diff --git a/maven/src/it/jpa-default/invoker.properties b/maven/src/it/hbm2java-jpa-default/invoker.properties
similarity index 100%
rename from maven/src/it/jpa-default/invoker.properties
rename to maven/src/it/hbm2java-jpa-default/invoker.properties
diff --git a/maven/src/it/jpa-default/pom.xml b/maven/src/it/hbm2java-jpa-default/pom.xml
similarity index 97%
rename from maven/src/it/jpa-default/pom.xml
rename to maven/src/it/hbm2java-jpa-default/pom.xml
index d3c94e8fc4..940e1a8d6c 100644
--- a/maven/src/it/jpa-default/pom.xml
+++ b/maven/src/it/hbm2java-jpa-default/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.hibernate.tool.maven.test</groupId>
-    <artifactId>jpa-default</artifactId>
+    <artifactId>hbm2java-jpa-default</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/maven/src/it/jpa-default/setup.bsh b/maven/src/it/hbm2java-jpa-default/setup.bsh
similarity index 100%
rename from maven/src/it/jpa-default/setup.bsh
rename to maven/src/it/hbm2java-jpa-default/setup.bsh
diff --git a/maven/src/it/jpa-default/src/main/resources/hibernate.properties b/maven/src/it/hbm2java-jpa-default/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/jpa-default/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java-jpa-default/src/main/resources/hibernate.properties
diff --git a/maven/src/it/jpa-default/verify.bsh b/maven/src/it/hbm2java-jpa-default/verify.bsh
similarity index 100%
rename from maven/src/it/jpa-default/verify.bsh
rename to maven/src/it/hbm2java-jpa-default/verify.bsh
diff --git a/maven/src/it/no-annotations/invoker.properties b/maven/src/it/hbm2java-no-annotations/invoker.properties
similarity index 100%
rename from maven/src/it/no-annotations/invoker.properties
rename to maven/src/it/hbm2java-no-annotations/invoker.properties
diff --git a/maven/src/it/no-annotations/pom.xml b/maven/src/it/hbm2java-no-annotations/pom.xml
similarity index 97%
rename from maven/src/it/no-annotations/pom.xml
rename to maven/src/it/hbm2java-no-annotations/pom.xml
index 72cf639001..f1d6f32fa4 100644
--- a/maven/src/it/no-annotations/pom.xml
+++ b/maven/src/it/hbm2java-no-annotations/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.hibernate.tool.maven.test</groupId>
-    <artifactId>no-annotations</artifactId>
+    <artifactId>hbm2java-no-annotations</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/maven/src/it/no-annotations/setup.bsh b/maven/src/it/hbm2java-no-annotations/setup.bsh
similarity index 100%
rename from maven/src/it/no-annotations/setup.bsh
rename to maven/src/it/hbm2java-no-annotations/setup.bsh
diff --git a/maven/src/it/no-annotations/src/main/resources/hibernate.properties b/maven/src/it/hbm2java-no-annotations/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/no-annotations/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java-no-annotations/src/main/resources/hibernate.properties
diff --git a/maven/src/it/no-annotations/verify.bsh b/maven/src/it/hbm2java-no-annotations/verify.bsh
similarity index 100%
rename from maven/src/it/no-annotations/verify.bsh
rename to maven/src/it/hbm2java-no-annotations/verify.bsh
diff --git a/maven/src/it/no-generics/invoker.properties b/maven/src/it/hbm2java-no-generics/invoker.properties
similarity index 100%
rename from maven/src/it/no-generics/invoker.properties
rename to maven/src/it/hbm2java-no-generics/invoker.properties
diff --git a/maven/src/it/no-generics/pom.xml b/maven/src/it/hbm2java-no-generics/pom.xml
similarity index 97%
rename from maven/src/it/no-generics/pom.xml
rename to maven/src/it/hbm2java-no-generics/pom.xml
index 971dfe5ac1..082b942d96 100644
--- a/maven/src/it/no-generics/pom.xml
+++ b/maven/src/it/hbm2java-no-generics/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.hibernate.tool.maven.test</groupId>
-    <artifactId>use-generics</artifactId>
+    <artifactId>hbm2java-no-generics</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/maven/src/it/no-generics/setup.bsh b/maven/src/it/hbm2java-no-generics/setup.bsh
similarity index 100%
rename from maven/src/it/no-generics/setup.bsh
rename to maven/src/it/hbm2java-no-generics/setup.bsh
diff --git a/maven/src/it/no-generics/src/main/resources/hibernate.properties b/maven/src/it/hbm2java-no-generics/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/no-generics/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java-no-generics/src/main/resources/hibernate.properties
diff --git a/maven/src/it/no-generics/verify.bsh b/maven/src/it/hbm2java-no-generics/verify.bsh
similarity index 100%
rename from maven/src/it/no-generics/verify.bsh
rename to maven/src/it/hbm2java-no-generics/verify.bsh
diff --git a/maven/src/it/output-directory/invoker.properties b/maven/src/it/hbm2java-output-directory/invoker.properties
similarity index 100%
rename from maven/src/it/output-directory/invoker.properties
rename to maven/src/it/hbm2java-output-directory/invoker.properties
diff --git a/maven/src/it/output-directory/pom.xml b/maven/src/it/hbm2java-output-directory/pom.xml
similarity index 97%
rename from maven/src/it/output-directory/pom.xml
rename to maven/src/it/hbm2java-output-directory/pom.xml
index 26d63b3f61..23d1cfd9a2 100644
--- a/maven/src/it/output-directory/pom.xml
+++ b/maven/src/it/hbm2java-output-directory/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.hibernate.tool.maven.test</groupId>
-    <artifactId>jpa-default</artifactId>
+    <artifactId>hbm2java-output-directory</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/maven/src/it/output-directory/setup.bsh b/maven/src/it/hbm2java-output-directory/setup.bsh
similarity index 100%
rename from maven/src/it/output-directory/setup.bsh
rename to maven/src/it/hbm2java-output-directory/setup.bsh
diff --git a/maven/src/it/output-directory/src/main/resources/hibernate.properties b/maven/src/it/hbm2java-output-directory/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/output-directory/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java-output-directory/src/main/resources/hibernate.properties
diff --git a/maven/src/it/output-directory/verify.bsh b/maven/src/it/hbm2java-output-directory/verify.bsh
similarity index 100%
rename from maven/src/it/output-directory/verify.bsh
rename to maven/src/it/hbm2java-output-directory/verify.bsh
diff --git a/maven/src/it/template-path/invoker.properties b/maven/src/it/hbm2java-template-path/invoker.properties
similarity index 100%
rename from maven/src/it/template-path/invoker.properties
rename to maven/src/it/hbm2java-template-path/invoker.properties
diff --git a/maven/src/it/template-path/pom.xml b/maven/src/it/hbm2java-template-path/pom.xml
similarity index 97%
rename from maven/src/it/template-path/pom.xml
rename to maven/src/it/hbm2java-template-path/pom.xml
index 06cd5e961d..b79b210233 100644
--- a/maven/src/it/template-path/pom.xml
+++ b/maven/src/it/hbm2java-template-path/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.hibernate.tool.maven.test</groupId>
-    <artifactId>jpa-default</artifactId>
+    <artifactId>hbm2java-template-path</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/maven/src/it/template-path/setup.bsh b/maven/src/it/hbm2java-template-path/setup.bsh
similarity index 100%
rename from maven/src/it/template-path/setup.bsh
rename to maven/src/it/hbm2java-template-path/setup.bsh
diff --git a/maven/src/it/template-path/src/main/resources/hibernate.properties b/maven/src/it/hbm2java-template-path/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/template-path/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java-template-path/src/main/resources/hibernate.properties
diff --git a/maven/src/it/template-path/templates/pojo/Pojo.ftl b/maven/src/it/hbm2java-template-path/templates/pojo/Pojo.ftl
similarity index 100%
rename from maven/src/it/template-path/templates/pojo/Pojo.ftl
rename to maven/src/it/hbm2java-template-path/templates/pojo/Pojo.ftl
diff --git a/maven/src/it/template-path/verify.bsh b/maven/src/it/hbm2java-template-path/verify.bsh
similarity index 100%
rename from maven/src/it/template-path/verify.bsh
rename to maven/src/it/hbm2java-template-path/verify.bsh
diff --git a/maven/src/it/use-generics/invoker.properties b/maven/src/it/hbm2java-use-generics/invoker.properties
similarity index 100%
rename from maven/src/it/use-generics/invoker.properties
rename to maven/src/it/hbm2java-use-generics/invoker.properties
diff --git a/maven/src/it/use-generics/pom.xml b/maven/src/it/hbm2java-use-generics/pom.xml
similarity index 97%
rename from maven/src/it/use-generics/pom.xml
rename to maven/src/it/hbm2java-use-generics/pom.xml
index 3f86642218..8b2931c1ed 100644
--- a/maven/src/it/use-generics/pom.xml
+++ b/maven/src/it/hbm2java-use-generics/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.hibernate.tool.maven.test</groupId>
-    <artifactId>use-generics</artifactId>
+    <artifactId>hbm2java-use-generics</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/maven/src/it/use-generics/setup.bsh b/maven/src/it/hbm2java-use-generics/setup.bsh
similarity index 100%
rename from maven/src/it/use-generics/setup.bsh
rename to maven/src/it/hbm2java-use-generics/setup.bsh
diff --git a/maven/src/it/use-generics/src/main/resources/hibernate.properties b/maven/src/it/hbm2java-use-generics/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/use-generics/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java-use-generics/src/main/resources/hibernate.properties
diff --git a/maven/src/it/use-generics/verify.bsh b/maven/src/it/hbm2java-use-generics/verify.bsh
similarity index 100%
rename from maven/src/it/use-generics/verify.bsh
rename to maven/src/it/hbm2java-use-generics/verify.bsh