diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java
index 83c0ac46f..01c0ab60f 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.transaction.Transactional;
 import javax.ws.rs.FormParam;
@@ -57,7 +56,6 @@ import javax.ws.rs.PathParam;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Controller
 @Path("/")
 @AuthoringStepPathFragment(CategorizationStep.PATH_FRAGMENT)
 @Named("CmsCategorizationStep")
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DefaultAuthoringStepConstants.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DefaultAuthoringStepConstants.java
index cc1dfbd27..8e2b6a240 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DefaultAuthoringStepConstants.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DefaultAuthoringStepConstants.java
@@ -34,6 +34,6 @@ public final class DefaultAuthoringStepConstants {
      * other localized resource of the default authoring steps.
      */
     public static final String BUNDLE
-        = "org.libreccms.ui.DefaultAuthoringStepsBundle";
+        = "org.librecms.ui.DefaultAuthoringStepsBundle";
 
 }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentController.java
index 9ab86454c..4a800879f 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentController.java
@@ -168,7 +168,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String redirectToDocumentFolders(
-        @PathParam("sectionIdentifider") final String sectionIdentifier
+        @PathParam("sectionIdentifier") final String sectionIdentifier
     ) {
         return String.format(
             "redirect:/%s/documentfolders/",
@@ -190,7 +190,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public MvcDocumentCreateStep<? extends ContentItem> createDocument(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentType") final String documentType
     ) {
         return createDocument(sectionIdentifier, "", documentType);
@@ -212,7 +212,7 @@ public class DocumentController {
     @Transactional(Transactional.TxType.REQUIRED)
     @SuppressWarnings("unchecked")
     public MvcDocumentCreateStep<? extends ContentItem> createDocument(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("folderPath") final String folderPath,
         @PathParam("documentType") final String documentType
     ) {
@@ -302,7 +302,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String editDocument(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath
     ) {
         final Optional<ContentSection> sectionResult = sectionsUi
@@ -352,7 +352,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public MvcAuthoringStep editDocument(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath,
         @PathParam("authoringStep") final String authoringStepIdentifier
     ) {
@@ -427,7 +427,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String showHistory(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath
     ) {
         final Optional<ContentSection> sectionResult = sectionsUi
@@ -485,7 +485,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String showPublishStep(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath
     ) {
         final Optional<ContentSection> sectionResult = sectionsUi
@@ -546,7 +546,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String publish(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath,
         @FormParam("selectedLifecycleUuid") @DefaultValue("")
         final String selectedLifecycleUuid
@@ -609,7 +609,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String republish(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath
     ) {
         final Optional<ContentSection> sectionResult = sectionsUi
@@ -654,7 +654,7 @@ public class DocumentController {
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String unpublish(
-        @PathParam("sectionIdentifider") final String sectionIdentifier,
+        @PathParam("sectionIdentifier") final String sectionIdentifier,
         @PathParam("documentPath") final String documentPath
     ) {
         final Optional<ContentSection> sectionResult = sectionsUi
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/PublishStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/PublishStep.java
index 9d26c0f43..4cb818d9e 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/PublishStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/PublishStep.java
@@ -40,7 +40,6 @@ import java.util.Optional;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.transaction.Transactional;
 import javax.ws.rs.FormParam;
@@ -55,7 +54,6 @@ import javax.ws.rs.Path;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Controller
 @Path("/")
 @AuthoringStepPathFragment(PublishStep.PATH_FRAGMENT)
 @Named("CmsPublishStep")
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/RelatedInfoStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/RelatedInfoStep.java
index ff23dfe3a..bafacf7f0 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/RelatedInfoStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/RelatedInfoStep.java
@@ -18,7 +18,6 @@
  */
 package org.librecms.ui.contentsections.documents;
 
-import com.arsdigita.kernel.KernelConfig;
 
 import org.libreccm.api.Identifier;
 import org.libreccm.api.IdentifierParser;
@@ -72,7 +71,6 @@ import java.util.stream.Collectors;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.transaction.Transactional;
 import javax.ws.rs.DefaultValue;
@@ -97,7 +95,6 @@ import javax.ws.rs.core.MediaType;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Controller
 @Path("/")
 @AuthoringStepPathFragment(RelatedInfoStep.PATH_FRAGMENT)
 @Named("CmsRelatedInfoStep")
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java
index 73d3006ad..552cf117a 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java
@@ -30,6 +30,6 @@ public final class ArticleStepsConstants {
     }
 
     public static final String BUNDLE
-        = "org.libreccms.ui.contenttypes.ArticleBundle";
+        = "org.librecms.ui.contenttypes.ArticleBundle";
 
 }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java
index 8f3adc0cb..7d8cccae0 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java
@@ -33,7 +33,6 @@ import org.librecms.ui.contentsections.documents.DocumentUi;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
-import javax.mvc.Controller;
 import javax.ws.rs.Path;
 
 import org.librecms.ui.contentsections.documents.MvcAuthoringStep;
@@ -56,7 +55,6 @@ import javax.ws.rs.PathParam;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Controller
 @Path("/")
 @AuthoringStepPathFragment(MvcArticlePropertiesStep.PATH_FRAGMENT)
 @Named("CmsArticlePropertiesStep")
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java
index 398817343..24f7fa455 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java
@@ -30,7 +30,6 @@ import org.librecms.ui.contentsections.ItemPermissionChecker;
 import org.librecms.ui.contentsections.documents.AuthoringStepPathFragment;
 import org.librecms.ui.contentsections.documents.DocumentUi;
 
-import javax.enterprise.context.RequestScoped;
 import javax.mvc.Controller;
 import javax.ws.rs.Path;
 
@@ -42,6 +41,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.ws.rs.FormParam;
@@ -54,7 +54,6 @@ import javax.ws.rs.PathParam;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Controller
 @Path("/")
 @AuthoringStepPathFragment(MvcArticleTextBodyStep.PATH_FRAGMENT)
 @Named("CmsArticleTextBodyStep")
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml
index a3112ab58..ffd030dcf 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml
@@ -63,7 +63,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item">
-                        <a href="/@cms/contentsections">
+                        <a href="/@cms">
                             #{CmsAdminMessages['contentsections.list.label']}
                         </a>
                     </li>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
index 3b297a4d8..cde5b6c6b 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
@@ -297,7 +297,7 @@
                                                                     id="rename-folder-#{row.name}-dialog-title">
                                                                     #{CmsAdminMessages.getMessage('contentsection.documentfolder.rename_folder_dialog.title', [row.folderPath])}
                                                                 </h2>
-                                                                <button aria-label="#{CmsMessages['contentsection.documentfolder.rename_folder_dialog.close']}" 
+                                                                <button aria-label="#{CmsAdminMessages['contentsection.documentfolder.rename_folder_dialog.close']}" 
                                                                         class="close" 
                                                                         data-dismiss="modal" 
                                                                         type="button" >
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
index 506bfc62b..9dcd04dde 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
@@ -35,7 +35,7 @@
                             <div class="modal-header">
                                 <h3 class="modal-title" 
                                     id="edit-categorization-#{tree.domainKey}-title">
-                                    #{CmsDefaultStepsMessageBundle.getMessage('categorization.edit.title', tree.domainKey, CmsCategorizationStep.contentItemTitle)}
+                                    #{CmsDefaultStepsMessageBundle.getMessage('categorization.edit.title', tree.domainKey, CmsSelectedDocumentModel.itemTitle)}
                                     <button aria-label="#{CmsDefaultStepsMessageBundle['categorization.edit.cancel']}"
                                             class="close"
                                             data-dismiss="modal"