diff --git a/distribution/pom.xml b/distribution/pom.xml
index 5d824b869a..2a24c927fe 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2-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>
 
@@ -47,7 +47,7 @@
         <!-- Share Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-share-distribution</artifactId>
+            <artifactId>alfresco-content-services-share-distribution</artifactId>
             <version>${alfresco.share.version}</version>
             <type>zip</type>
             <exclusions>
@@ -94,7 +94,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-share-distribution</artifactId>
+                                    <artifactId>alfresco-content-services-share-distribution</artifactId>
                                     <version>${alfresco.share.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index a432329af8..ec4c83d42c 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>
 
@@ -42,7 +42,7 @@
 
         <!-- Share -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
             <outputDirectory/>
             <includes>
                 <include>web-server/**</include>
@@ -51,7 +51,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
             <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
         </fileSet>
     </fileSets>
diff --git a/ear/pom.xml b/ear/pom.xml
index 71a437df42..323b189e68 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>
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-share-distribution</artifactId>
+            <artifactId>alfresco-content-services-share-distribution</artifactId>
             <version>${alfresco.share.version}</version>
             <type>zip</type>
             <scope>provided</scope>
@@ -145,10 +145,16 @@
             <artifactId>jaxb-impl</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.2.11</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>2.2.12</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -222,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>
 
@@ -235,10 +241,10 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>alfresco-share-distribution</includeArtifactIds>
+                            <includeArtifactIds>alfresco-content-services-share-distribution</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <excludes>*</excludes>
-                            <includes>alfresco-share-distribution-${alfresco.share.version}/web-extension-samples/</includes>
+                            <includes>alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples/</includes>
                         </configuration>
                     </execution>
 
@@ -256,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..e800040508 100644
--- a/ear/src/assembly/ear-distribution.xml
+++ b/ear/src/assembly/ear-distribution.xml
@@ -8,18 +8,18 @@
 
     <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>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
             <outputDirectory>web-server/classpath/alfresco/web-extension</outputDirectory>
         </fileSet>
     </fileSets>
@@ -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 87942d86bd..155a29d26c 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2-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>
@@ -47,7 +47,7 @@
         <!-- Share Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-share-distribution</artifactId>
+            <artifactId>alfresco-content-services-share-distribution</artifactId>
             <version>${alfresco.share.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>
@@ -94,7 +94,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-share-distribution</artifactId>
+                                    <artifactId>alfresco-content-services-share-distribution</artifactId>
                                     <version>${alfresco.share.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
diff --git a/enterprise-distribution/src/main/resources/README.txt b/enterprise-distribution/src/main/resources/README.txt
index 7091aa83ca..66e5741715 100644
--- a/enterprise-distribution/src/main/resources/README.txt
+++ b/enterprise-distribution/src/main/resources/README.txt
@@ -1,8 +1,8 @@
-Alfresco One (Build: ${installer.version.name})
-===============================
+Alfresco Content Services (Build: ${installer.version.name})
+==============================================
 
 Contains:
-	- Alfresco One Platform:	${alfresco.platform.version}
-	- Alfresco One Share:		${alfresco.share.version}
+	- Alfresco Content Services Platform:	${alfresco.platform.version}
+	- Alfresco Content Services Share:		${alfresco.share.version}
 
 See the Alfresco Support Portal (http://support.alfresco.com) for release notes and detailed information on this release.
diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index 15adf6f5db..2571e99ad9 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-one-installer</artifactId>
+    <artifactId>alfresco-content-services-installer</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Enterprise Full Installers</name>
 
@@ -17,7 +17,7 @@
         <license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location>
         <bitrock.arguments>
            project.version=${installer.version.name} 
-           project.fullName='Alfresco One' 
+           project.fullName='Alfresco Content Services' 
            project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12 
            project.osxSigningPkcs12Password=${p12Password} 
            project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 
@@ -31,8 +31,8 @@
         </bitrock.arguments>
 
         <!-- 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.package.name>alfresco-content-services</alfresco.package.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/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
index f4e7cd5b15..8f351422dc 100644
--- a/enterprise-war-for-ear/pom.xml
+++ b/enterprise-war-for-ear/pom.xml
@@ -50,6 +50,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
+                    <useCache>true</useCache>
                     <overlays>
                         <overlay>
                             <groupId>org.alfresco</groupId>
@@ -67,6 +68,12 @@
                             <type>amp</type>
                         </overlay>
                     </overlays>
+                    <archive>
+                        <manifestEntries>
+                            <!-- WebSphere property -->
+                            <DisableIBMJAXWSEngine>true</DisableIBMJAXWSEngine>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/installer/pom.xml b/installer/pom.xml
index 21c50b9c7e..db18687a89 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>alfresco-full-installation</artifactId>
         <version>5.2-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 c44489c3e5..b679dff34f 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>