diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
index c357020a684be7b90120ef6dc0fad68a42dcd098..732c11124f38fc0bbf2338a93f6d33d04b14d38f 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
@@ -398,10 +398,10 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
 
     public static Stream<Arguments> nameToInternalName_parameters() {
         return Stream.of(
-                Arguments.arguments("dash_minus", "OE/NO-027", "oeno-027"),
-                Arguments.arguments("percent", "OE%NO-027", "oeno-027"),
-                Arguments.arguments("umlaut", "OE/NÖ-027", "oeno-027"),
-                Arguments.arguments("dot", "OE.NO-027", "oeno-027")
+                Arguments.arguments("dash_minus", "OE/NO-027", "oe_no_027"),
+                Arguments.arguments("percent", "OE%NO-027", "oe_no_027"),
+                Arguments.arguments("umlaut", "OE/NÖ-027", "oe_no__027"),
+                Arguments.arguments("dot", "OE.NO-027", "oe_no_027")
         );
     }
 
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index c16a4191f90cdf1a3228bad5879a40f375abe409..d32189f944767a41aea777728ce7d1c58cf05a10 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -184,7 +184,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
         assertTrue(column0.getAutoGenerated());
         final TableColumn column1 = response.getColumns().get(1);
         assertEquals("I Am Späshül", column1.getName());
-        assertEquals("i_am_spashul", column1.getInternalName());
+        assertEquals("i_am_spa_shu_l", column1.getInternalName());
         assertEquals(TableColumnType.TEXT, column1.getColumnType());
         assertTrue(column1.getIsNullAllowed());
         assertFalse(column1.getAutoGenerated());