diff --git a/distribution/pom.xml b/distribution/pom.xml
index 14c824b05b..cb3f7287a6 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2.1-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-community-distribution</artifactId>
+    <artifactId>alfresco-content-services-community-distribution</artifactId>
     <packaging>jar</packaging>
     <name>Alfresco Full Distribution (Community Edition)</name>
 
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index a432329af8..badca5ce46 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -20,7 +20,7 @@
 
         <!-- Platform Enterprise Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
             <outputDirectory/>
         </fileSet>
 
diff --git a/ear/pom.xml b/ear/pom.xml
index 614efd107e..e1b3923ae1 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -53,7 +53,7 @@
         <!-- Distribution zip -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-one-platform-distributionzip</artifactId>
+            <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
             <version>${alfresco.platform.version}</version>
             <type>zip</type>
             <scope>provided</scope>
@@ -228,9 +228,9 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>alfresco-one-platform-distributionzip</includeArtifactIds>
+                            <includeArtifactIds>alfresco-content-services-platform-distributionzip</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
-                            <excludes>alfresco-one-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/modules/</excludes>
+                            <excludes>alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/modules/</excludes>
                         </configuration>
                     </execution>
 
@@ -262,7 +262,7 @@
                                     <version>1.0.1</version>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory>
+                            <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml
index 6cd5bda5b8..efe3f8711e 100644
--- a/ear/src/assembly/ear-distribution.xml
+++ b/ear/src/assembly/ear-distribution.xml
@@ -8,14 +8,14 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
             <outputDirectory/>
             <excludes>
                 <exclude>web-server/shared/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
             <outputDirectory>web-server/classpath</outputDirectory>
         </fileSet>
         <fileSet>
@@ -30,7 +30,7 @@
         </file>
         <file>
             <source>${project.build.directory}/alfresco-ear-distribution-${project.version}.ear</source>
-            <destName>alfresco-one-${project.version}.ear</destName>
+            <destName>alfresco-content-services-${project.version}.ear</destName>
         </file>
     </files>
 </assembly>
diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml
index ef2cf434ce..34469fdbf6 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2.1-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-one-distribution</artifactId>
+    <artifactId>alfresco-content-services-distribution</artifactId>
     <packaging>jar</packaging>
     <name>Alfresco Full Distribution (Enterprise Edition)</name>
 
@@ -19,7 +19,7 @@
         <!-- Platform Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-one-platform-distributionzip</artifactId>
+            <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
             <version>${alfresco.platform.version}</version>
             <type>zip</type>
             <exclusions>
@@ -81,7 +81,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-one-platform-distributionzip</artifactId>
+                                    <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
                                     <version>${alfresco.platform.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index 26fdf99118..0890d5a58b 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2.1-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-one-installer</artifactId>
+    <artifactId>alfresco-content-services-installer</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Enterprise Full Installers</name>
 
@@ -32,7 +32,7 @@
 
         <!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
         <alfresco.package.name>alfresco-one</alfresco.package.name>
-        <alfresco.distribution.name>alfresco-one-distribution</alfresco.distribution.name>
+        <alfresco.distribution.name>alfresco-content-services-distribution</alfresco.distribution.name>
 
         <!-- 
         Override alfresco.installer.name for the Enterprise installer that is still using 
@@ -45,7 +45,7 @@
         <!-- Import the dependencies from the Community installer -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-community-installer</artifactId>
+            <artifactId>alfresco-content-services-community-installer</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
@@ -73,13 +73,13 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-one-installer-resources</artifactId>
+                                    <artifactId>alfresco-content-services-installer-resources</artifactId>
                                     <version>${alfresco.platform.version}</version>
                                     <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-one-distribution</artifactId>
+                                    <artifactId>alfresco-content-services-distribution</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/distribution</outputDirectory>
diff --git a/installer/pom.xml b/installer/pom.xml
index 57b2ac3013..8b079d195b 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2.1-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-community-installer</artifactId>
+    <artifactId>alfresco-content-services-community-installer</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Community Full Installers</name>
 
@@ -302,7 +302,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-community-distribution</artifactId>
+                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/distribution</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 47f87e1577..eb4143e9da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         -->
         <installer.version.name>${installer.build.timestamp}-${installer.build.number}</installer.version.name>
 
-        <alfresco.package.name>alfresco-community</alfresco.package.name>
+        <alfresco.package.name>alfresco-content-services-community</alfresco.package.name>
         <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
     </properties>