From 257bc196c3b14a9e1aa5f2d79e4fdfcd5824ab22 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 26 Oct 2021 15:03:49 +0200
Subject: [PATCH] Re-save all models

---
 .../generator/template/main@generator.mps     | 44 +++++++++----------
 .../languageModels/editor.mps                 |  2 +-
 .../generator/template/main@generator.mps     |  8 ++--
 .../models/editor.mps                         |  2 +-
 .../models/structure.mps                      |  2 +-
 ...s.mps.coderules.typechecking.ui.plugin.mps |  6 +--
 ...ins.mps.coderules.typechecking.service.mps |  4 +-
 .../jetbrains.mps.lang.coderules.template.mps |  2 +-
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 0e0d7809..3b195e8b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -5204,7 +5204,7 @@
       <node concept="gft3U" id="75vUFrSv9Wb" role="1lVwrX">
         <node concept="3clFbS" id="75vUFrSva2f" role="gfFT$">
           <node concept="1sPUBX" id="75vUFrSva2j" role="lGtFl">
-            <ref role="v9R2y" node="75vUFrSv4lG" resolve="logical_local_declaration" />
+            <ref role="v9R2y" node="75vUFrSv4lG" resolve="metalogical_local_declaration" />
           </node>
         </node>
       </node>
@@ -5307,7 +5307,7 @@
       <node concept="gft3U" id="4QphcHh0uP$" role="1lVwrX">
         <node concept="10Nm6u" id="4QphcHh0v0Y" role="gfFT$">
           <node concept="1sPUBX" id="4QphcHh0v18" role="lGtFl">
-            <ref role="v9R2y" node="4QphcHh0rDe" resolve="logical_variable" />
+            <ref role="v9R2y" node="4QphcHh0rDe" resolve="metalogical_reference" />
           </node>
         </node>
       </node>
@@ -7052,7 +7052,7 @@
                 </node>
               </node>
               <node concept="2ZBi8u" id="7nPD14NP48I" role="lGtFl">
-                <ref role="2rW$FS" node="7jC45KceoRk" resolve="logical_local_declaration" />
+                <ref role="2rW$FS" node="7jC45KceoRk" resolve="metalogical_local_declaration" />
               </node>
             </node>
             <node concept="raruj" id="7nPD14NP48J" role="lGtFl" />
@@ -7200,7 +7200,7 @@
                 </node>
               </node>
               <node concept="2ZBi8u" id="7nPD14NOLBt" role="lGtFl">
-                <ref role="2rW$FS" node="7jC45KceoRk" resolve="logical_local_declaration" />
+                <ref role="2rW$FS" node="7jC45KceoRk" resolve="metalogical_local_declaration" />
               </node>
             </node>
             <node concept="raruj" id="7nPD14NOLBu" role="lGtFl" />
@@ -7262,7 +7262,7 @@
                         <node concept="2OqwBi" id="75vUFrSLwzH" role="3clFbG">
                           <node concept="1iwH7S" id="75vUFrSLwzI" role="2Oq$k0" />
                           <node concept="1iwH70" id="75vUFrSLwzJ" role="2OqNvi">
-                            <ref role="1iwH77" node="7jC45KceoRk" resolve="logical_local_declaration" />
+                            <ref role="1iwH77" node="7jC45KceoRk" resolve="metalogical_local_declaration" />
                             <node concept="2OqwBi" id="75vUFrSLwzK" role="1iwH7V">
                               <node concept="30H73N" id="75vUFrSLwzL" role="2Oq$k0" />
                               <node concept="3TrEf2" id="75vUFrSLwzM" role="2OqNvi">
@@ -7343,7 +7343,7 @@
                         <node concept="2OqwBi" id="7HUwyZaPVlo" role="3clFbG">
                           <node concept="1iwH7S" id="7HUwyZaPVlp" role="2Oq$k0" />
                           <node concept="1iwH70" id="7HUwyZaPVlq" role="2OqNvi">
-                            <ref role="1iwH77" node="7jC45KceoRk" resolve="logical_local_declaration" />
+                            <ref role="1iwH77" node="7jC45KceoRk" resolve="metalogical_local_declaration" />
                             <node concept="2OqwBi" id="7HUwyZaPVlr" role="1iwH7V">
                               <node concept="30H73N" id="7HUwyZaPVls" role="2Oq$k0" />
                               <node concept="3TrEf2" id="7HUwyZaPVlt" role="2OqNvi">
@@ -7692,7 +7692,7 @@
                               <node concept="2OqwBi" id="7nPD14NOYEx" role="3clFbG">
                                 <node concept="1iwH7S" id="7nPD14NOYEy" role="2Oq$k0" />
                                 <node concept="1iwH70" id="7nPD14NOYEz" role="2OqNvi">
-                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                   <node concept="30H73N" id="7nPD14NOYE$" role="1iwH7V" />
                                 </node>
                               </node>
@@ -7832,7 +7832,7 @@
                               <node concept="2OqwBi" id="7nPD14NOJgp" role="3clFbG">
                                 <node concept="1iwH7S" id="7nPD14NOJgq" role="2Oq$k0" />
                                 <node concept="1iwH70" id="7nPD14NOJgr" role="2OqNvi">
-                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                   <node concept="30H73N" id="7nPD14NOJgs" role="1iwH7V" />
                                 </node>
                               </node>
@@ -7907,7 +7907,7 @@
             <node concept="3Tmbuc" id="4KRwoemkxBz" role="1B3o_S" />
             <node concept="raruj" id="452KZTbxHh5" role="lGtFl" />
             <node concept="2ZBi8u" id="452KZTbxHh6" role="lGtFl">
-              <ref role="2rW$FS" node="452KZTbtpTP" resolve="logical_field" />
+              <ref role="2rW$FS" node="452KZTbtpTP" resolve="metalogical_field" />
             </node>
             <node concept="17Uvod" id="452KZTbxHh7" role="lGtFl">
               <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -7975,7 +7975,7 @@
             <node concept="3Tmbuc" id="4KRwoemkynD" role="1B3o_S" />
             <node concept="raruj" id="452KZTbxJ6d" role="lGtFl" />
             <node concept="2ZBi8u" id="452KZTbxJ6e" role="lGtFl">
-              <ref role="2rW$FS" node="452KZTbtpTP" resolve="logical_field" />
+              <ref role="2rW$FS" node="452KZTbtpTP" resolve="metalogical_field" />
             </node>
             <node concept="17Uvod" id="452KZTbxJ6f" role="lGtFl">
               <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -8082,7 +8082,7 @@
                             <node concept="2OqwBi" id="452KZTby0wn" role="3clFbG">
                               <node concept="1iwH7S" id="452KZTby0wo" role="2Oq$k0" />
                               <node concept="1iwH70" id="452KZTby0wp" role="2OqNvi">
-                                <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                 <node concept="2OqwBi" id="452KZTby0wq" role="1iwH7V">
                                   <node concept="30H73N" id="452KZTby0wr" role="2Oq$k0" />
                                   <node concept="3TrEf2" id="452KZTby0ws" role="2OqNvi">
@@ -8195,7 +8195,7 @@
                               <node concept="2OqwBi" id="452KZTby2qT" role="3clFbG">
                                 <node concept="1iwH7S" id="452KZTby2qU" role="2Oq$k0" />
                                 <node concept="1iwH70" id="452KZTby2qV" role="2OqNvi">
-                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                   <node concept="2OqwBi" id="452KZTby2qW" role="1iwH7V">
                                     <node concept="30H73N" id="452KZTby2qX" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="452KZTby2qY" role="2OqNvi">
@@ -9703,7 +9703,7 @@
                                 <node concept="2OqwBi" id="12QmIo_3$aG" role="3clFbG">
                                   <node concept="1iwH7S" id="12QmIo_3$aH" role="2Oq$k0" />
                                   <node concept="1iwH70" id="12QmIo_3$aI" role="2OqNvi">
-                                    <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                    <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                     <node concept="30H73N" id="12QmIo_3$aJ" role="1iwH7V" />
                                   </node>
                                 </node>
@@ -9807,7 +9807,7 @@
                               <node concept="2OqwBi" id="12QmIo_3Bd1" role="3clFbG">
                                 <node concept="1iwH7S" id="12QmIo_3Bd2" role="2Oq$k0" />
                                 <node concept="1iwH70" id="12QmIo_3Bd3" role="2OqNvi">
-                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                   <node concept="30H73N" id="12QmIo_3Bd4" role="1iwH7V" />
                                 </node>
                               </node>
@@ -10799,7 +10799,7 @@
                         <node concept="37vLTG" id="5itBwMbdiLb" role="1bW2Oz">
                           <property role="TrG5h" value="tok" />
                           <node concept="3uibUv" id="5itBwMbdiLc" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="Token" />
+                            <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
                           </node>
                         </node>
                       </node>
@@ -11923,7 +11923,7 @@
                               </node>
                             </node>
                             <node concept="1sPUBX" id="2BFWJjNJFvo" role="lGtFl">
-                              <ref role="v9R2y" node="4QphcHh0rDe" resolve="logical_variable" />
+                              <ref role="v9R2y" node="4QphcHh0rDe" resolve="metalogical_reference" />
                             </node>
                           </node>
                           <node concept="3uibUv" id="1HWyn8iTlBn" role="3g7fb8">
@@ -12061,7 +12061,7 @@
                               </node>
                               <node concept="3clFbF" id="1HWyn8iTlC1" role="3cqZAp">
                                 <node concept="37vLTw" id="2BFWJjNLghq" role="3clFbG">
-                                  <ref role="3cqZAo" node="2BFWJjNLghk" resolve="string" />
+                                  <ref role="3cqZAo" node="2BFWJjNLghk" resolve="name" />
                                 </node>
                               </node>
                             </node>
@@ -14233,7 +14233,7 @@
                               <node concept="2OqwBi" id="5itBwM5XZuW" role="3clFbG">
                                 <node concept="1iwH7S" id="5itBwM5XZhL" role="2Oq$k0" />
                                 <node concept="1iwH70" id="5itBwM5Y0Ks" role="2OqNvi">
-                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                   <node concept="30H73N" id="5itBwM5Y5No" role="1iwH7V" />
                                 </node>
                               </node>
@@ -14807,7 +14807,7 @@
                               <node concept="2OqwBi" id="5itBwM6XBHn" role="3clFbG">
                                 <node concept="1iwH7S" id="5itBwM6XBHo" role="2Oq$k0" />
                                 <node concept="1iwH70" id="5itBwM6XBHp" role="2OqNvi">
-                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="metalogical_field" />
                                   <node concept="30H73N" id="5itBwM6XBHq" role="1iwH7V" />
                                 </node>
                               </node>
@@ -14907,7 +14907,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="4qGA5WD0usu" role="3clF45">
-              <ref role="3uigEE" node="5itBwM6XBFY" resolve="Token" />
+              <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
             </node>
             <node concept="3Tm1VV" id="4qGA5WD0usv" role="1B3o_S" />
             <node concept="3clFbS" id="4qGA5WD0usw" role="3clF47">
@@ -14956,7 +14956,7 @@
                           </node>
                         </node>
                         <node concept="37vLTw" id="4qGA5WD0usT" role="AHHXb">
-                          <ref role="3cqZAo" node="4qGA5WD0usr" resolve="logical" />
+                          <ref role="3cqZAo" node="4qGA5WD0usr" resolve="params" />
                         </node>
                       </node>
                       <node concept="3uibUv" id="4qGA5WD17wG" role="10QFUM">
@@ -19459,7 +19459,7 @@
     <node concept="30QchW" id="sL9MTQxgra" role="30SoJX">
       <ref role="30HIoZ" to="tpee:fz12cDA" resolve="ClassConcept" />
       <node concept="j$656" id="sL9MTQxst1" role="1fOSGc">
-        <ref role="v9R2y" node="sL9MTQxkHa" resolve="frag_ManifestConstructor" />
+        <ref role="v9R2y" node="sL9MTQxkHa" resolve="frag_createManifest" />
       </node>
       <node concept="3gB$ML" id="sL9MTQxgrc" role="3gCiVm">
         <node concept="3clFbS" id="sL9MTQxgrd" role="2VODD2">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index faf1ce41..85e83638 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4239,7 +4239,7 @@
     <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
     <node concept="PMmxH" id="6wBZuQUGvdm" role="2wV5jI">
-      <ref role="PMmxG" node="6wBZuQUGpjH" resolve="TermDeclaration_Editor" />
+      <ref role="PMmxG" node="6wBZuQUGpjH" resolve="TermDeclaration_Default" />
     </node>
   </node>
   <node concept="1h_SRR" id="4vr5SAprGdP">
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index def46ea7..f6d1729c 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -540,7 +540,7 @@
       </node>
     </node>
     <node concept="2VPoh5" id="j$DTRie5QM" role="2VS0gm">
-      <ref role="2VPoh2" node="j$DTRidoLS" resolve="_RecoverType_" />
+      <ref role="2VPoh2" node="j$DTRidoLS" resolve="_RecoverType_Default_" />
       <ref role="2sBCQV" node="4LE1vMPhNy4" resolve="recoverTypeDefault" />
       <node concept="2VP$b9" id="j$DTRie5QN" role="2VPoh3">
         <node concept="3clFbS" id="j$DTRie5QO" role="2VODD2">
@@ -588,7 +588,7 @@
       </node>
     </node>
     <node concept="2VPoh5" id="4qGA5WCFx$y" role="2VS0gm">
-      <ref role="2VPoh2" node="7lmP5gAtYRF" resolve="ExpectTypeMacro" />
+      <ref role="2VPoh2" node="7lmP5gAtYRF" resolve="_ExpectTypeMacro_" />
       <ref role="2sBCQV" node="4qGA5WCFyqy" resolve="expectType" />
       <node concept="2VP$b9" id="4qGA5WCFx$z" role="2VPoh3">
         <node concept="3clFbS" id="4qGA5WCFx$$" role="2VODD2">
@@ -1179,7 +1179,7 @@
   <node concept="0oKg$" id="7lmP5gAtYRF">
     <property role="TrG5h" value="_ExpectTypeMacro_" />
     <node concept="3iyZe8" id="7lmP5gAtYUv" role="0oKgB">
-      <ref role="3iRiWT" node="7lmP5gAtYUr" resolve="expectType" />
+      <ref role="3iRiWT" node="7lmP5gAtYUr" resolve="_expectType_" />
       <node concept="3clFbS" id="7lmP5gAtYUw" role="3iwQuN">
         <node concept="3Aqczg" id="7lmP5gAtYZ1" role="3cqZAp">
           <node concept="3Aqt3T" id="7lmP5gAtYYZ" role="3Aqpz8">
@@ -1264,7 +1264,7 @@
       <property role="TrG5h" value="term" />
       <node concept="nspSf" id="1vAI4X$GmRS" role="ns1xx" />
       <node concept="1WS0z7" id="1vAI4X$GmRX" role="lGtFl">
-        <ref role="2rW$FS" node="1vAI4X$KFA0" resolve="termDeclaration" />
+        <ref role="2rW$FS" node="1vAI4X$KFA0" resolve="typeTerm_term" />
         <node concept="3JmXsc" id="1vAI4X$GmRY" role="3Jn$fo">
           <node concept="3clFbS" id="1vAI4X$GmRZ" role="2VODD2">
             <node concept="3clFbF" id="1vAI4X$GmUI" role="3cqZAp">
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index e1342077..be16b893 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -451,7 +451,7 @@
     <ref role="1XX52x" to="zfi7:6wBZuQUFd0b" resolve="TypeTermDeclaration" />
     <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
       <node concept="PMmxH" id="6wBZuQUGw5w" role="3EZMnx">
-        <ref role="PMmxG" to="vxmb:6wBZuQUGpjH" resolve="TermDeclaration_Editor" />
+        <ref role="PMmxG" to="vxmb:6wBZuQUGpjH" resolve="TermDeclaration_Default" />
       </node>
       <node concept="3F0ifn" id="6wBZuQUGwsL" role="3EZMnx">
         <property role="3F0ifm" value="-&gt;" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 3af3e604..afd0d912 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -144,7 +144,7 @@
     <property role="EcuMT" value="7505246501517400215" />
     <property role="TrG5h" value="TypeNodeBuilder" />
     <property role="3GE5qa" value="typeTerm" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6wBZuQUG57q" role="1TKVEi">
       <property role="IQ2ns" value="7505246501517414874" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 5b91898a..929f3453 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -3164,12 +3164,12 @@
             <node concept="3cpWsn" id="4LE1vMP67A5" role="3cpWs9">
               <property role="TrG5h" value="typeCollector" />
               <node concept="3uibUv" id="4LE1vMP673a" role="1tU5fm">
-                <ref role="3uigEE" to="tj24:5MNibENhpkH" resolve="TypeCollector" />
+                <ref role="3uigEE" to="tj24:5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
               </node>
               <node concept="2ShNRf" id="4LE1vMP67A6" role="33vP2m">
                 <node concept="HV5vD" id="4LE1vMP67A7" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="HV5vE" to="tj24:5MNibENhpkH" resolve="TypeCollector" />
+                  <ref role="HV5vE" to="tj24:5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
                 </node>
               </node>
             </node>
@@ -3186,7 +3186,7 @@
                   <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
                 </node>
                 <node concept="37vLTw" id="4LE1vMP67A8" role="37wK5m">
-                  <ref role="3cqZAo" node="4LE1vMP67A5" resolve="collector" />
+                  <ref role="3cqZAo" node="4LE1vMP67A5" resolve="typeCollector" />
                 </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 cbe1ed9b..423539f7 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
@@ -17314,7 +17314,7 @@
                           <node concept="3clFbF" id="4qGA5WCXL_t" role="3cqZAp">
                             <node concept="2ShNRf" id="4qGA5WCXL_u" role="3clFbG">
                               <node concept="HV5vD" id="4qGA5WCXL_v" role="2ShVmc">
-                                <ref role="HV5vE" node="5HVB6JRkwKp" resolve="MemoImpl" />
+                                <ref role="HV5vE" node="5HVB6JRkwKp" resolve="TypecheckingStrategy.MemoImpl" />
                               </node>
                             </node>
                           </node>
@@ -18107,7 +18107,7 @@
                           <node concept="3clFbF" id="4qGA5WCY5qP" role="3cqZAp">
                             <node concept="2ShNRf" id="4qGA5WCY5qQ" role="3clFbG">
                               <node concept="HV5vD" id="4qGA5WCY5qR" role="2ShVmc">
-                                <ref role="HV5vE" node="5HVB6JRkwKp" resolve="MemoImpl" />
+                                <ref role="HV5vE" node="5HVB6JRkwKp" resolve="TypecheckingStrategy.MemoImpl" />
                               </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 20c8046d..596225a4 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
@@ -7981,7 +7981,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="4qGA5WD0pSL" role="3clF45">
-          <ref role="3uigEE" node="5itBwM86qUH" resolve="Token" />
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
         <node concept="3Tm1VV" id="4qGA5WD0pSM" role="1B3o_S" />
         <node concept="3clFbS" id="4qGA5WD0pSN" role="3clF47" />