diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationDocumentTypesController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationDocumentTypesController.java
index cc5c54456..bade32f9c 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationDocumentTypesController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationDocumentTypesController.java
@@ -180,7 +180,7 @@ public class ConfigurationDocumentTypesController {
                 .collect(
                     Collectors.toMap(
                         model -> model.getContentItemClass(),
-                        model -> model
+                        model -> model.getLabel()
                     )
                 )
         );
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentTypesModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentTypesModel.java
index 265dbef81..1388b756f 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentTypesModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentTypesModel.java
@@ -47,7 +47,7 @@ public class DocumentTypesModel {
     /**
      * The available types thare are not assigned to the content section.
      */
-    private Map<String, DocumentTypeInfoModel> availableTypes;
+    private Map<String, String> availableTypes;
 
     /**
      * The available lifecycles definitions.
@@ -69,13 +69,11 @@ public class DocumentTypesModel {
         this.assignedTypes = new ArrayList<>(assignedTypes);
     }
 
-    public Map<String, DocumentTypeInfoModel> getAvailableTypes() {
+    public Map<String, String> getAvailableTypes() {
         return Collections.unmodifiableMap(availableTypes);
     }
 
-    public void setAvailableTypes(
-        final Map<String, DocumentTypeInfoModel> availableTypes
-    ) {
+    public void setAvailableTypes(final Map<String, String> availableTypes) {
         this.availableTypes = new HashMap<>(availableTypes);
     }