From 07d31d93f6cbdca2ca63c329d29890a14f0b6a31 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 16 Oct 2017 15:41:38 +0200
Subject: [PATCH] Updated to the latest version of typechecking plugin,
 migrated the code to work correctly.

---
 samples/lambdacalc/.mps/migration.xml         |   1 +
 .../models/sample.lambdacalc.constraints.mps  |   2 +-
 .../models/sample.lambdacalc.editor.mps       |   2 +-
 .../models/sample.lambdacalc.structure.mps    |   3 +-
 .../models/sample.lambdacalc.types.mps        | 227 ++++++++++--------
 .../models/sample.lambdacalc.typesystem.mps   |   3 +-
 .../sample.lambdacalc/sample.lambdacalc.mpl   |  18 +-
 7 files changed, 139 insertions(+), 117 deletions(-)

diff --git a/samples/lambdacalc/.mps/migration.xml b/samples/lambdacalc/.mps/migration.xml
index 6e74c2ac..613581ac 100644
--- a/samples/lambdacalc/.mps/migration.xml
+++ b/samples/lambdacalc/.mps/migration.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.cleanExp_3.4" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v34.EngagedLanguagesImports" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.EditorGeneratorRefactoring" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps
index 9a2d021c..1a0f2c65 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps
@@ -2,10 +2,10 @@
 <model ref="r:49af371c-e432-4e5a-a3df-e689ebe20a8d(sample.lambdacalc.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
     <import index="tpcg" ref="r:00000000-0000-4000-0000-011c8959028c(jetbrains.mps.lang.structure.constraints)" />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps
index d5328bee..8e267352 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a4cbccba-ea60-4d22-9e76-4b461414bf5b(sample.lambdacalc.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps
index 4f52c641..fed3c8a6 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps
@@ -2,8 +2,7 @@
 <model ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
index fb78b951..e0475660 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -2,7 +2,7 @@
 <model ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.lambdacalc.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="0" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc" version="0" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
@@ -13,16 +13,16 @@
   </languages>
   <imports>
     <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)" />
-    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
+    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
     <import index="1x08" ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.lambdacalc.behavior)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="69ci" ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.lambdacalc.types)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.typesystem2.program)" />
     <import index="6bz1" ref="r:d3905048-7598-4a84-931a-cbbcbcda146d(jetbrains.mps.lang.intentions.methods)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
   </imports>
@@ -375,12 +375,12 @@
         <property id="1877115349164965185" name="final" index="3JpusR" />
       </concept>
       <concept id="1618328391714702001" name="jetbrains.mps.lang.typesystem2.structure.ChildTermFeature" flags="ng" index="0ofuC" />
-      <concept id="1618328391714763069" name="jetbrains.mps.lang.typesystem2.structure.TypeTable" flags="ng" index="0oKg$">
-        <child id="1618328391714763070" name="type" index="0oKgB" />
+      <concept id="1618328391714763069" name="jetbrains.mps.lang.typesystem2.structure.MacroTable" flags="ng" index="0oKg$">
+        <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
-      <concept id="1618328391714763491" name="jetbrains.mps.lang.typesystem2.structure.TypeDeclaration" flags="ng" index="0oKvU">
-        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
-        <child id="8908809128801952514" name="init" index="3unh6L" />
+      <concept id="1618328391714763491" name="jetbrains.mps.lang.typesystem2.structure.MacroDeclaration" flags="ng" index="0oKvU">
+        <child id="7670825977262353027" name="input" index="3eYTkm" />
+        <child id="8908809128801952514" name="body" index="3unh6L" />
       </concept>
       <concept id="6086839168138086051" name="jetbrains.mps.lang.typesystem2.structure.TermTable" flags="ng" index="1HGPq">
         <child id="6086839168138086052" name="termDeclaration" index="1HGPt" />
@@ -398,19 +398,22 @@
         <property id="2316688792951788157" name="stage" index="3J8TDj" />
         <child id="7368070394767441299" name="rule" index="3ArX_J" />
       </concept>
-      <concept id="5524459797186715156" name="jetbrains.mps.lang.typesystem2.structure.NewTypePseudoConstraint" flags="ng" index="B_ONY">
-        <reference id="6086839168131376658" name="typeDecl" index="17QRF" />
-        <child id="5524459797186715209" name="typeVar" index="B_OMz" />
+      <concept id="5524459797186715156" name="jetbrains.mps.lang.typesystem2.structure.CallMacroPseudoConstraint" flags="ng" index="B_ONY">
+        <reference id="6086839168131376658" name="declaration" index="17QRF" />
+        <child id="5524459797186715209" name="logical" index="B_OMz" />
       </concept>
       <concept id="5524459797190399502" name="jetbrains.mps.lang.typesystem2.structure.TermDeclaration" flags="ng" index="BRKj$">
         <child id="5524459797190401236" name="template" index="BRKSY" />
       </concept>
-      <concept id="8908809128804390455" name="jetbrains.mps.lang.typesystem2.structure.TypeLogicalExpression" flags="ng" index="3txIi4" />
-      <concept id="8908809128801951589" name="jetbrains.mps.lang.typesystem2.structure.TypeInitializer" flags="ng" index="3uniRm">
+      <concept id="7670825977262339471" name="jetbrains.mps.lang.typesystem2.structure.MacroInputDeclaration" flags="ng" index="3eYOCq">
+        <child id="7670825977262355988" name="type" index="3eYSA1" />
+      </concept>
+      <concept id="8908809128804390455" name="jetbrains.mps.lang.typesystem2.structure.MacroLogicalExpression" flags="ng" index="3txIi4" />
+      <concept id="8908809128801951589" name="jetbrains.mps.lang.typesystem2.structure.MacroBody" flags="ng" index="3uniRm">
         <child id="8908809128801951594" name="parameter" index="3uniRp" />
         <child id="8908809128801951592" name="code" index="3uniRr" />
       </concept>
-      <concept id="8908809128801951597" name="jetbrains.mps.lang.typesystem2.structure.TypeInitializerLogicalDeclaration" flags="ng" index="3uniRu" />
+      <concept id="8908809128801951597" name="jetbrains.mps.lang.typesystem2.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
       <concept id="5372587443975633709" name="jetbrains.mps.lang.typesystem2.structure.AbstractRule" flags="ng" index="3wqRzX">
         <child id="7509376976631847095" name="input" index="20_v8_" />
         <child id="1427485783571243167" name="guard" index="3oo59u" />
@@ -460,6 +463,9 @@
       </concept>
       <concept id="1476354154047290768" name="jetbrains.mps.lang.typesystem2.structure.GetterBlock" flags="ng" index="3AP2Rn" />
       <concept id="6927468913528465293" name="jetbrains.mps.lang.typesystem2.structure.LogicalContextExpression" flags="ng" index="1BjVvb" />
+      <concept id="8581119423153238082" name="jetbrains.mps.lang.typesystem2.structure.NodeAnchor" flags="ng" index="3BlFb$">
+        <child id="8581119423153238083" name="node" index="3BlFb_" />
+      </concept>
       <concept id="1877115349178398764" name="jetbrains.mps.lang.typesystem2.structure.EqualsConstraint" flags="ng" index="3GeI9q">
         <child id="1877115349178398815" name="right" index="3GeI8D" />
         <child id="1877115349178398813" name="left" index="3GeI8F" />
@@ -492,7 +498,6 @@
     <property role="TrG5h" value="types" />
     <node concept="0oKvU" id="12dHl3ZCxMa" role="0oKgB">
       <property role="TrG5h" value="Forall" />
-      <ref role="3bZ5Sy" to="8tt8:12dHl3ZCxTW" resolve="ForallType" />
       <node concept="3uniRm" id="12dHl3ZCEvP" role="3unh6L">
         <node concept="3clFbS" id="12dHl3ZCEw1" role="3uniRr">
           <node concept="3Aqczg" id="12dHl3ZCEw0" role="3cqZAp">
@@ -507,10 +512,15 @@
           </node>
         </node>
       </node>
+      <node concept="3eYOCq" id="2mKpIXwNDzt" role="3eYTkm">
+        <property role="TrG5h" value="forallType" />
+        <node concept="3Tqbb2" id="2mKpIXwNDzu" role="3eYSA1">
+          <ref role="ehGHo" to="8tt8:12dHl3ZCxTW" resolve="ForallType" />
+        </node>
+      </node>
     </node>
     <node concept="0oKvU" id="492bFERodOY" role="0oKgB">
       <property role="TrG5h" value="Bool" />
-      <ref role="3bZ5Sy" to="8tt8:492bFERodLp" resolve="BoolType" />
       <node concept="3uniRm" id="4dPZ2m2k8Tn" role="3unh6L">
         <node concept="3clFbS" id="4dPZ2m2k8Vr" role="3uniRr">
           <node concept="3Aqczg" id="4dPZ2m2k8Vq" role="3cqZAp">
@@ -525,10 +535,15 @@
           </node>
         </node>
       </node>
+      <node concept="3eYOCq" id="2mKpIXwNDzr" role="3eYTkm">
+        <property role="TrG5h" value="boolType" />
+        <node concept="3Tqbb2" id="2mKpIXwNDzs" role="3eYSA1">
+          <ref role="ehGHo" to="8tt8:492bFERodLp" resolve="BoolType" />
+        </node>
+      </node>
     </node>
     <node concept="0oKvU" id="3_qfG1EPlgE" role="0oKgB">
       <property role="TrG5h" value="Fun" />
-      <ref role="3bZ5Sy" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
       <node concept="3uniRm" id="4dPZ2m2k8V8" role="3unh6L">
         <node concept="3clFbS" id="4dPZ2m2k8VN" role="3uniRr">
           <node concept="3Aqczg" id="4dPZ2m2k8VP" role="3cqZAp">
@@ -579,6 +594,12 @@
           </node>
         </node>
       </node>
+      <node concept="3eYOCq" id="2mKpIXwNDzp" role="3eYTkm">
+        <property role="TrG5h" value="funType" />
+        <node concept="3Tqbb2" id="2mKpIXwNDzq" role="3eYSA1">
+          <ref role="ehGHo" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="AVZre" id="5dGkjBXlLmT">
@@ -602,8 +623,8 @@
           </node>
           <node concept="3I6s7M" id="Cn$NxdZf0f" role="3I6sU7">
             <node concept="3XxkQB" id="492bFERogoB" role="3I6s78">
-              <node concept="aYllk" id="492bFERogoD" role="3XxmmS">
-                <node concept="3A2sRY" id="492bFERogoV" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDxI" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDxH" role="3BlFb_">
                   <ref role="3A2yKK" node="492bFERogn9" resolve="trueConst" />
                 </node>
               </node>
@@ -640,8 +661,8 @@
           </node>
           <node concept="3I6s7M" id="Cn$NxdZf0Q" role="3I6sU7">
             <node concept="3XxkQB" id="492bFERojU0" role="3I6s78">
-              <node concept="aYllk" id="492bFERojU1" role="3XxmmS">
-                <node concept="3A2sRY" id="492bFERojU2" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDxi" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDxh" role="3BlFb_">
                   <ref role="3A2yKK" node="492bFERojU5" resolve="falseConst" />
                 </node>
               </node>
@@ -677,12 +698,12 @@
               </node>
               <node concept="3Aqczg" id="3dV5CmlMdxk" role="3cqZAp">
                 <node concept="3XxkQB" id="3dV5CmlMdxc" role="3Aqpz8">
-                  <node concept="aYllk" id="3dV5CmlMdxe" role="3XxmmS">
-                    <node concept="2OqwBi" id="RRVBbp7PR7" role="aYrYs">
-                      <node concept="3A2sRY" id="492bFERozSf" role="2Oq$k0">
+                  <node concept="3BlFb$" id="2mKpIXwNDy2" role="3XxmmS">
+                    <node concept="2OqwBi" id="2mKpIXwNDxZ" role="3BlFb_">
+                      <node concept="3A2sRY" id="2mKpIXwNDy0" role="2Oq$k0">
                         <ref role="3A2yKK" node="3dV5CmlMdwE" resolve="lvb" />
                       </node>
-                      <node concept="3TrEf2" id="RRVBbp7Q0m" role="2OqNvi">
+                      <node concept="3TrEf2" id="2mKpIXwNDy1" role="2OqNvi">
                         <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQj" resolve="var" />
                       </node>
                     </node>
@@ -720,12 +741,12 @@
           </node>
           <node concept="3I6s7M" id="10BVPEVK65K" role="3I6sU7">
             <node concept="3XxkQB" id="10BVPEVK65C" role="3I6s78">
-              <node concept="aYllk" id="10BVPEVK65E" role="3XxmmS">
-                <node concept="2OqwBi" id="10BVPEVK6cU" role="aYrYs">
-                  <node concept="3A2sRY" id="10BVPEVK65X" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDyk" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDyh" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDyi" role="2Oq$k0">
                     <ref role="3A2yKK" node="10BVPEVK4YL" resolve="lvb" />
                   </node>
-                  <node concept="3TrEf2" id="10BVPEVK6nY" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDyj" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQq" resolve="var" />
                   </node>
                 </node>
@@ -752,12 +773,12 @@
         <node concept="3I6sU6" id="10BVPEVK4YY" role="3Ip0Jz">
           <node concept="3I6s7M" id="10BVPEVK5Ku" role="3I6sU7">
             <node concept="3XxkQB" id="10BVPEVK5Kq" role="3I6s78">
-              <node concept="aYllk" id="10BVPEVK5Kr" role="3XxmmS">
-                <node concept="2OqwBi" id="10BVPEVK5R$" role="aYrYs">
-                  <node concept="3A2sRY" id="10BVPEVK5KB" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxm" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxj" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxk" role="2Oq$k0">
                     <ref role="3A2yKK" node="10BVPEVK4YL" resolve="lvb" />
                   </node>
-                  <node concept="3TrEf2" id="10BVPEVK60N" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxl" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQs" resolve="expr" />
                   </node>
                 </node>
@@ -798,8 +819,8 @@
           </node>
           <node concept="3I6s7M" id="G788z3oTvL" role="3I6sU7">
             <node concept="3XxkQB" id="G788z3oTvH" role="3I6s78">
-              <node concept="aYllk" id="G788z3oTvI" role="3XxmmS">
-                <node concept="3A2sRY" id="G788z3oTvU" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDy8" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDy7" role="3BlFb_">
                   <ref role="3A2yKK" node="G788z3oSpi" resolve="let" />
                 </node>
               </node>
@@ -820,12 +841,12 @@
         <node concept="3I6sU6" id="G788z3oSps" role="3Ip0Jz">
           <node concept="3I6s7M" id="G788z3oTaY" role="3I6sU7">
             <node concept="3XxkQB" id="G788z3oTaU" role="3I6s78">
-              <node concept="aYllk" id="G788z3oTaV" role="3XxmmS">
-                <node concept="2OqwBi" id="G788z3oTiI" role="aYrYs">
-                  <node concept="3A2sRY" id="G788z3oTb7" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxM" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxJ" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxK" role="2Oq$k0">
                     <ref role="3A2yKK" node="G788z3oSpi" resolve="let" />
                   </node>
-                  <node concept="3TrEf2" id="G788z3oTtu" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxL" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQx" resolve="expr" />
                   </node>
                 </node>
@@ -866,8 +887,8 @@
           </node>
           <node concept="3I6s7M" id="7edv2S3cQd_" role="3I6sU7">
             <node concept="3XxkQB" id="7edv2S3cQdx" role="3I6s78">
-              <node concept="aYllk" id="7edv2S3cQdy" role="3XxmmS">
-                <node concept="3A2sRY" id="7edv2S3cQdI" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDya" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDy9" role="3BlFb_">
                   <ref role="3A2yKK" node="3TFdEPZe4bq" resolve="varRef" />
                 </node>
               </node>
@@ -888,12 +909,12 @@
         <node concept="3I6sU6" id="7edv2S3cP1Z" role="3Ip0Jz">
           <node concept="3I6s7M" id="7edv2S3cPNW" role="3I6sU7">
             <node concept="3XxkQB" id="7edv2S3cPNS" role="3I6s78">
-              <node concept="aYllk" id="7edv2S3cPNT" role="3XxmmS">
-                <node concept="2OqwBi" id="7edv2S3cPWm" role="aYrYs">
-                  <node concept="3A2sRY" id="7edv2S3cPO5" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxE" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxB" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxC" role="2Oq$k0">
                     <ref role="3A2yKK" node="3TFdEPZe4bq" resolve="varRef" />
                   </node>
-                  <node concept="3TrEf2" id="7edv2S3cQ8D" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxD" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_zMfd$ooos" resolve="def" />
                   </node>
                 </node>
@@ -975,8 +996,8 @@
           </node>
           <node concept="3I6s7M" id="Cn$NxdZfml" role="3I6sU7">
             <node concept="3XxkQB" id="3dV5CmlM9mr" role="3I6s78">
-              <node concept="aYllk" id="3dV5CmlM9mt" role="3XxmmS">
-                <node concept="3A2sRY" id="3dV5CmlM9mP" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDy4" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDy3" role="3BlFb_">
                   <ref role="3A2yKK" node="3dV5CmlM9jX" resolve="lam" />
                 </node>
               </node>
@@ -1000,17 +1021,17 @@
         <node concept="3I6sU6" id="Cn$NxdZfc_" role="3Ip0Jz">
           <node concept="3I6s7M" id="Cn$NxdZfcA" role="3I6sU7">
             <node concept="3XxkQB" id="3dV5CmlM9Xg" role="3I6s78">
-              <node concept="aYllk" id="3dV5CmlM9Xh" role="3XxmmS">
-                <node concept="2OqwBi" id="3dV5CmlMaMD" role="aYrYs">
-                  <node concept="2OqwBi" id="3dV5CmlMa54" role="2Oq$k0">
-                    <node concept="3A2sRY" id="3dV5CmlM9Xt" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxw" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxr" role="3BlFb_">
+                  <node concept="2OqwBi" id="2mKpIXwNDxs" role="2Oq$k0">
+                    <node concept="3A2sRY" id="2mKpIXwNDxt" role="2Oq$k0">
                       <ref role="3A2yKK" node="3dV5CmlM9jX" resolve="lam" />
                     </node>
-                    <node concept="3TrEf2" id="3dV5CmlMatG" role="2OqNvi">
+                    <node concept="3TrEf2" id="2mKpIXwNDxu" role="2OqNvi">
                       <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQg" resolve="binding" />
                     </node>
                   </node>
-                  <node concept="3TrEf2" id="3dV5CmlMb11" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxv" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQj" resolve="var" />
                   </node>
                 </node>
@@ -1022,12 +1043,12 @@
           </node>
           <node concept="3I6s7M" id="Cn$NxdZfcB" role="3I6sU7">
             <node concept="3XxkQB" id="3dV5CmlMb30" role="3I6s78">
-              <node concept="aYllk" id="3dV5CmlMb31" role="3XxmmS">
-                <node concept="2OqwBi" id="3dV5CmlMb33" role="aYrYs">
-                  <node concept="3A2sRY" id="3dV5CmlMb34" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDye" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDyb" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDyc" role="2Oq$k0">
                     <ref role="3A2yKK" node="3dV5CmlM9jX" resolve="lam" />
                   </node>
-                  <node concept="3TrEf2" id="3dV5CmlMbjs" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDyd" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQl" resolve="expr" />
                   </node>
                 </node>
@@ -1055,12 +1076,12 @@
         <node concept="3I6sU6" id="WBEjvSTmqr" role="3Ip0Jz">
           <node concept="3I6s7M" id="WBEjvSTmqs" role="3I6sU7">
             <node concept="3XxkQB" id="44a9n8ErXaL" role="3I6s78">
-              <node concept="aYllk" id="44a9n8ErXaM" role="3XxmmS">
-                <node concept="2OqwBi" id="44a9n8ErXi_" role="aYrYs">
-                  <node concept="3A2sRY" id="44a9n8ErXaY" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxU" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxR" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxS" role="2Oq$k0">
                     <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                   </node>
-                  <node concept="3TrEf2" id="44a9n8ErXv4" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxT" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGPL" resolve="fun" />
                   </node>
                 </node>
@@ -1072,12 +1093,12 @@
           </node>
           <node concept="3I6s7M" id="WBEjvSTmqt" role="3I6sU7">
             <node concept="3XxkQB" id="44a9n8ErXJd" role="3I6s78">
-              <node concept="aYllk" id="44a9n8ErXJe" role="3XxmmS">
-                <node concept="2OqwBi" id="44a9n8ErXJf" role="aYrYs">
-                  <node concept="3A2sRY" id="44a9n8ErXJg" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxQ" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxN" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxO" role="2Oq$k0">
                     <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                   </node>
-                  <node concept="3TrEf2" id="44a9n8ErXXI" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxP" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:7_8aRkgDGPX" resolve="arg" />
                   </node>
                 </node>
@@ -1183,8 +1204,8 @@
           </node>
           <node concept="3I6s7M" id="WBEjvSTmlM" role="3I6sU7">
             <node concept="3XxkQB" id="44a9n8Es2FU" role="3I6s78">
-              <node concept="aYllk" id="44a9n8Es2FW" role="3XxmmS">
-                <node concept="3A2sRY" id="44a9n8Es2Gy" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDy6" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDy5" role="3BlFb_">
                   <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                 </node>
               </node>
@@ -1237,8 +1258,8 @@
                   <node concept="a7P8L" id="WBEjvSTEBi" role="3AunhB">
                     <ref role="a7OzE" node="WBEjvSTpvo" resolve="E" />
                   </node>
-                  <node concept="aYllk" id="WBEjvSTEB0" role="3AunhB">
-                    <node concept="3A2sRY" id="WBEjvSTEBa" role="aYrYs">
+                  <node concept="3BlFb$" id="2mKpIXwPhj3" role="3AunhB">
+                    <node concept="3A2sRY" id="2mKpIXwPhj5" role="3BlFb_">
                       <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                     </node>
                   </node>
@@ -1256,12 +1277,12 @@
         <node concept="3I6sU6" id="6_p$mL23fz$" role="3Ip0Jz">
           <node concept="3I6s7M" id="6_p$mL23gmk" role="3I6sU7">
             <node concept="3XxkQB" id="6_p$mL23gmg" role="3I6s78">
-              <node concept="aYllk" id="6_p$mL23gmh" role="3XxmmS">
-                <node concept="2OqwBi" id="6_p$mL23gWV" role="aYrYs">
-                  <node concept="3A2sRY" id="6_p$mL23gmt" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxq" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxn" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxo" role="2Oq$k0">
                     <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                   </node>
-                  <node concept="3TrEf2" id="6_p$mL23h9g" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxp" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:6_p$mL233YL" resolve="cond" />
                   </node>
                 </node>
@@ -1273,12 +1294,12 @@
           </node>
           <node concept="3I6s7M" id="6_p$mL23gnQ" role="3I6sU7">
             <node concept="3XxkQB" id="6_p$mL23gnI" role="3I6s78">
-              <node concept="aYllk" id="6_p$mL23gnK" role="3XxmmS">
-                <node concept="2OqwBi" id="6_p$mL23gwl" role="aYrYs">
-                  <node concept="3A2sRY" id="6_p$mL23go4" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDx$" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxx" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxy" role="2Oq$k0">
                     <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                   </node>
-                  <node concept="3TrEf2" id="6_p$mL23h_w" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxz" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:6_p$mL233YR" resolve="pos" />
                   </node>
                 </node>
@@ -1290,12 +1311,12 @@
           </node>
           <node concept="3I6s7M" id="6_p$mL23hCc" role="3I6sU7">
             <node concept="3XxkQB" id="6_p$mL23hC4" role="3I6s78">
-              <node concept="aYllk" id="6_p$mL23hC6" role="3XxmmS">
-                <node concept="2OqwBi" id="6_p$mL23hKO" role="aYrYs">
-                  <node concept="3A2sRY" id="6_p$mL23hCz" role="2Oq$k0">
+              <node concept="3BlFb$" id="2mKpIXwNDxY" role="3XxmmS">
+                <node concept="2OqwBi" id="2mKpIXwNDxV" role="3BlFb_">
+                  <node concept="3A2sRY" id="2mKpIXwNDxW" role="2Oq$k0">
                     <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                   </node>
-                  <node concept="3TrEf2" id="6_p$mL23hZm" role="2OqNvi">
+                  <node concept="3TrEf2" id="2mKpIXwNDxX" role="2OqNvi">
                     <ref role="3Tt5mk" to="8tt8:6_p$mL233YU" resolve="neg" />
                   </node>
                 </node>
@@ -1348,8 +1369,8 @@
           </node>
           <node concept="3I6s7M" id="6_p$mL23i1M" role="3I6sU7">
             <node concept="3XxkQB" id="6_p$mL23i1I" role="3I6s78">
-              <node concept="aYllk" id="6_p$mL23i1J" role="3XxmmS">
-                <node concept="3A2sRY" id="6_p$mL23i1V" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDyg" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDyf" role="3BlFb_">
                   <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                 </node>
               </node>
@@ -1386,8 +1407,8 @@
                   <node concept="a7P8L" id="6_p$mL23rJF" role="3AunhB">
                     <ref role="a7OzE" node="6_p$mL23rnG" resolve="E" />
                   </node>
-                  <node concept="aYllk" id="6_p$mL23rl7" role="3AunhB">
-                    <node concept="3A2sRY" id="6_p$mL23rOm" role="aYrYs">
+                  <node concept="3BlFb$" id="2mKpIXwPhoj" role="3AunhB">
+                    <node concept="3A2sRY" id="2mKpIXwPhvB" role="3BlFb_">
                       <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                     </node>
                   </node>
@@ -1496,8 +1517,8 @@
           </node>
           <node concept="3I6s7M" id="1YCbHn1AKBE" role="3I6sU7">
             <node concept="3XxkQB" id="1YCbHn1AKBA" role="3I6s78">
-              <node concept="aYllk" id="1YCbHn1AKBB" role="3XxmmS">
-                <node concept="3A2sRY" id="1YCbHn1AKBQ" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwNDxG" role="3XxmmS">
+                <node concept="3A2sRY" id="2mKpIXwNDxF" role="3BlFb_">
                   <ref role="3A2yKK" node="1YCbHn1AJ$P" resolve="fix" />
                 </node>
               </node>
@@ -2262,7 +2283,7 @@
                 <node concept="2OqwBi" id="4dPZ2m2iO4i" role="2Oq$k0">
                   <node concept="2ShNRf" id="4dPZ2m2iLnS" role="2Oq$k0">
                     <node concept="1pGfFk" id="4dPZ2m2iNJ6" role="2ShVmc">
-                      <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="6pyv:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="492bFERoWG6" role="37wK5m">
                         <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
                         <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
@@ -2270,7 +2291,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4dPZ2m2iOkS" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="6pyv:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="37vLTw" id="492bFERoWNw" role="37wK5m">
                       <ref role="3cqZAo" node="492bFERoJe8" resolve="least" />
                     </node>
@@ -2284,7 +2305,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4dPZ2m2iPq2" role="2OqNvi">
-                  <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="6pyv:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
               </node>
               <node concept="2ShNRf" id="4dPZ2m2iJwv" role="37wK5m">
@@ -2685,8 +2706,8 @@
               <node concept="a7P8L" id="4dPZ2m2jBox" role="3AunhB">
                 <ref role="a7OzE" node="4dPZ2m2jBnq" resolve="Node" />
               </node>
-              <node concept="aYllk" id="4dPZ2m2jBoD" role="3AunhB">
-                <node concept="3A2sRY" id="4dPZ2m2jBoN" role="aYrYs">
+              <node concept="3BlFb$" id="2mKpIXwOPQ5" role="3AunhB">
+                <node concept="3A2sRY" id="2mKpIXwOPQ6" role="3BlFb_">
                   <ref role="3A2yKK" node="4dPZ2m2jBj9" resolve="tpbl" />
                 </node>
               </node>
@@ -2711,8 +2732,8 @@
               </node>
               <node concept="3Aqczg" id="4dPZ2m2jBmI" role="3cqZAp">
                 <node concept="3XxkQB" id="4dPZ2m2jBmA" role="3Aqpz8">
-                  <node concept="aYllk" id="4dPZ2m2jBmC" role="3XxmmS">
-                    <node concept="3A2sRY" id="4dPZ2m2jBmU" role="aYrYs">
+                  <node concept="3BlFb$" id="2mKpIXwNDxA" role="3XxmmS">
+                    <node concept="3A2sRY" id="2mKpIXwNDx_" role="3BlFb_">
                       <ref role="3A2yKK" node="4dPZ2m2jBj9" resolve="tpbl" />
                     </node>
                   </node>
@@ -3371,7 +3392,7 @@
                 <node concept="2OqwBi" id="4dPZ2m2jgbn" role="2Oq$k0">
                   <node concept="2ShNRf" id="4dPZ2m2jgbF" role="2Oq$k0">
                     <node concept="1pGfFk" id="4dPZ2m2jgbT" role="2ShVmc">
-                      <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="6pyv:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="4dPZ2m2jgeW" role="37wK5m">
                         <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
                         <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
@@ -3379,7 +3400,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4dPZ2m2jgbq" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="6pyv:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="37vLTw" id="4dPZ2m2jgbr" role="37wK5m">
                       <ref role="3cqZAo" node="4dPZ2m2jgzY" resolve="logical" />
                     </node>
@@ -3389,7 +3410,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4dPZ2m2jgbt" role="2OqNvi">
-                  <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="6pyv:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
               </node>
               <node concept="37vLTw" id="WBEjvSTobq" role="37wK5m">
@@ -3613,7 +3634,7 @@
                 <node concept="2OqwBi" id="WBEjvSToJJ" role="2Oq$k0">
                   <node concept="2ShNRf" id="WBEjvSToJK" role="2Oq$k0">
                     <node concept="1pGfFk" id="WBEjvSToJL" role="2ShVmc">
-                      <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="6pyv:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="WBEjvSToJM" role="37wK5m">
                         <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
                         <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
@@ -3621,7 +3642,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="WBEjvSToJN" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="6pyv:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="37vLTw" id="WBEjvSToJO" role="37wK5m">
                       <ref role="3cqZAo" node="WBEjvSTnS2" resolve="logical" />
                     </node>
@@ -3631,7 +3652,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="WBEjvSToJQ" role="2OqNvi">
-                  <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="6pyv:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
               </node>
               <node concept="37vLTw" id="WBEjvSToJX" role="37wK5m">
@@ -3810,7 +3831,7 @@
                 <node concept="2OqwBi" id="3Lj6UsgF6MB" role="2Oq$k0">
                   <node concept="2ShNRf" id="3Lj6UsgF6MC" role="2Oq$k0">
                     <node concept="1pGfFk" id="3Lj6UsgF6MD" role="2ShVmc">
-                      <ref role="37wK5l" to="nz6g:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="6pyv:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="3Lj6UsgF6ME" role="37wK5m">
                         <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
                         <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
@@ -3818,7 +3839,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3Lj6UsgF6MF" role="2OqNvi">
-                    <ref role="37wK5l" to="nz6g:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="6pyv:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="37vLTw" id="3Lj6UsgF7in" role="37wK5m">
                       <ref role="3cqZAo" node="12dHl3ZD0sZ" resolve="to" />
                     </node>
@@ -3828,7 +3849,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3Lj6UsgF6MI" role="2OqNvi">
-                  <ref role="37wK5l" to="nz6g:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="6pyv:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
               </node>
               <node concept="37vLTw" id="3Lj6UsgF6MR" role="37wK5m">
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps
index 258b113c..fa7ed997 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps
@@ -2,8 +2,7 @@
 <model ref="r:ea716504-770e-4d8e-a992-900e08e75062(sample.lambdacalc.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
-    <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
   <registry />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
index 9ac3799f..5e2e6ec3 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
@@ -33,11 +33,11 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="0" />
+    <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="11" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -49,11 +49,11 @@
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
-    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
+    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.typesystem2" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.typesystem2" version="3" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
     <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:sample.fooblin" version="0" />
   </languageVersions>
@@ -65,12 +65,14 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" 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" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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" />
-    <module reference="af858d84-85f2-42f4-a854-0b3c6b5cd482(sample.fooblin)" version="0" />
+    <module reference="af858d84-85f2-42f4-a854-0b3c6b5cd482(sample.lambdacalc)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
 </language>