diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 43c715b..bd08ccd 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -4,18 +4,19 @@
 # See http://www.boost.org/LICENSE_1_0.txt
 
 test-suite testlib :
-    [ compile-fail compile-fail_fail.cpp ]
-    [ compile-fail compile-fail_pass.cpp ]
-    [ compile compile_fail.cpp  ]
-    [ compile compile_pass.cpp  ]
-    [ compile compile_warn.cpp  ]
+    [ compile-fail comp-fail_fail.cpp ]
+    [ compile-fail comp-fail_pass.cpp ]
+    [ compile comp_fail.cpp  ]
+    [ compile comp_pass.cpp  ]
+    [ compile comp_warn.cpp  ]
 #  The link test .cpp files were apparently never committed to the repository,
 #  and were lost.   
 #    [ link link_fail.cpp ]
 #    [ link link_pass.cpp ]
 #    [ link-fail link-fail_fail.cpp ]
 #    [ link-fail link-fail_pass.cpp ]
-    [ run-fail run-fail_compile-fail.cpp ]
+    [ run-fail run_comp-fail.cpp ]
+    [ run-fail run-fail_comp-fail.cpp ]
     [ run-fail run-fail_fail-warn.cpp ]
     [ run-fail run-fail_fail.cpp ]
     [ run-fail run-fail_pass.cpp ]
diff --git a/test/compile-fail_fail.cpp b/test/comp-fail_fail.cpp
similarity index 100%
rename from test/compile-fail_fail.cpp
rename to test/comp-fail_fail.cpp
diff --git a/test/compile-fail_pass.cpp b/test/comp-fail_pass.cpp
similarity index 100%
rename from test/compile-fail_pass.cpp
rename to test/comp-fail_pass.cpp
diff --git a/test/compile_fail.cpp b/test/comp_fail.cpp
similarity index 100%
rename from test/compile_fail.cpp
rename to test/comp_fail.cpp
diff --git a/test/compile_pass.cpp b/test/comp_pass.cpp
similarity index 100%
rename from test/compile_pass.cpp
rename to test/comp_pass.cpp
diff --git a/test/compile_warn.cpp b/test/comp_warn.cpp
similarity index 100%
rename from test/compile_warn.cpp
rename to test/comp_warn.cpp
diff --git a/test/run-fail_compile-fail.cpp b/test/run-fail_comp-fail.cpp
similarity index 100%
rename from test/run-fail_compile-fail.cpp
rename to test/run-fail_comp-fail.cpp
diff --git a/test/run_compile-fail.cpp b/test/run_comp-fail.cpp
similarity index 100%
rename from test/run_compile-fail.cpp
rename to test/run_comp-fail.cpp