diff --git a/archetype/pom.xml b/archetype/pom.xml
index e29cfc1dc..8f5295b2c 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -3,7 +3,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.struts.action2</groupId>
-  <artifactId>saf2-archetype-quickstart</artifactId>
+  <artifactId>struts2-archetype-quickstart</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 </project>
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index b01a5b929..aa68007fa 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -21,12 +21,12 @@
 
 		<!--  SAF2 -->
 		<dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>struts-core</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>struts-extras</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
diff --git a/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java b/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java
index 0cffea56e..f961ce4b0 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java
+++ b/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.struts.action2.util.StrutsTypeConverter;
+import org.apache.struts2.util.StrutsTypeConverter;
 
 import java.text.SimpleDateFormat;
 import java.text.ParseException;
diff --git a/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
index d9e248641..468deb370 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ b/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger = DEBUG, stdout
 
 log4j.category.com.opensymphony.webwork=DEBUG
 log4j.category.com.opensymphony.sitemesh=DEBUG
-log4j.category.org.apache.struts.action2=DEBUG
+log4j.category.org.apache.struts2=DEBUG
 log4j.category.org.apache=INFO
 log4j.category.catalia=INFO
 
diff --git a/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties b/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties
index 28e88d1de..2ddd0aafc 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties
+++ b/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties
@@ -5,9 +5,9 @@
 ###
 
 ### Specifies the Configuration used to configure Struts Action 2.0
-### one could extend org.apache.struts.action2.config.Configuration
+### one could extend org.apache.struts2.config.Configuration
 ### to build one's customize way of getting the configurations parameters into Struts Action 2.0
-# struts.configuration=org.apache.struts.action2.config.DefaultConfiguration
+# struts.configuration=org.apache.struts2.config.DefaultConfiguration
 
 ### This can be used to set your default locale and encoding scheme
 # struts.locale=en_US
@@ -48,7 +48,7 @@ struts.multipart.maxSize=2097152
 # struts.custom.properties=application,com/webwork/extension/custom
 
 ### How request URLs are mapped to and from actions
-struts.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper
+struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
 
 ### Used by the DefaultActionMapper
 ### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do
@@ -122,8 +122,8 @@ struts.dispatcher.parametersWorkaround = false
 
 ### configure the Freemarker Manager class to be used
 ### Allows user to plug-in customised Freemarker Manager if necessary
-### MUST extends off org.apache.struts.action2.views.freemarker.FreemarkerManager
-#struts.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager
+### MUST extends off org.apache.struts2.views.freemarker.FreemarkerManager
+#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager
 
 ### See the StrutsBeanWrapper javadocs for more information
 struts.freemarker.wrapper.altMap=true
diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml
index 9c5960e11..2ea05f7ed 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml
+++ b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml
@@ -6,7 +6,7 @@
 <dwr>
     <allow>
         <create creator="new" javascript="validator">
-            <param name="class" value="org.apache.struts.action2.validators.DWRValidator"/>
+            <param name="class" value="org.apache.struts2.validators.DWRValidator"/>
         </create>
         <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
     </allow>
@@ -14,7 +14,7 @@
     <signatures>
         <![CDATA[
         import java.util.Map;
-        import org.apache.struts.action2.validators.DWRValidator;
+        import org.apache.struts2.validators.DWRValidator;
 
         DWRValidator.doPost(String, String, Map<String, String>);
         ]]>
diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 43c70c555..996bb7f58 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,11 @@
 	<!-- Filters -->
 	<filter>
         <filter-name>action2-cleanup</filter-name>
-        <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
     </filter>
     <filter>
         <filter-name>sitemesh</filter-name>
-        <filter-class>org.apache.struts.action2.sitemesh.FreeMarkerPageFilter</filter-class>
+        <filter-class>org.apache.struts2.sitemesh.FreeMarkerPageFilter</filter-class>
     </filter>
     <!--  
     <filter>
@@ -23,7 +23,7 @@
     -->
     <filter>
         <filter-name>action2</filter-name>
-        <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 	
 	<filter-mapping>
diff --git a/pom.xml b/pom.xml
index 2d463727d..b94a78a24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,19 +30,19 @@
    </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <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>
     <packaging>pom</packaging>
-    <name>Struts Action 2</name>
-    <url>http://struts.apache.org/struts-action2</url>
+    <name>Struts 2</name>
+    <url>http://struts.apache.org/struts2</url>
     <description>Apache Struts Action Framework 2</description>
 
     <inceptionYear>2006</inceptionYear>
 
     <!--
     <description>
-        Struts Action 2 is a Java web-application development framework.
+        Struts 2 is a Java web-application development framework.
         It is built specifically with developer productivity and
         code simplicity in mind, providing robust support for building
         reusable UI templates, such as form controls, UI themes,
@@ -52,9 +52,9 @@
     -->
     
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/action2/trunk</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/action2/trunk</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/action2/trunk</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk</url>
     </scm>
 
     <issueManagement>
@@ -71,7 +71,7 @@
         </repository>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/</url>
+            <url>scp://people.apache.org/www/struts.apache.org/struts2/</url>
         </site>
     </distributionManagement>
 
diff --git a/src/main/idea/workspace.xml b/src/main/idea/workspace.xml
index e71761dee..9899d06c7 100644
--- a/src/main/idea/workspace.xml
+++ b/src/main/idea/workspace.xml
@@ -50,7 +50,7 @@
             <module name="struts-core"/>
             <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
             <option name="ALTERNATIVE_JRE_PATH" value=""/>
-            <option name="PACKAGE_NAME" value="org.apache.struts.action2"/>
+            <option name="PACKAGE_NAME" value="org.apache.struts2"/>
             <option name="MAIN_CLASS_NAME" value=""/>
             <option name="METHOD_NAME" value=""/>
             <option name="TEST_OBJECT" value="package"/>
@@ -66,7 +66,7 @@
         </configuration>
         <configuration selected="true" default="false" name="Struts Showcase" type="Application"
                        factoryName="Application">
-            <option name="MAIN_CLASS_NAME" value="org.apache.struts.action2.Main"/>
+            <option name="MAIN_CLASS_NAME" value="org.apache.struts2.Main"/>
             <option name="VM_PARAMETERS" value=""/>
             <option name="PROGRAM_PARAMETERS" value="quickstart"/>
             <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/apps/showcase"/>
diff --git a/uber/pom.xml b/uber/pom.xml
index 0ba581d2b..22ecdbe67 100644
--- a/uber/pom.xml
+++ b/uber/pom.xml
@@ -3,11 +3,11 @@
          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>
+        <groupId>org.apache.struts2</groupId>
         <artifactId>struts-action2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts.action2</groupId>
+    <groupId>org.apache.struts2</groupId>
     <artifactId>action-all</artifactId>
     <packaging>pom</packaging>
     <name>Uber Jar</name>
@@ -34,27 +34,27 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>action-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>action</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>action-jasperreports</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>action-jfreechart</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.struts.action2</groupId>
+            <groupId>org.apache.struts2</groupId>
             <artifactId>action-pell-file-upload</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/uber/src/assemble/main.xml b/uber/src/assemble/main.xml
index 7a9642460..c9395c6af 100644
--- a/uber/src/assemble/main.xml
+++ b/uber/src/assemble/main.xml
@@ -7,11 +7,11 @@
     <dependencySet>
       <outputDirectory>/</outputDirectory>
       <includes>
-          <include>org.apache.struts.action2:action</include>
-          <include>org.apache.struts.action2:action-api</include>
-          <include>org.apache.struts.action2:action-jasperreports</include>
-          <include>org.apache.struts.action2:action-jfreechart</include>
-          <include>org.apache.struts.action2:action-pell-file-upload</include>
+          <include>org.apache.struts2:action</include>
+          <include>org.apache.struts2:action-api</include>
+          <include>org.apache.struts2:action-jasperreports</include>
+          <include>org.apache.struts2:action-jfreechart</include>
+          <include>org.apache.struts2:action-pell-file-upload</include>
       </includes>
       <unpack>true</unpack>
       <scope>test</scope>