diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
index 45c7dcf0..3d144bd2 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
@@ -1353,6 +1353,14 @@
       <node concept="3clFbS" id="2q9s7foUOEm" role="1nLNMH">
         <node concept="1nLNNL" id="2q9s7foUOF6" role="3cqZAp">
           <node concept="1nLNMm" id="2q9s7foUOF8" role="1nLNNK">
+            <node concept="3NuqgR" id="1stFrrzRYJk" role="0Rg$4">
+              <node concept="3Tqbb2" id="1stFrrzRYOx" role="3vLBG7">
+                <ref role="ehGHo" to="tp4f:hyWqMFP" resolve="IClassifier" />
+              </node>
+              <node concept="aZer4" id="2q9s7foUPm8" role="3XD1gS">
+                <property role="TrG5h" value="Cls" />
+              </node>
+            </node>
             <node concept="3Aq93q" id="2q9s7foUOFf" role="1nLNMb">
               <node concept="3I6sU6" id="2q9s7foUOFg" role="3Ip0Jz">
                 <node concept="3I6s7M" id="2q9s7foUOFn" role="3I6sU7">
@@ -1385,9 +1393,6 @@
               <node concept="aZer4" id="2q9s7foUPja" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
-              <node concept="aZer4" id="2q9s7foUPm8" role="3XD1gS">
-                <property role="TrG5h" value="Cls" />
-              </node>
               <node concept="3Tqbb2" id="2q9s7foUPjk" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="2q9s7foUPjz" role="0Rg$4">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
index bc75dd4e..da0fbd81 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
@@ -687,8 +687,8 @@
                 <node concept="2YIFZM" id="5cBWTAdG28w" role="1y58nS">
                   <ref role="1Pybhc" to="kqnc:1qY0I4b_aeY" resolve="ListUtil" />
                   <ref role="37wK5l" to="kqnc:3DgB4rOx1ZG" resolve="length" />
-                  <node concept="1Ft4W6" id="5cBWTAdG28x" role="37wK5m">
-                    <node concept="a7P8L" id="5cBWTAdG28y" role="1FtiSR">
+                  <node concept="1Ft4W6" id="1stFrrzToxM" role="37wK5m">
+                    <node concept="a7P8L" id="1stFrrzToxL" role="1FtiSR">
                       <ref role="a7OzE" node="5cBWTAdFiBR" resolve="Components" />
                     </node>
                   </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
index 23f0f345..fe6c3a9e 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
@@ -489,8 +489,8 @@
                     <node concept="3j8tct" id="6T3vXgtM$kJ" role="2Oq$k0">
                       <ref role="3j8tcu" node="6T3vXgtM$l7" resolve="mt" />
                     </node>
-                    <node concept="3Tsc0h" id="6T3vXgtM$kK" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpd4:hausUtE" resolve="argument" />
+                    <node concept="3Tsc0h" id="BiC39hKatk" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpd4:hiQyKgb" resolve="argument" />
                     </node>
                   </node>
                 </node>
@@ -509,8 +509,8 @@
                 <node concept="3j8tct" id="6T3vXgtM$kQ" role="2Oq$k0">
                   <ref role="3j8tcu" node="6T3vXgtM$l7" resolve="mt" />
                 </node>
-                <node concept="3Tsc0h" id="6T3vXgtM$kR" role="2OqNvi">
-                  <ref role="3TtcxE" to="tpd4:hausUtE" resolve="argument" />
+                <node concept="3Tsc0h" id="BiC39hKasS" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpd4:hiQyKgb" resolve="argument" />
                 </node>
               </node>
               <node concept="34oBXx" id="6T3vXgtM$kS" role="2OqNvi" />
@@ -564,8 +564,8 @@
               <node concept="3j8tct" id="6T3vXgtM$lc" role="2Oq$k0">
                 <ref role="3j8tcu" node="6T3vXgtM$l7" resolve="mt" />
               </node>
-              <node concept="3Tsc0h" id="6T3vXgtM$ld" role="2OqNvi">
-                <ref role="3TtcxE" to="tpd4:hausUtE" resolve="argument" />
+              <node concept="3Tsc0h" id="BiC39hKasl" role="2OqNvi">
+                <ref role="3TtcxE" to="tpd4:hiQyKgb" resolve="argument" />
               </node>
             </node>
             <node concept="34oBXx" id="6T3vXgtM$le" role="2OqNvi" />
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
index cccefa54..8049494d 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
@@ -133,7 +133,9 @@
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -2481,7 +2483,9 @@
               <node concept="aZer4" id="6Dg__VK8Mla" role="3XD1gS">
                 <property role="TrG5h" value="DNode" />
               </node>
-              <node concept="3Tqbb2" id="6Dg__VK8LgQ" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6Dg__VK8LgQ" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="6Dg__VK8Lj2" role="0Rg$4">
               <node concept="aZer4" id="6Dg__VK8Lj3" role="3XD1gS">