diff --git a/.mps/migration.xml b/.mps/migration.xml
index 6e097ec5..84bccae2 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -3,6 +3,8 @@
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.cleanSrc" value="executed" />
     <entry key="jetbrains.mps.cleanSrc_3.3" value="executed" />
+    <entry key="jetbrains.mps.fixLangVersions" value="executed" />
+    <entry key="jetbrains.mps.fixMig_33_331" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
diff --git a/jchr/languages/jetbrains.mps.jchr/generator/template/main@generator.mps b/jchr/languages/jetbrains.mps.jchr/generator/template/main@generator.mps
index a797976b..d1bee522 100644
--- a/jchr/languages/jetbrains.mps.jchr/generator/template/main@generator.mps
+++ b/jchr/languages/jetbrains.mps.jchr/generator/template/main@generator.mps
@@ -2,13 +2,13 @@
 <model ref="r:e8d74388-7e06-420b-a967-873a2ce54d8c(jetbrains.mps.jchr.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
-    <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="-1" />
-    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="0" />
+    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
index 68fe5d7d..b96b51ca 100644
--- a/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
+++ b/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
@@ -109,7 +109,7 @@
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="2" />
     <language id="0272d3b4-4cc8-481e-9e2f-07793fbfcb41" fqName="jetbrains.mps.lang.editor.table" version="0" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/actions.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/actions.mps
index 6addffc8..0b4f12a9 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/actions.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/actions.mps
@@ -2,9 +2,9 @@
 <model ref="r:7065c38d-5cb9-49bf-ba91-41e993c5a9ca(jetbrains.mps.jchr.actions)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/behavior.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/behavior.mps
index 260089c4..f903b302 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/behavior.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:c2e9552f-aeab-4773-af70-c663afdf96a5(jetbrains.mps.jchr.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/constraints.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/constraints.mps
index f68341d7..2fd92d95 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/constraints.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:88a2eb0e-4ce2-4cb9-bbe9-e96ae2317eec(jetbrains.mps.jchr.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="-1" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/editor.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/editor.mps
index ae1f8c4b..767bd73c 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/editor.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/editor.mps
@@ -2,9 +2,9 @@
 <model ref="r:801c1956-3093-47d7-a245-104463aeabb7(jetbrains.mps.jchr.editor)">
   <persistence version="9" />
   <languages>
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
-    <use id="0272d3b4-4cc8-481e-9e2f-07793fbfcb41" name="jetbrains.mps.lang.editor.table" version="-1" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="0272d3b4-4cc8-481e-9e2f-07793fbfcb41" name="jetbrains.mps.lang.editor.table" version="0" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -1298,7 +1298,7 @@
         <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
       </node>
       <node concept="3F0A7n" id="2KSgAgVcjDN" role="3EZMnx">
-        <ref role="1NtTu8" to="vgt0:2KSgAgVcjDt" resolve="symbolId" />
+        <ref role="1NtTu8" to="vgt0:2KSgAgVcjDt" resolve="expressionId" />
       </node>
       <node concept="3EZMnI" id="2KSgAgVfUe0" role="3EZMnx">
         <node concept="VPM3Z" id="2KSgAgVfUe2" role="3F10Kt">
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/intentions.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/intentions.mps
index 7ca73476..d8240fb9 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/intentions.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/intentions.mps
@@ -2,7 +2,7 @@
 <model ref="r:0032ed59-af46-4ce8-8951-fd874662f370(jetbrains.mps.jchr.intentions)">
   <persistence version="9" />
   <languages>
-    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="-1" />
+    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
index 714acc46..50a95a3a 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
@@ -2,16 +2,16 @@
 <model ref="r:a62ce4c1-5aa4-41dc-927f-d90d1c97111a(jetbrains.mps.jchr.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
-    <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="-1" />
-    <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="-1" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
-    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
-    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
-    <use id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" name="jetbrains.mps.execution.commands" version="-1" />
-    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
+    <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
+    <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" 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="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" name="jetbrains.mps.execution.commands" version="0" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/textGen.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/textGen.mps
index 60274fe9..c20e52b1 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/textGen.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/textGen.mps
@@ -2,7 +2,7 @@
 <model ref="r:5bf067fa-58b6-4b5f-bdcd-180ab9bc9976(jetbrains.mps.jchr.textGen)">
   <persistence version="9" />
   <languages>
-    <use id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" name="jetbrains.mps.lang.textGen" version="-1" />
+    <use id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" name="jetbrains.mps.lang.textGen" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -1234,7 +1234,7 @@
             <node concept="2OqwBi" id="2KSgAgVcpxg" role="lb14g">
               <node concept="117lpO" id="2KSgAgVcpuP" role="2Oq$k0" />
               <node concept="3TrcHB" id="2KSgAgVcpMA" role="2OqNvi">
-                <ref role="3TsBF5" to="vgt0:2KSgAgVcjDt" resolve="symbolId" />
+                <ref role="3TsBF5" to="vgt0:2KSgAgVcjDt" resolve="expressionId" />
               </node>
             </node>
           </node>
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/typesystem.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
index b24a66c4..5231be84 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
@@ -2,8 +2,8 @@
 <model ref="r:0908786d-1897-49e0-bece-5a5d4968324f(jetbrains.mps.jchr.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="-1" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps b/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
index 2655cfc9..2094abed 100644
--- a/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
+++ b/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
@@ -2,8 +2,8 @@
 <model ref="r:5e9b336d-b733-4396-b8ed-a74e3ea504fd(jetbrains.mps.jchr.sandbox)">
   <persistence version="9" />
   <languages>
-    <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="-1" />
-    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
+    <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="0" />
+    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
diff --git a/jchr/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps b/jchr/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
index 73f1d0ae..573204b8 100644
--- a/jchr/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
+++ b/jchr/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
@@ -2,7 +2,7 @@
 <model ref="r:7d0ef000-3cef-4963-bee2-388be23913c0(jetbrains.mps.jchr.sandbox.runner.gcd)">
   <persistence version="9" />
   <languages>
-    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
+    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 825ea4b6..cc3deb23 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -2,10 +2,10 @@
 <model ref="r:727775a3-16ae-4b9f-80a6-9ef3207ffa6a(jetbrains.mps.logic.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
diff --git a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 99cb8c13..92410261 100644
--- a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -121,7 +121,7 @@
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="2" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/actions.mps b/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
index 1fa6a244..be79c8ea 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
@@ -2,7 +2,7 @@
 <model ref="r:3e4db8f0-e5cf-49f3-9145-bc3c865d93ee(jetbrains.mps.logic.actions)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
index e98a40d0..60c9e5d9 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 663a8fab..0b2707bb 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -2,8 +2,8 @@
 <model ref="r:939fd27c-b8ee-4168-a9aa-0b5e37366f76(jetbrains.mps.logic.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="-1" />
-    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
index f4923204..a7a25253 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -2,8 +2,8 @@
 <model ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
index 43a54e76..51507849 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -2,7 +2,7 @@
 <model ref="r:2dd5d115-9996-497e-919a-307116853dd6(jetbrains.mps.logic.intentions)">
   <persistence version="9" />
   <languages>
-    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="-1" />
+    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index b5392fc3..3ae1b107 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:63d079fa-4fab-4468-a2ee-4cf39ac1306b(jetbrains.mps.logic.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index 0f6c369a..2d590b54 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -2,8 +2,8 @@
 <model ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index 87b5478d..133873e4 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -2,8 +2,8 @@
 <model ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps b/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
index cb2c9c15..6d25ca71 100644
--- a/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
+++ b/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
@@ -2,8 +2,8 @@
 <model ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
     <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification()" />
diff --git a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps b/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
index 545c8ef6..d0c96a95 100644
--- a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
+++ b/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
@@ -2,9 +2,9 @@
 <model ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)">
   <persistence version="9" />
   <languages>
-    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -152,7 +152,7 @@
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
diff --git a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps b/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
index 2dbe00db..c191cbce 100644
--- a/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
+++ b/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
@@ -2,11 +2,11 @@
 <model ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)">
   <persistence version="9" />
   <languages>
-    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
-    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
   </languages>
   <imports>
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
index 500943f7..8b8625f5 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
+++ b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
@@ -125,7 +125,7 @@
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
index d2a347d7..28b8a7fb 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
@@ -2,7 +2,7 @@
 <model ref="r:74d684e5-5094-483e-b711-7edd0235f56a(jetbrains.mps.logic.test.logical)">
   <persistence version="9" />
   <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 02a92e4a..bd644860 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -2,9 +2,9 @@
 <model ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)">
   <persistence version="9" />
   <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps
index 4d5c4c84..f463677d 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps
@@ -2,10 +2,10 @@
 <model ref="r:4f7fc196-9a9a-467a-9a63-602ad75de20b(jetbrains.mps.typechecking.annotation.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="-1" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
+    <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index a77c971c..9124bec0 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -31,7 +31,7 @@
         <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
         <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
         <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-        <language id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" fqName="jetbrains.mps.typechecking.annotation" version="-1" />
+        <language id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" fqName="jetbrains.mps.typechecking.annotation" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -72,7 +72,7 @@
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="2" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
index 3c56f7f1..8546073b 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:cef1dda6-3b0f-43e4-8ec9-7f1ff412f529(jetbrains.mps.typechecking.annotation.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
index 0295a748..0faa0df2 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:b3f597cd-d05e-4396-8bd7-d967f5186f88(jetbrains.mps.typechecking.annotation.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="-1" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
index 1e5e9b8b..3dadf17e 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:26262999-7049-47d1-a8fc-8e4617b9cd2d(jetbrains.mps.typechecking.annotation.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
index d47ead77..04212f5f 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
@@ -2,7 +2,7 @@
 <model ref="r:8991efa4-0db2-4f35-8467-4fdbae2564cc(jetbrains.mps.typechecking.annotation.intentions)">
   <persistence version="9" />
   <languages>
-    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="-1" />
+    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps
index bbc67230..d71480dc 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:3bd4fdbc-02ea-466b-b3c8-30ae513cc6b9(jetbrains.mps.typechecking.annotation.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
index a423683b..46baf524 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
@@ -10,10 +10,6 @@
   <imports>
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
-    <import index="xq5w" ref="r:729bada4-05fa-458f-8bf8-28b9cb978726(jetbrains.mps.logic.builtin.var)" />
     <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
   </imports>
   <registry>
@@ -316,27 +312,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd2vr" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd2vt" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd2vv" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd2vx" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd2vz" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd2v_" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd2vB" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd2vD" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd2vF" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd2vH" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6Jyd2vJ" role="3a1Ab0">
@@ -22566,27 +22562,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd4YP" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd4YR" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd4YT" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd4YV" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd4YX" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd4YZ" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd4Z1" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd4Z3" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd4Z5" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd4Z7" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6Jyd4Z9" role="3a1Ab0">
@@ -34399,27 +34395,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd6lv" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd6lx" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd6lz" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd6l_" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd6lB" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd6lD" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd6lF" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd6lH" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd6lJ" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd6lL" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6Jyd6lN" role="3a1Ab0">
@@ -62143,27 +62139,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd9sF" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd9sH" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd9sJ" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd9sL" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd9sN" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd9sP" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd9sR" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd9sT" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jyd9sV" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jyd9sX" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6Jyd9sZ" role="3a1Ab0">
@@ -80292,27 +80288,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6JydbvM" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydbvO" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydbvQ" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydbvS" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydbvU" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydbvW" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydbvY" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydbw0" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jydbw2" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydbw4" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6Jydbw6" role="3a1Ab0">
@@ -91416,27 +91412,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6JydcLn" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydcLp" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydcLr" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydcLt" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydcLv" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydcLx" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydcLz" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydcL_" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6JydcLB" role="3dC3og">
       <node concept="3uibUv" id="6MYr6JydcLD" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6JydcLF" role="3a1Ab0">
@@ -111740,27 +111736,27 @@
     </node>
     <node concept="3dC9aW" id="6MYr6Jydf32" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydf34" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="EqualsSolver" />
+        <ref role="3uigEE" to="95zw:3HJTsBn4mEA" resolve="JchrEqualsSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jydf36" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydf38" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="ExpressionSolver" />
+        <ref role="3uigEE" to="95zw:2KSgAgVhoMB" resolve="JchrExpressionSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jydf3a" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydf3c" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="LogicalSolver" />
+        <ref role="3uigEE" to="95zw:60B5zVEZP8W" resolve="JchrLogicalSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jydf3e" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydf3g" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="UnificationSolver" />
+        <ref role="3uigEE" to="95zw:6njqcfQVO0n" resolve="JchrUnificationSolver" />
       </node>
     </node>
     <node concept="3dC9aW" id="6MYr6Jydf3i" role="3dC3og">
       <node concept="3uibUv" id="6MYr6Jydf3k" role="3dC9yF">
-        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="AssertSolver" />
+        <ref role="3uigEE" to="95zw:6infEALA98Q" resolve="JchrAssertSolver" />
       </node>
     </node>
     <node concept="3a1Aqs" id="6MYr6Jydf3m" role="3a1Ab0">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
index 7f98fbae..c1378938 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
@@ -2,9 +2,9 @@
 <model ref="r:a2b9c5e8-1c86-4372-9a3f-35db5f00994a(jetbrains.mps.lang.typesystem2.samplechecker.test.type)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="-1" />
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
-    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
index 4f3fd770..50c74161 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
@@ -2,17 +2,17 @@
 <model ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.lang.typesystem2.samplechecker.template)">
   <persistence version="9" />
   <languages>
-    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="-1" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
index 1db42b91..6c6067ed 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
@@ -47,7 +47,7 @@
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="7fa12e9c-b949-4976-b4fa-19accbc320b4" fqName="jetbrains.mps.lang.dataFlow" version="0" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="2" />
     <language id="64d34fcd-ad02-4e73-aff8-a581124c2e30" fqName="jetbrains.mps.lang.findUsages" version="0" />
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 30ecb082..2e15fd45 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -2,15 +2,15 @@
 <model ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
-    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
-    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
+    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 04a89374..71c45ce7 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -2,11 +2,11 @@
 <model ref="r:c0702ee3-be79-48ac-aa39-b7cd0d895de6(jetbrains.mps.lang.typesystem2.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="-1" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 0929000f..16576fc0 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -121,7 +121,7 @@
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" fqName="jetbrains.mps.lang.constraints" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="1" />
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="2" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
index 322afd21..2fa56e29 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
@@ -2,8 +2,8 @@
 <model ref="r:04847532-40d8-4c13-804f-12fbbdc25fa9(jetbrains.mps.lang.typesystem2.actions)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="-1" />
-    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="0" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -18,8 +18,8 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -794,7 +794,7 @@
     <node concept="3FOIzC" id="2N2MQGCIMbf" role="3FOPby">
       <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
       <node concept="tYCnQ" id="2N2MQGCIMsI" role="tZc4B">
-        <ref role="uz4UX" to="wq2x:2CEQDIDRX6M" resolve="TypeTerm" />
+        <ref role="uz4UX" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
         <node concept="uMFAO" id="2N2MQGCIMsK" role="uz6Si">
           <node concept="3Tqbb2" id="2N2MQGCJ4jR" role="uMOYW">
             <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
@@ -805,12 +805,12 @@
                 <node concept="3cpWsn" id="2CEQDIDTvVK" role="3cpWs9">
                   <property role="TrG5h" value="term" />
                   <node concept="3Tqbb2" id="2CEQDIDTvVH" role="1tU5fm">
-                    <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTerm" />
+                    <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
                   </node>
                   <node concept="2ShNRf" id="2CEQDIDTvVL" role="33vP2m">
                     <node concept="2fJWfE" id="2CEQDIDTvVM" role="2ShVmc">
                       <node concept="3Tqbb2" id="2CEQDIDTvVN" role="3zrR0E">
-                        <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTerm" />
+                        <ref role="ehGHo" to="wq2x:2CEQDIDRX6M" resolve="TypeTermExpression" />
                       </node>
                     </node>
                   </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 65ba7f6b..4b496ce6 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 10322996..ff770543 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -2,10 +2,10 @@
 <model ref="r:81151157-4aa6-41ac-acda-128bb1020041(jetbrains.mps.lang.typesystem2.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="-1" />
-    <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="-1" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 1e0d61b8..10bd1c25 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -2,8 +2,8 @@
 <model ref="r:3345f3eb-f61a-42bd-88eb-d9032a80e9a6(jetbrains.mps.lang.typesystem2.editor)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 09bd19f4..05c4bb50 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index 40f4f26e..6041e6a0 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:6a6b9246-6407-4ef2-8408-df149f70bcd9(jetbrains.mps.lang.typesystem2.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="894463aa-8754-49c0-bf4b-6a32af66b376" name="jetbrains.mps.jchr" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />