diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index 88b27e7d33..db0f4c8913 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -33,7 +33,6 @@
             <ref bean="rmCreateRecordFolderCapability"/>
             <ref bean="rmModifyRecordFolderCapability"/>
             <ref bean="rmDeleteRecordFolderCapability"/>
-            <!-- FIXME: Move to separate capability -->
             <ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
             <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
             <ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
@@ -43,23 +42,6 @@
       <property name="index" value="20" />
    </bean>
 
-   <!-- FIXME: Will be added as a separate capability
-   <bean id="rmCreateModifyDestroyUnfiledRecordsContainerFolderCapability"
-         parent="compositeCapability">
-      <property name="name" value="CreateModifyDestroyUnfiledRecordsContainer"/>
-      <property name="permission" value="CreateModifyDestroyFolders"/>
-      <property name="capabilities">
-         <list>
-            <ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
-            <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
-            <ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
-         </list>
-      </property>
-      <property name="group"><ref bean="folderControlGroup"/></property>
-      <property name="index" value="30" />
-   </bean>
-   -->
-
    <bean id="rmReOpenFoldersCapability"
       parent="declarativeCapability">
       <property name="name" value="ReOpenFolders"/>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java
index b4c4c76fb6..b3e201d098 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java
@@ -30,6 +30,7 @@ import java.util.UUID;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic;
+import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.service.cmr.dictionary.Constraint;
@@ -130,11 +131,14 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
 
     public RMConstraintInfo addRMConstraint(String listName, String title, String[] values, MatchLogic matchLogic)
     {
-        if(listName == null)
+        if (listName == null)
         {
             // Generate a list name
-            // FIXME: hardcoded namespace
-            listName = "rmc:" + UUID.randomUUID().toString();
+            StringBuilder sb = new StringBuilder();
+            sb.append(RecordsManagementCustomModel.RM_CUSTOM_PREFIX);
+            sb.append(QName.NAMESPACE_PREFIX);
+            sb.append(UUID.randomUUID().toString());
+            listName = sb.toString();
         }
 
         List<String>allowedValues = new ArrayList<String>();
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java
index 640093da54..42b884683a 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java
@@ -34,58 +34,6 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
  */
 public class CapabilityServiceImplTest extends BaseRMTestCase
 {
-    public void testGetCapability() throws Exception
-    {
-        doTestInTransaction(new Test<Void>()
-        {
-            @Override
-            public Void run() throws Exception
-            {
-                // FIXME
-                return null;
-            }
-        });
-    }
-
-    public void testGetCapabilities() throws Exception
-    {
-        doTestInTransaction(new Test<Void>()
-        {
-            @Override
-            public Void run() throws Exception
-            {
-                // FIXME
-                return null;
-            }
-        });
-    }
-
-    public void testGetCapabilityAccessState() throws Exception
-    {
-        doTestInTransaction(new Test<Void>()
-        {
-            @Override
-            public Void run() throws Exception
-            {
-                // FIXME
-                return null;
-            }
-        });
-    }
-
-    public void testGetCapabilitiesAccessState() throws Exception
-    {
-        doTestInTransaction(new Test<Void>()
-        {
-            @Override
-            public Void run() throws Exception
-            {
-                // FIXME
-                return null;
-            }
-        });
-    }
-
     public void testGetAddRemoveGroups() throws Exception
     {
         doTestInTransaction(new Test<Void>()