diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
index fe0f847773..f9596bf37d 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
@@ -188,7 +188,7 @@
       <property name="kinds">
          <list>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </list>
       </property>
       <property name="conditions">
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 7aad8336d2..0cde4ca7b6 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
@@ -161,7 +161,7 @@
       <property name="kinds">
          <list>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </list>
       </property>
       <property name="conditions">
@@ -179,7 +179,7 @@
       <property name="kinds">
          <list>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </list>
       </property>
       <property name="conditions">
@@ -197,7 +197,7 @@
       <property name="kinds">
          <list>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </list>
       </property>
       <property name="conditions">
@@ -218,7 +218,7 @@
       <property name="kinds">
          <list>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </list>
       </property>
       <property name="conditions">
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
index 1bba238399..3071ca42dc 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
@@ -96,9 +96,8 @@
          <parent>rma:recordsManagementContainer</parent>
       </type>
 
-	  <!-- TODO rename to unfiledRecordFolder -->
-      <type name="rma:unfiledRecordContainerChild">
-         <title>Unfiled Record Container Child</title>
+      <type name="rma:unfiledRecordFolder">
+         <title>Unfiled Record Folder</title>
          <parent>rma:recordsManagementContainer</parent>
       </type>
 
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 3c3096b6bc..b3eb5bff5c 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -217,7 +217,7 @@
             <value>RECORD_CATEGORY</value>
             <value>RECORD_FOLDER</value>
             <value>RECORD</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
             <value>HOLD</value>
          </set>
       </property>
@@ -263,7 +263,7 @@
       <property name="kinds">
          <set>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </set>
       </property>
       <property name="capability" value="CopyUnfiledRecordFolder"/>
@@ -319,7 +319,7 @@
       <property name="kinds">
          <set>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
          </set>
       </property>
       <property name="capability" value="MoveUnfiledRecordsContainerFolder"/>
@@ -379,7 +379,7 @@
             <value>RECORD_CATEGORY</value>
             <value>RECORD_FOLDER</value>
             <value>RECORD</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
             <value>HOLD</value>
          </set>
       </property>
@@ -395,7 +395,7 @@
             <value>RECORD_CATEGORY</value>
             <value>RECORD_FOLDER</value>
             <value>UNFILED_RECORD_CONTAINER</value>
-            <value>UNFILED_RECORD_CONTAINER_CHILD</value>
+            <value>UNFILED_RECORD_FOLDER</value>
             <value>HOLD_CONTAINER</value>
             <value>HOLD</value>
          </set>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
index 0452585ad9..aa745985f6 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
@@ -38,5 +38,5 @@ public enum FilePlanComponentKind
     HOLD_CONTAINER,
     DISPOSITION_SCHEDULE,
     UNFILED_RECORD_CONTAINER,
-    UNFILED_RECORD_CONTAINER_CHILD;
+    UNFILED_RECORD_FOLDER;
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
index f8179d242c..b07518d500 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
@@ -234,9 +234,9 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
             {
                 result = FilePlanComponentKind.UNFILED_RECORD_CONTAINER;
             }
-            else if (instanceOf(nodeRef, TYPE_UNFILED_RECORD_CONTAINER_CHILD))
+            else if (instanceOf(nodeRef, TYPE_UNFILED_RECORD_FOLDER))
             {
-                result = FilePlanComponentKind.UNFILED_RECORD_CONTAINER_CHILD;
+                result = FilePlanComponentKind.UNFILED_RECORD_FOLDER;
             }
         }
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
index 47cbb317fe..2bf772f303 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
@@ -265,9 +265,9 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
                     result = "transfer-container";
                     break;
                 }
-                case UNFILED_RECORD_CONTAINER_CHILD:
+                case UNFILED_RECORD_FOLDER:
                 {
-                    result = "unfiled-record-container-child";
+                    result = "unfiled-record-folder";
                     break;
                 }
                 default:
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
index d6f418e7ce..47e24aca35 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
@@ -60,8 +60,8 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
     // Unfiled record container
     static final QName TYPE_UNFILED_RECORD_CONTAINER = QName.createQName(RM_URI, "unfiledRecordContainer");
 
-    // Unfiled record container child
-    static final QName TYPE_UNFILED_RECORD_CONTAINER_CHILD = QName.createQName(RM_URI, "unfiledRecordContainerChild");
+    // Unfiled record folder
+    static final QName TYPE_UNFILED_RECORD_FOLDER = QName.createQName(RM_URI, "unfiledRecordFolder");
 
     // Hold container
     static final QName TYPE_HOLD_CONTAINER = QName.createQName(RM_URI, "holdContainer");
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
index 1cd4e629d7..6ea25d733d 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
@@ -143,8 +143,8 @@ public class RecordsManagementContainerType extends    BaseBehaviourBean
                         QName parentType = nodeService.getType(parentRef);
                         boolean isContentSubType = dictionaryService.isSubClass(childType, ContentModel.TYPE_CONTENT);
                         boolean isUnfiledRecordContainer = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER);
-                        boolean isUnfiledRecordContainerChild = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER_CHILD);
-                        if (isContentSubType && (isUnfiledRecordContainer|| isUnfiledRecordContainerChild))
+                        boolean isUnfiledRecordFolder = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER);
+                        if (isContentSubType && (isUnfiledRecordContainer || isUnfiledRecordFolder))
                         {
                             if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT))
                             {