diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index 165b80875..316658adb 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -17,10 +17,10 @@ CPP_TEST_CASES += \
 				 cpp_basic_class_enum \
 				 cpp_basic_class_method \
 				 cpp_basic_class_virtual_method \
-				 cpp_basic_class_var_pub_member_atom \
+				 cpp_basic_class_var_pub_member_built_in \
 				 cpp_basic_class_var_pub_member_class \
 				 cpp_basic_global_enum \
-				 cpp_basic_global_var_atom \
+				 cpp_basic_global_var_built_in \
 				 cpp_basic_global_var_class \
 				 cpp_basic_namespaced_class \
 				 cpp_basic_template_function \
diff --git a/Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c b/Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
similarity index 100%
rename from Examples/test-suite/c/cpp_basic_class_var_pub_member_atom_runme.c
rename to Examples/test-suite/c/cpp_basic_class_var_pub_member_built_in_runme.c
diff --git a/Examples/test-suite/c/cpp_basic_global_var_atom_runme.c b/Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
similarity index 100%
rename from Examples/test-suite/c/cpp_basic_global_var_atom_runme.c
rename to Examples/test-suite/c/cpp_basic_global_var_built_in_runme.c
diff --git a/Examples/test-suite/cpp_basic_class_var_pub_member_atom.i b/Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
similarity index 100%
rename from Examples/test-suite/cpp_basic_class_var_pub_member_atom.i
rename to Examples/test-suite/cpp_basic_class_var_pub_member_built_in.i
diff --git a/Examples/test-suite/cpp_basic_global_var_atom.i b/Examples/test-suite/cpp_basic_global_var_built_in.i
similarity index 100%
rename from Examples/test-suite/cpp_basic_global_var_atom.i
rename to Examples/test-suite/cpp_basic_global_var_built_in.i