diff --git a/config/alfresco/messages/action-config_nb_NO.properties b/config/alfresco/messages/action-config_nb.properties
similarity index 100%
rename from config/alfresco/messages/action-config_nb_NO.properties
rename to config/alfresco/messages/action-config_nb.properties
diff --git a/config/alfresco/messages/action-service_nb_NO.properties b/config/alfresco/messages/action-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/action-service_nb_NO.properties
rename to config/alfresco/messages/action-service_nb.properties
diff --git a/config/alfresco/messages/activiti-engine-messages_nb_NO.properties b/config/alfresco/messages/activiti-engine-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/activiti-engine-messages_nb_NO.properties
rename to config/alfresco/messages/activiti-engine-messages_nb.properties
diff --git a/config/alfresco/messages/activities-service_nb_NO.properties b/config/alfresco/messages/activities-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/activities-service_nb_NO.properties
rename to config/alfresco/messages/activities-service_nb.properties
diff --git a/config/alfresco/messages/activity-list_nb_NO.properties b/config/alfresco/messages/activity-list_nb.properties
similarity index 100%
rename from config/alfresco/messages/activity-list_nb_NO.properties
rename to config/alfresco/messages/activity-list_nb.properties
diff --git a/config/alfresco/messages/application-model_nb_NO.properties b/config/alfresco/messages/application-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/application-model_nb_NO.properties
rename to config/alfresco/messages/application-model_nb.properties
diff --git a/config/alfresco/messages/authentication_nb_NO.properties b/config/alfresco/messages/authentication_nb.properties
similarity index 100%
rename from config/alfresco/messages/authentication_nb_NO.properties
rename to config/alfresco/messages/authentication_nb.properties
diff --git a/config/alfresco/messages/avm-messages_nb_NO.properties b/config/alfresco/messages/avm-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/avm-messages_nb_NO.properties
rename to config/alfresco/messages/avm-messages_nb.properties
diff --git a/config/alfresco/messages/bootstrap-content-template-examples_nb_NO.properties b/config/alfresco/messages/bootstrap-content-template-examples_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-content-template-examples_nb_NO.properties
rename to config/alfresco/messages/bootstrap-content-template-examples_nb.properties
diff --git a/config/alfresco/messages/bootstrap-example-javascripts_nb_NO.properties b/config/alfresco/messages/bootstrap-example-javascripts_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-example-javascripts_nb_NO.properties
rename to config/alfresco/messages/bootstrap-example-javascripts_nb.properties
diff --git a/config/alfresco/messages/bootstrap-imapScripts_nb_NO.properties b/config/alfresco/messages/bootstrap-imapScripts_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-imapScripts_nb_NO.properties
rename to config/alfresco/messages/bootstrap-imapScripts_nb.properties
diff --git a/config/alfresco/messages/bootstrap-javascripts_nb_NO.properties b/config/alfresco/messages/bootstrap-javascripts_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-javascripts_nb_NO.properties
rename to config/alfresco/messages/bootstrap-javascripts_nb.properties
diff --git a/config/alfresco/messages/bootstrap-readme-template_nb_NO.properties b/config/alfresco/messages/bootstrap-readme-template_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-readme-template_nb_NO.properties
rename to config/alfresco/messages/bootstrap-readme-template_nb.properties
diff --git a/config/alfresco/messages/bootstrap-spaces_nb_NO.properties b/config/alfresco/messages/bootstrap-spaces_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-spaces_nb_NO.properties
rename to config/alfresco/messages/bootstrap-spaces_nb.properties
diff --git a/config/alfresco/messages/bootstrap-templates_nb_NO.properties b/config/alfresco/messages/bootstrap-templates_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-templates_nb_NO.properties
rename to config/alfresco/messages/bootstrap-templates_nb.properties
diff --git a/config/alfresco/messages/bootstrap-tutorial_nb_NO.properties b/config/alfresco/messages/bootstrap-tutorial_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-tutorial_nb_NO.properties
rename to config/alfresco/messages/bootstrap-tutorial_nb.properties
diff --git a/config/alfresco/messages/bootstrap-webScriptsExtensions_nb_NO.properties b/config/alfresco/messages/bootstrap-webScriptsExtensions_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-webScriptsExtensions_nb_NO.properties
rename to config/alfresco/messages/bootstrap-webScriptsExtensions_nb.properties
diff --git a/config/alfresco/messages/bootstrap-webScripts_nb_NO.properties b/config/alfresco/messages/bootstrap-webScripts_nb.properties
similarity index 100%
rename from config/alfresco/messages/bootstrap-webScripts_nb_NO.properties
rename to config/alfresco/messages/bootstrap-webScripts_nb.properties
diff --git a/config/alfresco/messages/bpm-messages_nb_NO.properties b/config/alfresco/messages/bpm-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/bpm-messages_nb_NO.properties
rename to config/alfresco/messages/bpm-messages_nb.properties
diff --git a/config/alfresco/messages/categories_nb_NO.properties b/config/alfresco/messages/categories_nb.properties
similarity index 100%
rename from config/alfresco/messages/categories_nb_NO.properties
rename to config/alfresco/messages/categories_nb.properties
diff --git a/config/alfresco/messages/coci-service_nb_NO.properties b/config/alfresco/messages/coci-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/coci-service_nb_NO.properties
rename to config/alfresco/messages/coci-service_nb.properties
diff --git a/config/alfresco/messages/content-filter-languages_nb_NO.properties b/config/alfresco/messages/content-filter-languages_nb.properties
similarity index 100%
rename from config/alfresco/messages/content-filter-languages_nb_NO.properties
rename to config/alfresco/messages/content-filter-languages_nb.properties
diff --git a/config/alfresco/messages/content-model_nb_NO.properties b/config/alfresco/messages/content-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/content-model_nb_NO.properties
rename to config/alfresco/messages/content-model_nb.properties
diff --git a/config/alfresco/messages/content-service_nb_NO.properties b/config/alfresco/messages/content-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/content-service_nb_NO.properties
rename to config/alfresco/messages/content-service_nb.properties
diff --git a/config/alfresco/messages/copy-service_nb_NO.properties b/config/alfresco/messages/copy-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/copy-service_nb_NO.properties
rename to config/alfresco/messages/copy-service_nb.properties
diff --git a/config/alfresco/messages/data-list-model_nb_NO.properties b/config/alfresco/messages/data-list-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/data-list-model_nb_NO.properties
rename to config/alfresco/messages/data-list-model_nb.properties
diff --git a/config/alfresco/messages/discussion-messages_nb_NO.properties b/config/alfresco/messages/discussion-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/discussion-messages_nb_NO.properties
rename to config/alfresco/messages/discussion-messages_nb.properties
diff --git a/config/alfresco/messages/distributionpolicies-model_nb_NO.properties b/config/alfresco/messages/distributionpolicies-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/distributionpolicies-model_nb_NO.properties
rename to config/alfresco/messages/distributionpolicies-model_nb.properties
diff --git a/config/alfresco/messages/download-model_nb_NO.properties b/config/alfresco/messages/download-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/download-model_nb_NO.properties
rename to config/alfresco/messages/download-model_nb.properties
diff --git a/config/alfresco/messages/email-server-model_nb_NO.properties b/config/alfresco/messages/email-server-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/email-server-model_nb_NO.properties
rename to config/alfresco/messages/email-server-model_nb.properties
diff --git a/config/alfresco/messages/email-service_nb_NO.properties b/config/alfresco/messages/email-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/email-service_nb_NO.properties
rename to config/alfresco/messages/email-service_nb.properties
diff --git a/config/alfresco/messages/form-service_nb_NO.properties b/config/alfresco/messages/form-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/form-service_nb_NO.properties
rename to config/alfresco/messages/form-service_nb.properties
diff --git a/config/alfresco/messages/forum-model_nb_NO.properties b/config/alfresco/messages/forum-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/forum-model_nb_NO.properties
rename to config/alfresco/messages/forum-model_nb.properties
diff --git a/config/alfresco/messages/imap-service_nb_NO.properties b/config/alfresco/messages/imap-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/imap-service_nb_NO.properties
rename to config/alfresco/messages/imap-service_nb.properties
diff --git a/config/alfresco/messages/initiate-inplace_nb_NO.properties b/config/alfresco/messages/initiate-inplace_nb.properties
similarity index 100%
rename from config/alfresco/messages/initiate-inplace_nb_NO.properties
rename to config/alfresco/messages/initiate-inplace_nb.properties
diff --git a/config/alfresco/messages/invitation-service_nb_NO.properties b/config/alfresco/messages/invitation-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/invitation-service_nb_NO.properties
rename to config/alfresco/messages/invitation-service_nb.properties
diff --git a/config/alfresco/messages/jbpm-engine-messages_nb_NO.properties b/config/alfresco/messages/jbpm-engine-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/jbpm-engine-messages_nb_NO.properties
rename to config/alfresco/messages/jbpm-engine-messages_nb.properties
diff --git a/config/alfresco/messages/lock-service_nb_NO.properties b/config/alfresco/messages/lock-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/lock-service_nb_NO.properties
rename to config/alfresco/messages/lock-service_nb.properties
diff --git a/config/alfresco/messages/module-messages_nb_NO.properties b/config/alfresco/messages/module-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/module-messages_nb_NO.properties
rename to config/alfresco/messages/module-messages_nb.properties
diff --git a/config/alfresco/messages/notification-service_nb_NO.properties b/config/alfresco/messages/notification-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/notification-service_nb_NO.properties
rename to config/alfresco/messages/notification-service_nb.properties
diff --git a/config/alfresco/messages/patch-service_nb_NO.properties b/config/alfresco/messages/patch-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/patch-service_nb_NO.properties
rename to config/alfresco/messages/patch-service_nb.properties
diff --git a/config/alfresco/messages/period-provider_nb_NO.properties b/config/alfresco/messages/period-provider_nb.properties
similarity index 100%
rename from config/alfresco/messages/period-provider_nb_NO.properties
rename to config/alfresco/messages/period-provider_nb.properties
diff --git a/config/alfresco/messages/permissions-service_nb_NO.properties b/config/alfresco/messages/permissions-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/permissions-service_nb_NO.properties
rename to config/alfresco/messages/permissions-service_nb.properties
diff --git a/config/alfresco/messages/publishing-model_nb_NO.properties b/config/alfresco/messages/publishing-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/publishing-model_nb_NO.properties
rename to config/alfresco/messages/publishing-model_nb.properties
diff --git a/config/alfresco/messages/publishing-service_nb_NO.properties b/config/alfresco/messages/publishing-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/publishing-service_nb_NO.properties
rename to config/alfresco/messages/publishing-service_nb.properties
diff --git a/config/alfresco/messages/rendition-config_nb_NO.properties b/config/alfresco/messages/rendition-config_nb.properties
similarity index 100%
rename from config/alfresco/messages/rendition-config_nb_NO.properties
rename to config/alfresco/messages/rendition-config_nb.properties
diff --git a/config/alfresco/messages/replication_nb_NO.properties b/config/alfresco/messages/replication_nb.properties
similarity index 100%
rename from config/alfresco/messages/replication_nb_NO.properties
rename to config/alfresco/messages/replication_nb.properties
diff --git a/config/alfresco/messages/repoadmin-interpreter-help_nb_NO.properties b/config/alfresco/messages/repoadmin-interpreter-help_nb.properties
similarity index 100%
rename from config/alfresco/messages/repoadmin-interpreter-help_nb_NO.properties
rename to config/alfresco/messages/repoadmin-interpreter-help_nb.properties
diff --git a/config/alfresco/messages/rule-config_nb_NO.properties b/config/alfresco/messages/rule-config_nb.properties
similarity index 100%
rename from config/alfresco/messages/rule-config_nb_NO.properties
rename to config/alfresco/messages/rule-config_nb.properties
diff --git a/config/alfresco/messages/schema-update_nb_NO.properties b/config/alfresco/messages/schema-update_nb.properties
similarity index 100%
rename from config/alfresco/messages/schema-update_nb_NO.properties
rename to config/alfresco/messages/schema-update_nb.properties
diff --git a/config/alfresco/messages/site-model_nb_NO.properties b/config/alfresco/messages/site-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/site-model_nb_NO.properties
rename to config/alfresco/messages/site-model_nb.properties
diff --git a/config/alfresco/messages/site-service_nb_NO.properties b/config/alfresco/messages/site-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/site-service_nb_NO.properties
rename to config/alfresco/messages/site-service_nb.properties
diff --git a/config/alfresco/messages/slingshot_nb_NO.properties b/config/alfresco/messages/slingshot_nb.properties
similarity index 100%
rename from config/alfresco/messages/slingshot_nb_NO.properties
rename to config/alfresco/messages/slingshot_nb.properties
diff --git a/config/alfresco/messages/subscription-service_nb_NO.properties b/config/alfresco/messages/subscription-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/subscription-service_nb_NO.properties
rename to config/alfresco/messages/subscription-service_nb.properties
diff --git a/config/alfresco/messages/system-messages_nb_NO.properties b/config/alfresco/messages/system-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/system-messages_nb_NO.properties
rename to config/alfresco/messages/system-messages_nb.properties
diff --git a/config/alfresco/messages/system-model_nb_NO.properties b/config/alfresco/messages/system-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/system-model_nb_NO.properties
rename to config/alfresco/messages/system-model_nb.properties
diff --git a/config/alfresco/messages/template-service_nb_NO.properties b/config/alfresco/messages/template-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/template-service_nb_NO.properties
rename to config/alfresco/messages/template-service_nb.properties
diff --git a/config/alfresco/messages/templates-messages_nb_NO.properties b/config/alfresco/messages/templates-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/templates-messages_nb_NO.properties
rename to config/alfresco/messages/templates-messages_nb.properties
diff --git a/config/alfresco/messages/tenant-interpreter-help_nb_NO.properties b/config/alfresco/messages/tenant-interpreter-help_nb.properties
similarity index 100%
rename from config/alfresco/messages/tenant-interpreter-help_nb_NO.properties
rename to config/alfresco/messages/tenant-interpreter-help_nb.properties
diff --git a/config/alfresco/messages/transfer-model_nb_NO.properties b/config/alfresco/messages/transfer-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/transfer-model_nb_NO.properties
rename to config/alfresco/messages/transfer-model_nb.properties
diff --git a/config/alfresco/messages/transfer-service_nb_NO.properties b/config/alfresco/messages/transfer-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/transfer-service_nb_NO.properties
rename to config/alfresco/messages/transfer-service_nb.properties
diff --git a/config/alfresco/messages/ui-inplace_nb_NO.properties b/config/alfresco/messages/ui-inplace_nb.properties
similarity index 100%
rename from config/alfresco/messages/ui-inplace_nb_NO.properties
rename to config/alfresco/messages/ui-inplace_nb.properties
diff --git a/config/alfresco/messages/version-service_nb_NO.properties b/config/alfresco/messages/version-service_nb.properties
similarity index 100%
rename from config/alfresco/messages/version-service_nb_NO.properties
rename to config/alfresco/messages/version-service_nb.properties
diff --git a/config/alfresco/messages/wcm-services_nb_NO.properties b/config/alfresco/messages/wcm-services_nb.properties
similarity index 100%
rename from config/alfresco/messages/wcm-services_nb_NO.properties
rename to config/alfresco/messages/wcm-services_nb.properties
diff --git a/config/alfresco/messages/wcmapp-model_nb_NO.properties b/config/alfresco/messages/wcmapp-model_nb.properties
similarity index 100%
rename from config/alfresco/messages/wcmapp-model_nb_NO.properties
rename to config/alfresco/messages/wcmapp-model_nb.properties
diff --git a/config/alfresco/messages/wdr-messages_nb_NO.properties b/config/alfresco/messages/wdr-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/wdr-messages_nb_NO.properties
rename to config/alfresco/messages/wdr-messages_nb.properties
diff --git a/config/alfresco/messages/webdav-messages_nb_NO.properties b/config/alfresco/messages/webdav-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/webdav-messages_nb_NO.properties
rename to config/alfresco/messages/webdav-messages_nb.properties
diff --git a/config/alfresco/messages/workflow-interpreter-help_nb_NO.properties b/config/alfresco/messages/workflow-interpreter-help_nb.properties
similarity index 100%
rename from config/alfresco/messages/workflow-interpreter-help_nb_NO.properties
rename to config/alfresco/messages/workflow-interpreter-help_nb.properties
diff --git a/config/alfresco/messages/workflow-package-messages_nb_NO.properties b/config/alfresco/messages/workflow-package-messages_nb.properties
similarity index 100%
rename from config/alfresco/messages/workflow-package-messages_nb_NO.properties
rename to config/alfresco/messages/workflow-package-messages_nb.properties
diff --git a/config/alfresco/workflow/invitation-moderated-workflow-messages_nb_NO.properties b/config/alfresco/workflow/invitation-moderated-workflow-messages_nb.properties
similarity index 100%
rename from config/alfresco/workflow/invitation-moderated-workflow-messages_nb_NO.properties
rename to config/alfresco/workflow/invitation-moderated-workflow-messages_nb.properties
diff --git a/config/alfresco/workflow/invitation-nominated-workflow-messages_nb_NO.properties b/config/alfresco/workflow/invitation-nominated-workflow-messages_nb.properties
similarity index 100%
rename from config/alfresco/workflow/invitation-nominated-workflow-messages_nb_NO.properties
rename to config/alfresco/workflow/invitation-nominated-workflow-messages_nb.properties
diff --git a/config/alfresco/workflow/wcm-workflow-messages_nb_NO.properties b/config/alfresco/workflow/wcm-workflow-messages_nb.properties
similarity index 100%
rename from config/alfresco/workflow/wcm-workflow-messages_nb_NO.properties
rename to config/alfresco/workflow/wcm-workflow-messages_nb.properties
diff --git a/config/alfresco/workflow/workflow-messages_nb_NO.properties b/config/alfresco/workflow/workflow-messages_nb.properties
similarity index 100%
rename from config/alfresco/workflow/workflow-messages_nb_NO.properties
rename to config/alfresco/workflow/workflow-messages_nb.properties