diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
index c197ce1b..aefe5513 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
@@ -540,7 +540,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuv52g" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuv5bW" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -592,7 +592,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuv5gq" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuv5gr" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -1242,7 +1242,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuvVf8" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuvVnz" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -1380,7 +1380,7 @@
                       <node concept="37jhX" id="3ZfjIHuvW7D" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuvW7E" role="37jj2">
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                         </node>
                       </node>
                     </node>
@@ -1516,7 +1516,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuvXBW" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuvXBX" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2031,7 +2031,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuw7Px" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuw7Y2" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2070,7 +2070,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuw80k" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuw80l" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2171,7 +2171,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuw9ei" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuw9ej" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2236,7 +2236,7 @@
                           </node>
                           <node concept="37jhX" id="7XekScWV2JN" role="3AunhB">
                             <node concept="2YIFZM" id="7XekScWV2JO" role="37jj2">
-                              <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                              <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                               <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                             </node>
                           </node>
@@ -2317,7 +2317,7 @@
                       </node>
                       <node concept="37jhX" id="3ZfjIHuwbp4" role="3AunhB">
                         <node concept="2YIFZM" id="3ZfjIHuwbxG" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
index d3a78d63..2bf41f81 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
@@ -527,7 +527,7 @@
                               </node>
                               <node concept="37jhX" id="5zhVuyLcJbC" role="3AunhB">
                                 <node concept="2YIFZM" id="5zhVuyLcJk8" role="37jj2">
-                                  <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                                  <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                                   <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                                 </node>
                               </node>
@@ -571,7 +571,7 @@
                                 </node>
                                 <node concept="37jhX" id="5zhVuyLcJnk" role="3AunhB">
                                   <node concept="2YIFZM" id="5zhVuyLcJnl" role="37jj2">
-                                    <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                                    <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                                     <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                                   </node>
                                 </node>
@@ -685,7 +685,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyLcSzU" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyLcSzV" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -913,7 +913,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyLcZd_" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyLcZnx" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -940,7 +940,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyLcZpA" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyLcZpB" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
index c7a8fa8f..e1dbd1b5 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
@@ -2629,7 +2629,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL8$KY" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL8$UF" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2717,7 +2717,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL8A5p" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL8A5q" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2738,7 +2738,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL8Aa3" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL8Aa4" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2826,7 +2826,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL8AAK" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL8AAL" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -2847,7 +2847,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL8AAS" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL8AAT" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -4177,7 +4177,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL9u$N" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL9uHd" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>
@@ -4198,7 +4198,7 @@
                       </node>
                       <node concept="37jhX" id="5zhVuyL9uJd" role="3AunhB">
                         <node concept="2YIFZM" id="5zhVuyL9uJe" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
+                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContext" />
                           <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
                         </node>
                       </node>