diff --git a/maven-core-integration-tests/src/test/resources/it0002/target/classes/it0002.properties b/maven-core-integration-tests/src/test/resources/it0002/target/classes/it0002.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/maven-core-integration-tests/src/test/resources/it0002/target/classes/it0002.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason
diff --git a/maven-core-integration-tests/src/test/resources/it0006/src/test/verifier/verifications.xml b/maven-core-integration-tests/src/test/resources/it0006/src/test/verifier/verifications.xml
index 385d31d840..b740ea5ed2 100644
--- a/maven-core-integration-tests/src/test/resources/it0006/src/test/verifier/verifications.xml
+++ b/maven-core-integration-tests/src/test/resources/it0006/src/test/verifier/verifications.xml
@@ -9,7 +9,7 @@
     </file>
     <file>
       <location>pom.xml</location>
-      <contains>Maven.*Plugin Test</contains>
+      <contains>Maven.*Integration Test</contains>
     </file>
   </files>
-</verifications>
\ No newline at end of file
+</verifications>
diff --git a/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/IT0016Person.java b/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/Person.java
similarity index 89%
rename from maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/IT0016Person.java
rename to maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/Person.java
index 6e26610f1e..349355ad05 100644
--- a/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/IT0016Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/Person.java
@@ -1,6 +1,6 @@
 package org.apache.maven.it0016;
 
-public class IT0016Person
+public class Person
 {
     private String name;
     
diff --git a/maven-core-integration-tests/src/test/resources/it0024/pom.xml b/maven-core-integration-tests/src/test/resources/it0024/pom.xml
index 29389897a0..c0f2102c05 100644
--- a/maven-core-integration-tests/src/test/resources/it0024/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0024/pom.xml
@@ -21,17 +21,14 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-
         <executions>
           <execution>
             <id>test</id>
             <phase>generate-sources</phase>
-
             <configuration>
               <source>1.4</source>
               <target>1.4</target>
             </configuration>
-
             <goals>
               <goal>compile</goal>
             </goals>
diff --git a/maven-core-integration-tests/src/test/resources/it0037/pom2.xml b/maven-core-integration-tests/src/test/resources/it0037/pom2.xml
index 24cfa25c1e..3b98a30f0e 100644
--- a/maven-core-integration-tests/src/test/resources/it0037/pom2.xml
+++ b/maven-core-integration-tests/src/test/resources/it0037/pom2.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven-core-it0037</artifactId>
+  <groupId>org.apache.maven.its.it0037</groupId>
+  <artifactId>maven-it-it0037</artifactId>
   <packaging>jar</packaging>
   <version>1.0-build2</version>
   <dependencies>
diff --git a/maven-core-integration-tests/src/test/resources/it0038/project/pom2.xml b/maven-core-integration-tests/src/test/resources/it0038/project/pom2.xml
index 24cfa25c1e..b650ca03cd 100644
--- a/maven-core-integration-tests/src/test/resources/it0038/project/pom2.xml
+++ b/maven-core-integration-tests/src/test/resources/it0038/project/pom2.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven-core-it0037</artifactId>
+  <groupId>org.apache.maven.its.it0038</groupId>
+  <artifactId>maven-it-it0038</artifactId>
   <packaging>jar</packaging>
   <version>1.0-build2</version>
   <dependencies>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
index dadf187ae2..9532c92167 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
@@ -1,6 +1,6 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
+  <groupId>org.apache.maven.its.it0039</groupId>
   <artifactId>maven-core-it0039-p1</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
index 8dca614880..ad2dc5f428 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
@@ -1,6 +1,6 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
+  <groupId>org.apache.maven.its.it0039</groupId>
   <artifactId>maven-core-it0039-p1</artifactId>
   <packaging>jar</packaging>
   <version>1.0</version>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
index dffc9b1023..c28c287c3e 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
@@ -1,6 +1,6 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
+  <groupId>org.apache.maven.its.it0039</groupId>
   <artifactId>maven-core-it0039-p2</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
index 3a6e6a42e1..60fe926e84 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
@@ -1,6 +1,6 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
+  <groupId>org.apache.maven.its.it0039</groupId>
   <artifactId>maven-core-it0039-p2</artifactId>
   <packaging>jar</packaging>
   <version>1.0</version>
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0060/Person.java b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0060/Person.java
index 613e499ae0..f8d5a932ca 100644
--- a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0060/Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0060/Person.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0060;
 
 public class Person
 {
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/resources/it0001.properties b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/resources/it0001.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/resources/it0001.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason
diff --git a/maven-core-integration-tests/src/test/resources/it0002/target/classes/it0001.properties b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/resources/it0060.properties
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0002/target/classes/it0001.properties
rename to maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/resources/it0060.properties
diff --git a/maven-core-integration-tests/src/test/resources/it0079/pom.xml b/maven-core-integration-tests/src/test/resources/it0079/pom.xml
index e362e22490..6761fcfc21 100644
--- a/maven-core-integration-tests/src/test/resources/it0079/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0079/pom.xml
@@ -2,8 +2,8 @@
 
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>maven-core-it0079</artifactId>
+    <groupId>org.apache.maven.its.it0079</groupId>
+    <artifactId>maven-it-it0079</artifactId>
 
     <description>Test that source attachments have the same build number as the main
         artifact when deployed.</description>