diff --git a/build.gradle b/build.gradle
index 916cd8c5c..c13a65066 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,7 @@ configurations {
 dependencies {
     // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency:
     // mps "com.jetbrains:mps:$mpsVersion"
-    mps "com.jetbrains.mps:mps-prerelease:241.19072.10282"
+    mps "com.jetbrains.mps:mps-prerelease:241.19072.10319"
 }
 
 repositories {
diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd
index c24ebc237..da080beef 100644
--- a/code/batik/solutions/de.itemis.stubs.batik.msd
+++ b/code/batik/solutions/de.itemis.stubs.batik.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="de.itemis.stubs.batik" uuid="563a0770-eb88-4f4f-83ed-f708776fc2fe" moduleVersion="0">
   <models>
-    <modelRoot type="java_classes" contentPath="${module}/lib">
+    <modelRoot contentPath="${module}/lib" type="java_classes">
       <sourceRoot location="batik-awt-util.jar" />
       <sourceRoot location="batik-constants.jar" />
       <sourceRoot location="batik-css.jar" />
diff --git a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd
index 9439cea86..bd43705fa 100644
--- a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd
+++ b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="de.itemis.mps.debug.runtime" uuid="14abba35-d008-451b-8562-9bfe66c43bd0" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl
index 6213a9358..b82886257 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl
@@ -14,7 +14,7 @@
   <generators>
     <generator alias="" namespace="de.itemis.mps.editor.diagram#1110129820007083940" uuid="9a94d19e-1f70-46b2-87a7-a5b1c8e1fc5f">
       <models>
-        <modelRoot type="default" contentPath="${module}">
+        <modelRoot contentPath="${module}" type="default">
           <sourceRoot location="generator/template" />
         </modelRoot>
       </models>
diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps
index e3531412b..73de429d4 100644
--- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps
+++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps
@@ -390,7 +390,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
         <child id="2319506556913311101" name="anchors" index="2Vcluh" />
diff --git a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
index 51a0dfcc0..f5a0a4c3d 100644
--- a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
+++ b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="de.slisson.mps.reflection" uuid="654422bf-e75f-44dc-936d-188890a746ce" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
     </modelRoot>
   </models>
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
index fc7c54f83..72995a4cf 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="de.itemis.mps.editor.pagination" uuid="232ef711-abb3-4b52-a3f2-e7987a748232" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -14,7 +14,7 @@
   <generators>
     <generator alias="main" namespace="de.itemis.mps.editor.pagination.generator" uuid="037732ac-3a3f-400a-8c94-3dc0161526dd">
       <models>
-        <modelRoot type="default" contentPath="${module}/generator">
+        <modelRoot contentPath="${module}/generator" type="default">
           <sourceRoot location="templates" />
         </modelRoot>
       </models>
diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd
index e427f023d..2e87679ca 100644
--- a/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd
+++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="de.itemis.mps.editor.pagination.runtime" uuid="b8eca104-6d07-43d6-9bd7-4c8692c82707" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd
index 298eb1e15..b140b3711 100644
--- a/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd
+++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="de.itemis.mps.editor.pagination.test" uuid="03b57d96-6e28-44ba-a68b-4cc264810a54" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd
index 43c627562..8fec60b39 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="com.mbeddr.mpsutil.editor.querylist.sandbox" uuid="c58b797b-c53c-4442-abff-4d54c72169ea" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl
index 72b0ae05c..99affd847 100644
--- a/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl
+++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="de.itemis.mps.structurecheck" uuid="c6cfed73-685b-4891-8bdd-b38a1dcb107a" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
     </modelRoot>
   </models>