diff --git a/compiler/lib/test/codegen/CppWriter/cpp b/compiler/lib/test/codegen/CppWriter/gen_cpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/cpp
rename to compiler/lib/test/codegen/CppWriter/gen_cpp
diff --git a/compiler/lib/test/codegen/CppWriter/hpp b/compiler/lib/test/codegen/CppWriter/gen_hpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/hpp
rename to compiler/lib/test/codegen/CppWriter/gen_hpp
diff --git a/compiler/lib/test/codegen/CppWriter/otherCpp b/compiler/lib/test/codegen/CppWriter/gen_otherCpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/otherCpp
rename to compiler/lib/test/codegen/CppWriter/gen_otherCpp
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index a2247a786..364f31fdd 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -1,12 +1,14 @@
 #!/bin/sh
 
+cd `dirname $0`
+
 . ../../../../scripts/test-utils.sh
 
 cpp_doc_ok()
 {
-  ./hpp > C.hpp && \
-  ./cpp > C.cpp && \
-  ./otherCpp > Other.cpp && \
+  ./gen_hpp > C.hpp && \
+  ./gen_cpp > C.cpp && \
+  ./gen_otherCpp > Other.cpp && \
   gcc -c C.cpp Other.cpp
 }