diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
index 4a78d6d26b..d4f99d3ebb 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
@@ -64,8 +64,8 @@
 
       <plugins>
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
          </plugin>
 
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/LICENSE b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/LICENSE
similarity index 100%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/LICENSE
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/LICENSE
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/NOTICE b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/NOTICE
similarity index 100%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/NOTICE
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/NOTICE
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/README b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/README
similarity index 78%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/README
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/README
index 8754eeae6e..c9c7c0ec85 100644
--- a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/README
+++ b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/README
@@ -6,8 +6,8 @@ To configure the project add the following to the SCA contribution's pom.xml:
       ...
       <plugins>
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
          </plugin>
       ...
       </plugins>
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml
similarity index 94%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml
index 8040a41a0b..35dcac229e 100644
--- a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml
+++ b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/pom.xml
@@ -26,8 +26,7 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.tuscany.maven.plugins</groupId>
-    <artifactId>maven-tuscany-plugin</artifactId>
+    <artifactId>tuscany-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Apache Tuscany Maven Tuscany Plugin</name>
     <version>2.0-SNAPSHOT</version>
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
similarity index 100%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
similarity index 100%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java
similarity index 100%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java
diff --git a/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java b/sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java
similarity index 100%
rename from sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java
rename to sca-java-2.x/trunk/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStopMojo.java
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index f0dd822c86..a75326cead 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -116,7 +116,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>maven/maven-tuscany-plugin</module>
+                <module>maven/tuscany-maven-plugin</module>
                 <module>modules</module>
                 <module>samples</module>
                 <module>testing/itest</module>
@@ -141,7 +141,7 @@
                 <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
             </properties>
             <modules>
-                <module>maven/maven-tuscany-plugin</module>
+                <module>maven/tuscany-maven-plugin</module>
                 <module>modules</module>
                 <module>samples</module>
                 <module>testing/itest</module>
@@ -230,7 +230,7 @@
         <profile>
             <id>distribution</id>
             <modules>
-                <module>maven/maven-tuscany-plugin</module>
+                <module>maven/tuscany-maven-plugin</module>
                 <module>modules</module>
                 <module>samples</module>
                 <module>testing/itest</module>
@@ -420,7 +420,7 @@
                 <buildZips>true</buildZips>
             </properties>
             <modules>
-                <module>maven/maven-tuscany-plugin</module>
+                <module>maven/tuscany-maven-plugin</module>
                 <module>modules</module>
                 <module>features</module>
                 <module>distribution</module>
@@ -687,7 +687,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac
             <configuration>
               <rules>
                 <requirePluginVersions>
-                   <unCheckedPluginList>org.apache.tuscany.maven.plugins:maven-tuscany-plugin</unCheckedPluginList>
+                   <unCheckedPluginList>org.apache.tuscany.sca:tuscany-maven-plugin</unCheckedPluginList>
                    <message>Best Practice is to always define released plugin versions!</message>
                    <banLatest>true</banLatest>
                    <banRelease>true</banRelease>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-ant/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-ant/pom.xml
index 24bcd2b110..eabfa7e8bf 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-ant/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-ant/pom.xml
@@ -68,8 +68,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
          </plugin>
       </plugins>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml
index 1ebb6432bb..a0da82d1d3 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml
@@ -77,8 +77,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
             <dependencies>
                <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml
index 0d0f9ce9b8..f8cc051e14 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-jaxrs/pom.xml
@@ -88,8 +88,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
             <dependencies>
                <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml
index 737b2f8735..8d193fd1a6 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-jsonrpc/pom.xml
@@ -81,8 +81,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
       <dependencies>
          <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml
index e4e42058dc..1f0638aead 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml
@@ -76,8 +76,8 @@
 
          <!-- to support running the application with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
             <configuration>
               <mainClass>sample.HelloworldSCAClient</mainClass>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml
index b49d845f5b..140e2c1221 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-spring/pom.xml
@@ -74,8 +74,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
             <dependencies>
                <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
index 4861185b50..8bb8d1e161 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
@@ -93,8 +93,8 @@
 
           <!-- to support running thw webapp with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
          </plugin>
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml
index e8e25fd204..7a5582b83a 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webservice/pom.xml
@@ -81,8 +81,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
             <dependencies>
                <dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml
index 7b80c1d72f..f0aac7c3fc 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml
@@ -67,8 +67,8 @@
 
          <!-- to support running the composite with mvn tuscany:run -->
          <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-tuscany-plugin</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
          </plugin>
       </plugins>