diff --git a/.mps/migration.xml b/.mps/migration.xml
index 6ad5e78e..e3b70f5e 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="241" />
+    <entry key="project.migrated.version" value="243" />
   </component>
 </project>
\ No newline at end of file
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 009ff4e5..8691eef8 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
@@ -11102,7 +11102,7 @@
                                                           <node concept="2OqwBi" id="1jRhh4jJG53" role="3clFbG">
                                                             <node concept="30H73N" id="1jRhh4jJG54" role="2Oq$k0" />
                                                             <node concept="3TrEf2" id="1jRhh4jJG55" role="2OqNvi">
-                                                              <ref role="3Tt5mk" to="wq2x:1ufy3d9wUy7" />
+                                                              <ref role="3Tt5mk" to="wq2x:1ufy3d9wUy7" resolve="init" />
                                                             </node>
                                                           </node>
                                                         </node>
@@ -11216,7 +11216,7 @@
                       <node concept="2ShNRf" id="FQ_DIr5uEf" role="2Oq$k0">
                         <node concept="1pGfFk" id="FQ_DIr5uEg" role="2ShVmc">
                           <property role="373rjd" value="true" />
-                          <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" />
+                          <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                           <node concept="10M0yZ" id="FQ_DIr5uEh" role="37wK5m">
                             <ref role="3cqZAo" to="tpfl:FQ_DIqWkmy" resolve="TRACE_SYM" />
                             <ref role="1PxDUh" to="tpfl:FQ_DIqWkm2" resolve="TemplateTracePredicate" />
@@ -11272,7 +11272,7 @@
                                                   <ref role="3cqZAo" node="FQ_DIrareL" resolve="origInput" />
                                                 </node>
                                                 <node concept="3TrEf2" id="FQ_DIrarf2" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" />
+                                                  <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
                                                 </node>
                                               </node>
                                             </node>
@@ -11813,7 +11813,7 @@
                                                     <node concept="2OqwBi" id="1jRhh4jKx9W" role="3clFbG">
                                                       <node concept="30H73N" id="1jRhh4jKv7s" role="2Oq$k0" />
                                                       <node concept="3TrEf2" id="1jRhh4jKB5Q" role="2OqNvi">
-                                                        <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" />
+                                                        <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" resolve="init" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -15254,7 +15254,7 @@
                   </node>
                   <node concept="2ShNRf" id="5itBwM5S4x1" role="33vP2m">
                     <node concept="1pGfFk" id="5itBwM5S4x2" role="2ShVmc">
-                      <ref role="37wK5l" to="ugy2:5Nh6YP2ayz0" />
+                      <ref role="37wK5l" to="ugy2:5Nh6YP2ayz0" resolve="RuleBuilder" />
                       <node concept="37vLTw" id="5itBwM5Srje" role="37wK5m">
                         <ref role="3cqZAo" node="5itBwM5SoMw" resolve="session" />
                       </node>
@@ -16170,7 +16170,7 @@
                   </node>
                   <node concept="2ShNRf" id="5itBwM6VIna" role="33vP2m">
                     <node concept="1pGfFk" id="5itBwM6VInb" role="2ShVmc">
-                      <ref role="37wK5l" to="ugy2:5Nh6YP2ayz0" />
+                      <ref role="37wK5l" to="ugy2:5Nh6YP2ayz0" resolve="RuleBuilder" />
                       <node concept="37vLTw" id="5itBwM6XZAl" role="37wK5m">
                         <ref role="3cqZAo" node="5itBwM6XBHK" resolve="session" />
                       </node>
@@ -19804,7 +19804,7 @@
             </node>
             <node concept="2OqwBi" id="61G6TdBuARQ" role="37wK5m">
               <node concept="37vLTw" id="61G6TdBu_XR" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdBu_PM" resolve="target" />
+                <ref role="3cqZAo" node="61G6TdBu_PM" resolve="origin" />
                 <node concept="29HgVG" id="61G6TdBuBjA" role="lGtFl">
                   <node concept="3NFfHV" id="61G6TdBuBmu" role="3NFExx">
                     <node concept="3clFbS" id="61G6TdBuBmv" role="2VODD2">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 59402758..bd4dde7c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -132,7 +132,7 @@
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 02b1c201..02301dfe 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
index e1f7adcf..6ffa755b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -1180,7 +1180,7 @@
           <node concept="2OqwBi" id="3GJd70pu30M" role="3clFbG">
             <node concept="2OqwBi" id="3GJd70ptPRO" role="2Oq$k0">
               <node concept="37vLTw" id="3GJd70ptKxI" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
+                <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelSystemId" />
               </node>
               <node concept="T8wYR" id="3GJd70ptWN5" role="2OqNvi" />
             </node>
@@ -1513,7 +1513,7 @@
             <node concept="3clFbF" id="3GJd70pl1LR" role="3cqZAp">
               <node concept="2OqwBi" id="3GJd70pl73I" role="3clFbG">
                 <node concept="37vLTw" id="3GJd70pl1LP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
+                  <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelSystemId" />
                 </node>
                 <node concept="kI3uX" id="3GJd70pleKK" role="2OqNvi">
                   <node concept="2YIFZM" id="55vERwjti0G" role="kIiFs">
@@ -1526,7 +1526,7 @@
                       <node concept="1eOMI4" id="4nDRG5_Vsdh" role="2Oq$k0">
                         <node concept="10QFUN" id="4nDRG5_Vsdi" role="1eOMHV">
                           <node concept="3uibUv" id="4nDRG5_Vsdj" role="10QFUM">
-                            <ref role="3uigEE" node="3GJd70paCjO" resolve="UsedLanguagesCache" />
+                            <ref role="3uigEE" node="3GJd70paCjO" resolve="AspectLookup.UsedLanguagesCache" />
                           </node>
                           <node concept="37vLTw" id="4nDRG5_Vsdk" role="10QFUP">
                             <ref role="3cqZAo" node="3GJd70pfXD1" resolve="cached" />
@@ -1773,7 +1773,7 @@
                 <node concept="2ShNRf" id="4nDRG5_ZdgM" role="37vLTx">
                   <node concept="1pGfFk" id="4nDRG5_ZdgN" role="2ShVmc">
                     <property role="373rjd" value="true" />
-                    <ref role="37wK5l" node="3GJd70pcbpJ" />
+                    <ref role="37wK5l" node="3GJd70pcbpJ" resolve="AspectLookup.UsedLanguagesCache" />
                     <node concept="37vLTw" id="4nDRG5_ZdgO" role="37wK5m">
                       <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
                     </node>
@@ -1794,7 +1794,7 @@
               <node concept="37vLTI" id="5Zr$fBYTbPy" role="3clFbG">
                 <node concept="3EllGN" id="5Zr$fBYSSG6" role="37vLTJ">
                   <node concept="37vLTw" id="5Zr$fBYSFJb" role="3ElQJh">
-                    <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
+                    <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelSystemId" />
                   </node>
                   <node concept="2YIFZM" id="55vERwjtERu" role="3ElVtu">
                     <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
@@ -2319,7 +2319,7 @@
                 </node>
                 <node concept="3dhRuq" id="1AsznI2A2FN" role="2OqNvi">
                   <node concept="37vLTw" id="4nDRG5zP0lh" role="25WWJ7">
-                    <ref role="3cqZAo" node="4nDRG5zP0ld" resolve="remove" />
+                    <ref role="3cqZAo" node="4nDRG5zP0ld" resolve="toRemove" />
                   </node>
                 </node>
               </node>
@@ -2391,7 +2391,7 @@
                 </node>
                 <node concept="TSZUe" id="1AsznI2AOuI" role="2OqNvi">
                   <node concept="37vLTw" id="4nDRG5zQG62" role="25WWJ7">
-                    <ref role="3cqZAo" node="4nDRG5zQG5Y" resolve="remove" />
+                    <ref role="3cqZAo" node="4nDRG5zQG5Y" resolve="toAdd" />
                   </node>
                 </node>
               </node>
@@ -2841,7 +2841,7 @@
             </node>
           </node>
           <node concept="2AHcQZ" id="4nDRG5A4B3r" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" />
+            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
           </node>
         </node>
       </node>
@@ -2858,7 +2858,7 @@
                   <node concept="liA8E" id="3GJd70phUfi" role="2OqNvi">
                     <ref role="37wK5l" to="w1kc:~SModelInternal.removeModelListener(jetbrains.mps.smodel.event.SModelListener)" resolve="removeModelListener" />
                     <node concept="37vLTw" id="4nDRG5_T_Sz" role="37wK5m">
-                      <ref role="3cqZAo" node="3GJd70piqj8" resolve="myModelListener" />
+                      <ref role="3cqZAo" node="3GJd70piqj8" resolve="modelListener" />
                     </node>
                   </node>
                   <node concept="1eOMI4" id="3GJd70pi72e" role="2Oq$k0">
@@ -2901,7 +2901,7 @@
               <node concept="2OqwBi" id="4nDRG5_SQAT" role="37vLTJ">
                 <node concept="Xjq3P" id="4nDRG5_SLHB" role="2Oq$k0" />
                 <node concept="2OwXpG" id="4nDRG5_SXT2" role="2OqNvi">
-                  <ref role="2Oxat5" node="3GJd70piqj8" resolve="myModelListener" />
+                  <ref role="2Oxat5" node="3GJd70piqj8" resolve="modelListener" />
                 </node>
               </node>
             </node>
@@ -4295,7 +4295,7 @@
             <node concept="2OqwBi" id="5vVBssDUUIK" role="37vLTJ">
               <node concept="Xjq3P" id="5vVBssDUUP$" role="2Oq$k0" />
               <node concept="2OwXpG" id="5vVBssDUUIN" role="2OqNvi">
-                <ref role="2Oxat5" node="5vVBssDUUhE" resolve="myPriority" />
+                <ref role="2Oxat5" node="5vVBssDUUhE" resolve="priority" />
               </node>
             </node>
             <node concept="37vLTw" id="5vVBssDUUhO" role="37vLTx">
@@ -5299,7 +5299,7 @@
             <node concept="3cpWs6" id="4nDRG5_gMF_" role="3cqZAp">
               <node concept="2ShNRf" id="4nDRG5_hgMK" role="3cqZAk">
                 <node concept="1pGfFk" id="4nDRG5_hgML" role="2ShVmc">
-                  <ref role="37wK5l" node="3KN3A4uXEXp" />
+                  <ref role="37wK5l" node="3KN3A4uXEXp" resolve="AspectClique" />
                   <node concept="37vLTw" id="4nDRG5_hgMM" role="37wK5m">
                     <ref role="3cqZAo" node="3KN3A4uWnnZ" resolve="aspects" />
                   </node>
@@ -5364,7 +5364,7 @@
               <node concept="3cpWs6" id="4nDRG5_hSsn" role="3cqZAp">
                 <node concept="2ShNRf" id="4nDRG5_i2bN" role="3cqZAk">
                   <node concept="1pGfFk" id="4nDRG5_i2bO" role="2ShVmc">
-                    <ref role="37wK5l" node="7u0sJ20M14I" />
+                    <ref role="37wK5l" node="7u0sJ20M14I" resolve="AspectClique" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 3a76e4ce..52719f99 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -3053,7 +3053,7 @@
       </node>
     </node>
     <node concept="2AHcQZ" id="4nDRG5AyPG2" role="2AJF6D">
-      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       <node concept="2B6LJw" id="4nDRG5Azg8V" role="2B76xF">
         <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
         <node concept="3clFbT" id="4nDRG5Azgbe" role="2B70Vg">
@@ -3471,11 +3471,11 @@
             <node concept="2OqwBi" id="5lpFZvO1gfd" role="37vLTJ">
               <node concept="Xjq3P" id="5lpFZvO1gfe" role="2Oq$k0" />
               <node concept="2OwXpG" id="5lpFZvO1gff" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                <ref role="2Oxat5" node="7WKNeR9bpBf" resolve="ruleTemplateIndex" />
               </node>
             </node>
             <node concept="37vLTw" id="5lpFZvO1gfg" role="37vLTx">
-              <ref role="3cqZAo" node="5lpFZvO1gfx" resolve="ruleProcessingSession" />
+              <ref role="3cqZAo" node="5lpFZvO1gfx" resolve="ruleTemplateIndex" />
             </node>
           </node>
         </node>
@@ -3510,7 +3510,7 @@
             <node concept="2OqwBi" id="2sMBLui0o6D" role="37vLTJ">
               <node concept="Xjq3P" id="2sMBLui0ow4" role="2Oq$k0" />
               <node concept="2OwXpG" id="2sMBLui0o6G" role="2OqNvi">
-                <ref role="2Oxat5" node="2sMBLui0mnQ" resolve="myRulesPlanHandler" />
+                <ref role="2Oxat5" node="2sMBLui0mnQ" resolve="rulesPlanHandler" />
               </node>
             </node>
             <node concept="37vLTw" id="2sMBLui0mo0" role="37vLTx">
@@ -3929,7 +3929,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="KkWtiKsWn9" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="39eNUjlYSQk" role="jymVt" />
@@ -4141,7 +4141,7 @@
                       <node concept="liA8E" id="2sMBLuhTFq5" role="2OqNvi">
                         <ref role="37wK5l" node="7DvO2M9UagU" resolve="buildPlan" />
                         <node concept="37vLTw" id="2sMBLuhTKXP" role="37wK5m">
-                          <ref role="3cqZAo" node="2sMBLuhTKXM" resolve="plan" />
+                          <ref role="3cqZAo" node="2sMBLuhTKXM" resolve="rulesPlan" />
                         </node>
                       </node>
                     </node>
@@ -4171,7 +4171,7 @@
                           <ref role="3cqZAo" node="6OXbTDxtYkB" resolve="name" />
                         </node>
                         <node concept="37vLTw" id="2sMBLuhU7hs" role="37wK5m">
-                          <ref role="3cqZAo" node="2sMBLuhTKXM" resolve="plan" />
+                          <ref role="3cqZAo" node="2sMBLuhTKXM" resolve="rulesPlan" />
                         </node>
                       </node>
                     </node>
@@ -6252,7 +6252,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4nDRG5B2lRV" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="3o9wrC3sbje" role="jymVt" />
@@ -6287,7 +6287,7 @@
       </node>
     </node>
     <node concept="2AHcQZ" id="4nDRG5DaT6w" role="2AJF6D">
-      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
     </node>
   </node>
   <node concept="3HP615" id="6RN9TdHmQLy">
@@ -6344,7 +6344,7 @@
       </node>
     </node>
     <node concept="2AHcQZ" id="4nDRG5DaX7R" role="2AJF6D">
-      <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
     </node>
   </node>
   <node concept="312cEu" id="39eNUjlSKNI">
@@ -6448,7 +6448,7 @@
           <node concept="3fqX7Q" id="6nOPMUv6_8n" role="3clFbw">
             <node concept="2OqwBi" id="6nOPMUv6_8p" role="3fr31v">
               <node concept="37vLTw" id="6nOPMUv6_8q" role="2Oq$k0">
-                <ref role="3cqZAo" node="6nOPMUv5WB5" resolve="visitedInput" />
+                <ref role="3cqZAo" node="6nOPMUv5WB5" resolve="pointsByInput" />
               </node>
               <node concept="2Nt0df" id="6nOPMUvdLHP" role="2OqNvi">
                 <node concept="37vLTw" id="6nOPMUvdRyN" role="38cxEo">
@@ -6519,11 +6519,11 @@
           <node concept="3cpWsn" id="4Q576RaVq4y" role="3cpWs9">
             <property role="TrG5h" value="templateTracePoint" />
             <node concept="3uibUv" id="4Q576RbBmvq" role="1tU5fm">
-              <ref role="3uigEE" node="39eNUjlVKZl" resolve="TemplateTracePoint" />
+              <ref role="3uigEE" node="39eNUjlVKZl" resolve="TemplateTraceImpl.TemplateTracePoint" />
             </node>
             <node concept="2ShNRf" id="4Q576RaVqLZ" role="33vP2m">
               <node concept="1pGfFk" id="4Q576RaVriM" role="2ShVmc">
-                <ref role="37wK5l" node="39eNUjlVKZt" resolve="TemplateTraceImpl.TracedTemplate" />
+                <ref role="37wK5l" node="39eNUjlVKZt" resolve="TemplateTraceImpl.TemplateTracePoint" />
                 <node concept="37vLTw" id="4Q576RaVrs_" role="37wK5m">
                   <ref role="3cqZAo" node="4Q576RaSm$1" resolve="input" />
                 </node>
@@ -6551,7 +6551,7 @@
             <node concept="liA8E" id="4Q576RaVsn$" role="2OqNvi">
               <ref role="37wK5l" node="799SgOKzLTr" resolve="addChild" />
               <node concept="37vLTw" id="4Q576RaVsQv" role="37wK5m">
-                <ref role="3cqZAo" node="4Q576RaVq4y" resolve="tplTrace" />
+                <ref role="3cqZAo" node="4Q576RaVq4y" resolve="templateTracePoint" />
               </node>
             </node>
           </node>
@@ -6592,10 +6592,10 @@
                   <node concept="37vLTI" id="6nOPMUv1M6P" role="3clFbG">
                     <node concept="3EllGN" id="6nOPMUv1M6Q" role="37vLTJ">
                       <node concept="2GrUjf" id="6nOPMUv1Onu" role="3ElVtu">
-                        <ref role="2Gs0qQ" node="4Q576RaVv4q" resolve="reqNode" />
+                        <ref role="2Gs0qQ" node="4Q576RaVv4q" resolve="req" />
                       </node>
                       <node concept="37vLTw" id="6nOPMUv1M6S" role="3ElQJh">
-                        <ref role="3cqZAo" node="799SgOKlJtN" resolve="templateByRequired" />
+                        <ref role="3cqZAo" node="799SgOKlJtN" resolve="templatesByRequired" />
                       </node>
                     </node>
                     <node concept="2ShNRf" id="6nOPMUv1M6T" role="37vLTx">
@@ -6611,11 +6611,11 @@
               <node concept="3fqX7Q" id="6nOPMUv1M6W" role="3clFbw">
                 <node concept="2OqwBi" id="6nOPMUv1M6X" role="3fr31v">
                   <node concept="37vLTw" id="6nOPMUv1M6Y" role="2Oq$k0">
-                    <ref role="3cqZAo" node="799SgOKlJtN" resolve="templateByRequired" />
+                    <ref role="3cqZAo" node="799SgOKlJtN" resolve="templatesByRequired" />
                   </node>
                   <node concept="2Nt0df" id="6nOPMUv1M6Z" role="2OqNvi">
                     <node concept="2GrUjf" id="6nOPMUv1Ont" role="38cxEo">
-                      <ref role="2Gs0qQ" node="4Q576RaVv4q" resolve="reqNode" />
+                      <ref role="2Gs0qQ" node="4Q576RaVv4q" resolve="req" />
                     </node>
                   </node>
                 </node>
@@ -6625,15 +6625,15 @@
               <node concept="2OqwBi" id="4Q576RaV$zp" role="3clFbG">
                 <node concept="3EllGN" id="6nOPMUv1M7O" role="2Oq$k0">
                   <node concept="2GrUjf" id="6nOPMUv1Onv" role="3ElVtu">
-                    <ref role="2Gs0qQ" node="4Q576RaVv4q" resolve="reqNode" />
+                    <ref role="2Gs0qQ" node="4Q576RaVv4q" resolve="req" />
                   </node>
                   <node concept="37vLTw" id="6nOPMUv1M7Q" role="3ElQJh">
-                    <ref role="3cqZAo" node="799SgOKlJtN" resolve="templateByRequired" />
+                    <ref role="3cqZAo" node="799SgOKlJtN" resolve="templatesByRequired" />
                   </node>
                 </node>
                 <node concept="2Ke9KJ" id="4Q576RaV_jd" role="2OqNvi">
                   <node concept="37vLTw" id="4Q576RaVA_H" role="25WWJ7">
-                    <ref role="3cqZAo" node="4Q576RaVq4y" resolve="tplTrace" />
+                    <ref role="3cqZAo" node="4Q576RaVq4y" resolve="templateTracePoint" />
                   </node>
                 </node>
               </node>
@@ -6675,7 +6675,7 @@
           <node concept="3cpWsn" id="4Q576RaUOoA" role="3cpWs9">
             <property role="TrG5h" value="point" />
             <node concept="3uibUv" id="4Q576RaV4Yd" role="1tU5fm">
-              <ref role="3uigEE" node="39eNUjlUY05" resolve="InputTracePoint" />
+              <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.InputTracePoint" />
             </node>
             <node concept="3EllGN" id="6nOPMUvuCSr" role="33vP2m">
               <node concept="37vLTw" id="6nOPMUvuCSt" role="3ElVtu">
@@ -6709,13 +6709,13 @@
         </node>
         <node concept="3cpWs6" id="4Q576RaV0ps" role="3cqZAp">
           <node concept="37vLTw" id="4Q576RaV3ey" role="3cqZAk">
-            <ref role="3cqZAo" node="4Q576RaUOoA" resolve="lastInputPoint" />
+            <ref role="3cqZAo" node="4Q576RaUOoA" resolve="point" />
           </node>
         </node>
       </node>
       <node concept="3Tm6S6" id="4Q576RaUC44" role="1B3o_S" />
       <node concept="3uibUv" id="4Q576RaUF8n" role="3clF45">
-        <ref role="3uigEE" node="39eNUjlUY05" resolve="InputTracePoint" />
+        <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.InputTracePoint" />
       </node>
       <node concept="37vLTG" id="4Q576RaUInz" role="3clF46">
         <property role="TrG5h" value="input" />
@@ -6732,7 +6732,7 @@
       <node concept="37vLTG" id="4Q576RbdIVk" role="3clF46">
         <property role="TrG5h" value="inputPoint" />
         <node concept="3uibUv" id="4Q576Rbb7Za" role="1tU5fm">
-          <ref role="3uigEE" node="39eNUjlUY05" resolve="InputTracePoint" />
+          <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.InputTracePoint" />
         </node>
       </node>
       <node concept="3clFbS" id="4Q576Rbani$" role="3clF47">
@@ -6904,15 +6904,15 @@
                 <property role="TrG5h" value="templatePoints" />
                 <node concept="_YKpA" id="4Q576RbaW3P" role="1tU5fm">
                   <node concept="3uibUv" id="6nOPMUuVe1K" role="_ZDj9">
-                    <ref role="3uigEE" node="39eNUjlVKZl" resolve="TemplateTracePoint" />
+                    <ref role="3uigEE" node="39eNUjlVKZl" resolve="TemplateTraceImpl.TemplateTracePoint" />
                   </node>
                 </node>
                 <node concept="3EllGN" id="4Q576RbaW3R" role="33vP2m">
                   <node concept="37vLTw" id="4Q576Rbbg$9" role="3ElVtu">
-                    <ref role="3cqZAo" node="4Q576RbdFTg" resolve="node" />
+                    <ref role="3cqZAo" node="4Q576RbdFTg" resolve="input" />
                   </node>
                   <node concept="37vLTw" id="4Q576RbaW3T" role="3ElQJh">
-                    <ref role="3cqZAo" node="799SgOKlJtN" resolve="templateByRequired" />
+                    <ref role="3cqZAo" node="799SgOKlJtN" resolve="templatesByRequired" />
                   </node>
                 </node>
               </node>
@@ -6949,7 +6949,7 @@
               </node>
               <node concept="2OqwBi" id="6YRY30_IKde" role="3clFbw">
                 <node concept="37vLTw" id="6YRY30_IK48" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4Q576RbaW3O" resolve="sources" />
+                  <ref role="3cqZAo" node="4Q576RbaW3O" resolve="templatePoints" />
                 </node>
                 <node concept="1v1jN8" id="6YRY30_ILzS" role="2OqNvi" />
               </node>
@@ -7022,11 +7022,11 @@
               <node concept="3cpWsn" id="4Q576RbaW41" role="3cpWs9">
                 <property role="TrG5h" value="templatePoint" />
                 <node concept="3uibUv" id="4Q576RbaW42" role="1tU5fm">
-                  <ref role="3uigEE" node="39eNUjlVKZl" resolve="TemplateTracePoint" />
+                  <ref role="3uigEE" node="39eNUjlVKZl" resolve="TemplateTraceImpl.TemplateTracePoint" />
                 </node>
                 <node concept="2OqwBi" id="4Q576RbaW43" role="33vP2m">
                   <node concept="37vLTw" id="4Q576RbaW44" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4Q576RbaW3O" resolve="sources" />
+                    <ref role="3cqZAo" node="4Q576RbaW3O" resolve="templatePoints" />
                   </node>
                   <node concept="2Kt2Hk" id="4Q576RbaW45" role="2OqNvi" />
                 </node>
@@ -7037,11 +7037,11 @@
                 <node concept="3clFbF" id="4Q576RbaW48" role="3cqZAp">
                   <node concept="2OqwBi" id="4Q576RbaW49" role="3clFbG">
                     <node concept="37vLTw" id="4Q576RbaW4a" role="2Oq$k0">
-                      <ref role="3cqZAo" node="799SgOKlJtN" resolve="templateByRequired" />
+                      <ref role="3cqZAo" node="799SgOKlJtN" resolve="templatesByRequired" />
                     </node>
                     <node concept="kI3uX" id="4Q576RbaW4b" role="2OqNvi">
                       <node concept="37vLTw" id="4Q576Rbbhr1" role="kIiFs">
-                        <ref role="3cqZAo" node="4Q576RbdFTg" resolve="node" />
+                        <ref role="3cqZAo" node="4Q576RbdFTg" resolve="input" />
                       </node>
                     </node>
                   </node>
@@ -7049,7 +7049,7 @@
               </node>
               <node concept="2OqwBi" id="4Q576RbaW4d" role="3clFbw">
                 <node concept="37vLTw" id="4Q576RbaW4e" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4Q576RbaW3O" resolve="sources" />
+                  <ref role="3cqZAo" node="4Q576RbaW3O" resolve="templatePoints" />
                 </node>
                 <node concept="1v1jN8" id="4Q576RbaW4f" role="2OqNvi" />
               </node>
@@ -7057,12 +7057,12 @@
             <node concept="3clFbF" id="4Q576RbaW4g" role="3cqZAp">
               <node concept="2OqwBi" id="4Q576RbaW4h" role="3clFbG">
                 <node concept="37vLTw" id="4Q576RbaW4i" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4Q576RbaW41" resolve="source" />
+                  <ref role="3cqZAo" node="4Q576RbaW41" resolve="templatePoint" />
                 </node>
                 <node concept="liA8E" id="4Q576RbaW4j" role="2OqNvi">
                   <ref role="37wK5l" node="799SgOKzLTr" resolve="addChild" />
                   <node concept="37vLTw" id="4Q576RbaW4k" role="37wK5m">
-                    <ref role="3cqZAo" node="4Q576RbdwvV" resolve="trace" />
+                    <ref role="3cqZAo" node="4Q576RbdwvV" resolve="inputPoint" />
                   </node>
                 </node>
               </node>
@@ -7071,11 +7071,11 @@
           </node>
           <node concept="2OqwBi" id="4Q576RbaW4l" role="3clFbw">
             <node concept="37vLTw" id="4Q576RbaW4m" role="2Oq$k0">
-              <ref role="3cqZAo" node="799SgOKlJtN" resolve="templateByRequired" />
+              <ref role="3cqZAo" node="799SgOKlJtN" resolve="templatesByRequired" />
             </node>
             <node concept="2Nt0df" id="4Q576RbaW4n" role="2OqNvi">
               <node concept="37vLTw" id="4Q576Rbbg9Q" role="38cxEo">
-                <ref role="3cqZAo" node="4Q576RbdFTg" resolve="node" />
+                <ref role="3cqZAo" node="4Q576RbdFTg" resolve="input" />
               </node>
             </node>
           </node>
@@ -7116,7 +7116,7 @@
                   </node>
                   <node concept="TSZUe" id="4Q576RbaW4B" role="2OqNvi">
                     <node concept="37vLTw" id="4Q576RbaW4C" role="25WWJ7">
-                      <ref role="3cqZAo" node="4Q576RbdwvV" resolve="trace" />
+                      <ref role="3cqZAo" node="4Q576RbdwvV" resolve="inputPoint" />
                     </node>
                   </node>
                 </node>
@@ -7134,7 +7134,7 @@
       <node concept="37vLTG" id="4Q576RbdwvV" role="3clF46">
         <property role="TrG5h" value="inputPoint" />
         <node concept="3uibUv" id="4Q576Rbb6vU" role="1tU5fm">
-          <ref role="3uigEE" node="39eNUjlUY05" resolve="InputTracePoint" />
+          <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.InputTracePoint" />
         </node>
       </node>
     </node>
@@ -7950,7 +7950,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="5ZROos5hvoU" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="3clFb_" id="3YPJJpIcXnC" role="jymVt">
@@ -8353,7 +8353,7 @@
                 <node concept="iZEcu" id="39eNUjlWtTi" role="2OqNvi" />
               </node>
               <node concept="37vLTw" id="39eNUjlWts5" role="37vLTJ">
-                <ref role="3cqZAo" node="39eNUjlWq3P" resolve="nodeArg" />
+                <ref role="3cqZAo" node="39eNUjlWq3P" resolve="nodeRef" />
               </node>
             </node>
           </node>
@@ -8509,7 +8509,7 @@
                 <node concept="Tc6Ow" id="39eNUjlX0jP" role="2ShVmc">
                   <node concept="2sp9CU" id="39eNUjlX0LV" role="HW$YZ" />
                   <node concept="37vLTw" id="39eNUjlX1as" role="HW$Y0">
-                    <ref role="3cqZAo" node="39eNUjlWq3P" resolve="nodeArg" />
+                    <ref role="3cqZAo" node="39eNUjlWq3P" resolve="nodeRef" />
                   </node>
                   <node concept="37vLTw" id="39eNUjlX15r" role="HW$Y0">
                     <ref role="3cqZAo" node="39eNUjlVKZm" resolve="templateRef" />
@@ -8632,7 +8632,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="5ZROos5bx50" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="3YPJJpId6uy" role="jymVt" />
@@ -8663,7 +8663,7 @@
       <node concept="3rvAFt" id="6nOPMUvdpPE" role="1tU5fm">
         <node concept="3Tqbb2" id="6nOPMUvdt8S" role="3rvQeY" />
         <node concept="3uibUv" id="6nOPMUvdvJM" role="3rvSg0">
-          <ref role="3uigEE" node="39eNUjlUY05" resolve="InputTracePoint" />
+          <ref role="3uigEE" node="39eNUjlUY05" resolve="TemplateTraceImpl.InputTracePoint" />
         </node>
       </node>
       <node concept="2ShNRf" id="6nOPMUv5ZfP" role="33vP2m">
@@ -9044,7 +9044,7 @@
             <node concept="2OqwBi" id="4nDRG5Dc_Zi" role="37vLTJ">
               <node concept="Xjq3P" id="4nDRG5Dc_zP" role="2Oq$k0" />
               <node concept="2OwXpG" id="4nDRG5DcA$_" role="2OqNvi">
-                <ref role="2Oxat5" node="4nDRG5DczbC" resolve="myReportSink" />
+                <ref role="2Oxat5" node="4nDRG5DczbC" resolve="reportSink" />
               </node>
             </node>
             <node concept="37vLTw" id="4nDRG5DczbO" role="37vLTx">
@@ -9351,7 +9351,7 @@
                     </node>
                     <node concept="2ShNRf" id="4nDRG5DcoDn" role="33vP2m">
                       <node concept="1pGfFk" id="4nDRG5DcoDo" role="2ShVmc">
-                        <ref role="37wK5l" node="55xYlrlYx4c" />
+                        <ref role="37wK5l" node="55xYlrlYx4c" resolve="FeedbackReportItem" />
                         <node concept="37vLTw" id="4nDRG5DcoDp" role="37wK5m">
                           <ref role="3cqZAo" node="4nDRG5Dbtfc" resolve="status" />
                         </node>
@@ -9421,7 +9421,7 @@
                 <node concept="3cpWs6" id="4nDRG5DbkLs" role="3cqZAp">
                   <node concept="Rm8GO" id="4nDRG5DbkLt" role="3cqZAk">
                     <ref role="Rm8GQ" to="w7la:~Supervisor$HandleResult.DROP" resolve="DROP" />
-                    <ref role="1Px2BO" to="w7la:~Supervisor$HandleResult" resolve="HandleResult" />
+                    <ref role="1Px2BO" to="w7la:~Supervisor$HandleResult" resolve="Supervisor.HandleResult" />
                   </node>
                 </node>
               </node>
@@ -9450,12 +9450,12 @@
         <node concept="3cpWs6" id="4nDRG5DbkLA" role="3cqZAp">
           <node concept="Rm8GO" id="4nDRG5DbkLB" role="3cqZAk">
             <ref role="Rm8GQ" to="w7la:~Supervisor$HandleResult.PROPAGATE" resolve="PROPAGATE" />
-            <ref role="1Px2BO" to="w7la:~Supervisor$HandleResult" resolve="HandleResult" />
+            <ref role="1Px2BO" to="w7la:~Supervisor$HandleResult" resolve="Supervisor.HandleResult" />
           </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="4nDRG5DbjgK" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -9517,7 +9517,7 @@
       </node>
       <node concept="P$JXv" id="4nDRG5DbTQS" role="lGtFl" />
       <node concept="2AHcQZ" id="4nDRG5DbTQV" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxMMQ5" role="jymVt" />
@@ -9596,7 +9596,7 @@
       </node>
       <node concept="P$JXv" id="4nDRG5DbTDE" role="lGtFl" />
       <node concept="2AHcQZ" id="4nDRG5DbTDH" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="55xYlrlYx4b" role="jymVt" />
@@ -9611,7 +9611,7 @@
       <property role="od$2w" value="false" />
       <node concept="3Tm1VV" id="1FOQehwovo2" role="1B3o_S" />
       <node concept="3uibUv" id="3Frdzi2HNjf" role="3clF45">
-        <ref role="3uigEE" to="d6hs:~IssueKindReportItem$ItemKind" resolve="ItemKind" />
+        <ref role="3uigEE" to="d6hs:~IssueKindReportItem$ItemKind" resolve="IssueKindReportItem.ItemKind" />
       </node>
       <node concept="3clFbS" id="1FOQehwovoe" role="3clF47">
         <node concept="3clFbF" id="1FOQehwovF_" role="3cqZAp">
@@ -9636,7 +9636,7 @@
       <node concept="3uibUv" id="4ekZiHdbS3t" role="3clF45">
         <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
         <node concept="3uibUv" id="4ekZiHdbS3u" role="11_B2D">
-          <ref role="3uigEE" to="d6hs:~RuleIdFlavouredItem$TypesystemRuleId" resolve="TypesystemRuleId" />
+          <ref role="3uigEE" to="d6hs:~RuleIdFlavouredItem$TypesystemRuleId" resolve="RuleIdFlavouredItem.TypesystemRuleId" />
         </node>
       </node>
       <node concept="3clFbS" id="4ekZiHdbS3y" role="3clF47">
@@ -9646,11 +9646,11 @@
               <node concept="2ShNRf" id="4ekZiHdROXV" role="3cqZAk">
                 <node concept="Tc6Ow" id="4ekZiHdROXW" role="2ShVmc">
                   <node concept="3uibUv" id="4ekZiHdROXX" role="HW$YZ">
-                    <ref role="3uigEE" to="d6hs:~RuleIdFlavouredItem$TypesystemRuleId" resolve="TypesystemRuleId" />
+                    <ref role="3uigEE" to="d6hs:~RuleIdFlavouredItem$TypesystemRuleId" resolve="RuleIdFlavouredItem.TypesystemRuleId" />
                   </node>
                   <node concept="2ShNRf" id="4ekZiHdROXY" role="HW$Y0">
                     <node concept="1pGfFk" id="4ekZiHdROXZ" role="2ShVmc">
-                      <ref role="37wK5l" to="d6hs:~RuleIdFlavouredItem$TypesystemRuleId.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="TypesystemRuleId" />
+                      <ref role="37wK5l" to="d6hs:~RuleIdFlavouredItem$TypesystemRuleId.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="RuleIdFlavouredItem.TypesystemRuleId" />
                       <node concept="37vLTw" id="5MK8bDyTvrM" role="37wK5m">
                         <ref role="3cqZAo" node="4ekZiHdeOLS" resolve="templateRef" />
                       </node>
@@ -9961,7 +9961,7 @@
                 <ref role="3cqZAo" node="2hQbw6HCsn9" resolve="staticRules" />
               </node>
               <node concept="37vLTw" id="5NUR$ODdHB" role="37wK5m">
-                <ref role="3cqZAo" node="7DvO2M9Uagt" resolve="ruleBuilders" />
+                <ref role="3cqZAo" node="7DvO2M9Uagt" resolve="updateFun" />
               </node>
             </node>
           </node>
@@ -11414,7 +11414,7 @@
           <property role="TrG5h" value="updateFun" />
           <node concept="1ajhzC" id="3SOUSnYuNG0" role="1tU5fm">
             <node concept="3uibUv" id="3SOUSnYuNG1" role="1ajw0F">
-              <ref role="3uigEE" node="2gPa6JIZsdd" resolve="UpdateRec" />
+              <ref role="3uigEE" node="2gPa6JIZsdd" resolve="RulesPlanHandler.UpdateRec" />
             </node>
             <node concept="3vKaQO" id="3SOUSnYuNG2" role="1ajl9A">
               <node concept="3uibUv" id="3SOUSnYvBBT" role="3O5elw">
@@ -14278,7 +14278,7 @@
       <node concept="37vLTG" id="6nFpYlujKf7" role="3clF46">
         <property role="TrG5h" value="updatesRecorder" />
         <node concept="3uibUv" id="6nFpYlujNlq" role="1tU5fm">
-          <ref role="3uigEE" node="6nFpYlu02jD" />
+          <ref role="3uigEE" node="6nFpYlu02jD" resolve="UpdatesRecorder" />
         </node>
       </node>
       <node concept="37vLTG" id="23Habm3snHP" role="3clF46">
@@ -14661,7 +14661,7 @@
             <node concept="3clFbF" id="4hQVL4fbewz" role="3cqZAp">
               <node concept="2OqwBi" id="3OUB6BBRauS" role="3clFbG">
                 <node concept="37vLTw" id="4hQVL4fbewD" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4hQVL4fbdNS" resolve="required" />
+                  <ref role="3cqZAo" node="4hQVL4fbdNS" resolve="requiredNoInput" />
                 </node>
                 <node concept="X8dFx" id="3OUB6BBRaFH" role="2OqNvi">
                   <node concept="1LFfDK" id="4hQVL4fbdNT" role="25WWJ7">
@@ -14773,7 +14773,7 @@
                     <node concept="1rXfSq" id="5HxDM7D5RUp" role="37wK5m">
                       <ref role="37wK5l" node="tIwzd1MM22" resolve="doProcessRequired" />
                       <node concept="37vLTw" id="5HxDM7D8W7g" role="37wK5m">
-                        <ref role="3cqZAo" node="4hQVL4fbdNS" resolve="required" />
+                        <ref role="3cqZAo" node="4hQVL4fbdNS" resolve="requiredNoInput" />
                       </node>
                       <node concept="2ShNRf" id="1bodCZASVbC" role="37wK5m">
                         <node concept="2i4dXS" id="1bodCZASVbD" role="2ShVmc">
@@ -14884,7 +14884,7 @@
                       <ref role="3cqZAo" node="6nFpYlujVzU" resolve="updatesRecorder" />
                     </node>
                     <node concept="liA8E" id="17DrR$SPIht" role="2OqNvi">
-                      <ref role="37wK5l" node="3DPJ8QIziiQ" />
+                      <ref role="37wK5l" node="3DPJ8QIziiQ" resolve="invalidatedSet" />
                     </node>
                   </node>
                   <node concept="1v1jN8" id="17DrR$SPIhu" role="2OqNvi" />
@@ -14896,7 +14896,7 @@
                     <ref role="3cqZAo" node="6nFpYlujVzU" resolve="updatesRecorder" />
                   </node>
                   <node concept="liA8E" id="17DrR$SSy2I" role="2OqNvi">
-                    <ref role="37wK5l" node="17DrR$SS7Jv" />
+                    <ref role="37wK5l" node="17DrR$SS7Jv" resolve="introducedSet" />
                   </node>
                 </node>
                 <node concept="1v1jN8" id="17DrR$SSw1G" role="2OqNvi" />
@@ -15200,7 +15200,7 @@
                   <node concept="2OqwBi" id="61G6TdDXfHG" role="37vLTx">
                     <node concept="2ShNRf" id="61G6TdDXfHH" role="2Oq$k0">
                       <node concept="1pGfFk" id="1bodCZDaY0X" role="2ShVmc">
-                        <ref role="37wK5l" node="1bodCZDaLCE" resolve="ProgramFactory.AssistedWalk" />
+                        <ref role="37wK5l" node="1bodCZDaLCE" resolve="AssistedWalk" />
                         <node concept="37Ijox" id="1bodCZDhxNr" role="37wK5m">
                           <ref role="37Ijqf" node="1bodCZD4fET" resolve="invalidatedOrNew" />
                           <node concept="Xjq3P" id="1bodCZDhxNs" role="wWaWy" />
@@ -15498,7 +15498,7 @@
                   <ref role="37wK5l" to="wwqx:~Logger.trace(java.lang.String)" resolve="trace" />
                   <node concept="3cpWs3" id="3SOUSo1a3Cq" role="37wK5m">
                     <node concept="37vLTw" id="3SOUSo1a3Cr" role="3uHU7w">
-                      <ref role="3cqZAo" node="1bodCZBwKXW" resolve="visited" />
+                      <ref role="3cqZAo" node="1bodCZBwKXW" resolve="allVisited" />
                     </node>
                     <node concept="Xl_RD" id="3SOUSo1a3Cs" role="3uHU7B">
                       <property role="Xl_RC" value="initially visited " />
@@ -15524,7 +15524,7 @@
             </node>
             <node concept="1kEaZ2" id="5NUR$Op$4m" role="2OqNvi">
               <node concept="37vLTw" id="5NUR$Op_oH" role="25WWJ7">
-                <ref role="3cqZAo" node="1bodCZBwKXW" resolve="visited" />
+                <ref role="3cqZAo" node="1bodCZBwKXW" resolve="allVisited" />
               </node>
             </node>
           </node>
@@ -15571,7 +15571,7 @@
                       <ref role="37wK5l" to="wwqx:~Logger.trace(java.lang.String)" resolve="trace" />
                       <node concept="3cpWs3" id="1bodCZ_qFOv" role="37wK5m">
                         <node concept="37vLTw" id="1bodCZ_qFOw" role="3uHU7w">
-                          <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                          <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                         </node>
                         <node concept="Xl_RD" id="1bodCZ_qFOx" role="3uHU7B">
                           <property role="Xl_RC" value="iterate invalidated " />
@@ -15589,7 +15589,7 @@
                       <ref role="37wK5l" to="wwqx:~Logger.trace(java.lang.String)" resolve="trace" />
                       <node concept="3cpWs3" id="1bodCZA7KA6" role="37wK5m">
                         <node concept="37vLTw" id="1bodCZA7KA7" role="3uHU7w">
-                          <ref role="3cqZAo" node="1bodCZBwKXW" resolve="visited" />
+                          <ref role="3cqZAo" node="1bodCZBwKXW" resolve="allVisited" />
                         </node>
                         <node concept="Xl_RD" id="1bodCZA7KA8" role="3uHU7B">
                           <property role="Xl_RC" value="already visited " />
@@ -15620,7 +15620,7 @@
                     <node concept="2OqwBi" id="1bodCZA7KAe" role="33vP2m">
                       <node concept="2ShNRf" id="1bodCZA7KAf" role="2Oq$k0">
                         <node concept="1pGfFk" id="1bodCZDaY0T" role="2ShVmc">
-                          <ref role="37wK5l" node="1bodCZDk5LJ" />
+                          <ref role="37wK5l" node="1bodCZDk5LJ" resolve="AssistedWalk" />
                         </node>
                       </node>
                       <node concept="liA8E" id="1bodCZA7KAh" role="2OqNvi">
@@ -15668,7 +15668,7 @@
                 <node concept="3clFbF" id="1bodCZA7KAw" role="3cqZAp">
                   <node concept="2OqwBi" id="1bodCZA7KAx" role="3clFbG">
                     <node concept="37vLTw" id="1bodCZA7KAy" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1bodCZBwKXW" resolve="visited" />
+                      <ref role="3cqZAo" node="1bodCZBwKXW" resolve="allVisited" />
                     </node>
                     <node concept="X8dFx" id="1bodCZA7KAz" role="2OqNvi">
                       <node concept="2OqwBi" id="1bodCZA7KA$" role="25WWJ7">
@@ -15711,7 +15711,7 @@
                 <node concept="3clFbF" id="1bodCZ_w0g6" role="3cqZAp">
                   <node concept="2OqwBi" id="1bodCZ_wivd" role="3clFbG">
                     <node concept="37vLTw" id="1bodCZ_w0g4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                     </node>
                     <node concept="X8dFx" id="1bodCZ_wO5Q" role="2OqNvi">
                       <node concept="2OqwBi" id="1bodCZ_x8ik" role="25WWJ7">
@@ -15745,13 +15745,13 @@
                     <node concept="2OqwBi" id="1bodCZ_yLKF" role="33vP2m">
                       <node concept="2ShNRf" id="1bodCZ_yLKG" role="2Oq$k0">
                         <node concept="1pGfFk" id="1bodCZDaY0V" role="2ShVmc">
-                          <ref role="37wK5l" node="1bodCZDk5LJ" />
+                          <ref role="37wK5l" node="1bodCZDk5LJ" resolve="AssistedWalk" />
                         </node>
                       </node>
                       <node concept="liA8E" id="1bodCZ_yLKI" role="2OqNvi">
                         <ref role="37wK5l" node="1bodCZDdnh4" resolve="forEachRequired" />
                         <node concept="37vLTw" id="1bodCZ_yLKJ" role="37wK5m">
-                          <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                          <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                         </node>
                         <node concept="2ShNRf" id="1bodCZ_yLKK" role="37wK5m">
                           <node concept="1pGfFk" id="1bodCZ_yLKL" role="2ShVmc">
@@ -15795,7 +15795,7 @@
                 <node concept="3clFbF" id="1bodCZ_yLKY" role="3cqZAp">
                   <node concept="2OqwBi" id="1bodCZ_yLKZ" role="3clFbG">
                     <node concept="37vLTw" id="1bodCZ_yLL0" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1bodCZBwKXW" resolve="visited" />
+                      <ref role="3cqZAo" node="1bodCZBwKXW" resolve="allVisited" />
                     </node>
                     <node concept="X8dFx" id="1bodCZ_yLL1" role="2OqNvi">
                       <node concept="2OqwBi" id="1bodCZ_yLL2" role="25WWJ7">
@@ -15813,7 +15813,7 @@
                 <node concept="3clFbF" id="1bodCZ_AbWR" role="3cqZAp">
                   <node concept="2OqwBi" id="1bodCZ_Ajy0" role="3clFbG">
                     <node concept="37vLTw" id="1bodCZ_AbWP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                     </node>
                     <node concept="2EZike" id="1bodCZ_AraX" role="2OqNvi" />
                   </node>
@@ -15821,7 +15821,7 @@
                 <node concept="3clFbF" id="1bodCZ_yLL5" role="3cqZAp">
                   <node concept="2OqwBi" id="1bodCZ_yLL6" role="3clFbG">
                     <node concept="37vLTw" id="1bodCZ_yLL7" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                     </node>
                     <node concept="X8dFx" id="1bodCZ_yLL8" role="2OqNvi">
                       <node concept="2OqwBi" id="1bodCZ_yLL9" role="25WWJ7">
@@ -15838,7 +15838,7 @@
                 <node concept="3clFbF" id="1bodCZ_DCjs" role="3cqZAp">
                   <node concept="2OqwBi" id="1bodCZ_DK1X" role="3clFbG">
                     <node concept="37vLTw" id="1bodCZ_DCjq" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                      <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                     </node>
                     <node concept="3dhRuq" id="1bodCZ_DY4L" role="2OqNvi">
                       <node concept="10Nm6u" id="1bodCZ_E3A7" role="25WWJ7" />
@@ -15866,7 +15866,7 @@
               </node>
               <node concept="2OqwBi" id="1bodCZ_yoPQ" role="3clFbw">
                 <node concept="37vLTw" id="1bodCZ_y8zP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                  <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
                 </node>
                 <node concept="3GX2aA" id="1bodCZ_yx0q" role="2OqNvi" />
               </node>
@@ -15904,7 +15904,7 @@
             </node>
             <node concept="2OqwBi" id="1bodCZ_qhSv" role="3uHU7w">
               <node concept="37vLTw" id="1bodCZ_q9dv" role="2Oq$k0">
-                <ref role="3cqZAo" node="1bodCZ_oROF" resolve="invalidated" />
+                <ref role="3cqZAo" node="1bodCZ_oROF" resolve="allInvalidated" />
               </node>
               <node concept="3GX2aA" id="1bodCZ_qv7m" role="2OqNvi" />
             </node>
@@ -17415,7 +17415,7 @@
                           </node>
                           <node concept="2ShNRf" id="3SOUSnYLXot" role="3K4E3e">
                             <node concept="1pGfFk" id="3SOUSnYLXou" role="2ShVmc">
-                              <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="RuntimeException" />
+                              <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                               <node concept="3cpWs3" id="3SOUSnYLXov" role="37wK5m">
                                 <node concept="37vLTw" id="3SOUSnYLXow" role="3uHU7w">
                                   <ref role="3cqZAo" node="3rrtTcS7pQO" resolve="details" />
@@ -17456,7 +17456,7 @@
                           </node>
                           <node concept="2ShNRf" id="3SOUSnYNHQT" role="3K4GZi">
                             <node concept="1pGfFk" id="3SOUSnYNHQU" role="2ShVmc">
-                              <ref role="37wK5l" to="ugy2:5X1yxJHUoaI" resolve="RuntimeException" />
+                              <ref role="37wK5l" to="ugy2:5X1yxJHUoaI" resolve="TemplateApplicationException" />
                               <node concept="3cpWs3" id="3SOUSnYNHQV" role="37wK5m">
                                 <node concept="37vLTw" id="3SOUSnYNHQW" role="3uHU7w">
                                   <ref role="3cqZAo" node="3rrtTcS7pQO" resolve="details" />
@@ -17560,7 +17560,7 @@
                   <node concept="3clFbC" id="3rrtTcS7lmn" role="3clFbw">
                     <node concept="10Nm6u" id="3rrtTcS7lte" role="3uHU7w" />
                     <node concept="37vLTw" id="3rrtTcS7kDK" role="3uHU7B">
-                      <ref role="3cqZAo" node="47oVduO_Y8i" resolve="ids_reqs" />
+                      <ref role="3cqZAo" node="47oVduO_Y8i" resolve="rec" />
                     </node>
                   </node>
                   <node concept="9aQIb" id="3rrtTcS7lGL" role="9aQIa">
@@ -17681,7 +17681,7 @@
                                 <ref role="3cqZAo" node="6nFpYlujVzU" resolve="updatesRecorder" />
                               </node>
                               <node concept="liA8E" id="47oVduO_Y9u" role="2OqNvi">
-                                <ref role="37wK5l" node="6nFpYlucRT5" />
+                                <ref role="37wK5l" node="6nFpYlucRT5" resolve="recordUpdate" />
                                 <node concept="37vLTw" id="47oVduO_Y9v" role="37wK5m">
                                   <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                                 </node>
@@ -19038,7 +19038,7 @@
       </node>
       <node concept="3Tm6S6" id="5ntLU8Glzld" role="1B3o_S" />
       <node concept="3uibUv" id="5ntLU8Glzg8" role="EKbjA">
-        <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+        <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
         <node concept="3uibUv" id="4MqhgXU_ix8" role="11_B2D">
           <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramFactory.ResultTriple" />
         </node>
@@ -19333,7 +19333,7 @@
           <node concept="3clFbF" id="4MqhgXU_$nx" role="3cqZAp">
             <node concept="37vLTI" id="4MqhgXU__hD" role="3clFbG">
               <node concept="37vLTw" id="4MqhgXU__uL" role="37vLTx">
-                <ref role="3cqZAo" node="4MqhgXU_y$h" resolve="processed" />
+                <ref role="3cqZAo" node="4MqhgXU_y$h" resolve="visited" />
               </node>
               <node concept="2OqwBi" id="4MqhgXU_$yz" role="37vLTJ">
                 <node concept="Xjq3P" id="4MqhgXU_$nv" role="2Oq$k0" />
@@ -19346,7 +19346,7 @@
           <node concept="3clFbF" id="KkWtiPfHYI" role="3cqZAp">
             <node concept="37vLTI" id="KkWtiPfHYJ" role="3clFbG">
               <node concept="37vLTw" id="KkWtiPfHYK" role="37vLTx">
-                <ref role="3cqZAo" node="KkWtiPf32D" resolve="forceRequired" />
+                <ref role="3cqZAo" node="KkWtiPf32D" resolve="newInvalidated" />
               </node>
               <node concept="2OqwBi" id="KkWtiPfHYL" role="37vLTJ">
                 <node concept="Xjq3P" id="KkWtiPfHYM" role="2Oq$k0" />
@@ -19442,7 +19442,7 @@
       <property role="TrG5h" value="updatesRecorder" />
       <node concept="3Tm6S6" id="6nFpYlujVzV" role="1B3o_S" />
       <node concept="3uibUv" id="6nFpYlujVzX" role="1tU5fm">
-        <ref role="3uigEE" node="6nFpYlu02jD" />
+        <ref role="3uigEE" node="6nFpYlu02jD" resolve="UpdatesRecorder" />
       </node>
     </node>
     <node concept="312cEg" id="39eNUjlTflP" role="jymVt">
@@ -19551,7 +19551,7 @@
             </node>
             <node concept="2ShNRf" id="3GLv42NdC3W" role="37vLTx">
               <node concept="1pGfFk" id="3GLv42NdC$E" role="2ShVmc">
-                <ref role="37wK5l" node="3GLv42NdnWY" resolve="UpdatesRecorder.RelevantNodesMonitor" />
+                <ref role="37wK5l" node="3GLv42NdnWY" resolve="ReferredNodes" />
                 <node concept="37vLTw" id="3GLv42NdCGo" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlu7giH" resolve="unit" />
                 </node>
@@ -19864,7 +19864,7 @@
                     <node concept="3cpWs3" id="1bodCZ$4OMH" role="3uHU7B">
                       <node concept="3cpWs3" id="1bodCZ$7fpD" role="3uHU7B">
                         <node concept="37vLTw" id="1bodCZ$7kug" role="3uHU7w">
-                          <ref role="3cqZAo" node="KkWtiN4477" resolve="templates" />
+                          <ref role="3cqZAo" node="KkWtiN4477" resolve="template" />
                         </node>
                         <node concept="3cpWs3" id="1bodCZ$6Y$n" role="3uHU7B">
                           <node concept="3cpWs3" id="1bodCZ$4DTl" role="3uHU7B">
@@ -19933,7 +19933,7 @@
             <node concept="liA8E" id="KkWtiMWjf6" role="2OqNvi">
               <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
               <node concept="37vLTw" id="3SOUSnYGowx" role="37wK5m">
-                <ref role="3cqZAo" node="KkWtiN4477" resolve="templates" />
+                <ref role="3cqZAo" node="KkWtiN4477" resolve="template" />
               </node>
             </node>
           </node>
@@ -22439,7 +22439,7 @@
         <node concept="37vLTG" id="4UTrqZZNYZf" role="3clF46">
           <property role="TrG5h" value="action" />
           <node concept="3uibUv" id="4UTrqZZNYZg" role="1tU5fm">
-            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+            <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
             <node concept="16syzq" id="4UTrqZZNZlu" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
             </node>
@@ -22449,7 +22449,7 @@
         <node concept="3Tm1VV" id="4UTrqZZNYyg" role="1B3o_S" />
         <node concept="3clFbS" id="4UTrqZZNYyh" role="3clF47">
           <node concept="XkiVB" id="4UTrqZZNYRo" role="3cqZAp">
-            <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramFactory.NodeWalker" />
+            <ref role="37wK5l" node="12yN8DyNqja" resolve="NodeWalker" />
             <node concept="37vLTw" id="4UTrqZZNZus" role="37wK5m">
               <ref role="3cqZAo" node="4UTrqZZNYZf" resolve="action" />
             </node>
@@ -22485,7 +22485,7 @@
         <node concept="37vLTG" id="3IIf9O_hbbt" role="3clF46">
           <property role="TrG5h" value="action" />
           <node concept="3uibUv" id="3IIf9O_hbbu" role="1tU5fm">
-            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+            <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
             <node concept="16syzq" id="3IIf9O_hbbv" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
             </node>
@@ -22495,7 +22495,7 @@
         <node concept="3Tm1VV" id="3IIf9O_hbbx" role="1B3o_S" />
         <node concept="3clFbS" id="3IIf9O_hbby" role="3clF47">
           <node concept="XkiVB" id="3IIf9O_hbbz" role="3cqZAp">
-            <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramFactory.NodeWalker" />
+            <ref role="37wK5l" node="12yN8DyNqja" resolve="NodeWalker" />
             <node concept="37vLTw" id="3IIf9O_hbb$" role="37wK5m">
               <ref role="3cqZAo" node="3IIf9O_hbbt" resolve="action" />
             </node>
@@ -22663,7 +22663,7 @@
       <node concept="2tJIrI" id="4UTrqZZNWox" role="jymVt" />
       <node concept="3Tm1VV" id="4UTrqZZNVSK" role="1B3o_S" />
       <node concept="3uibUv" id="4UTrqZZNWuC" role="1zkMxy">
-        <ref role="3uigEE" node="12yN8DyNqdl" resolve="ProgramFactory.NodeWalker" />
+        <ref role="3uigEE" node="12yN8DyNqdl" resolve="NodeWalker" />
         <node concept="16syzq" id="4UTrqZZNWxK" role="11_B2D">
           <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
         </node>
@@ -22715,7 +22715,7 @@
         <node concept="37vLTG" id="4UTrqZZOb7I" role="3clF46">
           <property role="TrG5h" value="action" />
           <node concept="3uibUv" id="4UTrqZZOb9_" role="1tU5fm">
-            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+            <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
             <node concept="16syzq" id="4UTrqZZObkm" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
             </node>
@@ -22725,7 +22725,7 @@
         <node concept="3Tm1VV" id="4UTrqZZOaY9" role="1B3o_S" />
         <node concept="3clFbS" id="4UTrqZZOaYa" role="3clF47">
           <node concept="XkiVB" id="4UTrqZZObpZ" role="3cqZAp">
-            <ref role="37wK5l" node="4UTrqZZNYyd" resolve="ProgramFactory.NodeWalker.ALL_DEEP" />
+            <ref role="37wK5l" node="4UTrqZZNYyd" resolve="NodeWalker.ALL_DEEP" />
             <node concept="37vLTw" id="4UTrqZZObxU" role="37wK5m">
               <ref role="3cqZAo" node="4UTrqZZOb46" resolve="startFrom" />
             </node>
@@ -22746,7 +22746,7 @@
         <node concept="37vLTG" id="3IIf9O_hpad" role="3clF46">
           <property role="TrG5h" value="action" />
           <node concept="3uibUv" id="3IIf9O_hpae" role="1tU5fm">
-            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+            <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
             <node concept="16syzq" id="3IIf9O_hpaf" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
             </node>
@@ -22756,7 +22756,7 @@
         <node concept="3Tm1VV" id="3IIf9O_hpah" role="1B3o_S" />
         <node concept="3clFbS" id="3IIf9O_hpai" role="3clF47">
           <node concept="XkiVB" id="3IIf9O_hpaj" role="3cqZAp">
-            <ref role="37wK5l" node="3IIf9O_hbbq" resolve="ProgramFactory.NodeWalker.ALL_DEEP" />
+            <ref role="37wK5l" node="3IIf9O_hbbq" resolve="NodeWalker.ALL_DEEP" />
             <node concept="37vLTw" id="3IIf9O_hpak" role="37wK5m">
               <ref role="3cqZAo" node="3IIf9O_hpab" resolve="startFrom" />
             </node>
@@ -22826,7 +22826,7 @@
       <node concept="2tJIrI" id="4UTrqZZOe9Q" role="jymVt" />
       <node concept="3Tm1VV" id="4UTrqZZO9qz" role="1B3o_S" />
       <node concept="3uibUv" id="4UTrqZZOaEu" role="1zkMxy">
-        <ref role="3uigEE" node="4UTrqZZNVSJ" resolve="ProgramFactory.NodeWalker.ALL_DEEP" />
+        <ref role="3uigEE" node="4UTrqZZNVSJ" resolve="NodeWalker.ALL_DEEP" />
         <node concept="16syzq" id="4UTrqZZOaRM" role="11_B2D">
           <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
         </node>
@@ -22858,7 +22858,7 @@
         <node concept="37vLTG" id="4UTrqZZOjsI" role="3clF46">
           <property role="TrG5h" value="action" />
           <node concept="3uibUv" id="4UTrqZZOjuZ" role="1tU5fm">
-            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+            <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
             <node concept="16syzq" id="4UTrqZZOjG1" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZOiH2" resolve="S" />
             </node>
@@ -22868,7 +22868,7 @@
         <node concept="3Tm1VV" id="4UTrqZZOjgS" role="1B3o_S" />
         <node concept="3clFbS" id="4UTrqZZOjgT" role="3clF47">
           <node concept="XkiVB" id="4UTrqZZOjLW" role="3cqZAp">
-            <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramFactory.NodeWalker" />
+            <ref role="37wK5l" node="12yN8DyNqja" resolve="NodeWalker" />
             <node concept="37vLTw" id="4UTrqZZOjRC" role="37wK5m">
               <ref role="3cqZAo" node="4UTrqZZOjsI" resolve="action" />
             </node>
@@ -22916,7 +22916,7 @@
         <property role="TrG5h" value="S" />
       </node>
       <node concept="3uibUv" id="4UTrqZZOj1t" role="1zkMxy">
-        <ref role="3uigEE" node="12yN8DyNqdl" resolve="ProgramFactory.NodeWalker" />
+        <ref role="3uigEE" node="12yN8DyNqdl" resolve="NodeWalker" />
         <node concept="16syzq" id="4UTrqZZOjas" role="11_B2D">
           <ref role="16sUi3" node="4UTrqZZOiH2" resolve="S" />
         </node>
@@ -22941,7 +22941,7 @@
       <node concept="37vLTG" id="12yN8DyNqjA" role="3clF46">
         <property role="TrG5h" value="action" />
         <node concept="3uibUv" id="12yN8DyNqjI" role="1tU5fm">
-          <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+          <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
           <node concept="16syzq" id="tIwzd1IBE1" role="11_B2D">
             <ref role="16sUi3" node="tIwzd1IC9f" resolve="T" />
           </node>
@@ -23179,7 +23179,7 @@
       <property role="TrG5h" value="action" />
       <node concept="3Tmbuc" id="1eEe91P3OWP" role="1B3o_S" />
       <node concept="3uibUv" id="12yN8DyNqkj" role="1tU5fm">
-        <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramFactory.NodeWalker.NodeAction" />
+        <ref role="3uigEE" node="12yN8DyNqe8" resolve="NodeWalker.NodeAction" />
         <node concept="16syzq" id="tIwzd1ID1q" role="11_B2D">
           <ref role="16sUi3" node="tIwzd1IC9f" resolve="T" />
         </node>
@@ -23202,7 +23202,7 @@
             <node concept="2OqwBi" id="1bodCZDllg4" role="37vLTJ">
               <node concept="Xjq3P" id="1bodCZDlxY$" role="2Oq$k0" />
               <node concept="2OwXpG" id="1bodCZDllg7" role="2OqNvi">
-                <ref role="2Oxat5" node="1bodCZDceHn" resolve="myFilter" />
+                <ref role="2Oxat5" node="1bodCZDceHn" resolve="filter" />
               </node>
             </node>
             <node concept="37vLTw" id="1bodCZDceHy" role="37vLTx">
@@ -23599,8 +23599,8 @@
             <node concept="YeOm9" id="6nFpYltM1DI" role="2ShVmc">
               <node concept="1Y3b0j" id="6nFpYltM1DJ" role="YeSDq">
                 <property role="2bfB8j" value="true" />
-                <ref role="37wK5l" node="6nFpYltLIxT" resolve="ProgramFactory.AssistedWalk.ActionWrapper" />
-                <ref role="1Y3XeK" node="6nFpYltLHQ$" resolve="ProgramFactory.AssistedWalk.ActionWrapper" />
+                <ref role="37wK5l" node="6nFpYltLIxT" resolve="AssistedWalk.ActionWrapper" />
+                <ref role="1Y3XeK" node="6nFpYltLHQ$" resolve="AssistedWalk.ActionWrapper" />
                 <node concept="3Tm1VV" id="6nFpYltM1DK" role="1B3o_S" />
                 <node concept="37vLTw" id="6nFpYltM1En" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYltM1Ej" resolve="action" />
@@ -23635,7 +23635,7 @@
                         </node>
                         <node concept="2OqwBi" id="1bodCZDfoZy" role="3K4Cdx">
                           <node concept="37vLTw" id="1bodCZDfhKi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1bodCZDceHn" resolve="myFilter" />
+                            <ref role="3cqZAo" node="1bodCZDceHn" resolve="filter" />
                           </node>
                           <node concept="liA8E" id="1bodCZDfAyO" role="2OqNvi">
                             <ref role="37wK5l" to="82uw:~Predicate.test(java.lang.Object)" resolve="test" />
@@ -23664,7 +23664,7 @@
         <node concept="3cpWs6" id="3DPJ8QIyRCj" role="3cqZAp">
           <node concept="2ShNRf" id="3DPJ8QIyRCk" role="3cqZAk">
             <node concept="1pGfFk" id="4nDRG5JoR5E" role="2ShVmc">
-              <ref role="37wK5l" node="6nFpYltLIxT" resolve="ProgramFactory.AssistedWalk.ActionWrapper" />
+              <ref role="37wK5l" node="6nFpYltLIxT" resolve="AssistedWalk.ActionWrapper" />
               <node concept="16syzq" id="3DPJ8QIyRCp" role="1pMfVU">
                 <ref role="16sUi3" node="3DPJ8QIyRCI" resolve="T" />
               </node>
@@ -23702,7 +23702,7 @@
         <node concept="3cpWs6" id="6nFpYltVXdq" role="3cqZAp">
           <node concept="2ShNRf" id="6nFpYltVXdr" role="3cqZAk">
             <node concept="1pGfFk" id="4nDRG5JoIDX" role="2ShVmc">
-              <ref role="37wK5l" node="6nFpYltLIxT" resolve="ProgramFactory.AssistedWalk.ActionWrapper" />
+              <ref role="37wK5l" node="6nFpYltLIxT" resolve="AssistedWalk.ActionWrapper" />
               <node concept="16syzq" id="6nFpYltVXdw" role="1pMfVU">
                 <ref role="16sUi3" node="6nFpYltVXe1" resolve="T" />
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
index 93315a93..c0ff8e90 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
@@ -8194,7 +8194,7 @@
                 <node concept="3clFbF" id="7lt0LtQvQBk" role="3cqZAp">
                   <node concept="2ShNRf" id="7lt0LtQvQBi" role="3clFbG">
                     <node concept="HV5vD" id="7lt0LtQvQMH" role="2ShVmc">
-                      <ref role="HV5vE" node="7ISVfSJ1oi" resolve="Free" />
+                      <ref role="HV5vE" node="7ISVfSJ1oi" resolve="LogicalPredicate.LogicalSolver.Free" />
                     </node>
                   </node>
                 </node>
@@ -11099,7 +11099,7 @@
       <node concept="3clFbS" id="FQ_DIqWkmp" role="3clF47">
         <node concept="3clFbF" id="FQ_DIqWkmq" role="3cqZAp">
           <node concept="37vLTw" id="FQ_DIqWkmr" role="3clFbG">
-            <ref role="3cqZAo" node="FQ_DIqWkmy" resolve="FEEDBACK_SYM" />
+            <ref role="3cqZAo" node="FQ_DIqWkmy" resolve="TRACE_SYM" />
           </node>
         </node>
       </node>
@@ -11131,7 +11131,7 @@
             <ref role="1Y3XeK" node="7lt0LtQvaw_" resolve="PredicateSymbolExt" />
             <ref role="37wK5l" node="7lt0LtQva_c" resolve="PredicateSymbolExt" />
             <node concept="37vLTw" id="FQ_DIqWkmC" role="37wK5m">
-              <ref role="3cqZAo" node="FQ_DIqWkmu" resolve="FEEDBACK" />
+              <ref role="3cqZAo" node="FQ_DIqWkmu" resolve="TRACE" />
             </node>
             <node concept="3cmrfG" id="FQ_DIqWkmD" role="37wK5m">
               <property role="3cmrfH" value="2" />
@@ -11148,7 +11148,7 @@
                 <node concept="3clFbF" id="FQ_DIqWkmJ" role="3cqZAp">
                   <node concept="2ShNRf" id="FQ_DIqWkmK" role="3clFbG">
                     <node concept="HV5vD" id="FQ_DIqWkmL" role="2ShVmc">
-                      <ref role="HV5vE" node="FQ_DIqWkn9" resolve="TemplateTraceSolver" />
+                      <ref role="HV5vE" node="FQ_DIqWkn9" resolve="TemplateTracePredicate.TemplateTraceSolver" />
                     </node>
                   </node>
                 </node>
@@ -11173,7 +11173,7 @@
                 <node concept="3clFbF" id="FQ_DIqWkmT" role="3cqZAp">
                   <node concept="2ShNRf" id="FQ_DIqWkmU" role="3clFbG">
                     <node concept="1pGfFk" id="FQ_DIqWkmV" role="2ShVmc">
-                      <ref role="37wK5l" node="FQ_DIqWkm4" resolve="ProvideFeedbackPredicate" />
+                      <ref role="37wK5l" node="FQ_DIqWkm4" resolve="TemplateTracePredicate" />
                       <node concept="AH0OO" id="FQ_DIqWkmW" role="37wK5m">
                         <node concept="3cmrfG" id="FQ_DIqWkmX" role="AHEQo">
                           <property role="3cmrfH" value="0" />
@@ -11302,7 +11302,7 @@
               <node concept="1eOMI4" id="FQ_DIqWknO" role="3fr31v">
                 <node concept="2ZW3vV" id="FQ_DIqWknP" role="1eOMHV">
                   <node concept="3uibUv" id="FQ_DIqWknQ" role="2ZW6by">
-                    <ref role="3uigEE" node="FQ_DIqWkm2" resolve="ProvideFeedbackPredicate" />
+                    <ref role="3uigEE" node="FQ_DIqWkm2" resolve="TemplateTracePredicate" />
                   </node>
                   <node concept="2OqwBi" id="FQ_DIqWknR" role="2ZW6bz">
                     <node concept="37vLTw" id="FQ_DIqWknS" role="2Oq$k0">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
index b0cbd0cb..c52546a3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
@@ -1374,7 +1374,7 @@
             <node concept="2OqwBi" id="5Nh6YP29vc3" role="37vLTJ">
               <node concept="Xjq3P" id="5Nh6YP29wgp" role="2Oq$k0" />
               <node concept="2OwXpG" id="5Nh6YP29vc6" role="2OqNvi">
-                <ref role="2Oxat5" node="5Nh6YP29t0l" resolve="myRef" />
+                <ref role="2Oxat5" node="5Nh6YP29t0l" resolve="templateRef" />
               </node>
             </node>
             <node concept="37vLTw" id="5Nh6YP29t0v" role="37vLTx">
@@ -1420,7 +1420,7 @@
             <node concept="2OqwBi" id="5Nh6YP1U5ga" role="37vLTJ">
               <node concept="Xjq3P" id="5Nh6YP1U6dE" role="2Oq$k0" />
               <node concept="2OwXpG" id="5Nh6YP1U5gd" role="2OqNvi">
-                <ref role="2Oxat5" node="5Nh6YP1U2pN" resolve="myNodeId" />
+                <ref role="2Oxat5" node="5Nh6YP1U2pN" resolve="nodeId" />
               </node>
             </node>
             <node concept="37vLTw" id="5Nh6YP1U2pX" role="37vLTx">
@@ -2009,7 +2009,7 @@
       <node concept="2tJIrI" id="36tQV5BD$Uq" role="jymVt" />
       <node concept="3Tm1VV" id="4vBwiiV6131" role="1B3o_S" />
       <node concept="2AHcQZ" id="KkWtiMPZM2" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="5vVBssDEoXH" role="jymVt" />
@@ -2053,7 +2053,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="5vVBssDBodm" role="37vLTx">
-              <ref role="3cqZAo" node="5vVBssDBndO" resolve="macroTemplateIndex" />
+              <ref role="3cqZAo" node="5vVBssDBndO" resolve="macroTables" />
             </node>
           </node>
         </node>
@@ -2076,7 +2076,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="4VNF0fT2ti1" role="37vLTx">
-              <ref role="3cqZAo" node="4VNF0fT2n7P" resolve="updatable" />
+              <ref role="3cqZAo" node="4VNF0fT2n7P" resolve="tracker" />
             </node>
           </node>
         </node>
@@ -2196,7 +2196,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bodCZHKBIm" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="4VNF0fT3YKU" role="jymVt" />
@@ -2219,7 +2219,7 @@
             </node>
             <node concept="2OqwBi" id="KkWtiOdbNG" role="37wK5m">
               <node concept="37vLTw" id="KkWtiOdbNH" role="2Oq$k0">
-                <ref role="3cqZAo" node="4VNF0fT3X02" resolve="dependency" />
+                <ref role="3cqZAo" node="4VNF0fT3X02" resolve="dependsOn" />
               </node>
               <node concept="Vyspw" id="KkWtiOdbNI" role="2OqNvi">
                 <node concept="37vLTw" id="KkWtiOdbNJ" role="Vysub">
@@ -2251,7 +2251,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bodCZHKzxf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="KkWtiOdfUY" role="jymVt" />
@@ -2297,7 +2297,7 @@
                     <node concept="2JrnkZ" id="KkWtiOdfVl" role="2Oq$k0">
                       <node concept="2OqwBi" id="KkWtiOdfVm" role="2JrQYb">
                         <node concept="37vLTw" id="KkWtiOdfVn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiOdfV3" resolve="dependsOn" />
+                          <ref role="3cqZAo" node="KkWtiOdfV3" resolve="required" />
                         </node>
                         <node concept="iZEcu" id="KkWtiOdfVo" role="2OqNvi" />
                       </node>
@@ -2308,7 +2308,7 @@
                   <node concept="3y3z36" id="KkWtiOdfVq" role="3uHU7w">
                     <node concept="10Nm6u" id="KkWtiOdfVr" role="3uHU7w" />
                     <node concept="37vLTw" id="KkWtiOdfVs" role="3uHU7B">
-                      <ref role="3cqZAo" node="KkWtiOdfV3" resolve="dependsOn" />
+                      <ref role="3cqZAo" node="KkWtiOdfV3" resolve="required" />
                     </node>
                   </node>
                   <node concept="3y3z36" id="KkWtiOdfVt" role="3uHU7B">
@@ -2316,7 +2316,7 @@
                       <ref role="3cqZAo" node="KkWtiOdfV1" resolve="source" />
                     </node>
                     <node concept="37vLTw" id="KkWtiOdfVv" role="3uHU7w">
-                      <ref role="3cqZAo" node="KkWtiOdfV3" resolve="dependsOn" />
+                      <ref role="3cqZAo" node="KkWtiOdfV3" resolve="required" />
                     </node>
                   </node>
                 </node>
@@ -2371,7 +2371,7 @@
           <node concept="1rXfSq" id="2hQbw6HlN3S" role="3clFbG">
             <ref role="37wK5l" node="2hQbw6HlwSO" resolve="triggerRequireHooks" />
             <node concept="37vLTw" id="2hQbw6HlNvr" role="37wK5m">
-              <ref role="3cqZAo" node="36tQV5BDFIJ" resolve="node" />
+              <ref role="3cqZAo" node="36tQV5BDFIJ" resolve="required" />
             </node>
           </node>
         </node>
@@ -2408,10 +2408,10 @@
           <node concept="1rXfSq" id="2LxIQenhMbl" role="3clFbG">
             <ref role="37wK5l" node="KkWtiOdfV0" resolve="addRequired" />
             <node concept="37vLTw" id="2LxIQenhMwq" role="37wK5m">
-              <ref role="3cqZAo" node="2LxIQemVR2I" resolve="input" />
+              <ref role="3cqZAo" node="2LxIQemVR2I" resolve="source" />
             </node>
             <node concept="37vLTw" id="2LxIQenhMFE" role="37wK5m">
-              <ref role="3cqZAo" node="2LxIQemVPgX" resolve="node" />
+              <ref role="3cqZAo" node="2LxIQemVPgX" resolve="required" />
             </node>
           </node>
         </node>
@@ -2419,7 +2419,7 @@
           <node concept="1rXfSq" id="2hQbw6HlMc6" role="3clFbG">
             <ref role="37wK5l" node="2hQbw6HlwSO" resolve="triggerRequireHooks" />
             <node concept="37vLTw" id="2hQbw6HlMxz" role="37wK5m">
-              <ref role="3cqZAo" node="2LxIQemVPgX" resolve="node" />
+              <ref role="3cqZAo" node="2LxIQemVPgX" resolve="required" />
             </node>
           </node>
         </node>
@@ -2464,7 +2464,7 @@
             <node concept="3Tqbb2" id="5yr01fEensj" role="1tU5fm" />
             <node concept="2OqwBi" id="5yr01fEenzm" role="33vP2m">
               <node concept="37vLTw" id="5yr01fEenzn" role="2Oq$k0">
-                <ref role="3cqZAo" node="5yr01fEehcn" resolve="nodeRef" />
+                <ref role="3cqZAo" node="5yr01fEehcn" resolve="required" />
               </node>
               <node concept="Vyspw" id="5yr01fEenzo" role="2OqNvi">
                 <node concept="37vLTw" id="5yr01fEenzp" role="Vysub">
@@ -2757,7 +2757,7 @@
           <node concept="3clFbS" id="At0yqM9Flo" role="3clFbx">
             <node concept="3clFbF" id="At0yqM9IJU" role="3cqZAp">
               <node concept="1rXfSq" id="At0yqM9IJS" role="3clFbG">
-                <ref role="37wK5l" node="KkWtiOdfV0" resolve="addDependency" />
+                <ref role="37wK5l" node="KkWtiOdfV0" resolve="addRequired" />
                 <node concept="37vLTw" id="At0yqM9J$I" role="37wK5m">
                   <ref role="3cqZAo" node="7mIqwW50wJC" resolve="ruleInput" />
                 </node>
@@ -3412,7 +3412,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bodCZHKdJw" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="7DvO2M9IiNg" role="jymVt" />
@@ -3442,7 +3442,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bodCZHKhVy" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="7DvO2M9IiNt" role="jymVt" />
@@ -3656,7 +3656,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1bodCZHKluE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="2hQbw6Hlvtz" role="jymVt" />
@@ -3752,7 +3752,7 @@
         <node concept="YS8fn" id="5X1yxJHVsuI" role="3cqZAp">
           <node concept="2ShNRf" id="5X1yxJHVsuJ" role="YScLw">
             <node concept="1pGfFk" id="5X1yxJHVsuK" role="2ShVmc">
-              <ref role="37wK5l" node="5X1yxJHUoaI" resolve="RuntimeException" />
+              <ref role="37wK5l" node="5X1yxJHUoaI" resolve="TemplateApplicationException" />
               <node concept="3cpWs3" id="5X1yxJHVvcr" role="37wK5m">
                 <node concept="3cpWs3" id="5X1yxJHVvcs" role="3uHU7B">
                   <node concept="Xl_RD" id="5X1yxJHVvct" role="3uHU7B">
@@ -3773,7 +3773,7 @@
       <node concept="16euLQ" id="5itBwM7WF$V" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86U8g" role="3ztrMU">
-          <ref role="3uigEE" node="5itBwM86qnn" resolve="Token" />
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -3865,7 +3865,7 @@
         <node concept="YS8fn" id="7mIqwW51AyB" role="3cqZAp">
           <node concept="2ShNRf" id="7mIqwW51AyC" role="YScLw">
             <node concept="1pGfFk" id="7mIqwW51AyD" role="2ShVmc">
-              <ref role="37wK5l" node="5X1yxJHUoaI" resolve="RuntimeException" />
+              <ref role="37wK5l" node="5X1yxJHUoaI" resolve="TemplateApplicationException" />
               <node concept="3cpWs3" id="7mIqwW51AyE" role="37wK5m">
                 <node concept="3cpWs3" id="7mIqwW51AyF" role="3uHU7B">
                   <node concept="Xl_RD" id="7mIqwW51AyG" role="3uHU7B">
@@ -3886,7 +3886,7 @@
       <node concept="16euLQ" id="7mIqwW51AyJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="7mIqwW51AyK" role="3ztrMU">
-          <ref role="3uigEE" node="5itBwM86qUH" resolve="Token" />
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -3980,7 +3980,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4nDRG5KFMkZ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="6tnA4677Qqb" role="jymVt" />
@@ -8344,7 +8344,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="7Aoa2yUAvYu" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="1eEe91OY9KN" role="jymVt" />
@@ -8363,7 +8363,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="7Aoa2yUA6C0" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="7Aoa2yUAL84" role="jymVt" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index dca910cb..018477f0 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -137,7 +137,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index 108a9228..96a7be7f 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -625,7 +625,7 @@
     <property role="3GE5qa" value="typeTerm" />
     <ref role="aqKnT" to="zfi7:1vAI4X$MkW8" resolve="FeatureReferenceExpression" />
     <node concept="3XHNnq" id="KkWtiMpv_M" role="3ft7WO">
-      <ref role="3XGfJA" to="zfi7:1vAI4X$MlAp" />
+      <ref role="3XGfJA" to="zfi7:1vAI4X$MlAp" resolve="feature" />
       <node concept="1WAQ3h" id="KkWtiMpv_R" role="1WZ6D9">
         <node concept="3clFbS" id="KkWtiMpv_T" role="2VODD2">
           <node concept="3clFbF" id="KkWtiMpvUz" role="3cqZAp">
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 53fb5473..e906960c 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
index d103ad08..bae47ffa 100644
--- a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
+++ b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
@@ -127,7 +127,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 3e7e3eb5..9c291a1c 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -131,7 +131,7 @@
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index 75352782..f838f3e1 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
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 74834605..eb36ce0a 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
@@ -610,7 +610,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIs05n3" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIs07Lz" role="jymVt" />
@@ -840,7 +840,7 @@
                   <node concept="2ShNRf" id="FQ_DIrv3sf" role="2HTEbv">
                     <node concept="1pGfFk" id="FQ_DIrv3sg" role="2ShVmc">
                       <property role="373rjd" value="true" />
-                      <ref role="37wK5l" to="uwx2:3gNap3fN2iv" />
+                      <ref role="37wK5l" to="uwx2:3gNap3fN2iv" resolve="LogicalValue" />
                       <node concept="10QFUN" id="FQ_DIrv3sh" role="37wK5m">
                         <node concept="37vLTw" id="FQ_DIrv3si" role="10QFUP">
                           <ref role="3cqZAo" node="1msb0mq8QXA" resolve="symbol" />
@@ -875,7 +875,7 @@
                     <node concept="2ShNRf" id="FQ_DIrv2su" role="2HTEbv">
                       <node concept="1pGfFk" id="FQ_DIrv2sv" role="2ShVmc">
                         <property role="373rjd" value="true" />
-                        <ref role="37wK5l" to="uwx2:3gNap3fNdxx" />
+                        <ref role="37wK5l" to="uwx2:3gNap3fNdxx" resolve="MetaLogicalValue" />
                         <node concept="10QFUN" id="FQ_DIrv2sw" role="37wK5m">
                           <node concept="37vLTw" id="FQ_DIrv2sx" role="10QFUP">
                             <ref role="3cqZAo" node="1msb0mq8QXA" resolve="symbol" />
@@ -883,7 +883,7 @@
                           <node concept="3uibUv" id="FQ_DIrv2sy" role="10QFUM">
                             <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                             <node concept="3uibUv" id="FQ_DIrv2sz" role="11_B2D">
-                              <ref role="3uigEE" to="wyt6:~Object" />
+                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                             </node>
                           </node>
                         </node>
@@ -908,7 +908,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIrufnp" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIruhkx" role="jymVt" />
@@ -1269,7 +1269,7 @@
             <ref role="3cqZAo" node="1msb0mq9vsN" resolve="value" />
           </node>
           <node concept="37vLTw" id="5BGv8yzwv56" role="37wK5m">
-            <ref role="3cqZAo" node="5BGv8yzwqg0" resolve="varCount" />
+            <ref role="3cqZAo" node="5BGv8yzwqg0" resolve="variables" />
           </node>
         </node>
       </node>
@@ -1986,7 +1986,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIs1Gg4" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIs24qR" role="jymVt" />
@@ -2122,7 +2122,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIrrqNc" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIs1_KQ" role="jymVt" />
@@ -2768,7 +2768,7 @@
             <ref role="3cqZAo" node="5JQSuNswPj8" resolve="terms" />
           </node>
           <node concept="37vLTw" id="5BGv8yzvKR2" role="37wK5m">
-            <ref role="3cqZAo" node="5BGv8yzvESG" resolve="varCount" />
+            <ref role="3cqZAo" node="5BGv8yzvESG" resolve="variables" />
           </node>
         </node>
       </node>
@@ -9317,7 +9317,7 @@
             <ref role="3cqZAo" node="6YPNC4NYoAq" resolve="child" />
           </node>
           <node concept="37vLTw" id="6YPNC4NYs2x" role="37wK5m">
-            <ref role="3cqZAo" node="6YPNC4NYoAt" resolve="varCount" />
+            <ref role="3cqZAo" node="6YPNC4NYoAt" resolve="variables" />
           </node>
         </node>
       </node>
@@ -10010,7 +10010,7 @@
             <ref role="3cqZAo" node="6YPNC4OEHuQ" resolve="list" />
           </node>
           <node concept="37vLTw" id="6YPNC4OEIy$" role="37wK5m">
-            <ref role="3cqZAo" node="6YPNC4OEHXA" resolve="varCount" />
+            <ref role="3cqZAo" node="6YPNC4OEHXA" resolve="variables" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
index 9655b2b3..74c0a7c6 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
@@ -442,7 +442,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIrt$8S" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="3gNap3ffG7C" role="jymVt" />
@@ -771,7 +771,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIs0Vqx" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIs0Zg7" role="jymVt" />
@@ -1044,7 +1044,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIrsCON" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="3gNap3ffGtS" role="jymVt" />
@@ -1392,7 +1392,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIs1kQJ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIsv0Jv" role="jymVt" />
@@ -1533,7 +1533,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIrtabo" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIrtdWn" role="jymVt" />
@@ -1897,7 +1897,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIrtEyg" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIrtKpL" role="jymVt" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index 43b613a1..f7fcefd5 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -43,7 +43,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index 2146d509..b9ee72bd 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -94,7 +94,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
index d2bb6476..1259449a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
@@ -25,7 +25,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
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 c94b3156..a8453746 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
@@ -8,7 +8,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 20a64c5d..9fc40a80 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -898,12 +898,12 @@
             <node concept="2OqwBi" id="1Pi9pJ$h4V3" role="37vLTJ">
               <node concept="Xjq3P" id="1Pi9pJ$h3e$" role="2Oq$k0" />
               <node concept="2OwXpG" id="1Pi9pJ$haVR" role="2OqNvi">
-                <ref role="2Oxat5" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
+                <ref role="2Oxat5" node="1Pi9pJ$gX7O" resolve="rulesProcessing" />
               </node>
             </node>
             <node concept="2ShNRf" id="1Pi9pJ$him1" role="37vLTx">
               <node concept="1pGfFk" id="1Pi9pJ$him2" role="2ShVmc">
-                <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RuleProcessingSession" />
+                <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RulesProcessing" />
                 <node concept="37vLTw" id="1Pi9pJ$him3" role="37wK5m">
                   <ref role="3cqZAo" node="WJTIIoJWGP" resolve="ac" />
                 </node>
@@ -923,7 +923,7 @@
             <node concept="2OqwBi" id="6OXbTD_oquj" role="33vP2m">
               <node concept="2OqwBi" id="6OXbTD_oquk" role="2Oq$k0">
                 <node concept="37vLTw" id="1Pi9pJ$hmCQ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
+                  <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="rulesProcessing" />
                 </node>
                 <node concept="liA8E" id="6OXbTD_oqum" role="2OqNvi">
                   <ref role="37wK5l" to="hano:7WKNeR9alW4" resolve="queryTemplates" />
@@ -946,7 +946,7 @@
             </node>
             <node concept="2ShNRf" id="61G6TdBqAxu" role="33vP2m">
               <node concept="1pGfFk" id="3Pxu0s87$zF" role="2ShVmc">
-                <ref role="37wK5l" to="ugy2:5yr01fEdYJE" />
+                <ref role="37wK5l" to="ugy2:5yr01fEdYJE" resolve="TemplateApplicationSession" />
                 <node concept="37vLTw" id="5vVBssDPM9U" role="37wK5m">
                   <ref role="3cqZAo" node="tyIfzC1aQx" resolve="repo" />
                 </node>
@@ -970,7 +970,7 @@
         <node concept="3clFbF" id="4LE1vMPe9nF" role="3cqZAp">
           <node concept="2OqwBi" id="4LE1vMPecfd" role="3clFbG">
             <node concept="37vLTw" id="4LE1vMPe9nD" role="2Oq$k0">
-              <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
+              <ref role="3cqZAo" node="61G6TdBqAxt" resolve="applicationSession" />
             </node>
             <node concept="liA8E" id="4LE1vMPefCy" role="2OqNvi">
               <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
@@ -1011,7 +1011,7 @@
         <node concept="3clFbF" id="2LxIQemUJ5w" role="3cqZAp">
           <node concept="2OqwBi" id="2LxIQemUJwF" role="3clFbG">
             <node concept="37vLTw" id="2LxIQemUJ5u" role="2Oq$k0">
-              <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
+              <ref role="3cqZAo" node="61G6TdBqAxt" resolve="applicationSession" />
             </node>
             <node concept="liA8E" id="2LxIQemUJYl" role="2OqNvi">
               <ref role="37wK5l" to="ugy2:4VNF0fT26a5" resolve="withDependenciesTracker" />
@@ -1034,16 +1034,16 @@
             </node>
             <node concept="2ShNRf" id="6$7vuu2ugt4" role="37vLTx">
               <node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
-                <ref role="37wK5l" to="hano:5lpFZvO1gf1" />
+                <ref role="37wK5l" to="hano:5lpFZvO1gf1" resolve="ProgramBuilder" />
                 <node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
                   <property role="Xl_RC" value="test" />
                 </node>
                 <node concept="37vLTw" id="61G6TdBqAxW" role="37wK5m">
-                  <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
+                  <ref role="3cqZAo" node="61G6TdBqAxt" resolve="applicationSession" />
                 </node>
                 <node concept="2OqwBi" id="5vVBssDN6qb" role="37wK5m">
                   <node concept="37vLTw" id="1Pi9pJ$hx0Y" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
+                    <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="rulesProcessing" />
                   </node>
                   <node concept="liA8E" id="5vVBssDN9HC" role="2OqNvi">
                     <ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
@@ -1054,7 +1054,7 @@
                 </node>
                 <node concept="2OqwBi" id="2sMBLui0$jy" role="37wK5m">
                   <node concept="37vLTw" id="2sMBLui0$jz" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
+                    <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="rulesProcessing" />
                   </node>
                   <node concept="liA8E" id="2sMBLui0$j$" role="2OqNvi">
                     <ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
@@ -1394,7 +1394,7 @@
             </node>
             <node concept="2ShNRf" id="3o9wrC3WGRN" role="33vP2m">
               <node concept="1pGfFk" id="5rVYEA66sG1" role="2ShVmc">
-                <ref role="37wK5l" to="hano:3o9wrC3sC_c" />
+                <ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="FeedbackReportingSupervisor" />
                 <node concept="37vLTw" id="WJTIIp8IAA" role="37wK5m">
                   <ref role="3cqZAo" node="WJTIIp8A0t" resolve="failuresSink" />
                 </node>
@@ -1849,7 +1849,7 @@
               <ref role="37wK5l" to="hano:1XKnVQioNo" resolve="invalidateChanged" />
               <node concept="2OqwBi" id="1Pi9pJ$h$Zn" role="37wK5m">
                 <node concept="37vLTw" id="1Pi9pJ$hzcV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
+                  <ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="rulesProcessing" />
                 </node>
                 <node concept="liA8E" id="1Pi9pJ$hBrY" role="2OqNvi">
                   <ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
@@ -2825,7 +2825,7 @@
           <node concept="3clFbF" id="WJTIIoQM3A" role="3cqZAp">
             <node concept="2ShNRf" id="1laj_RSBMrG" role="3clFbG">
               <node concept="1pGfFk" id="1laj_RSBMrH" role="2ShVmc">
-                <ref role="37wK5l" to="hano:55xYlrlYx4c" />
+                <ref role="37wK5l" to="hano:55xYlrlYx4c" resolve="FeedbackReportItem" />
                 <node concept="37vLTw" id="1laj_RSBMrI" role="37wK5m">
                   <ref role="3cqZAo" node="1laj_RSBK97" resolve="kind" />
                 </node>
@@ -5017,7 +5017,7 @@
             <node concept="2OqwBi" id="3j46jeGLJ6B" role="37vLTJ">
               <node concept="Xjq3P" id="3j46jeGLJ6C" role="2Oq$k0" />
               <node concept="2OwXpG" id="3j46jeGLJ6D" role="2OqNvi">
-                <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="typesIndex" />
+                <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="report" />
               </node>
             </node>
             <node concept="2ShNRf" id="7Aoa2yVNQiS" role="37vLTx">
@@ -5087,14 +5087,14 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="WJTIIoWsSa" role="2Oq$k0">
-                  <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newIndex" />
+                  <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newReport" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="2OqwBi" id="1z4$59jdVTD" role="2GsD0m">
             <node concept="37vLTw" id="1z4$59jdVTK" role="2Oq$k0">
-              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
             </node>
             <node concept="liA8E" id="1z4$59je8Zm" role="2OqNvi">
               <ref role="37wK5l" to="tj24:7Aoa2yVI_mh" resolve="allTypes" />
@@ -5189,7 +5189,7 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="1z4$59jeiRG" role="2Oq$k0">
-                  <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newReportedTypes" />
+                  <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newReport" />
                 </node>
               </node>
             </node>
@@ -5203,7 +5203,7 @@
           <node concept="2OqwBi" id="362mGRZLGZ1" role="1DdaDG">
             <node concept="2OqwBi" id="1z4$59jegXH" role="2Oq$k0">
               <node concept="37vLTw" id="1z4$59jegYb" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="reportedTypes" />
+                <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
               </node>
               <node concept="liA8E" id="1z4$59jej9y" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
@@ -5220,7 +5220,7 @@
         <node concept="3clFbF" id="WJTIIoZO7o" role="3cqZAp">
           <node concept="2OqwBi" id="WJTIIoZOli" role="3clFbG">
             <node concept="37vLTw" id="WJTIIoZO7m" role="2Oq$k0">
-              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
             </node>
             <node concept="liA8E" id="WJTIIoZOVR" role="2OqNvi">
               <ref role="37wK5l" to="tj24:7Aoa2yVdVDc" resolve="clear" />
@@ -5230,17 +5230,17 @@
         <node concept="3clFbF" id="WJTIIoZPVj" role="3cqZAp">
           <node concept="37vLTI" id="WJTIIoZR7K" role="3clFbG">
             <node concept="37vLTw" id="WJTIIoZRBQ" role="37vLTx">
-              <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newIndex" />
+              <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newReport" />
             </node>
             <node concept="37vLTw" id="WJTIIoZPVh" role="37vLTJ">
-              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
             </node>
           </node>
         </node>
         <node concept="3clFbF" id="WJTIIp0_sJ" role="3cqZAp">
           <node concept="2OqwBi" id="WJTIIp0_G0" role="3clFbG">
             <node concept="37vLTw" id="WJTIIp0_sH" role="2Oq$k0">
-              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
             </node>
             <node concept="liA8E" id="WJTIIp0AgC" role="2OqNvi">
               <ref role="37wK5l" to="tj24:7Aoa2yVe2QP" resolve="putAllTypes" />
@@ -5266,7 +5266,7 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="362mGRZM1HB" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="reportedTypes" />
+                  <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
                 </node>
               </node>
             </node>
@@ -5339,7 +5339,7 @@
             <node concept="3clFbF" id="WJTIIoVb2h" role="3cqZAp">
               <node concept="2OqwBi" id="WJTIIoVbiz" role="3clFbG">
                 <node concept="37vLTw" id="WJTIIoVb2f" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+                  <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
                 </node>
                 <node concept="liA8E" id="WJTIIoViYf" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:7Aoa2yVdVDc" resolve="clear" />
@@ -5350,7 +5350,7 @@
           <node concept="3y3z36" id="WJTIIoVfUB" role="3clFbw">
             <node concept="10Nm6u" id="WJTIIoVg8l" role="3uHU7w" />
             <node concept="37vLTw" id="WJTIIoVfEf" role="3uHU7B">
-              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
             </node>
           </node>
         </node>
@@ -5359,7 +5359,7 @@
             <node concept="2OqwBi" id="WJTIIoV2fD" role="37vLTJ">
               <node concept="Xjq3P" id="WJTIIoV2fE" role="2Oq$k0" />
               <node concept="2OwXpG" id="WJTIIoV2fF" role="2OqNvi">
-                <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="reportedTypes" />
+                <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="report" />
               </node>
             </node>
             <node concept="2ShNRf" id="7Aoa2yVQA4Q" role="37vLTx">
@@ -5383,7 +5383,7 @@
         <node concept="3clFbF" id="WJTIIoUQ8_" role="3cqZAp">
           <node concept="2OqwBi" id="WJTIIoUQgG" role="3clFbG">
             <node concept="37vLTw" id="WJTIIoUQ8$" role="2Oq$k0">
-              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+              <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
             </node>
             <node concept="liA8E" id="WJTIIoUQwv" role="2OqNvi">
               <ref role="37wK5l" to="tj24:7Aoa2yVI_mh" resolve="allTypes" />
@@ -5410,7 +5410,7 @@
               <node concept="2OqwBi" id="WJTIIoVjFv" role="2Oq$k0">
                 <node concept="2OqwBi" id="WJTIIoV2MM" role="2Oq$k0">
                   <node concept="37vLTw" id="WJTIIoV2EE" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="reportedTypes" />
+                    <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="report" />
                   </node>
                   <node concept="liA8E" id="WJTIIoVjdV" role="2OqNvi">
                     <ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
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 4e0d7202..ce36481e 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
@@ -2868,7 +2868,7 @@
                                   <node concept="liA8E" id="7Aoa2yV_Lps" role="2OqNvi">
                                     <ref role="37wK5l" to="tj24:7z54$fPgk2E" resolve="getOrSet" />
                                     <node concept="10M0yZ" id="7Aoa2yV_Wn2" role="37wK5m">
-                                      <ref role="3cqZAo" to="tj24:7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                                      <ref role="3cqZAo" to="tj24:7Aoa2yVefYI" resolve="REPORT" />
                                       <ref role="1PxDUh" to="tj24:6v6oK27venk" resolve="AbstractCheckRequest" />
                                     </node>
                                     <node concept="1bVj0M" id="7Aoa2yV_Xqj" role="37wK5m">
@@ -3007,7 +3007,7 @@
                           <node concept="liA8E" id="7Aoa2yVBGZn" role="2OqNvi">
                             <ref role="37wK5l" to="tj24:7i3KM7g1KV4" resolve="get" />
                             <node concept="10M0yZ" id="7Aoa2yVBHd5" role="37wK5m">
-                              <ref role="3cqZAo" to="tj24:7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                              <ref role="3cqZAo" to="tj24:7Aoa2yVefYI" resolve="REPORT" />
                               <ref role="1PxDUh" to="tj24:6v6oK27venk" resolve="AbstractCheckRequest" />
                             </node>
                           </node>
@@ -3290,7 +3290,7 @@
                   </node>
                   <node concept="2ShNRf" id="5zsw4w31jsK" role="33vP2m">
                     <node concept="1pGfFk" id="5zsw4w31jsL" role="2ShVmc">
-                      <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RuleProcessingSession" />
+                      <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RulesProcessing" />
                       <node concept="37vLTw" id="zL5ZaNDPhd" role="37wK5m">
                         <ref role="3cqZAo" node="3KN3A4vAiqQ" resolve="ac" />
                       </node>
@@ -3350,7 +3350,7 @@
                   <node concept="2OqwBi" id="6OXbTD_oquj" role="33vP2m">
                     <node concept="2OqwBi" id="6OXbTD_oquk" role="2Oq$k0">
                       <node concept="37vLTw" id="6OXbTD_oqul" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                        <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="rulesProcessing" />
                       </node>
                       <node concept="liA8E" id="6OXbTD_oqum" role="2OqNvi">
                         <ref role="37wK5l" to="hano:7WKNeR9alW4" resolve="queryTemplates" />
@@ -3432,7 +3432,7 @@
                   </node>
                   <node concept="2ShNRf" id="61G6TdBqDRl" role="33vP2m">
                     <node concept="1pGfFk" id="3Pxu0s87EMf" role="2ShVmc">
-                      <ref role="37wK5l" to="ugy2:5yr01fEdYJE" />
+                      <ref role="37wK5l" to="ugy2:5yr01fEdYJE" resolve="TemplateApplicationSession" />
                       <node concept="37vLTw" id="5vVBssDPRQY" role="37wK5m">
                         <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
                       </node>
@@ -3456,7 +3456,7 @@
               <node concept="3clFbF" id="4LE1vMPaYTo" role="3cqZAp">
                 <node concept="2OqwBi" id="4LE1vMPaZHf" role="3clFbG">
                   <node concept="37vLTw" id="4LE1vMPaYTm" role="2Oq$k0">
-                    <ref role="3cqZAo" node="61G6TdBqDRk" resolve="macroProcessing" />
+                    <ref role="3cqZAo" node="61G6TdBqDRk" resolve="applicationSession" />
                   </node>
                   <node concept="liA8E" id="4LE1vMPb0OL" role="2OqNvi">
                     <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
@@ -3478,16 +3478,16 @@
                   </node>
                   <node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
                     <node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
-                      <ref role="37wK5l" to="hano:5lpFZvO1gf1" />
+                      <ref role="37wK5l" to="hano:5lpFZvO1gf1" resolve="ProgramBuilder" />
                       <node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
                         <property role="Xl_RC" value="test" />
                       </node>
                       <node concept="37vLTw" id="61G6TdBqDRI" role="37wK5m">
-                        <ref role="3cqZAo" node="61G6TdBqDRk" resolve="macroProcessing" />
+                        <ref role="3cqZAo" node="61G6TdBqDRk" resolve="applicationSession" />
                       </node>
                       <node concept="2OqwBi" id="5vVBssDNe$B" role="37wK5m">
                         <node concept="37vLTw" id="6OXbTD_oFoC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                          <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="rulesProcessing" />
                         </node>
                         <node concept="liA8E" id="5vVBssDNf95" role="2OqNvi">
                           <ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
@@ -3498,7 +3498,7 @@
                       </node>
                       <node concept="2OqwBi" id="2sMBLui0DSV" role="37wK5m">
                         <node concept="37vLTw" id="2sMBLui0DSW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                          <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="rulesProcessing" />
                         </node>
                         <node concept="liA8E" id="2sMBLui0DSX" role="2OqNvi">
                           <ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
@@ -3607,7 +3607,7 @@
                             <property role="2bfB8j" value="true" />
                             <property role="373rjd" value="true" />
                             <ref role="1Y3XeK" to="hano:6RN9TdHmQLy" resolve="FeedbackConsumer" />
-                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                             <node concept="3Tm1VV" id="4nDRG5AZ8hb" role="1B3o_S" />
                           </node>
                         </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index a0de572d..c7c676bc 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -926,7 +926,7 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="IFW4V39a9J" role="37vLTJ">
-                  <ref role="3cqZAo" node="IFW4V33x8O" resolve="trgCliques" />
+                  <ref role="3cqZAo" node="IFW4V33x8O" resolve="trgClique" />
                 </node>
               </node>
             </node>
@@ -981,7 +981,7 @@
                     </node>
                   </node>
                   <node concept="37vLTw" id="IFW4V38lQm" role="37vLTJ">
-                    <ref role="3cqZAo" node="IFW4V33x8O" resolve="trgCliques" />
+                    <ref role="3cqZAo" node="IFW4V33x8O" resolve="trgClique" />
                   </node>
                 </node>
               </node>
@@ -1033,7 +1033,7 @@
             <node concept="3fqX7Q" id="51ek2rRUDCe" role="33vP2m">
               <node concept="2OqwBi" id="51ek2rRUDCg" role="3fr31v">
                 <node concept="37vLTw" id="51ek2rRUDCh" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2ceN1hCDCZY" resolve="srcCliques" />
+                  <ref role="3cqZAo" node="2ceN1hCDCZY" resolve="srcClique" />
                 </node>
                 <node concept="liA8E" id="4nDRG5$gj9E" role="2OqNvi">
                   <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
@@ -1052,7 +1052,7 @@
                 <node concept="3fqX7Q" id="51ek2rRUQuj" role="37vLTx">
                   <node concept="2OqwBi" id="51ek2rRUQul" role="3fr31v">
                     <node concept="37vLTw" id="IFW4V36ECt" role="2Oq$k0">
-                      <ref role="3cqZAo" node="IFW4V33x8O" resolve="trgCliques" />
+                      <ref role="3cqZAo" node="IFW4V33x8O" resolve="trgClique" />
                     </node>
                     <node concept="liA8E" id="4nDRG5$gDrm" role="2OqNvi">
                       <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
@@ -4370,7 +4370,7 @@
                       </node>
                     </node>
                     <node concept="2AHcQZ" id="3GJd70pxJQY" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" />
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
                 </node>
@@ -6218,7 +6218,7 @@
               </node>
               <node concept="2ShNRf" id="6nFpYluoeMX" role="33vP2m">
                 <node concept="1pGfFk" id="6nFpYluoeMY" role="2ShVmc">
-                  <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RuleProcessingSession" />
+                  <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RulesProcessing" />
                   <node concept="37vLTw" id="zL5ZaNDTUJ" role="37wK5m">
                     <ref role="3cqZAo" node="3KN3A4vDlEh" resolve="clique" />
                   </node>
@@ -6234,7 +6234,7 @@
               </node>
               <node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
                 <node concept="1pGfFk" id="3Pxu0s87Llu" role="2ShVmc">
-                  <ref role="37wK5l" to="ugy2:5yr01fEdYJE" />
+                  <ref role="37wK5l" to="ugy2:5yr01fEdYJE" resolve="TemplateApplicationSession" />
                   <node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
                     <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
                   </node>
@@ -6272,7 +6272,7 @@
           <node concept="3clFbF" id="3OUB6BASVxs" role="3cqZAp">
             <node concept="2OqwBi" id="4qGA5WCXRHC" role="3clFbG">
               <node concept="37vLTw" id="4qGA5WCXL_w" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdBDyzL" resolve="macroProcessing" />
+                <ref role="3cqZAo" node="61G6TdBDyzL" resolve="applicationSession" />
               </node>
               <node concept="liA8E" id="4qGA5WCXTPI" role="2OqNvi">
                 <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
@@ -6312,12 +6312,12 @@
               <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
-                    <ref role="37wK5l" to="tj24:1imVejVB$_h" />
+                    <ref role="37wK5l" to="tj24:1imVejVB$_h" resolve="ApplyTemplatesStep" />
                     <node concept="37vLTw" id="6nFpYluoiGj" role="37wK5m">
-                      <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
+                      <ref role="3cqZAo" node="6nFpYluoeMV" resolve="rulesProcessing" />
                     </node>
                     <node concept="37vLTw" id="61G6TdBDzLl" role="37wK5m">
-                      <ref role="3cqZAo" node="61G6TdBDyzL" resolve="macroProcessing" />
+                      <ref role="3cqZAo" node="61G6TdBDyzL" resolve="applicationSession" />
                     </node>
                     <node concept="2OqwBi" id="7WKNeR8TcXG" role="37wK5m">
                       <node concept="Xjq3P" id="7WKNeR8TcXH" role="2Oq$k0" />
@@ -6390,13 +6390,13 @@
             <node concept="2OqwBi" id="7WKNeR8SQy_" role="3clFbG">
               <node concept="2ShNRf" id="7WKNeR8SQyA" role="2Oq$k0">
                 <node concept="1pGfFk" id="7WKNeR8SQyB" role="2ShVmc">
-                  <ref role="37wK5l" to="tj24:1pPth$lK1ZL" resolve="CoderulesHelper" />
+                  <ref role="37wK5l" to="tj24:1pPth$lK1ZL" resolve="LaunchHelper" />
                   <node concept="2ShNRf" id="7WKNeR8SQyC" role="37wK5m">
                     <node concept="YeOm9" id="7WKNeR8SQyD" role="2ShVmc">
                       <node concept="1Y3b0j" id="7WKNeR8SQyE" role="YeSDq">
                         <property role="2bfB8j" value="true" />
                         <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                        <ref role="1Y3XeK" to="tj24:3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+                        <ref role="1Y3XeK" to="tj24:3F6vMxqaxpm" resolve="LaunchHelper.ProgressCallback" />
                         <node concept="3Tm1VV" id="7WKNeR8SQyF" role="1B3o_S" />
                         <node concept="3clFb_" id="3MwxBzG61n7" role="jymVt">
                           <property role="TrG5h" value="done" />
@@ -7954,7 +7954,7 @@
             <node concept="3fqX7Q" id="4nDRG5$ioAJ" role="33vP2m">
               <node concept="2OqwBi" id="4nDRG5$ioAL" role="3fr31v">
                 <node concept="37vLTw" id="4nDRG5$ioAM" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3KN3A4v4yZU" resolve="forModel" />
+                  <ref role="3cqZAo" node="3KN3A4v4yZU" resolve="clique" />
                 </node>
                 <node concept="liA8E" id="4nDRG5$ioAN" role="2OqNvi">
                   <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
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 5e786c2c..7d64dee6 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
@@ -3037,7 +3037,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2j1FRbx609Y" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="3uibUv" id="2j1FRbx61sA" role="11_B2D">
           <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
         </node>
@@ -3047,7 +3047,7 @@
       <property role="TrG5h" value="REPORT_ITEMS" />
       <node concept="3Tm1VV" id="2daneBP_Jiz" role="1B3o_S" />
       <node concept="3uibUv" id="2daneBP_Ji$" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="_YKpA" id="2daneBP_OV2" role="11_B2D">
           <node concept="3uibUv" id="2daneBP_OV3" role="_ZDj9">
             <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
@@ -3071,7 +3071,7 @@
       <property role="TrG5h" value="MESSAGES" />
       <node concept="3Tm1VV" id="1PN9XOHxyoL" role="1B3o_S" />
       <node concept="3uibUv" id="1PN9XOHxyoM" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="_YKpA" id="1PN9XOHxyoN" role="11_B2D">
           <node concept="3uibUv" id="1PN9XOHxyoO" role="_ZDj9">
             <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
@@ -3103,7 +3103,7 @@
       <node concept="3Tm1VV" id="3KN3A4vHiEL" role="1B3o_S" />
       <node concept="3clFbS" id="3KN3A4vHiEM" role="3clF47">
         <node concept="XkiVB" id="3KN3A4vHiEN" role="3cqZAp">
-          <ref role="37wK5l" node="1pPth$lHpLU" />
+          <ref role="37wK5l" node="1pPth$lHpLU" resolve="EvaluateRulesStep" />
           <node concept="37vLTw" id="3KN3A4vHiEO" role="37wK5m">
             <ref role="3cqZAo" node="3KN3A4vHiEG" resolve="repository" />
           </node>
@@ -3213,7 +3213,7 @@
                                           <node concept="3clFbF" id="KkWtiKlwKc" role="3cqZAp">
                                             <node concept="37vLTI" id="KkWtiKlYfW" role="3clFbG">
                                               <node concept="37vLTw" id="KkWtiKlZ4H" role="37vLTx">
-                                                <ref role="3cqZAo" node="KkWtiKln33" resolve="events" />
+                                                <ref role="3cqZAo" node="KkWtiKln33" resolve="trEvents" />
                                               </node>
                                               <node concept="37vLTw" id="KkWtiKlLx3" role="37vLTJ">
                                                 <ref role="3cqZAo" node="KkWtiKlLwV" resolve="traceEvents" />
@@ -3481,7 +3481,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4nDRG5DdziG" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="1laj_RSBHty" role="jymVt" />
@@ -5619,7 +5619,7 @@
             <node concept="liA8E" id="7Aoa2yVAPz_" role="2OqNvi">
               <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
               <node concept="37vLTw" id="7Aoa2yVAPzA" role="37wK5m">
-                <ref role="3cqZAo" node="7Aoa2yVAM2J" resolve="unitRef" />
+                <ref role="3cqZAo" node="7Aoa2yVAM2J" resolve="key" />
               </node>
             </node>
             <node concept="37vLTw" id="7Aoa2yVAPzB" role="2Oq$k0">
@@ -5658,7 +5658,7 @@
               <node concept="liA8E" id="At0yqMWans" role="2OqNvi">
                 <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                 <node concept="37vLTw" id="At0yqMWcOH" role="37wK5m">
-                  <ref role="3cqZAo" node="At0yqMWbwW" resolve="unitRef" />
+                  <ref role="3cqZAo" node="At0yqMWbwW" resolve="key" />
                 </node>
               </node>
               <node concept="37vLTw" id="At0yqMWanu" role="2Oq$k0">
@@ -5703,7 +5703,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="7Aoa2yVzAef" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="1T5MAgPi6KS" role="jymVt" />
@@ -5902,7 +5902,7 @@
           <node concept="1rXfSq" id="4duYm8_ndvy" role="3clFbG">
             <ref role="37wK5l" node="61G6TdDe$Or" resolve="updateSharedCacheHolder" />
             <node concept="37vLTw" id="4duYm8_ndvz" role="37wK5m">
-              <ref role="3cqZAo" node="4duYm8_mV8n" resolve="unitRef" />
+              <ref role="3cqZAo" node="4duYm8_mV8n" resolve="key" />
             </node>
             <node concept="1bVj0M" id="4duYm8_ndv$" role="37wK5m">
               <node concept="gl6BB" id="KkWtiKGc8g" role="1bW2Oz">
@@ -6045,7 +6045,7 @@
             <node concept="liA8E" id="4duYm8_mA7y" role="2OqNvi">
               <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfPresent(java.lang.Object,java.util.function.BiFunction)" resolve="computeIfPresent" />
               <node concept="37vLTw" id="61G6TdDfA4u" role="37wK5m">
-                <ref role="3cqZAo" node="61G6TdDe$Os" resolve="unitRef" />
+                <ref role="3cqZAo" node="61G6TdDe$Os" resolve="key" />
               </node>
               <node concept="37vLTw" id="61G6TdDfAAg" role="37wK5m">
                 <ref role="3cqZAo" node="61G6TdDe$Ou" resolve="updater" />
@@ -6280,7 +6280,7 @@
         </node>
         <node concept="3clFbJ" id="7Aoa2yVj216" role="3cqZAp">
           <node concept="37vLTw" id="7Aoa2yVjDFX" role="3clFbw">
-            <ref role="3cqZAo" node="7Aoa2yVjDFT" resolve="b" />
+            <ref role="3cqZAo" node="7Aoa2yVjDFT" resolve="fresh" />
           </node>
           <node concept="3clFbS" id="7Aoa2yVj218" role="3clFbx">
             <node concept="3clFbF" id="7Aoa2yVj2Ua" role="3cqZAp">
@@ -6525,7 +6525,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="qsErMwy_oB" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="7i3KM7g1LNN" role="jymVt" />
@@ -7293,12 +7293,12 @@
       <node concept="3Tm1VV" id="7i3KM7gApvx" role="1B3o_S" />
       <node concept="3clFbS" id="7i3KM7gApvy" role="3clF47">
         <node concept="XkiVB" id="6nFpYlursqi" role="3cqZAp">
-          <ref role="37wK5l" node="1imVejVB$_h" />
+          <ref role="37wK5l" node="1imVejVB$_h" resolve="ApplyTemplatesStep" />
           <node concept="37vLTw" id="6nFpYlurv6W" role="37wK5m">
-            <ref role="3cqZAo" node="6nFpYluo8Vd" resolve="session" />
+            <ref role="3cqZAo" node="6nFpYluo8Vd" resolve="rulesProcessing" />
           </node>
           <node concept="37vLTw" id="61G6TdBAEfx" role="37wK5m">
-            <ref role="3cqZAo" node="61G6TdBA_$Z" resolve="macroProcessing" />
+            <ref role="3cqZAo" node="61G6TdBA_$Z" resolve="applicationSession" />
           </node>
           <node concept="37vLTw" id="6nFpYlurvaW" role="37wK5m">
             <ref role="3cqZAo" node="7WKNeR9fh8z" resolve="inputNodes" />
@@ -8850,11 +8850,11 @@
             <node concept="2OqwBi" id="6nFpYluGWwM" role="37vLTJ">
               <node concept="Xjq3P" id="6nFpYluGWzI" role="2Oq$k0" />
               <node concept="2OwXpG" id="6nFpYluGWwP" role="2OqNvi">
-                <ref role="2Oxat5" node="6nFpYluGTJA" resolve="helpers" />
+                <ref role="2Oxat5" node="6nFpYluGTJA" resolve="helper" />
               </node>
             </node>
             <node concept="37vLTw" id="6nFpYluGTJL" role="37vLTx">
-              <ref role="3cqZAo" node="6nFpYluGIjR" resolve="helpers" />
+              <ref role="3cqZAo" node="6nFpYluGIjR" resolve="helper" />
             </node>
           </node>
         </node>
@@ -10697,7 +10697,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="KkWtiL61IM" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="KkWtiL62tp" role="jymVt" />
@@ -10737,7 +10737,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="KkWtiL62Jr" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="KkWtiKKLii" role="jymVt" />
@@ -11052,7 +11052,7 @@
                         <node concept="liA8E" id="KkWtiM4HAi" role="2OqNvi">
                           <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                           <node concept="37vLTw" id="KkWtiM4HAj" role="37wK5m">
-                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORT" />
                           </node>
                           <node concept="1bVj0M" id="KkWtiM4HAk" role="37wK5m">
                             <node concept="3clFbS" id="KkWtiM4HAl" role="1bW5cS">
@@ -11120,7 +11120,7 @@
               <node concept="liA8E" id="KkWtiKSFES" role="2OqNvi">
                 <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                 <node concept="37vLTw" id="KkWtiKSFFm" role="37wK5m">
-                  <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                  <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORT" />
                 </node>
                 <node concept="1bVj0M" id="KkWtiKSFET" role="37wK5m">
                   <node concept="3clFbS" id="KkWtiKSFEU" role="1bW5cS">
@@ -11145,7 +11145,7 @@
               <node concept="1Y3b0j" id="KkWtiKSDPL" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="2tJIrI" id="KkWtiKSEMM" role="jymVt" />
                 <node concept="3Tm1VV" id="KkWtiKSDPM" role="1B3o_S" />
@@ -11178,7 +11178,7 @@
                           <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
                           <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
                           <node concept="37vLTw" id="KkWtiM4Ty$" role="37wK5m">
-                            <ref role="3cqZAo" node="KkWtiKSFEO" resolve="reportedTypes" />
+                            <ref role="3cqZAo" node="KkWtiKSFEO" resolve="report" />
                           </node>
                         </node>
                         <node concept="2YIFZM" id="KkWtiKVkz$" role="3K4GZi">
@@ -11192,7 +11192,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKUtD3" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKbs" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -11206,7 +11206,7 @@
                     <node concept="3clFbF" id="KkWtiKSJtq" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKSJtr" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKSJts" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKSJtt" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVe00r" resolve="dropInvalidated" />
@@ -11218,7 +11218,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKSH6G" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="3cqZAl" id="KkWtiKT2zQ" role="3clF45" />
                   <node concept="37vLTG" id="KkWtiKSH3L" role="3clF46">
@@ -11243,7 +11243,7 @@
                     <node concept="3clFbF" id="KkWtiKThGW" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKThGX" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKThGY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKThGZ" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVe2QP" resolve="putAllTypes" />
@@ -11255,7 +11255,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKTePT" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="3clFb_" id="KkWtiKTtjW" role="jymVt">
@@ -11282,7 +11282,7 @@
                     <node concept="3clFbF" id="KkWtiKTwy2" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKTwy3" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKTwy4" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKTwy5" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVg38k" resolve="changedBasis" />
@@ -11297,7 +11297,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKTtmX" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="3clFb_" id="KkWtiKTOyh" role="jymVt">
@@ -11316,7 +11316,7 @@
                     <node concept="3clFbF" id="KkWtiKTSgx" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKTSgy" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKTSgz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKSFEO" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKTSg$" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVg8Dv" resolve="addReportItems" />
@@ -11344,7 +11344,7 @@
                         <ref role="37wK5l" node="1z4$59i_qJE" resolve="forwardReportItems" />
                         <node concept="2OqwBi" id="KkWtiKV$gW" role="37wK5m">
                           <node concept="37vLTw" id="KkWtiKVnLw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="KkWtiKSFEO" resolve="reportedTypes" />
+                            <ref role="3cqZAo" node="KkWtiKSFEO" resolve="report" />
                           </node>
                           <node concept="liA8E" id="KkWtiKVCmv" role="2OqNvi">
                             <ref role="37wK5l" node="7Aoa2yVl_uk" resolve="allReportItems" />
@@ -11354,7 +11354,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKTO_9" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -11363,7 +11363,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="KkWtiKPk43" role="3clF45">
-        <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+        <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
         <node concept="3uibUv" id="KkWtiKPlf$" role="11_B2D">
           <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="TypecheckingReport" />
         </node>
@@ -11489,7 +11489,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4nDRG5$K8wd" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="6dGwhn$yxhS" role="jymVt" />
@@ -11693,7 +11693,7 @@
                         <node concept="liA8E" id="KkWtiLGj2v" role="2OqNvi">
                           <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                           <node concept="37vLTw" id="KkWtiLGj2X" role="37wK5m">
-                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORT" />
                           </node>
                           <node concept="1bVj0M" id="KkWtiLGj2w" role="37wK5m">
                             <node concept="3clFbS" id="KkWtiLGj2x" role="1bW5cS">
@@ -11717,7 +11717,7 @@
                       <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
                       <node concept="2OqwBi" id="KkWtiLHe$S" role="37wK5m">
                         <node concept="37vLTw" id="KkWtiLHe$T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiLGj2r" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiLGj2r" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiLHe$U" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
@@ -11783,7 +11783,7 @@
               <node concept="liA8E" id="KkWtiKXhHa" role="2OqNvi">
                 <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                 <node concept="37vLTw" id="KkWtiKXhHC" role="37wK5m">
-                  <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                  <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORT" />
                 </node>
                 <node concept="1bVj0M" id="KkWtiKXhHb" role="37wK5m">
                   <node concept="3clFbS" id="KkWtiKXhHc" role="1bW5cS">
@@ -11832,8 +11832,8 @@
               <node concept="1Y3b0j" id="KkWtiKXhIj" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
-                <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Builder" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="2tJIrI" id="KkWtiKXhIk" role="jymVt" />
                 <node concept="3Tm1VV" id="KkWtiKXhIl" role="1B3o_S" />
                 <node concept="3clFb_" id="KkWtiKXhIm" role="jymVt">
@@ -11864,7 +11864,7 @@
                           <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
                           <node concept="2OqwBi" id="KkWtiKXKW8" role="37wK5m">
                             <node concept="37vLTw" id="KkWtiKXKW9" role="2Oq$k0">
-                              <ref role="3cqZAo" node="KkWtiKXhH6" resolve="reportedTypes" />
+                              <ref role="3cqZAo" node="KkWtiKXhH6" resolve="report" />
                             </node>
                             <node concept="liA8E" id="KkWtiKXKWa" role="2OqNvi">
                               <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
@@ -11885,7 +11885,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKXhIA" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKbu" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -11899,7 +11899,7 @@
                     <node concept="3clFbF" id="KkWtiKXhIE" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKXhIF" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKXhIG" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKXhIH" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVe00r" resolve="dropInvalidated" />
@@ -11911,7 +11911,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKXhIJ" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="3cqZAl" id="KkWtiKXhIK" role="3clF45" />
                   <node concept="37vLTG" id="KkWtiKXhIL" role="3clF46">
@@ -11936,7 +11936,7 @@
                     <node concept="3clFbF" id="KkWtiKXhIW" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKXhIX" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKXhIY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKXhIZ" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVe2QP" resolve="putAllTypes" />
@@ -11948,7 +11948,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKXhJ1" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="3clFb_" id="KkWtiKXhJ2" role="jymVt">
@@ -11975,7 +11975,7 @@
                     <node concept="3clFbF" id="KkWtiKXhJc" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKXhJd" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKXhJe" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKXhJf" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVg38k" resolve="changedBasis" />
@@ -11990,7 +11990,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKXhJi" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="3clFb_" id="KkWtiKXhJj" role="jymVt">
@@ -12009,7 +12009,7 @@
                     <node concept="3clFbF" id="KkWtiKXhJq" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiKXhJr" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiKXhJs" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiKXhH6" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiKXhJt" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVg8Dv" resolve="addReportItems" />
@@ -12037,7 +12037,7 @@
                         <ref role="37wK5l" node="1z4$59i_qJE" resolve="forwardReportItems" />
                         <node concept="2OqwBi" id="KkWtiKXhJA" role="37wK5m">
                           <node concept="37vLTw" id="KkWtiKXhJB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="KkWtiKXhH6" resolve="reportedTypes" />
+                            <ref role="3cqZAo" node="KkWtiKXhH6" resolve="report" />
                           </node>
                           <node concept="liA8E" id="KkWtiKXhJC" role="2OqNvi">
                             <ref role="37wK5l" node="7Aoa2yVl_uk" resolve="allReportItems" />
@@ -12047,7 +12047,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKXhJD" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -12056,7 +12056,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="KkWtiKX6t8" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="KkWtiKX4IZ" role="jymVt" />
@@ -12102,7 +12102,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4nDRG5$KfUB" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="4nDRG5$Kiv9" role="jymVt" />
@@ -12216,7 +12216,7 @@
                           <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                           <node concept="10M0yZ" id="7Aoa2yVrA5Q" role="37wK5m">
                             <ref role="1PxDUh" node="6v6oK27venk" resolve="AbstractCheckRequest" />
-                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORT" />
                           </node>
                           <node concept="1bVj0M" id="7Aoa2yVrAiu" role="37wK5m">
                             <node concept="3clFbS" id="7Aoa2yVrAiv" role="1bW5cS">
@@ -12258,7 +12258,7 @@
                       <node concept="3Tqbb2" id="KkWtiL5k7t" role="1tU5fm" />
                       <node concept="2OqwBi" id="KkWtiL5kC_" role="33vP2m">
                         <node concept="37vLTw" id="KkWtiL5kCA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7Aoa2yVrAip" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="7Aoa2yVrAip" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiL5kCB" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
@@ -12419,7 +12419,7 @@
                 <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                 <node concept="10M0yZ" id="KkWtiL46PI" role="37wK5m">
                   <ref role="1PxDUh" node="6v6oK27venk" resolve="AbstractCheckRequest" />
-                  <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                  <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORT" />
                 </node>
                 <node concept="1bVj0M" id="KkWtiL46PJ" role="37wK5m">
                   <node concept="3clFbS" id="KkWtiL46PK" role="1bW5cS">
@@ -12444,7 +12444,7 @@
               <node concept="1Y3b0j" id="KkWtiL4fD1" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="3Tm1VV" id="KkWtiL4fD2" role="1B3o_S" />
                 <node concept="3Tqbb2" id="KkWtiL4dX6" role="2Ghqu4" />
@@ -12463,7 +12463,7 @@
                           <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
                           <node concept="2OqwBi" id="KkWtiL51lp" role="37wK5m">
                             <node concept="37vLTw" id="KkWtiL51lq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="KkWtiL46PD" resolve="reportedTypes" />
+                              <ref role="3cqZAo" node="KkWtiL46PD" resolve="report" />
                             </node>
                             <node concept="liA8E" id="KkWtiL51lr" role="2OqNvi">
                               <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
@@ -12484,7 +12484,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiL4gym" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKbw" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -12507,7 +12507,7 @@
                     <node concept="3clFbF" id="KkWtiL4JmS" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiL4K1H" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiL4JmQ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiL46PD" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiL46PD" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiL4Llp" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVe2QP" resolve="putAllTypes" />
@@ -12520,7 +12520,7 @@
                     <node concept="3clFbF" id="KkWtiL4BER" role="3cqZAp">
                       <node concept="2OqwBi" id="KkWtiL4BET" role="3clFbG">
                         <node concept="37vLTw" id="KkWtiL4BEU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="KkWtiL46PD" resolve="reportedTypes" />
+                          <ref role="3cqZAo" node="KkWtiL46PD" resolve="report" />
                         </node>
                         <node concept="liA8E" id="KkWtiL4BEV" role="2OqNvi">
                           <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
@@ -12532,7 +12532,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiL4$DV" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -12594,7 +12594,7 @@
     <node concept="3clFbW" id="6v6oK27i3ML" role="jymVt">
       <node concept="3clFbS" id="6v6oK27i3MM" role="3clF47">
         <node concept="XkiVB" id="6v6oK27i3MR" role="3cqZAp">
-          <ref role="37wK5l" node="7Aoa2yVx6AT" />
+          <ref role="37wK5l" node="7Aoa2yVx6AT" resolve="AbstractConvertsRequest" />
           <node concept="37vLTw" id="6v6oK27i3MP" role="37wK5m">
             <ref role="3cqZAo" node="6v6oK27i3MB" resolve="coerceQuery" />
           </node>
@@ -12859,7 +12859,7 @@
               <node concept="1Y3b0j" id="KkWtiL2j3M" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="3Tm1VV" id="KkWtiL2j3N" role="1B3o_S" />
                 <node concept="3Tqbb2" id="KkWtiL2hKx" role="2Ghqu4" />
@@ -12950,7 +12950,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiL2koW" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKby" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -13026,7 +13026,7 @@
     <node concept="3clFbW" id="6v6oK27nfe8" role="jymVt">
       <node concept="3clFbS" id="6v6oK27nfe9" role="3clF47">
         <node concept="XkiVB" id="6v6oK27nfee" role="3cqZAp">
-          <ref role="37wK5l" node="7Aoa2yVx6AT" />
+          <ref role="37wK5l" node="7Aoa2yVx6AT" resolve="AbstractConvertsRequest" />
           <node concept="37vLTw" id="6v6oK27nfec" role="37wK5m">
             <ref role="3cqZAo" node="6v6oK27nfdY" resolve="coerceQuery" />
           </node>
@@ -13291,7 +13291,7 @@
               <node concept="1Y3b0j" id="KkWtiL0xTT" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="3Tm1VV" id="KkWtiL0xTU" role="1B3o_S" />
                 <node concept="3Tqbb2" id="KkWtiL0$eh" role="2Ghqu4" />
@@ -13382,7 +13382,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiL0_ZB" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKb$" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -13454,7 +13454,7 @@
     <node concept="3clFbW" id="6v6oK26Kol8" role="jymVt">
       <node concept="3clFbS" id="6v6oK26Kol9" role="3clF47">
         <node concept="XkiVB" id="6v6oK26Kole" role="3cqZAp">
-          <ref role="37wK5l" node="7Aoa2yVx6AT" />
+          <ref role="37wK5l" node="7Aoa2yVx6AT" resolve="AbstractConvertsRequest" />
           <node concept="37vLTw" id="6v6oK26Kolc" role="37wK5m">
             <ref role="3cqZAo" node="6v6oK26KokY" resolve="convertQuery" />
           </node>
@@ -13785,7 +13785,7 @@
               <node concept="1Y3b0j" id="KkWtiKYNqH" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="3Tm1VV" id="KkWtiKYNqI" role="1B3o_S" />
                 <node concept="3clFb_" id="KkWtiKYOfh" role="jymVt">
@@ -13878,7 +13878,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiKYOfB" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKbA" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -13894,7 +13894,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="7Aoa2yVyM_g" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="3uibUv" id="KkWtiKOSSS" role="3clF45">
         <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
@@ -14014,7 +14014,7 @@
               <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
               <node concept="3clFbT" id="7Aoa2yTPx5Q" role="37wK5m" />
               <node concept="37Ijox" id="7Aoa2yTPzh_" role="37wK5m">
-                <ref role="37Ijqf" node="7Aoa2yTPo47" resolve="response" />
+                <ref role="37Ijqf" node="7Aoa2yTPo47" resolve="responseBuilder" />
                 <node concept="Xjq3P" id="7Aoa2yTPyzw" role="wWaWy" />
               </node>
             </node>
@@ -14054,7 +14054,7 @@
               <node concept="1Y3b0j" id="KkWtiL3Zec" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="3Tm1VV" id="KkWtiL3Zed" role="1B3o_S" />
                 <node concept="_YKpA" id="KkWtiL3XDl" role="2Ghqu4">
@@ -14101,7 +14101,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiL3ZF0" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKbC" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -14114,7 +14114,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7Aoa2yTPo4C" role="3clF45">
-        <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+        <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
         <node concept="_YKpA" id="7Aoa2yTPsqk" role="11_B2D">
           <node concept="2sp9CU" id="7Aoa2yTPsRl" role="_ZDj9" />
         </node>
@@ -14166,7 +14166,7 @@
       <property role="TrG5h" value="REPORT" />
       <property role="3TUv4t" value="true" />
       <node concept="3uibUv" id="7Aoa2yVefYJ" role="1tU5fm">
-        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="DataFlavour" />
+        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
         <node concept="3uibUv" id="7Aoa2yVejg$" role="11_B2D">
           <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="TypecheckingReport" />
         </node>
@@ -14236,7 +14236,7 @@
                   <ref role="3cqZAo" node="7Aoa2yVky2I" resolve="cachedData" />
                 </node>
                 <node concept="37vLTw" id="628U2saJsWQ" role="37wK5m">
-                  <ref role="3cqZAo" node="6v6oK27vjiv" resolve="updatable" />
+                  <ref role="3cqZAo" node="6v6oK27vjiv" resolve="fresh" />
                 </node>
               </node>
             </node>
@@ -14561,7 +14561,7 @@
               <node concept="1Y3b0j" id="KkWtiL7XgI" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="KkWtiKKMjz" resolve="Response.Builder" />
                 <node concept="3Tm1VV" id="KkWtiL7XgJ" role="1B3o_S" />
                 <node concept="3uibUv" id="KkWtiL7Wkn" role="2Ghqu4">
@@ -14597,7 +14597,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="KkWtiL7XNE" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="37vLTG" id="KkWtiLdKbE" role="3clF46">
                     <property role="TrG5h" value="executionOk" />
@@ -14610,7 +14610,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="KkWtiKOUDl" role="3clF45">
-        <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+        <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
         <node concept="3uibUv" id="KkWtiKOXoO" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
         </node>
@@ -15856,7 +15856,7 @@
         <node concept="3uibUv" id="KkWtiLdX2X" role="1tU5fm">
           <ref role="3uigEE" to="82uw:~Supplier" resolve="Supplier" />
           <node concept="3uibUv" id="7Aoa2yU04Ad" role="11_B2D">
-            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
             <node concept="16syzq" id="7Aoa2yU04Ae" role="11_B2D">
               <ref role="16sUi3" node="7Aoa2yU04Ag" resolve="T" />
             </node>
@@ -16017,7 +16017,7 @@
                     <node concept="1rXfSq" id="7Aoa2yUqCET" role="2Oq$k0">
                       <ref role="37wK5l" node="7Vnjo8NrvGD" resolve="steps" />
                       <node concept="37vLTw" id="7Aoa2yUqCEU" role="37wK5m">
-                        <ref role="3cqZAo" node="7Aoa2yUqCEi" />
+                        <ref role="3cqZAo" node="7Aoa2yUqCEi" resolve="aspectClique" />
                       </node>
                       <node concept="2OqwBi" id="7Aoa2yUqCEV" role="37wK5m">
                         <node concept="37vLTw" id="7Aoa2yUqCEW" role="2Oq$k0">
@@ -16122,7 +16122,7 @@
           <node concept="3uibUv" id="KkWtiLe2Q_" role="1tU5fm">
             <ref role="3uigEE" to="82uw:~Supplier" resolve="Supplier" />
             <node concept="3uibUv" id="KkWtiLe2QA" role="11_B2D">
-              <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+              <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
               <node concept="16syzq" id="KkWtiLe2QB" role="11_B2D">
                 <ref role="16sUi3" node="7Aoa2yTNzHc" resolve="T" />
               </node>
@@ -16309,7 +16309,7 @@
               <node concept="YeOm9" id="61G6TdB_yxc" role="2ShVmc">
                 <node concept="1Y3b0j" id="61G6TdB_yxd" role="YeSDq">
                   <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="ugy2:5yr01fEdYJE" />
+                  <ref role="37wK5l" to="ugy2:5yr01fEdYJE" resolve="TemplateApplicationSession" />
                   <ref role="1Y3XeK" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                   <node concept="3Tm1VV" id="61G6TdB_yxe" role="1B3o_S" />
                   <node concept="37vLTw" id="1C_jAsqoGJS" role="37wK5m">
@@ -16346,7 +16346,7 @@
                       <node concept="3clFbF" id="7Aoa2yUpwQ9" role="3cqZAp">
                         <node concept="2OqwBi" id="7Aoa2yUpAPs" role="3clFbG">
                           <node concept="Xjq3P" id="7Aoa2yUpDZA" role="2Oq$k0">
-                            <ref role="1HBi2w" node="7i3KM7gIg9K" resolve="Default" />
+                            <ref role="1HBi2w" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
                           </node>
                           <node concept="liA8E" id="7Aoa2yUpAPv" role="2OqNvi">
                             <ref role="37wK5l" node="7Aoa2yUmT5E" resolve="reportFeedback" />
@@ -16416,7 +16416,7 @@
               <node concept="TSZUe" id="7Aoa2yUnO0I" role="2OqNvi">
                 <node concept="2ShNRf" id="7Aoa2yUnO0J" role="25WWJ7">
                   <node concept="1pGfFk" id="7Aoa2yUnO0K" role="2ShVmc">
-                    <ref role="37wK5l" to="hano:1FOQehwow5Q" />
+                    <ref role="37wK5l" to="hano:1FOQehwow5Q" resolve="FeedbackReportItem" />
                     <node concept="2YIFZM" id="7Aoa2yUnO0L" role="37wK5m">
                       <ref role="1Pybhc" to="tpfl:61G6TdBsGY8" resolve="FeedbackUtil" />
                       <ref role="37wK5l" to="tpfl:3o9wrC3WoA4" resolve="severityToStatus" />
@@ -16431,7 +16431,7 @@
                     </node>
                     <node concept="2OqwBi" id="7Aoa2yUnO0P" role="37wK5m">
                       <node concept="37vLTw" id="7Aoa2yUnW3Z" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Aoa2yUnW3V" resolve="origin" />
+                        <ref role="3cqZAo" node="7Aoa2yUnW3V" resolve="feedbackOrigin" />
                       </node>
                       <node concept="liA8E" id="7Aoa2yUnO0T" role="2OqNvi">
                         <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getOrigin" />
@@ -16447,7 +16447,7 @@
                     </node>
                     <node concept="2OqwBi" id="7Aoa2yUnO0X" role="37wK5m">
                       <node concept="37vLTw" id="7Aoa2yUnW40" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7Aoa2yUnW3V" resolve="origin" />
+                        <ref role="3cqZAo" node="7Aoa2yUnW3V" resolve="feedbackOrigin" />
                       </node>
                       <node concept="liA8E" id="7Aoa2yUnO11" role="2OqNvi">
                         <ref role="37wK5l" to="tpfl:4ekZiHddjyV" resolve="getTemplate" />
@@ -16471,7 +16471,7 @@
           <node concept="3clFbF" id="7i3KM7gIG_m" role="3cqZAp">
             <node concept="2ShNRf" id="7i3KM7gIG_k" role="3clFbG">
               <node concept="1pGfFk" id="7i3KM7gIGWP" role="2ShVmc">
-                <ref role="37wK5l" node="1T5MAgPvww5" />
+                <ref role="37wK5l" node="1T5MAgPvww5" resolve="ConfigureTypecheckingStep" />
               </node>
             </node>
           </node>
@@ -16546,7 +16546,7 @@
             <node concept="2ShNRf" id="7Aoa2yU9upj" role="3clFbG">
               <node concept="1pGfFk" id="7Aoa2yUd$X1" role="2ShVmc">
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" node="7Aoa2yU0Z1E" />
+                <ref role="37wK5l" node="7Aoa2yU0Z1E" resolve="ProcessEffectStep" />
                 <node concept="37vLTw" id="7Aoa2yUcTWO" role="37wK5m">
                   <ref role="3cqZAo" node="17DrR$SMHcm" resolve="evaluatedProgram" />
                 </node>
@@ -16568,7 +16568,7 @@
         <node concept="37vLTG" id="1RYTbd8flJp" role="3clF46">
           <property role="TrG5h" value="response" />
           <node concept="3uibUv" id="1RYTbd8fpOA" role="1tU5fm">
-            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
             <node concept="16syzq" id="1RYTbd8ftKH" role="11_B2D">
               <ref role="16sUi3" node="1RYTbd8fcDi" resolve="T" />
             </node>
@@ -16801,7 +16801,7 @@
               </node>
               <node concept="2ShNRf" id="7Vnjo8Ltj5k" role="33vP2m">
                 <node concept="1pGfFk" id="7Vnjo8Ltj5l" role="2ShVmc">
-                  <ref role="37wK5l" to="hano:7DvO2M9VeM1" />
+                  <ref role="37wK5l" to="hano:7DvO2M9VeM1" resolve="RulesProcessing" />
                   <node concept="37vLTw" id="7Vnjo8Ltj5m" role="37wK5m">
                     <ref role="3cqZAo" node="4XsNDZYbBO8" resolve="aspectClique" />
                   </node>
@@ -16818,7 +16818,7 @@
               <node concept="1rXfSq" id="4XsNDZYgEfw" role="33vP2m">
                 <ref role="37wK5l" node="61G6TdB_yxW" resolve="templateApplicationSession" />
                 <node concept="37vLTw" id="4XsNDZYgEfy" role="37wK5m">
-                  <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="processingSession" />
+                  <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="rulesProcessing" />
                 </node>
               </node>
             </node>
@@ -16827,9 +16827,9 @@
           <node concept="3clFbF" id="4XsNDZYgfjs" role="3cqZAp">
             <node concept="2ShNRf" id="6kREIVkWRFr" role="3clFbG">
               <node concept="1pGfFk" id="6kREIVkWRFs" role="2ShVmc">
-                <ref role="37wK5l" node="1imVejVB$_h" />
+                <ref role="37wK5l" node="1imVejVB$_h" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="4XsNDZYgxYu" role="37wK5m">
-                  <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="processingSession" />
+                  <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="rulesProcessing" />
                 </node>
                 <node concept="37vLTw" id="4XsNDZYgGxX" role="37wK5m">
                   <ref role="3cqZAo" node="4XsNDZYgEfv" resolve="applicationSession" />
@@ -17044,7 +17044,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="7Aoa2yU7689" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="7Aoa2yU7oNY" role="jymVt" />
@@ -17053,7 +17053,7 @@
         <node concept="37vLTG" id="4XsNDZYfRLT" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="4XsNDZYfRLU" role="1tU5fm">
-            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
             <node concept="16syzq" id="4XsNDZYfRLV" role="11_B2D">
               <ref role="16sUi3" node="4XsNDZYfRM0" resolve="T" />
             </node>
@@ -17068,7 +17068,7 @@
           <node concept="3clFbF" id="KkWtiKN2$A" role="3cqZAp">
             <node concept="2OqwBi" id="KkWtiKN72P" role="3clFbG">
               <node concept="37vLTw" id="KkWtiKN2$$" role="2Oq$k0">
-                <ref role="3cqZAo" node="4XsNDZYfRLT" resolve="response" />
+                <ref role="3cqZAo" node="4XsNDZYfRLT" resolve="builder" />
               </node>
               <node concept="liA8E" id="KkWtiKNboD" role="2OqNvi">
                 <ref role="37wK5l" node="KkWtiKM52m" resolve="ruleTemplates" />
@@ -17160,7 +17160,7 @@
         <node concept="37vLTG" id="5Qx6_65F8sy" role="3clF46">
           <property role="TrG5h" value="typeCollector" />
           <node concept="3uibUv" id="5Qx6_65F8sz" role="1tU5fm">
-            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
+            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
           </node>
         </node>
         <node concept="37vLTG" id="5Qx6_65F8s$" role="3clF46">
@@ -17206,11 +17206,11 @@
               <node concept="2OqwBi" id="5Qx6_65Fubu" role="37vLTJ">
                 <node concept="Xjq3P" id="5Qx6_65Fubv" role="2Oq$k0" />
                 <node concept="2OwXpG" id="5Qx6_65Fubw" role="2OqNvi">
-                  <ref role="2Oxat5" node="5Qx6_65tZCJ" resolve="cacheHolder" />
+                  <ref role="2Oxat5" node="5Qx6_65tZCJ" resolve="cachedData" />
                 </node>
               </node>
               <node concept="37vLTw" id="5Qx6_65Fubx" role="37vLTx">
-                <ref role="3cqZAo" node="5Qx6_65F8s$" resolve="cacheHolder" />
+                <ref role="3cqZAo" node="5Qx6_65F8s$" resolve="cachedData" />
               </node>
             </node>
           </node>
@@ -17219,7 +17219,7 @@
               <node concept="2OqwBi" id="7Aoa2yVl9QN" role="37vLTJ">
                 <node concept="Xjq3P" id="7Aoa2yVlbBP" role="2Oq$k0" />
                 <node concept="2OwXpG" id="7Aoa2yVl9QQ" role="2OqNvi">
-                  <ref role="2Oxat5" node="7Aoa2yVl44f" resolve="myFresh" />
+                  <ref role="2Oxat5" node="7Aoa2yVl44f" resolve="fresh" />
                 </node>
               </node>
               <node concept="37vLTw" id="7Aoa2yVl44p" role="37vLTx">
@@ -17364,7 +17364,7 @@
                 <node concept="liA8E" id="3OUB6BBbaeh" role="2OqNvi">
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                   <node concept="10M0yZ" id="3OUB6BBbaei" role="37wK5m">
-                    <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
+                    <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_PROCESSING" />
                     <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
                   </node>
                   <node concept="1bVj0M" id="3OUB6BBbaej" role="37wK5m">
@@ -17405,7 +17405,7 @@
               <node concept="1rXfSq" id="3OUB6BBxZvS" role="33vP2m">
                 <ref role="37wK5l" node="6PWFJfG8yyv" resolve="templateApplicationSession" />
                 <node concept="37vLTw" id="3OUB6BBxZvU" role="37wK5m">
-                  <ref role="3cqZAo" node="3OUB6BBbaed" resolve="ruleProcessingSession" />
+                  <ref role="3cqZAo" node="3OUB6BBbaed" resolve="rulesProcessing" />
                 </node>
               </node>
             </node>
@@ -17414,9 +17414,9 @@
           <node concept="3clFbF" id="3OUB6BBbeOR" role="3cqZAp">
             <node concept="2ShNRf" id="3OUB6BBbeOS" role="3clFbG">
               <node concept="1pGfFk" id="3OUB6BBbeOT" role="2ShVmc">
-                <ref role="37wK5l" node="1imVejVB$_h" />
+                <ref role="37wK5l" node="1imVejVB$_h" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="3OUB6BBbeOU" role="37wK5m">
-                  <ref role="3cqZAo" node="3OUB6BBbaed" resolve="ruleProcessingSession" />
+                  <ref role="3cqZAo" node="3OUB6BBbaed" resolve="rulesProcessing" />
                 </node>
                 <node concept="37vLTw" id="3OUB6BBxZvV" role="37wK5m">
                   <ref role="3cqZAo" node="3OUB6BBxZvR" resolve="applicationSession" />
@@ -17464,7 +17464,7 @@
           <node concept="3clFbF" id="3OUB6BB8wr7" role="3cqZAp">
             <node concept="2ShNRf" id="3OUB6BB8wr9" role="3clFbG">
               <node concept="1pGfFk" id="3OUB6BB8wra" role="2ShVmc">
-                <ref role="37wK5l" node="3KN3A4vHiEF" />
+                <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
                 <node concept="37vLTw" id="1C_jAsqosQN" role="37wK5m">
                   <ref role="3cqZAo" node="1C_jAsqmSE4" resolve="repository" />
                 </node>
@@ -17482,7 +17482,7 @@
         <node concept="37vLTG" id="1RYTbd8gjGx" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="1RYTbd8gjGy" role="1tU5fm">
-            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
             <node concept="16syzq" id="1RYTbd8gjGz" role="11_B2D">
               <ref role="16sUi3" node="1RYTbd8gjGK" resolve="T" />
             </node>
@@ -17593,7 +17593,7 @@
         <property role="TrG5h" value="typeCollector" />
         <node concept="3Tmbuc" id="5Qx6_65CSCp" role="1B3o_S" />
         <node concept="3uibUv" id="5Qx6_65twIL" role="1tU5fm">
-          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
+          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
         </node>
       </node>
       <node concept="312cEg" id="5Qx6_65tZCJ" role="jymVt">
@@ -17672,7 +17672,7 @@
               <ref role="3cqZAo" node="7Aoa2yVkuvB" resolve="cachedData" />
             </node>
             <node concept="37vLTw" id="7Aoa2yVi6DT" role="37wK5m">
-              <ref role="3cqZAo" node="5Qx6_65tWEQ" resolve="cachedData" />
+              <ref role="3cqZAo" node="5Qx6_65tWEQ" resolve="fresh" />
             </node>
           </node>
           <node concept="3clFbF" id="6nFpYlvovYU" role="3cqZAp">
@@ -17705,7 +17705,7 @@
         <node concept="37vLTG" id="5Qx6_65ttJc" role="3clF46">
           <property role="TrG5h" value="typeCollector" />
           <node concept="3uibUv" id="5Qx6_65tu4x" role="1tU5fm">
-            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
+            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
           </node>
         </node>
         <node concept="37vLTG" id="7Aoa2yVkuvB" role="3clF46">
@@ -17769,7 +17769,7 @@
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                   <node concept="10M0yZ" id="61G6TdCq_q3" role="37wK5m">
                     <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                    <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
+                    <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_PROCESSING" />
                   </node>
                   <node concept="1bVj0M" id="6$F3Z5ziOoY" role="37wK5m">
                     <node concept="3clFbS" id="6$F3Z5ziOoZ" role="1bW5cS">
@@ -17817,7 +17817,7 @@
                       <node concept="3clFbF" id="6nFpYlvg8x8" role="3cqZAp">
                         <node concept="2ShNRf" id="6nFpYlvg8x6" role="3clFbG">
                           <node concept="1pGfFk" id="6nFpYlvg9wZ" role="2ShVmc">
-                            <ref role="37wK5l" to="hano:6nFpYlu7fpM" />
+                            <ref role="37wK5l" to="hano:6nFpYlu7fpM" resolve="UpdatesRecorder" />
                             <node concept="37vLTw" id="1C_jAsqoQYX" role="37wK5m">
                               <ref role="3cqZAo" node="1C_jAsqmSE4" resolve="repository" />
                             </node>
@@ -17848,7 +17848,7 @@
                 <node concept="1rXfSq" id="3OUB6BByz2u" role="2Oq$k0">
                   <ref role="37wK5l" node="6PWFJfG8yyv" resolve="templateApplicationSession" />
                   <node concept="37vLTw" id="3OUB6BByz2w" role="37wK5m">
-                    <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="ruleProcessingSession" />
+                    <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="rulesProcessing" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4VNF0fT8eRS" role="2OqNvi">
@@ -17867,9 +17867,9 @@
           <node concept="3clFbF" id="6nFpYlus0VB" role="3cqZAp">
             <node concept="2ShNRf" id="6nFpYlus0Vz" role="3clFbG">
               <node concept="1pGfFk" id="6nFpYlus1Mr" role="2ShVmc">
-                <ref role="37wK5l" node="7i3KM7gApvv" />
+                <ref role="37wK5l" node="7i3KM7gApvv" resolve="InvalidateAndApplyTemplatesStep" />
                 <node concept="37vLTw" id="6$F3Z5ziVT9" role="37wK5m">
-                  <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="ruleProcessingSession" />
+                  <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="rulesProcessing" />
                 </node>
                 <node concept="37vLTw" id="3OUB6BByz2x" role="37wK5m">
                   <ref role="3cqZAo" node="3OUB6BByz2t" resolve="applicationSession" />
@@ -18108,7 +18108,7 @@
                               <node concept="3clFbH" id="7Aoa2yU6xyQ" role="3cqZAp" />
                               <node concept="3clFbF" id="7Aoa2yU5YWv" role="3cqZAp">
                                 <node concept="37vLTw" id="7Aoa2yU5YWt" role="3clFbG">
-                                  <ref role="3cqZAo" node="7Aoa2yU5Ert" resolve="inEffect" />
+                                  <ref role="3cqZAo" node="7Aoa2yU5Ert" resolve="effect" />
                                 </node>
                               </node>
                             </node>
@@ -18136,7 +18136,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="7Aoa2yU4nTb" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="5Qx6_65NCvF" role="jymVt" />
@@ -18145,7 +18145,7 @@
         <node concept="37vLTG" id="1RYTbd8gD1y" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="1RYTbd8gD1z" role="1tU5fm">
-            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Builder" />
+            <ref role="3uigEE" node="KkWtiKKMjz" resolve="Response.Builder" />
             <node concept="16syzq" id="1RYTbd8gD1$" role="11_B2D">
               <ref role="16sUi3" node="1RYTbd8gD1C" resolve="T" />
             </node>
@@ -18278,7 +18278,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2j1FRbx4Nxk" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="3uibUv" id="2j1FRbx4OBA" role="11_B2D">
           <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramBuilder" />
         </node>
@@ -18289,7 +18289,7 @@
       <property role="TrG5h" value="REPORT_ITEMS" />
       <node concept="3Tm1VV" id="5iJsa3_dp$g" role="1B3o_S" />
       <node concept="3uibUv" id="5iJsa3_dp$h" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="_YKpA" id="7Vnjo8LBVlx" role="11_B2D">
           <node concept="3uibUv" id="7Vnjo8LBVly" role="_ZDj9">
             <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
@@ -18314,7 +18314,7 @@
       <property role="TrG5h" value="RULE_TEMPLATES_INDEX" />
       <node concept="3Tm1VV" id="4XsNDZYhLLF" role="1B3o_S" />
       <node concept="3uibUv" id="4XsNDZYgVTH" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="3uibUv" id="4XsNDZYgWrp" role="11_B2D">
           <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
         </node>
@@ -18616,7 +18616,7 @@
                         <node concept="37vLTI" id="3bpBM3Qd930" role="3clFbG">
                           <node concept="2ShNRf" id="3bpBM3Qd2l1" role="37vLTx">
                             <node concept="1pGfFk" id="3bpBM3Qd2l2" role="2ShVmc">
-                              <ref role="37wK5l" to="hano:5lpFZvO1gf1" />
+                              <ref role="37wK5l" to="hano:5lpFZvO1gf1" resolve="ProgramBuilder" />
                               <node concept="37vLTw" id="3bpBM3Qd2l4" role="37wK5m">
                                 <ref role="3cqZAo" node="Hg6Enc4Wb5" resolve="nameHint" />
                               </node>
@@ -18693,8 +18693,8 @@
                           <node concept="liA8E" id="5lpFZvO0m30" role="2OqNvi">
                             <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="doWithValue" />
                             <node concept="10M0yZ" id="5lpFZvO0ny7" role="37wK5m">
-                              <ref role="3cqZAo" node="39eNUjlXwas" />
-                              <ref role="1PxDUh" node="RZQG98UNsT" />
+                              <ref role="3cqZAo" node="39eNUjlXwas" resolve="TRACE_TMPL" />
+                              <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
                             </node>
                             <node concept="1bVj0M" id="5lpFZvO0rqA" role="37wK5m">
                               <node concept="gl6BB" id="5lpFZvO0rqL" role="1bW2Oz">
@@ -18830,7 +18830,7 @@
                         <node concept="TSZUe" id="5iJsa3_eFVt" role="2OqNvi">
                           <node concept="2ShNRf" id="5iJsa3_eMzi" role="25WWJ7">
                             <node concept="1pGfFk" id="5iJsa3_fiT3" role="2ShVmc">
-                              <ref role="37wK5l" to="1yqb:1FOQehxypU6" />
+                              <ref role="37wK5l" to="1yqb:1FOQehxypU6" resolve="ApplyTemplatesReportItem" />
                               <node concept="Rm8GO" id="5iJsa3_fkvR" role="37wK5m">
                                 <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
                                 <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
@@ -18948,7 +18948,7 @@
               <ref role="37wK5l" to="hano:6nFpYluW_Ik" resolve="setUpdatesRecorder" />
               <node concept="2ShNRf" id="4hQVL4fgQub" role="37wK5m">
                 <node concept="1pGfFk" id="4hQVL4fgVyX" role="2ShVmc">
-                  <ref role="37wK5l" to="hano:4mdCe2g_MnB" />
+                  <ref role="37wK5l" to="hano:4mdCe2g_MnB" resolve="UpdatesRecorder" />
                 </node>
               </node>
             </node>
@@ -19074,7 +19074,7 @@
       <property role="TrG5h" value="TRACE_TMPL" />
       <node concept="3Tm1VV" id="39eNUjlXwat" role="1B3o_S" />
       <node concept="3uibUv" id="39eNUjlXwau" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="3uibUv" id="39eNUjlXxQx" role="11_B2D">
           <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
         </node>
@@ -19091,7 +19091,7 @@
       <property role="TrG5h" value="TRACE_EVAL" />
       <node concept="3Tm1VV" id="RZQG98Ve3R" role="1B3o_S" />
       <node concept="3uibUv" id="RZQG98Ve3S" role="1tU5fm">
-        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="ValueKey" />
         <node concept="3uibUv" id="RZQG98ZcOu" role="11_B2D">
           <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
         </node>
@@ -19249,7 +19249,7 @@
                       <node concept="YeOm9" id="7WKNeR9ynVz" role="2ShVmc">
                         <node concept="1Y3b0j" id="7WKNeR9ynVA" role="YeSDq">
                           <property role="2bfB8j" value="true" />
-                          <ref role="37wK5l" to="hano:5lpFZvO3WAh" />
+                          <ref role="37wK5l" to="hano:5lpFZvO3WAh" resolve="ProgramEvaluator" />
                           <ref role="1Y3XeK" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
                           <node concept="3Tm1VV" id="7WKNeR9ynVB" role="1B3o_S" />
                           <node concept="3clFb_" id="7WKNeR9yo$l" role="jymVt">
@@ -19262,11 +19262,11 @@
                             <node concept="37vLTG" id="7WKNeR9yo$m" role="3clF46">
                               <property role="TrG5h" value="config" />
                               <node concept="3uibUv" id="7WKNeR9yo$n" role="1tU5fm">
-                                <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="Config" />
+                                <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
                               </node>
                             </node>
                             <node concept="3uibUv" id="7WKNeR9yo$o" role="3clF45">
-                              <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="Config" />
+                              <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
                             </node>
                             <node concept="3Tm1VV" id="7WKNeR9yo$p" role="1B3o_S" />
                             <node concept="3clFbS" id="7WKNeR9yo$x" role="3clF47">
@@ -19279,7 +19279,7 @@
                                   </node>
                                   <node concept="2ShNRf" id="5wYq9r5VHZ5" role="37wK5m">
                                     <node concept="1pGfFk" id="5wYq9r5VJJ0" role="2ShVmc">
-                                      <ref role="37wK5l" to="1yqb:19fWAfxeDcL" />
+                                      <ref role="37wK5l" to="1yqb:19fWAfxeDcL" resolve="DefaultPrintable" />
                                       <node concept="37vLTw" id="5wYq9r5VSVQ" role="37wK5m">
                                         <ref role="3cqZAo" node="443LGHBSt7P" resolve="repository" />
                                       </node>
@@ -19471,7 +19471,7 @@
                                                     </node>
                                                     <node concept="2ShNRf" id="3VwM5b5$Swa" role="37wK5m">
                                                       <node concept="1pGfFk" id="3VwM5b5$Swb" role="2ShVmc">
-                                                        <ref role="37wK5l" to="hano:4nDRG5Dcx3$" />
+                                                        <ref role="37wK5l" to="hano:4nDRG5Dcx3$" resolve="FeedbackHandler" />
                                                         <node concept="37Ijox" id="4nDRG5DdlVM" role="37wK5m">
                                                           <ref role="37Ijqf" node="4nDRG5DcW5C" resolve="addReportItem" />
                                                           <node concept="Xjq3P" id="4nDRG5Ddf74" role="wWaWy" />
@@ -19480,7 +19480,7 @@
                                                     </node>
                                                     <node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
                                                       <node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">
-                                                        <ref role="37wK5l" to="1yqb:7nPD14NbIzp" />
+                                                        <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
                                                         <node concept="37vLTw" id="6tPOoeTco$P" role="37wK5m">
                                                           <ref role="3cqZAo" node="5lpFZvOegxy" resolve="trace" />
                                                         </node>
@@ -19777,7 +19777,7 @@
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
                 <ref role="1Y3XeK" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="3BoSoEkMPGv" role="1B3o_S" />
                 <node concept="3clFb_" id="6kREIVkyFHz" role="jymVt">
                   <property role="1EzhhJ" value="false" />
@@ -19872,7 +19872,7 @@
             <ref role="37wK5l" node="4nDRG5DcW5C" resolve="addReportItem" />
             <node concept="2ShNRf" id="1laj_RSBMrG" role="37wK5m">
               <node concept="1pGfFk" id="1laj_RSBMrH" role="2ShVmc">
-                <ref role="37wK5l" to="hano:55xYlrlYx4c" />
+                <ref role="37wK5l" to="hano:55xYlrlYx4c" resolve="FeedbackReportItem" />
                 <node concept="37vLTw" id="1laj_RSBMrI" role="37wK5m">
                   <ref role="3cqZAo" node="oI9YsbqwH" resolve="kind" />
                 </node>
@@ -20351,7 +20351,7 @@
       <node concept="37vLTG" id="3F6vMxqaA9K" role="3clF46">
         <property role="TrG5h" value="callback" />
         <node concept="3uibUv" id="3F6vMxqb93n" role="1tU5fm">
-          <ref role="3uigEE" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+          <ref role="3uigEE" node="3F6vMxqaxpm" resolve="LaunchHelper.ProgressCallback" />
         </node>
       </node>
       <node concept="37vLTG" id="6kREIVkWIC4" role="3clF46">
@@ -20380,7 +20380,7 @@
               <node concept="YeOm9" id="443LGHBiInx" role="2ShVmc">
                 <node concept="1Y3b0j" id="443LGHBiIn$" role="YeSDq">
                   <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+                  <ref role="1Y3XeK" node="3F6vMxqaxpm" resolve="LaunchHelper.ProgressCallback" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                   <node concept="3Tm1VV" id="443LGHBiIn_" role="1B3o_S" />
                   <node concept="3clFb_" id="3MwxBzG5HQr" role="jymVt">
@@ -20472,7 +20472,7 @@
       <node concept="37vLTG" id="MFuM6QYZJ7" role="3clF46">
         <property role="TrG5h" value="callback" />
         <node concept="3uibUv" id="MFuM6QYZJ8" role="1tU5fm">
-          <ref role="3uigEE" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+          <ref role="3uigEE" node="3F6vMxqaxpm" resolve="LaunchHelper.ProgressCallback" />
         </node>
       </node>
       <node concept="3uibUv" id="MFuM6QYJBO" role="3clF45">
@@ -21353,7 +21353,7 @@
       <property role="TrG5h" value="callback" />
       <node concept="3Tm6S6" id="3F6vMxqaA$y" role="1B3o_S" />
       <node concept="3uibUv" id="3F6vMxqb9ot" role="1tU5fm">
-        <ref role="3uigEE" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+        <ref role="3uigEE" node="3F6vMxqaxpm" resolve="LaunchHelper.ProgressCallback" />
       </node>
     </node>
     <node concept="3Tm1VV" id="1pPth$l_TFW" role="1B3o_S" />
@@ -21451,7 +21451,7 @@
             <node concept="2OqwBi" id="7Aoa2yUbM1v" role="37vLTJ">
               <node concept="Xjq3P" id="7Aoa2yUbM3w" role="2Oq$k0" />
               <node concept="2OwXpG" id="7Aoa2yUbM1y" role="2OqNvi">
-                <ref role="2Oxat5" node="7Aoa2yUbKjp" resolve="myEvaluatedProgram" />
+                <ref role="2Oxat5" node="7Aoa2yUbKjp" resolve="evaluatedProgram" />
               </node>
             </node>
             <node concept="37vLTw" id="7Aoa2yUbKj$" role="37vLTx">
@@ -21464,7 +21464,7 @@
             <node concept="2OqwBi" id="7Aoa2yUcb9R" role="37vLTJ">
               <node concept="Xjq3P" id="7Aoa2yUcbdy" role="2Oq$k0" />
               <node concept="2OwXpG" id="7Aoa2yUcb9U" role="2OqNvi">
-                <ref role="2Oxat5" node="7Aoa2yUc9q8" resolve="myRequest" />
+                <ref role="2Oxat5" node="7Aoa2yUc9q8" resolve="request" />
               </node>
             </node>
             <node concept="37vLTw" id="7Aoa2yUc9qk" role="37vLTx">
@@ -21477,7 +21477,7 @@
             <node concept="2OqwBi" id="7Aoa2yUcqcv" role="37vLTJ">
               <node concept="Xjq3P" id="7Aoa2yUcqm1" role="2Oq$k0" />
               <node concept="2OwXpG" id="7Aoa2yUcqcy" role="2OqNvi">
-                <ref role="2Oxat5" node="7Aoa2yUcom1" resolve="myCollectedReportItems" />
+                <ref role="2Oxat5" node="7Aoa2yUcom1" resolve="collectedReportItems" />
               </node>
             </node>
             <node concept="37vLTw" id="7Aoa2yUcomc" role="37vLTx">
@@ -21747,7 +21747,7 @@
                                     <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
                                     <node concept="2ShNRf" id="7Aoa2yUa7Dq" role="37wK5m">
                                       <node concept="1pGfFk" id="7Aoa2yUa7Dr" role="2ShVmc">
-                                        <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" />
+                                        <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" resolve="TraceReport" />
                                         <node concept="37vLTw" id="7Aoa2yUa7Ds" role="37wK5m">
                                           <ref role="3cqZAo" node="7Aoa2yUa7DA" resolve="tmplTrace" />
                                         </node>
@@ -21819,7 +21819,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="7Aoa2yU0YWf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -21923,7 +21923,7 @@
           <node concept="3fqX7Q" id="1z4$59jbqtd" role="3clFbw">
             <node concept="2ZW3vV" id="1z4$59jbqte" role="3fr31v">
               <node concept="3uibUv" id="1z4$59jbqtf" role="2ZW6by">
-                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
               </node>
               <node concept="37vLTw" id="1z4$59jbqtg" role="2ZW6bz">
                 <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
@@ -21951,7 +21951,7 @@
               <node concept="1eOMI4" id="7Aoa2yUxUi_" role="2Oq$k0">
                 <node concept="10QFUN" id="7Aoa2yUxUiA" role="1eOMHV">
                   <node concept="3uibUv" id="7Aoa2yUxUiB" role="10QFUM">
-                    <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
                   </node>
                   <node concept="37vLTw" id="7Aoa2yUxUiC" role="10QFUP">
                     <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
@@ -22013,7 +22013,7 @@
                   <ref role="37Ijqf" node="7Aoa2yUvnZ2" resolve="matchProperties" />
                   <node concept="2FaPjH" id="7Aoa2yUyi00" role="wWaWy">
                     <node concept="3uibUv" id="7Aoa2yUyi01" role="2FaQuo">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
                     </node>
                   </node>
                 </node>
@@ -22456,7 +22456,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="7Aoa2yVI_mp" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
       <node concept="P$JXv" id="7Aoa2yVI_LX" role="lGtFl">
         <node concept="TZ5HA" id="7Aoa2yVI_LY" role="TZ5H$">
@@ -22849,7 +22849,7 @@
           <node concept="3clFbS" id="7Aoa2yVg8Dz" role="2LFqv$">
             <node concept="3clFbF" id="7Aoa2yVg8D$" role="3cqZAp">
               <node concept="1rXfSq" id="7Aoa2yVg8D_" role="3clFbG">
-                <ref role="37wK5l" node="7Aoa2yVg8DK" />
+                <ref role="37wK5l" node="7Aoa2yVg8DK" resolve="addReportItem" />
                 <node concept="37vLTw" id="7Aoa2yVg8DA" role="37wK5m">
                   <ref role="3cqZAo" node="7Aoa2yVg8DB" resolve="it" />
                 </node>
@@ -22988,7 +22988,7 @@
                       <ref role="37wK5l" to="wwqx:~Logger.trace(java.lang.String)" resolve="trace" />
                       <node concept="3cpWs3" id="KkWtiLWGe_" role="37wK5m">
                         <node concept="37vLTw" id="KkWtiLWLgl" role="3uHU7w">
-                          <ref role="3cqZAo" node="KkWtiLWGeF" resolve="n" />
+                          <ref role="3cqZAo" node="KkWtiLWGeF" resolve="inv" />
                         </node>
                         <node concept="Xl_RD" id="KkWtiLWGeE" role="3uHU7B">
                           <property role="Xl_RC" value="invalidated: " />
@@ -23020,7 +23020,7 @@
                       <ref role="37wK5l" to="wwqx:~Logger.trace(java.lang.String)" resolve="trace" />
                       <node concept="3cpWs3" id="KkWtiLWMFt" role="37wK5m">
                         <node concept="37vLTw" id="KkWtiLWMFu" role="3uHU7w">
-                          <ref role="3cqZAo" node="KkWtiLWMFw" resolve="inv" />
+                          <ref role="3cqZAo" node="KkWtiLWMFw" resolve="v" />
                         </node>
                         <node concept="Xl_RD" id="KkWtiLWMFv" role="3uHU7B">
                           <property role="Xl_RC" value="validated: " />
@@ -23423,7 +23423,7 @@
                 <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                 <node concept="2ShNRf" id="7Aoa2yVtzeR" role="37wK5m">
                   <node concept="1pGfFk" id="7Aoa2yVtzeS" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtzeT" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtzey" resolve="source" />
                     </node>
@@ -23510,7 +23510,7 @@
                 <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                 <node concept="2ShNRf" id="7Aoa2yVtzfv" role="37wK5m">
                   <node concept="1pGfFk" id="7Aoa2yVtzfw" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtzfx" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtzfa" resolve="source" />
                     </node>
@@ -23544,7 +23544,7 @@
               <node concept="1Ls8ON" id="KkWtiLykYK" role="37wK5m">
                 <node concept="2ShNRf" id="7Aoa2yVtzfJ" role="1Lso8e">
                   <node concept="1pGfFk" id="7Aoa2yVtzfK" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtzfL" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtzfc" resolve="target" />
                     </node>
@@ -23609,7 +23609,7 @@
                 <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
                 <node concept="2ShNRf" id="7Aoa2yVtaS_" role="37wK5m">
                   <node concept="1pGfFk" id="7Aoa2yVtaSA" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtaSB" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtaSi" resolve="source" />
                     </node>
@@ -23640,7 +23640,7 @@
                   <node concept="37vLTG" id="7Aoa2yVtaSL" role="1bW2Oz">
                     <property role="TrG5h" value="k" />
                     <node concept="3uibUv" id="7Aoa2yVtaSM" role="1tU5fm">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
                     </node>
                   </node>
                 </node>
@@ -23661,7 +23661,7 @@
               <node concept="1Ls8ON" id="KkWtiLxGDz" role="37wK5m">
                 <node concept="2ShNRf" id="7Aoa2yVtaSR" role="1Lso8e">
                   <node concept="1pGfFk" id="7Aoa2yVtaSS" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtaST" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtaSk" resolve="target" />
                     </node>
@@ -23727,7 +23727,7 @@
                 <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
                 <node concept="2ShNRf" id="7Aoa2yVthkh" role="37wK5m">
                   <node concept="1pGfFk" id="7Aoa2yVthki" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVthkj" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVthjV" resolve="source" />
                     </node>
@@ -23757,7 +23757,7 @@
                   <node concept="37vLTG" id="7Aoa2yVthkv" role="1bW2Oz">
                     <property role="TrG5h" value="k" />
                     <node concept="3uibUv" id="7Aoa2yVthkw" role="1tU5fm">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
                     </node>
                   </node>
                 </node>
@@ -23839,7 +23839,7 @@
                 <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
                 <node concept="2ShNRf" id="7Aoa2yVtoNm" role="37wK5m">
                   <node concept="1pGfFk" id="7Aoa2yVtoNn" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtoNo" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtoN0" resolve="source" />
                     </node>
@@ -23871,7 +23871,7 @@
                   <node concept="37vLTG" id="7Aoa2yVtoN$" role="1bW2Oz">
                     <property role="TrG5h" value="k" />
                     <node concept="3uibUv" id="7Aoa2yVtoN_" role="1tU5fm">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
                     </node>
                   </node>
                 </node>
@@ -23889,7 +23889,7 @@
               <node concept="1Ls8ON" id="KkWtiLx40v" role="37wK5m">
                 <node concept="2ShNRf" id="7Aoa2yVtoNE" role="1Lso8e">
                   <node concept="1pGfFk" id="7Aoa2yVtoNF" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="MatchSNodeWrapper" />
                     <node concept="37vLTw" id="7Aoa2yVtoNG" role="37wK5m">
                       <ref role="3cqZAo" node="7Aoa2yVtoN2" resolve="target" />
                     </node>
@@ -23916,7 +23916,7 @@
       <node concept="3uibUv" id="7Aoa2yVt33c" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="7Aoa2yVt33d" role="11_B2D">
-          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+          <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
         </node>
         <node concept="3uibUv" id="7Aoa2yVt33e" role="11_B2D">
           <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
@@ -23975,7 +23975,7 @@
       <node concept="3uibUv" id="7Aoa2yVt33E" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
         <node concept="3uibUv" id="7Aoa2yVt33F" role="11_B2D">
-          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+          <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
         </node>
         <node concept="3uibUv" id="7Aoa2yVt33G" role="11_B2D">
           <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
@@ -24058,7 +24058,7 @@
             </node>
             <node concept="2ShNRf" id="7Aoa2yVxErE" role="33vP2m">
               <node concept="1pGfFk" id="7Aoa2yVxErF" role="2ShVmc">
-                <ref role="37wK5l" node="5Qx6_65F4Qp" />
+                <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
                 <node concept="Xjq3P" id="7Aoa2yVxErG" role="37wK5m" />
                 <node concept="37vLTw" id="7Aoa2yVxFqa" role="37wK5m">
                   <ref role="3cqZAo" node="7Aoa2yVxi7k" resolve="repository" />
@@ -24138,7 +24138,7 @@
       <node concept="37vLTG" id="7Aoa2yVxi7u" role="3clF46">
         <property role="TrG5h" value="typeCollector" />
         <node concept="3uibUv" id="7Aoa2yVxi7v" role="1tU5fm">
-          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
+          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
         </node>
       </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 a934b0b4..eed26398 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -3722,7 +3722,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIqjUyo" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIq1Ic7" role="jymVt" />
@@ -5297,7 +5297,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="FQ_DIq8GzJ" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="4VwaB4LBN8G" role="jymVt" />
@@ -5658,7 +5658,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIq7Kmn" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DIq7XXn" role="jymVt" />
@@ -6133,7 +6133,7 @@
           <node concept="3cpWs6" id="6QkkSolR79u" role="3cqZAp">
             <node concept="2ShNRf" id="6QkkSolR7_m" role="3cqZAk">
               <node concept="1pGfFk" id="6QkkSolRa5i" role="2ShVmc">
-                <ref role="37wK5l" node="7vxJ_H4nq2z" />
+                <ref role="37wK5l" node="7vxJ_H4nq2z" resolve="TableCellInfo" />
                 <node concept="1rXfSq" id="6rXhqaxuzuV" role="37wK5m">
                   <ref role="37wK5l" node="6rXhqaxuf_E" resolve="extractState" />
                   <node concept="1LFfDK" id="6rXhqaxuTqn" role="37wK5m">
@@ -7147,7 +7147,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIq70wA" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="4VwaB4L_Pzd" role="jymVt" />
@@ -11180,7 +11180,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DIq85gf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="4VwaB4LAXSK" role="jymVt" />
@@ -11924,7 +11924,7 @@
             </node>
             <node concept="2ShNRf" id="4XsNDZYpjzp" role="37vLTx">
               <node concept="1pGfFk" id="4XsNDZYpjzq" role="2ShVmc">
-                <ref role="37wK5l" node="4tC1JBnm56r" resolve="SimpleTemplateTraceViewer" />
+                <ref role="37wK5l" node="4tC1JBnm56r" resolve="SimpleTemplateTraceModel" />
                 <node concept="37vLTw" id="4XsNDZYpjzr" role="37wK5m">
                   <ref role="3cqZAo" node="4XsNDZYnGYA" resolve="templateTrace" />
                 </node>
@@ -12444,7 +12444,7 @@
               <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="2OqwBi" id="23Habm51MCa" role="37wK5m">
                 <node concept="37vLTw" id="5O6oUvqViv7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5O6oUvqViv4" resolve="createControlToolbar" />
+                  <ref role="3cqZAo" node="5O6oUvqViv4" resolve="actionToolbar" />
                 </node>
                 <node concept="liA8E" id="23Habm51MCd" role="2OqNvi">
                   <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
@@ -12643,7 +12643,7 @@
               <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="2OqwBi" id="4XsNDZYQXFx" role="37wK5m">
                 <node concept="37vLTw" id="5O6oUvqX$v5" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5O6oUvqX$v2" resolve="createTemplateTraceToolbar" />
+                  <ref role="3cqZAo" node="5O6oUvqX$v2" resolve="actionToolbar" />
                 </node>
                 <node concept="liA8E" id="4XsNDZYQXFz" role="2OqNvi">
                   <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
@@ -12965,7 +12965,7 @@
               <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="2OqwBi" id="23Habm5emjL" role="37wK5m">
                 <node concept="37vLTw" id="5O6oUvqZcYl" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5O6oUvqZcYi" resolve="createProfilingToolbar" />
+                  <ref role="3cqZAo" node="5O6oUvqZcYi" resolve="actionToolbar" />
                 </node>
                 <node concept="liA8E" id="23Habm5emjO" role="2OqNvi">
                   <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
@@ -13345,7 +13345,7 @@
               <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="2OqwBi" id="4n$QnzZF8we" role="37wK5m">
                 <node concept="37vLTw" id="FQ_DIpSQA8" role="2Oq$k0">
-                  <ref role="3cqZAo" node="FQ_DIpSQA5" resolve="createActivationViewToolbar" />
+                  <ref role="3cqZAo" node="FQ_DIpSQA5" resolve="actionToolbar" />
                 </node>
                 <node concept="liA8E" id="4n$QnzZF8wh" role="2OqNvi">
                   <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
@@ -14057,7 +14057,7 @@
         </node>
         <node concept="3cpWs6" id="4n$QnzZDmXL" role="3cqZAp">
           <node concept="37vLTw" id="5O6oUvqSKCw" role="3cqZAk">
-            <ref role="3cqZAo" node="5O6oUvqSKCp" resolve="createActionToolbar" />
+            <ref role="3cqZAo" node="5O6oUvqSKCp" resolve="actionToolbar" />
           </node>
         </node>
       </node>
@@ -19651,12 +19651,12 @@
                         <node concept="3cpWsn" id="6rXhqavt3Qy" role="3cpWs9">
                           <property role="TrG5h" value="node" />
                           <node concept="3uibUv" id="6rXhqavt3Qz" role="1tU5fm">
-                            <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="DefaultTreeNode" />
+                            <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
                             <node concept="3qTvmN" id="6rXhqavt3Q$" role="11_B2D" />
                           </node>
                           <node concept="10QFUN" id="6rXhqavt3Q_" role="33vP2m">
                             <node concept="3uibUv" id="6rXhqavt3QA" role="10QFUM">
-                              <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="DefaultTreeNode" />
+                              <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
                               <node concept="3qTvmN" id="6rXhqavt3QB" role="11_B2D" />
                             </node>
                             <node concept="2OqwBi" id="6rXhqavt3QC" role="10QFUP">
@@ -19910,7 +19910,7 @@
                               <node concept="liA8E" id="6rXhqaw5i3a" role="2OqNvi">
                                 <ref role="37wK5l" node="7vxJ_H4vD3N" resolve="lookupPathsToIndexed" />
                                 <node concept="Rm8GO" id="6rXhqaw5i3b" role="37wK5m">
-                                  <ref role="1Px2BO" node="7vxJ_H4vErE" resolve="Kind" />
+                                  <ref role="1Px2BO" node="7vxJ_H4vErE" resolve="IndexedTreeTableModel.Kind" />
                                   <ref role="Rm8GQ" node="3sb6Qlvb$Zo" resolve="EMPHASIS" />
                                 </node>
                               </node>
@@ -20007,7 +20007,7 @@
                 <node concept="2ShNRf" id="6rXhqavAT$A" role="37wK5m">
                   <node concept="HV5vD" id="6rXhqavB2Bj" role="2ShVmc">
                     <property role="373rjd" value="true" />
-                    <ref role="HV5vE" node="6rXhqavwoGD" resolve="TraceTab.ArgumentsExtractor" />
+                    <ref role="HV5vE" node="6rXhqavwoGD" resolve="TraceTab.ExtractArguments" />
                   </node>
                 </node>
               </node>
@@ -20052,7 +20052,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6rXhqavxiqf" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
         <node concept="A3Dl8" id="6rXhqavyWf0" role="3clF45">
           <node concept="3qTvmN" id="6rXhqavyWf1" role="A3Ik2" />
@@ -20095,7 +20095,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6rXhqavy29B" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
         <node concept="A3Dl8" id="6rXhqavzb2l" role="3clF45">
           <node concept="3qTvmN" id="6rXhqavzb2m" role="A3Ik2" />
@@ -21053,7 +21053,7 @@
                       <node concept="37vLTI" id="6QkkSolLVlE" role="3clFbG">
                         <node concept="2ShNRf" id="6QkkSolLVlF" role="37vLTx">
                           <node concept="1pGfFk" id="6QkkSolLVlG" role="2ShVmc">
-                            <ref role="37wK5l" node="5O6oUvrrmRS" />
+                            <ref role="37wK5l" node="5O6oUvrrmRS" resolve="TableCellInfo" />
                             <node concept="37vLTw" id="6QkkSolLVlI" role="37wK5m">
                               <ref role="3cqZAo" node="6QkkSolLWBQ" resolve="prefix" />
                             </node>
@@ -21154,7 +21154,7 @@
                           </node>
                           <node concept="2ShNRf" id="6QkkSolLVmg" role="37vLTx">
                             <node concept="1pGfFk" id="6QkkSolLVmh" role="2ShVmc">
-                              <ref role="37wK5l" node="5O6oUvro8EZ" />
+                              <ref role="37wK5l" node="5O6oUvro8EZ" resolve="TableCellInfo" />
                               <node concept="37vLTw" id="6QkkSolLVmj" role="37wK5m">
                                 <ref role="3cqZAo" node="6QkkSolLWBQ" resolve="prefix" />
                               </node>
@@ -21248,7 +21248,7 @@
                   <node concept="10QFUN" id="5Nh6YP2djbB" role="1eOMHV">
                     <node concept="2OqwBi" id="5Nh6YP2djb$" role="10QFUP">
                       <node concept="37vLTw" id="5Nh6YP2djb_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="occ" />
+                        <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="inv" />
                       </node>
                       <node concept="liA8E" id="5Nh6YP2djbA" role="2OqNvi">
                         <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
@@ -21274,7 +21274,7 @@
               <node concept="2OqwBi" id="5Nh6YP24ypi" role="33vP2m">
                 <node concept="2OqwBi" id="5Nh6YP24ypj" role="2Oq$k0">
                   <node concept="37vLTw" id="5Nh6YP24ypk" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="occ" />
+                    <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="inv" />
                   </node>
                   <node concept="liA8E" id="5Nh6YP24ypl" role="2OqNvi">
                     <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
@@ -21360,7 +21360,7 @@
               </node>
               <node concept="2ShNRf" id="5Nh6YP1baC3" role="33vP2m">
                 <node concept="1pGfFk" id="5Nh6YP1baC4" role="2ShVmc">
-                  <ref role="37wK5l" node="5O6oUvro8EZ" />
+                  <ref role="37wK5l" node="5O6oUvro8EZ" resolve="TableCellInfo" />
                   <node concept="37vLTw" id="7DPseACLi0x" role="37wK5m">
                     <ref role="3cqZAo" node="7DPseACJ$$J" resolve="prefix" />
                   </node>
@@ -21370,7 +21370,7 @@
                   <node concept="3cpWs3" id="7DPseACLi0z" role="37wK5m">
                     <node concept="3cpWs3" id="7DPseACLi0$" role="3uHU7B">
                       <node concept="37vLTw" id="7DPseACLi0_" role="3uHU7B">
-                        <ref role="3cqZAo" node="7DPseACJGO_" resolve="tip" />
+                        <ref role="3cqZAo" node="7DPseACJGO_" resolve="event" />
                       </node>
                       <node concept="Xl_RD" id="7DPseACLi0A" role="3uHU7w">
                         <property role="Xl_RC" value=" " />
@@ -21412,7 +21412,7 @@
                     <node concept="10QFUN" id="5Nh6YP1f$sn" role="33vP2m">
                       <node concept="2OqwBi" id="5Nh6YP1f$sh" role="10QFUP">
                         <node concept="37vLTw" id="5Nh6YP1f$si" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5Nh6YP1baAq" resolve="templateRef" />
+                          <ref role="3cqZAo" node="5Nh6YP1baAq" resolve="crTemplateRef" />
                         </node>
                         <node concept="liA8E" id="5Nh6YP1f$sj" role="2OqNvi">
                           <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
@@ -21459,7 +21459,7 @@
                             <node concept="10QFUN" id="5Nh6YP1Yz8$" role="1eOMHV">
                               <node concept="2OqwBi" id="5Nh6YP1Yz8_" role="10QFUP">
                                 <node concept="37vLTw" id="5Nh6YP1Yz8A" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="occ" />
+                                  <ref role="3cqZAo" node="5Nh6YP1baAa" resolve="inv" />
                                 </node>
                                 <node concept="liA8E" id="5Nh6YP1Yz8B" role="2OqNvi">
                                   <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
@@ -21524,7 +21524,7 @@
                           <node concept="37vLTI" id="5Nh6YP1baBs" role="3clFbG">
                             <node concept="2ShNRf" id="5Nh6YP1baBt" role="37vLTx">
                               <node concept="1pGfFk" id="5Nh6YP1baBu" role="2ShVmc">
-                                <ref role="37wK5l" node="5O6oUvrrmRS" />
+                                <ref role="37wK5l" node="5O6oUvrrmRS" resolve="TableCellInfo" />
                                 <node concept="37vLTw" id="7DPseACLtsh" role="37wK5m">
                                   <ref role="3cqZAo" node="7DPseACJ$$J" resolve="prefix" />
                                 </node>
@@ -21537,7 +21537,7 @@
                                       <property role="Xl_RC" value=" " />
                                     </node>
                                     <node concept="37vLTw" id="7DPseACLtsm" role="3uHU7B">
-                                      <ref role="3cqZAo" node="7DPseACJGO_" resolve="tip" />
+                                      <ref role="3cqZAo" node="7DPseACJGO_" resolve="event" />
                                     </node>
                                   </node>
                                   <node concept="37vLTw" id="7DPseACLtsn" role="3uHU7w">
@@ -21622,7 +21622,7 @@
                   <node concept="3y3z36" id="5Nh6YP1baBV" role="3clFbw">
                     <node concept="10Nm6u" id="5Nh6YP1baBW" role="3uHU7w" />
                     <node concept="37vLTw" id="5Nh6YP1baBX" role="3uHU7B">
-                      <ref role="3cqZAo" node="5Nh6YP1baAU" resolve="snode" />
+                      <ref role="3cqZAo" node="5Nh6YP1baAU" resolve="crule" />
                     </node>
                   </node>
                 </node>
@@ -21794,7 +21794,7 @@
               </node>
               <node concept="2ShNRf" id="5Nh6YP2hyxF" role="33vP2m">
                 <node concept="1pGfFk" id="5Nh6YP2hyxG" role="2ShVmc">
-                  <ref role="37wK5l" node="5O6oUvro8EZ" />
+                  <ref role="37wK5l" node="5O6oUvro8EZ" resolve="TableCellInfo" />
                   <node concept="37vLTw" id="7DPseACCcJS" role="37wK5m">
                     <ref role="3cqZAo" node="7DPseACBQI6" resolve="prefix" />
                   </node>
@@ -21804,7 +21804,7 @@
                   <node concept="3cpWs3" id="7DPseACCof_" role="37wK5m">
                     <node concept="3cpWs3" id="7DPseACC_Rs" role="3uHU7B">
                       <node concept="37vLTw" id="7DPseACCD_m" role="3uHU7B">
-                        <ref role="3cqZAo" node="7DPseACBYl_" resolve="tip" />
+                        <ref role="3cqZAo" node="7DPseACBYl_" resolve="event" />
                       </node>
                       <node concept="Xl_RD" id="7DPseACCvfc" role="3uHU7w">
                         <property role="Xl_RC" value=" " />
@@ -21958,7 +21958,7 @@
                           <node concept="37vLTI" id="5Nh6YP2hyyG" role="3clFbG">
                             <node concept="2ShNRf" id="5Nh6YP2hyyH" role="37vLTx">
                               <node concept="1pGfFk" id="5Nh6YP2hyyI" role="2ShVmc">
-                                <ref role="37wK5l" node="5O6oUvrrmRS" />
+                                <ref role="37wK5l" node="5O6oUvrrmRS" resolve="TableCellInfo" />
                                 <node concept="37vLTw" id="7DPseACEUHZ" role="37wK5m">
                                   <ref role="3cqZAo" node="7DPseACBQI6" resolve="prefix" />
                                 </node>
@@ -21971,7 +21971,7 @@
                                       <property role="Xl_RC" value=" " />
                                     </node>
                                     <node concept="37vLTw" id="7DPseACFcTs" role="3uHU7B">
-                                      <ref role="3cqZAo" node="7DPseACBYl_" resolve="tip" />
+                                      <ref role="3cqZAo" node="7DPseACBYl_" resolve="event" />
                                     </node>
                                   </node>
                                   <node concept="37vLTw" id="5Nh6YP2hyyK" role="3uHU7w">
@@ -23106,7 +23106,7 @@
       <node concept="3Tm1VV" id="5O6oUvro8F7" role="1B3o_S" />
       <node concept="3clFbS" id="5O6oUvro8F8" role="3clF47">
         <node concept="1VxSAg" id="5O6oUvro8F9" role="3cqZAp">
-          <ref role="37wK5l" node="5O6oUvroul9" />
+          <ref role="37wK5l" node="5O6oUvroul9" resolve="TableCellInfo" />
           <node concept="37vLTw" id="7DPseADqn_l" role="37wK5m">
             <ref role="3cqZAo" node="5O6oUvromMc" resolve="prefix" />
           </node>
@@ -23376,7 +23376,7 @@
       <node concept="3Tm1VV" id="3WU9yfAaEzX" role="1B3o_S" />
       <node concept="3clFbS" id="3WU9yfAaEzY" role="3clF47">
         <node concept="1VxSAg" id="5O6oUvroZn5" role="3cqZAp">
-          <ref role="37wK5l" node="5O6oUvroul9" />
+          <ref role="37wK5l" node="5O6oUvroul9" resolve="TableCellInfo" />
           <node concept="Xl_RD" id="5O6oUvrp8$A" role="37wK5m">
             <property role="Xl_RC" value="" />
           </node>
@@ -24886,7 +24886,7 @@
                   <ref role="3cqZAo" node="7DPseAC9Rq4" resolve="pictogram" />
                 </node>
                 <node concept="37vLTw" id="7DPseACJlS5" role="37wK5m">
-                  <ref role="3cqZAo" node="2T1p0CFIJU4" resolve="text" />
+                  <ref role="3cqZAo" node="2T1p0CFIJU4" resolve="event" />
                 </node>
                 <node concept="37vLTw" id="7DPseACIUlo" role="37wK5m">
                   <ref role="3cqZAo" node="7DPseACIUlk" resolve="invocation" />
@@ -25448,7 +25448,7 @@
                   <node concept="liA8E" id="2T1p0CFIN0D" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~StringBuilder.append(int)" resolve="append" />
                     <node concept="37vLTw" id="2T1p0CFIN0E" role="37wK5m">
-                      <ref role="3cqZAo" node="2T1p0CFIN0a" resolve="replSize" />
+                      <ref role="3cqZAo" node="2T1p0CFIN0a" resolve="discSize" />
                     </node>
                   </node>
                 </node>
@@ -25459,7 +25459,7 @@
                 <property role="3cmrfH" value="0" />
               </node>
               <node concept="37vLTw" id="2T1p0CFIN0H" role="3uHU7B">
-                <ref role="3cqZAo" node="2T1p0CFIN0a" resolve="replSize" />
+                <ref role="3cqZAo" node="2T1p0CFIN0a" resolve="discSize" />
               </node>
             </node>
           </node>
@@ -25479,7 +25479,7 @@
           <node concept="3cpWs6" id="2T1p0CFIN0N" role="3cqZAp">
             <node concept="2ShNRf" id="2T1p0CFIN0O" role="3cqZAk">
               <node concept="1pGfFk" id="2T1p0CFIN0P" role="2ShVmc">
-                <ref role="37wK5l" node="5O6oUvro8EZ" />
+                <ref role="37wK5l" node="5O6oUvro8EZ" resolve="TableCellInfo" />
                 <node concept="Xl_RD" id="7DPseADJj01" role="37wK5m">
                   <property role="Xl_RC" value="≈" />
                 </node>
@@ -25916,7 +25916,7 @@
                   <ref role="3cqZAo" node="7DPseACACRq" resolve="pictogram" />
                 </node>
                 <node concept="37vLTw" id="7DPseACBLjx" role="37wK5m">
-                  <ref role="3cqZAo" node="7DPseACACRk" resolve="text" />
+                  <ref role="3cqZAo" node="7DPseACACRk" resolve="event" />
                 </node>
                 <node concept="37vLTw" id="7DPseACBruB" role="37wK5m">
                   <ref role="3cqZAo" node="7DPseACBruz" resolve="occurrence" />
@@ -26029,10 +26029,10 @@
               <node concept="liA8E" id="9UUIHLzH0P" role="2OqNvi">
                 <ref role="37wK5l" node="5Nh6YP1baA9" resolve="forInvocation" />
                 <node concept="37vLTw" id="7DPseACKtQT" role="37wK5m">
-                  <ref role="3cqZAo" node="7DPseACKtQP" resolve="string" />
+                  <ref role="3cqZAo" node="7DPseACKtQP" resolve="pictogram" />
                 </node>
                 <node concept="37vLTw" id="7DPseACKUVS" role="37wK5m">
-                  <ref role="3cqZAo" node="7DPseACKUVO" resolve="string" />
+                  <ref role="3cqZAo" node="7DPseACKUVO" resolve="event" />
                 </node>
                 <node concept="37vLTw" id="7DPseACKa06" role="37wK5m">
                   <ref role="3cqZAo" node="7DPseACKa02" resolve="invocation" />
@@ -28282,7 +28282,7 @@
           <node concept="3fqX7Q" id="YGS68MJp0Z" role="3clFbw">
             <node concept="2OqwBi" id="YGS68MJp10" role="3fr31v">
               <node concept="37vLTw" id="7DPseAE9mTt" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DPseAE9mTi" resolve="rule" />
+                <ref role="3cqZAo" node="7DPseAE9mTi" resolve="tipRule" />
               </node>
               <node concept="liA8E" id="YGS68MJp1b" role="2OqNvi">
                 <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
@@ -30029,7 +30029,7 @@
             <ref role="3uigEE" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
           </node>
           <node concept="Rm8GO" id="6nOPMUvA8FA" role="HW$Y0">
-            <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="PointKind" />
+            <ref role="1Px2BO" to="hano:4Q576Rbjy_X" resolve="TemplateTrace.PointKind" />
             <ref role="Rm8GQ" to="hano:4Q576RbjAsm" resolve="Template" />
           </node>
         </node>
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 12b99302..61d95202 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
@@ -170,7 +170,7 @@
         <node concept="3clFbF" id="2r1jTXMuu0R" role="3cqZAp">
           <node concept="37vLTI" id="2r1jTXMuu0T" role="3clFbG">
             <node concept="37vLTw" id="2r1jTXMuu0W" role="37vLTJ">
-              <ref role="3cqZAo" node="2r1jTXMuu0N" resolve="myPlatform" />
+              <ref role="3cqZAo" node="2r1jTXMuu0N" resolve="mpsPlatform" />
             </node>
             <node concept="37vLTw" id="2r1jTXMuu0X" role="37vLTx">
               <ref role="3cqZAo" node="2OeoySeQews" resolve="platform" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 2156dccb..dfb5a100 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -1962,7 +1962,7 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="2AHcQZ" id="7DPseACbDQR" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="YGS68MDYlg" role="jymVt" />
@@ -2534,7 +2534,7 @@
                   <node concept="37vLTG" id="1uAGzk0z8yS" role="1bW2Oz">
                     <property role="TrG5h" value="record" />
                     <node concept="3uibUv" id="1uAGzk0z8yT" role="1tU5fm">
-                      <ref role="3uigEE" node="3wxtToDPbdf" resolve="Record" />
+                      <ref role="3uigEE" node="3wxtToDPbdf" resolve="Snapshot.History.Record" />
                       <node concept="3uibUv" id="1uAGzk0z8yU" role="11_B2D">
                         <ref role="3uigEE" to="w7la:~PredicateInvocation" resolve="PredicateInvocation" />
                       </node>
@@ -2606,7 +2606,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1uAGzk0yUZ5" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="1uAGzk0z3Rl" role="jymVt" />
@@ -6939,7 +6939,7 @@
                 <ref role="3cqZAo" node="2ceN1hDbrAY" resolve="upto" />
               </node>
               <node concept="37vLTw" id="2ceN1hDbvh1" role="37wK5m">
-                <ref role="3cqZAo" node="2ceN1hDbrB0" resolve="selLogicals" />
+                <ref role="3cqZAo" node="2ceN1hDbrB0" resolve="logicalsToEmphasize" />
               </node>
               <node concept="2OqwBi" id="2ceN1hDbxo2" role="37wK5m">
                 <node concept="37vLTw" id="2ceN1hDbwPc" role="2Oq$k0">
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index cff22972..96596cab 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -418,7 +418,7 @@
       <property role="TrG5h" value="PROFILER" />
       <node concept="3Tm1VV" id="23Habm2dyBT" role="1B3o_S" />
       <node concept="3uibUv" id="23Habm2dyBU" role="1tU5fm">
-        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="ValueKey" />
         <node concept="3uibUv" id="23Habm2dyBV" role="11_B2D">
           <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
         </node>
@@ -1699,7 +1699,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1uAGzk0EKhC" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3clFb_" id="74PwTvF1tk_" role="jymVt">
@@ -3544,7 +3544,7 @@
         <node concept="3clFbF" id="FQ_DItJKlh" role="3cqZAp">
           <node concept="37vLTI" id="FQ_DItJKlj" role="3clFbG">
             <node concept="37vLTw" id="FQ_DItJKlm" role="37vLTJ">
-              <ref role="3cqZAo" node="FQ_DItJKld" resolve="myScheduler" />
+              <ref role="3cqZAo" node="FQ_DItJKld" resolve="mySubscribeScheduler" />
             </node>
             <node concept="37vLTw" id="FQ_DItJKln" role="37vLTx">
               <ref role="3cqZAo" node="FQ_DIt9s3r" resolve="scheduler" />
@@ -3745,7 +3745,7 @@
                               <node concept="2ShNRf" id="FQ_DIum82D" role="37wK5m">
                                 <node concept="1pGfFk" id="FQ_DIumNhv" role="2ShVmc">
                                   <property role="373rjd" value="true" />
-                                  <ref role="37wK5l" node="FQ_DItKjeO" />
+                                  <ref role="37wK5l" node="FQ_DItKjeO" resolve="DefaultSingleObserver" />
                                   <node concept="3uibUv" id="FQ_DIum82H" role="1pMfVU">
                                     <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                   </node>
@@ -3779,7 +3779,7 @@
                                           <node concept="3clFbF" id="FQ_DIum82X" role="3cqZAp">
                                             <node concept="2OqwBi" id="FQ_DIum82Y" role="3clFbG">
                                               <node concept="37vLTw" id="FQ_DIum82Z" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="FQ_DItJLl2" resolve="myCurrentObserveSchedule" />
+                                                <ref role="3cqZAo" node="FQ_DItJLl2" resolve="myCurrentObserveScheduler" />
                                               </node>
                                               <node concept="liA8E" id="FQ_DIum830" role="2OqNvi">
                                                 <ref role="37wK5l" node="FQ_DItchB9" resolve="schedule" />
@@ -3840,7 +3840,7 @@
                                             <node concept="3clFbF" id="FQ_DIum83n" role="3cqZAp">
                                               <node concept="2OqwBi" id="FQ_DIum83o" role="3clFbG">
                                                 <node concept="37vLTw" id="FQ_DIum83p" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="FQ_DItJLl2" resolve="myCurrentObserveSchedule" />
+                                                  <ref role="3cqZAo" node="FQ_DItJLl2" resolve="myCurrentObserveScheduler" />
                                                 </node>
                                                 <node concept="liA8E" id="FQ_DIum83q" role="2OqNvi">
                                                   <ref role="37wK5l" node="FQ_DItchB9" resolve="schedule" />
@@ -3973,7 +3973,7 @@
                   <property role="2bfB8j" value="true" />
                   <property role="373rjd" value="true" />
                   <ref role="1Y3XeK" node="FQ_DItdPSf" resolve="SingleObserver" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                   <node concept="3Tm1VV" id="FQ_DIugDuM" role="1B3o_S" />
                   <node concept="16syzq" id="FQ_DIugDv4" role="2Ghqu4">
                     <ref role="16sUi3" node="FQ_DIt9szD" resolve="T" />
@@ -4004,7 +4004,7 @@
                       </node>
                     </node>
                     <node concept="2AHcQZ" id="FQ_DIugEdh" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" />
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
                   <node concept="3clFb_" id="KkWtiKp65V" role="jymVt">
@@ -4053,7 +4053,7 @@
                       </node>
                     </node>
                     <node concept="2AHcQZ" id="KkWtiKp66c" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" />
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
                 </node>
@@ -4141,7 +4141,7 @@
           <node concept="2ShNRf" id="FQ_DIue_e0" role="3clFbG">
             <node concept="1pGfFk" id="FQ_DIueCfG" role="2ShVmc">
               <property role="373rjd" value="true" />
-              <ref role="37wK5l" node="FQ_DIudES9" />
+              <ref role="37wK5l" node="FQ_DIudES9" resolve="Single" />
               <node concept="Xjq3P" id="FQ_DIueCUc" role="37wK5m" />
               <node concept="37vLTw" id="FQ_DIueE0L" role="37wK5m">
                 <ref role="3cqZAo" node="FQ_DIt9sJJ" resolve="mapper" />
@@ -4219,7 +4219,7 @@
         <node concept="3clFbF" id="FQ_DItKAwU" role="3cqZAp">
           <node concept="37vLTI" id="FQ_DItKAwW" role="3clFbG">
             <node concept="37vLTw" id="FQ_DItKAwZ" role="37vLTJ">
-              <ref role="3cqZAo" node="FQ_DItKAwQ" resolve="myT" />
+              <ref role="3cqZAo" node="FQ_DItKAwQ" resolve="mySingletonValue" />
             </node>
             <node concept="37vLTw" id="FQ_DItKAx0" role="37vLTx">
               <ref role="3cqZAo" node="FQ_DItKAlQ" resolve="t" />
@@ -4407,7 +4407,7 @@
           <node concept="1Y3b0j" id="FQ_DIuguhn" role="YeSDq">
             <property role="2bfB8j" value="true" />
             <property role="373rjd" value="true" />
-            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
             <ref role="1Y3XeK" node="FQ_DItchtg" resolve="Scheduler" />
             <node concept="3Tm1VV" id="FQ_DIuguho" role="1B3o_S" />
             <node concept="3clFb_" id="FQ_DIuguk7" role="jymVt">
@@ -4433,7 +4433,7 @@
                 </node>
               </node>
               <node concept="2AHcQZ" id="FQ_DIuguki" role="2AJF6D">
-                <ref role="2AI5Lk" to="wyt6:~Override" />
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
               </node>
             </node>
           </node>
@@ -4777,7 +4777,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DItKiRb" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="FQ_DItKn$t" role="jymVt" />
@@ -4817,7 +4817,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="FQ_DItKiRj" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -4968,7 +4968,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="5lpFZvNS7yS" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="5lpFZvNS8ua" role="jymVt" />
@@ -5049,7 +5049,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="5lpFZvNS7z2" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="5lpFZvNS7hD" role="jymVt" />
@@ -5068,7 +5068,7 @@
     <node concept="2YIFZL" id="36y_5CttgB5" role="jymVt">
       <property role="TrG5h" value="of" />
       <node concept="3uibUv" id="36y_5CttgB6" role="3clF45">
-        <ref role="3uigEE" node="36y_5CtsZff" resolve="Builder" />
+        <ref role="3uigEE" node="36y_5CtsZff" resolve="AbstractEffect.Builder" />
       </node>
       <node concept="3Tm1VV" id="36y_5CttgB7" role="1B3o_S" />
       <node concept="3clFbS" id="36y_5CttgB8" role="3clF47">
@@ -5231,7 +5231,7 @@
             <node concept="2ShNRf" id="36y_5Ctu6fq" role="3clFbG">
               <node concept="1pGfFk" id="36y_5Ctu6fr" role="2ShVmc">
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" node="6BMBBPCSWZy" />
+                <ref role="37wK5l" node="6BMBBPCSWZy" resolve="AbstractEffect.Some" />
                 <node concept="37vLTw" id="36y_5Ctu6fs" role="37wK5m">
                   <ref role="3cqZAo" node="36y_5CttzUo" resolve="info" />
                 </node>
@@ -5291,7 +5291,7 @@
               <node concept="2ShNRf" id="36y_5Cu2y0T" role="3K4E3e">
                 <node concept="1pGfFk" id="36y_5Cu2y0U" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="37wK5l" node="6BMBBPCSWZy" />
+                  <ref role="37wK5l" node="6BMBBPCSWZy" resolve="AbstractEffect.Some" />
                   <node concept="37vLTw" id="36y_5Cu2y0V" role="37wK5m">
                     <ref role="3cqZAo" node="36y_5CttzUo" resolve="info" />
                   </node>
@@ -5307,7 +5307,7 @@
               <node concept="2ShNRf" id="36y_5Cu2y$x" role="3K4GZi">
                 <node concept="1pGfFk" id="36y_5Cu2y$y" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="37wK5l" node="3bpBM3PNk9l" />
+                  <ref role="37wK5l" node="3bpBM3PNk9l" resolve="AbstractEffect.None" />
                   <node concept="37vLTw" id="36y_5Cu2y$z" role="37wK5m">
                     <ref role="3cqZAo" node="36y_5CttzUo" resolve="info" />
                   </node>
@@ -5334,7 +5334,7 @@
       <property role="TrG5h" value="compose" />
       <property role="1EzhhJ" value="true" />
       <node concept="3uibUv" id="51ek2rQDq3S" role="3clF45">
-        <ref role="3uigEE" node="5lpFZvOkOLg" resolve="Effect.AbstractEffect" />
+        <ref role="3uigEE" node="5lpFZvOkOLg" resolve="AbstractEffect" />
       </node>
       <node concept="3Tm1VV" id="51ek2rQD9Pz" role="1B3o_S" />
       <node concept="3clFbS" id="51ek2rQD9P$" role="3clF47" />
@@ -5344,7 +5344,7 @@
           <ref role="3uigEE" to="82uw:~Supplier" resolve="Supplier" />
           <node concept="3qUE_q" id="51ek2rQKAV3" role="11_B2D">
             <node concept="3uibUv" id="51ek2rQKClG" role="3qUE_r">
-              <ref role="3uigEE" node="5lpFZvOkOLg" resolve="Effect.AbstractEffect" />
+              <ref role="3uigEE" node="5lpFZvOkOLg" resolve="AbstractEffect" />
             </node>
           </node>
         </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 1efb5f81..f7cad09c 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
@@ -6095,7 +6095,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="FQ_DIrtNjY" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="3clFb_" id="7lmP5gAk_qF" role="jymVt">
@@ -6253,7 +6253,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="FQ_DIru4g5" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="3clFb_" id="7lmP5gAl85u" role="jymVt">
@@ -6428,7 +6428,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="FQ_DIrtWo8" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="3clFb_" id="7lmP5gAlF24" role="jymVt">
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 0d1c850c..e8e7088e 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -96,7 +96,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index b139764f..35c9e99f 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -97,7 +97,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index bd727a0b..c5b2b5b2 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -95,7 +95,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 7e6b8d87..fbaba7d0 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -97,7 +97,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index 40967fc6..71593021 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -55,7 +55,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
index d268b804..8b501303 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
@@ -89,7 +89,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
index 43c3b705..e11410e7 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
@@ -98,7 +98,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
index 4ff99fcb..7664d649 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
@@ -100,7 +100,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
index cea6daf2..38063e81 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
@@ -101,7 +101,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
index d72823b2..1fb3fd38 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
@@ -97,7 +97,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
index 2e3c4adb..2044760f 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
@@ -45,7 +45,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
index 144d6a6f..d519d9e3 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
@@ -100,7 +100,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
index 23bf175a..0a2aab6f 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
@@ -101,7 +101,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
index 739cc57a..9c5f22d0 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
@@ -96,7 +96,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
index c420ad42..1989527e 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
@@ -100,7 +100,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
index 242473fe..5f865917 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
@@ -97,7 +97,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index ffb67030..2c96a1bf 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -56,7 +56,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
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 d9cb0103..7d0a7053 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
@@ -47011,7 +47011,7 @@
                   <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
                 </node>
                 <node concept="3TrEf2" id="1bodCZDMx_8" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:fzcqZ_w" />
+                  <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
index e160d2c9..9a9a8f4d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
@@ -98,7 +98,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
index 9bb36842..b14398f5 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
@@ -97,7 +97,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
index 741766da..35aaa9b1 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
@@ -113,7 +113,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
index 81f9977d..1e8ab524 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
@@ -101,7 +101,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
index 45d85f56..eac3ac97 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
@@ -101,7 +101,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
index 6b7ac46e..00343cc3 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
@@ -101,7 +101,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
index 48f7864c..f160b487 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
@@ -104,7 +104,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
index 74aed141..79d422ed 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
@@ -103,7 +103,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
index 0b90a444..4ace9b33 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
@@ -95,7 +95,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
index dd542e7c..77f71b31 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
@@ -99,7 +99,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
index 1b79b82f..b15f3f94 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
@@ -103,7 +103,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
index cf1fd57f..bb354412 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
@@ -111,7 +111,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
index 26849f9c..e5ebd110 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
@@ -102,7 +102,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
index 0050af84..1a4766f5 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
@@ -113,7 +113,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
index a4888846..72b56058 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
@@ -110,7 +110,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
index 346f2bd2..36b0561a 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
@@ -101,7 +101,7 @@
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />