diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 4937f3a39c..41a02bd045 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1414,7 +1414,7 @@
         <property name="importerService" ref="ImporterService"/>
         <property name="searchService" ref="SearchService"/>
         <property name="nodeService" ref="NodeService"/>
-        <property name="recordsManagementService" ref="RecordsManagementService"/>
+        <property name="filePlanService" ref="FilePlanService"/>
         <property name="permissionService" ref="PermissionService"/>
         <property name="authorityService" ref="AuthorityService"/>
         <property name="filePlanRoleService" ref="FilePlanRoleService"/>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
index f279699c9e..03c4f61460 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
@@ -11,15 +11,15 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
+import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RecordsManagementSearchBehaviour;
 import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderServiceImpl;
@@ -69,8 +69,8 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
     /** Node service */
     private NodeService nodeService;
 
-    /** Records management service */
-    private RecordsManagementService recordsManagementService;
+    /** File plan service service */
+    private FilePlanService filePlanService;
 
     /** Permission service */
     private PermissionService permissionService;
@@ -130,13 +130,13 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
     }
 
     /**
-     * Set records management service
+     * Set file plan service
      *
-     * @param recordsManagementService the records management service
+     * @param filePlanService the file plan service
      */
-    public void setRecordsManagementService(RecordsManagementService recordsManagementService)
+    public void setFilePlanService(FilePlanService filePlanService)
     {
-        this.recordsManagementService = recordsManagementService;
+        this.filePlanService = filePlanService;
     }
 
     /**
@@ -358,7 +358,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
         {
             public Object doWork() throws Exception
             {
-                java.util.List<NodeRef> rmRoots = recordsManagementService.getFilePlans();
+                Set<NodeRef> rmRoots = filePlanService.getFilePlans();
                 logger.info("Bootstraping " + rmRoots.size() + " rm roots ...");
                 for (NodeRef rmRoot : rmRoots)
                 {
@@ -368,7 +368,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
                         permissionService.setInheritParentPermissions(rmRoot, false);
                     }
 
-                    String allRoleShortName = "AllRoles" + rmRoot.getId();
+                    String allRoleShortName = RMAuthority.ALL_ROLES_PREFIX + rmRoot.getId();
                     String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName);
 
                     if (authorityService.authorityExists(allRoleGroupName) == false)
@@ -377,7 +377,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
 
                         // Create "all" role group for root node
                         String allRoles = authorityService.createAuthority(AuthorityType.GROUP, allRoleShortName,
-                                "All Roles", new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM)));
+                                RMAuthority.ALL_ROLES_DISPLAY_NAME, new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM)));
 
                         // Put all the role groups in it
                         Set<Role> roles = filePlanRoleService.getRoles(rmRoot);
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
index d370c59b34..8b4fb31eb2 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
@@ -29,7 +29,6 @@ import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.security.authority.RMAuthority;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AuthorityService;
-import org.alfresco.service.cmr.security.AuthorityType;
 import org.springframework.beans.factory.BeanNameAware;
 
 /**
@@ -73,8 +72,8 @@ public class RMv21RolesPatch extends AbstractModuleComponent implements BeanName
                 addAuthorityToZone(roleGroupName);
                 if (parentAddedToZone == false)
                 {
-                    String allRolesGroup = authorityService.getName(AuthorityType.GROUP, "AllRoles" + filePlan.getId());
-                    addAuthorityToZone(allRolesGroup);
+                    String allRolesGroupName = filePlanRoleService.getAllRolesContainerGroup(filePlan);
+                    addAuthorityToZone(allRolesGroupName);
                     parentAddedToZone = true;
                 }
             }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
index 4d8b7f5f8f..311012abe1 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
@@ -247,7 +247,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
      */
     private String getAllRolesGroupShortName(NodeRef rmRootNode)
     {
-        return "AllRoles" + rmRootNode.getId();
+        return RMAuthority.ALL_ROLES_PREFIX + rmRootNode.getId();
     }
 
     /**
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
index 3738580214..845b15bb58 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
@@ -253,7 +253,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
                         permissionService.setInheritParentPermissions(rmRoot, false);
                     }
 
-                    String allRoleShortName = "AllRoles" + rmRoot.getId();
+                    String allRoleShortName = RMAuthority.ALL_ROLES_PREFIX + rmRoot.getId();
                     String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName);
 
                     if (authorityService.authorityExists(allRoleGroupName) == false)
@@ -263,7 +263,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
                         // Create "all" role group for root node
                         String allRoles = authorityService.createAuthority(AuthorityType.GROUP,
                                                                            allRoleShortName,
-                                                                           "All Roles",
+                                                                           RMAuthority.ALL_ROLES_DISPLAY_NAME,
                                                                            new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM)));
 
                         // Put all the role groups in it
diff --git a/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java b/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java
index db8106a536..39cb198164 100644
--- a/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java
+++ b/rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java
@@ -30,4 +30,14 @@ public interface RMAuthority
      * The default rm zone.
      */
     public static String ZONE_APP_RM = "APP.RM";
+
+    /**
+     * The constant for all roles display name
+     */
+    public static String ALL_ROLES_DISPLAY_NAME = "All Roles";
+
+    /**
+     * The constant for all roles prefix
+     */
+    public static String ALL_ROLES_PREFIX = "AllRoles";
 }