diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-all/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-all/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-all/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-all/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-configuration/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-configuration/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PluginConfigurationEmitter.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PluginConfigurationEmitter.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PluginConfigurationEmitter.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PluginConfigurationEmitter.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-context-passing/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-context-passing/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-install-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-install-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-war-plugin/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-war-plugin/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-core-stubs/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-file/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-file/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-file/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-file/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FileMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FileMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FileMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FilesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FilesMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FilesMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-file/src/main/java/org/apache/maven/plugin/coreit/FilesMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-fork/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItForkerMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItForkerMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItForkerMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItForkerMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItGoalForkerMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItGoalForkerMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItGoalForkerMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItGoalForkerMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/resources/META-INF/maven/lifecycle.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/resources/META-INF/maven/lifecycle.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-fork/src/main/resources/META-INF/maven/lifecycle.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/resources/META-INF/maven/lifecycle.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-envar-properties/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-generate-envar-properties/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-envar-properties/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-generate-envar-properties/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-envar-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedEnvarConfigurationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-generate-envar-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedEnvarConfigurationMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-envar-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedEnvarConfigurationMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-generate-envar-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedEnvarConfigurationMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-properties/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-generate-properties/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-properties/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-generate-properties/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-generate-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-generate-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-generate-properties/src/main/java/org/apache/maven/plugin/coreit/InterpolatedPomConfigurationMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-loadable/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-loadable/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-loadable/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-loadable/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-loadable/src/main/java/org/apache/maven/plugin/coreit/LoadableMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-loadable/src/main/java/org/apache/maven/plugin/coreit/LoadableMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-loadable/src/main/java/org/apache/maven/plugin/coreit/LoadableMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-loadable/src/main/java/org/apache/maven/plugin/coreit/LoadableMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-no-project/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-no-project/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-no-project/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-packaging/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-packaging/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-packaging/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/Bla.java b/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/Bla.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/Bla.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/Bla.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/ParameterImplementationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/ParameterImplementationMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/ParameterImplementationMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/ParameterImplementationMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/MyBla.java b/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/MyBla.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/MyBla.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/MyBla.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-setter/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-setter/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-setter/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-setter/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java b/its/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-touch/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-touch/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-touch/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-properties/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-properties/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml
rename to its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
diff --git a/its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
similarity index 100%
rename from its/core-it-support/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
rename to its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
diff --git a/its/core-it-support/core-integration-testing-plugins/pom.xml b/its/core-it-support/core-it-plugins/pom.xml
similarity index 91%
rename from its/core-it-support/core-integration-testing-plugins/pom.xml
rename to its/core-it-support/core-it-plugins/pom.xml
index d4e621f800..e0f3453f68 100644
--- a/its/core-it-support/core-integration-testing-plugins/pom.xml
+++ b/its/core-it-support/core-it-plugins/pom.xml
@@ -55,9 +55,9 @@ under the License.
- scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-it-support/core-integration-testing-plugins
- scm:svn:https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-it-support/core-integration-testing-plugins
- http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-integration-testing-plugins
+ scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-it-support/core-it-plugins
+ scm:svn:https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-it-support/core-it-plugins
+ http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins
diff --git a/its/core-it-support/pom.xml b/its/core-it-support/pom.xml
index f041772638..b166c7c3c6 100644
--- a/its/core-it-support/pom.xml
+++ b/its/core-it-support/pom.xml
@@ -38,7 +38,7 @@ under the License.
http://maven.apache.org
- core-integration-testing-plugins
+ core-it-plugins
core-integration-testing-wagon
core-integration-testing-support
maven-integration-test-helper