diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
index 73bd0a59c5b..21a8345b38a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
@@ -82,7 +82,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" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
index 32d538787fa..392b825db71 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps
@@ -3190,7 +3190,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2PA_oGdpdQy" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2PA_oGdthiz" role="jymVt" />
@@ -5325,7 +5325,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="6GJBP5i6QzB" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="6GJBP5i6PuO" role="jymVt" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps
index ad546f8a823..29346faf84a 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps
@@ -369,7 +369,7 @@
   </node>
   <node concept="1lYeZD" id="2hNr1jFDxsE">
     <property role="TrG5h" value="BugfixCommitMessageCheckin" />
-    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="CheckinExtensionPoint" />
+    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="ForegroundCheckin" />
     <node concept="3Tm1VV" id="2hNr1jFDxsF" role="1B3o_S" />
     <node concept="2tJIrI" id="2hNr1jFDxsG" role="jymVt" />
     <node concept="3tTeZs" id="2hNr1jFDxsH" role="jymVt">
@@ -643,7 +643,7 @@
   <node concept="2DaZZR" id="2hNr1jFDxQs" />
   <node concept="1lYeZD" id="2hNr1jFD$Xi">
     <property role="TrG5h" value="CapitalizedSubjectCheckin" />
-    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="CheckinExtensionPoint" />
+    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="ForegroundCheckin" />
     <node concept="3Tm1VV" id="2hNr1jFD$Xj" role="1B3o_S" />
     <node concept="2tJIrI" id="2hNr1jFD$Xk" role="jymVt" />
     <node concept="3tTeZs" id="2hNr1jFD$Xl" role="jymVt">
@@ -868,7 +868,7 @@
   </node>
   <node concept="1lYeZD" id="2hNr1jFD$XS">
     <property role="TrG5h" value="DeleteClassesCheckin" />
-    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="CheckinExtensionPoint" />
+    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="ForegroundCheckin" />
     <node concept="3Tm1VV" id="2hNr1jFD$XT" role="1B3o_S" />
     <node concept="2tJIrI" id="2hNr1jFD$XU" role="jymVt" />
     <node concept="3tTeZs" id="2hNr1jFD$XV" role="jymVt">
@@ -1099,7 +1099,7 @@
   </node>
   <node concept="1lYeZD" id="2hNr1jFD$Yu">
     <property role="TrG5h" value="HelloCheckin" />
-    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="CheckinExtensionPoint" />
+    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="ForegroundCheckin" />
     <node concept="3Tm1VV" id="2hNr1jFD$Yv" role="1B3o_S" />
     <node concept="2tJIrI" id="2hNr1jFD$Yw" role="jymVt" />
     <node concept="3tTeZs" id="2hNr1jFD$Yx" role="jymVt">
@@ -1224,7 +1224,7 @@
   </node>
   <node concept="1lYeZD" id="32CFzTqVtcV">
     <property role="TrG5h" value="ForceSaveAllCheckin" />
-    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="CheckinExtensionPoint" />
+    <ref role="1lYe$Y" to="aqel:1yfWS2nNO6t" resolve="ForegroundCheckin" />
     <node concept="3Tm1VV" id="32CFzTqVtcW" role="1B3o_S" />
     <node concept="2tJIrI" id="32CFzTqVtcX" role="jymVt" />
     <node concept="3tTeZs" id="32CFzTqVtcY" role="jymVt">
@@ -1593,8 +1593,8 @@
             <node concept="YeOm9" id="iOccn7Y6zQ" role="2ShVmc">
               <node concept="1Y3b0j" id="iOccn7Y6zR" role="YeSDq">
                 <property role="2bfB8j" value="true" />
-                <ref role="1Y3XeK" to="aqel:iOccn7YWVJ" resolve="BackgroundCheckingHandler" />
-                <ref role="37wK5l" to="aqel:iOccn7Z0_l" resolve="BackgroundCheckingHandler" />
+                <ref role="1Y3XeK" to="aqel:iOccn7YWVJ" resolve="BackgroundCheckinHandler" />
+                <ref role="37wK5l" to="aqel:iOccn7Z0_l" resolve="BackgroundCheckinHandler" />
                 <node concept="3Tm1VV" id="iOccn7Y6zS" role="1B3o_S" />
                 <node concept="2YIFZM" id="iOccn7Y6$m" role="37wK5m">
                   <ref role="37wK5l" node="2hNr1jFa1hM" resolve="getKey" />
@@ -1639,7 +1639,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="XpfY8WyZPY" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="2tJIrI" id="D2dJ$FajmO" role="jymVt" />
@@ -1656,7 +1656,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="D2dJ$Fajqx" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -1694,8 +1694,8 @@
             <node concept="YeOm9" id="12pSLg$sqPy" role="2ShVmc">
               <node concept="1Y3b0j" id="12pSLg$sqPz" role="YeSDq">
                 <property role="2bfB8j" value="true" />
-                <ref role="1Y3XeK" to="aqel:iOccn7YWVJ" resolve="BackgroundCheckingHandler" />
-                <ref role="37wK5l" to="aqel:iOccn7Z0_l" resolve="BackgroundCheckingHandler" />
+                <ref role="1Y3XeK" to="aqel:iOccn7YWVJ" resolve="BackgroundCheckinHandler" />
+                <ref role="37wK5l" to="aqel:iOccn7Z0_l" resolve="BackgroundCheckinHandler" />
                 <node concept="3Tm1VV" id="12pSLg$sqP_" role="1B3o_S" />
                 <node concept="2YIFZM" id="12pSLg$sqPA" role="37wK5m">
                   <ref role="37wK5l" node="2hNr1jFa1hM" resolve="getKey" />
@@ -1732,7 +1732,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="12pSLg$sqPP" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="2tJIrI" id="D2dJ$Faxk6" role="jymVt" />
@@ -1748,7 +1748,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="D2dJ$Faxn3" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -1786,8 +1786,8 @@
             <node concept="YeOm9" id="2HiDHfmiazZ" role="2ShVmc">
               <node concept="1Y3b0j" id="2HiDHfmia$0" role="YeSDq">
                 <property role="2bfB8j" value="true" />
-                <ref role="1Y3XeK" to="aqel:iOccn7YWVJ" resolve="BackgroundCheckingHandler" />
-                <ref role="37wK5l" to="aqel:iOccn7Z0_l" resolve="BackgroundCheckingHandler" />
+                <ref role="1Y3XeK" to="aqel:iOccn7YWVJ" resolve="BackgroundCheckinHandler" />
+                <ref role="37wK5l" to="aqel:iOccn7Z0_l" resolve="BackgroundCheckinHandler" />
                 <node concept="3Tm1VV" id="2HiDHfmia$1" role="1B3o_S" />
                 <node concept="2YIFZM" id="2HiDHfmia$2" role="37wK5m">
                   <ref role="37wK5l" node="2hNr1jFa1hM" resolve="getKey" />
@@ -1913,14 +1913,14 @@
                       <node concept="3cpWsn" id="2HiDHfmj0Gx" role="3cpWs9">
                         <property role="TrG5h" value="factory" />
                         <node concept="3uibUv" id="2HiDHfmj0Gz" role="1tU5fm">
-                          <ref role="3uigEE" node="2HiDHfmj7k4" resolve="GradleWindowFactory" />
+                          <ref role="3uigEE" node="2HiDHfmj7k4" resolve="GradleTasksCheckin.MyWindowFactory" />
                         </node>
                         <node concept="2ShNRf" id="2HiDHfmjdKA" role="33vP2m">
                           <node concept="1pGfFk" id="ODg7jjkk8D" role="2ShVmc">
                             <property role="373rjd" value="true" />
-                            <ref role="37wK5l" node="ODg7jjjopU" resolve="MyWindowFactory" />
+                            <ref role="37wK5l" node="ODg7jjjopU" resolve="GradleTasksCheckin.MyWindowFactory" />
                             <node concept="1rXfSq" id="ODg7jjkk8C" role="37wK5m">
-                              <ref role="37wK5l" node="ODg7jjkuIo" resolve="getProjectRootPath" />
+                              <ref role="37wK5l" node="ODg7jjkuIo" resolve="getVCSRootPath" />
                             </node>
                           </node>
                         </node>
@@ -1950,7 +1950,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="2HiDHfmia$f" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="2tJIrI" id="ODg7jjj7uL" role="jymVt" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps
index 87b7c1e9998..4a9272ab453 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps
@@ -372,7 +372,7 @@
       </node>
       <node concept="3clFbS" id="w97ei4GRmX" role="3clF47">
         <node concept="XkiVB" id="w97ei4GRmY" role="3cqZAp">
-          <ref role="37wK5l" node="1yfWS2nOYu5" resolve="AbstractCheckinHandler" />
+          <ref role="37wK5l" node="1yfWS2nOYu5" resolve="BaseCheckinHandler" />
           <node concept="37vLTw" id="w97ei4GRmZ" role="37wK5m">
             <ref role="3cqZAo" node="w97ei4GRmR" resolve="settingsKey" />
           </node>
@@ -392,7 +392,7 @@
       <node concept="3clFbS" id="1yfWS2nQf$C" role="3clF47" />
       <node concept="3Tmbuc" id="1yfWS2nQeQ$" role="1B3o_S" />
       <node concept="3uibUv" id="1yfWS2nQfzk" role="3clF45">
-        <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+        <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
       </node>
     </node>
     <node concept="2tJIrI" id="1yfWS2nPS52" role="jymVt" />
@@ -400,7 +400,7 @@
       <property role="TrG5h" value="beforeCheckin" />
       <node concept="3Tm1VV" id="1yfWS2nQial" role="1B3o_S" />
       <node concept="3uibUv" id="1yfWS2nQian" role="3clF45">
-        <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+        <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
       </node>
       <node concept="3clFbS" id="1yfWS2nQiao" role="3clF47">
         <node concept="3clFbJ" id="2GzKrnbewM" role="3cqZAp">
@@ -427,7 +427,7 @@
     </node>
     <node concept="3Tm1VV" id="7uW9A9Lcnfn" role="1B3o_S" />
     <node concept="3uibUv" id="w97ei4GPLy" role="1zkMxy">
-      <ref role="3uigEE" node="w97ei4GzZs" resolve="AbstractCheckinHandler" />
+      <ref role="3uigEE" node="w97ei4GzZs" resolve="BaseCheckinHandler" />
     </node>
   </node>
   <node concept="vrV6u" id="1yfWS2nNO6t">
@@ -599,7 +599,7 @@
                 </node>
                 <node concept="TSZUe" id="2Nko9yAVk0T" role="2OqNvi">
                   <node concept="37vLTw" id="2Nko9yAVnNi" role="25WWJ7">
-                    <ref role="3cqZAo" node="2Nko9yAVnNe" resolve="createFactory" />
+                    <ref role="3cqZAo" node="2Nko9yAVnNe" resolve="factory" />
                   </node>
                 </node>
               </node>
@@ -1029,7 +1029,7 @@
       </node>
       <node concept="3Tm1VV" id="1yfWS2nO6lP" role="1B3o_S" />
       <node concept="3uibUv" id="1yfWS2nO9hh" role="3clF45">
-        <ref role="3uigEE" node="w97ei4GzZs" resolve="AbstractCheckinHandler" />
+        <ref role="3uigEE" node="w97ei4GzZs" resolve="BaseCheckinHandler" />
       </node>
     </node>
     <node concept="2tJIrI" id="D2dJ$F9T2l" role="jymVt" />
@@ -1380,7 +1380,7 @@
       <ref role="37wK5l" node="7vUP_qcxDx4" resolve="ExecutionOrder" />
       <node concept="Rm8GO" id="w97ei57_S6" role="37wK5m">
         <ref role="Rm8GQ" to="18nx:~CommitCheck$ExecutionOrder.EARLY" resolve="EARLY" />
-        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="sRL9v" id="w97ei58BvB" role="lGtFl">
         <node concept="19SGf9" id="w97ei58BvC" role="sRSUq">
@@ -1395,7 +1395,7 @@
       <ref role="37wK5l" node="7vUP_qcxDx4" resolve="ExecutionOrder" />
       <node concept="Rm8GO" id="w97ei57_Wc" role="37wK5m">
         <ref role="Rm8GQ" to="18nx:~CommitCheck$ExecutionOrder.MODIFICATION" resolve="MODIFICATION" />
-        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="sRL9v" id="w97ei58BTS" role="lGtFl">
         <node concept="19SGf9" id="w97ei58BTT" role="sRSUq">
@@ -1410,7 +1410,7 @@
       <ref role="37wK5l" node="7vUP_qcxDx4" resolve="ExecutionOrder" />
       <node concept="Rm8GO" id="w97ei57A3s" role="37wK5m">
         <ref role="Rm8GQ" to="18nx:~CommitCheck$ExecutionOrder.LATE" resolve="LATE" />
-        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="sRL9v" id="w97ei58Cjb" role="lGtFl">
         <node concept="19SGf9" id="w97ei58Cjc" role="sRSUq">
@@ -1425,7 +1425,7 @@
       <ref role="37wK5l" node="7vUP_qcxDx4" resolve="ExecutionOrder" />
       <node concept="Rm8GO" id="w97ei57Af1" role="37wK5m">
         <ref role="Rm8GQ" to="18nx:~CommitCheck$ExecutionOrder.POST_COMMIT" resolve="POST_COMMIT" />
-        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="1Px2BO" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
     </node>
     <node concept="3Tm1VV" id="w97ei4HiXF" role="1B3o_S" />
@@ -1433,7 +1433,7 @@
       <property role="TrG5h" value="executionOrderInternal" />
       <node concept="3Tm6S6" id="7vUP_qcxBIf" role="1B3o_S" />
       <node concept="3uibUv" id="w97ei5862r" role="1tU5fm">
-        <ref role="3uigEE" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
     </node>
     <node concept="3clFbW" id="7vUP_qcxDx4" role="jymVt">
@@ -1443,7 +1443,7 @@
         <node concept="3clFbF" id="7vUP_qcxDNX" role="3cqZAp">
           <node concept="37vLTI" id="7vUP_qcxEqs" role="3clFbG">
             <node concept="37vLTw" id="7vUP_qcxEPf" role="37vLTx">
-              <ref role="3cqZAo" node="7vUP_qcxDGF" resolve="text" />
+              <ref role="3cqZAo" node="7vUP_qcxDGF" resolve="executionOrder" />
             </node>
             <node concept="37vLTw" id="7vUP_qcxDNW" role="37vLTJ">
               <ref role="3cqZAo" node="7vUP_qcxBIe" resolve="executionOrderInternal" />
@@ -1454,7 +1454,7 @@
       <node concept="37vLTG" id="7vUP_qcxDGF" role="3clF46">
         <property role="TrG5h" value="executionOrder" />
         <node concept="3uibUv" id="w97ei587g5" role="1tU5fm">
-          <ref role="3uigEE" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+          <ref role="3uigEE" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
         </node>
       </node>
     </node>
@@ -1469,7 +1469,7 @@
       </node>
       <node concept="3Tm1VV" id="w97ei58r$j" role="1B3o_S" />
       <node concept="3uibUv" id="w97ei58seM" role="3clF45">
-        <ref role="3uigEE" to="18nx:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18nx:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
     </node>
   </node>
@@ -1490,7 +1490,7 @@
       <node concept="3cqZAl" id="iOccn7Z0_m" role="3clF45" />
       <node concept="3clFbS" id="iOccn7Z0_n" role="3clF47">
         <node concept="XkiVB" id="iOccn7Z0Ix" role="3cqZAp">
-          <ref role="37wK5l" node="1yfWS2nOYu5" resolve="AbstractCheckinHandler" />
+          <ref role="37wK5l" node="1yfWS2nOYu5" resolve="BaseCheckinHandler" />
           <node concept="37vLTw" id="iOccn7Z0KB" role="37wK5m">
             <ref role="3cqZAo" node="iOccn7Z0_F" resolve="settingsKey" />
           </node>
@@ -1559,7 +1559,7 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3uibUv" id="2PSVZXMfrlF" role="3clF45">
-        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="3clFbS" id="2PSVZXMfrlH" role="3clF47">
         <node concept="3clFbF" id="2PSVZXMftGc" role="3cqZAp">
@@ -1568,20 +1568,20 @@
               <ref role="3cqZAo" node="2PSVZXMfo7h" resolve="executionOrder" />
             </node>
             <node concept="liA8E" id="2PSVZXMfv5B" role="2OqNvi">
-              <ref role="37wK5l" node="w97ei58shL" resolve="getExecutionOrder" />
+              <ref role="37wK5l" node="w97ei58shL" resolve="get" />
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="2Nko9yAOeXD" role="3cqZAp" />
       </node>
       <node concept="2AHcQZ" id="2PSVZXMfrlI" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2PSVZXMfrc4" role="jymVt" />
     <node concept="3Tm1VV" id="iOccn7YWVK" role="1B3o_S" />
     <node concept="3uibUv" id="iOccn7YZ2o" role="1zkMxy">
-      <ref role="3uigEE" node="w97ei4GzZs" resolve="AbstractCheckinHandler" />
+      <ref role="3uigEE" node="w97ei4GzZs" resolve="BaseCheckinHandler" />
     </node>
     <node concept="3uibUv" id="7Inuc2b_WMj" role="EKbjA">
       <ref role="3uigEE" to="18ny:~CommitCheck" resolve="CommitCheck" />
@@ -1604,7 +1604,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="iOccn7Zb$g" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="XpfY8WyUTC" role="jymVt" />
@@ -1665,7 +1665,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="XpfY8WyVex" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -1677,7 +1677,7 @@
       <property role="TrG5h" value="beforeCheckin" />
       <node concept="3Tm1VV" id="7SRksDjMSlK" role="1B3o_S" />
       <node concept="3uibUv" id="7SRksDjMSlL" role="3clF45">
-        <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+        <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
       </node>
       <node concept="3clFbS" id="7SRksDjMSlM" role="3clF47">
         <node concept="2Gpval" id="7SRksDjN2Dd" role="3cqZAp">
@@ -1714,7 +1714,7 @@
               <node concept="3cpWsn" id="7SRksDjNoCh" role="3cpWs9">
                 <property role="TrG5h" value="result" />
                 <node concept="3uibUv" id="7SRksDjNo_g" role="1tU5fm">
-                  <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+                  <ref role="3uigEE" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
                 </node>
                 <node concept="2OqwBi" id="7SRksDjNoCi" role="33vP2m">
                   <node concept="2GrUjf" id="7SRksDjNoCj" role="2Oq$k0">
@@ -1738,7 +1738,7 @@
                 <node concept="17R0WA" id="7SRksDjNAoh" role="3uHU7w">
                   <node concept="Rm8GO" id="7SRksDjNBKh" role="3uHU7w">
                     <ref role="Rm8GQ" to="18nx:~CheckinHandler$ReturnResult.CLOSE_WINDOW" resolve="CLOSE_WINDOW" />
-                    <ref role="1Px2BO" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+                    <ref role="1Px2BO" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
                   </node>
                   <node concept="37vLTw" id="7SRksDjN_WN" role="3uHU7B">
                     <ref role="3cqZAo" node="7SRksDjNoCh" resolve="result" />
@@ -1750,7 +1750,7 @@
                   </node>
                   <node concept="Rm8GO" id="7SRksDjN_3t" role="3uHU7w">
                     <ref role="Rm8GQ" to="18nx:~CheckinHandler$ReturnResult.CANCEL" resolve="CANCEL" />
-                    <ref role="1Px2BO" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+                    <ref role="1Px2BO" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
                   </node>
                 </node>
               </node>
@@ -1760,7 +1760,7 @@
         <node concept="3cpWs6" id="7SRksDjNFMk" role="3cqZAp">
           <node concept="Rm8GO" id="3y8dKk6NOao" role="3cqZAk">
             <ref role="Rm8GQ" to="18nx:~CheckinHandler$ReturnResult.COMMIT" resolve="COMMIT" />
-            <ref role="1Px2BO" to="18nx:~CheckinHandler$ReturnResult" resolve="ReturnResult" />
+            <ref role="1Px2BO" to="18nx:~CheckinHandler$ReturnResult" resolve="CheckinHandler.ReturnResult" />
           </node>
         </node>
       </node>
@@ -1798,7 +1798,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yARd9U" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -1806,7 +1806,7 @@
     <property role="TrG5h" value="BackgroundCheckin" />
     <property role="3GE5qa" value="background" />
     <node concept="3uibUv" id="4yZoggcRgaj" role="luc8K">
-      <ref role="3uigEE" node="iOccn7YWVJ" resolve="BackgroundCheckingHandler" />
+      <ref role="3uigEE" node="iOccn7YWVJ" resolve="BackgroundCheckinHandler" />
     </node>
   </node>
   <node concept="312cEu" id="2Nko9yAPngh">
@@ -1993,7 +1993,7 @@
             <node concept="10Oyi0" id="1adXBFNxT4D" role="1tU5fm" />
             <node concept="2OqwBi" id="1adXBFNxUfe" role="33vP2m">
               <node concept="37vLTw" id="1adXBFNxUff" role="2Oq$k0">
-                <ref role="3cqZAo" node="6pFqDJAzhNY" resolve="foregroundHandlers" />
+                <ref role="3cqZAo" node="6pFqDJAzhNY" resolve="handlers" />
               </node>
               <node concept="34oBXx" id="1adXBFNxUfg" role="2OqNvi" />
             </node>
@@ -2111,7 +2111,7 @@
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
                 <ref role="1Y3XeK" to="4zvo:~RefreshableOnComponent" resolve="RefreshableOnComponent" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="3Vy2pj$Y5VK" role="1B3o_S" />
                 <node concept="3clFb_" id="3Vy2pj$Y5VY" role="jymVt">
                   <property role="TrG5h" value="saveState" />
@@ -2152,7 +2152,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="3Vy2pj$Y5W4" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="2tJIrI" id="3Vy2pj$Y5W5" role="jymVt" />
@@ -2195,7 +2195,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="3Vy2pj$Y5Wc" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="2tJIrI" id="3Vy2pj$Y5Wd" role="jymVt" />
@@ -2213,7 +2213,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="3Vy2pj$Y5Wk" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -2284,7 +2284,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="2Nko9yATVHe" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -2363,7 +2363,7 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3uibUv" id="2Nko9yARWBV" role="3clF45">
-        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="3clFbS" id="2Nko9yARWBX" role="3clF47">
         <node concept="3clFbF" id="2Nko9yAS4oB" role="3cqZAp">
@@ -2379,7 +2379,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yARWBY" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2Nko9yARkN9" role="jymVt" />
@@ -2397,7 +2397,7 @@
           <node concept="2OqwBi" id="2Nko9yASlx$" role="3clFbG">
             <node concept="2OqwBi" id="2Nko9yASago" role="2Oq$k0">
               <node concept="3nyPlj" id="2Nko9yAS9es" role="2Oq$k0">
-                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryExtensionPoint" />
+                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryHandlers" />
               </node>
               <node concept="3zZkjj" id="2Nko9yASbtV" role="2OqNvi">
                 <node concept="1bVj0M" id="2Nko9yASbtX" role="23t8la">
@@ -2441,7 +2441,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yAQXtt" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3uibUv" id="2Nko9yAS3mZ" role="1zkMxy">
@@ -2563,7 +2563,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yAS0JG" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2Nko9yAS0JR" role="jymVt" />
@@ -2585,7 +2585,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yAS0JZ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2Nko9yAS0K0" role="jymVt" />
@@ -2618,7 +2618,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yAS0Kf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3uibUv" id="2Nko9yAS0Kg" role="EKbjA">
@@ -2636,7 +2636,7 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3uibUv" id="2Nko9yASmt4" role="3clF45">
-        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="3clFbS" id="2Nko9yASmt5" role="3clF47">
         <node concept="3clFbF" id="2Nko9yASmt6" role="3cqZAp">
@@ -2652,7 +2652,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yASmta" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2Nko9yASmtb" role="jymVt" />
@@ -2670,7 +2670,7 @@
           <node concept="2OqwBi" id="2Nko9yASmtj" role="3clFbG">
             <node concept="2OqwBi" id="2Nko9yASmtk" role="2Oq$k0">
               <node concept="3nyPlj" id="2Nko9yASmtl" role="2Oq$k0">
-                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryExtensionPoint" />
+                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryHandlers" />
               </node>
               <node concept="3zZkjj" id="2Nko9yASmtm" role="2OqNvi">
                 <node concept="1bVj0M" id="2Nko9yASmtn" role="23t8la">
@@ -2714,7 +2714,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yASmt$" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3uibUv" id="2Nko9yASmt_" role="1zkMxy">
@@ -2732,7 +2732,7 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3uibUv" id="2Nko9yASns6" role="3clF45">
-        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="3clFbS" id="2Nko9yASns7" role="3clF47">
         <node concept="3clFbF" id="2Nko9yASns8" role="3cqZAp">
@@ -2748,7 +2748,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yASnsc" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2Nko9yASnsd" role="jymVt" />
@@ -2766,7 +2766,7 @@
           <node concept="2OqwBi" id="2Nko9yASnsl" role="3clFbG">
             <node concept="2OqwBi" id="2Nko9yASnsm" role="2Oq$k0">
               <node concept="3nyPlj" id="2Nko9yASnsn" role="2Oq$k0">
-                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryExtensionPoint" />
+                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryHandlers" />
               </node>
               <node concept="3zZkjj" id="2Nko9yASnso" role="2OqNvi">
                 <node concept="1bVj0M" id="2Nko9yASnsp" role="23t8la">
@@ -2810,7 +2810,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yASnsA" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3uibUv" id="2Nko9yASnsB" role="1zkMxy">
@@ -2828,7 +2828,7 @@
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
       <node concept="3uibUv" id="2Nko9yASoyS" role="3clF45">
-        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="ExecutionOrder" />
+        <ref role="3uigEE" to="18ny:~CommitCheck$ExecutionOrder" resolve="CommitCheck.ExecutionOrder" />
       </node>
       <node concept="3clFbS" id="2Nko9yASoyT" role="3clF47">
         <node concept="3clFbF" id="2Nko9yASoyU" role="3cqZAp">
@@ -2844,7 +2844,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yASoyY" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2Nko9yASoyZ" role="jymVt" />
@@ -2862,7 +2862,7 @@
           <node concept="2OqwBi" id="2Nko9yASoz7" role="3clFbG">
             <node concept="2OqwBi" id="2Nko9yASoz8" role="2Oq$k0">
               <node concept="3nyPlj" id="2Nko9yASoz9" role="2Oq$k0">
-                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryExtensionPoint" />
+                <ref role="37wK5l" node="2Nko9yAS0K4" resolve="queryHandlers" />
               </node>
               <node concept="3zZkjj" id="2Nko9yASoza" role="2OqNvi">
                 <node concept="1bVj0M" id="2Nko9yASozb" role="23t8la">
@@ -2906,7 +2906,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2Nko9yASozo" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3uibUv" id="2Nko9yASozp" role="1zkMxy">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
index c0dd1c36327..f9798ef27a6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
@@ -4,7 +4,7 @@
   <imports>
     <import index="8do3" ref="r:cea04c4b-adba-417e-a192-34c7a8799ac1(com.mbeddr.mpsutil.compare.structure)" implicit="true" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
+    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="p37l" ref="r:df1b052a-af27-4b87-80fc-1492fa2192be(jetbrains.mps.vcs.diff.ui)" implicit="true" />
@@ -277,16 +277,16 @@
               <node concept="3cpWsn" id="5oR1gCFT89F" role="3cpWs9">
                 <property role="TrG5h" value="project" />
                 <node concept="3uibUv" id="5oR1gCFT89G" role="1tU5fm">
-                  <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+                  <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
                 </node>
                 <node concept="2OqwBi" id="3Z0sSYENoR" role="33vP2m">
                   <node concept="2OqwBi" id="3Z0sSYEM7v" role="2Oq$k0">
                     <node concept="2YIFZM" id="3Z0sSYELIf" role="2Oq$k0">
-                      <ref role="37wK5l" to="z1c3:~ProjectManager.getInstance()" resolve="getInstance" />
-                      <ref role="1Pybhc" to="z1c3:~ProjectManager" resolve="ProjectManager" />
+                      <ref role="37wK5l" to="z1c4:~ProjectManager.getInstance()" resolve="getInstance" />
+                      <ref role="1Pybhc" to="z1c4:~ProjectManager" resolve="ProjectManager" />
                     </node>
                     <node concept="liA8E" id="3Z0sSYEMDk" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~ProjectManager.getOpenedProjects()" resolve="getOpenedProjects" />
+                      <ref role="37wK5l" to="z1c4:~ProjectManager.getOpenedProjects()" resolve="getOpenedProjects" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3Z0sSYEOqK" role="2OqNvi">
@@ -579,16 +579,16 @@
               <node concept="3cpWsn" id="3zBhpJM4Blc" role="3cpWs9">
                 <property role="TrG5h" value="project" />
                 <node concept="3uibUv" id="3zBhpJM4Bld" role="1tU5fm">
-                  <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+                  <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
                 </node>
                 <node concept="2OqwBi" id="3Z0sSZQGQp" role="33vP2m">
                   <node concept="2OqwBi" id="3Z0sSZQGQq" role="2Oq$k0">
                     <node concept="2YIFZM" id="3Z0sSZQGQr" role="2Oq$k0">
-                      <ref role="37wK5l" to="z1c3:~ProjectManager.getInstance()" resolve="getInstance" />
-                      <ref role="1Pybhc" to="z1c3:~ProjectManager" resolve="ProjectManager" />
+                      <ref role="37wK5l" to="z1c4:~ProjectManager.getInstance()" resolve="getInstance" />
+                      <ref role="1Pybhc" to="z1c4:~ProjectManager" resolve="ProjectManager" />
                     </node>
                     <node concept="liA8E" id="3Z0sSZQGQs" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~ProjectManager.getOpenedProjects()" resolve="getOpenedProjects" />
+                      <ref role="37wK5l" to="z1c4:~ProjectManager.getOpenedProjects()" resolve="getOpenedProjects" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3Z0sSZQGQt" role="2OqNvi">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr
index 348a619aa9d..9541c18a162 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr
@@ -326,7 +326,7 @@
             <node concept="liA8E" id="E9Bg74Xo89" role="2OqNvi">
               <ref role="37wK5l" to="wyt6:~StringBuilder.append(int)" resolve="append" />
               <node concept="37vLTw" id="E9Bg750OZs" role="37wK5m">
-                <ref role="3cqZAo" node="E9Bg750OZ7" resolve="i" />
+                <ref role="3cqZAo" node="E9Bg750OZ7" resolve="expectedChildren" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr
index 1f9fd87afeb..fb611536008 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MPSNodeComparator.mpsr
@@ -3050,7 +3050,7 @@
                         <node concept="2ZHEkA" id="DYlgnAHgPX" role="2OqNvi" />
                       </node>
                       <node concept="37vLTw" id="E9Bg74Q0kY" role="37wK5m">
-                        <ref role="3cqZAo" node="E9Bg74Q0kW" resolve="options" />
+                        <ref role="3cqZAo" node="E9Bg74Q0kW" resolve="newOptions" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MpsNodeComparatorOptionsBuilder.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MpsNodeComparatorOptionsBuilder.mpsr
index 5707661cf6c..0c952bfbf1c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MpsNodeComparatorOptionsBuilder.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/MpsNodeComparatorOptionsBuilder.mpsr
@@ -135,7 +135,7 @@
             <node concept="2OqwBi" id="E9Bg752xOF" role="37vLTJ">
               <node concept="2tS5IS" id="E9Bg752xOG" role="2Oq$k0" />
               <node concept="2OwXpG" id="E9Bg752xOH" role="2OqNvi">
-                <ref role="2Oxat5" node="E9Bg752xHS" resolve="compareAttributes" />
+                <ref role="2Oxat5" node="E9Bg752xHS" resolve="compareAnnotations" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/PropertyDifference.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/PropertyDifference.mpsr
index b01a39029a1..7895587bcc2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/PropertyDifference.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/PropertyDifference.mpsr
@@ -454,7 +454,7 @@
                   <node concept="liA8E" id="E9Bg74iX2$" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="37vLTw" id="E9Bg74mZLE" role="37wK5m">
-                      <ref role="3cqZAo" node="E9Bg74mZL$" resolve="property" />
+                      <ref role="3cqZAo" node="E9Bg74mZL$" resolve="expected" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
index 15663ab3948..e30c71a0b95 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
@@ -1491,7 +1491,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="fo3l86ccZl" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -9426,7 +9426,7 @@
       <node concept="37vLTG" id="1TNXceg$fBV" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="1TNXceg$fBU" role="1tU5fm">
-          <ref role="3uigEE" node="1TNXcegzj9g" resolve="ITraceRecordMapper" />
+          <ref role="3uigEE" node="1TNXcegzj9g" resolve="INodeMapper" />
         </node>
       </node>
     </node>