diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java
index eef3b8495699..3ef39cc9794c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java
@@ -89,7 +89,7 @@ public ResponseEntity sendEmail(HttpServletRequest request, HttpServletResponse
         String helpDeskEmail = configurationService.getProperty("lr.help.mail", "");
         String helpDeskPhoneNum = configurationService.getProperty("lr.help.phone", "");
         String dspaceName = configurationService.getProperty("dspace.name", "");
-        String dspaceNameShort = configurationService.getProperty("dspace.name.short", "");
+        String dspaceNameShort = configurationService.getProperty("dspace.shortname", "");
 
         if (StringUtils.isEmpty(uiUrl)) {
             log.error("Cannot load the `dspace.ui.url` property from the cfg.");
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java
index 84a6c9b00890..05f1c34902dd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java
@@ -283,7 +283,7 @@ private void sendEmailWithDownloadLink(Context context, DSpaceObject dso,
         String helpDeskEmail = configurationService.getProperty("lr.help.mail", "");
         String helpDeskPhoneNum = configurationService.getProperty("lr.help.phone", "");
         String dspaceName = configurationService.getProperty("dspace.name", "");
-        String dspaceNameShort = configurationService.getProperty("dspace.name.short", "");
+        String dspaceNameShort = configurationService.getProperty("dspace.shortname", "");
 
         if (StringUtils.isEmpty(uiUrl)) {
             log.error("Cannot load the `dspace.ui.url` property from the cfg.");
diff --git a/dspace/config/clarin-dspace.cfg b/dspace/config/clarin-dspace.cfg
index b6dbcef3ca11..f27d6830c213 100644
--- a/dspace/config/clarin-dspace.cfg
+++ b/dspace/config/clarin-dspace.cfg
@@ -5,7 +5,7 @@
 #------------------------------------------------------------------#
 #---------------------------DSpace---------------------------------#
 #------------------------------------------------------------------#
-dspace.name.short = DSpace
+dspace.shortname = DSpace
 dspace.name = CLARIN DSpace
 
 #------------------------------------------------------------------#
diff --git a/dspace/config/emails/clarin_download_link_admin b/dspace/config/emails/clarin_download_link_admin
index 3119ee134fa1..3288ea422d9f 100644
--- a/dspace/config/emails/clarin_download_link_admin
+++ b/dspace/config/emails/clarin_download_link_admin
@@ -9,7 +9,7 @@
 ##
 ## See org.dspace.core.Email for information on the format of this file.
 ##
-#set($subject = "${config.get('dspace.name.short')}: New File Download Request (CC)")
+#set($subject = "${config.get('dspace.shortname')}: New File Download Request (CC)")
 
 This is an information for administrators and other configured people about a new download request.
 
@@ -26,7 +26,7 @@ The file is distributed under specific license:
 Extra information filled by the user:
 	${params[5]}
 
-${config.get('dspace.name.short')} Team
+${config.get('dspace.shortname')} Team
 
 _____________________________________
 ${config.get('dspace.name')},
diff --git a/dspace/config/emails/share_submission b/dspace/config/emails/share_submission
index 884d183726d1..6a930dee95f3 100644
--- a/dspace/config/emails/share_submission
+++ b/dspace/config/emails/share_submission
@@ -12,7 +12,7 @@ If you have trouble please contact
 ${config.get('lr.help.mail')} or call us at ${config.get('lr.help.phone')}
 
 
-${config.get('dspace.name.short')} Team
+${config.get('dspace.shortname')} Team
 
 _____________________________________
 ${config.get('dspace.name')},