diff --git a/.mps/migration.xml b/.mps/migration.xml
index 5cc44f9f..6ad5e78e 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -31,6 +31,6 @@
     <entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
     <entry key="jetbrains.mps.resaveModules" value="executed" />
     <entry key="jetbrains.mps.v8_elimination" value="executed" />
-    <entry key="project.migrated.version" value="233" />
+    <entry key="project.migrated.version" value="241" />
   </component>
 </project>
\ No newline at end of file
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index 5d384002..66fd1d77 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -3908,7 +3908,7 @@
             <node concept="2OqwBi" id="4WeLqVxP81v" role="37vLTJ">
               <node concept="Xjq3P" id="4WeLqVxP88$" role="2Oq$k0" />
               <node concept="2OwXpG" id="4WeLqVxP81y" role="2OqNvi">
-                <ref role="2Oxat5" node="4WeLqVxP2Go" resolve="myDeep" />
+                <ref role="2Oxat5" node="4WeLqVxP2Go" resolve="deep" />
               </node>
             </node>
             <node concept="37vLTw" id="4WeLqVxP2Gy" role="37vLTx">
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index 5b119718..763726ae 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -927,12 +927,12 @@
         <property role="TrG5h" value="OCCURS_CHECK_EX" />
         <node concept="3Tm6S6" id="4WeLqVxg6iW" role="1B3o_S" />
         <node concept="3uibUv" id="4WeLqVxg6iX" role="1tU5fm">
-          <ref role="3uigEE" node="4WeLqVxfpe8" resolve="UnificationPredicate.OccursCheckException" />
+          <ref role="3uigEE" node="4WeLqVxfpe8" resolve="UnificationPredicate.UnificationSolver.OccursCheckException" />
         </node>
         <node concept="2ShNRf" id="4WeLqVxg6iY" role="33vP2m">
           <node concept="HV5vD" id="4WeLqVxg6iZ" role="2ShVmc">
             <property role="373rjd" value="true" />
-            <ref role="HV5vE" node="4WeLqVxfpe8" resolve="UnificationPredicate.OccursCheckException" />
+            <ref role="HV5vE" node="4WeLqVxfpe8" resolve="UnificationPredicate.UnificationSolver.OccursCheckException" />
           </node>
         </node>
       </node>
@@ -2844,13 +2844,13 @@
                           <node concept="2ShNRf" id="4WeLqVwTqn2" role="2Oq$k0">
                             <node concept="1pGfFk" id="4WeLqVwT$f1" role="2ShVmc">
                               <property role="373rjd" value="true" />
-                              <ref role="37wK5l" to="6exd:4WeLqVxOSvl" />
+                              <ref role="37wK5l" to="6exd:4WeLqVxOSvl" resolve="DataFormWalk" />
                               <node concept="2ShNRf" id="4WeLqVwX5c$" role="37wK5m">
                                 <node concept="YeOm9" id="4WeLqVwXrvH" role="2ShVmc">
                                   <node concept="1Y3b0j" id="4WeLqVwXrvK" role="YeSDq">
                                     <property role="2bfB8j" value="true" />
                                     <property role="373rjd" value="true" />
-                                    <ref role="1Y3XeK" to="6exd:2ev$9JFHDMZ" resolve="IdleWalker" />
+                                    <ref role="1Y3XeK" to="6exd:2ev$9JFHDMZ" resolve="DataFormWalk.IdleWalker" />
                                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                                     <node concept="3Tm1VV" id="4WeLqVwXrvL" role="1B3o_S" />
                                     <node concept="3clFb_" id="4WeLqVwYscQ" role="jymVt">
@@ -2961,7 +2961,7 @@
                         <node concept="3cpWs6" id="4WeLqVxidnT" role="3cqZAp">
                           <node concept="2YIFZM" id="4WeLqVxidnU" role="3cqZAk">
                             <ref role="37wK5l" to="w7la:~Solver$Result.FAIL(java.lang.String)" resolve="FAIL" />
-                            <ref role="1Pybhc" to="w7la:~Solver$Result" resolve="Result" />
+                            <ref role="1Pybhc" to="w7la:~Solver$Result" resolve="Solver.Result" />
                             <node concept="Xl_RD" id="4WeLqVxincw" role="37wK5m">
                               <property role="Xl_RC" value="occurs check failed" />
                             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd b/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd
index 6aeafc83..8724ad84 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd
@@ -15,7 +15,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
-    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
     <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 83c0ad55..ed20990f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="-1" />
     <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="-1" />
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="-1" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="-1" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="-1" />
     <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="-1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
index 917194d2..0c442935 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
@@ -2876,7 +2876,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4qPSkk6rW1i" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3clFb_" id="6TxWhgAxJqL" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
index 4938f885..315948fe 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
@@ -706,7 +706,7 @@
                     </node>
                     <node concept="2OqwBi" id="1Lr58WFTIHh" role="2GsD0m">
                       <node concept="37vLTw" id="2r1jTXL$IJ$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2r1jTXL$IJy" resolve="project" />
+                        <ref role="3cqZAo" node="2r1jTXL$IJy" resolve="mpsProject" />
                       </node>
                       <node concept="liA8E" id="1Lr58WFTIHj" role="2OqNvi">
                         <ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
@@ -802,7 +802,7 @@
                         </node>
                         <node concept="2OqwBi" id="1Lr58WFTIHJ" role="37wK5m">
                           <node concept="37vLTw" id="2r1jTXL$IJ_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2r1jTXL$IJy" resolve="project" />
+                            <ref role="3cqZAo" node="2r1jTXL$IJy" resolve="mpsProject" />
                           </node>
                           <node concept="liA8E" id="1Lr58WFTIHL" role="2OqNvi">
                             <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index dfca3037..243957bb 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -4883,7 +4883,7 @@
             <node concept="liA8E" id="1a$$29AvYUx" role="2OqNvi">
               <ref role="37wK5l" to="tj24:7iCybvTszk9" resolve="registerProvider" />
               <node concept="Rm8GO" id="1a$$29AvYXx" role="37wK5m">
-                <ref role="1Px2BO" to="tj24:7iCybvToD3Z" resolve="Level" />
+                <ref role="1Px2BO" to="tj24:7iCybvToD3Z" resolve="Config.Level" />
                 <ref role="Rm8GQ" to="tj24:5Ul706LbJYK" resolve="TEST" />
               </node>
               <node concept="1bVj0M" id="1a$$29Aw4Um" role="37wK5m">
@@ -4934,7 +4934,7 @@
             <node concept="liA8E" id="xqbf82l6Yd" role="2OqNvi">
               <ref role="37wK5l" to="tj24:xqbf82kuzw" resolve="reset" />
               <node concept="Rm8GO" id="1a$$29Aw7Pu" role="37wK5m">
-                <ref role="1Px2BO" to="tj24:7iCybvToD3Z" resolve="Level" />
+                <ref role="1Px2BO" to="tj24:7iCybvToD3Z" resolve="Config.Level" />
                 <ref role="Rm8GQ" to="tj24:5Ul706LbJYK" resolve="TEST" />
               </node>
             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
index bba1530e..d75e84e6 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
@@ -173,7 +173,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2r1jTXMuuem" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2r1jTXMuumm" role="jymVt" />
@@ -221,7 +221,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2r1jTXMuupl" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index ba926ab3..b15a9020 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -5882,7 +5882,7 @@
                         <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                       </node>
                       <node concept="2YIFZM" id="4qPSkk6vBtz" role="3uHU7w">
-                        <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isTracing" />
+                        <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isProfiling" />
                         <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
                       </node>
                     </node>
@@ -15545,7 +15545,7 @@
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
             <node concept="2YIFZM" id="4qPSkk6vBt$" role="33vP2m">
-              <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isTracing" />
+              <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isProfiling" />
               <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
             </node>
           </node>
@@ -16425,7 +16425,7 @@
                           <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                         </node>
                         <node concept="2YIFZM" id="4qPSkk6vBt_" role="3uHU7w">
-                          <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isTracing" />
+                          <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isProfiling" />
                           <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
                         </node>
                       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index cc9ca833..fda355e1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -18015,7 +18015,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpHquM" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="24Dk$YpHOGU" role="jymVt" />
@@ -18421,7 +18421,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpK2uJ" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="YGS68MOVeT" role="jymVt" />
@@ -18697,7 +18697,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpKXM8" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="dJjRa5pzSM" role="jymVt" />
@@ -18944,7 +18944,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpLqgg" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="dJjRa5xFUg" role="jymVt" />
@@ -19266,7 +19266,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpMrGy" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="4XsNDZYCrJc" role="jymVt" />
@@ -19584,7 +19584,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpNpfY" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="4XsNDZYDzlH" role="jymVt" />
@@ -19836,7 +19836,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="24Dk$YpO5Cu" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="3IJoaDJegdE" role="jymVt" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps b/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
index 079501d7..b0098786 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
@@ -130,13 +130,13 @@
         </node>
         <node concept="3clFbF" id="IFW4V2uR84" role="3cqZAp">
           <node concept="2YIFZM" id="IFW4V2uR85" role="3clFbG">
-            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookupCoordinator" />
+            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
             <ref role="37wK5l" to="fqlx:IFW4V2uAhM" resolve="init" />
           </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="2r1jTXMuuem" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2r1jTXMuumm" role="jymVt" />
@@ -154,12 +154,12 @@
         <node concept="3clFbF" id="IFW4V2uRwY" role="3cqZAp">
           <node concept="2YIFZM" id="IFW4V2uRy4" role="3clFbG">
             <ref role="37wK5l" to="fqlx:IFW4V2uCEF" resolve="dispose" />
-            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookupCoordinator" />
+            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
           </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="2r1jTXMuupl" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 20c16079..55c2ee08 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -5259,7 +5259,7 @@
                           <node concept="YeOm9" id="500mE4_xd_d" role="2ShVmc">
                             <node concept="1Y3b0j" id="500mE4_xd_e" role="YeSDq">
                               <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" to="6exd:104EUzFOARB" resolve="Visitor" />
+                              <ref role="1Y3XeK" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
                               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                               <node concept="3Tm1VV" id="500mE4_xd_f" role="1B3o_S" />
                               <node concept="3clFb_" id="500mE4_xd_g" role="jymVt">
@@ -5353,7 +5353,7 @@
                                     <node concept="3cpWsn" id="500mE4_xd_P" role="3cpWs9">
                                       <property role="TrG5h" value="visitor" />
                                       <node concept="3uibUv" id="500mE4_xd_Q" role="1tU5fm">
-                                        <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="Visitor" />
+                                        <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
                                         <node concept="3uibUv" id="500mE4_xd_R" role="11_B2D">
                                           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                         </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index ff48eae7..fd3192af 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -656,7 +656,7 @@
               <node concept="2ShNRf" id="4WeLqVx6Rhu" role="33vP2m">
                 <node concept="1pGfFk" id="4WeLqVx6Rhv" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="oy3s:4TCblo5ML4I" />
+                  <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
                   <node concept="2YIFZM" id="4WeLqVx6Rhw" role="37wK5m">
                     <ref role="37wK5l" to="bj13:~LogicalKt.newLogical(java.lang.Object)" resolve="newLogical" />
                     <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
@@ -870,7 +870,7 @@
             <node concept="2OqwBi" id="4WeLqVx4wMp" role="3clFbG">
               <node concept="2ShNRf" id="4WeLqVx4wMq" role="2Oq$k0">
                 <node concept="1pGfFk" id="4WeLqVx4wMr" role="2ShVmc">
-                  <ref role="37wK5l" to="6exd:4WeLqVxOSvl" />
+                  <ref role="37wK5l" to="6exd:4WeLqVxOSvl" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="4WeLqVx4wMs" role="37wK5m">
                     <ref role="3cqZAo" node="4WeLqVx4wLZ" resolve="mock" />
                   </node>
diff --git a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
index a6b0731b..7013cbc1 100644
--- a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
+++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
     <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
     <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
diff --git a/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
index c15ff7dd..8f21ce27 100644
--- a/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
+++ b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
@@ -16,7 +16,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
-    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
     <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
index dd2841a4..105e00e8 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
     <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
     <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
index 0dbfabc9..abedf91f 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
@@ -16,7 +16,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
-    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
     <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
index 6ba5abe4..9e171e2a 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
@@ -1164,7 +1164,7 @@
                                 <node concept="nsMwS" id="6ZRhjsGHQ6l" role="ns1xD">
                                   <ref role="nsMwP" node="6ZRhjsG9m9W" resolve="target" />
                                   <node concept="a7P8L" id="6ZRhjsGHQ6q" role="iSaTp">
-                                    <ref role="a7OzE" node="6ZRhjsGHQ68" resolve="TargetTyoe" />
+                                    <ref role="a7OzE" node="6ZRhjsGHQ68" resolve="TargetType" />
                                   </node>
                                 </node>
                               </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 319d3e8d..b268962f 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -8654,14 +8654,14 @@
                                   <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
                                   <node concept="2OqwBi" id="4lgunKfZtQa" role="3jbY8P">
                                     <node concept="37vLTw" id="4lgunKfZtI2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="methLike" />
+                                      <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="meth" />
                                     </node>
                                     <node concept="2qgKlT" id="4lgunKfZu2U" role="2OqNvi">
                                       <ref role="37wK5l" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
                                     </node>
                                   </node>
                                   <node concept="a7P8L" id="4lgunKfZtGP" role="3jbY8V">
-                                    <ref role="a7OzE" node="4lgunKfZtBg" resolve="RetTDecl" />
+                                    <ref role="a7OzE" node="4lgunKfZtBg" resolve="RetDeclT" />
                                   </node>
                                 </node>
                               </node>
@@ -8687,7 +8687,7 @@
                               <node concept="3fqX7Q" id="4lgunKg4RIo" role="3uHU7w">
                                 <node concept="2OqwBi" id="4lgunKg4SnW" role="3fr31v">
                                   <node concept="37vLTw" id="4lgunKg4S3x" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="methLike" />
+                                    <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="meth" />
                                   </node>
                                   <node concept="1mIQ4w" id="4lgunKg4STE" role="2OqNvi">
                                     <node concept="chp4Y" id="4lgunKg4T4r" role="cj9EA">
@@ -8698,7 +8698,7 @@
                               </node>
                               <node concept="2OqwBi" id="4lgunKfZnj0" role="3uHU7B">
                                 <node concept="37vLTw" id="4lgunKfZn8Y" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="methLike" />
+                                  <ref role="3cqZAo" node="4lgunKfZmNJ" resolve="meth" />
                                 </node>
                                 <node concept="3x8VRR" id="4lgunKfZnIW" role="2OqNvi" />
                               </node>
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 05762768..2b439a44 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
     <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
     <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
     <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
diff --git a/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
index b33713d8..c38b2219 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
+++ b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
@@ -16,7 +16,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
-    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
     <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
     <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />