diff --git a/src/main/java/org/caosdb/server/utils/ServerMessages.java b/src/main/java/org/caosdb/server/utils/ServerMessages.java
index 4b28848817eaa06f9516060953eda38265851024..4197f2cf78cedb3fcf9dc0ea6648b6c3335a9da8 100644
--- a/src/main/java/org/caosdb/server/utils/ServerMessages.java
+++ b/src/main/java/org/caosdb/server/utils/ServerMessages.java
@@ -55,7 +55,7 @@ public class ServerMessages {
       new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "Parsing failed.");
 
   public static final Message UNKNOWN_DATATYPE =
-      new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "Unknown datatype.");
+      new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "Unknown data type.");
 
   public static final Message UNKNOWN_IMPORTANCE =
       new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "Unknown importance.");
@@ -494,13 +494,13 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_DATA_TYPE_INHERITANCE_AMBIGUOUS,
-          "The datatype which is to be inherited could not be detected due to divergent datatypes of at least two parents.");
+          "The data type which is to be inherited could not be detected due to divergent data types of at least two parents.");
 
   public static final Message DATA_TYPE_DOES_NOT_ACCEPT_COLLECTION_VALUES =
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_DATA_TYPE_DOES_NOT_ACCEPT_COLLECTION_VALUES,
-          "This datatype does not accept collections of values (e.g. Lists).");
+          "This data type does not accept collections of values (e.g. Lists).");
 
   public static final Message CANNOT_PARSE_UNIT =
       new Message(
@@ -554,7 +554,7 @@ public class ServerMessages {
       new Message(
           MessageType.Warning,
           MessageCode.MESSAGE_CODE_PROPERTY_WITH_DATA_TYPE_OVERRIDE,
-          "This property overrides the datatype.");
+          "This property overrides the data type.");
 
   public static final Message PROPERTY_WITH_DESC_OVERRIDE =
       new Message(