diff --git a/package.xml b/package.xml
index 47ec6b2..c199350 100644
--- a/package.xml
+++ b/package.xml
@@ -36,57 +36,57 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file name="v8js_variables.cc" role="src" />
    <file name="php_v8js.h" role="src" />
    <file name="php_v8js_macros.h" role="src" />
-   <file name="php_v8js_commonjs.cc" role="src" />
+   <file name="v8js_commonjs.cc" role="src" />
    <file name="test.php" role="src" />
    <file name="TODO" role="src" />
-  <dir name="/samples">
+  <dir name="samples">
    <file name="dlopen.supp" role="src" />
-   <file name="test_callback.php" role="src" />
-   <file name="test_call.php" role="src" />
-   <file name="test_closure.php" role="src" />
-   <file name="test_crash.php" role="src" />
-   <file name="test_date.php" role="src" />
-   <file name="test_dumper.php" role="src" />
-   <file name="test_exception2.php" role="src" />
-   <file name="test_exception.php" role="src" />
-   <file name="test_extend.php" role="src" />
-   <file name="test_extension.php" role="src" />
-   <file name="test_method.php" role="src" />
-  <dir name="/tests">
-   <file name="basic.phpt" role="src" />
-   <file name="callbacks.phpt" role="src" />
-   <file name="closures_basic.phpt" role="src" />
-   <file name="closures_dynamic.phpt" role="src" />
-   <file name="commonjs_modules.phpt" role="src" />
-   <file name="construct.phpt" role="src" />
-   <file name="context_preserving.phpt" role="src" />
-   <file name="context_separation.phpt" role="src" />
-   <file name="context_temp_creation.phpt" role="src" />
-   <file name="exception.phpt" role="src" />
-   <file name="exception_propagation_1.phpt" role="src" />
-   <file name="exception_propagation_2.phpt" role="src" />
-   <file name="exception_propagation_3.phpt" role="src" />
-   <file name="execute_flags_args.phpt" role="src" />
-   <file name="execute_flags.phpt" role="src" />
-   <file name="extensions_basic.phpt" role="src" />
-   <file name="extensions_circular_dependency.phpt" role="src" />
-   <file name="get_accessor.phpt" role="src" />
-   <file name="js-construct-basic.phpt" role="src" />
-   <file name="js-construct-direct-call.phpt" role="src" />
-   <file name="js-construct-protected-ctor.phpt" role="src" />
-   <file name="js-construct-with-ctor.phpt" role="src" />
-   <file name="memory_limit.phpt" role="src" />
-   <file name="multi-object.phpt" role="src" />
-   <file name="multi.phpt" role="src" />
-   <file name="object_method_call.phpt" role="src" />
-   <file name="object.phpt" role="src" />
-   <file name="object_prototype.phpt" role="src" />
-   <file name="object_reuse.phpt" role="src" />
-   <file name="return_value.phpt" role="src" />
-   <file name="skipif.inc" role="src" />
-   <file name="time_limit.phpt" role="src" />
-   <file name="variable_passing.phpt" role="src" />
-</dir>
+   <file name="test_callback.php" role="php" />
+   <file name="test_call.php" role="php" />
+   <file name="test_closure.php" role="php" />
+   <file name="test_crash.php" role="php" />
+   <file name="test_date.php" role="php" />
+   <file name="test_dumper.php" role="php" />
+   <file name="test_exception2.php" role="php" />
+   <file name="test_exception.php" role="php" />
+   <file name="test_extend.php" role="php" />
+   <file name="test_extension.php" role="php" />
+   <file name="test_method.php" role="php" />
+ </dir>
+  <dir name="tests">
+   <file name="basic.phpt" role="test" />
+   <file name="callbacks.phpt" role="test" />
+   <file name="closures_basic.phpt" role="test" />
+   <file name="closures_dynamic.phpt" role="test" />
+   <file name="commonjs_modules.phpt" role="test" />
+   <file name="construct.phpt" role="test" />
+   <file name="context_preserving.phpt" role="test" />
+   <file name="context_separation.phpt" role="test" />
+   <file name="context_temp_creation.phpt" role="test" />
+   <file name="exception.phpt" role="test" />
+   <file name="exception_propagation_1.phpt" role="test" />
+   <file name="exception_propagation_2.phpt" role="test" />
+   <file name="exception_propagation_3.phpt" role="test" />
+   <file name="execute_flags_args.phpt" role="test" />
+   <file name="execute_flags.phpt" role="test" />
+   <file name="extensions_basic.phpt" role="test" />
+   <file name="extensions_circular_dependency.phpt" role="test" />
+   <file name="get_accessor.phpt" role="test" />
+   <file name="js-construct-basic.phpt" role="test" />
+   <file name="js-construct-direct-call.phpt" role="test" />
+   <file name="js-construct-protected-ctor.phpt" role="test" />
+   <file name="js-construct-with-ctor.phpt" role="test" />
+   <file name="memory_limit.phpt" role="test" />
+   <file name="multi-object.phpt" role="test" />
+   <file name="multi.phpt" role="test" />
+   <file name="object_method_call.phpt" role="test" />
+   <file name="object.phpt" role="test" />
+   <file name="object_prototype.phpt" role="test" />
+   <file name="object_reuse.phpt" role="test" />
+   <file name="return_value.phpt" role="test" />
+   <file name="skipif.inc" role="test" />
+   <file name="time_limit.phpt" role="test" />
+   <file name="variable_passing.phpt" role="test" />
 </dir>
 </dir>
  </contents>