diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties b/app/multi-tenant/central-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties
index 67a07e3fa..e9f5e5c2b 100644
--- a/app/multi-tenant/central-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties
+++ b/app/multi-tenant/central-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties
@@ -11,4 +11,4 @@ order.exceeds.stock = {0} exceeds stock for book
 review.add.forbidden=User not allowed to add more than one review for a given book
 book.import.failed = Import of books failed
 book.import.invalid.csv = Invalid CSV structure found - Please check its content
-SDM.Attachments.maxCountError = Maximum number of attachments reached in English
+SDM.maxCountErrorMessage = Maximum number of attachments reached in English
diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties b/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties
index 67a07e3fa..e9f5e5c2b 100644
--- a/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties
+++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/src/main/resources/messages.properties
@@ -11,4 +11,4 @@ order.exceeds.stock = {0} exceeds stock for book
 review.add.forbidden=User not allowed to add more than one review for a given book
 book.import.failed = Import of books failed
 book.import.invalid.csv = Invalid CSV structure found - Please check its content
-SDM.Attachments.maxCountError = Maximum number of attachments reached in English
+SDM.maxCountErrorMessage = Maximum number of attachments reached in English
diff --git a/app/single-tenant/central-space/demoapp/srv/src/main/resources/messages.properties b/app/single-tenant/central-space/demoapp/srv/src/main/resources/messages.properties
index 8e99a85d0..a6963a4a2 100644
--- a/app/single-tenant/central-space/demoapp/srv/src/main/resources/messages.properties
+++ b/app/single-tenant/central-space/demoapp/srv/src/main/resources/messages.properties
@@ -1 +1 @@
-SDM.Attachments.maxCountError = Maximum number of attachments reached in English
+SDM.maxCountErrorMessage = Maximum number of attachments reached in English
diff --git a/app/single-tenant/personal-space/demoapp/srv/src/main/resources/messages.properties b/app/single-tenant/personal-space/demoapp/srv/src/main/resources/messages.properties
index 8e99a85d0..a6963a4a2 100644
--- a/app/single-tenant/personal-space/demoapp/srv/src/main/resources/messages.properties
+++ b/app/single-tenant/personal-space/demoapp/srv/src/main/resources/messages.properties
@@ -1 +1 @@
-SDM.Attachments.maxCountError = Maximum number of attachments reached in English
+SDM.maxCountErrorMessage = Maximum number of attachments reached in English
diff --git a/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_MultipleFacet.java b/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_MultipleFacet.java
index 85698a9cc..a6eed7368 100644
--- a/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_MultipleFacet.java
+++ b/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_MultipleFacet.java
@@ -2510,7 +2510,7 @@ void testNAttachments_NewEntity() throws IOException {
         response = api.saveEntityDraft(appUrl, entityName, srvpath, entityID4);
         if (response.equals("Saved")) {
           String expectedJson =
-              "{\"error\":{\"code\":\"500\",\"message\":\"Cannot upload more than 4 attachments.\"}}";
+              "{\"error\":{\"code\":\"500\",\"message\":\"Maximum number of attachments reached in English\"}}";
           ObjectMapper objectMapper = new ObjectMapper();
           JsonNode actualJsonNode = objectMapper.readTree(check);
           JsonNode expectedJsonNode = objectMapper.readTree(expectedJson);
@@ -2558,7 +2558,7 @@ void testUploadNAttachments() throws IOException {
         System.out.println("Result message for attachment " + i + ": " + resultMessage);
 
         String expectedResponse =
-            "{\"error\":{\"code\":\"500\",\"message\":\"Cannot upload more than 4 attachments.\"}}";
+            "{\"error\":{\"code\":\"500\",\"message\":\"Maximum number of attachments reached in English\"}}";
         if (resultMessage.equals(expectedResponse)) {
           ObjectMapper objectMapper = new ObjectMapper();
           JsonNode actualJsonNode = objectMapper.readTree(resultMessage);
@@ -3979,9 +3979,9 @@ void testCreateLinkFailure() throws IOException {
         String errorMessage = json.getJSONObject("error").getString("message");
         assertEquals("500", errorCode);
         if (facetName.equals("references")) {
-          assertEquals("Cannot upload more than 5 attachments.", errorMessage);
+          assertEquals("Maximum number of attachments reached in English", errorMessage);
         } else if (facetName.equals("attachments")) {
-          assertEquals("Cannot upload more than 4 attachments.", errorMessage);
+          assertEquals("Maximum number of attachments reached in English", errorMessage);
         }
       }
     }
diff --git a/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_SingleFacet.java b/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_SingleFacet.java
index 1f4962c81..67286c045 100644
--- a/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_SingleFacet.java
+++ b/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_SingleFacet.java
@@ -2367,7 +2367,7 @@ void testNAttachments_NewEntity() throws IOException {
         response = api.saveEntityDraft(appUrl, entityName, srvpath, entityID4);
         if (response.equals("Saved")) {
           String expectedJson =
-              "{\"error\":{\"code\":\"500\",\"message\":\"Cannot upload more than 4 attachments.\"}}";
+              "{\"error\":{\"code\":\"500\",\"message\":\"Maximum number of attachments reached in English\"}}";
           ObjectMapper objectMapper = new ObjectMapper();
           JsonNode actualJsonNode = objectMapper.readTree(check);
           JsonNode expectedJsonNode = objectMapper.readTree(expectedJson);
@@ -2415,7 +2415,7 @@ void testUploadNAttachments() throws IOException {
         System.out.println("Result message for attachment " + i + ": " + resultMessage);
 
         String expectedResponse =
-            "{\"error\":{\"code\":\"500\",\"message\":\"Cannot upload more than 4 attachments.\"}}";
+            "{\"error\":{\"code\":\"500\",\"message\":\"Maximum number of attachments reached in English\"}}";
         if (resultMessage.equals(expectedResponse)) {
           ObjectMapper objectMapper = new ObjectMapper();
           JsonNode actualJsonNode = objectMapper.readTree(resultMessage);
@@ -3504,7 +3504,7 @@ void testCreateLinkFailure() throws IOException {
         String errorCode = json.getJSONObject("error").getString("code");
         String errorMessage = json.getJSONObject("error").getString("message");
         assertEquals("500", errorCode);
-        assertEquals("Cannot upload more than 4 attachments.", errorMessage);
+        assertEquals("Maximum number of attachments reached in English", errorMessage);
       }
       String response = api.saveEntityDraft(appUrl, entityName, srvpath, createLinkEntity);
       if (!response.equals("Saved")) {