diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index b46a0804..58eed6e1 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -182,8 +182,8 @@
       </concept>
     </language>
     <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
-      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="" index="2ra2ae" />
+      <concept id="6958395084019752" name="jetbrains.mps.lang.typechecking.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
       </concept>
     </language>
     <language id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types">
diff --git a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
index 72269b10..09dfad50 100644
--- a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
+++ b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
@@ -9,9 +9,9 @@
   <languageVersions>
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:06b7c5c7-e359-4f4b-a581-5d0c9323af39:samples.fitch" version="1" />
-    <language slang="l:ddb01c98-e78e-4c79-b11a-aeba193668d4:samples.fitch.logic.firstOrder" version="0" />
-    <language slang="l:748b3ba1-2791-4ee8-b985-a5598baa7112:samples.fitch.logic.herbrand" version="0" />
-    <language slang="l:ec79e64d-4cbb-4f6c-b7b7-108dd125aba6:samples.fitch.logic.propositional" version="-1" />
+    <language slang="l:ddb01c98-e78e-4c79-b11a-aeba193668d4:samples.fitch.firstOrderLogic" version="0" />
+    <language slang="l:748b3ba1-2791-4ee8-b985-a5598baa7112:samples.fitch.herbrandLogic" version="0" />
+    <language slang="l:ec79e64d-4cbb-4f6c-b7b7-108dd125aba6:samples.fitch.propositionalLogic" version="-1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="86925f4e-7856-4553-a261-c86fbf09bb52(samples.fitch.demo)" version="0" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 068ebde5..3ac8460a 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
-    <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc" version="0" />
+    <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="0" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -248,19 +248,19 @@
         <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
       </concept>
     </language>
-    <language id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc">
-      <concept id="3749787170939265030" name="sample.lambdacalc.structure.VarType" flags="ng" index="2BbKIm">
+    <language id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc">
+      <concept id="3749787170939265030" name="samples.lambdacalc.structure.VarType" flags="ng" index="2BbKIm">
         <property id="3749787170939266901" name="name" index="2BbKN5" />
       </concept>
-      <concept id="4132684604212800736" name="sample.lambdacalc.structure.Type" flags="ng" index="1jz_8w" />
-      <concept id="4132684604212800783" name="sample.lambdacalc.structure.FunType" flags="ng" index="1jz_ff">
+      <concept id="4132684604212800736" name="samples.lambdacalc.structure.Type" flags="ng" index="1jz_8w" />
+      <concept id="4132684604212800783" name="samples.lambdacalc.structure.FunType" flags="ng" index="1jz_ff">
         <child id="4132684604212800793" name="argType" index="1jz_fp" />
         <child id="4132684604212800805" name="resType" index="1jz_f_" />
       </concept>
-      <concept id="1192808835813875324" name="sample.lambdacalc.structure.ForallType" flags="ng" index="3JbUGG">
+      <concept id="1192808835813875324" name="samples.lambdacalc.structure.ForallType" flags="ng" index="3JbUGG">
         <child id="1192808835813913262" name="type" index="3JbKvY" />
       </concept>
-      <concept id="4774429934441520217" name="sample.lambdacalc.structure.BoolType" flags="ng" index="3P8Jbz" />
+      <concept id="4774429934441520217" name="samples.lambdacalc.structure.BoolType" flags="ng" index="3P8Jbz" />
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
index 55b7a305..43f0796a 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
@@ -2,7 +2,7 @@
 <model ref="r:64f472af-c4b1-4900-9ea3-aec5c51b6e6e(samples.lambdacalc.demo)">
   <persistence version="9" />
   <languages>
-    <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc" version="0" />
+    <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="0" />
   </languages>
   <imports />
   <registry>
@@ -11,44 +11,44 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc">
-      <concept id="1784752312119229448" name="sample.lambdacalc.structure.Fix" flags="ng" index="2facFd" />
-      <concept id="8747055848970356251" name="sample.lambdacalc.structure.VarRef" flags="ng" index="t0$VC">
+    <language id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc">
+      <concept id="1784752312119229448" name="samples.lambdacalc.structure.Fix" flags="ng" index="2facFd" />
+      <concept id="8747055848970356251" name="samples.lambdacalc.structure.VarRef" flags="ng" index="t0$VC">
         <reference id="8747055848970356252" name="def" index="t0$VJ" />
       </concept>
-      <concept id="7591258541060276116" name="sample.lambdacalc.structure.IfThenElse" flags="ng" index="FlqVS">
+      <concept id="7591258541060276116" name="samples.lambdacalc.structure.IfThenElse" flags="ng" index="FlqVS">
         <child id="7591258541060276154" name="neg" index="FlqVm" />
         <child id="7591258541060276151" name="pos" index="FlqVr" />
         <child id="7591258541060276145" name="cond" index="FlqVt" />
       </concept>
-      <concept id="8739282858702982512" name="sample.lambdacalc.structure.App" flags="ng" index="1DVIo5">
+      <concept id="8739282858702982512" name="samples.lambdacalc.structure.App" flags="ng" index="1DVIo5">
         <child id="8739282858702982513" name="fun" index="1DVIo4" />
         <child id="8739282858702982525" name="arg" index="1DVIo8" />
       </concept>
-      <concept id="8739282858702982488" name="sample.lambdacalc.structure.Var" flags="ng" index="1DVIoH" />
-      <concept id="8739282858702982568" name="sample.lambdacalc.structure.Doc" flags="ng" index="1DVIrt">
+      <concept id="8739282858702982488" name="samples.lambdacalc.structure.Var" flags="ng" index="1DVIoH" />
+      <concept id="8739282858702982568" name="samples.lambdacalc.structure.Doc" flags="ng" index="1DVIrt">
         <child id="8739282858702982571" name="clause" index="1DVIru" />
       </concept>
-      <concept id="8739282858702982546" name="sample.lambdacalc.structure.LamVarBind" flags="ng" index="1DVIrB">
+      <concept id="8739282858702982546" name="samples.lambdacalc.structure.LamVarBind" flags="ng" index="1DVIrB">
         <child id="8739282858702982547" name="var" index="1DVIrA" />
       </concept>
-      <concept id="8739282858702982553" name="sample.lambdacalc.structure.LetVarBind" flags="ng" index="1DVIrG">
+      <concept id="8739282858702982553" name="samples.lambdacalc.structure.LetVarBind" flags="ng" index="1DVIrG">
         <child id="8739282858702982556" name="expr" index="1DVIrD" />
         <child id="8739282858702982554" name="var" index="1DVIrJ" />
       </concept>
-      <concept id="8739282858702982552" name="sample.lambdacalc.structure.LetExpr" flags="ng" index="1DVIrH">
+      <concept id="8739282858702982552" name="samples.lambdacalc.structure.LetExpr" flags="ng" index="1DVIrH">
         <child id="8739282858702982561" name="expr" index="1DVIrk" />
         <child id="8739282858702982559" name="binding" index="1DVIrE" />
       </concept>
-      <concept id="8739282858702982543" name="sample.lambdacalc.structure.Lam" flags="ng" index="1DVIrU">
+      <concept id="8739282858702982543" name="samples.lambdacalc.structure.Lam" flags="ng" index="1DVIrU">
         <child id="8739282858702982549" name="expr" index="1DVIrw" />
         <child id="8739282858702982544" name="binding" index="1DVIr_" />
       </concept>
-      <concept id="8739282858702985614" name="sample.lambdacalc.structure.LetClause" flags="ng" index="1DVJbV">
+      <concept id="8739282858702985614" name="samples.lambdacalc.structure.LetClause" flags="ng" index="1DVJbV">
         <child id="2654091495521629866" name="binding" index="j9CMd" />
       </concept>
-      <concept id="4774429934441545239" name="sample.lambdacalc.structure.False" flags="ng" index="3P8L2H" />
-      <concept id="4774429934441530831" name="sample.lambdacalc.structure.True" flags="ng" index="3P8MHP" />
+      <concept id="4774429934441545239" name="samples.lambdacalc.structure.False" flags="ng" index="3P8L2H" />
+      <concept id="4774429934441530831" name="samples.lambdacalc.structure.True" flags="ng" index="3P8MHP" />
     </language>
   </registry>
   <node concept="1DVIrt" id="7_8aRkgE06U">
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
index 5268fef6..6defabad 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
@@ -8,7 +8,7 @@
   <sourcePath />
   <languageVersions>
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:sample.lambdacalc" version="0" />
+    <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:samples.lambdacalc" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="05f15741-5274-4aed-a086-84d9a15ab93b(samples.lambdacalc.demo)" version="0" />
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 2a762b67..20b1997e 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
@@ -524,8 +524,8 @@
       </concept>
     </language>
     <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
-      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="" index="2ra2ae" />
+      <concept id="6958395084019752" name="jetbrains.mps.lang.typechecking.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">