diff --git a/samples/lambdacalc/.mps/migration.xml b/samples/lambdacalc/.mps/migration.xml
index 4a354136..3f55b4af 100644
--- a/samples/lambdacalc/.mps/migration.xml
+++ b/samples/lambdacalc/.mps/migration.xml
@@ -3,6 +3,8 @@
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.cleanExp_3.4" 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" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
   </component>
 </project>
\ No newline at end of file
diff --git a/samples/lambdacalc/.mps/misc.xml b/samples/lambdacalc/.mps/misc.xml
index 5580139f..8e3bf350 100644
--- a/samples/lambdacalc/.mps/misc.xml
+++ b/samples/lambdacalc/.mps/misc.xml
@@ -3,14 +3,4 @@
   <component name="MPSFavoritesManager">
     <option name="keepMe" value="true" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/behavior.mps b/samples/lambdacalc/languages/sample.fooblin/models/behavior.mps
index 73a83abc..2752f247 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/behavior.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.fooblin.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -149,8 +149,8 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@@ -295,10 +295,12 @@
                       <node concept="2OqwBi" id="4rRw8_AuDnV" role="37vLTx">
                         <node concept="2OqwBi" id="4rRw8_AuDnW" role="2Oq$k0">
                           <node concept="1PxgMI" id="4rRw8_AuDnX" role="2Oq$k0">
-                            <ref role="1m5ApE" to="8tt8:7_8aRkgDGQf" resolve="Abs" />
                             <node concept="37vLTw" id="4rRw8_AuDnY" role="1m5AlR">
                               <ref role="3cqZAo" node="4rRw8_AuAJD" resolve="binder" />
                             </node>
+                            <node concept="chp4Y" id="4i_CItPT6Qo" role="3oSUPX">
+                              <ref role="cht4Q" to="8tt8:7_8aRkgDGQf" resolve="Abs" />
+                            </node>
                           </node>
                           <node concept="3TrEf2" id="4rRw8_AuDnZ" role="2OqNvi">
                             <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQg" resolve="bind" />
@@ -330,10 +332,12 @@
                       <node concept="2OqwBi" id="6ydDNpmN6Ue" role="37vLTx">
                         <node concept="2OqwBi" id="6ydDNpmN6Uf" role="2Oq$k0">
                           <node concept="1PxgMI" id="6ydDNpmN6Ug" role="2Oq$k0">
-                            <ref role="1m5ApE" to="8tt8:7_8aRkgDGQo" resolve="LetExpr" />
                             <node concept="37vLTw" id="6ydDNpmN6Uh" role="1m5AlR">
                               <ref role="3cqZAo" node="4rRw8_AuAJD" resolve="binder" />
                             </node>
+                            <node concept="chp4Y" id="4i_CItPT6Ql" role="3oSUPX">
+                              <ref role="cht4Q" to="8tt8:7_8aRkgDGQo" resolve="LetExpr" />
+                            </node>
                           </node>
                           <node concept="3TrEf2" id="6ydDNpmN7zR" role="2OqNvi">
                             <ref role="3Tt5mk" to="8tt8:7_8aRkgDGQv" resolve="bind" />
@@ -382,10 +386,12 @@
                       <node concept="TSZUe" id="6ydDNpmNfGj" role="2OqNvi">
                         <node concept="2OqwBi" id="6ydDNpmNfGm" role="25WWJ7">
                           <node concept="1PxgMI" id="6ydDNpmNfGn" role="2Oq$k0">
-                            <ref role="1m5ApE" to="8tt8:7_8aRkgDHAe" resolve="LetClause" />
                             <node concept="37vLTw" id="6ydDNpmNfGo" role="1m5AlR">
                               <ref role="3cqZAo" node="4rRw8_AuAJD" resolve="binder" />
                             </node>
+                            <node concept="chp4Y" id="4i_CItPT6Qn" role="3oSUPX">
+                              <ref role="cht4Q" to="8tt8:7_8aRkgDHAe" resolve="LetClause" />
+                            </node>
                           </node>
                           <node concept="3TrEf2" id="6ydDNpmNhjU" role="2OqNvi">
                             <ref role="3Tt5mk" to="8tt8:7_8aRkgDHAf" resolve="var" />
@@ -568,10 +574,12 @@
                   <node concept="TSZUe" id="6ydDNpmNLsL" role="2OqNvi">
                     <node concept="2OqwBi" id="6ydDNpmNLsM" role="25WWJ7">
                       <node concept="1PxgMI" id="6ydDNpmNLsN" role="2Oq$k0">
-                        <ref role="1m5ApE" to="8tt8:7_8aRkgDHAe" resolve="LetClause" />
                         <node concept="37vLTw" id="6ydDNpmNM0d" role="1m5AlR">
                           <ref role="3cqZAo" node="6ydDNpmNLrk" resolve="clause" />
                         </node>
+                        <node concept="chp4Y" id="4i_CItPT6Qm" role="3oSUPX">
+                          <ref role="cht4Q" to="8tt8:7_8aRkgDHAe" resolve="LetClause" />
+                        </node>
                       </node>
                       <node concept="3TrEf2" id="6ydDNpmNLsP" role="2OqNvi">
                         <ref role="3Tt5mk" to="8tt8:7_8aRkgDHAf" resolve="var" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/constraints.mps b/samples/lambdacalc/languages/sample.fooblin/models/constraints.mps
index 5baf87f5..3987c9a2 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/constraints.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:49af371c-e432-4e5a-a3df-e689ebe20a8d(sample.fooblin.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <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)" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/editor.mps b/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
index b071735c..99e30c64 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a4cbccba-ea60-4d22-9e76-4b461414bf5b(sample.fooblin.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/types.mps b/samples/lambdacalc/languages/sample.fooblin/models/types.mps
index f3f65438..877387b0 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/types.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/types.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.fooblin" 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" />
@@ -18,7 +18,6 @@
     <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="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)" />
     <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.fooblin.types)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl b/samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl
index c0185a92..6b34eb86 100644
--- a/samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl
+++ b/samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl
@@ -14,13 +14,8 @@
         </modelRoot>
       </models>
       <external-templates />
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-        <usedDevKit>a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)</usedDevKit>
-      </usedDevKits>
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -32,7 +27,7 @@
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" 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="4" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:sample.fooblin" version="-1" />
       </languageVersions>
@@ -58,11 +53,8 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -74,26 +66,25 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <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="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
     <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:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
     <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" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:86ef8290-12bb-4ca7-947f-093788f263a9:jetbrains.mps.lang.project" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <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="4" />
+    <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:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />