diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
index 77e02303..5181afdd 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
@@ -11433,7 +11433,7 @@
                     <node concept="37jhX" id="72jqiIMQ65L" role="3AunhB">
                       <node concept="2OqwBi" id="72jqiIMQ65M" role="37jj2">
                         <node concept="3A2sRY" id="72jqiIMQ65N" role="2Oq$k0">
-                          <ref role="3A2yKK" node="72jqiIMQ65C" resolve="tso" />
+                          <ref role="3A2yKK" node="72jqiIMQ65C" resolve="op" />
                         </node>
                         <node concept="2qgKlT" id="72jqiIMQ65O" role="2OqNvi">
                           <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl
index b3a8e770..81a3ab75 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/jetbrains.mps.lang.extensionExt.mpl
@@ -56,8 +56,6 @@
         <module reference="2b5d81e3-eeee-46b4-bbad-18a882b8b6ca(jetbrains.mps.lang.extensionExt)" version="0" />
         <module reference="ef7c3914-ebf3-4622-bccc-06a09ecc5ddf(jetbrains.mps.lang.extensionExt.generator)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-        <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
-        <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
@@ -119,12 +117,19 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
+    <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl
index 9ff670a1..74029277 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.sharedConceptsExt/jetbrains.mps.lang.sharedConceptsExt.mpl
@@ -56,8 +56,6 @@
         <module reference="a8c30236-79d6-4235-8125-7c9bb96576cd(jetbrains.mps.lang.sharedConceptsExt)" version="0" />
         <module reference="5f9d7bca-c056-4802-b2a2-39520071e411(jetbrains.mps.lang.sharedConceptsExt.generator)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-        <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
-        <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
@@ -116,11 +114,18 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
+    <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index 4d37d384..4c497d2c 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -20096,7 +20096,7 @@
                       <node concept="nsMwS" id="4boCUQton_A" role="ns1xD">
                         <ref role="nsMwP" to="wi9y:1oUE7CX3Xc1" resolve="elem" />
                         <node concept="a7P8L" id="41_kb$lzKAm" role="iSaTp">
-                          <ref role="a7OzE" node="4boCUQton_I" resolve="CType" />
+                          <ref role="a7OzE" node="4boCUQton_I" resolve="E" />
                         </node>
                       </node>
                     </node>
@@ -20105,7 +20105,7 @@
                       <node concept="nsMwS" id="4boCUQtoomi" role="ns1xD">
                         <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
                         <node concept="a7P8L" id="5wYq9r5ns84" role="iSaTp">
-                          <ref role="a7OzE" node="5wYq9r5ns1w" resolve="ConceptB" />
+                          <ref role="a7OzE" node="5wYq9r5ns1w" resolve="TrgConcept" />
                         </node>
                       </node>
                     </node>
@@ -20142,7 +20142,7 @@
                         <node concept="nsMwS" id="41_kb$lzKB4" role="ns1xD">
                           <ref role="nsMwP" to="wi9y:1oUE7CX3Xc1" resolve="elem" />
                           <node concept="a7P8L" id="41_kb$lzKB7" role="iSaTp">
-                            <ref role="a7OzE" node="4boCUQton_I" resolve="CType" />
+                            <ref role="a7OzE" node="4boCUQton_I" resolve="E" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index 5b18080b..7973d38f 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -897,7 +897,7 @@
             </node>
             <node concept="2OqwBi" id="3FGJ5nvn4fS" role="3uHU7B">
               <node concept="37vLTw" id="3FGJ5nvn3xj" role="2Oq$k0">
-                <ref role="3cqZAo" node="3FGJ5nvn00z" resolve="namesOfRulesWithDependency" />
+                <ref role="3cqZAo" node="3FGJ5nvn00z" resolve="templatesOfRulesWithDependency" />
               </node>
               <node concept="34oBXx" id="3FGJ5nvn4Ud" role="2OqNvi" />
             </node>
@@ -1012,7 +1012,7 @@
                 <node concept="3clFbF" id="3FGJ5nvmUre" role="3cqZAp">
                   <node concept="2OqwBi" id="3FGJ5nvmUSg" role="3clFbG">
                     <node concept="37vLTw" id="3FGJ5nvmUrc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3FGJ5nvmSHN" resolve="addedRulesTags" />
+                      <ref role="3cqZAo" node="3FGJ5nvmSHN" resolve="addedRulesTemplates" />
                     </node>
                     <node concept="TSZUe" id="3FGJ5nvmVEe" role="2OqNvi">
                       <node concept="2OqwBi" id="3BoSoElE13B" role="25WWJ7">
@@ -1072,11 +1072,11 @@
         <node concept="3vwNmj" id="3FGJ5nvmSa3" role="3cqZAp">
           <node concept="2OqwBi" id="3FGJ5nvmYLo" role="3vwVQn">
             <node concept="37vLTw" id="3FGJ5nvmYer" role="2Oq$k0">
-              <ref role="3cqZAo" node="3FGJ5nvmSHN" resolve="addedRulesTags" />
+              <ref role="3cqZAo" node="3FGJ5nvmSHN" resolve="addedRulesTemplates" />
             </node>
             <node concept="BjQpj" id="3FGJ5nvmZNu" role="2OqNvi">
               <node concept="37vLTw" id="3FGJ5nvn2Je" role="25WWJ7">
-                <ref role="3cqZAo" node="3FGJ5nvn00z" resolve="namesOfRulesWithDependency" />
+                <ref role="3cqZAo" node="3FGJ5nvn00z" resolve="templatesOfRulesWithDependency" />
               </node>
             </node>
           </node>