diff --git a/api/pom.xml b/api/pom.xml
index 3d8423c87..7384ba4ae 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts.action2</groupId>
-        <artifactId>struts-action2-parent</artifactId>
+        <groupId>org.apache.struts2</groupId>
+        <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts.action2</groupId>
-    <artifactId>struts-api</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-api</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 API</name>
     <dependencies>
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 60cf16132..b051599af 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-      <groupId>org.apache.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-blank</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-blank</artifactId>
     <packaging>war</packaging>
     <name>Blank Webapp</name>
     <dependencies>
diff --git a/apps/pom.xml b/apps/pom.xml
index 45f1cf901..d01b3e2f0 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts2</groupId>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-apps</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>
     <name>Webapps</name>
     <modules>
@@ -121,8 +121,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>struts-core</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 40acd0770..d7ebd4ba6 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-      <groupId>org.apache.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-portlet</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-portlet</artifactId>
     <packaging>war</packaging>
     <name>Portlet Webapp</name>
     <dependencies>
diff --git a/apps/shopping-cart/pom.xml b/apps/shopping-cart/pom.xml
index 84cad30c1..4815ec378 100644
--- a/apps/shopping-cart/pom.xml
+++ b/apps/shopping-cart/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-      <groupId>org.apache.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-shopping-cart</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-shopping-cart</artifactId>
     <packaging>war</packaging>
     <name>Shopping Cart Webapp</name>
     <dependencies>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index fe01e74b0..aac4f209c 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts2</groupId>
-        <artifactId>struts-apps</artifactId>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-apps</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-showcase</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-showcase</artifactId>
     <packaging>war</packaging>
     <name>Showcase Webapp</name>
     <profiles>
diff --git a/apps/starter/pom.xml b/apps/starter/pom.xml
index d1ba0f035..1773204ee 100644
--- a/apps/starter/pom.xml
+++ b/apps/starter/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-      <groupId>org.apache.struts2</groupId>
-      <artifactId>struts-apps</artifactId>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-starter</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-starter</artifactId>
     <packaging>war</packaging>
     <name>Starter Webapp</name>
     <dependencies>
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 8f5295b2c..e1b4b2af6 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -2,7 +2,7 @@
 
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.struts.action2</groupId>
+  <groupId>org.apache.struts</groupId>
   <artifactId>struts2-archetype-quickstart</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index 1bc6ad18b..b7097413d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts2</groupId>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-core</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 - Core</name>
     
diff --git a/extras/pom.xml b/extras/pom.xml
index bacd23ad8..6dfef9a79 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts2</groupId>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>struts-extras</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-extras</artifactId>
     <packaging>jar</packaging>
     <name>Struts Extras</name>
     
@@ -29,8 +29,8 @@
         </dependency>
     
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>struts-core</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
       
diff --git a/pom.xml b/pom.xml
index b94a78a24..b3b67004a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
    </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.struts2</groupId>
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-parent</artifactId>
     <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/uber/pom.xml b/uber/pom.xml
index 22ecdbe67..ac36c693a 100644
--- a/uber/pom.xml
+++ b/uber/pom.xml
@@ -3,12 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts2</groupId>
-        <artifactId>struts-action2-parent</artifactId>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts2</groupId>
-    <artifactId>action-all</artifactId>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-all</artifactId>
     <packaging>pom</packaging>
     <name>Uber Jar</name>
     <build>
@@ -34,28 +34,18 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-api</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-jasperreports</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-jfreechart</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts2</groupId>
-            <artifactId>action-pell-file-upload</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-extras</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>