diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 96c8a1e..5a0ebb9 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -75,7 +75,7 @@
       <version>2.0</version>
     </dependency>
     <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
     <dependency>
@@ -101,12 +101,12 @@
 
     <!-- Maven runtime -->
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-java</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-beanshell</artifactId>
       <scope>runtime</scope>
     </dependency>
@@ -149,22 +149,22 @@
     <dependencies>
       <!-- maven -->
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
index 2b57e6f..dccc3b7 100755
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven.plugintools</groupId>
+    <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
     <version>2.4-SNAPSHOT</version>
   </parent>
@@ -39,11 +39,11 @@
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-model</artifactId>
     </dependency>
 
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index 29453d9..80146df 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven.plugintools</groupId>
+    <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
     <version>2.4-SNAPSHOT</version>
   </parent>
diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index 4a2f950..c2d450f 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven.plugintools</groupId>
+    <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
     <version>2.4-SNAPSHOT</version>
   </parent>
@@ -35,7 +35,7 @@
   <dependencies>
     <!-- maven -->
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
     <dependency>
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index 76aa899..425732c 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven.plugintools</groupId>
+    <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
     <version>2.4-SNAPSHOT</version>
   </parent>
@@ -49,7 +49,7 @@
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
 
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index 41f21f1..6d64c72 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven.plugintools</groupId>
+    <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
     <version>2.4-SNAPSHOT</version>
   </parent>
@@ -34,7 +34,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.plugintools</groupId>
+      <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-java</artifactId>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
index f05885c..f612420 100644
--- a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
+++ b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
@@ -112,7 +112,7 @@ under the License.
           </taglets>
 
           <tagletArtifact>
-            <groupId>org.apache.maven.plugintools</groupId>
+            <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-tools-javadoc</artifactId>
             <version>@project.version@</version>
           </tagletArtifact>
diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
index c3819bb..ca013d2 100755
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven.plugintools</groupId>
+    <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
     <version>2.4-SNAPSHOT</version>
   </parent>
diff --git a/pom.xml b/pom.xml
index 4a553bd..83d0f97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
-  <groupId>org.apache.maven.plugintools</groupId>
+  <groupId>org.apache.maven.plugin-tools</groupId>
   <artifactId>maven-plugin-tools</artifactId>
   <version>2.4-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -174,22 +174,22 @@
     <dependencies>
       <!-- maven -->
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.plugintools</groupId>
+        <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>