diff --git a/pom.xml b/pom.xml
index f0176f8b50..f112341dc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,10 @@
 
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.alfresco</groupId>
-   <artifactId>alfresco-rm</artifactId>
+   <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
    <version>3.1.0-SNAPSHOT</version>
-   <name>Alfresco Records Management</name>
+   <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>
    <inceptionYear>2005</inceptionYear>
@@ -587,14 +587,14 @@
                   <configuration>
                      <regexPropertySettings>
                         <regexPropertySetting>
-                           <name>rm.module.repo.version.min</name>
+                           <name>ags.module.repo.version.min</name>
                            <value>${alfresco.version}</value>
                            <regex>(\d+)\.(\d+).*</regex>
                            <replacement>$1.$2</replacement>
                            <failIfNoMatch>false</failIfNoMatch>
                         </regexPropertySetting>
                         <regexPropertySetting>
-                           <name>rm.module.version</name>
+                           <name>ags.module.version</name>
                            <value>${project.version}</value>
                            <regex>([0-9\.]*[0-9]).*</regex>
                            <replacement>$1</replacement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index b4d9b7d2a7..508456a569 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-automation</artifactId>
-   <name>Alfresco Records Management Automation</name>
+   <artifactId>alfresco-governance-services-automation</artifactId>
+   <name>Alfresco Governance Services Automation</name>
    <packaging>pom</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm</artifactId>
+      <artifactId>alfresco-governance-services</artifactId>
       <version>3.1.0-SNAPSHOT</version>
    </parent>
 
@@ -131,7 +131,7 @@
          </build>
       </profile>
       <profile>
-         <id>apply-rm-community</id>
+         <id>apply-ags-community</id>
          <build>
             <plugins>
                <plugin>
@@ -147,13 +147,13 @@
                            <artifactItems>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-share</artifactId>
+                                 <artifactId>alfresco-governance-services-community-share</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-repo</artifactId>
+                                 <artifactId>alfresco-governance-services-community-repo</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
@@ -178,7 +178,7 @@
                         <configuration>
                            <backup>true</backup>
                            <ampLocation>
-                              ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp
+                              ${project.build.directory}/amps/alfresco-governance-services-community-repo-${project.version}.amp
                            </ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
                            </warLocation>
@@ -193,7 +193,7 @@
                         <configuration>
                            <backup>true</backup>
                            <ampLocation>
-                              ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp
+                              ${project.build.directory}/amps/alfresco-governance-services-community-share-${project.version}.amp
                            </ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war
                            </warLocation>
@@ -205,7 +205,7 @@
          </build>
       </profile>
       <profile>
-         <id>apply-rm-enterprise</id>
+         <id>apply-ags-enterprise</id>
          <build>
             <plugins>
                <plugin>
@@ -221,13 +221,13 @@
                            <artifactItems>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>${alfresco.rm.share}</artifactId>
+                                 <artifactId>${ags.share}</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>${alfresco.rm.repo}</artifactId>
+                                 <artifactId>${ags.repo}</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
@@ -251,7 +251,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                            <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/${alfresco.rm.repo}-${project.version}.amp</ampLocation>
+                           <ampLocation>${project.build.directory}/amps/${ags.repo}-${project.version}.amp</ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
                         </configuration>
                      </execution>
@@ -263,7 +263,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                            <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/${alfresco.rm.share}-${project.version}.amp</ampLocation>
+                           <ampLocation>${project.build.directory}/amps/${ags.share}-${project.version}.amp</ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
                         </configuration>
                      </execution>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index e30c8556d0..20ba6c376f 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -2,19 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-automation-community-rest-api</artifactId>
-   <name>Alfresco Records Management Automation Community REST API</name>
+   <artifactId>alfresco-governance-services-automation-community-rest-api</artifactId>
+   <name>Alfresco Governance Services Automation Community REST API</name>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-automation</artifactId>
+      <artifactId>alfresco-governance-services-automation</artifactId>
       <version>3.1.0-SNAPSHOT</version>
    </parent>
 
    <properties>
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
-      <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
-      <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
+      <ags.share>alfresco-governance-services-community-share</ags.share>
+      <ags.repo>alfresco-governance-services-community-repo</ags.repo>
       <tas.restapi.version>5.2.0-10</tas.restapi.version>
       <fluent.json.version>2.0.0</fluent.json.version>
    </properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index ef69cfc74c..d1b26aee53 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-community</artifactId>
-   <name>Alfresco Records Management Community</name>
+   <artifactId>alfresco-governance-services-community</artifactId>
+   <name>Alfresco Governance Services Community</name>
    <packaging>pom</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm</artifactId>
+      <artifactId>alfresco-governance-services</artifactId>
       <version>3.1.0-SNAPSHOT</version>
    </parent>
 
diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index a3b7b72169..aca25a856e 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,9 +1,9 @@
 FROM alfresco/alfresco-content-repository-community:6.0.7-ga
 
-COPY target/alfresco-rm-community-repo-*.amp /usr/local/tomcat/amps/
+COPY target/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/amps/
 
 RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
-              /usr/local/tomcat/amps/alfresco-rm-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup
+              /usr/local/tomcat/amps/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup
 
 ### Copy gs-api-explorer war into webapps folder
 COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
index d62b2ea187..65ddc9bcdd 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
@@ -6,5 +6,5 @@ module.aliases=org_alfresco_module_dod5015
 
 module.title=AGS Repo
 module.description=Alfresco Governance Services Repository Extension
-module.version=${rm.module.version}
-module.repo.version.min=${rm.module.repo.version.min}
\ No newline at end of file
+module.version=${ags.module.version}
+module.repo.version.min=${ags.module.repo.version.min}
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index cb2cfec855..9e05d0758d 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-community-repo</artifactId>
+   <artifactId>alfresco-governance-services-community-repo</artifactId>
    <name>AGS Repo</name>
    <description>Alfresco Governance Services Repository Extension</description>
    <packaging>amp</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-community</artifactId>
+      <artifactId>alfresco-governance-services-community</artifactId>
       <version>3.1.0-SNAPSHOT</version>
    </parent>
 
@@ -23,7 +23,7 @@
       <alfresco.test.db.name>alfresco-test</alfresco.test.db.name>
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
-      <alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
+      <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
       <skip.integrationtests>true</skip.integrationtests>
 
       <!-- 6.0 changes -->
@@ -223,7 +223,7 @@
                         </artifactItem>
                         <artifactItem>
                            <groupId>org.alfresco</groupId>
-                           <artifactId>alfresco-rm-community-rest-api-explorer</artifactId>
+                           <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
                            <version>${project.version}</version>
                            <type>war</type>
                            <destFileName>gs-api-explorer-${project.version}.war</destFileName>
@@ -257,7 +257,7 @@
             <artifactId>alfresco-maven-plugin</artifactId>
             <executions>
                <execution>
-                  <id>attach-rm-jar</id>
+                  <id>attach-alfresco-governance-services-jar</id>
                   <goals>
                      <goal>amp</goal>
                   </goals>
@@ -585,7 +585,7 @@
                               </webapp>
                               <webapp>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-rest-api-explorer</artifactId>
+                                 <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
                                  <version>${project.version}</version>
                                  <contextPath>/gs-api-explorer</contextPath>
                                  <type>war</type>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index 46b32f4100..cda7507d96 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>alfresco-rm-community-rest-api-explorer</artifactId>
-  <name>Alfresco Records Management Community REST API Explorer</name>
+  <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
+  <name>Alfresco Governance Services Community REST API Explorer</name>
   <packaging>war</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-community</artifactId>
+      <artifactId>alfresco-governance-services-community</artifactId>
       <version>3.1.0-SNAPSHOT</version>
    </parent>