diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 6590e8e58..b6066449b 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -13,15 +13,15 @@ top_builddir = @top_builddir@/..
 include $(srcdir)/../common.mk
 
 CPP_TEST_CASES += \
-				 cpp_atomic_class \
-				 cpp_atomic_class_enum \
-				 cpp_atomic_class_method \
-				 cpp_atomic_class_var_pub_member_atom \
-				 cpp_atomic_class_var_pub_member_class \
-				 cpp_atomic_global_enum \
-				 cpp_atomic_global_var_atom \
-				 cpp_atomic_global_var_class \
-				 cpp_atomic_namespaced_class
+				 cpp_basic_class \
+				 cpp_basic_class_enum \
+				 cpp_basic_class_method \
+				 cpp_basic_class_var_pub_member_atom \
+				 cpp_basic_class_var_pub_member_class \
+				 cpp_basic_global_enum \
+				 cpp_basic_global_var_atom \
+				 cpp_basic_global_var_class \
+				 cpp_basic_namespaced_class
 
 #
 # BROKEN TEST CASES:
diff --git a/Examples/test-suite/c/cpp_atomic_class_enum_runme.c b/Examples/test-suite/c/cpp_basic_class_enum_runme.c
similarity index 74%
rename from Examples/test-suite/c/cpp_atomic_class_enum_runme.c
rename to Examples/test-suite/c/cpp_basic_class_enum_runme.c
index 02b9d0d3c..1b84d5943 100644
--- a/Examples/test-suite/c/cpp_atomic_class_enum_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_enum_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_class_enum/cpp_atomic_class_enum_proxy.h"
+#include "cpp_basic_class_enum/cpp_basic_class_enum_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_class_method_runme.c b/Examples/test-suite/c/cpp_basic_class_method_runme.c
similarity index 72%
rename from Examples/test-suite/c/cpp_atomic_class_method_runme.c
rename to Examples/test-suite/c/cpp_basic_class_method_runme.c
index 31adbebe3..d85e36278 100644
--- a/Examples/test-suite/c/cpp_atomic_class_method_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_method_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_class_method/cpp_atomic_class_method_proxy.h"
+#include "cpp_basic_class_method/cpp_basic_class_method_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_class_runme.c b/Examples/test-suite/c/cpp_basic_class_runme.c
similarity index 70%
rename from Examples/test-suite/c/cpp_atomic_class_runme.c
rename to Examples/test-suite/c/cpp_basic_class_runme.c
index 45e0e0dd7..aa4d481b5 100644
--- a/Examples/test-suite/c/cpp_atomic_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_runme.c
@@ -1,4 +1,4 @@
-#include "cpp_atomic_class/cpp_atomic_class_proxy.h"
+#include "cpp_basic_class/cpp_basic_class_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c
similarity index 73%
rename from Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c
rename to Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c
index 0396a4476..3cfb658ba 100644
--- a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_atom_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_class_var_pub_member_atom/cpp_atomic_class_var_pub_member_atom_proxy.h"
+#include "cpp_basic_class_var_pub_member_atom/cpp_basic_class_var_pub_member_atom_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
similarity index 80%
rename from Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c
rename to Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
index 516396371..4be7d2a54 100644
--- a/Examples/test-suite/c/cpp_atomic_class_var_pub_member_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_class_var_pub_member_class_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_class_var_pub_member_class/cpp_atomic_class_var_pub_member_class_proxy.h"
+#include "cpp_basic_class_var_pub_member_class/cpp_basic_class_var_pub_member_class_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_global_enum_runme.c b/Examples/test-suite/c/cpp_basic_global_enum_runme.c
similarity index 70%
rename from Examples/test-suite/c/cpp_atomic_global_enum_runme.c
rename to Examples/test-suite/c/cpp_basic_global_enum_runme.c
index a4bdf55be..9620619e7 100644
--- a/Examples/test-suite/c/cpp_atomic_global_enum_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_enum_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_global_enum/cpp_atomic_global_enum_proxy.h"
+#include "cpp_basic_global_enum/cpp_basic_global_enum_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c b/Examples/test-suite/c/cpp_basic_global_var_atom_runme.c
similarity index 69%
rename from Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c
rename to Examples/test-suite/c/cpp_basic_global_var_atom_runme.c
index f21939cff..80540bda1 100644
--- a/Examples/test-suite/c/cpp_atomic_global_var_atom_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_var_atom_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_global_var_atom/cpp_atomic_global_var_atom_proxy.h"
+#include "cpp_basic_global_var_atom/cpp_basic_global_var_atom_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
similarity index 60%
rename from Examples/test-suite/c/cpp_atomic_global_var_class_runme.c
rename to Examples/test-suite/c/cpp_basic_global_var_class_runme.c
index 3841e4d0d..a620e58b3 100644
--- a/Examples/test-suite/c/cpp_atomic_global_var_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_global_var_class_runme.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "cpp_atomic_global_var_class/cpp_atomic_global_var_class_proxy.h"
+#include "cpp_basic_global_var_class/cpp_basic_global_var_class_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
similarity index 68%
rename from Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c
rename to Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
index 8fe021df2..e06f8b128 100644
--- a/Examples/test-suite/c/cpp_atomic_namespaced_class_runme.c
+++ b/Examples/test-suite/c/cpp_basic_namespaced_class_runme.c
@@ -1,4 +1,4 @@
-#include "cpp_atomic_namespaced_class/cpp_atomic_namespaced_class_proxy.h"
+#include "cpp_basic_namespaced_class/cpp_basic_namespaced_class_proxy.h"
 
 int main(int argc, const char *argv[])
 {
diff --git a/Examples/test-suite/cpp_atomic_class.i b/Examples/test-suite/cpp_basic_class.i
similarity index 60%
rename from Examples/test-suite/cpp_atomic_class.i
rename to Examples/test-suite/cpp_basic_class.i
index a9555b4da..bd46a4274 100644
--- a/Examples/test-suite/cpp_atomic_class.i
+++ b/Examples/test-suite/cpp_basic_class.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_class
+%module cpp_basic_class
 
 %inline{
     class MyClass {
diff --git a/Examples/test-suite/cpp_atomic_class_enum.i b/Examples/test-suite/cpp_basic_class_enum.i
similarity index 84%
rename from Examples/test-suite/cpp_atomic_class_enum.i
rename to Examples/test-suite/cpp_basic_class_enum.i
index afbd77bff..8e7788b53 100644
--- a/Examples/test-suite/cpp_atomic_class_enum.i
+++ b/Examples/test-suite/cpp_basic_class_enum.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_class_enum
+%module cpp_basic_class_enum
 
 %inline {
     class MyClass {
diff --git a/Examples/test-suite/cpp_atomic_class_method.i b/Examples/test-suite/cpp_basic_class_method.i
similarity index 80%
rename from Examples/test-suite/cpp_atomic_class_method.i
rename to Examples/test-suite/cpp_basic_class_method.i
index ec2f9c5cd..b67cc2a0b 100644
--- a/Examples/test-suite/cpp_atomic_class_method.i
+++ b/Examples/test-suite/cpp_basic_class_method.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_class_method
+%module cpp_basic_class_method
 
 %inline{
     class MyClass {
diff --git a/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i b/Examples/test-suite/cpp_basic_class_var_pub_member_atom.i
similarity index 72%
rename from Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i
rename to Examples/test-suite/cpp_basic_class_var_pub_member_atom.i
index 8fbfbb2b0..65bf1b301 100644
--- a/Examples/test-suite/cpp_atomic_class_var_pub_member_atom.i
+++ b/Examples/test-suite/cpp_basic_class_var_pub_member_atom.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_class_var_pub_member_atom
+%module cpp_basic_class_var_pub_member_atom
 
 %inline{
     class MyClass {
diff --git a/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i b/Examples/test-suite/cpp_basic_class_var_pub_member_class.i
similarity index 73%
rename from Examples/test-suite/cpp_atomic_class_var_pub_member_class.i
rename to Examples/test-suite/cpp_basic_class_var_pub_member_class.i
index 00c060fe8..4cbee00c6 100644
--- a/Examples/test-suite/cpp_atomic_class_var_pub_member_class.i
+++ b/Examples/test-suite/cpp_basic_class_var_pub_member_class.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_class_var_pub_member_class
+%module cpp_basic_class_var_pub_member_class
 
 %inline{
     class MyClass {
diff --git a/Examples/test-suite/cpp_atomic_global_enum.i b/Examples/test-suite/cpp_basic_global_enum.i
similarity index 73%
rename from Examples/test-suite/cpp_atomic_global_enum.i
rename to Examples/test-suite/cpp_basic_global_enum.i
index 34367f378..b1bfa612f 100644
--- a/Examples/test-suite/cpp_atomic_global_enum.i
+++ b/Examples/test-suite/cpp_basic_global_enum.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_global_enum
+%module cpp_basic_global_enum
 
 %inline {
     enum SomeEnum
diff --git a/Examples/test-suite/cpp_atomic_global_var_atom.i b/Examples/test-suite/cpp_basic_global_var_atom.i
similarity index 52%
rename from Examples/test-suite/cpp_atomic_global_var_atom.i
rename to Examples/test-suite/cpp_basic_global_var_atom.i
index 5aa81aa7d..c0cc1ba91 100644
--- a/Examples/test-suite/cpp_atomic_global_var_atom.i
+++ b/Examples/test-suite/cpp_basic_global_var_atom.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_global_var_atom
+%module cpp_basic_global_var_atom
 
 %inline {
     int myGlobalInt = 42;
diff --git a/Examples/test-suite/cpp_atomic_global_var_class.i b/Examples/test-suite/cpp_basic_global_var_class.i
similarity index 66%
rename from Examples/test-suite/cpp_atomic_global_var_class.i
rename to Examples/test-suite/cpp_basic_global_var_class.i
index 8e138c60a..b99585a72 100644
--- a/Examples/test-suite/cpp_atomic_global_var_class.i
+++ b/Examples/test-suite/cpp_basic_global_var_class.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_global_var_class
+%module cpp_basic_global_var_class
 
 %inline {
     class MyClass {};
diff --git a/Examples/test-suite/cpp_atomic_namespaced_class.i b/Examples/test-suite/cpp_basic_namespaced_class.i
similarity index 74%
rename from Examples/test-suite/cpp_atomic_namespaced_class.i
rename to Examples/test-suite/cpp_basic_namespaced_class.i
index a60d666c7..31b49b292 100644
--- a/Examples/test-suite/cpp_atomic_namespaced_class.i
+++ b/Examples/test-suite/cpp_basic_namespaced_class.i
@@ -1,4 +1,4 @@
-%module cpp_atomic_namespaced_class
+%module cpp_basic_namespaced_class
 %feature (nspace, "1");
 
 %inline{