From d2a68e8fc7268834e1753c35b2b2856933b50b06 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 21 Nov 2022 12:08:05 +0100
Subject: [PATCH] Apply migrations to mpscore sub-project

---
 samples/mpscore/.mps/migration.xml            |  5 ++
 ...tbrains.mps.baseLanguage.kotlinRefsExt.mpl |  1 +
 ...s.mps.baseLanguage.kotlinRefsExt.types.mps | 20 +++---
 ...s.mps.baseLanguage.methodReferencesExt.mpl |  1 +
 ...baseLanguage.methodReferencesExt.types.mps | 24 +++----
 .../jetbrains.mps.lang.extensionExt.mpl       |  1 +
 .../jetbrains.mps.lang.extensionExt.types.mps |  4 +-
 .../jetbrains.mps.lang.sharedConceptsExt.mpl  |  1 +
 ....baseLanguage.methodReferencesExt.test.msd |  1 -
 ...Language.methodReferencesExt.test.code.mps | 72 +++++++++----------
 ...uage.methodReferencesExt.test.features.mps | 38 +++++-----
 11 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/samples/mpscore/.mps/migration.xml b/samples/mpscore/.mps/migration.xml
index ad8940e4..345bfc32 100644
--- a/samples/mpscore/.mps/migration.xml
+++ b/samples/mpscore/.mps/migration.xml
@@ -3,6 +3,11 @@
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="project.migrated.version" value="222" />
   </component>
 </project>
\ No newline at end of file
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 b30b3e69..8b5aaae3 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
@@ -51,6 +51,7 @@
         <module reference="2405a196-e75d-462c-938b-ae8e3fac20aa(jetbrains.mps.baseLanguage.kotlinRefs)" version="0" />
         <module reference="f4bb9d3b-4825-4eb2-93d9-73c355a855dc(jetbrains.mps.baseLanguage.kotlinRefsExt)" version="0" />
         <module reference="f9a2dffe-b22d-4f2e-affd-70e87c08114b(jetbrains.mps.baseLanguage.kotlinRefsExt.generator)" version="0" />
+        <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" 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="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps
index c81b4570..e5132039 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/models/jetbrains.mps.baseLanguage.kotlinRefsExt.types.mps
@@ -876,7 +876,7 @@
                 </node>
                 <node concept="2OqwBi" id="7doxVE4TmqH" role="33vP2m">
                   <node concept="3A2sRY" id="7doxVE4TmqI" role="2Oq$k0">
-                    <ref role="3A2yKK" node="7doxVE4TkDA" resolve="call" />
+                    <ref role="3A2yKK" node="7doxVE4TkDA" resolve="fcall" />
                   </node>
                   <node concept="2qgKlT" id="7doxVE4TmqJ" role="2OqNvi">
                     <ref role="37wK5l" to="w8y0:UG7NftRxKM" resolve="getReceiver" />
@@ -940,7 +940,7 @@
                                   </node>
                                 </node>
                                 <node concept="a7P8L" id="1aCOVadic_t" role="3AunhB">
-                                  <ref role="a7OzE" node="1aCOVadictR" resolve="RecT" />
+                                  <ref role="a7OzE" node="1aCOVadictR" resolve="RecieverT" />
                                 </node>
                               </node>
                             </node>
@@ -1062,13 +1062,13 @@
                                 <node concept="nsMwS" id="1aCOVadrpH2" role="ns1xD">
                                   <ref role="nsMwP" to="kqnc:ZJPHcupkk9" resolve="result" />
                                   <node concept="a7P8L" id="1aCOVadrpI_" role="iSaTp">
-                                    <ref role="a7OzE" node="1aCOVadrpHA" resolve="ReturnT" />
+                                    <ref role="a7OzE" node="1aCOVadrpHA" resolve="RetT" />
                                   </node>
                                 </node>
                                 <node concept="nsMwS" id="1aCOVadrpH0" role="ns1xD">
                                   <ref role="nsMwP" to="kqnc:ZJPHcupkk3" resolve="params" />
                                   <node concept="a7P8L" id="1aCOVadrpIG" role="iSaTp">
-                                    <ref role="a7OzE" node="1aCOVadpzEq" resolve="ArgT" />
+                                    <ref role="a7OzE" node="1aCOVadpzEq" resolve="ParamT" />
                                   </node>
                                 </node>
                                 <node concept="nsMwS" id="1aCOVadrpH5" role="ns1xD">
@@ -1139,7 +1139,7 @@
                                 <ref role="a7OzE" node="1aCOVadrvzI" resolve="CapRetT" />
                               </node>
                               <node concept="a7P8L" id="1aCOVadrvAc" role="3AunhB">
-                                <ref role="a7OzE" node="1aCOVadrpHA" resolve="ReturnT" />
+                                <ref role="a7OzE" node="1aCOVadrpHA" resolve="RetT" />
                               </node>
                             </node>
                           </node>
@@ -1170,7 +1170,7 @@
             <node concept="10Nm6u" id="7doxVE4Tm7d" role="3uHU7w" />
             <node concept="2OqwBi" id="7doxVE4Tlgc" role="3uHU7B">
               <node concept="3A2sRY" id="7doxVE4TkWN" role="2Oq$k0">
-                <ref role="3A2yKK" node="7doxVE4TkDA" resolve="call" />
+                <ref role="3A2yKK" node="7doxVE4TkDA" resolve="fcall" />
               </node>
               <node concept="3TrEf2" id="7doxVE4TlOi" role="2OqNvi">
                 <ref role="3Tt5mk" to="48vp:fz7wK6H" resolve="target" />
@@ -1413,7 +1413,7 @@
                       <node concept="2OqwBi" id="1aCOVadjwJd" role="37wK5m">
                         <node concept="2OqwBi" id="1aCOVadjwJe" role="2Oq$k0">
                           <node concept="37vLTw" id="1aCOVadjwJf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1aCOVadjgfv" resolve="tp" />
+                            <ref role="3cqZAo" node="1aCOVadjgfv" resolve="tpd" />
                           </node>
                           <node concept="liA8E" id="1aCOVadjwJg" role="2OqNvi">
                             <ref role="37wK5l" to="1p8r:4W0pdSCLAuW" resolve="getUpperBounds" />
@@ -1482,7 +1482,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="1aCOVadjgf$" role="1DdaDG">
-                <ref role="3cqZAo" node="1aCOVadiSHj" resolve="tpd" />
+                <ref role="3cqZAo" node="1aCOVadiSHj" resolve="tpds" />
               </node>
             </node>
             <node concept="3clFbH" id="1aCOVadjg0D" role="3cqZAp" />
@@ -1490,7 +1490,7 @@
           <node concept="1Wc70l" id="1aCOVadjf2Z" role="3clFbw">
             <node concept="2OqwBi" id="1aCOVadjfdc" role="3uHU7w">
               <node concept="37vLTw" id="1aCOVadjf4e" role="2Oq$k0">
-                <ref role="3cqZAo" node="1aCOVadiSHj" resolve="tpd" />
+                <ref role="3cqZAo" node="1aCOVadiSHj" resolve="tpds" />
               </node>
               <node concept="3GX2aA" id="1aCOVadjfQq" role="2OqNvi" />
             </node>
@@ -1880,7 +1880,7 @@
                         <ref role="37wK5l" to="vciu:7iropoGMbzr" resolve="ofList" />
                         <ref role="1Pybhc" to="vciu:7iropoGKfR9" resolve="NodeArgument" />
                         <node concept="37vLTw" id="1aCOVadk16X" role="37wK5m">
-                          <ref role="3cqZAo" node="1aCOVadk16T" resolve="actualArgument" />
+                          <ref role="3cqZAo" node="1aCOVadk16T" resolve="args" />
                         </node>
                       </node>
                     </node>
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 56a2979e..2a0e0b96 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
@@ -47,6 +47,7 @@
         <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="9e36d2ee-c59c-4580-9e81-646748d0614b(jetbrains.mps.baseLanguage.closuresExt)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
index 34705621..9c63d17d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/models/jetbrains.mps.baseLanguage.methodReferencesExt.types.mps
@@ -774,7 +774,7 @@
                       <node concept="3clFbS" id="6ZRhjsGcJ2u" role="3IrJb0">
                         <node concept="3clFbJ" id="6ZRhjsGcJ5u" role="3cqZAp">
                           <node concept="37vLTw" id="6ZRhjsGcNgI" role="3clFbw">
-                            <ref role="3cqZAo" node="6ZRhjsGcNgu" resolve="b" />
+                            <ref role="3cqZAo" node="6ZRhjsGcNgu" resolve="instanceMethod" />
                           </node>
                           <node concept="3clFbS" id="6ZRhjsGcJ5w" role="3clFbx">
                             <node concept="3Aqczg" id="6ZRhjsGcMfO" role="3cqZAp">
@@ -1028,13 +1028,13 @@
                                 <node concept="nsMwS" id="6ZRhjsGaOcp" role="ns1xD">
                                   <ref role="nsMwP" to="kqnc:ZJPHcupkk3" resolve="params" />
                                   <node concept="a7P8L" id="6ZRhjsGb2t5" role="iSaTp">
-                                    <ref role="a7OzE" node="6ZRhjsGaOcx" resolve="ParamType" />
+                                    <ref role="a7OzE" node="6ZRhjsGaOcx" resolve="MethParamType" />
                                   </node>
                                 </node>
                                 <node concept="nsMwS" id="6ZRhjsGaOcs" role="ns1xD">
                                   <ref role="nsMwP" to="kqnc:ZJPHcupkk9" resolve="result" />
                                   <node concept="a7P8L" id="6ZRhjsGb2tb" role="iSaTp">
-                                    <ref role="a7OzE" node="6ZRhjsGb1hn" resolve="ResType" />
+                                    <ref role="a7OzE" node="6ZRhjsGb1hn" resolve="MethResType" />
                                   </node>
                                 </node>
                                 <node concept="nsMwS" id="6ZRhjsGdEHN" role="ns1xD">
@@ -1114,7 +1114,7 @@
                               <node concept="3Aqczg" id="6ZRhjsGz2MJ" role="3cqZAp">
                                 <node concept="3A8Hvi" id="6ZRhjsGz2MK" role="3Aqpz8">
                                   <node concept="a7P8L" id="6ZRhjsGz2ML" role="3A8wtg">
-                                    <ref role="a7OzE" node="6ZRhjsG9V36" resolve="TargetType" />
+                                    <ref role="a7OzE" node="6ZRhjsG9V36" resolve="NaturalType" />
                                   </node>
                                   <node concept="ns1u0" id="6ZRhjsGz2MM" role="3A8w4Q">
                                     <ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
@@ -1159,7 +1159,7 @@
                                 <node concept="3Aqczg" id="6ZRhjsGb4nM" role="3cqZAp">
                                   <node concept="3A8Hvi" id="6ZRhjsGb4nG" role="3Aqpz8">
                                     <node concept="a7P8L" id="6ZRhjsGb4MF" role="3A8wtg">
-                                      <ref role="a7OzE" node="6ZRhjsG9V36" resolve="TargetType" />
+                                      <ref role="a7OzE" node="6ZRhjsG9V36" resolve="NaturalType" />
                                     </node>
                                     <node concept="ns1u0" id="6ZRhjsGb6ap" role="3A8w4Q">
                                       <ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
@@ -1193,9 +1193,9 @@
                               <node concept="ns1u0" id="6ZRhjsGb6l1" role="3AunhB">
                                 <ref role="ns1xF" node="6ZRhjsG9lpn" resolve="methodRef" />
                                 <node concept="nsMwS" id="6ZRhjsGb6l5" role="ns1xD">
-                                  <ref role="nsMwP" node="6ZRhjsGHQ5B" resolve="function" />
+                                  <ref role="nsMwP" node="6ZRhjsGHQ5B" resolve="natural" />
                                   <node concept="a7P8L" id="6ZRhjsGb6l8" role="iSaTp">
-                                    <ref role="a7OzE" node="6ZRhjsG9V36" resolve="TargetType" />
+                                    <ref role="a7OzE" node="6ZRhjsG9V36" resolve="NaturalType" />
                                   </node>
                                 </node>
                                 <node concept="nsMwS" id="6ZRhjsGHQ6l" role="ns1xD">
@@ -1301,7 +1301,7 @@
             </node>
             <node concept="3NuqgR" id="4s_lMmH6CtZ" role="0Rg$4">
               <node concept="3uibUv" id="4s_lMmH6Cu0" role="3vLBG7">
-                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="Options" />
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
               <node concept="aZer4" id="4s_lMmH6Cu1" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
@@ -1373,7 +1373,7 @@
                     </node>
                     <node concept="1HFMs5" id="6ZRhjsGc8Y$" role="3AunhB">
                       <node concept="a7P8L" id="6ZRhjsGc8Y_" role="1uarlU">
-                        <ref role="a7OzE" node="6ZRhjsGc8YF" resolve="FunType" />
+                        <ref role="a7OzE" node="6ZRhjsGc8YF" resolve="ClsType" />
                       </node>
                       <node concept="ns1u0" id="6ZRhjsGc9c$" role="1uarlW">
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
@@ -1412,7 +1412,7 @@
             </node>
             <node concept="3NuqgR" id="6ZRhjsGc8YH" role="0Rg$4">
               <node concept="3uibUv" id="6ZRhjsGc8YI" role="3vLBG7">
-                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="Options" />
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
               <node concept="aZer4" id="6ZRhjsGc8YJ" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
@@ -1428,7 +1428,7 @@
                         <ref role="a7OzE" node="6ZRhjsGc8YE" resolve="TargetType" />
                       </node>
                       <node concept="a7P8L" id="6ZRhjsGc8YQ" role="3AunhB">
-                        <ref role="a7OzE" node="6ZRhjsGc8YF" resolve="FunType" />
+                        <ref role="a7OzE" node="6ZRhjsGc8YF" resolve="ClsType" />
                       </node>
                       <node concept="a7P8L" id="6ZRhjsGc8YR" role="3AunhB">
                         <ref role="a7OzE" node="6ZRhjsGc8YJ" resolve="Options" />
@@ -1512,7 +1512,7 @@
             </node>
             <node concept="3NuqgR" id="vrUbzhEaSa" role="0Rg$4">
               <node concept="3uibUv" id="vrUbzhEaSb" role="3vLBG7">
-                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="Options" />
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
               <node concept="aZer4" id="vrUbzhEaSc" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
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 109c3542..2270f6af 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
@@ -48,6 +48,7 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" 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="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/models/jetbrains.mps.lang.extensionExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/models/jetbrains.mps.lang.extensionExt.types.mps
index d74a0280..acfa348b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/models/jetbrains.mps.lang.extensionExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.extensionExt/models/jetbrains.mps.lang.extensionExt.types.mps
@@ -703,7 +703,7 @@
                     <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
                     <node concept="1HFMs5" id="6ZRhjsG7Zqf" role="3AunhB">
                       <node concept="a7P8L" id="6ZRhjsG7Y4w" role="1uarlU">
-                        <ref role="a7OzE" node="6ZRhjsG7Y0i" resolve="EType" />
+                        <ref role="a7OzE" node="6ZRhjsG7Y0i" resolve="ExtType" />
                       </node>
                       <node concept="ns1u0" id="6ZRhjsG7ZrF" role="1uarlW">
                         <ref role="ns1xF" node="6ZRhjsG7IgK" resolve="extensionPoint" />
@@ -747,7 +747,7 @@
                 <property role="TrG5h" value="Opt" />
               </node>
               <node concept="3uibUv" id="6ZRhjsG7XL0" role="3vLBG7">
-                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="Options" />
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
             </node>
             <node concept="3xSepi" id="6ZRhjsG7Y9O" role="3xSepv">
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 00a086b6..0ab78cc3 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
@@ -48,6 +48,7 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" 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="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd
index a4669801..5bcab3cc 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd
@@ -25,7 +25,6 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps
index 03a99ab5..fe2613af 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps
@@ -351,7 +351,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGycrp" resolve="identity" />
                   <node concept="2FaPjH" id="6ZRhjsGydYU" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGydYV" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGycro" resolve="LowerBounded" />
+                      <ref role="3uigEE" node="6ZRhjsGycro" resolve="BoundsTypes.LowerBounded" />
                     </node>
                   </node>
                 </node>
@@ -380,7 +380,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGycrp" resolve="identity" />
                   <node concept="2FaPjH" id="6ZRhjsGydZ6" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGydZ7" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGycro" resolve="LowerBounded" />
+                      <ref role="3uigEE" node="6ZRhjsGycro" resolve="BoundsTypes.LowerBounded" />
                     </node>
                   </node>
                 </node>
@@ -409,7 +409,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGycrp" resolve="identity" />
                   <node concept="2FaPjH" id="6ZRhjsGydZi" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGydZj" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGycro" resolve="LowerBounded" />
+                      <ref role="3uigEE" node="6ZRhjsGycro" resolve="BoundsTypes.LowerBounded" />
                     </node>
                   </node>
                 </node>
@@ -481,7 +481,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGycrA" resolve="process" />
                   <node concept="2FaPjH" id="6ZRhjsGyf2w" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGyf2x" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGycr_" resolve="UpperBounded" />
+                      <ref role="3uigEE" node="6ZRhjsGycr_" resolve="BoundsTypes.UpperBounded" />
                     </node>
                   </node>
                 </node>
@@ -559,7 +559,7 @@
         <node concept="37vLTG" id="6ZRhjsGymwR" role="3clF46">
           <property role="TrG5h" value="b" />
           <node concept="3uibUv" id="6ZRhjsGymwS" role="1tU5fm">
-            <ref role="3uigEE" node="6ZRhjsGymxk" />
+            <ref role="3uigEE" node="6ZRhjsGymxk" resolve="MethodReferences.AbstractBuilder" />
             <node concept="16syzq" id="6ZRhjsGymwT" role="11_B2D">
               <ref role="16sUi3" node="6ZRhjsGymx1" resolve="U" />
             </node>
@@ -690,7 +690,7 @@
       <node concept="37vLTG" id="6ZRhjsGymxD" role="3clF46">
         <property role="TrG5h" value="action" />
         <node concept="3uibUv" id="6ZRhjsGymxE" role="1tU5fm">
-          <ref role="3uigEE" node="6ZRhjsGymwy" resolve="AbstractVisited" />
+          <ref role="3uigEE" node="6ZRhjsGymwy" resolve="MethodReferences.AbstractVisited" />
           <node concept="16syzq" id="6ZRhjsGymxF" role="11_B2D">
             <ref role="16sUi3" node="6ZRhjsGymxG" resolve="T" />
           </node>
@@ -739,7 +739,7 @@
           <node concept="3cpWs6" id="6ZRhjsGymxY" role="3cqZAp">
             <node concept="2ShNRf" id="6ZRhjsGymxZ" role="3cqZAk">
               <node concept="1pGfFk" id="6ZRhjsGymy0" role="2ShVmc">
-                <ref role="37wK5l" node="6ZRhjsGymxL" resolve="ItemContainer" />
+                <ref role="37wK5l" node="6ZRhjsGymxL" resolve="MethodReferences.ItemContainer" />
                 <node concept="37vLTw" id="6ZRhjsGymy1" role="37wK5m">
                   <ref role="3cqZAo" node="6ZRhjsGymy5" resolve="content" />
                 </node>
@@ -751,7 +751,7 @@
           <property role="TrG5h" value="W" />
         </node>
         <node concept="3uibUv" id="6ZRhjsGymy3" role="3clF45">
-          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
           <node concept="16syzq" id="6ZRhjsGymy4" role="11_B2D">
             <ref role="16sUi3" node="6ZRhjsGymy2" resolve="W" />
           </node>
@@ -784,7 +784,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="6ZRhjsGymyg" role="3clF45">
-          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
           <node concept="16syzq" id="6ZRhjsGymyh" role="11_B2D">
             <ref role="16sUi3" node="6ZRhjsGymyi" resolve="E" />
           </node>
@@ -869,7 +869,7 @@
           <node concept="3cpWsn" id="6ZRhjsGysqK" role="3cpWs9">
             <property role="TrG5h" value="provider" />
             <node concept="3uibUv" id="6ZRhjsGysqL" role="1tU5fm">
-              <ref role="3uigEE" node="6ZRhjsGymyI" resolve="SelectorProvider" />
+              <ref role="3uigEE" node="6ZRhjsGymyI" resolve="MethodReferences.SelectorProvider" />
             </node>
             <node concept="1bVj0M" id="6ZRhjsGysqM" role="33vP2m">
               <node concept="3clFbS" id="6ZRhjsGysqN" role="1bW5cS">
@@ -1120,7 +1120,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="6ZRhjsGzyRK" role="1tU5fm">
-              <ref role="3uigEE" node="6ZRhjsGymx2" resolve="Builder" />
+              <ref role="3uigEE" node="6ZRhjsGymx2" resolve="MethodReferences.Builder" />
               <node concept="3uibUv" id="6ZRhjsGzyRL" role="11_B2D">
                 <ref role="3uigEE" to="i5cy:~AtomicInteger" resolve="AtomicInteger" />
               </node>
@@ -1189,7 +1189,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGymx9" resolve="copy" />
                   <node concept="2FaPjH" id="6ZRhjsG_4cy" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsG_4cz" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGymx2" resolve="Builder" />
+                      <ref role="3uigEE" node="6ZRhjsGymx2" resolve="MethodReferences.Builder" />
                     </node>
                   </node>
                 </node>
@@ -1218,7 +1218,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGymx9" resolve="copy" />
                   <node concept="2FaPjH" id="6ZRhjsG_4Fe" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsG_4Ff" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGymx2" resolve="Builder" />
+                      <ref role="3uigEE" node="6ZRhjsGymx2" resolve="MethodReferences.Builder" />
                     </node>
                   </node>
                   <node concept="3uibUv" id="6ZRhjsG_5oO" role="3_kYmE">
@@ -1252,7 +1252,7 @@
                       <ref role="37Ijqf" node="6ZRhjsGymxW" resolve="init" />
                       <node concept="2FaPjH" id="6ZRhjsG_aAd" role="wWaWy">
                         <node concept="3uibUv" id="6ZRhjsG_aAe" role="2FaQuo">
-                          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                         </node>
                       </node>
                     </node>
@@ -1263,7 +1263,7 @@
                     <ref role="37Ijqf" node="6ZRhjsGymy7" resolve="get" />
                     <node concept="2FaPjH" id="6ZRhjsG_aAh" role="wWaWy">
                       <node concept="3uibUv" id="6ZRhjsG_aAi" role="2FaQuo">
-                        <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                        <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                       </node>
                     </node>
                   </node>
@@ -1315,7 +1315,7 @@
                         <ref role="37Ijqf" node="6ZRhjsGymxW" resolve="init" />
                         <node concept="2FaPjH" id="6ZRhjsG_vu0" role="wWaWy">
                           <node concept="3uibUv" id="6ZRhjsG_vu1" role="2FaQuo">
-                            <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                            <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                           </node>
                         </node>
                       </node>
@@ -1327,7 +1327,7 @@
                       <ref role="37Ijqf" node="6ZRhjsGymyc" resolve="self" />
                       <node concept="2FaPjH" id="6ZRhjsG_vu4" role="wWaWy">
                         <node concept="3uibUv" id="6ZRhjsG_vu5" role="2FaQuo">
-                          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                         </node>
                       </node>
                     </node>
@@ -1339,7 +1339,7 @@
                     <ref role="37Ijqf" node="6ZRhjsGymy7" resolve="get" />
                     <node concept="2FaPjH" id="6ZRhjsG_vu8" role="wWaWy">
                       <node concept="3uibUv" id="6ZRhjsG_vu9" role="2FaQuo">
-                        <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                        <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                       </node>
                     </node>
                   </node>
@@ -1389,7 +1389,7 @@
                         <ref role="37Ijqf" node="6ZRhjsGymxW" resolve="init" />
                         <node concept="2FaPjH" id="6ZRhjsG_YuX" role="wWaWy">
                           <node concept="3uibUv" id="6ZRhjsG_YuY" role="2FaQuo">
-                            <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                            <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                           </node>
                         </node>
                       </node>
@@ -1401,7 +1401,7 @@
                       <ref role="37Ijqf" node="6ZRhjsGymyc" resolve="self" />
                       <node concept="2FaPjH" id="6ZRhjsG_Yv1" role="wWaWy">
                         <node concept="3uibUv" id="6ZRhjsG_Yv2" role="2FaQuo">
-                          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                          <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                         </node>
                       </node>
                     </node>
@@ -1413,7 +1413,7 @@
                     <ref role="37Ijqf" node="6ZRhjsGymy7" resolve="get" />
                     <node concept="2FaPjH" id="6ZRhjsG_Yv5" role="wWaWy">
                       <node concept="3uibUv" id="6ZRhjsG_Yv6" role="2FaQuo">
-                        <ref role="3uigEE" node="6ZRhjsGymxH" resolve="ItemContainer" />
+                        <ref role="3uigEE" node="6ZRhjsGymxH" resolve="MethodReferences.ItemContainer" />
                       </node>
                     </node>
                   </node>
@@ -1604,7 +1604,7 @@
           <node concept="3cpWsn" id="6ZRhjsG$S0Z" role="3cpWs9">
             <property role="TrG5h" value="builder" />
             <node concept="3uibUv" id="6ZRhjsG$S0X" role="1tU5fm">
-              <ref role="3uigEE" node="6ZRhjsGymx2" resolve="Builder" />
+              <ref role="3uigEE" node="6ZRhjsGymx2" resolve="MethodReferences.Builder" />
               <node concept="3uibUv" id="6ZRhjsG$S0V" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~String" resolve="String" />
               </node>
@@ -1622,7 +1622,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6ZRhjsG$S14" role="10QFUM">
-                <ref role="3uigEE" node="6ZRhjsGymx2" resolve="Builder" />
+                <ref role="3uigEE" node="6ZRhjsGymx2" resolve="MethodReferences.Builder" />
                 <node concept="17QB3L" id="6ZRhjsG$S15" role="11_B2D" />
                 <node concept="17QB3L" id="6ZRhjsG$S16" role="11_B2D" />
               </node>
@@ -1633,7 +1633,7 @@
           <node concept="3cpWsn" id="6ZRhjsG$T9s" role="3cpWs9">
             <property role="TrG5h" value="abuilder" />
             <node concept="3uibUv" id="6ZRhjsG$T9q" role="1tU5fm">
-              <ref role="3uigEE" node="6ZRhjsGymxk" resolve="AbstractBuilder" />
+              <ref role="3uigEE" node="6ZRhjsGymxk" resolve="MethodReferences.AbstractBuilder" />
               <node concept="3uibUv" id="6ZRhjsG$T9o" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~String" resolve="String" />
               </node>
@@ -1651,7 +1651,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6ZRhjsG$T9x" role="10QFUM">
-                <ref role="3uigEE" node="6ZRhjsGymxk" resolve="AbstractBuilder" />
+                <ref role="3uigEE" node="6ZRhjsGymxk" resolve="MethodReferences.AbstractBuilder" />
                 <node concept="17QB3L" id="6ZRhjsG$T9y" role="11_B2D" />
                 <node concept="17QB3L" id="6ZRhjsG$T9z" role="11_B2D" />
               </node>
@@ -1664,8 +1664,8 @@
               <node concept="1Y3b0j" id="6ZRhjsG$WgB" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" node="6ZRhjsGymwO" resolve="AbstractVisited" />
-                <ref role="1Y3XeK" node="6ZRhjsGymwy" resolve="AbstractVisited" />
+                <ref role="37wK5l" node="6ZRhjsGymwO" resolve="MethodReferences.AbstractVisited" />
+                <ref role="1Y3XeK" node="6ZRhjsGymwy" resolve="MethodReferences.AbstractVisited" />
                 <node concept="3Tm1VV" id="6ZRhjsG$WgC" role="1B3o_S" />
                 <node concept="37Ijox" id="6ZRhjsG$VPs" role="37wK5m">
                   <ref role="37Ijqf" to="wyt6:~String.intern()" resolve="intern" />
@@ -1802,7 +1802,7 @@
       <node concept="2tJIrI" id="6ZRhjsGAfcP" role="jymVt" />
       <node concept="3Tm1VV" id="6ZRhjsGAfcQ" role="1B3o_S" />
       <node concept="3uibUv" id="6ZRhjsGAfcR" role="1zkMxy">
-        <ref role="3uigEE" node="6ZRhjsGAfcd" resolve="Computer" />
+        <ref role="3uigEE" node="6ZRhjsGAfcd" resolve="SuperReference.Computer" />
       </node>
       <node concept="3clFb_" id="6ZRhjsGAfcS" role="jymVt">
         <property role="TrG5h" value="process" />
@@ -1951,7 +1951,7 @@
         <node concept="37vLTG" id="6ZRhjsGAh0i" role="3clF46">
           <property role="TrG5h" value="processor" />
           <node concept="3uibUv" id="6ZRhjsGAh0j" role="1tU5fm">
-            <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="MultiProcessor" />
+            <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="VariableArity.MultiProcessor" />
             <node concept="16syzq" id="6ZRhjsGAh0k" role="11_B2D">
               <ref role="16sUi3" node="6ZRhjsGAh0n" resolve="J" />
             </node>
@@ -2064,7 +2064,7 @@
             <node concept="2ShNRf" id="6ZRhjsGAicu" role="2Oq$k0">
               <node concept="1pGfFk" id="6ZRhjsGAjfu" role="2ShVmc">
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" node="6ZRhjsGAgZX" resolve="ArrayHolder" />
+                <ref role="37wK5l" node="6ZRhjsGAgZX" resolve="VariableArity.ArrayHolder" />
                 <node concept="3uibUv" id="6ZRhjsGAjgI" role="1pMfVU">
                   <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
                 </node>
@@ -2076,7 +2076,7 @@
                 <ref role="37Ijqf" node="6ZRhjsGAh0x" resolve="sumOf" />
                 <node concept="2FaPjH" id="6ZRhjsGAkXR" role="wWaWy">
                   <node concept="3uibUv" id="6ZRhjsGAkXS" role="2FaQuo">
-                    <ref role="3uigEE" node="6ZRhjsGAh0w" resolve="IntegerUtil" />
+                    <ref role="3uigEE" node="6ZRhjsGAh0w" resolve="VariableArity.IntegerUtil" />
                   </node>
                 </node>
               </node>
@@ -2088,7 +2088,7 @@
             <node concept="2ShNRf" id="6ZRhjsGAnfo" role="2Oq$k0">
               <node concept="1pGfFk" id="6ZRhjsGAnfp" role="2ShVmc">
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" node="6ZRhjsGAgZX" resolve="ArrayHolder" />
+                <ref role="37wK5l" node="6ZRhjsGAgZX" resolve="VariableArity.ArrayHolder" />
                 <node concept="3uibUv" id="6ZRhjsGAnfq" role="1pMfVU">
                   <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
                 </node>
@@ -2100,7 +2100,7 @@
                 <ref role="37Ijqf" node="6ZRhjsGAh0U" resolve="sumOfArray" />
                 <node concept="2FaPjH" id="6ZRhjsGAnft" role="wWaWy">
                   <node concept="3uibUv" id="6ZRhjsGAnfu" role="2FaQuo">
-                    <ref role="3uigEE" node="6ZRhjsGAh0w" resolve="IntegerUtil" />
+                    <ref role="3uigEE" node="6ZRhjsGAh0w" resolve="VariableArity.IntegerUtil" />
                   </node>
                 </node>
               </node>
@@ -2124,7 +2124,7 @@
                 <ref role="37Ijqf" node="6ZRhjsGAgZE" resolve="processStrings" />
                 <node concept="2FaPjH" id="6ZRhjsGArWa" role="wWaWy">
                   <node concept="3uibUv" id="6ZRhjsGArWb" role="2FaQuo">
-                    <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="MultiProcessor" />
+                    <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="VariableArity.MultiProcessor" />
                   </node>
                 </node>
               </node>
@@ -2143,7 +2143,7 @@
                 <ref role="37Ijqf" node="6ZRhjsGAgZE" resolve="processStrings" />
                 <node concept="2FaPjH" id="6ZRhjsGAwo1" role="wWaWy">
                   <node concept="3uibUv" id="6ZRhjsGAwo2" role="2FaQuo">
-                    <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="MultiProcessor" />
+                    <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="VariableArity.MultiProcessor" />
                   </node>
                 </node>
               </node>
@@ -2163,7 +2163,7 @@
               <ref role="37Ijqf" node="6ZRhjsGAgZE" resolve="processStrings" />
               <node concept="2FaPjH" id="6ZRhjsGAz2m" role="wWaWy">
                 <node concept="3uibUv" id="6ZRhjsGAz2n" role="2FaQuo">
-                  <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="MultiProcessor" />
+                  <ref role="3uigEE" node="6ZRhjsGAgZy" resolve="VariableArity.MultiProcessor" />
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features.mps
index 2a0bfbe5..f03fe646 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features.mps
@@ -243,7 +243,7 @@
         <node concept="37vLTG" id="6ZRhjsGeE2c" role="3clF46">
           <property role="TrG5h" value="tm" />
           <node concept="3uibUv" id="6ZRhjsGeE2b" role="1tU5fm">
-            <ref role="3uigEE" node="6ZRhjsGbVws" resolve="ThreeMethods" />
+            <ref role="3uigEE" node="6ZRhjsGbVws" resolve="MethodRefs.ThreeMethods" />
           </node>
         </node>
         <node concept="3cqZAl" id="6ZRhjsGeE0G" role="3clF45" />
@@ -522,7 +522,7 @@
                 <ref role="37Ijqf" node="6ZRhjsGbUXa" resolve="copy" />
                 <node concept="2FaPjH" id="6ZRhjsGdgdm" role="wWaWy">
                   <node concept="3uibUv" id="6ZRhjsGdgdn" role="2FaQuo">
-                    <ref role="3uigEE" node="6ZRhjsGbTTV" resolve="Builder" />
+                    <ref role="3uigEE" node="6ZRhjsGbTTV" resolve="MethodRefs.Builder" />
                   </node>
                 </node>
                 <node concept="17QB3L" id="6ZRhjsGdne$" role="3_kYmE" />
@@ -542,7 +542,7 @@
                 <ref role="37Ijqf" node="6ZRhjsGbUXa" resolve="copy" />
                 <node concept="2FaPjH" id="6ZRhjsGdQfE" role="wWaWy">
                   <node concept="3uibUv" id="6ZRhjsGdQfF" role="2FaQuo">
-                    <ref role="3uigEE" node="6ZRhjsGbTTV" resolve="Builder" />
+                    <ref role="3uigEE" node="6ZRhjsGbTTV" resolve="MethodRefs.Builder" />
                   </node>
                 </node>
                 <node concept="10Oyi0" id="6ZRhjsGeDZy" role="3_kYmE" />
@@ -564,7 +564,7 @@
         <node concept="3clFbF" id="6ZRhjsGeQqt" role="3cqZAp">
           <node concept="2YIFZM" id="6ZRhjsGeQs4" role="3clFbG">
             <ref role="37wK5l" node="6ZRhjsGeQaB" resolve="accept" />
-            <ref role="1Pybhc" node="6ZRhjsGbVws" resolve="ThreeMethods" />
+            <ref role="1Pybhc" node="6ZRhjsGbVws" resolve="MethodRefs.ThreeMethods" />
             <node concept="37Ijox" id="6ZRhjsGeQt2" role="37wK5m">
               <ref role="37Ijqf" to="wyt6:~String.&lt;init&gt;()" resolve="String" />
               <node concept="2FaPjH" id="6ZRhjsGeQt3" role="wWaWy">
@@ -575,8 +575,8 @@
         </node>
         <node concept="3clFbF" id="6ZRhjsGeE5C" role="3cqZAp">
           <node concept="2YIFZM" id="6ZRhjsGeE7a" role="3clFbG">
-            <ref role="37wK5l" node="6ZRhjsGeE3n" resolve="callback" />
-            <ref role="1Pybhc" node="6ZRhjsGbVws" resolve="ThreeMethods" />
+            <ref role="37wK5l" node="6ZRhjsGeE3n" resolve="reject" />
+            <ref role="1Pybhc" node="6ZRhjsGbVws" resolve="MethodRefs.ThreeMethods" />
             <node concept="37Ijox" id="6ZRhjsGeE8P" role="37wK5m">
               <ref role="37Ijqf" to="wyt6:~String.&lt;init&gt;()" resolve="String" />
               <node concept="2FaPjH" id="6ZRhjsGeE8R" role="wWaWy">
@@ -762,7 +762,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGgWPb" resolve="ID" />
                   <node concept="2FaPjH" id="6ZRhjsGgYvG" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGgYvH" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -791,7 +791,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGgWPb" resolve="ID" />
                   <node concept="2FaPjH" id="6ZRhjsGgYy1" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGgYy2" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -823,7 +823,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGgWPb" resolve="ID" />
                   <node concept="2FaPjH" id="6ZRhjsGgYI8" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGgYI9" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                   <node concept="1U20sH" id="6ZRhjsGh08s" role="lGtFl">
@@ -856,7 +856,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGgWPb" resolve="ID" />
                   <node concept="2FaPjH" id="6ZRhjsGgYW6" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGgYW7" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -885,7 +885,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGgWPb" resolve="ID" />
                   <node concept="2FaPjH" id="6ZRhjsGgZiI" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGgZiJ" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -917,10 +917,10 @@
               </node>
               <node concept="3$u5V9" id="6ZRhjsGiZ6y" role="2OqNvi">
                 <node concept="37Ijox" id="6ZRhjsGiZat" role="23t8la">
-                  <ref role="37Ijqf" node="6ZRhjsGiXnF" resolve="unpackCovariant" />
+                  <ref role="37Ijqf" node="6ZRhjsGiXnF" resolve="elementCovariant" />
                   <node concept="2FaPjH" id="6ZRhjsGiZav" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGiZaw" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -954,10 +954,10 @@
               </node>
               <node concept="3$u5V9" id="6ZRhjsGiZfk" role="2OqNvi">
                 <node concept="37Ijox" id="6ZRhjsGiZfl" role="23t8la">
-                  <ref role="37Ijqf" node="6ZRhjsGiXnF" resolve="unpackCovariant" />
+                  <ref role="37Ijqf" node="6ZRhjsGiXnF" resolve="elementCovariant" />
                   <node concept="2FaPjH" id="6ZRhjsGiZfm" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGiZfn" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -988,10 +988,10 @@
               </node>
               <node concept="3$u5V9" id="6ZRhjsGxuAQ" role="2OqNvi">
                 <node concept="37Ijox" id="6ZRhjsGxuAR" role="23t8la">
-                  <ref role="37Ijqf" node="6ZRhjsGiXnF" resolve="unpackCovariant" />
+                  <ref role="37Ijqf" node="6ZRhjsGiXnF" resolve="elementCovariant" />
                   <node concept="2FaPjH" id="6ZRhjsGxuAS" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGxuAT" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -1025,7 +1025,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGxuRe" resolve="elementContravariant" />
                   <node concept="2FaPjH" id="6ZRhjsGxvgu" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGxvgv" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                 </node>
@@ -1057,7 +1057,7 @@
                   <ref role="37Ijqf" node="6ZRhjsGxuRe" resolve="elementContravariant" />
                   <node concept="2FaPjH" id="6ZRhjsGxvHg" role="wWaWy">
                     <node concept="3uibUv" id="6ZRhjsGxvHh" role="2FaQuo">
-                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="Bounds" />
+                      <ref role="3uigEE" node="6ZRhjsGgWAI" resolve="MethodRefs.Bounds" />
                     </node>
                   </node>
                   <node concept="3uibUv" id="6ZRhjsGxvTN" role="3_kYmE">