diff --git a/samples/Zephir/filenames/exception.zep.c b/samples/C/exception.zep.c
similarity index 100%
rename from samples/Zephir/filenames/exception.zep.c
rename to samples/C/exception.zep.c
diff --git a/samples/Zephir/filenames/exception.zep.h b/samples/C/exception.zep.h
similarity index 100%
rename from samples/Zephir/filenames/exception.zep.h
rename to samples/C/exception.zep.h
diff --git a/samples/Zephir/filenames/exception.zep.php b/samples/PHP/exception.zep.php
similarity index 100%
rename from samples/Zephir/filenames/exception.zep.php
rename to samples/PHP/exception.zep.php
diff --git a/test/test_generated.rb b/test/test_generated.rb
index 8fe57245..1c3f8d90 100644
--- a/test/test_generated.rb
+++ b/test/test_generated.rb
@@ -45,9 +45,9 @@ class TestGenerated < Minitest::Test
     generated_without_loading_data("Godeps/_workspace/src/github.com/kr/s3/sign.go")
 
     # Generated by Zephir
-    generated_without_loading_data("Zephir/filenames/exception.zep.c")
-    generated_without_loading_data("Zephir/filenames/exception.zep.h")
-    generated_without_loading_data("Zephir/filenames/exception.zep.php")
+    generated_without_loading_data("C/exception.zep.c")
+    generated_without_loading_data("C/exception.zep.h")
+    generated_without_loading_data("PHP/exception.zep.php")
 
     # Minified files
     generated_loading_data("JavaScript/jquery-1.6.1.min.js")