diff --git a/build.xml b/build.xml
index 38ea90ad..6323f842 100644
--- a/build.xml
+++ b/build.xml
@@ -4425,7 +4425,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
@@ -4499,7 +4498,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
@@ -4617,7 +4615,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
@@ -4667,7 +4664,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
@@ -5065,7 +5061,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
@@ -5131,7 +5126,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
@@ -5362,7 +5356,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index c933df54..92020813 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -2,13 +2,13 @@
 <model ref="r:c0702ee3-be79-48ac-aa39-b7cd0d895de6(jetbrains.mps.lang.coderules.generator.template.main@generator)">
   <persistence version="9" />
   <languages>
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="3" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
+    <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="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
@@ -16,7 +16,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="3" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -528,13 +528,6 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="4705942098322609812" name="jetbrains.mps.lang.smodel.structure.EnumMember_IsOperation" flags="ng" index="21noJN">
-        <child id="4705942098322609813" name="member" index="21noJM" />
-      </concept>
-      <concept id="4705942098322467729" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="ng" index="21nZrQ">
-        <reference id="4705942098322467736" name="decl" index="21nZrZ" />
-      </concept>
-      <concept id="1966870290083281362" name="jetbrains.mps.lang.smodel.structure.EnumMember_NameOperation" flags="ng" index="24Tkf9" />
       <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -552,6 +545,9 @@
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="1138676077309" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="nn" index="uoxfO">
+        <reference id="1138676095763" name="enumMember" index="uo_Cq" />
+      </concept>
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -600,6 +596,9 @@
         <child id="6039268229364358388" name="body" index="1pnPq1" />
         <child id="6039268229364358387" name="concept" index="1pnPq6" />
       </concept>
+      <concept id="1146171026731" name="jetbrains.mps.lang.smodel.structure.Property_HasValue_Enum" flags="nn" index="3t7uKx">
+        <child id="1146171026732" name="value" index="3t7uKA" />
+      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@@ -1484,7 +1483,7 @@
   </node>
   <node concept="1pmfR0" id="4vbeH84AvBw">
     <property role="TrG5h" value="init_tracking" />
-    <property role="1v3f2W" value="hpv1Zf2/pre_processing" />
+    <property role="1v3f2W" value="pre_processing" />
     <node concept="1pplIY" id="4vbeH84AvBx" role="1pqMTA">
       <node concept="3clFbS" id="4vbeH84AvBy" role="2VODD2">
         <node concept="3clFbF" id="5HGqmA_DfxW" role="3cqZAp">
@@ -2251,13 +2250,10 @@
                         <node concept="3zFVjK" id="4jcOV4hxRwL" role="3zH0cK">
                           <node concept="3clFbS" id="4jcOV4hxRwM" role="2VODD2">
                             <node concept="3clFbF" id="4jcOV4hxTS4" role="3cqZAp">
-                              <node concept="2OqwBi" id="2Hyoxv0dRG" role="3clFbG">
-                                <node concept="24Tkf9" id="2Hyoxv0dRI" role="2OqNvi" />
-                                <node concept="2OqwBi" id="4jcOV4hxU8e" role="2Oq$k0">
-                                  <node concept="30H73N" id="4jcOV4hxTS3" role="2Oq$k0" />
-                                  <node concept="3TrcHB" id="4jcOV4hxUmI" role="2OqNvi">
-                                    <ref role="3TsBF5" to="wq2x:2Hyoxv0dL8" resolve="severity" />
-                                  </node>
+                              <node concept="2OqwBi" id="4jcOV4hxU8e" role="3clFbG">
+                                <node concept="30H73N" id="4jcOV4hxTS3" role="2Oq$k0" />
+                                <node concept="3TrcHB" id="4jcOV4hxUmI" role="2OqNvi">
+                                  <ref role="3TsBF5" to="wq2x:4jcOV4hu0nK" resolve="severity" />
                                 </node>
                               </node>
                             </node>
@@ -2934,7 +2930,7 @@
   </node>
   <node concept="1pmfR0" id="4vbeH84MZvs">
     <property role="TrG5h" value="localvars_make_unique" />
-    <property role="1v3f2W" value="hpv1Zf2/pre_processing" />
+    <property role="1v3f2W" value="pre_processing" />
     <property role="1v3jST" value="true" />
     <node concept="1pplIY" id="4vbeH84MZvt" role="1pqMTA">
       <node concept="3clFbS" id="4vbeH84MZvu" role="2VODD2">
@@ -7267,7 +7263,7 @@
         </node>
         <node concept="j$LIH" id="36tQV5AEsNn" role="14YRTM">
           <node concept="1lLz0L" id="36tQV5AEsNo" role="1lHHLF">
-            <property role="1lMjX7" value="h1lM37o/error" />
+            <property role="1lMjX7" value="error" />
             <property role="1lLB17" value="no tag" />
           </node>
         </node>
@@ -7298,7 +7294,7 @@
     </node>
     <node concept="j$LIH" id="3KXGt7WGOUn" role="jxRDz">
       <node concept="1lLz0L" id="3KXGt7WGP8R" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="no tag" />
       </node>
     </node>
@@ -7656,7 +7652,7 @@
     </node>
     <node concept="j$LIH" id="75vUFrSv90i" role="jxRDz">
       <node concept="1lLz0L" id="75vUFrSv90j" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -7809,7 +7805,7 @@
     </node>
     <node concept="j$LIH" id="75vUFrSLxmr" role="jxRDz">
       <node concept="1lLz0L" id="75vUFrSLxt0" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -7989,7 +7985,7 @@
     </node>
     <node concept="j$LIH" id="36tQV5AGAZ_" role="jxRDz">
       <node concept="1lLz0L" id="36tQV5AGBeY" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -8333,7 +8329,7 @@
     </node>
     <node concept="j$LIH" id="452KZTbs$C7" role="jxRDz">
       <node concept="1lLz0L" id="452KZTbs$C8" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -8479,7 +8475,7 @@
     </node>
     <node concept="j$LIH" id="452KZTbxEHc" role="jxRDz">
       <node concept="1lLz0L" id="452KZTbxEHd" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -8735,7 +8731,7 @@
     </node>
     <node concept="j$LIH" id="452KZTbxZdN" role="jxRDz">
       <node concept="1lLz0L" id="452KZTbxZdO" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -8831,7 +8827,7 @@
     </node>
     <node concept="j$LIH" id="1sCZQVfjxvr" role="jxRDz">
       <node concept="1lLz0L" id="1sCZQVfjxvs" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -8905,12 +8901,12 @@
     </node>
     <node concept="j$LIH" id="37pq54QuGuf" role="jxRDz">
       <node concept="1lLz0L" id="37pq54QuGui" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="unsupported concept" />
       </node>
     </node>
     <node concept="1lLz0L" id="37pq54QuGuk" role="28wCFW">
-      <property role="1lMjX7" value="h1lM37o/error" />
+      <property role="1lMjX7" value="error" />
       <property role="1lLB17" value="expression type is null" />
     </node>
   </node>
@@ -8998,7 +8994,7 @@
     </node>
     <node concept="j$LIH" id="65DJywF5lSX" role="jxRDz">
       <node concept="1lLz0L" id="65DJywF5lT9" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -9335,7 +9331,7 @@
     </node>
     <node concept="j$LIH" id="18kNIl0VRBi" role="jxRDz">
       <node concept="1lLz0L" id="18kNIl0VS4G" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="cannot be used in this context" />
       </node>
     </node>
@@ -9690,7 +9686,7 @@
     </node>
     <node concept="j$LIH" id="7IysFeABCo5" role="jxRDz">
       <node concept="1lLz0L" id="7IysFeABCo6" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -9787,7 +9783,7 @@
     </node>
     <node concept="j$LIH" id="1L74NXExvrD" role="jxRDz">
       <node concept="1lLz0L" id="1L74NXExvss" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -9890,7 +9886,7 @@
     </node>
     <node concept="j$LIH" id="1L74NXE_F1j" role="jxRDz">
       <node concept="1lLz0L" id="1L74NXE_F1k" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -11011,7 +11007,7 @@
     </node>
     <node concept="j$LIH" id="4KRwoemrAVq" role="jxRDz">
       <node concept="1lLz0L" id="4KRwoemrAVr" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -11384,7 +11380,7 @@
     </node>
     <node concept="j$LIH" id="20Ay2VewAbF" role="jxRDz">
       <node concept="1lLz0L" id="20Ay2VewAod" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -11531,7 +11527,7 @@
     </node>
     <node concept="j$LIH" id="7kTeLbPxOdr" role="jxRDz">
       <node concept="1lLz0L" id="7kTeLbPxOxM" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
@@ -12505,7 +12501,7 @@
     </node>
     <node concept="j$LIH" id="7kTeLbP$6sO" role="jxRDz">
       <node concept="1lLz0L" id="7kTeLbP$6sP" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="cannot be used in this context" />
       </node>
     </node>
@@ -15785,12 +15781,12 @@
                   <node concept="2OqwBi" id="1FOQehwoZ9C" role="2Oq$k0">
                     <node concept="30H73N" id="1FOQehwoYWn" role="2Oq$k0" />
                     <node concept="3TrcHB" id="1FOQehwoZIb" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:2Hyoxv0dL6" resolve="kind" />
+                      <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
                     </node>
                   </node>
-                  <node concept="21noJN" id="2Hyoxv0dRJ" role="2OqNvi">
-                    <node concept="21nZrQ" id="2Hyoxv0dRK" role="21noJM">
-                      <ref role="21nZrZ" to="wq2x:2Hyoxv0dJ2" resolve="info" />
+                  <node concept="3t7uKx" id="1FOQehwp18E" role="2OqNvi">
+                    <node concept="uoxfO" id="1FOQehwp18G" role="3t7uKA">
+                      <ref role="uo_Cq" to="wq2x:oI9Ys1lFi" />
                     </node>
                   </node>
                 </node>
@@ -15812,12 +15808,12 @@
                   <node concept="2OqwBi" id="1FOQehwp1Lm" role="2Oq$k0">
                     <node concept="30H73N" id="1FOQehwp1Ln" role="2Oq$k0" />
                     <node concept="3TrcHB" id="1FOQehwp1Lo" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:2Hyoxv0dL6" resolve="kind" />
+                      <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
                     </node>
                   </node>
-                  <node concept="21noJN" id="2Hyoxv0dRL" role="2OqNvi">
-                    <node concept="21nZrQ" id="2Hyoxv0dRM" role="21noJM">
-                      <ref role="21nZrZ" to="wq2x:2Hyoxv0dJ3" resolve="warning" />
+                  <node concept="3t7uKx" id="1FOQehwp1Lp" role="2OqNvi">
+                    <node concept="uoxfO" id="1FOQehwp1Lq" role="3t7uKA">
+                      <ref role="uo_Cq" to="wq2x:oI9Ys1lFj" />
                     </node>
                   </node>
                 </node>
@@ -15839,12 +15835,12 @@
                   <node concept="2OqwBi" id="1FOQehwp2dK" role="2Oq$k0">
                     <node concept="30H73N" id="1FOQehwp2dL" role="2Oq$k0" />
                     <node concept="3TrcHB" id="1FOQehwp2dM" role="2OqNvi">
-                      <ref role="3TsBF5" to="wq2x:2Hyoxv0dL6" resolve="kind" />
+                      <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
                     </node>
                   </node>
-                  <node concept="21noJN" id="2Hyoxv0dRN" role="2OqNvi">
-                    <node concept="21nZrQ" id="2Hyoxv0dRO" role="21noJM">
-                      <ref role="21nZrZ" to="wq2x:2Hyoxv0dJ4" resolve="error" />
+                  <node concept="3t7uKx" id="1FOQehwp2dN" role="2OqNvi">
+                    <node concept="uoxfO" id="1FOQehwp2dO" role="3t7uKA">
+                      <ref role="uo_Cq" to="wq2x:oI9Ys1lFm" />
                     </node>
                   </node>
                 </node>
@@ -15860,7 +15856,7 @@
         </node>
         <node concept="j$LIH" id="1FOQehwp3v1" role="14YRTM">
           <node concept="1lLz0L" id="1FOQehwp3DE" role="1lHHLF">
-            <property role="1lMjX7" value="h1lM37o/error" />
+            <property role="1lMjX7" value="error" />
             <property role="1lLB17" value="unsupported report kind" />
           </node>
         </node>
@@ -15868,7 +15864,7 @@
     </node>
     <node concept="j$LIH" id="1FOQehwp307" role="jxRDz">
       <node concept="1lLz0L" id="1FOQehwp3aL" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid switch usage" />
       </node>
     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index cdc543b3..e0a12992 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -35,19 +35,19 @@
         <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:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
         <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
         <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
       </languageVersions>
@@ -61,7 +61,6 @@
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
         <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
@@ -71,7 +70,6 @@
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)" version="0" />
-        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
@@ -116,32 +114,32 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <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="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
-    <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
+    <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
     <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 75a5de3a..b5492e71 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -2,10 +2,10 @@
 <model ref="r:81151157-4aa6-41ac-acda-128bb1020041(jetbrains.mps.lang.coderules.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" 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" />
     <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="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 3bde8005..b52636f0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <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="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -425,10 +425,11 @@
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
-      <concept id="1966870290088668520" name="jetbrains.mps.lang.smodel.structure.Enum_MembersOperation" flags="ng" index="2ViDtN" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1143512015885" name="jetbrains.mps.lang.smodel.structure.Node_GetNextSiblingOperation" flags="nn" index="YCak7" />
+      <concept id="1240171359678" name="jetbrains.mps.lang.smodel.structure.EnumMember_ValueOperation" flags="nn" index="2ZYiMu" />
+      <concept id="1240173327827" name="jetbrains.mps.lang.smodel.structure.EnumMember_NameOperation" flags="nn" index="305NjN" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -454,6 +455,14 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
+      <concept id="1240930118027" name="jetbrains.mps.lang.smodel.structure.SEnumOperationInvocation" flags="nn" index="3HcIyF">
+        <reference id="1240930118028" name="enumDeclaration" index="3HcIyG" />
+        <child id="1240930317927" name="operation" index="3Hdvt7" />
+      </concept>
+      <concept id="1240930444812" name="jetbrains.mps.lang.smodel.structure.SEnum_MemberForNameOperation" flags="ng" index="3HdYsG">
+        <child id="1240930444813" name="nameExpression" index="3HdYsH" />
+      </concept>
+      <concept id="1240930444980" name="jetbrains.mps.lang.smodel.structure.SEnum_MembersOperation" flags="ng" index="3HdYuk" />
       <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
         <child id="1140131861877" name="replacementNode" index="1P9ThW" />
       </concept>
@@ -469,13 +478,6 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
-      <concept id="5779574625832942190" name="jetbrains.mps.lang.smodel.structure.Enum_FromPresentationOperation" flags="ng" index="1X_LrI">
-        <child id="7305791986891524236" name="presentationExpression" index="3gWYIm" />
-      </concept>
-      <concept id="5779574625832259537" name="jetbrains.mps.lang.smodel.structure.EnumMember_PresentationOperation" flags="ng" index="1XCIdh" />
-      <concept id="5779574625830813396" name="jetbrains.mps.lang.smodel.structure.EnumerationIdRefExpression" flags="ng" index="1XH99k">
-        <reference id="5779574625830813397" name="enumDeclaration" index="1XH99l" />
-      </concept>
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -1021,13 +1023,13 @@
     <node concept="14StLt" id="6p0DfM0qaop" role="V601i">
       <property role="TrG5h" value="DefaultBackground" />
       <node concept="30gYXW" id="6p0DfM0qaoq" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="6p0DfM0qaor" role="VblUZ">
           <property role="1iTho6" value="FFFFFF" />
         </node>
       </node>
       <node concept="Veino" id="6p0DfM0qaos" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="6p0DfM0qaot" role="VblUZ">
           <property role="1iTho6" value="FFFFFF" />
         </node>
@@ -1036,13 +1038,13 @@
     <node concept="14StLt" id="6p0DfM0fyq3" role="V601i">
       <property role="TrG5h" value="EmitStatement" />
       <node concept="30gYXW" id="5lJXKGbJw" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="5lJXKGbJy" role="VblUZ">
           <property role="1iTho6" value="EEFFFF" />
         </node>
       </node>
       <node concept="Veino" id="5lJXKGvHt" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="5lJXKGvHv" role="VblUZ">
           <property role="1iTho6" value="EEFFFF" />
         </node>
@@ -1051,13 +1053,13 @@
     <node concept="14StLt" id="6p0DfM0hll6" role="V601i">
       <property role="TrG5h" value="EmitStatementCode" />
       <node concept="30gYXW" id="6p0DfM0hll7" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="6p0DfM0hll8" role="VblUZ">
           <property role="1iTho6" value="F9F9FF" />
         </node>
       </node>
       <node concept="Veino" id="6p0DfM0hll9" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="6p0DfM0hlla" role="VblUZ">
           <property role="1iTho6" value="F9F9FF" />
         </node>
@@ -1080,10 +1082,10 @@
         </node>
       </node>
       <node concept="Vb9p2" id="7ksQUDZqpsH" role="3F10Kt">
-        <property role="Vbekb" value="g1_kEg4/ITALIC" />
+        <property role="Vbekb" value="ITALIC" />
       </node>
       <node concept="VQ3r3" id="7km57PkbRWe" role="3F10Kt">
-        <property role="2USNnj" value="gtbM8PH/underlined" />
+        <property role="2USNnj" value="2" />
       </node>
     </node>
     <node concept="14StLt" id="7ksQUDZpyGq" role="V601i">
@@ -1149,10 +1151,10 @@
         </node>
       </node>
       <node concept="Vb9p2" id="4bWqD4C9dB8" role="3F10Kt">
-        <property role="Vbekb" value="g1_kEg4/ITALIC" />
+        <property role="Vbekb" value="ITALIC" />
       </node>
       <node concept="VQ3r3" id="4bWqD4C9dB9" role="3F10Kt">
-        <property role="2USNnj" value="gtbM8PH/underlined" />
+        <property role="2USNnj" value="2" />
       </node>
     </node>
     <node concept="14StLt" id="4bWqD4C4CM3" role="V601i">
@@ -1270,7 +1272,7 @@
     <property role="TrG5h" value="RuleInput_ActionMap" />
     <ref role="1h_SK9" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
     <node concept="1hA7zw" id="12yN8DyB6zo" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="12yN8DyB6zp" role="1hA7z_">
         <node concept="3clFbS" id="12yN8DyB6zq" role="2VODD2">
           <node concept="3clFbF" id="12yN8DyB6zz" role="3cqZAp">
@@ -1451,7 +1453,7 @@
           <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
         </node>
         <node concept="3F1sOY" id="4EfgX2EvGGa" role="3EZMnx">
-          <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
+          <property role="1cu_pB" value="2" />
           <ref role="1NtTu8" to="wq2x:4EfgX2EvGcc" resolve="expression" />
         </node>
         <node concept="VPM3Z" id="oI9YrmS7F" role="3F10Kt">
@@ -1520,7 +1522,7 @@
           </node>
         </node>
         <node concept="Vb9p2" id="5zfvpQ72h8d" role="3F10Kt">
-          <property role="Vbekb" value="g1_k_vY/BOLD" />
+          <property role="Vbekb" value="BOLD" />
         </node>
       </node>
       <node concept="3EZMnI" id="5zfvpQ71CIP" role="3EZMnx">
@@ -1660,7 +1662,7 @@
     <property role="TrG5h" value="Comment_Actions" />
     <ref role="1h_SK9" to="wq2x:1CgWc1Tyjkw" resolve="Comment" />
     <node concept="1hA7zw" id="5bC6UNlwTHx" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="5bC6UNlwTHy" role="1hA7z_">
         <node concept="3clFbS" id="5bC6UNlwTHz" role="2VODD2">
           <node concept="3clFbF" id="5bC6UNlwTHG" role="3cqZAp">
@@ -1767,7 +1769,7 @@
         <ref role="1NtTu8" to="wq2x:6DOfTm$zUE3" resolve="input" />
       </node>
       <node concept="3F2HdR" id="7IysFeA0yd6" role="3EZMnx">
-        <property role="Q2I2d" value="g$1Qtxb/punctuation" />
+        <property role="Q2I2d" value="punctuation" />
         <property role="2czwfO" value=" " />
         <ref role="1NtTu8" to="wq2x:7IysFeA0yca" resolve="parameter" />
         <node concept="l2Vlx" id="7IysFeA0yd8" role="2czzBx" />
@@ -1786,7 +1788,7 @@
           <property role="3F0ifm" value="no parameters" />
           <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
           <node concept="Vb9p2" id="7Xmdqtdys5T" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
+            <property role="Vbekb" value="BOLD" />
           </node>
         </node>
       </node>
@@ -2293,7 +2295,7 @@
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
         <ref role="1k5W1q" to="qgy9:1iWwVK2B1it" resolve="Logical" />
         <node concept="Vb9p2" id="7XmdqtdDfDo" role="3F10Kt">
-          <property role="Vbekb" value="g1_kEg4/ITALIC" />
+          <property role="Vbekb" value="ITALIC" />
         </node>
       </node>
       <node concept="l2Vlx" id="7IysFeA99pr" role="2iSdaV" />
@@ -2398,7 +2400,7 @@
     <node concept="3EZMnI" id="1L74NXEmFMy" role="2wV5jI">
       <node concept="3F2HdR" id="1L74NXEmFY1" role="3EZMnx">
         <property role="2czwfO" value="," />
-        <property role="Q2I2d" value="g$1Qtxb/punctuation" />
+        <property role="Q2I2d" value="punctuation" />
         <ref role="1NtTu8" to="wq2x:1L74NXEmFJV" resolve="binding" />
         <node concept="l2Vlx" id="1L74NXEmFY2" role="2czzBx" />
         <node concept="3F0ifn" id="1L74NXEmFY3" role="2czzBI">
@@ -2462,10 +2464,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jmeh1" role="IW6Ez">
       <node concept="3cWJ9i" id="7lt0LtPgBg6" role="1Qtc8$">
         <node concept="CtIbL" id="7lt0LtPgBg8" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="7lt0LtPhpr0" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="aenpk" id="4nIWweBLxJX" role="1Qtc8A">
@@ -2500,7 +2502,7 @@
                   <node concept="1OKiuA" id="4hPXq9Jmeht" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9Jmehu" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9Jmehv" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9Jmehw" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -2579,7 +2581,7 @@
                   <node concept="1OKiuA" id="4nIWweBH1SO" role="2OqNvi">
                     <node concept="1Q80Hx" id="4nIWweBH1SP" role="lBI5i" />
                     <node concept="2B6iha" id="4nIWweBH1SQ" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4nIWweBH1SR" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -2606,7 +2608,7 @@
     <node concept="1Qtc8_" id="4aJUH_hTlaK" role="IW6Ez">
       <node concept="3cWJ9i" id="4aJUH_hTlaL" role="1Qtc8$">
         <node concept="CtIbL" id="4aJUH_hTlaM" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="4aJUH_hTlaN" role="1Qtc8A">
@@ -2657,10 +2659,10 @@
     <node concept="1Qtc8_" id="4hPXq9JmeiV" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9JmeiW" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9JmeiX" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9JmeiY" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9JmeiZ" role="1Qtc8A" />
@@ -2668,7 +2670,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jmej2" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jmej0" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jmej1" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="aenpk" id="4hPXq9Jmej4" role="1Qtc8A">
@@ -2716,7 +2718,7 @@
                   <node concept="1OKiuA" id="4hPXq9Jmejw" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9Jmejx" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9Jmejy" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9Jmejz" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -2739,10 +2741,10 @@
     <node concept="1Qtc8_" id="4hPXq9JmejD" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9JmejE" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9JmejF" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9JmejG" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9JmejH" role="1Qtc8A" />
@@ -2750,7 +2752,7 @@
     <node concept="1Qtc8_" id="4hPXq9JmejK" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9JmejI" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9JmejJ" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="aenpk" id="4hPXq9JmejM" role="1Qtc8A">
@@ -2798,7 +2800,7 @@
                   <node concept="1OKiuA" id="4hPXq9Jmeke" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9Jmekf" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9Jmekg" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9Jmekh" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -2817,10 +2819,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jmekm" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jmekn" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jmeko" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9Jmekp" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9Jmekq" role="1Qtc8A" />
@@ -2828,7 +2830,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jmekt" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jmekr" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jmeks" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="aenpk" id="4hPXq9Jmekv" role="1Qtc8A">
@@ -2876,7 +2878,7 @@
                   <node concept="1OKiuA" id="4hPXq9JmekV" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9JmekW" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9JmekX" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9JmekY" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -2950,7 +2952,7 @@
                   <node concept="1OKiuA" id="4hPXq9Jmeny" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9Jmenz" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9Jmen$" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9Jmen_" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -3136,7 +3138,7 @@
                 <node concept="1OKiuA" id="4hPXq9Jmeua" role="2OqNvi">
                   <node concept="1Q80Hx" id="4hPXq9Jmeub" role="lBI5i" />
                   <node concept="2B6iha" id="4hPXq9Jmeuc" role="lGT1i">
-                    <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                    <property role="1lyBwo" value="mostRelevant" />
                   </node>
                   <node concept="3cmrfG" id="4hPXq9Jmeud" role="3dN3m$">
                     <property role="3cmrfH" value="-1" />
@@ -3188,7 +3190,7 @@
           </node>
         </node>
         <node concept="Vb9p2" id="6DOfTm$8sUZ" role="3F10Kt">
-          <property role="Vbekb" value="g1_tSyq/BOLD_ITALIC" />
+          <property role="Vbekb" value="BOLD_ITALIC" />
         </node>
       </node>
       <node concept="3F0ifn" id="5hSMZ_lrdys" role="3EZMnx">
@@ -3472,7 +3474,7 @@
       </node>
       <node concept="3cWJ9i" id="4aJUH_hSgot" role="1Qtc8$">
         <node concept="CtIbL" id="4aJUH_hSgov" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -3524,7 +3526,7 @@
       </node>
       <node concept="3cWJ9i" id="7XmdqtdBcyx" role="1Qtc8$">
         <node concept="CtIbL" id="7XmdqtdBcyz" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -3632,7 +3634,7 @@
     <node concept="1Qtc8_" id="5f6wxQ38FK6" role="IW6Ez">
       <node concept="3cWJ9i" id="5f6wxQ38FKa" role="1Qtc8$">
         <node concept="CtIbL" id="5f6wxQ38FKc" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="5f6wxQ38FKg" role="1Qtc8A">
@@ -3889,7 +3891,7 @@
           <property role="3F0ifm" value="start" />
           <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
           <node concept="Vb9p2" id="36tQV5AmMLW" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
+            <property role="Vbekb" value="BOLD" />
           </node>
         </node>
         <node concept="pVoyu" id="4TI9yUddc5w" role="3F10Kt">
@@ -3941,7 +3943,7 @@
           <node concept="3F0ifn" id="36tQV5AmMM3" role="2czzBI">
             <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
             <node concept="Vb9p2" id="36tQV5AmMM4" role="3F10Kt">
-              <property role="Vbekb" value="g1_k_vY/BOLD" />
+              <property role="Vbekb" value="BOLD" />
             </node>
           </node>
           <node concept="pVoyu" id="4TI9yUdpRLo" role="3F10Kt">
@@ -4051,7 +4053,7 @@
             <property role="3F0ifm" value="activate nothing" />
             <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
             <node concept="Vb9p2" id="36tQV5AmMMo" role="3F10Kt">
-              <property role="Vbekb" value="g1_k_vY/BOLD" />
+              <property role="Vbekb" value="BOLD" />
             </node>
           </node>
         </node>
@@ -4248,7 +4250,7 @@
       </node>
       <node concept="3cWJ9i" id="7lt0LtPh0wz" role="1Qtc8$">
         <node concept="CtIbL" id="7lt0LtPh0w_" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
       </node>
     </node>
@@ -4327,14 +4329,14 @@
       </node>
       <node concept="3cWJ9i" id="7lt0LtPHTOV" role="1Qtc8$">
         <node concept="CtIbL" id="7lt0LtPHTOW" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
     <node concept="1Qtc8_" id="7lt0LtPPjkL" role="IW6Ez">
       <node concept="3cWJ9i" id="7lt0LtPPjkM" role="1Qtc8$">
         <node concept="CtIbL" id="7lt0LtPPjkN" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
       </node>
       <node concept="IWgqT" id="7lt0LtPPjkO" role="1Qtc8A">
@@ -4385,7 +4387,7 @@
     <property role="TrG5h" value="Head_delete" />
     <ref role="1h_SK9" to="wq2x:6p0DfM0a3gA" resolve="Head" />
     <node concept="1hA7zw" id="7lt0LtPQ8fu" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <property role="1hHO97" value="Make Keep" />
       <node concept="1hAIg9" id="7lt0LtPQ8fv" role="1hA7z_">
         <node concept="3clFbS" id="7lt0LtPQ8fw" role="2VODD2">
@@ -4408,7 +4410,7 @@
               <node concept="1OKiuA" id="7lt0LtPQa4Z" role="2OqNvi">
                 <node concept="1Q80Hx" id="7lt0LtPQa50" role="lBI5i" />
                 <node concept="2B6iha" id="7lt0LtPQa51" role="lGT1i">
-                  <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                  <property role="1lyBwo" value="mostRelevant" />
                 </node>
                 <node concept="3cmrfG" id="7lt0LtPQa52" role="3dN3m$">
                   <property role="3cmrfH" value="-1" />
@@ -4441,7 +4443,7 @@
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
       </node>
       <node concept="3F0A7n" id="oI9Ys1lGM" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:2Hyoxv0dL6" resolve="kind" />
+        <ref role="1NtTu8" to="wq2x:oI9Ys1lGD" resolve="kind" />
       </node>
       <node concept="3F0ifn" id="oI9Ys1lGi" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -4578,7 +4580,7 @@
       </node>
       <node concept="3cWJ9i" id="1mdVbTS8OFI" role="1Qtc8$">
         <node concept="CtIbL" id="1mdVbTS8OFK" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -4657,7 +4659,7 @@
       </node>
       <node concept="3cWJ9i" id="34$A1Mf2_77" role="1Qtc8$">
         <node concept="CtIbL" id="34$A1Mf2_79" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -4878,7 +4880,7 @@
       </node>
       <node concept="3cWJ9i" id="xaaVXv4Ni8" role="1Qtc8$">
         <node concept="CtIbL" id="xaaVXv4Nia" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -4941,15 +4943,15 @@
       <node concept="3EZMnI" id="4jcOV4hvop4" role="3EZMnx">
         <ref role="1k5W1q" to="qgy9:7ksQUDZuyMD" resolve="Backquote" />
         <node concept="3F0A7n" id="4jcOV4hu0nN" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:4jcOV4hu0nK" resolve="severity" />
           <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-          <ref role="1NtTu8" to="wq2x:2Hyoxv0dL8" resolve="severity" />
         </node>
         <node concept="3F0ifn" id="4jcOV4hvop6" role="3EZMnx">
           <property role="3F0ifm" value="(" />
           <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
         </node>
         <node concept="3F1sOY" id="4jcOV4hwiHR" role="3EZMnx">
-          <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
+          <property role="1cu_pB" value="2" />
           <ref role="1NtTu8" to="wq2x:4jcOV4hwicZ" resolve="message" />
         </node>
         <node concept="VPM3Z" id="4jcOV4hvop8" role="3F10Kt">
@@ -4996,17 +4998,18 @@
                     <ref role="3cqZAo" node="4jcOV4hujRJ" resolve="pfc" />
                   </node>
                   <node concept="3TrcHB" id="4jcOV4hukux" role="2OqNvi">
-                    <ref role="3TsBF5" to="wq2x:2Hyoxv0dL8" resolve="severity" />
+                    <ref role="3TsBF5" to="wq2x:4jcOV4hu0nK" resolve="severity" />
                   </node>
                 </node>
                 <node concept="tyxLq" id="4jcOV4humkV" role="2OqNvi">
-                  <node concept="2OqwBi" id="2Hyoxv0dPC" role="tz02z">
-                    <node concept="1XH99k" id="2Hyoxv0dPD" role="2Oq$k0">
-                      <ref role="1XH99l" to="wq2x:2Hyoxv0dJ5" resolve="FeedbackSeverity" />
-                    </node>
-                    <node concept="1X_LrI" id="2Hyoxv0dPE" role="2OqNvi">
-                      <node concept="2ZBlsa" id="4jcOV4hvntV" role="3gWYIm" />
+                  <node concept="2OqwBi" id="4jcOV4hvnED" role="tz02z">
+                    <node concept="3HcIyF" id="4jcOV4hvnbG" role="2Oq$k0">
+                      <ref role="3HcIyG" to="wq2x:4jcOV4hu0ns" resolve="FeedbackSeverity" />
+                      <node concept="3HdYsG" id="4jcOV4hvnmT" role="3Hdvt7">
+                        <node concept="2ZBlsa" id="4jcOV4hvntV" role="3HdYsH" />
+                      </node>
                     </node>
+                    <node concept="2ZYiMu" id="4jcOV4hvoik" role="2OqNvi" />
                   </node>
                 </node>
               </node>
@@ -5024,21 +5027,19 @@
         <node concept="3clFbS" id="4jcOV4hu0oW" role="2VODD2">
           <node concept="3clFbF" id="4jcOV4hu4W6" role="3cqZAp">
             <node concept="2OqwBi" id="4jcOV4hu5UD" role="3clFbG">
-              <node concept="2OqwBi" id="2Hyoxv0dP_" role="2Oq$k0">
-                <node concept="1XH99k" id="2Hyoxv0dPA" role="2Oq$k0">
-                  <ref role="1XH99l" to="wq2x:2Hyoxv0dJ5" resolve="FeedbackSeverity" />
-                </node>
-                <node concept="2ViDtN" id="2Hyoxv0dPB" role="2OqNvi" />
+              <node concept="3HcIyF" id="4jcOV4hu4W3" role="2Oq$k0">
+                <ref role="3HcIyG" to="wq2x:4jcOV4hu0ns" resolve="FeedbackSeverity" />
+                <node concept="3HdYuk" id="4jcOV4hu56h" role="3Hdvt7" />
               </node>
               <node concept="3$u5V9" id="4jcOV4hu7vq" role="2OqNvi">
                 <node concept="1bVj0M" id="4jcOV4hu7vs" role="23t8la">
                   <node concept="3clFbS" id="4jcOV4hu7vt" role="1bW5cS">
                     <node concept="3clFbF" id="4jcOV4hu7E2" role="3cqZAp">
-                      <node concept="2OqwBi" id="2Hyoxv0dPm" role="3clFbG">
-                        <node concept="1XCIdh" id="2Hyoxv0dPo" role="2OqNvi" />
+                      <node concept="2OqwBi" id="4jcOV4hueIK" role="3clFbG">
                         <node concept="37vLTw" id="4jcOV4hu7E1" role="2Oq$k0">
                           <ref role="3cqZAo" node="4jcOV4hu7vu" resolve="it" />
                         </node>
+                        <node concept="305NjN" id="4jcOV4hvmOC" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -5069,7 +5070,7 @@
           <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
         </node>
         <node concept="3F1sOY" id="4jcOV4hEDuN" role="3EZMnx">
-          <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
+          <property role="1cu_pB" value="2" />
           <ref role="1NtTu8" to="wq2x:4jcOV4hEDv3" resolve="message" />
         </node>
         <node concept="VPM3Z" id="4jcOV4hEDuO" role="3F10Kt">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index 2c2b7657..512ce561 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -2,14 +2,14 @@
 <model ref="r:0b4fa908-1136-4415-a93b-4106c8eb77b5(jetbrains.mps.lang.coderules.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="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" 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="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -109,7 +109,9 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
         <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
+        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
       </concept>
       <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
         <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
@@ -506,7 +508,7 @@
                             <ref role="2pJxaS" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
                             <node concept="2pIpSj" id="5f6wxQ3dlQO" role="2pJxcM">
                               <ref role="2pIpSl" to="wq2x:6p0DfM0ajKO" resolve="constraint" />
-                              <node concept="36biLy" id="5f6wxQ3dmeZ" role="28nt2d">
+                              <node concept="36biLy" id="5f6wxQ3dmeZ" role="2pJxcZ">
                                 <node concept="2OqwBi" id="5f6wxQ3dqSF" role="36biLW">
                                   <node concept="2OqwBi" id="5f6wxQ3dn3D" role="2Oq$k0">
                                     <node concept="1PxgMI" id="5f6wxQ3dppK" role="2Oq$k0">
@@ -720,7 +722,7 @@
                             <ref role="2pJxaS" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
                             <node concept="2pIpSj" id="5f6wxQ3fbQo" role="2pJxcM">
                               <ref role="2pIpSl" to="wq2x:20Ay2VefOBA" resolve="constraint" />
-                              <node concept="36biLy" id="5f6wxQ3fcdH" role="28nt2d">
+                              <node concept="36biLy" id="5f6wxQ3fcdH" role="2pJxcZ">
                                 <node concept="2OqwBi" id="5f6wxQ3fea8" role="36biLW">
                                   <node concept="2OqwBi" id="5f6wxQ3eV2W" role="2Oq$k0">
                                     <node concept="1PxgMI" id="5f6wxQ3eUKP" role="2Oq$k0">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 57678297..54d8d8b8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -2,9 +2,9 @@
 <model ref="r:51eac161-f155-4ff3-9f01-b4596f103664(jetbrains.mps.lang.coderules.migration)">
   <persistence version="9" />
   <languages>
-    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
+    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -227,7 +227,7 @@
       <node concept="3Tm1VV" id="7smgEqgGBKl" role="1B3o_S" />
       <node concept="3clFbS" id="7smgEqgGBKn" role="3clF47">
         <node concept="RRSsy" id="63PS1WEWEvB" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WEWEvC" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Introduce_NodeAnchor)" />
           </node>
@@ -286,7 +286,7 @@
       <node concept="3Tm1VV" id="6s2wbV0R$rd" role="1B3o_S" />
       <node concept="3clFbS" id="6s2wbV0R$rf" role="3clF47">
         <node concept="RRSsy" id="63PS1WEStJg" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WEStJh" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Replace_LogicalValue)" />
           </node>
@@ -345,7 +345,7 @@
       <node concept="3Tm1VV" id="6DOfTm$A8yt" role="1B3o_S" />
       <node concept="3clFbS" id="6DOfTm$A8yv" role="3clF47">
         <node concept="RRSsy" id="63PS1WEMePa" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WEMePb" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Replace_TypeNodeExpression)" />
           </node>
@@ -404,7 +404,7 @@
       <node concept="3Tm1VV" id="5WBVN_N356_" role="1B3o_S" />
       <node concept="3clFbS" id="5WBVN_N356B" role="3clF47">
         <node concept="RRSsy" id="63PS1WESvQG" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WESvQH" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Replace_LogicalValue2)" />
           </node>
@@ -463,7 +463,7 @@
       <node concept="3Tm1VV" id="49obacldLFT" role="1B3o_S" />
       <node concept="3clFbS" id="49obacldLFV" role="3clF47">
         <node concept="RRSsy" id="63PS1WEM2PQ" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WEM2PR" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Replace_LogicalExpression)" />
           </node>
@@ -522,7 +522,7 @@
       <node concept="3Tm1VV" id="1HWyn8jSwYE" role="1B3o_S" />
       <node concept="3clFbS" id="1HWyn8jSwYG" role="3clF47">
         <node concept="RRSsy" id="63PS1WEDBBa" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WEDBBc" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (RemoveTermArguments)" />
           </node>
@@ -581,7 +581,7 @@
       <node concept="3Tm1VV" id="Lu45F83rnP" role="1B3o_S" />
       <node concept="3clFbS" id="Lu45F83rnR" role="3clF47">
         <node concept="RRSsy" id="63PS1WEDEOr" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WEDEOs" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (RemoveTermArgumentDeclaration)" />
           </node>
@@ -641,7 +641,7 @@
       <node concept="3Tm1VV" id="7lt0LtPAUTJ" role="1B3o_S" />
       <node concept="3clFbS" id="7lt0LtPAUTL" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTmEhm" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTmEhn" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (ConsolidateRuleParameters)" />
           </node>
@@ -701,7 +701,7 @@
       <node concept="3Tm1VV" id="1mdVbTSaajj" role="1B3o_S" />
       <node concept="3clFbS" id="1mdVbTSaajl" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTmEeE" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTmEeF" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (ReplaceDeprecatedPatternLogicalVariable)" />
           </node>
@@ -760,7 +760,7 @@
       <node concept="3Tm1VV" id="JOGAOsOdlt" role="1B3o_S" />
       <node concept="3clFbS" id="JOGAOsOdlv" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTmEbX" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTmEbY" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Copy_TermTable)" />
           </node>
@@ -821,7 +821,7 @@
       <node concept="3Tm1VV" id="JOGAOsQdkV" role="1B3o_S" />
       <node concept="3clFbS" id="JOGAOsQdkX" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTm_8k" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTm_8l" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Replace_Term)" />
           </node>
@@ -881,7 +881,7 @@
       <node concept="3Tm1VV" id="JOGAOsS0nf" role="1B3o_S" />
       <node concept="3clFbS" id="JOGAOsS0nh" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTmuNp" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTmuNq" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Update_TermTable)" />
           </node>
@@ -941,7 +941,7 @@
       <node concept="3Tm1VV" id="JOGAOsT9Ra" role="1B3o_S" />
       <node concept="3clFbS" id="JOGAOsT9Rc" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTmsv2" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTmsv3" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Drop_TermTable)" />
           </node>
@@ -1000,7 +1000,7 @@
       <node concept="3Tm1VV" id="12QmIoyW8oZ" role="1B3o_S" />
       <node concept="3clFbS" id="12QmIoyW8p1" role="3clF47">
         <node concept="RRSsy" id="6tPOoeTmrTF" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="6tPOoeTmrTG" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (SwitchToRuleTemplates)" />
           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 09516004..dc8fb26d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -14,18 +14,6 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
-        <property id="1421157252384165432" name="memberId" index="3tVfz5" />
-        <property id="672037151186491528" name="presentation" index="1L1pqM" />
-        <reference id="899069222106091871" name="oldMember" index="2wpffI" />
-      </concept>
-      <concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclartaion" flags="ng" index="25R3W">
-        <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
-        <child id="3348158742936976577" name="members" index="25R1y" />
-      </concept>
-      <concept id="6491077959632463275" name="jetbrains.mps.lang.structure.structure.EnumPropertyMigrationInfo" flags="ng" index="3l_iC">
-        <child id="6491077959632463286" name="oldProperty" index="3l_iP" />
-      </concept>
       <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
@@ -33,20 +21,12 @@
       <concept id="6054523464627964745" name="jetbrains.mps.lang.structure.structure.AttributeInfo_AttributedConcept" flags="ng" index="trNpa">
         <reference id="6054523464627965081" name="concept" index="trN6q" />
       </concept>
-      <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
-        <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
-      </concept>
-      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration_Old" flags="ng" index="AxPO7">
+      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration" flags="ng" index="AxPO7">
         <reference id="1083171729157" name="memberDataType" index="M4eZT" />
         <reference id="1083241965437" name="defaultMember" index="Qgau1" />
         <child id="1083172003582" name="member" index="M5hS2" />
       </concept>
-      <concept id="1588368162884797030" name="jetbrains.mps.lang.structure.structure.EnumMigrationInfo" flags="ng" index="2JgGob">
-        <property id="6491077959634662372" name="valueOpMigration" index="3scbB" />
-        <property id="6491077959634650670" name="nameOpMigration" index="3sfsH" />
-        <child id="6491077959632451996" name="oldEnum" index="3lCyv" />
-      </concept>
-      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration_Old" flags="ig" index="M4N5e">
+      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ig" index="M4N5e">
         <property id="1083923523172" name="externalValue" index="1uS6qo" />
         <property id="1083923523171" name="internalValue" index="1uS6qv" />
       </concept>
@@ -106,21 +86,22 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="34$A1Mf2w7l" role="1TKVEi">
       <property role="IQ2ns" value="3541122455446356437" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="extends" />
       <ref role="20lvS9" node="7eGEHDlgPKk" resolve="RulesList" />
     </node>
     <node concept="1TJgyj" id="1HWyn8jEsaE" role="1TKVEi">
       <property role="IQ2ns" value="1980609059185345194" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="constraint" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="6p0DfM0asBO" resolve="ConstraintDeclaration" />
     </node>
     <node concept="1TJgyj" id="36tQV5Anslx" role="1TKVEi">
       <property role="IQ2ns" value="3575255234175157601" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="template" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="36tQV5AmIsf" resolve="RuleTemplate" />
     </node>
     <node concept="PrWs8" id="34$A1Mf53b_" role="PzmwI">
@@ -141,17 +122,17 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
     <node concept="1TJgyj" id="PB1R3Y7EcX" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="965748826975413053" />
       <ref role="20lvS9" node="PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
     </node>
     <node concept="1TJgyj" id="20Ay2VegCfd" role="1TKVEi">
       <property role="IQ2ns" value="2316688792939037645" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="logic" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="20Ay2VefOqC" resolve="LogicalClauseList" />
     </node>
   </node>
@@ -184,9 +165,9 @@
     <property role="3GE5qa" value="rule.clause" />
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="1TJgyj" id="6p0DfM0ajKO" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="constraint" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7368070394767031348" />
       <ref role="20lvS9" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     </node>
@@ -205,15 +186,16 @@
     <property role="EcuMT" value="7368070394767045637" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="6p0DfM0aywA" role="1TKVEi">
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="template" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7368070394767091750" />
       <ref role="20lvS9" node="6p0DfM0asBO" resolve="ConstraintDeclaration" />
     </node>
     <node concept="1TJgyj" id="6p0DfM0et2r" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="argument" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7368070394768117915" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
@@ -229,9 +211,9 @@
       <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
     </node>
     <node concept="1TJgyj" id="1CgWc1TyPxy" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameters" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="1878265754077059170" />
       <ref role="20lvS9" node="1CgWc1TyPXm" resolve="ConstraintParameterDeclaration" />
     </node>
@@ -260,8 +242,9 @@
     <property role="EcuMT" value="7368070394769139970" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6p0DfM0iCzc" role="1TKVEi">
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7368070394769213644" />
       <ref role="20lvS9" node="6p0DfM0ia8T" resolve="RuleInputDeclaration" />
     </node>
@@ -273,16 +256,16 @@
     <property role="34LRSv" value="=" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="6p0DfM0oEeG" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="assignee" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7368070394770793388" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
     <node concept="1TJgyj" id="6p0DfM0oEna" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="value" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7368070394770793930" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
@@ -321,15 +304,16 @@
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
     <node concept="1TJgyj" id="5NuEpF1iiA0" role="1TKVEi">
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="applicableConcept" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="6691972578451990912" />
       <ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
     </node>
     <node concept="1TJgyj" id="5NuEpF1ihrB" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="input" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="6691972578451986151" />
       <ref role="20lvS9" node="6p0DfM0ia8T" resolve="RuleInputDeclaration" />
     </node>
@@ -342,7 +326,7 @@
     <property role="EcuMT" value="6928531011217258898" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="60B5zVESBfb" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="variable" />
       <property role="IQ2ns" value="6928531011217290187" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
@@ -369,9 +353,9 @@
     <property role="EcuMT" value="5372587443968979218" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="4EfgX2EvGcc" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="5372587443968983820" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -392,9 +376,9 @@
     <property role="EcuMT" value="1878265754076919072" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="1TJgyj" id="5bC6UNlwzV7" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="part" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <property role="IQ2ns" value="5974055334837370567" />
       <ref role="20lvS9" to="tpee:5vlcUuJ5uOX" resolve="TextCommentPart" />
     </node>
@@ -420,7 +404,7 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5f6wxQ38Bap" role="1TKVEi">
       <property role="IQ2ns" value="6036655413802463897" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="dataType" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
     </node>
@@ -436,9 +420,9 @@
     <property role="EcuMT" value="1618328391714763069" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1pPth$m5B4Y" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="macro" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="1618328391714763070" />
       <ref role="20lvS9" node="1pPth$m5Bbz" resolve="MacroDeclaration" />
     </node>
@@ -456,22 +440,23 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6DOfTm$zUE3" role="1TKVEi">
       <property role="IQ2ns" value="7670825977262353027" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="input" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="6DOfTm$zRmf" resolve="MacroInputDeclaration" />
     </node>
     <node concept="1TJgyj" id="7IysFeA0yca" role="1TKVEi">
       <property role="IQ2ns" value="8908809128802132746" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7IysFeA0yb0" resolve="MacroParameterDeclaration" />
     </node>
     <node concept="1TJgyj" id="7IysFe_ZQc2" role="1TKVEi">
       <property role="IQ2ns" value="8908809128801952514" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
+      <property role="20lbJX" value="0..1" />
       <ref role="20lvS9" node="7IysFe_ZPX_" resolve="MacroBody" />
     </node>
     <node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
@@ -509,9 +494,9 @@
       <ref role="PrY4T" to="tpee:i2fhoOR" resolve="IMethodLike" />
     </node>
     <node concept="1TJgyj" id="tIwzd1_VRv" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="535508562359074271" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
@@ -523,17 +508,17 @@
     <property role="34LRSv" value="expand" />
     <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
     <node concept="1TJgyj" id="18kNIl0jL_z" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="logical" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="1302893676238674275" />
       <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
     <node concept="1TJgyj" id="18kNIl0jL3E" role="1TKVEi">
       <property role="IQ2ns" value="1302893676238672106" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="origin" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -552,15 +537,15 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7IysFe_ZPXC" role="1TKVEi">
       <property role="IQ2ns" value="8908809128801951592" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
     <node concept="1TJgyj" id="7IysFe_ZPXE" role="1TKVEi">
       <property role="IQ2ns" value="8908809128801951594" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
     </node>
     <node concept="PrWs8" id="7IysFe_ZPXA" role="PzmwI">
@@ -583,14 +568,14 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7IysFeA0ybI" role="1TKVEi">
       <property role="IQ2ns" value="8908809128802132718" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
     </node>
     <node concept="1TJgyj" id="7IysFeA5xBQ" role="1TKVEi">
       <property role="IQ2ns" value="8908809128803441142" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="init" />
       <ref role="20lvS9" node="7IysFeA5Lco" resolve="InitBlock" />
     </node>
@@ -611,8 +596,9 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="7IysFeA1uTj" role="1TKVEi">
       <property role="IQ2ns" value="8908809128802381395" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7IysFeA0yb0" resolve="MacroParameterDeclaration" />
     </node>
     <node concept="PrWs8" id="7IysFeA1uRT" role="PzmwI">
@@ -643,9 +629,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3TnYLtqfhzO" role="1TKVEi">
       <property role="IQ2ns" value="4492335231042132212" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
     </node>
     <node concept="PrWs8" id="3TnYLtqfhzy" role="PzmwI">
@@ -665,8 +651,9 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="3TnYLtqfh$T" role="1TKVEi">
       <property role="IQ2ns" value="4492335231042132281" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
     </node>
     <node concept="PrWs8" id="3TnYLtqfh$K" role="PzmwI">
@@ -681,23 +668,24 @@
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="1TJgyj" id="3TnYLtqgRY3" role="1TKVEi">
       <property role="IQ2ns" value="4492335231042551683" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
     </node>
     <node concept="1TJgyj" id="3TnYLtqgQZ0" role="1TKVEi">
       <property role="IQ2ns" value="4492335231042547648" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="init" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="TrG5h" value="value" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="1TJgyj" id="3TnYLtqgQYV" role="1TKVEi">
       <property role="IQ2ns" value="4492335231042547643" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
   </node>
@@ -708,15 +696,16 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1L74NXEmG0t" role="1TKVEi">
       <property role="IQ2ns" value="2037618519496638493" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7IysFeA0yb0" resolve="MacroParameterDeclaration" />
     </node>
     <node concept="1TJgyj" id="1L74NXGK1G1" role="1TKVEi">
       <property role="IQ2ns" value="2037618519536835329" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -732,9 +721,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1L74NXEmFJV" role="1TKVEi">
       <property role="IQ2ns" value="2037618519496637435" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="binding" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="1L74NXEmF9s" resolve="MacroParameterBinding" />
     </node>
   </node>
@@ -746,20 +735,21 @@
     <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
     <node concept="1TJgyj" id="5hSMZ_lpUoi" role="1TKVEi">
       <property role="IQ2ns" value="6086839168131376658" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="1pPth$m5Bbz" resolve="MacroDeclaration" />
     </node>
     <node concept="1TJgyj" id="4MEOIDFfpT9" role="1TKVEi">
       <property role="IQ2ns" value="5524459797186715209" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="logical" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
     <node concept="1TJgyj" id="5hSMZ_lrcKO" role="1TKVEi">
       <property role="IQ2ns" value="6086839168131714100" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="argument" />
       <ref role="20lvS9" node="1L74NXEmFJU" resolve="MacroArgumentList" />
     </node>
@@ -774,9 +764,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="20Ay2VefOqD" role="1TKVEi">
       <property role="IQ2ns" value="2316688792938825385" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="clauses" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="20Ay2VefOqF" resolve="LogicalClause" />
     </node>
   </node>
@@ -795,9 +785,9 @@
     <ref role="1TJDcQ" node="20Ay2VefOqF" resolve="LogicalClause" />
     <node concept="1TJgyj" id="20Ay2VefOBA" role="1TKVEi">
       <property role="IQ2ns" value="2316688792938826214" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="constraint" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     </node>
   </node>
@@ -808,9 +798,9 @@
     <ref role="1TJDcQ" node="20Ay2VefOqF" resolve="LogicalClause" />
     <node concept="1TJgyj" id="20Ay2Vei7FI" role="1TKVEi">
       <property role="IQ2ns" value="2316688792939428590" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
   </node>
@@ -822,16 +812,16 @@
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="1CcQBrQdzxt" role="1TKVEi">
       <property role="IQ2ns" value="1877115349178398813" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="left" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
     <node concept="1TJgyj" id="1CcQBrQdzxv" role="1TKVEi">
       <property role="IQ2ns" value="1877115349178398815" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="right" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
@@ -850,9 +840,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6hqFpWmM98w" role="1TKVEi">
       <property role="IQ2ns" value="7231283050490401312" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
     </node>
     <node concept="PrWs8" id="6hqFpWmM98u" role="PzmwI">
@@ -866,9 +856,9 @@
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="7smgEqggf13" role="1TKVEi">
       <property role="IQ2ns" value="8581119423153238083" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="node" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -879,9 +869,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6DOfTm$zVok" role="1TKVEi">
       <property role="IQ2ns" value="7670825977262355988" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tp25:gzTqbfa" resolve="SNodeType" />
     </node>
     <node concept="PrWs8" id="6DOfTm$zRmg" role="PzmwI">
@@ -901,8 +891,9 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6DOfTm$$CHk" role="1TKVEi">
       <property role="IQ2ns" value="7670825977262541652" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="6DOfTm$zRmf" resolve="MacroInputDeclaration" />
     </node>
   </node>
@@ -914,9 +905,9 @@
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="5WBVN_MT8FD" role="1TKVEi">
       <property role="IQ2ns" value="6856711987714624233" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="PrWs8" id="1HWyn8iMa37" role="PzmwI">
@@ -930,9 +921,9 @@
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="1HWyn8iJ_Iq" role="1TKVEi">
       <property role="IQ2ns" value="1980609059169917850" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="origin" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
@@ -947,23 +938,23 @@
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="3pMFS1zdejv" role="1TKVEi">
       <property role="IQ2ns" value="3923391191348208863" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="origin" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
     <node concept="1TJgyj" id="3pMFS1zdej$" role="1TKVEi">
       <property role="IQ2ns" value="3923391191348208868" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="pattern" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
     <node concept="1TJgyj" id="3pMFS1zdejx" role="1TKVEi">
       <property role="IQ2ns" value="3923391191348208865" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="replacement" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
@@ -979,22 +970,22 @@
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsx" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="input" />
       <property role="IQ2ns" value="3575255234174969633" />
       <ref role="20lvS9" node="5NuEpF1if3e" resolve="RuleInputSpecification" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmQgD" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="condition" />
       <property role="IQ2ns" value="3575255234175001641" />
       <ref role="20lvS9" node="4laj_h9P4cy" resolve="Condition" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIss" role="1TKVEi">
       <property role="IQ2ns" value="3575255234174969628" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
     <node concept="PrWs8" id="6OXbTDyHcSb" role="PzmwI">
@@ -1017,29 +1008,29 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7lt0LtPHSaf" role="1TKVEi">
       <property role="IQ2ns" value="8456919074565751439" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7lt0LtPpEVM" resolve="ParameterContainer" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsU" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="head" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="3575255234174969658" />
       <ref role="20lvS9" node="6p0DfM0a3gA" resolve="Head" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsV" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="guard" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="3575255234174969659" />
       <ref role="20lvS9" node="6p0DfM0a3Qe" resolve="Guard" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsW" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="body" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="3575255234174969660" />
       <ref role="20lvS9" node="6p0DfM0a3TO" resolve="Body" />
     </node>
@@ -1059,9 +1050,9 @@
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="1TJgyj" id="36tQV5AmIt1" role="1TKVEi">
       <property role="IQ2ns" value="3575255234174969665" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="rule" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="36tQV5AmIsB" resolve="ConstraintRule" />
     </node>
   </node>
@@ -1073,9 +1064,9 @@
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="1TJgyj" id="36tQV5BDmjo" role="1TKVEi">
       <property role="IQ2ns" value="3575255234196628696" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="node" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -1085,9 +1076,9 @@
     <property role="TrG5h" value="ParameterContainer" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7lt0LtPpF3M" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="8456919074560454898" />
       <ref role="20lvS9" node="PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
     </node>
@@ -1100,26 +1091,35 @@
     <property role="TrG5h" value="SNodeReportOperation" />
     <property role="34LRSv" value="report" />
     <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
-    <node concept="1TJgyi" id="2Hyoxv0dL6" role="1TKVEl">
-      <property role="TrG5h" value="kind" />
+    <node concept="1TJgyi" id="oI9Ys1lGD" role="1TKVEl">
       <property role="IQ2nx" value="6958395097963305" />
-      <ref role="AX2Wp" node="2Hyoxv0dJ0" resolve="ReportKind" />
-      <node concept="3l_iC" id="2Hyoxv0dL7" role="lGtFl">
-        <node concept="1TJgyi" id="oI9Ys1lGD" role="3l_iP">
-          <property role="IQ2nx" value="6958395097963305" />
-          <property role="TrG5h" value="kind" />
-          <ref role="AX2Wp" node="oI9Ys1lFh" resolve="ReportKind" />
-        </node>
-      </node>
+      <property role="TrG5h" value="kind" />
+      <ref role="AX2Wp" node="oI9Ys1lFh" resolve="ReportKind" />
     </node>
     <node concept="1TJgyj" id="oI9Ys1lF8" role="1TKVEi">
       <property role="IQ2ns" value="6958395097963208" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="text" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
+  <node concept="AxPO7" id="oI9Ys1lFh">
+    <property role="TrG5h" value="ReportKind" />
+    <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
+    <node concept="M4N5e" id="oI9Ys1lFi" role="M5hS2">
+      <property role="1uS6qo" value="info" />
+      <property role="1uS6qv" value="info" />
+    </node>
+    <node concept="M4N5e" id="oI9Ys1lFj" role="M5hS2">
+      <property role="1uS6qo" value="warning" />
+      <property role="1uS6qv" value="warning" />
+    </node>
+    <node concept="M4N5e" id="oI9Ys1lFm" role="M5hS2">
+      <property role="1uS6qo" value="error" />
+      <property role="1uS6qv" value="error" />
+    </node>
+  </node>
   <node concept="1TIwiD" id="1mdVbTS8GIV">
     <property role="EcuMT" value="1553157749316176827" />
     <property role="3GE5qa" value="constraint" />
@@ -1129,16 +1129,16 @@
       <ref role="PrY4T" to="5j4j:JOGAOsIRhm" resolve="Capture" />
     </node>
     <node concept="1TJgyj" id="4sSe4$p4oON" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="variable" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="5131913661993028915" />
       <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
     <node concept="1TJgyj" id="4sSe4$p4oOP" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="value" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="5131913661993028917" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
@@ -1150,9 +1150,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6OXbTDyyU9U" role="1TKVEi">
       <property role="IQ2ns" value="7871500063838282362" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
     <node concept="PrWs8" id="6OXbTDyHcHo" role="PzmwI">
@@ -1184,24 +1184,24 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2BZXJecE0bF" role="1TKVEi">
       <property role="IQ2ns" value="3026409000513569515" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="queryKind" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="1TJgyj" id="6OXbTD$dU7c" role="1TKVEi">
       <property role="IQ2ns" value="7871500063866331596" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="queryStage" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7P_FdVQ_S6B" resolve="QueryTemplate" />
       <node concept="asaX9" id="6tPOoeT5KFi" role="lGtFl" />
     </node>
     <node concept="1TJgyj" id="2BZXJecNeMM" role="1TKVEi">
       <property role="IQ2ns" value="3026409000515988658" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="2BZXJecNbEw" resolve="QueryParameterDeclaration" />
     </node>
     <node concept="PrWs8" id="6OXbTD$dU7e" role="PzmwI">
@@ -1224,9 +1224,9 @@
     </node>
     <node concept="1TJgyj" id="2BZXJecQkiP" role="1TKVEi">
       <property role="IQ2ns" value="3026409000516797621" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
     </node>
   </node>
@@ -1237,8 +1237,9 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="2BZXJecNhVS" role="1TKVEi">
       <property role="IQ2ns" value="3026409000516001528" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="2BZXJecNbEw" resolve="QueryParameterDeclaration" />
     </node>
   </node>
@@ -1250,9 +1251,9 @@
     <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
     <node concept="1TJgyj" id="12QmIo$ySSU" role="1TKVEi">
       <property role="IQ2ns" value="1204249894870289978" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="nodes" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -1277,27 +1278,46 @@
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="4jcOV4hwicZ" role="1TKVEi">
       <property role="IQ2ns" value="4957570047284421439" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="message" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
-    <node concept="1TJgyi" id="2Hyoxv0dL8" role="1TKVEl">
-      <property role="TrG5h" value="severity" />
+    <node concept="1TJgyi" id="4jcOV4hu0nK" role="1TKVEl">
       <property role="IQ2nx" value="4957570047283824112" />
-      <ref role="AX2Wp" node="2Hyoxv0dJ5" resolve="FeedbackSeverity" />
-      <node concept="3l_iC" id="2Hyoxv0dL9" role="lGtFl">
-        <node concept="1TJgyi" id="4jcOV4hu0nK" role="3l_iP">
-          <property role="IQ2nx" value="4957570047283824112" />
-          <property role="TrG5h" value="severity" />
-          <ref role="AX2Wp" node="4jcOV4hu0ns" resolve="FeedbackSeverity" />
-        </node>
-      </node>
+      <property role="TrG5h" value="severity" />
+      <ref role="AX2Wp" node="4jcOV4hu0ns" resolve="FeedbackSeverity" />
     </node>
     <node concept="PrWs8" id="4jcOV4hwWdd" role="PzmwI">
       <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
     </node>
   </node>
+  <node concept="AxPO7" id="4jcOV4hu0ns">
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="FeedbackSeverity" />
+    <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
+    <ref role="Qgau1" node="4jcOV4hu0nu" />
+    <node concept="M4N5e" id="4jcOV4hu0nt" role="M5hS2">
+      <property role="1uS6qv" value="DEBUG" />
+      <property role="1uS6qo" value="debug" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0nu" role="M5hS2">
+      <property role="1uS6qv" value="INFO" />
+      <property role="1uS6qo" value="info" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0nx" role="M5hS2">
+      <property role="1uS6qv" value="WARN" />
+      <property role="1uS6qo" value="warning" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0n_" role="M5hS2">
+      <property role="1uS6qv" value="ERROR" />
+      <property role="1uS6qo" value="error" />
+    </node>
+    <node concept="M4N5e" id="4jcOV4hu0nE" role="M5hS2">
+      <property role="1uS6qv" value="FATAL" />
+      <property role="1uS6qo" value="fatal" />
+    </node>
+  </node>
   <node concept="1TIwiD" id="4jcOV4hExo0">
     <property role="EcuMT" value="4957570047287105024" />
     <property role="3GE5qa" value="constraint" />
@@ -1306,122 +1326,14 @@
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
     <node concept="1TJgyj" id="4jcOV4hEDv3" role="1TKVEi">
       <property role="IQ2ns" value="4957570047287138243" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="message" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="PrWs8" id="4jcOV4hEyRj" role="PzmwI">
       <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
     </node>
   </node>
-  <node concept="25R3W" id="2Hyoxv0dJ0">
-    <property role="TrG5h" value="ReportKind" />
-    <property role="3F6X1D" value="6958395097963217" />
-    <ref role="1H5jkz" node="2Hyoxv0dJ2" resolve="info" />
-    <node concept="2JgGob" id="2Hyoxv0dJ1" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3eY/string_name" />
-      <property role="3sfsH" value="5CkWgdpp0p1/by_name" />
-      <node concept="AxPO7" id="oI9Ys1lFh" role="3lCyv">
-        <property role="TrG5h" value="ReportKind" />
-        <property role="3F6X1D" value="6958395097963217" />
-        <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
-        <node concept="M4N5e" id="oI9Ys1lFi" role="M5hS2">
-          <property role="1uS6qo" value="info" />
-          <property role="1uS6qv" value="info" />
-        </node>
-        <node concept="M4N5e" id="oI9Ys1lFj" role="M5hS2">
-          <property role="1uS6qo" value="warning" />
-          <property role="1uS6qv" value="warning" />
-        </node>
-        <node concept="M4N5e" id="oI9Ys1lFm" role="M5hS2">
-          <property role="1uS6qo" value="error" />
-          <property role="1uS6qv" value="error" />
-        </node>
-      </node>
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJ2" role="25R1y">
-      <property role="TrG5h" value="info" />
-      <property role="3tVfz5" value="6958395097963218" />
-      <ref role="2wpffI" node="oI9Ys1lFi" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJ3" role="25R1y">
-      <property role="TrG5h" value="warning" />
-      <property role="3tVfz5" value="6958395097963219" />
-      <ref role="2wpffI" node="oI9Ys1lFj" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJ4" role="25R1y">
-      <property role="TrG5h" value="error" />
-      <property role="3tVfz5" value="6958395097963222" />
-      <ref role="2wpffI" node="oI9Ys1lFm" />
-    </node>
-  </node>
-  <node concept="25R3W" id="2Hyoxv0dJ5">
-    <property role="TrG5h" value="FeedbackSeverity" />
-    <property role="3GE5qa" value="constraint" />
-    <property role="3F6X1D" value="4957570047283824092" />
-    <ref role="1H5jkz" node="2Hyoxv0dJ8" resolve="INFO" />
-    <node concept="2JgGob" id="2Hyoxv0dJ6" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3eY/string_name" />
-      <property role="3sfsH" value="5CkWgdpp0p2/by_presentation" />
-      <node concept="AxPO7" id="4jcOV4hu0ns" role="3lCyv">
-        <property role="3GE5qa" value="constraint" />
-        <property role="TrG5h" value="FeedbackSeverity" />
-        <property role="3F6X1D" value="4957570047283824092" />
-        <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
-        <ref role="Qgau1" node="4jcOV4hu0nu" />
-        <node concept="M4N5e" id="4jcOV4hu0nt" role="M5hS2">
-          <property role="1uS6qv" value="DEBUG" />
-          <property role="1uS6qo" value="debug" />
-        </node>
-        <node concept="M4N5e" id="4jcOV4hu0nu" role="M5hS2">
-          <property role="1uS6qv" value="INFO" />
-          <property role="1uS6qo" value="info" />
-        </node>
-        <node concept="M4N5e" id="4jcOV4hu0nx" role="M5hS2">
-          <property role="1uS6qv" value="WARN" />
-          <property role="1uS6qo" value="warning" />
-        </node>
-        <node concept="M4N5e" id="4jcOV4hu0n_" role="M5hS2">
-          <property role="1uS6qv" value="ERROR" />
-          <property role="1uS6qo" value="error" />
-        </node>
-        <node concept="M4N5e" id="4jcOV4hu0nE" role="M5hS2">
-          <property role="1uS6qv" value="FATAL" />
-          <property role="1uS6qo" value="fatal" />
-        </node>
-      </node>
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJ7" role="25R1y">
-      <property role="TrG5h" value="DEBUG" />
-      <property role="1L1pqM" value="debug" />
-      <property role="3tVfz5" value="4957570047283824093" />
-      <ref role="2wpffI" node="4jcOV4hu0nt" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJ8" role="25R1y">
-      <property role="TrG5h" value="INFO" />
-      <property role="1L1pqM" value="info" />
-      <property role="3tVfz5" value="4957570047283824094" />
-      <ref role="2wpffI" node="4jcOV4hu0nu" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJ9" role="25R1y">
-      <property role="TrG5h" value="WARN" />
-      <property role="1L1pqM" value="warning" />
-      <property role="3tVfz5" value="4957570047283824097" />
-      <ref role="2wpffI" node="4jcOV4hu0nx" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJa" role="25R1y">
-      <property role="TrG5h" value="ERROR" />
-      <property role="1L1pqM" value="error" />
-      <property role="3tVfz5" value="4957570047283824101" />
-      <ref role="2wpffI" node="4jcOV4hu0n_" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJb" role="25R1y">
-      <property role="TrG5h" value="FATAL" />
-      <property role="1L1pqM" value="fatal" />
-      <property role="3tVfz5" value="4957570047283824106" />
-      <ref role="2wpffI" node="4jcOV4hu0nE" />
-    </node>
-  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index f2984741..58a27d5e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -111,7 +111,9 @@
       </concept>
       <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
         <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
+        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
       </concept>
       <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
         <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
@@ -1395,7 +1397,7 @@
                   <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
                   <node concept="2pIpSj" id="5WBVN_MTa8k" role="2pJxcM">
                     <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                    <node concept="36biLy" id="5WBVN_MTa8N" role="28nt2d">
+                    <node concept="36biLy" id="5WBVN_MTa8N" role="2pJxcZ">
                       <node concept="1PxgMI" id="5WBVN_MTaE6" role="36biLW">
                         <property role="1BlNFB" value="true" />
                         <node concept="chp4Y" id="5WBVN_MTaEx" role="3oSUPX">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
index 015b1bfa..152cd4d0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
@@ -5,8 +5,8 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="3" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index eb3b749c..24bde774 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -23,9 +23,9 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 3eee106a..2e1bf118 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -13,7 +13,7 @@
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -1069,7 +1069,7 @@
             </node>
             <node concept="3clFbS" id="7rf49NgqSon" role="TDEfX">
               <node concept="RRSsy" id="4cvvxaYhrSr" role="3cqZAp">
-                <property role="RRSoG" value="gZ5fksE/warn" />
+                <property role="RRSoG" value="warn" />
                 <node concept="Xl_RD" id="7rf49NgqUfc" role="RRSoy">
                   <property role="Xl_RC" value="error evaluating program" />
                 </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 78d29a51..6ee8ed35 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -4,10 +4,10 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <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="0" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl b/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
index 14573c23..d8a9e25b 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
@@ -29,15 +29,15 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -54,7 +54,6 @@
         <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
-        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
         <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
@@ -68,7 +67,6 @@
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
         <module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="b19b2d23-1869-41e0-9ee6-8eaad9ffcd84(jetbrains.mps.lang.util.order#174635545557533742)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
@@ -107,21 +105,21 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <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="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
     <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
   </languageVersions>
@@ -136,7 +134,6 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="2e120f68-abfb-4980-bb1c-bc70159b1f95(jetbrains.mps.lang.controlflow)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
@@ -144,7 +141,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
   </dependencyVersions>
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/constraints.mps
index 983a9eaf..4116ee75 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:8cd6dfa2-2ff4-42f2-82df-5e0463e7dd79(jetbrains.mps.lang.controlflow.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps
index b6d42d74..64313c52 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:8f5297f2-a3b0-4e96-9303-d7a878892926(jetbrains.mps.lang.controlflow.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps
index 9204b975..e12f6dd7 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:9d6fe210-6699-4ffe-b3e4-567da3cd1f1d(jetbrains.mps.lang.controlflow.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps
index 336fcd1c..610ddb49 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:f19bed53-b05b-4c70-8516-9de1db10b1ae(jetbrains.mps.lang.controlflow.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl b/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
index 3414c444..0c651b14 100644
--- a/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
+++ b/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
@@ -22,14 +22,14 @@
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" 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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <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="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="-1" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -44,13 +44,11 @@
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)" version="0" />
         <module reference="ceb57370-a04c-41e9-91e3-f36110b5e4aa(jetbrains.mps.lang.smodel.types#7345257067587611144)" version="0" />
-        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -84,29 +82,29 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <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="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -118,13 +116,11 @@
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)" version="0" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps b/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps
index a18f3385..80aa8564 100644
--- a/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:29e6d197-c9e1-483d-a801-8724d71606b3(jetbrains.mps.lang.smodel.types.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 6813f804..6f8e66bb 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -3,9 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="3" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index 179b450b..38693a90 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -37,15 +37,15 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -64,7 +64,6 @@
         <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
-        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
         <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
@@ -76,7 +75,6 @@
         <module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)" version="0" />
-        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
         <module reference="685b46b0-fc2b-411e-954a-af0eeec1a29a(jetbrains.mps.lang.typechecking#01)" version="0" />
@@ -118,21 +116,21 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <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="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
     <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
   </languageVersions>
@@ -147,14 +145,12 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
index c5931615..8c33f23d 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:681ebaa9-a068-4b8a-8251-b12d2bd76ef1(jetbrains.mps.lang.typechecking.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index d7e3daaa..1aef9977 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:2e850586-b012-4b1a-9080-68602bc3e8c1(jetbrains.mps.lang.typechecking.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
index 926d681d..d47de6bd 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
@@ -6,7 +6,7 @@
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 0ba10764..d998b795 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -40,9 +40,9 @@
     <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
     <node concept="1TJgyj" id="oI9Yrc9Ch" role="1TKVEi">
       <property role="IQ2ns" value="6958395084020241" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="typeExpr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
index f99c19fc..c7814162 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -2,10 +2,10 @@
 <model ref="r:dbdd79b0-220d-41f0-b3ef-b9e8311cce7a(jetbrains.mps.lang.typechecking.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="3" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index b580079c..fb8c9223 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -2,17 +2,17 @@
 <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="3" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
+    <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
+    <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="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -1751,7 +1751,7 @@
     </node>
     <node concept="j$LIH" id="677NV56tvCh" role="jxRDz">
       <node concept="1lLz0L" id="677NV56tvCi" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="unsupported construct" />
       </node>
     </node>
@@ -1965,7 +1965,7 @@
     </node>
     <node concept="j$LIH" id="6dMt3c5aqRs" role="jxRDz">
       <node concept="1lLz0L" id="6dMt3c5aqRt" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="unsupported construct" />
       </node>
     </node>
@@ -2527,7 +2527,7 @@
     </node>
     <node concept="j$LIH" id="3kjrYXAPkLh" role="jxRDz">
       <node concept="1lLz0L" id="3kjrYXAPkLi" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage (type_term_feature)" />
       </node>
     </node>
@@ -2537,7 +2537,7 @@
     <property role="TrG5h" value="dataform_getter" />
     <node concept="j$LIH" id="1L74NXFa6j1" role="jxRDz">
       <node concept="1lLz0L" id="1L74NXFa6jO" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage (type_term)" />
       </node>
     </node>
@@ -2965,7 +2965,7 @@
     </node>
     <node concept="j$LIH" id="1CcQBrPQaZT" role="jxRDz">
       <node concept="1lLz0L" id="1CcQBrPQaZU" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
+        <property role="1lMjX7" value="error" />
         <property role="1lLB17" value="invalid usage" />
       </node>
     </node>
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 1a200acc..e108fbf9 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -28,17 +28,17 @@
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" 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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+        <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+        <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
         <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
       </languageVersions>
       <dependencyVersions>
@@ -101,32 +101,32 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <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="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
-    <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
+    <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 8d126406..e8638c71 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <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="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index bb730853..b2d8a589 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -3,9 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index bb0012ba..b6ff2473 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -3,13 +3,13 @@
   <persistence version="9" />
   <languages>
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" 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="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)" />
   </languages>
   <imports>
@@ -676,7 +676,7 @@
     <node concept="14StLt" id="1pt0VTMEHmC" role="V601i">
       <property role="TrG5h" value="NodeVariable" />
       <node concept="VechU" id="1pt0VTMEHCC" role="3F10Kt">
-        <property role="Vb096" value="fLwANPs/magenta" />
+        <property role="Vb096" value="magenta" />
         <node concept="1iSF2X" id="5lJXKCxiC" role="VblUZ">
           <property role="1iTho6" value="CC6699" />
         </node>
@@ -799,7 +799,7 @@
         </node>
       </node>
       <node concept="VQ3r3" id="7ksQUDZuOmp" role="3F10Kt">
-        <property role="2USNnj" value="gtbM8PH/underlined" />
+        <property role="2USNnj" value="2" />
       </node>
     </node>
     <node concept="14StLt" id="1iWwVK2B1it" role="V601i">
@@ -961,7 +961,7 @@
           <property role="3F0ifm" value="[" />
           <ref role="1k5W1q" to="tpen:hXb$RYA" resolve="LeftBracket" />
           <node concept="Vb9p2" id="5f6wxQ3yfjd" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
+            <property role="Vbekb" value="BOLD" />
           </node>
           <node concept="11L4FC" id="5f6wxQ3yfje" role="3F10Kt">
             <property role="VOm3f" value="true" />
@@ -982,7 +982,7 @@
           <property role="3F0ifm" value="]" />
           <ref role="1k5W1q" to="tpen:hXb$V4T" resolve="RightBracket" />
           <node concept="Vb9p2" id="5f6wxQ3yfjj" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
+            <property role="Vbekb" value="BOLD" />
           </node>
           <node concept="11L4FC" id="5f6wxQ3yhtr" role="3F10Kt">
             <property role="VOm3f" value="true" />
@@ -1033,7 +1033,7 @@
             <property role="VOm3f" value="true" />
           </node>
           <node concept="Vb9p2" id="5f6wxQ3poff" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
+            <property role="Vbekb" value="BOLD" />
           </node>
         </node>
         <node concept="3F1sOY" id="5f6wxQ3pofg" role="3EZMnx">
@@ -1050,7 +1050,7 @@
             <property role="VOm3f" value="true" />
           </node>
           <node concept="Vb9p2" id="5f6wxQ3pqN1" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
+            <property role="Vbekb" value="BOLD" />
           </node>
         </node>
         <node concept="l2Vlx" id="5f6wxQ3pofj" role="2iSdaV" />
@@ -1139,7 +1139,7 @@
           <property role="VOm3f" value="true" />
         </node>
         <node concept="VechU" id="4kX17XeTdVw" role="3F10Kt">
-          <property role="Vb096" value="g1_qRwE/darkGreen" />
+          <property role="Vb096" value="DARK_GREEN" />
           <node concept="1iSF2X" id="7LZcKzB$q$_" role="VblUZ">
             <property role="1iTho6" value="808080" />
           </node>
@@ -1159,7 +1159,7 @@
           <property role="VOm3f" value="true" />
         </node>
         <node concept="VechU" id="4kX17XeTdV$" role="3F10Kt">
-          <property role="Vb096" value="g1_qRwE/darkGreen" />
+          <property role="Vb096" value="DARK_GREEN" />
           <node concept="1iSF2X" id="7LZcKzB$q$C" role="VblUZ">
             <property role="1iTho6" value="808080" />
           </node>
@@ -2429,10 +2429,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jm69H" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm69I" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm69J" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9Jm69K" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9Jm69L" role="1Qtc8A" />
@@ -2440,7 +2440,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jm69O" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm69M" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm69N" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="7XmdqtdOVNH" role="1Qtc8A">
@@ -2472,7 +2472,7 @@
                 <node concept="1OKiuA" id="7XmdqtdOWGU" role="2OqNvi">
                   <node concept="1Q80Hx" id="7XmdqtdOWGV" role="lBI5i" />
                   <node concept="2B6iha" id="7XmdqtdOWGW" role="lGT1i">
-                    <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                    <property role="1lyBwo" value="mostRelevant" />
                   </node>
                   <node concept="3cmrfG" id="7XmdqtdOWGX" role="3dN3m$">
                     <property role="3cmrfH" value="-1" />
@@ -2505,10 +2505,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6aq" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6ar" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6as" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9Jm6at" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9Jm6au" role="1Qtc8A" />
@@ -2516,7 +2516,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6ax" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6av" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6aw" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="mvV$s" id="4hPXq9Jm6az" role="1Qtc8A">
@@ -2538,10 +2538,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6aI" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6aJ" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6aK" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9Jm6aL" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9Jm6aM" role="1Qtc8A" />
@@ -2549,7 +2549,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6aP" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6aN" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6aO" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="mvV$s" id="4hPXq9Jm6aR" role="1Qtc8A">
@@ -2572,10 +2572,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6cc" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cd" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6ce" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9Jm6cf" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9Jm6cg" role="1Qtc8A" />
@@ -2583,7 +2583,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6cj" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6ch" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6ci" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="aenpk" id="4hPXq9Jm6cl" role="1Qtc8A">
@@ -2631,7 +2631,7 @@
                   <node concept="1OKiuA" id="4hPXq9Jm6cL" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9Jm6cM" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9Jm6cN" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9Jm6cO" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -2651,10 +2651,10 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6cT" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cU" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6cV" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
         <node concept="CtIbL" id="4hPXq9Jm6cW" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="L$LW2" id="4hPXq9Jm6cX" role="1Qtc8A" />
@@ -2662,7 +2662,7 @@
     <node concept="1Qtc8_" id="4hPXq9Jm6d0" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cY" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm6cZ" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="aenpk" id="4hPXq9Jm6d2" role="1Qtc8A">
@@ -2710,7 +2710,7 @@
                   <node concept="1OKiuA" id="4hPXq9Jm6du" role="2OqNvi">
                     <node concept="1Q80Hx" id="4hPXq9Jm6dv" role="lBI5i" />
                     <node concept="2B6iha" id="4hPXq9Jm6dw" role="lGT1i">
-                      <property role="1lyBwo" value="59pBc0SIIVt/mostRelevant" />
+                      <property role="1lyBwo" value="mostRelevant" />
                     </node>
                     <node concept="3cmrfG" id="4hPXq9Jm6dx" role="3dN3m$">
                       <property role="3cmrfH" value="-1" />
@@ -3141,7 +3141,7 @@
     <property role="3GE5qa" value="dataform.constructor.feature" />
     <ref role="1h_SK9" to="5j4j:JOGAOsxiL_" resolve="DataFormFeature" />
     <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
         <node concept="3clFbS" id="1CcQBrPqIC7" role="2VODD2">
           <node concept="3clFbF" id="1CcQBrPqJok" role="3cqZAp">
@@ -3181,7 +3181,7 @@
     <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
       <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
         <node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
       </node>
       <node concept="IWgqT" id="1CcQBrPqlWZ" role="1Qtc8A">
@@ -3232,7 +3232,7 @@
     <node concept="1Qtc8_" id="JOGAOsxAMn" role="IW6Ez">
       <node concept="3cWJ9i" id="JOGAOsxAMo" role="1Qtc8$">
         <node concept="CtIbL" id="JOGAOsxAMp" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="JOGAOsxAMq" role="1Qtc8A">
@@ -3410,7 +3410,7 @@
     <node concept="1Qtc8_" id="7c96q9tzBpk" role="IW6Ez">
       <node concept="3cWJ9i" id="7c96q9tzBpo" role="1Qtc8$">
         <node concept="CtIbL" id="7c96q9tzBpq" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="1GhOrh" id="7c96q9tzBEG" role="1Qtc8A">
@@ -3697,7 +3697,7 @@
     <node concept="14StLt" id="4bWqD4C2vDI" role="V601i">
       <property role="TrG5h" value="Term" />
       <node concept="Vb9p2" id="3IIf9O_CN_$" role="3F10Kt">
-        <property role="Vbekb" value="g1_kEg4/ITALIC" />
+        <property role="Vbekb" value="ITALIC" />
       </node>
       <node concept="1X3_iC" id="4bWqD4C9OHF" role="lGtFl">
         <property role="3V$3am" value="styleItem" />
@@ -3756,7 +3756,7 @@
           <property role="VOm3f" value="true" />
         </node>
         <node concept="VechU" id="2L$SfAAUS_a" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5A/lightGray" />
+          <property role="Vb096" value="lightGray" />
         </node>
         <node concept="2SqB2G" id="2L$SfABae9P" role="2SqHTX">
           <property role="TrG5h" value="NEW_LINE" />
@@ -3769,7 +3769,7 @@
     <property role="TrG5h" value="NewLineAttribute_DELETE" />
     <ref role="1h_SK9" to="5j4j:2L$SfAAUQEl" resolve="NewLineAttribute" />
     <node concept="1hA7zw" id="2L$SfAB9FIx" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="2L$SfAB9FIy" role="1hA7z_">
         <node concept="3clFbS" id="2L$SfAB9FIz" role="2VODD2">
           <node concept="3clFbF" id="2L$SfAB9FIO" role="3cqZAp">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
index c4849796..c7081cb4 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -2,8 +2,8 @@
 <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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <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)" />
@@ -98,7 +98,7 @@
       </concept>
       <concept id="1240322627579" name="jetbrains.mps.lang.intentions.structure.IntentionParameter" flags="nn" index="38Zlrr" />
       <concept id="1240395258925" name="jetbrains.mps.lang.intentions.structure.ParameterizedIntentionDeclaration" flags="ig" index="3dkpOd">
-        <child id="1240395532443" name="queryFunction" index="3dlsAV" />
+        <child id="1240395532443" name="queryBlock" index="3dlsAV" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps
deleted file mode 100644
index c1446cda..00000000
--- a/coderules/languages/jetbrains.mps.logic/languageModels/jetbrains.mps.logic.enumMigration.mps
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a1d964b3-5c8a-489b-a939-3133e5843e8f(jetbrains.mps.logic.enumMigration)">
-  <persistence version="9" />
-  <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-  </languages>
-  <imports>
-    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <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="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1163670490218" name="jetbrains.mps.baseLanguage.structure.SwitchStatement" flags="nn" index="3KaCP$">
-        <child id="1163670592366" name="defaultBlock" index="3Kb1Dw" />
-        <child id="1163670766145" name="expression" index="3KbGdf" />
-        <child id="1163670772911" name="case" index="3KbHQx" />
-      </concept>
-      <concept id="1163670641947" name="jetbrains.mps.baseLanguage.structure.SwitchCase" flags="ng" index="3KbdKl">
-        <child id="1163670677455" name="expression" index="3Kbmr1" />
-        <child id="1163670683720" name="body" index="3Kbo56" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="3355805929432017219" name="jetbrains.mps.lang.structure.structure.EnumCustomMethodReplacementInfo" flags="ng" index="2CoXVP">
-        <property id="3355805929432017222" name="kind" index="2CoXVK" />
-        <reference id="3355805929432017224" name="enum" index="2CoXVY" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="4705942098322467729" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="ng" index="21nZrQ">
-        <reference id="4705942098322467736" name="decl" index="21nZrZ" />
-      </concept>
-      <concept id="1966870290088668512" name="jetbrains.mps.lang.smodel.structure.Enum_MemberLiteral" flags="ng" index="2ViDtV">
-        <reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
-      </concept>
-      <concept id="1240170042401" name="jetbrains.mps.lang.smodel.structure.SEnumerationMemberType" flags="in" index="2ZThk1">
-        <reference id="1240170836027" name="enum" index="2ZWj4r" />
-      </concept>
-      <concept id="2453008993612717253" name="jetbrains.mps.lang.smodel.structure.ExpressionEnumBody" flags="ng" index="3X5gDF">
-        <child id="2453008993612717254" name="expression" index="3X5gDC" />
-      </concept>
-      <concept id="2453008993612559843" name="jetbrains.mps.lang.smodel.structure.EnumSwitchCase" flags="ng" index="3X5Udd">
-        <child id="2453008993612717146" name="body" index="3X5gFO" />
-        <child id="2453008993612559844" name="members" index="3X5Uda" />
-      </concept>
-      <concept id="2453008993612559839" name="jetbrains.mps.lang.smodel.structure.EnumSwitchExpression" flags="ng" index="3X5UdL">
-        <child id="2453008993612714935" name="cases" index="3X5gkp" />
-        <child id="2453008993612559840" name="enumExpression" index="3X5Ude" />
-      </concept>
-      <concept id="5779574625830813396" name="jetbrains.mps.lang.smodel.structure.EnumerationIdRefExpression" flags="ng" index="1XH99k">
-        <reference id="5779574625830813397" name="enumDeclaration" index="1XH99l" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="2Hyoxv0dJK">
-    <property role="TrG5h" value="NodeKind_MigrationUtils" />
-    <node concept="3Tm1VV" id="2Hyoxv0dJL" role="1B3o_S" />
-    <node concept="2YIFZL" id="2Hyoxv0dK3" role="jymVt">
-      <property role="TrG5h" value="value" />
-      <node concept="37vLTG" id="2Hyoxv0dK4" role="3clF46">
-        <property role="TrG5h" value="enummember" />
-        <node concept="2ZThk1" id="2Hyoxv0dK5" role="1tU5fm">
-          <ref role="2ZWj4r" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2Hyoxv0dK6" role="1B3o_S" />
-      <node concept="3clFbS" id="2Hyoxv0dK7" role="3clF47">
-        <node concept="3cpWs6" id="2Hyoxv0dK8" role="3cqZAp">
-          <node concept="3X5UdL" id="2Hyoxv0dK9" role="3cqZAk">
-            <node concept="3X5Udd" id="2Hyoxv0dJR" role="3X5gkp">
-              <node concept="21nZrQ" id="2Hyoxv0dJS" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:2Hyoxv0dJG" resolve="inherit" />
-              </node>
-              <node concept="3X5gDF" id="2Hyoxv0dJT" role="3X5gFO">
-                <node concept="10Nm6u" id="2Hyoxv0dJN" role="3X5gDC" />
-              </node>
-            </node>
-            <node concept="3X5Udd" id="2Hyoxv0dJU" role="3X5gkp">
-              <node concept="21nZrQ" id="2Hyoxv0dJV" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:2Hyoxv0dJH" resolve="the_default" />
-              </node>
-              <node concept="3X5gDF" id="2Hyoxv0dJW" role="3X5gFO">
-                <node concept="Xl_RD" id="2Hyoxv0dJO" role="3X5gDC">
-                  <property role="Xl_RC" value="DEFAULT" />
-                </node>
-              </node>
-            </node>
-            <node concept="3X5Udd" id="2Hyoxv0dJX" role="3X5gkp">
-              <node concept="21nZrQ" id="2Hyoxv0dJY" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:2Hyoxv0dJI" resolve="concept_instance" />
-              </node>
-              <node concept="3X5gDF" id="2Hyoxv0dJZ" role="3X5gFO">
-                <node concept="Xl_RD" id="2Hyoxv0dJP" role="3X5gDC">
-                  <property role="Xl_RC" value="CONCEPT_INSTANCE" />
-                </node>
-              </node>
-            </node>
-            <node concept="3X5Udd" id="2Hyoxv0dK0" role="3X5gkp">
-              <node concept="21nZrQ" id="2Hyoxv0dK1" role="3X5Uda">
-                <ref role="21nZrZ" to="5j4j:2Hyoxv0dJJ" resolve="classifier_type" />
-              </node>
-              <node concept="3X5gDF" id="2Hyoxv0dK2" role="3X5gFO">
-                <node concept="Xl_RD" id="2Hyoxv0dJQ" role="3X5gDC">
-                  <property role="Xl_RC" value="CLASSIFIER_TYPE" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="2Hyoxv0dKa" role="3X5Ude">
-              <ref role="3cqZAo" node="2Hyoxv0dK4" resolve="enummember" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="2Hyoxv0dJM" role="3clF45" />
-      <node concept="2CoXVP" id="2Hyoxv0dKb" role="lGtFl">
-        <property role="2CoXVK" value="2UidVq6Wu$Q/memberToValue" />
-        <ref role="2CoXVY" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-      </node>
-    </node>
-    <node concept="2YIFZL" id="2Hyoxv0dKc" role="jymVt">
-      <property role="TrG5h" value="fromValue" />
-      <node concept="37vLTG" id="2Hyoxv0dKd" role="3clF46">
-        <property role="TrG5h" value="value" />
-        <node concept="17QB3L" id="2Hyoxv0dKe" role="1tU5fm" />
-      </node>
-      <node concept="3Tm1VV" id="2Hyoxv0dKf" role="1B3o_S" />
-      <node concept="2ZThk1" id="2Hyoxv0dKh" role="3clF45">
-        <ref role="2ZWj4r" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-      </node>
-      <node concept="2CoXVP" id="2Hyoxv0dKi" role="lGtFl">
-        <property role="2CoXVK" value="2UidVq6Wu$R/valueToMember" />
-        <ref role="2CoXVY" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-      </node>
-      <node concept="3clFbS" id="2Hyoxv0dKL" role="3clF47">
-        <node concept="3clFbJ" id="2Hyoxv0dKj" role="3cqZAp">
-          <node concept="3clFbS" id="2Hyoxv0dKk" role="3clFbx">
-            <node concept="3cpWs6" id="2Hyoxv0dKl" role="3cqZAp">
-              <node concept="2OqwBi" id="2Hyoxv0dKm" role="3cqZAk">
-                <node concept="1XH99k" id="2Hyoxv0dKn" role="2Oq$k0">
-                  <ref role="1XH99l" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-                </node>
-                <node concept="2ViDtV" id="2Hyoxv0dKo" role="2OqNvi">
-                  <ref role="2ViDtZ" to="5j4j:2Hyoxv0dJG" resolve="inherit" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="2Hyoxv0dKp" role="3clFbw">
-            <node concept="37vLTw" id="2Hyoxv0dKq" role="3uHU7B">
-              <ref role="3cqZAo" node="2Hyoxv0dKd" resolve="value" />
-            </node>
-            <node concept="10Nm6u" id="2Hyoxv0dKr" role="3uHU7w" />
-          </node>
-        </node>
-        <node concept="3KaCP$" id="2Hyoxv0dKM" role="3cqZAp">
-          <node concept="3KbdKl" id="2Hyoxv0dKs" role="3KbHQx">
-            <node concept="3clFbS" id="2Hyoxv0dKt" role="3Kbo56">
-              <node concept="3cpWs6" id="2Hyoxv0dKu" role="3cqZAp">
-                <node concept="2OqwBi" id="2Hyoxv0dKv" role="3cqZAk">
-                  <node concept="1XH99k" id="2Hyoxv0dKw" role="2Oq$k0">
-                    <ref role="1XH99l" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-                  </node>
-                  <node concept="2ViDtV" id="2Hyoxv0dKx" role="2OqNvi">
-                    <ref role="2ViDtZ" to="5j4j:2Hyoxv0dJH" resolve="the_default" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="Xl_RD" id="2Hyoxv0dKy" role="3Kbmr1">
-              <property role="Xl_RC" value="DEFAULT" />
-            </node>
-          </node>
-          <node concept="3KbdKl" id="2Hyoxv0dKz" role="3KbHQx">
-            <node concept="3clFbS" id="2Hyoxv0dK$" role="3Kbo56">
-              <node concept="3cpWs6" id="2Hyoxv0dK_" role="3cqZAp">
-                <node concept="2OqwBi" id="2Hyoxv0dKA" role="3cqZAk">
-                  <node concept="1XH99k" id="2Hyoxv0dKB" role="2Oq$k0">
-                    <ref role="1XH99l" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-                  </node>
-                  <node concept="2ViDtV" id="2Hyoxv0dKC" role="2OqNvi">
-                    <ref role="2ViDtZ" to="5j4j:2Hyoxv0dJI" resolve="concept_instance" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="Xl_RD" id="2Hyoxv0dKD" role="3Kbmr1">
-              <property role="Xl_RC" value="CONCEPT_INSTANCE" />
-            </node>
-          </node>
-          <node concept="3KbdKl" id="2Hyoxv0dKE" role="3KbHQx">
-            <node concept="3clFbS" id="2Hyoxv0dKF" role="3Kbo56">
-              <node concept="3cpWs6" id="2Hyoxv0dKG" role="3cqZAp">
-                <node concept="2OqwBi" id="2Hyoxv0dKH" role="3cqZAk">
-                  <node concept="1XH99k" id="2Hyoxv0dKI" role="2Oq$k0">
-                    <ref role="1XH99l" to="5j4j:2Hyoxv0dJE" resolve="NodeKind" />
-                  </node>
-                  <node concept="2ViDtV" id="2Hyoxv0dKJ" role="2OqNvi">
-                    <ref role="2ViDtZ" to="5j4j:2Hyoxv0dJJ" resolve="classifier_type" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="Xl_RD" id="2Hyoxv0dKK" role="3Kbmr1">
-              <property role="Xl_RC" value="CLASSIFIER_TYPE" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="2Hyoxv0dKN" role="3KbGdf">
-            <ref role="3cqZAo" node="2Hyoxv0dKd" resolve="value" />
-          </node>
-          <node concept="3clFbS" id="2Hyoxv0dKO" role="3Kb1Dw">
-            <node concept="3cpWs6" id="2Hyoxv0dKP" role="3cqZAp">
-              <node concept="10Nm6u" id="2Hyoxv0dKQ" role="3cqZAk" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index 8e94815f..93d6ef86 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -2,9 +2,9 @@
 <model ref="r:43d4629d-ce89-487f-b335-2aac72284228(jetbrains.mps.logic.migration)">
   <persistence version="9" />
   <languages>
-    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
+    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -124,7 +124,7 @@
       <node concept="3Tm1VV" id="5NAQwIkSyCf" role="1B3o_S" />
       <node concept="3clFbS" id="5NAQwIkSyCh" role="3clF47">
         <node concept="RRSsy" id="5p9vXslWQ$k" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="5p9vXslWQ$l" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Extract_ListRole_from_ChildRole)" />
           </node>
@@ -183,7 +183,7 @@
       <node concept="3Tm1VV" id="5f6wxQ3pDPN" role="1B3o_S" />
       <node concept="3clFbS" id="5f6wxQ3pDPP" role="3clF47">
         <node concept="RRSsy" id="63PS1WESvQG" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fh_4/error" />
+          <property role="RRSoG" value="error" />
           <node concept="Xl_RD" id="63PS1WESvQH" role="RRSoy">
             <property role="Xl_RC" value="Migration has been truncated, please downgrade. (Replace_LogicalValue_with_Expression)" />
           </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index e5457bdf..a84fb52f 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -11,15 +11,6 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
-        <property id="1421157252384165432" name="memberId" index="3tVfz5" />
-        <property id="672037151186491528" name="presentation" index="1L1pqM" />
-        <reference id="899069222106091871" name="oldMember" index="2wpffI" />
-      </concept>
-      <concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclartaion" flags="ng" index="25R3W">
-        <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
-        <child id="3348158742936976577" name="members" index="25R1y" />
-      </concept>
       <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="6054523464626862044" name="jetbrains.mps.lang.structure.structure.AttributeInfo_IsMultiple" flags="ng" index="tn0Fv">
         <property id="6054523464626875854" name="value" index="tnX3d" />
@@ -27,19 +18,12 @@
       <concept id="6054523464627964745" name="jetbrains.mps.lang.structure.structure.AttributeInfo_AttributedConcept" flags="ng" index="trNpa">
         <reference id="6054523464627965081" name="concept" index="trN6q" />
       </concept>
-      <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
-        <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
-      </concept>
-      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration_Old" flags="ng" index="AxPO7">
+      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration" flags="ng" index="AxPO7">
+        <property id="1197591154882" name="memberIdentifierPolicy" index="3lZH7k" />
         <reference id="1083171729157" name="memberDataType" index="M4eZT" />
         <child id="1083172003582" name="member" index="M5hS2" />
       </concept>
-      <concept id="1588368162884797030" name="jetbrains.mps.lang.structure.structure.EnumMigrationInfo" flags="ng" index="2JgGob">
-        <property id="6491077959634662372" name="valueOpMigration" index="3scbB" />
-        <property id="6491077959634650670" name="nameOpMigration" index="3sfsH" />
-        <child id="6491077959632451996" name="oldEnum" index="3lCyv" />
-      </concept>
-      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration_Old" flags="ig" index="M4N5e">
+      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ig" index="M4N5e">
         <property id="1083923523172" name="externalValue" index="1uS6qo" />
         <property id="1083923523171" name="internalValue" index="1uS6qv" />
       </concept>
@@ -96,9 +80,9 @@
     <property role="R4oN_" value="data form literal expression" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="6$jH9oLmVNm" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="root" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="7571593955706125526" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
@@ -111,9 +95,9 @@
     <property role="R4oN_" value="term node" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="DataNode" />
     <node concept="1TJgyj" id="6$jH9oLnyAp" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="role" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7571593955706284441" />
       <ref role="20lvS9" node="6$jH9oLmYD_" resolve="RoleNode" />
     </node>
@@ -137,9 +121,9 @@
     <property role="R4oN_" value="child role node" />
     <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
     <node concept="1TJgyj" id="6$jH9oLmYFB" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7571593955706137319" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
@@ -152,9 +136,9 @@
     <property role="R4oN_" value="value role node" />
     <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
     <node concept="1TJgyj" id="6$jH9oLmYL8" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="7571593955706137672" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
@@ -172,6 +156,27 @@
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
   </node>
+  <node concept="AxPO7" id="6dP_abdQnLY">
+    <property role="TrG5h" value="NodeKind" />
+    <property role="3lZH7k" value="derive_from_presentation" />
+    <property role="3GE5qa" value="dataform" />
+    <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
+    <node concept="M4N5e" id="1dOf$WH0KX6" role="M5hS2">
+      <property role="1uS6qo" value="inherit" />
+    </node>
+    <node concept="M4N5e" id="45hxFudjYuy" role="M5hS2">
+      <property role="1uS6qo" value="the default" />
+      <property role="1uS6qv" value="DEFAULT" />
+    </node>
+    <node concept="M4N5e" id="6dP_abdTU2g" role="M5hS2">
+      <property role="1uS6qv" value="CONCEPT_INSTANCE" />
+      <property role="1uS6qo" value="concept instance" />
+    </node>
+    <node concept="M4N5e" id="6dP_abdQo2a" role="M5hS2">
+      <property role="1uS6qv" value="CLASSIFIER_TYPE" />
+      <property role="1uS6qo" value="classifier type" />
+    </node>
+  </node>
   <node concept="1TIwiD" id="5lJXKARS0">
     <property role="TrG5h" value="DataNode" />
     <property role="R5$K7" value="true" />
@@ -201,9 +206,9 @@
     <property role="EcuMT" value="8829335963591530299" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="7E86$tKt5BI" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="8829335963591530990" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -215,7 +220,7 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5f6wxQ3ychO" role="1TKVEi">
       <property role="IQ2ns" value="6036655413809169524" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="cardinalityExpr" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -234,14 +239,15 @@
     <property role="EcuMT" value="8829335963593820278" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="7E86$tK_PaH" role="1TKVEi">
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="8829335963593822893" />
       <ref role="20lvS9" node="7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     </node>
     <node concept="1TJgyj" id="5f6wxQ3pnWr" role="1TKVEi">
       <property role="IQ2ns" value="6036655413806858011" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="indexExpr" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -253,7 +259,7 @@
     <property role="EcuMT" value="1564179198502666296" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
     <node concept="1TJgyj" id="5zfvpQ71CIE" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="dataType" />
       <property role="IQ2ns" value="6399471711045454762" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
@@ -266,9 +272,9 @@
     <property role="EcuMT" value="238586457668550951" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="1TJgyj" id="dfChU1zo4I" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="238586457668550958" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -290,9 +296,9 @@
     <property role="34LRSv" value="list" />
     <ref role="1TJDcQ" node="5lJXKARS0" resolve="DataNode" />
     <node concept="1TJgyj" id="1OShD0HAZ38" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <property role="IQ2ns" value="2105510410850136264" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
@@ -302,14 +308,14 @@
     <property role="TrG5h" value="LogicalVariableDeclarationContainer" />
     <property role="EcuMT" value="8169506320648805904" />
     <node concept="1TJgyj" id="2E5lcNn8k3O" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <property role="IQ2ns" value="3063948360254832884" />
       <ref role="20lvS9" node="7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     </node>
     <node concept="1TJgyj" id="5zfvpQ72gqq" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="dataType" />
       <property role="IQ2ns" value="6399471711045617306" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
@@ -329,9 +335,9 @@
     <ref role="1TJDcQ" node="6$jH9oLmYD_" resolve="RoleNode" />
     <node concept="1TJgyj" id="5NAQwIkRIYU" role="1TKVEi">
       <property role="IQ2ns" value="6694277639409954746" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="list" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="1OShD0HAY6y" resolve="ListNode" />
     </node>
     <node concept="asaX9" id="2L$SfABkf0J" role="lGtFl" />
@@ -344,9 +350,9 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="5WBVN_MJ9$7" role="1TKVEi">
       <property role="IQ2ns" value="6856711987712006407" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="literal" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="5WBVN_MJ50y" resolve="ListLiteral" />
     </node>
     <node concept="asaX9" id="27bTNFdTRnM" role="lGtFl" />
@@ -360,9 +366,9 @@
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="5WBVN_MESCO" role="1TKVEi">
       <property role="IQ2ns" value="6856711987710888500" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="root" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
@@ -374,9 +380,9 @@
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="5WBVN_MJ50Y" role="1TKVEi">
       <property role="IQ2ns" value="6856711987711987774" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
     <node concept="asaX9" id="27bTNFeNrZK" role="lGtFl" />
@@ -389,9 +395,9 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="28ktUhrjrp0" role="1TKVEi">
       <property role="IQ2ns" value="2455719244613924416" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="logical" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -402,7 +408,7 @@
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="1TJgyj" id="49obaclcanY" role="1TKVEi">
       <property role="IQ2ns" value="4780620083400582654" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="logical" />
       <ref role="20lvS9" node="7E86$tKsl45" resolve="LogicalItem" />
     </node>
@@ -439,7 +445,7 @@
     </node>
     <node concept="1TJgyj" id="JOGAOsxmrx" role="1TKVEi">
       <property role="IQ2ns" value="861509610434291425" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="getter" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
@@ -451,15 +457,16 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxTDo" role="1TKVEi">
       <property role="IQ2ns" value="861509610434435672" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
     </node>
     <node concept="1TJgyj" id="JOGAOsxTDm" role="1TKVEi">
       <property role="IQ2ns" value="861509610434435670" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="getter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -489,15 +496,16 @@
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243078" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="decl" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
     </node>
     <node concept="1TJgyj" id="JOGAOsxaC4" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243076" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="override" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
     </node>
   </node>
@@ -508,9 +516,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxaCc" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243084" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="template" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="JOGAOsxiLy" resolve="DataFormTemplate" />
     </node>
     <node concept="PrWs8" id="JOGAOsxaCa" role="PzmwI">
@@ -518,6 +526,7 @@
     </node>
     <node concept="1TJgyj" id="JOGAOsxaCh" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243089" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="prototype" />
       <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
     </node>
@@ -531,9 +540,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243105" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="contents" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
     </node>
     <node concept="PrWs8" id="JOGAOsxfAQ" role="PzmwI">
@@ -547,9 +556,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
       <property role="IQ2ns" value="861509610434276451" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
     </node>
   </node>
@@ -561,9 +570,9 @@
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="7lt0LtQg3vl" role="1TKVEi">
       <property role="IQ2ns" value="8456919074574710741" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
@@ -580,59 +589,5 @@
       <node concept="tn0Fv" id="2L$SfAAV6TP" role="HhnKV" />
     </node>
   </node>
-  <node concept="25R3W" id="2Hyoxv0dJE">
-    <property role="TrG5h" value="NodeKind" />
-    <property role="3GE5qa" value="dataform" />
-    <property role="3F6X1D" value="7166797808989207678" />
-    <ref role="1H5jkz" node="2Hyoxv0dJG" resolve="inherit" />
-    <node concept="2JgGob" id="2Hyoxv0dJF" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3fo/by_custom_methods" />
-      <property role="3sfsH" value="5CkWgdpp0p2/by_presentation" />
-      <node concept="AxPO7" id="6dP_abdQnLY" role="3lCyv">
-        <property role="TrG5h" value="NodeKind" />
-        <property role="3GE5qa" value="dataform" />
-        <property role="3F6X1D" value="7166797808989207678" />
-        <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
-        <node concept="M4N5e" id="1dOf$WH0KX6" role="M5hS2">
-          <property role="1uS6qo" value="inherit" />
-        </node>
-        <node concept="M4N5e" id="45hxFudjYuy" role="M5hS2">
-          <property role="1uS6qo" value="the default" />
-          <property role="1uS6qv" value="DEFAULT" />
-        </node>
-        <node concept="M4N5e" id="6dP_abdTU2g" role="M5hS2">
-          <property role="1uS6qv" value="CONCEPT_INSTANCE" />
-          <property role="1uS6qo" value="concept instance" />
-        </node>
-        <node concept="M4N5e" id="6dP_abdQo2a" role="M5hS2">
-          <property role="1uS6qv" value="CLASSIFIER_TYPE" />
-          <property role="1uS6qo" value="classifier type" />
-        </node>
-      </node>
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJG" role="25R1y">
-      <property role="TrG5h" value="inherit" />
-      <property role="3tVfz5" value="1401813893797580614" />
-      <ref role="2wpffI" node="1dOf$WH0KX6" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJH" role="25R1y">
-      <property role="TrG5h" value="the_default" />
-      <property role="1L1pqM" value="the default" />
-      <property role="3tVfz5" value="4706691208486840226" />
-      <ref role="2wpffI" node="45hxFudjYuy" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJI" role="25R1y">
-      <property role="TrG5h" value="concept_instance" />
-      <property role="1L1pqM" value="concept instance" />
-      <property role="3tVfz5" value="7166797808990134416" />
-      <ref role="2wpffI" node="6dP_abdTU2g" />
-    </node>
-    <node concept="25R33" id="2Hyoxv0dJJ" role="25R1y">
-      <property role="TrG5h" value="classifier_type" />
-      <property role="1L1pqM" value="classifier type" />
-      <property role="3tVfz5" value="7166797808989208714" />
-      <ref role="2wpffI" node="6dP_abdQo2a" />
-    </node>
-  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 0ff95758..2ac66145 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -2,10 +2,10 @@
 <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="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="3" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
@@ -98,7 +98,9 @@
       </concept>
       <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
         <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
+        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
       </concept>
       <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
         <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
@@ -692,7 +694,7 @@
                     <ref role="2pJxaS" to="5j4j:7HUwyZb1HXL" resolve="MultiLogicalType" />
                     <node concept="2pIpSj" id="65DJywF0U8Z" role="2pJxcM">
                       <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                      <node concept="36biLy" id="65DJywF0U90" role="28nt2d">
+                      <node concept="36biLy" id="65DJywF0U90" role="2pJxcZ">
                         <node concept="1PxgMI" id="37pq54Qvmfe" role="36biLW">
                           <property role="1BlNFB" value="true" />
                           <node concept="chp4Y" id="37pq54QvmfL" role="3oSUPX">
@@ -722,7 +724,7 @@
                     <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
                     <node concept="2pIpSj" id="65DJywF0UiM" role="2pJxcM">
                       <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                      <node concept="36biLy" id="65DJywF0UjO" role="28nt2d">
+                      <node concept="36biLy" id="65DJywF0UjO" role="2pJxcZ">
                         <node concept="1Z$b5t" id="65DJywF0UjZ" role="36biLW">
                           <ref role="1Z$eMM" node="7dgRGU4B6qV" resolve="T" />
                         </node>
@@ -1034,7 +1036,7 @@
                   <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
                   <node concept="2pIpSj" id="65DJywF0UQG" role="2pJxcM">
                     <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                    <node concept="36biLy" id="65DJywF0URI" role="28nt2d">
+                    <node concept="36biLy" id="65DJywF0URI" role="2pJxcZ">
                       <node concept="2OqwBi" id="37pq54QwP99" role="36biLW">
                         <node concept="2OqwBi" id="65DJywF0URT" role="2Oq$k0">
                           <node concept="1PxgMI" id="65DJywF0URU" role="2Oq$k0">
@@ -1089,7 +1091,7 @@
                     <ref role="2pJxaS" to="5j4j:7HUwyZb1HXL" resolve="MultiLogicalType" />
                     <node concept="2pIpSj" id="65DJywF0VtC" role="2pJxcM">
                       <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                      <node concept="36biLy" id="65DJywF0VuE" role="28nt2d">
+                      <node concept="36biLy" id="65DJywF0VuE" role="2pJxcZ">
                         <node concept="2OqwBi" id="37pq54QwPP$" role="36biLW">
                           <node concept="2OqwBi" id="65DJywF0VuP" role="2Oq$k0">
                             <node concept="1PxgMI" id="65DJywF0VuQ" role="2Oq$k0">
@@ -1179,7 +1181,7 @@
                   <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
                   <node concept="2pIpSj" id="28ktUhrF1PJ" role="2pJxcM">
                     <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                    <node concept="36biLy" id="28ktUhrF1PK" role="28nt2d">
+                    <node concept="36biLy" id="28ktUhrF1PK" role="2pJxcZ">
                       <node concept="1PxgMI" id="28ktUhrF1PL" role="36biLW">
                         <property role="1BlNFB" value="true" />
                         <node concept="chp4Y" id="28ktUhrF1PM" role="3oSUPX">
@@ -1306,7 +1308,7 @@
                   <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
                   <node concept="2pIpSj" id="7lt0LtQg3Hp" role="2pJxcM">
                     <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                    <node concept="36biLy" id="7lt0LtQg3Hq" role="28nt2d">
+                    <node concept="36biLy" id="7lt0LtQg3Hq" role="2pJxcZ">
                       <node concept="1PxgMI" id="7lt0LtQg3Hr" role="36biLW">
                         <property role="1BlNFB" value="true" />
                         <node concept="chp4Y" id="7lt0LtQg3Hs" role="3oSUPX">
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index d0b71750..15361cf2 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -21,10 +21,10 @@
     <language slang="l:96ee7a94-411d-4cf8-9b94-96cad7e52411:jetbrains.mps.baseLanguage.jdk7" version="0" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index 9a0e0274..d8072f1d 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -9,7 +9,7 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index 8f811eac..af174ac1 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -23,21 +23,21 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" 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="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <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="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
index 4958b608..360303e4 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
+++ b/coderules/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="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -207,7 +207,7 @@
             </node>
           </node>
           <node concept="VechU" id="1FOQehwZg06" role="3F10Kt">
-            <property role="Vb096" value="fLwANPn/red" />
+            <property role="Vb096" value="red" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
index fceaba32..f30c5b84 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
@@ -2,8 +2,8 @@
 <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="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index 6414322e..97f76bf0 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -21,14 +21,14 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <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="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -64,32 +64,32 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps
index 9f09e8cb..1eac715d 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:fcd8a0cb-db23-4096-8c51-848b03e9e544(jetbrains.mps.typechecking.testlang.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
index a4b511b2..22e5d055 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:5e4e4f29-5632-41c5-a47c-40ca5e101249(jetbrains.mps.typechecking.testlang.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <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)" />
   </languages>
@@ -351,7 +351,7 @@
     <node concept="1Qtc8_" id="7mB3viLbcyk" role="IW6Ez">
       <node concept="3cWJ9i" id="7mB3viLbcyo" role="1Qtc8$">
         <node concept="CtIbL" id="7mB3viLbcyq" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="7mB3viLbcyu" role="1Qtc8A">
@@ -611,7 +611,7 @@
     <node concept="1Qtc8_" id="7mB3viLgWoH" role="IW6Ez">
       <node concept="3cWJ9i" id="7mB3viLgWoL" role="1Qtc8$">
         <node concept="CtIbL" id="7mB3viLgWoN" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="7mB3viLgWoR" role="1Qtc8A">
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps
index 1fc9f3e7..682fb266 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -52,9 +52,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7lt0LtPHOme" role="1TKVEi">
       <property role="IQ2ns" value="8456919074565735822" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="stmt" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7mB3viLb8nE" resolve="Stmt" />
     </node>
     <node concept="PrWs8" id="7mB3viLaATe" role="PzmwI">
@@ -67,9 +67,9 @@
     <ref role="1TJDcQ" node="7mB3viLb8nE" resolve="Stmt" />
     <node concept="1TJgyj" id="7lt0LtPHOmo" role="1TKVEi">
       <property role="IQ2ns" value="8456919074565735832" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7lt0LtPHOmg" resolve="Expr" />
     </node>
   </node>
@@ -93,14 +93,14 @@
     <ref role="1TJDcQ" node="7mB3viLb8nE" resolve="Stmt" />
     <node concept="1TJgyj" id="7mB3viLbaWO" role="1TKVEi">
       <property role="IQ2ns" value="8477760168143925044" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="decl" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7mB3viLbaW_" resolve="VarDecl" />
     </node>
     <node concept="1TJgyj" id="7mB3viLbaWQ" role="1TKVEi">
       <property role="IQ2ns" value="8477760168143925046" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="init" />
       <ref role="20lvS9" node="7lt0LtPHOmg" resolve="Expr" />
     </node>
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 3ae18c7e..dd72fdfc 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -2,13 +2,13 @@
 <model ref="r:65f97255-4bb1-4783-acd6-a4ed5a1088e2(jetbrains.mps.typechecking.testlang.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
-    <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
-    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="-1" />
+    <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="-1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
+    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -77,7 +77,9 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
         <reference id="5455284157993911078" name="property" index="2pJxcJ" />
-        <child id="1595412875168045201" name="initValue" index="28ntcv" />
+      </concept>
+      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
+        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
       </concept>
       <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
         <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
@@ -335,7 +337,7 @@
                             <ref role="2pJxaS" to="qulx:7mB3viLbCL0" resolve="Type" />
                             <node concept="2pJxcG" id="7mB3viLbEmR" role="2pJxcM">
                               <ref role="2pJxcJ" to="qulx:7mB3viLbCL1" resolve="name" />
-                              <node concept="1TmgYN" id="7mB3viLdI8l" role="28ntcv">
+                              <node concept="1TmgYN" id="7mB3viLdI8l" role="2pJxcZ">
                                 <node concept="1nq8_$" id="7mB3viLdI8Z" role="1Tms7$">
                                   <node concept="a7P8L" id="7mB3viLdI8X" role="1nq8_t">
                                     <ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
@@ -345,7 +347,7 @@
                             </node>
                             <node concept="2pJxcG" id="7mB3viLhVif" role="2pJxcM">
                               <ref role="2pJxcJ" to="qulx:7mB3viLggsO" resolve="val" />
-                              <node concept="1TmgYN" id="7mB3viLhVjF" role="28ntcv">
+                              <node concept="1TmgYN" id="7mB3viLhVjF" role="2pJxcZ">
                                 <node concept="1nq8_$" id="7mB3viLhVjG" role="1Tms7$">
                                   <node concept="a7P8L" id="7mB3viLhVjH" role="1nq8_t">
                                     <ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/typesystem.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/typesystem.mps
index 8f729c1f..a6fa44f6 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:934cf379-2814-43cc-a514-f3f421acc40b(jetbrains.mps.typechecking.testlang.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd b/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd
index 5c3388c8..fbc8948d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd
@@ -18,7 +18,7 @@
     <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
     <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 760c7dd9..15ace368 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -559,7 +559,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.logic.test" />
         <property role="3LESm3" value="b189d6c6-9397-4d64-88af-1ac73760a4f5" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="7Ant4WkHLpe" role="3LF7KH">
           <node concept="2Ry0Ak" id="7Ant4WkHLpf" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
@@ -1156,7 +1156,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.coderules.typechecking.test" />
         <property role="3LESm3" value="c9670c16-a215-41fb-8784-04b14329799d" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="7mB3viLwG3p" role="3LF7KH">
           <node concept="2Ry0Ak" id="7mB3viLwGj2" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
@@ -1977,7 +1977,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.coderules.test" />
         <property role="3LESm3" value="c18711cb-f08b-4fae-81b0-1dd840be9c90" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="1Lr58WFO94S" role="3LF7KH">
           <node concept="2Ry0Ak" id="1Lr58WFO9de" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
index 6ae4c4e4..9b63e750 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
@@ -24,11 +24,11 @@
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
index 52b1ca72..033b4a0d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
@@ -2,7 +2,7 @@
 <model ref="r:cc1a7719-27fc-407d-bcc3-f0a29456923e(jetbrains.mps.coderules.test.modelcheck@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="1" />
@@ -289,7 +289,7 @@
             <node concept="9aQIb" id="2rIdnPwwLPG" role="9aQIa">
               <node concept="3clFbS" id="2rIdnPwwLPH" role="9aQI4">
                 <node concept="RRSsy" id="2rIdnPuCRgJ" role="3cqZAp">
-                  <property role="RRSoG" value="gZ5fksE/warn" />
+                  <property role="RRSoG" value="warn" />
                   <node concept="Xl_RD" id="2rIdnPuCRgL" role="RRSoy">
                     <property role="Xl_RC" value="Test is disabled in non-CI enviroment" />
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
index a94bddd9..6195a5e6 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
@@ -29,13 +29,13 @@
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
     <language slang="l:3a1f0f04-b5e0-43be-884e-b856bfdeca21:jetbrains.mps.typechecking.testlang" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
index 52c55377..99663deb 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
@@ -2,7 +2,7 @@
 <model ref="r:9fe32987-154e-453c-9afc-bfa5e13b7487(jetbrains.mps.coderules.scheduling@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <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="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index d720b462..d0aec07b 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -2,22 +2,22 @@
 <model ref="r:cbfbe9a2-941f-4667-8e48-3bf39c5dad6d(jetbrains.mps.coderules.typechecking@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
-    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="3" />
-    <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
-    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
+    <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="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
+    <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="-1" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" 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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
+    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
+    <use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="-1" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -2051,12 +2051,12 @@
           <node concept="34yUbh" id="7mB3viLdNfV" role="34yUb0">
             <property role="TrG5h" value="bar" />
           </node>
-          <node concept="34$_Ec" id="2DIFeUB7BAT" role="34yUb2">
-            <property role="34$_Ed" value="123" />
-          </node>
           <node concept="3xLA65" id="7mB3viLoFYN" role="lGtFl">
             <property role="TrG5h" value="bar" />
           </node>
+          <node concept="34$_Ec" id="2DIFeUB7BAT" role="34yUb2">
+            <property role="34$_Ed" value="123" />
+          </node>
         </node>
         <node concept="34yUbg" id="7mB3viLioHG" role="0U$qp">
           <node concept="34yUbh" id="7mB3viLioHH" role="34yUb0">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd
index 164bf682..b68deb44 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd
@@ -7,7 +7,7 @@
   </models>
   <sourcePath />
   <languageVersions>
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a1f0f04-b5e0-43be-884e-b856bfdeca21:jetbrains.mps.typechecking.testlang" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
index a76c23c2..991bc1a4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
@@ -32,12 +32,12 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index c201421f..cdc5ffee 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -9,7 +9,7 @@
     <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="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -3312,27 +3312,27 @@
   </node>
   <node concept="Zd50a" id="4vBwiiVq9ko">
     <property role="TrG5h" value="MacOSX" />
-    <property role="Zd52Q" value="1mJS7WEAV1T/Mac_OS_X" />
+    <property role="Zd52Q" value="Mac OS X" />
     <property role="Z2u3V" value="false" />
     <node concept="Zd509" id="4vBwiiVq9kp" role="Zd508">
       <ref role="1bYAoF" node="4vBwiiVgYfo" resolve="ShowNodeType" />
       <node concept="pLAjd" id="4vBwiiVq9kq" role="Zd501">
         <property role="pLAjc" value="ctrl+shift" />
         <property role="pLAjf" value="VK_P" />
-        <property role="3hacHL" value="5SFo3Mf0QpD/replace_all" />
+        <property role="3hacHL" value="replace all" />
       </node>
     </node>
   </node>
   <node concept="Zd50a" id="4vBwiiVq9kr">
     <property role="TrG5h" value="MacOSX105" />
-    <property role="Zd52Q" value="2HiVo5PakU7/Mac_OS_X_10_5_" />
+    <property role="Zd52Q" value="Mac OS X 10.5+" />
     <property role="Z2u3V" value="false" />
     <node concept="Zd509" id="4vBwiiVq9ks" role="Zd508">
       <ref role="1bYAoF" node="4vBwiiVgYfo" resolve="ShowNodeType" />
       <node concept="pLAjd" id="4vBwiiVq9kt" role="Zd501">
         <property role="pLAjc" value="ctrl+shift" />
         <property role="pLAjf" value="VK_P" />
-        <property role="3hacHL" value="5SFo3Mf0QpD/replace_all" />
+        <property role="3hacHL" value="replace all" />
       </node>
     </node>
   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
index afa8561b..9920f07e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
@@ -29,12 +29,12 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
index c611f895..26688e65 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <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="1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 0ccdde89..a07bcafe 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -6,7 +6,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" 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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
@@ -271,7 +271,7 @@
       <node concept="3Tm1VV" id="3LFq2p98DNN" role="1B3o_S" />
       <node concept="3clFbS" id="3LFq2p98DNO" role="3clF47">
         <node concept="RRSsy" id="3LFq2p98DVg" role="3cqZAp">
-          <property role="RRSoG" value="h1akgim/info" />
+          <property role="RRSoG" value="info" />
           <node concept="Xl_RD" id="3LFq2p98DVi" role="RRSoy">
             <property role="Xl_RC" value="*** Coderules INITIALIZED " />
           </node>
@@ -348,7 +348,7 @@
           <property role="3V$3am" value="statement" />
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
           <node concept="2xdQw9" id="1GKZK$Ai41j" role="8Wnug">
-            <property role="2xdLsb" value="gZ5fksE/warn" />
+            <property role="2xdLsb" value="warn" />
             <node concept="3cpWs3" id="1GKZK$Ai7TX" role="9lYJi">
               <node concept="37vLTw" id="1GKZK$Ai8qx" role="3uHU7w">
                 <ref role="3cqZAo" node="1GKZK$AhZZq" resolve="relevant" />
@@ -681,7 +681,7 @@
           <node concept="9aQIb" id="3LFq2p98r6e" role="9aQIa">
             <node concept="3clFbS" id="3LFq2p98r6f" role="9aQI4">
               <node concept="RRSsy" id="3LFq2p98rfn" role="3cqZAp">
-                <property role="RRSoG" value="gZ5fh_4/error" />
+                <property role="RRSoG" value="error" />
                 <node concept="Xl_RD" id="3LFq2p98rfp" role="RRSoy">
                   <property role="Xl_RC" value="Coderules failed to initialize: TypecheckingBackend component not found" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 9f12b4f6..e2bdead7 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -2,17 +2,17 @@
 <model ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <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="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" 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="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
-    <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="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <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" />
   </languages>
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
@@ -1854,7 +1854,7 @@
                 <node concept="9aQIb" id="4ZGicUZ5AwF" role="9aQIa">
                   <node concept="3clFbS" id="4ZGicUZ5AwG" role="9aQI4">
                     <node concept="RRSsy" id="4ZGicUZ67ry" role="3cqZAp">
-                      <property role="RRSoG" value="gZ5fksE/warn" />
+                      <property role="RRSoG" value="warn" />
                       <node concept="37vLTw" id="4ZGicUZ67Oj" role="RRSoy">
                         <ref role="3cqZAo" node="4ZGicUZ5ZbA" resolve="msg" />
                       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index dacb40fc..46292639 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -25,12 +25,12 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index dab9b28a..ef3c4864 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
@@ -13,7 +13,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
+    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
   </languages>
   <imports>
     <import index="zavc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.messageTargets(MPS.Core/)" />
@@ -12475,7 +12475,7 @@
                 </node>
               </node>
               <node concept="2xdQw9" id="YbzkzLtMB_" role="3cqZAp">
-                <property role="2xdLsb" value="gZ5fksE/warn" />
+                <property role="2xdLsb" value="warn" />
                 <node concept="Xl_RD" id="428_4iYyOss" role="9lYJi">
                   <property role="Xl_RC" value="exception while extracting presentation" />
                 </node>
@@ -25080,7 +25080,7 @@
               </node>
               <node concept="3clFbS" id="2HYHa0WQNUj" role="TDEfX">
                 <node concept="2xdQw9" id="YbzkzLtSD1" role="3cqZAp">
-                  <property role="2xdLsb" value="gZ5fksE/warn" />
+                  <property role="2xdLsb" value="warn" />
                   <node concept="Xl_RD" id="2HYHa0WQOxc" role="9lYJi">
                     <property role="Xl_RC" value="Error computing cellinfo" />
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
index 70a9cbdb..135b4743 100644
--- a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
+++ b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
@@ -33,12 +33,12 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 9d193a4e..01417557 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 54a89cad..f3ca949f 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@@ -3775,7 +3775,7 @@
                     <node concept="3Tm1VV" id="443LGHBiInM" role="1B3o_S" />
                     <node concept="3clFbS" id="443LGHBiInO" role="3clF47">
                       <node concept="RRSsy" id="4UWJfzxYHC8" role="3cqZAp">
-                        <property role="RRSoG" value="gZ5fksE/warn" />
+                        <property role="RRSoG" value="warn" />
                         <node concept="3cpWs3" id="4UWJfzxYI1C" role="RRSoy">
                           <node concept="37vLTw" id="4UWJfzxYIom" role="3uHU7w">
                             <ref role="3cqZAo" node="443LGHBiInJ" resolve="message" />
@@ -4247,7 +4247,7 @@
                   <node concept="3clFbH" id="2HYHa0WUUhS" role="3cqZAp" />
                   <node concept="3clFbH" id="1GKZK$A38Lc" role="3cqZAp" />
                   <node concept="2xdQw9" id="1GKZK$A3MMz" role="3cqZAp">
-                    <property role="2xdLsb" value="gZ5fksE/warn" />
+                    <property role="2xdLsb" value="warn" />
                     <node concept="Xl_RD" id="1GKZK$A3MM_" role="9lYJi">
                       <property role="Xl_RC" value="error" />
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd b/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
index bc34d9a9..5ee78fa4 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
@@ -25,12 +25,12 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 122717a1..19880847 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -5,7 +5,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -1946,6 +1946,7 @@
   </node>
   <node concept="Zd50a" id="5_Vai8e3aL3">
     <property role="TrG5h" value="Default" />
+    <property role="Zd52Q" value="$default" />
     <property role="Z2u3V" value="false" />
     <node concept="Zd509" id="5_Vai8e3aL4" role="Zd508">
       <ref role="1bYAoF" node="78H58oetvZ3" resolve="LaunchControlflowQuery" />
@@ -1964,14 +1965,14 @@
   </node>
   <node concept="Zd50a" id="5_Vai8e3bb5">
     <property role="TrG5h" value="MacOSX" />
-    <property role="Zd52Q" value="1mJS7WEAV1T/Mac_OS_X" />
+    <property role="Zd52Q" value="Mac OS X" />
     <property role="Z2u3V" value="false" />
     <node concept="Zd509" id="5_Vai8e3bb6" role="Zd508">
       <ref role="1bYAoF" node="78H58oetvZ3" resolve="LaunchControlflowQuery" />
       <node concept="pLAjd" id="5_Vai8e3bb7" role="Zd501">
         <property role="pLAjc" value="ctrl" />
         <property role="pLAjf" value="VK_F6" />
-        <property role="3hacHL" value="5SFo3Mf0QpD/replace_all" />
+        <property role="3hacHL" value="replace all" />
       </node>
     </node>
     <node concept="Zd509" id="5_Vai8e3UEx" role="Zd508">
@@ -1979,7 +1980,7 @@
       <node concept="pLAjd" id="5_Vai8e3UEy" role="Zd501">
         <property role="pLAjc" value="ctrl+alt" />
         <property role="pLAjf" value="VK_F6" />
-        <property role="3hacHL" value="5SFo3Mf0QpD/replace_all" />
+        <property role="3hacHL" value="replace all" />
       </node>
     </node>
   </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
index a1766fd5..13c9b3ed 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
+++ b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
@@ -16,9 +16,9 @@
     <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="1" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index abc05154..96a323bb 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index 66d60fb7..a8da2672 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -21,9 +21,9 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index fb41bdc5..6781d442 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <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="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -938,7 +938,7 @@
             <node concept="3clFbJ" id="NKt6ynosk7" role="3cqZAp">
               <node concept="3clFbS" id="NKt6ynosk8" role="3clFbx">
                 <node concept="RRSsy" id="NKt6ynosk9" role="3cqZAp">
-                  <property role="RRSoG" value="gZ5fksE/warn" />
+                  <property role="RRSoG" value="warn" />
                   <node concept="3cpWs3" id="NKt6ynoska" role="RRSoy">
                     <node concept="Xl_RD" id="NKt6ynoskb" role="3uHU7w">
                       <property role="Xl_RC" value="\&quot;" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
index 9b9550a9..8895c295 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
   </languages>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 44ce238e..9c19b474 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -5,7 +5,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
index fbfc27a6..c3033c46 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
@@ -17,9 +17,9 @@
     <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="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
index 3fffd23d..3491d0a6 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
@@ -2,7 +2,7 @@
 <model ref="r:bf5143f7-9856-43e8-8ae7-57cecc1fe6a9(jetbrains.mps.lang.controlflow.aspect)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <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="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
index 1b5633a9..fa4ba856 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
@@ -15,9 +15,9 @@
     <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="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index d65f0366..e0cee6cf 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <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="2" />
   </languages>
diff --git a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 16626bfd..b61807ce 100644
--- a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -19,7 +19,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index d9c9b724..afd73da3 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -27,10 +27,10 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index 33777945..9b292f0f 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -4,7 +4,7 @@
   <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="2" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
+    <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="9" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
index 1c08103e..77f1e30a 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
@@ -16,9 +16,9 @@
     <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="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
index 631d54e2..372c7414 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 25700ce5..a6c00d07 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -737,12 +737,8 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
@@ -774,33 +770,21 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <library file="${artifacts.mps}/languages/mps-stubs.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
       <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.java.stub.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-core.jar" />
+      <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-environment.jar" />
+      <library file="${artifacts.mps}/lib/mps-platform.jar" />
+      <library file="${artifacts.mps}/lib/mps-stubs.jar" />
+      <library file="${artifacts.mps}/lib/mps-test.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.migration.util.jar" />
@@ -857,20 +841,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -897,7 +880,6 @@
         <fileset file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
@@ -926,20 +908,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -968,20 +949,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1009,7 +989,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
@@ -1038,20 +1017,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1081,20 +1059,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1123,7 +1100,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
@@ -1152,20 +1128,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1196,20 +1171,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1237,7 +1211,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
@@ -1266,20 +1239,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1312,20 +1284,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -1410,12 +1381,8 @@
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
-      <pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
@@ -1444,32 +1411,20 @@
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <pathelement location="${artifacts.mps}/languages/mps-stubs.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
       <pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.java.stub.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-core.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-editor.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-environment.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-platform.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-stubs.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.migration.util.jar" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps
index 786339b7..3ff82d38 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:ca022d5c-fd0b-471c-8b4e-a0e11d3675f8(samples.fitch.firstOrderLogic.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
index 78b2725c..946ffa29 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:c18170ff-96aa-486a-aea5-01ae6cdbba3f(samples.fitch.firstOrderLogic.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps
index 27cdbe49..a51ca44a 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(samples.fitch.firstOrderLogic.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -100,16 +100,16 @@
     </node>
     <node concept="1TJgyj" id="3w0n0hzkQZl" role="1TKVEi">
       <property role="IQ2ns" value="4035326440040001493" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="left" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="bw37:2DPo4JTRwsJ" resolve="Term" />
     </node>
     <node concept="1TJgyj" id="3w0n0hzkQZn" role="1TKVEi">
       <property role="IQ2ns" value="4035326440040001495" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="right" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="bw37:2DPo4JTRwsJ" resolve="Term" />
     </node>
   </node>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 65a118fc..55ad8c1f 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -1314,7 +1314,7 @@
                   <node concept="3wWvb2" id="3dsgZcixPyc" role="3I6s78">
                     <node concept="2OqwBi" id="3dsgZcixPUk" role="3wWo3s">
                       <node concept="2s7oft" id="3dsgZcixQbH" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixQc7" role="2s7u9n">
                           <property role="Xl_RC" value="replacement is not OK" />
                         </node>
@@ -2101,7 +2101,7 @@
                   <node concept="3wWvb2" id="3dsgZcixT20" role="3I6s78">
                     <node concept="2OqwBi" id="3dsgZcixT21" role="3wWo3s">
                       <node concept="2s7oft" id="3dsgZcixT22" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixT23" role="2s7u9n">
                           <property role="Xl_RC" value="replacement is not OK" />
                         </node>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps
index 7b348b1d..835f3844 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:4c0e6503-314c-4f5e-9b48-78e8b9cc05ef(samples.fitch.firstOrderLogic.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 68b6405e..7063e41e 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -21,14 +21,14 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <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="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -66,31 +66,31 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
@@ -105,7 +105,6 @@
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
@@ -114,7 +113,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
index 9ff50deb..72d0bebc 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:3df2afd9-204b-4bdf-91b7-9ed29c61dfb1(samples.fitch.herbrandLogic.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps
index 29048f0a..b83c4628 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:0b1f15f7-167a-449c-aaf4-e2a3be522c90(samples.fitch.herbrandLogic.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <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)" />
   </languages>
@@ -73,7 +73,9 @@
       <concept id="4323500428136740385" name="jetbrains.mps.lang.editor.structure.CellIdReferenceSelector" flags="ng" index="2TlHUq">
         <reference id="4323500428136742952" name="id" index="2TlMyj" />
       </concept>
-      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2">
+        <property id="1186403771423" name="style" index="Vbekb" />
+      </concept>
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
@@ -117,6 +119,7 @@
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <property id="1130859485024" name="attractsFocus" index="1cu_pB" />
         <reference id="1139959269582" name="actionMap" index="1ERwB7" />
         <child id="4323500428121274054" name="id" index="2SqHTX" />
       </concept>
@@ -200,7 +203,9 @@
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
         <reference id="5455284157993911078" name="property" index="2pJxcJ" />
-        <child id="1595412875168045201" name="initValue" index="28ntcv" />
+      </concept>
+      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
+        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
       </concept>
       <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
         <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
@@ -273,6 +278,7 @@
       </node>
       <node concept="3F2HdR" id="2DPo4JTS3gj" role="3EZMnx">
         <property role="2czwfO" value="," />
+        <property role="1cu_pB" value="0" />
         <ref role="1NtTu8" to="bw37:2DPo4JTRwtv" resolve="argument" />
         <ref role="1ERwB7" node="2DPo4JTT9wr" resolve="Function_DeleteArguments" />
         <node concept="l2Vlx" id="2DPo4JTS3gl" role="2czzBx" />
@@ -337,6 +343,7 @@
       </node>
       <node concept="3F2HdR" id="2DPo4JTS3gZ" role="3EZMnx">
         <property role="2czwfO" value="," />
+        <property role="1cu_pB" value="0" />
         <ref role="1NtTu8" to="bw37:2DPo4JTRwtF" resolve="member" />
         <ref role="1ERwB7" node="2DPo4JTTm8h" resolve="Relation_DeleteMembers" />
         <node concept="l2Vlx" id="2DPo4JTS3h0" role="2czzBx" />
@@ -421,7 +428,7 @@
     <node concept="1Qtc8_" id="2DPo4JTSM6c" role="IW6Ez">
       <node concept="3cWJ9i" id="2DPo4JTSM6g" role="1Qtc8$">
         <node concept="CtIbL" id="2DPo4JTSM6i" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="2DPo4JTSM6m" role="1Qtc8A">
@@ -581,7 +588,7 @@
       </node>
       <node concept="3cWJ9i" id="2DPo4JTT2hn" role="1Qtc8$">
         <node concept="CtIbL" id="2DPo4JTT2ho" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -591,7 +598,7 @@
     <property role="3GE5qa" value="sentence" />
     <ref role="1h_SK9" to="bw37:2DPo4JTRwsP" resolve="Function" />
     <node concept="1hA7zw" id="2DPo4JTT9BG" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <property role="1hHO97" value="Delete argument list" />
       <node concept="1hAIg9" id="2DPo4JTT9BH" role="1hA7z_">
         <node concept="3clFbS" id="2DPo4JTT9BI" role="2VODD2">
@@ -664,7 +671,7 @@
     <property role="3GE5qa" value="sentence" />
     <ref role="1h_SK9" to="bw37:2DPo4JTRwtx" resolve="Relation" />
     <node concept="1hA7zw" id="2DPo4JTTm8i" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <property role="1hHO97" value="Delete members list" />
       <node concept="1hAIg9" id="2DPo4JTTm8j" role="1hA7z_">
         <node concept="3clFbS" id="2DPo4JTTm8k" role="2VODD2">
@@ -749,7 +756,7 @@
                 <ref role="2pJxaS" to="bw37:2DPo4JTRwsI" resolve="Object" />
                 <node concept="2pJxcG" id="2DPo4JTTBNJ" role="2pJxcM">
                   <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                  <node concept="ub8z3" id="2DPo4JTTBU1" role="28ntcv" />
+                  <node concept="ub8z3" id="2DPo4JTTBU1" role="2pJxcZ" />
                 </node>
               </node>
             </node>
@@ -801,7 +808,7 @@
                 <ref role="2pJxaS" to="bw37:2DPo4JTRwsM" resolve="Variable" />
                 <node concept="2pJxcG" id="2DPo4JTTRku" role="2pJxcM">
                   <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                  <node concept="ub8z3" id="2DPo4JTTRkv" role="28ntcv" />
+                  <node concept="ub8z3" id="2DPo4JTTRkv" role="2pJxcZ" />
                 </node>
               </node>
             </node>
@@ -1078,7 +1085,9 @@
       <node concept="3F0ifn" id="4h0MmDW8lXC" role="3EZMnx" />
       <node concept="3F0ifn" id="4h0MmDW8lXF" role="3EZMnx">
         <property role="3F0ifm" value="Eliminator for universal quantifier (∀)." />
-        <node concept="Vb9p2" id="4h0MmDW8lXJ" role="3F10Kt" />
+        <node concept="Vb9p2" id="4h0MmDW8lXJ" role="3F10Kt">
+          <property role="Vbekb" value="PLAIN" />
+        </node>
       </node>
       <node concept="3F0ifn" id="4h0MmDW8lXL" role="3EZMnx">
         <property role="3F0ifm" value="Must have one basis (premise) : a universal sentence (∀ X.SENTENCE)," />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps
index b7d48c6b..89666bd8 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -83,9 +83,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2DPo4JTRwtv" role="1TKVEi">
       <property role="IQ2ns" value="3059457401299011423" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="argument" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" node="2DPo4JTRwsJ" resolve="Term" />
     </node>
     <node concept="PrWs8" id="2DPo4JTRwsV" role="PzmwI">
@@ -104,16 +104,16 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2DPo4JTRwtr" role="1TKVEi">
       <property role="IQ2ns" value="3059457401299011419" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="variable" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="2DPo4JTRwsM" resolve="Variable" />
     </node>
     <node concept="1TJgyj" id="2DPo4JTRwts" role="1TKVEi">
       <property role="IQ2ns" value="3059457401299011420" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="sentence" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="2DPo4JTSLdQ" role="PzmwI">
@@ -129,16 +129,16 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2DPo4JTRwto" role="1TKVEi">
       <property role="IQ2ns" value="3059457401299011416" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="variable" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="2DPo4JTRwsM" resolve="Variable" />
     </node>
     <node concept="1TJgyj" id="2DPo4JTRwtm" role="1TKVEi">
       <property role="IQ2ns" value="3059457401299011414" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="sentence" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="2DPo4JTSLdN" role="PzmwI">
@@ -154,9 +154,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2DPo4JTRwtF" role="1TKVEi">
       <property role="IQ2ns" value="3059457401299011435" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="member" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" node="2DPo4JTRwsJ" resolve="Term" />
     </node>
     <node concept="PrWs8" id="2DPo4JTRwtB" role="PzmwI">
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 7f60efcb..d4ad1511 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -1398,7 +1398,7 @@
                   <node concept="3wWvb2" id="3dsgZcixU3w" role="3I6s78">
                     <node concept="2OqwBi" id="3dsgZcixU3x" role="3wWo3s">
                       <node concept="2s7oft" id="3dsgZcixU3y" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixU3z" role="2s7u9n">
                           <property role="Xl_RC" value="variable is not OK" />
                         </node>
@@ -2116,7 +2116,7 @@
                   <node concept="3wWvb2" id="3dsgZcixVeT" role="3I6s78">
                     <node concept="2OqwBi" id="3dsgZcixVeU" role="3wWo3s">
                       <node concept="2s7oft" id="3dsgZcixVeV" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixVeW" role="2s7u9n">
                           <property role="Xl_RC" value="term is not OK" />
                         </node>
@@ -2751,7 +2751,7 @@
                   <node concept="3wWvb2" id="3dsgZcixPyc" role="3I6s78">
                     <node concept="2OqwBi" id="3dsgZcixPUk" role="3wWo3s">
                       <node concept="2s7oft" id="3dsgZcixQbH" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixRqs" role="2s7u9n">
                           <property role="Xl_RC" value="variable is not OK" />
                         </node>
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps
index c4ab0fe4..1443dd1b 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:a131ff8b-2e4a-4043-b66f-532fa530a251(samples.fitch.herbrandLogic.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index 94248626..cb7e9ac7 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -21,14 +21,14 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <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="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -67,31 +67,31 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
@@ -107,7 +107,6 @@
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
@@ -116,7 +115,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
index fc9f3bcd..846b07f3 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
@@ -2,10 +2,10 @@
 <model ref="r:8ccc0587-6cb2-4342-adfa-b9156d0d1eeb(samples.fitch.propositionalLogic.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
index e704ffc3..eda88f39 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
@@ -2,9 +2,9 @@
 <model ref="r:2ca623f4-8f74-473f-b3b6-e9b637018c0b(samples.fitch.propositionalLogic.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" 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)" />
@@ -307,7 +307,7 @@
     <property role="TrG5h" value="And_Actions" />
     <ref role="1h_SK9" to="27wh:3JXBM6C3FnV" resolve="And" />
     <node concept="1hA7zw" id="3JXBM6C8NIo" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="3JXBM6C8NIp" role="1hA7z_">
         <node concept="3clFbS" id="3JXBM6C8NIq" role="2VODD2">
           <node concept="3cpWs8" id="3JXBM6C8YI2" role="3cqZAp">
@@ -480,7 +480,7 @@
     <property role="TrG5h" value="If_Actions" />
     <ref role="1h_SK9" to="27wh:3JXBM6C3Fph" resolve="If" />
     <node concept="1hA7zw" id="3JXBM6C9alQ" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="3JXBM6C9alR" role="1hA7z_">
         <node concept="3clFbS" id="3JXBM6C9alS" role="2VODD2">
           <node concept="3clFbF" id="3JXBM6C9c2K" role="3cqZAp">
@@ -550,7 +550,7 @@
     <property role="TrG5h" value="Iff_Actions" />
     <ref role="1h_SK9" to="27wh:3JXBM6C3Frx" resolve="Iff" />
     <node concept="1hA7zw" id="3JXBM6C9dQl" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="3JXBM6C9dQm" role="1hA7z_">
         <node concept="3clFbS" id="3JXBM6C9dQn" role="2VODD2">
           <node concept="3clFbF" id="3JXBM6C9f$R" role="3cqZAp">
@@ -628,7 +628,7 @@
     <property role="TrG5h" value="Not_Actions" />
     <ref role="1h_SK9" to="27wh:3JXBM6C3Cnn" resolve="Not" />
     <node concept="1hA7zw" id="3JXBM6C86ik" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="3JXBM6C86il" role="1hA7z_">
         <node concept="3clFbS" id="3JXBM6C86im" role="2VODD2">
           <node concept="3clFbF" id="3JXBM6C86iz" role="3cqZAp">
@@ -694,7 +694,7 @@
     <property role="TrG5h" value="Or_Actions" />
     <ref role="1h_SK9" to="27wh:3JXBM6C3FoA" resolve="Or" />
     <node concept="1hA7zw" id="3JXBM6C8ul9" role="1h_SK8">
-      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <property role="1hAc7j" value="delete_action_id" />
       <node concept="1hAIg9" id="3JXBM6C8ula" role="1hA7z_">
         <node concept="3clFbS" id="3JXBM6C8ulb" role="2VODD2">
           <node concept="3cpWs8" id="3JXBM6C8HbR" role="3cqZAp">
@@ -1052,7 +1052,7 @@
       </node>
       <node concept="3cWJ9i" id="3JXBM6C7kE2" role="1Qtc8$">
         <node concept="CtIbL" id="3JXBM6C7kE4" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
     </node>
@@ -1250,7 +1250,7 @@
       </node>
       <node concept="3cWJ9i" id="3JXBM6C7GZR" role="1Qtc8$">
         <node concept="CtIbL" id="3JXBM6C7GZS" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+          <property role="CtIbK" value="LEFT" />
         </node>
       </node>
     </node>
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps
index dffc9d61..4677f43d 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -53,9 +53,9 @@
     <property role="R4oN_" value="Conjunction" />
     <node concept="1TJgyj" id="3JXBM6C3FnW" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247817724" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="conjunct" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3Fsj" role="PzmwI">
@@ -82,16 +82,16 @@
     <property role="R4oN_" value="Implication" />
     <node concept="1TJgyj" id="3JXBM6C3Fpi" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247817810" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="antecedent" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="1TJgyj" id="3JXBM6C3Fpk" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247817812" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="consequent" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3Fss" role="PzmwI">
@@ -106,16 +106,16 @@
     <property role="R4oN_" value="Biconditional" />
     <node concept="1TJgyj" id="3JXBM6C3FrF" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247817963" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="antecedent" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="1TJgyj" id="3JXBM6C3FrG" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247817964" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="consequent" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3Fsu" role="PzmwI">
@@ -130,9 +130,9 @@
     <property role="R4oN_" value="Negation" />
     <node concept="1TJgyj" id="3JXBM6C3Cno" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247805400" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="target" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3Fsw" role="PzmwI">
@@ -147,9 +147,9 @@
     <property role="R4oN_" value="Disjunction" />
     <node concept="1TJgyj" id="3JXBM6C3Fp4" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247817796" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="disjunct" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" to="jfgh:4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3Fsy" role="PzmwI">
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index 8c56b742..4c064782 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps
index dd2f72e8..e4ea76e8 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:66ac687e-b631-4ad4-84c8-55502c32e02c(samples.fitch.propositionalLogic.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index 4397e017..9548403d 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -21,14 +21,14 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <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="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -65,31 +65,31 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
@@ -105,7 +105,6 @@
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
@@ -114,7 +113,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch/models/constraints.mps b/samples/fitch/languages/samples.fitch/models/constraints.mps
index 23bbdaaf..d1934ce9 100644
--- a/samples/fitch/languages/samples.fitch/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:3e3289bd-0103-48e0-beb3-89796cdeaf7c(samples.fitch.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
diff --git a/samples/fitch/languages/samples.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps
index af2ba776..b05f2cc4 100644
--- a/samples/fitch/languages/samples.fitch/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(samples.fitch.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="0272d3b4-4cc8-481e-9e2f-07793fbfcb41" name="jetbrains.mps.lang.editor.table" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/fitch/languages/samples.fitch/models/migration.mps b/samples/fitch/languages/samples.fitch/models/migration.mps
index 5a1da37b..bdf7a0c9 100644
--- a/samples/fitch/languages/samples.fitch/models/migration.mps
+++ b/samples/fitch/languages/samples.fitch/models/migration.mps
@@ -2,7 +2,7 @@
 <model ref="r:b0d68e87-c19f-44c1-8fed-3b2c58e7ac98(samples.fitch.migration)">
   <persistence version="9" />
   <languages>
-    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
+    <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="1" />
     <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
diff --git a/samples/fitch/languages/samples.fitch/models/structure.mps b/samples/fitch/languages/samples.fitch/models/structure.mps
index e4ece676..4995a78a 100644
--- a/samples/fitch/languages/samples.fitch/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch/models/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -59,9 +59,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3JXBM6C3MQ0" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247848320" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="basis" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" node="3JXBM6C3FsN" resolve="Reference" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3Pwg" role="PzmwI">
@@ -75,8 +75,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3JXBM6C3FuH" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247818157" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="reasoning" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3JXBM6C3UQB" resolve="Node" />
     </node>
   </node>
@@ -86,9 +87,9 @@
     <property role="3GE5qa" value="proof.reasoning" />
     <node concept="1TJgyj" id="2aBGSFggvpT" role="1TKVEi">
       <property role="IQ2ns" value="2497161927181071993" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="conclusion" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="4LBPYGV4cY1" resolve="Sentence" />
     </node>
     <node concept="PrWs8" id="3JXBM6C4o1Q" role="PrDN$">
@@ -114,9 +115,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3JXBM6C3UQ_" role="1TKVEi">
       <property role="IQ2ns" value="4322786184247881125" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="content" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" node="3JXBM6C3UQB" resolve="Node" />
     </node>
     <node concept="PrWs8" id="3JXBM6C3UQC" role="PzmwI">
@@ -172,9 +173,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="$u9BK__SA9" role="1TKVEi">
       <property role="IQ2ns" value="657004910291159433" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="sentence" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="4LBPYGV4cY1" resolve="Sentence" />
     </node>
   </node>
@@ -212,15 +213,15 @@
     </node>
     <node concept="1TJgyj" id="$u9BK__SAr" role="1TKVEi">
       <property role="IQ2ns" value="657004910291159451" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="goal" />
       <ref role="20lvS9" node="$u9BK__SA8" resolve="Goal" />
     </node>
     <node concept="1TJgyj" id="3JXBM6C4wQA" role="1TKVEi">
       <property role="IQ2ns" value="4322786184248036774" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="content" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
+      <property role="20lbJX" value="1..n" />
       <ref role="20lvS9" node="3JXBM6C3UQB" resolve="Node" />
     </node>
     <node concept="PrWs8" id="3w0n0hzhVZC" role="PzmwI">
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index d5709595..33be87c7 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -321,7 +321,7 @@
                   <node concept="3wWvb2" id="3dsgZcixPyc" role="3I6s78">
                     <node concept="2OqwBi" id="3dsgZcixPUk" role="3wWo3s">
                       <node concept="2s7oft" id="3dsgZcixQbH" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixQc7" role="2s7u9n">
                           <property role="Xl_RC" value="invalid" />
                         </node>
@@ -447,7 +447,7 @@
                         <ref role="3A2yKK" node="2YqrT$P7SAF" resolve="goal" />
                       </node>
                       <node concept="2s7oft" id="3dsgZcixQcU" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="3dsgZcixQcV" role="2s7u9n">
                           <property role="Xl_RC" value="invalid" />
                         </node>
diff --git a/samples/fitch/languages/samples.fitch/models/typesystem.mps b/samples/fitch/languages/samples.fitch/models/typesystem.mps
index f9b92258..136df543 100644
--- a/samples/fitch/languages/samples.fitch/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch/models/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:0fc28004-caa1-4d7f-a96d-1a8d903e1c13(samples.fitch.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports />
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 918e510e..4fd5c0d2 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -21,14 +21,14 @@
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <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="17" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -65,36 +65,36 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:0272d3b4-4cc8-481e-9e2f-07793fbfcb41:jetbrains.mps.lang.editor.table" version="0" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
-    <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
+    <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
@@ -109,7 +109,6 @@
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
@@ -118,7 +117,6 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
diff --git a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
index 4694fd45..c8a89d2b 100644
--- a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
+++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
@@ -308,7 +308,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="samples.fitch.demo" />
         <property role="3LESm3" value="86925f4e-7856-4553-a261-c86fbf09bb52" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="4$bYnYI$ZFO" role="3LF7KH">
           <node concept="2Ry0Ak" id="4$bYnYI$ZGE" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
diff --git a/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
index 2b81a4fe..5a6c4580 100644
--- a/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
+++ b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
@@ -19,7 +19,7 @@
     <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
     <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
index 530e9aa5..675bdcb4 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:d41e6e4e-dc07-45a8-bf02-65bd041c2454(samples.fitch.demo.firstOrderLogic@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
index cc7046f7..910e17a4 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:561d5575-77bb-481e-a4fe-d899693312ea(samples.fitch.demo.herbrandLogic@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
index d836c7a4..03c0fb8b 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:bbd46661-951f-4ac0-98b0-8d5304512807(samples.fitch.demo.propositionalLogic@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
index 0fc326d5..a832380b 100644
--- a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
+++ b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
@@ -20,10 +20,10 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:06b7c5c7-e359-4f4b-a581-5d0c9323af39:samples.fitch" version="1" />
     <language slang="l:ddb01c98-e78e-4c79-b11a-aeba193668d4:samples.fitch.firstOrderLogic" version="0" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index f28df778..87d8ec47 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -258,12 +258,8 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
@@ -294,31 +290,21 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <library file="${artifacts.mps}/languages/mps-stubs.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
       <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-core.jar" />
+      <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-environment.jar" />
+      <library file="${artifacts.mps}/lib/mps-platform.jar" />
+      <library file="${artifacts.mps}/lib/mps-stubs.jar" />
+      <library file="${artifacts.mps}/lib/mps-test.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
@@ -359,20 +345,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -416,20 +401,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -511,12 +495,8 @@
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
-      <pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
@@ -545,29 +525,20 @@
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <pathelement location="${artifacts.mps}/languages/mps-stubs.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
       <pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-core.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-editor.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-environment.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-platform.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-stubs.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
index dc8e8261..3605c6ee 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:49af371c-e432-4e5a-a3df-e689ebe20a8d(samples.lambdacalc.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" 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" />
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps
index fab183ae..36362c91 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:a4cbccba-ea60-4d22-9e76-4b461414bf5b(samples.lambdacalc.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -111,6 +111,7 @@
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <property id="1130859485024" name="attractsFocus" index="1cu_pB" />
         <child id="1142887637401" name="renderingCondition" index="pqm2j" />
       </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
@@ -563,7 +564,7 @@
     <node concept="1Qtc8_" id="7_8aRkgF6Dk" role="IW6Ez">
       <node concept="3cWJ9i" id="7_8aRkgF6Do" role="1Qtc8$">
         <node concept="CtIbL" id="7_8aRkgF6Dq" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+          <property role="CtIbK" value="RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="7_8aRkgFP5Q" role="1Qtc8A">
@@ -666,7 +667,7 @@
                 <node concept="1OKiuA" id="7_8aRkgHznQ" role="2OqNvi">
                   <node concept="1Q80Hx" id="7_8aRkgHzrr" role="lBI5i" />
                   <node concept="2B6iha" id="7_8aRkgHB0P" role="lGT1i">
-                    <property role="1lyBwo" value="1S2pyLby17G/firstEditable" />
+                    <property role="1lyBwo" value="firstEditable" />
                   </node>
                 </node>
               </node>
@@ -919,6 +920,7 @@
         <property role="3F0ifm" value="∀" />
       </node>
       <node concept="3F2HdR" id="48ZGLP7q1QZ" role="3EZMnx">
+        <property role="1cu_pB" value="0" />
         <property role="2czwfO" value=" " />
         <ref role="1NtTu8" to="8tt8:48ZGLP7q1Qc" resolve="typeVars" />
         <node concept="2iRfu4" id="48ZGLP7q1R2" role="2czzBx" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps
index 0fce40d7..6e28bf6c 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps
@@ -80,16 +80,16 @@
     <ref role="1TJDcQ" node="7_8aRkgDGPJ" resolve="Expr" />
     <node concept="1TJgyj" id="7_8aRkgDGPL" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982513" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="fun" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
     <node concept="1TJgyj" id="7_8aRkgDGPX" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982525" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="arg" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -108,16 +108,16 @@
     <ref role="1TJDcQ" node="7_8aRkgDGPJ" resolve="Expr" />
     <node concept="1TJgyj" id="7_8aRkgDGQg" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982544" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="binding" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGQi" resolve="LamVarBind" />
     </node>
     <node concept="1TJgyj" id="7_8aRkgDGQl" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982549" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -128,9 +128,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7_8aRkgDGQj" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982547" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="var" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPo" resolve="Var" />
     </node>
   </node>
@@ -142,15 +142,16 @@
     <ref role="1TJDcQ" node="7_8aRkgDGPJ" resolve="Expr" />
     <node concept="1TJgyj" id="7_8aRkgDGQv" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982559" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="binding" />
+      <property role="20lbJX" value="0..1" />
       <ref role="20lvS9" node="7_8aRkgDGQp" resolve="LetVarBind" />
     </node>
     <node concept="1TJgyj" id="7_8aRkgDGQx" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982561" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -161,16 +162,16 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7_8aRkgDGQq" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982554" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="var" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPo" resolve="Var" />
     </node>
     <node concept="1TJgyj" id="7_8aRkgDGQs" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982556" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -189,9 +190,9 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7_8aRkgDGQF" role="1TKVEi">
       <property role="IQ2ns" value="8739282858702982571" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="clause" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7_8aRkgDGQB" resolve="Clause" />
     </node>
     <node concept="PrWs8" id="7_8aRkgDGQD" role="PzmwI">
@@ -206,9 +207,9 @@
     <ref role="1TJDcQ" node="7_8aRkgDGQB" resolve="Clause" />
     <node concept="1TJgyj" id="2jleysRWVqE" role="1TKVEi">
       <property role="IQ2ns" value="2654091495521629866" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="binding" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGQp" resolve="LetVarBind" />
     </node>
     <node concept="PrWs8" id="1Lr58WGbe9B" role="PzmwI">
@@ -223,9 +224,9 @@
     <ref role="1TJDcQ" node="7_8aRkgDGQB" resolve="Clause" />
     <node concept="1TJgyj" id="7_8aRkgEZ_X" role="1TKVEi">
       <property role="IQ2ns" value="8739282858703321469" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -244,16 +245,16 @@
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
     <node concept="1TJgyj" id="3_qfG1EP6Op" role="1TKVEi">
       <property role="IQ2ns" value="4132684604212800793" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="argType" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
     <node concept="1TJgyj" id="3_qfG1EP6O_" role="1TKVEi">
       <property role="IQ2ns" value="4132684604212800805" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="resType" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
   </node>
@@ -293,8 +294,9 @@
     <ref role="1TJDcQ" node="7_8aRkgDGPJ" resolve="Expr" />
     <node concept="1TJgyj" id="7_zMfd$ooos" role="1TKVEi">
       <property role="IQ2ns" value="8747055848970356252" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="def" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPo" resolve="Var" />
     </node>
   </node>
@@ -310,23 +312,23 @@
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
     <node concept="1TJgyj" id="12dHl3ZCFaI" role="1TKVEi">
       <property role="IQ2ns" value="1192808835813913262" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
     <node concept="1TJgyj" id="48ZGLP7q1Qc" role="1TKVEi">
       <property role="IQ2ns" value="4773731068369444236" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="typeVars" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="3g9UT2j9I06" resolve="VarType" />
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHw4" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553596420" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="constraints" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="2O9ahh6mHvg" resolve="Constraint" />
     </node>
   </node>
@@ -345,23 +347,23 @@
     <ref role="1TJDcQ" node="7_8aRkgDGPJ" resolve="Expr" />
     <node concept="1TJgyj" id="6_p$mL233YL" role="1TKVEi">
       <property role="IQ2ns" value="7591258541060276145" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="cond" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
     <node concept="1TJgyj" id="6_p$mL233YR" role="1TKVEi">
       <property role="IQ2ns" value="7591258541060276151" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="pos" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
     <node concept="1TJgyj" id="6_p$mL233YU" role="1TKVEi">
       <property role="IQ2ns" value="7591258541060276154" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="neg" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -376,9 +378,9 @@
     </node>
     <node concept="1TJgyj" id="JqEP$8fvqp" role="1TKVEi">
       <property role="IQ2ns" value="854183478218847897" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -393,9 +395,9 @@
     </node>
     <node concept="1TJgyj" id="JqEP$8fvrp" role="1TKVEi">
       <property role="IQ2ns" value="854183478218847961" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="var" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPo" resolve="Var" />
     </node>
   </node>
@@ -408,9 +410,9 @@
     </node>
     <node concept="1TJgyj" id="JqEP$8fvrd" role="1TKVEi">
       <property role="IQ2ns" value="854183478218847949" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="ann" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
   </node>
@@ -421,8 +423,9 @@
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
     <node concept="1TJgyj" id="48ZGLP8$3cj" role="1TKVEi">
       <property role="IQ2ns" value="4773731068388848403" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="def" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3g9UT2j9I06" resolve="VarType" />
     </node>
   </node>
@@ -434,16 +437,16 @@
     <ref role="1TJDcQ" node="7_8aRkgDGPJ" resolve="Expr" />
     <node concept="1TJgyj" id="JqEP$8sgV6" role="1TKVEi">
       <property role="IQ2ns" value="854183478222196422" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="fst" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
     <node concept="1TJgyj" id="JqEP$8sgV8" role="1TKVEi">
       <property role="IQ2ns" value="854183478222196424" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="snd" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -455,16 +458,16 @@
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
     <node concept="1TJgyj" id="JqEP$8shbd" role="1TKVEi">
       <property role="IQ2ns" value="854183478222197453" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="fstType" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
     <node concept="1TJgyj" id="JqEP$8shbb" role="1TKVEi">
       <property role="IQ2ns" value="854183478222197451" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="sndType" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
   </node>
@@ -479,16 +482,16 @@
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHnJ" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595887" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="members" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="2O9ahh6mHnE" resolve="Prototype" />
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHnL" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595889" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="typeVar" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3g9UT2j9I06" resolve="VarType" />
     </node>
   </node>
@@ -501,9 +504,9 @@
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHnH" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595885" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="annVar" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="JqEP$8fvrm" resolve="AnnVar" />
     </node>
     <node concept="PrWs8" id="2O9ahh6tR0e" role="PzmwI">
@@ -518,22 +521,23 @@
     <ref role="1TJDcQ" node="7_8aRkgDGQB" resolve="Clause" />
     <node concept="1TJgyj" id="2O9ahh6mHnP" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595893" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="typeScheme" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="12dHl3ZCxTW" resolve="ForallType" />
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHnR" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595895" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="impls" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="2O9ahh6mHnU" resolve="PrototypeImpl" />
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHo2" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595906" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="typeclass" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="2O9ahh6mHnA" resolve="Typeclass" />
     </node>
   </node>
@@ -546,15 +550,16 @@
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHnX" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595901" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="proto" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="2O9ahh6mHnE" resolve="Prototype" />
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHnZ" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553595903" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="expr" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
@@ -566,14 +571,16 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2O9ahh6tFol" role="1TKVEi">
       <property role="IQ2ns" value="3245170173555422741" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="varRef" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="3g9UT2j9I06" resolve="VarType" />
     </node>
     <node concept="1TJgyj" id="2O9ahh6mHvj" role="1TKVEi">
       <property role="IQ2ns" value="3245170173553596371" />
+      <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="typeclass" />
-      <property role="20lbJX" value="fLJekj4/_1" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="2O9ahh6mHnA" resolve="Typeclass" />
     </node>
   </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 6822d8d4..ebf1f186 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" 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" />
@@ -190,9 +190,6 @@
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
-      <concept id="4056363777117001481" name="jetbrains.mps.lang.quotation.structure.StringToTypedValueMigrationInfo" flags="ng" index="AAgTk">
-        <property id="2173356959483005420" name="stringValueMigrated" index="3qcH_f" />
-      </concept>
       <concept id="1196866233735" name="jetbrains.mps.lang.quotation.structure.PropertyAntiquotation" flags="ng" index="2EMmih" />
     </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
@@ -3615,7 +3612,7 @@
                         <ref role="3A2yKK" node="44a9n8ErWrh" resolve="app" />
                       </node>
                       <node concept="2s7oft" id="6K6UrSyIeTu" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="2YIFZM" id="6K6UrSyIfsz" role="2s7u9n">
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                           <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
@@ -3821,7 +3818,7 @@
                         <ref role="3A2yKK" node="6_p$mL23fzC" resolve="ite" />
                       </node>
                       <node concept="2s7oft" id="6K6UrSyIgs7" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="6K6UrSyIgtz" role="2s7u9n">
                           <property role="Xl_RC" value="mismatched type" />
                         </node>
@@ -5491,7 +5488,6 @@
                             <property role="2qtEX9" value="name" />
                             <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
                             <property role="3hQQBS" value="VarType" />
-                            <property role="3qcH_f" value="true" />
                             <node concept="1TmgYN" id="48ZGLP8Lim5" role="2c44t1">
                               <node concept="1nq8_$" id="48ZGLP8Lim6" role="1Tms7$">
                                 <node concept="a7P8L" id="48ZGLP8Lim7" role="1nq8_t">
@@ -5622,7 +5618,6 @@
                                 <property role="2qtEX9" value="name" />
                                 <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
                                 <property role="3hQQBS" value="VarType" />
-                                <property role="3qcH_f" value="true" />
                                 <node concept="1TmgYN" id="2O9ahh6LnAP" role="2c44t1">
                                   <node concept="1nq8_$" id="2O9ahh6LnBa" role="1Tms7$">
                                     <node concept="a7P8L" id="2O9ahh6LnB8" role="1nq8_t">
@@ -6714,7 +6709,6 @@
                               <node concept="2EMmih" id="47tET_X1EJF" role="lGtFl">
                                 <property role="2qtEX9" value="typeclassName" />
                                 <property role="P4ACc" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4746138258032205784/4746138258032205785" />
-                                <property role="3qcH_f" value="true" />
                                 <node concept="1TmgYN" id="47tET_X1EJJ" role="2c44t1">
                                   <node concept="1nq8_$" id="47tET_X1EJR" role="1Tms7$">
                                     <node concept="a7P8L" id="47tET_X1EJP" role="1nq8_t">
@@ -6726,7 +6720,6 @@
                               <node concept="2EMmih" id="47tET_X1EJU" role="lGtFl">
                                 <property role="2qtEX9" value="typeVarName" />
                                 <property role="P4ACc" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4746138258032205784/4746138258034063219" />
-                                <property role="3qcH_f" value="true" />
                                 <node concept="1TmgYN" id="47tET_X1EK2" role="2c44t1">
                                   <node concept="1nq8_$" id="47tET_X1EKa" role="1Tms7$">
                                     <node concept="a7P8L" id="47tET_X38ZZ" role="1nq8_t">
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index 745a4bc7..14a21357 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -32,32 +32,32 @@
     <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="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <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="3" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <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="1" />
     <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="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
     <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:samples.lambdacalc" version="0" />
   </languageVersions>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
index e2c62f77..7afbf4dd 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
@@ -175,7 +175,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="samples.lambdacalc.demo" />
         <property role="3LESm3" value="05f15741-5274-4aed-a086-84d9a15ab93b" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="7E7FS_VaVBC" role="3LF7KH">
           <node concept="2Ry0Ak" id="7E7FS_VaVC3" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
index 4873e4ec..32d0b038 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
@@ -19,7 +19,7 @@
     <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
     <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index d727d33a..cc1d50b9 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:f6344a84-a2b8-4892-8b2e-6291d7f50a97(samples.lambdacalc.demo@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
index 20301771..807faea1 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
@@ -17,10 +17,10 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index c09daaf6..7c9327fd 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -314,12 +314,8 @@
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
@@ -349,32 +345,22 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <library file="${artifacts.mps}/languages/mps-stubs.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
       <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
       <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-core.jar" />
+      <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-environment.jar" />
+      <library file="${artifacts.mps}/lib/mps-platform.jar" />
+      <library file="${artifacts.mps}/lib/mps-stubs.jar" />
+      <library file="${artifacts.mps}/lib/mps-test.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
@@ -416,20 +402,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -483,20 +468,19 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -545,21 +529,20 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@@ -642,12 +625,8 @@
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
-      <pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
@@ -676,29 +655,20 @@
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
-      <pathelement location="${artifacts.mps}/languages/mps-stubs.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
-      <pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
       <pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
-      <pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
-      <pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-core.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-editor.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-environment.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-platform.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-stubs.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 5aca8fa0..788b36b0 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -29,22 +29,22 @@
     <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="2" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
     <language slang="l:2e120f68-abfb-4980-bb1c-bc70159b1f95:jetbrains.mps.lang.controlflow" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index bf24aa8c..9e85ae7a 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -627,7 +627,7 @@
                         <ref role="3A2yKK" node="6Yb9hAqKS2R" resolve="stmt" />
                       </node>
                       <node concept="2s7oft" id="6Yb9hAqKSzp" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="6Yb9hAqKSzq" role="2s7u9n">
                           <property role="Xl_RC" value="unreachable statement" />
                         </node>
@@ -750,7 +750,7 @@
                         <ref role="3A2yKK" node="6Yb9hAqL3dc" resolve="expr" />
                       </node>
                       <node concept="2s7oft" id="6Yb9hAqL3wd" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="6Yb9hAqL3we" role="2s7u9n">
                           <property role="Xl_RC" value="unreachable expression" />
                         </node>
@@ -822,7 +822,7 @@
                         <ref role="3A2yKK" node="6Yb9hAqONDu" resolve="lvd" />
                       </node>
                       <node concept="2s7oft" id="FAZzzit0yJ" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="FAZzzit0yK" role="2s7u9n">
                           <property role="Xl_RC" value="unused assignment" />
                         </node>
@@ -974,7 +974,7 @@
                         <ref role="3A2yKK" node="6Yb9hAqONDu" resolve="lvd" />
                       </node>
                       <node concept="2s7oft" id="6F9w2VbPMU_" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="6F9w2VbPMUA" role="2s7u9n">
                           <property role="Xl_RC" value="unused assignment" />
                         </node>
@@ -1112,7 +1112,7 @@
                             <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
                           </node>
                           <node concept="2s7oft" id="FAZzzit0x8" role="2OqNvi">
-                            <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                            <property role="2s7ueQ" value="error" />
                             <node concept="Xl_RD" id="FAZzzit0x9" role="2s7u9n">
                               <property role="Xl_RC" value="unused assignment" />
                             </node>
@@ -1231,7 +1231,7 @@
                             <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
                           </node>
                           <node concept="2s7oft" id="5YmBCzQNbnM" role="2OqNvi">
-                            <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                            <property role="2s7ueQ" value="error" />
                             <node concept="Xl_RD" id="5YmBCzQNbnN" role="2s7u9n">
                               <property role="Xl_RC" value="unused assignment" />
                             </node>
@@ -1283,7 +1283,7 @@
                               <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
                             </node>
                             <node concept="2s7oft" id="AoTMCCZmSJ" role="2OqNvi">
-                              <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                              <property role="2s7ueQ" value="error" />
                               <node concept="Xl_RD" id="AoTMCCZmSK" role="2s7u9n">
                                 <property role="Xl_RC" value="uninitialized read" />
                               </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps
index 055a85f9..4e1d2b98 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:e5022488-eabe-41a9-8cb7-295cff00cbac(jetbrains.mps.baseLanguageExt.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 28fe2289..186bde94 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -7,14 +7,14 @@
     <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.coderules" version="15" />
     <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="3" />
+    <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="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <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="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="-1" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
   </languages>
   <imports>
@@ -342,9 +342,6 @@
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
-      <concept id="4056363777117001481" name="jetbrains.mps.lang.quotation.structure.StringToTypedValueMigrationInfo" flags="ng" index="AAgTk">
-        <property id="2173356959483005420" name="stringValueMigrated" index="3qcH_f" />
-      </concept>
       <concept id="1196866233735" name="jetbrains.mps.lang.quotation.structure.PropertyAntiquotation" flags="ng" index="2EMmih" />
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
@@ -2613,7 +2610,7 @@
                         <ref role="3cqZAo" node="5moyjRHvuZ1" resolve="declType" />
                       </node>
                       <node concept="2s7oft" id="5moyjRHtRmA" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="5moyjRHtRmG" role="2s7u9n">
                           <property role="Xl_RC" value="malformed type" />
                         </node>
@@ -5543,7 +5540,7 @@
                         <ref role="3A2yKK" node="3m6K8XLd3xH" resolve="dcc" />
                       </node>
                       <node concept="2s7oft" id="5moyjRHxg57" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="5moyjRHxg5d" role="2s7u9n">
                           <property role="Xl_RC" value="malformed type" />
                         </node>
@@ -6027,7 +6024,7 @@
                         <ref role="3A2yKK" node="70Wv0dIXgif" resolve="anonCls" />
                       </node>
                       <node concept="2s7oft" id="70Wv0dIXKMd" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                        <property role="2s7ueQ" value="error" />
                         <node concept="Xl_RD" id="70Wv0dIXKMj" role="2s7u9n">
                           <property role="Xl_RC" value="malformed type" />
                         </node>
@@ -9174,7 +9171,7 @@
                             <ref role="3cqZAo" node="1Py6iKTFGZ" resolve="expr" />
                           </node>
                           <node concept="2s7oft" id="1Py6iKVsm9" role="2OqNvi">
-                            <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                            <property role="2s7ueQ" value="error" />
                             <node concept="Xl_RD" id="1Py6iKVsmf" role="2s7u9n">
                               <property role="Xl_RC" value="incompatible type" />
                             </node>
@@ -9415,7 +9412,7 @@
                             <ref role="3cqZAo" node="3Be4SRvyYCq" resolve="retExpr" />
                           </node>
                           <node concept="2s7oft" id="3Be4SRvxg6t" role="2OqNvi">
-                            <property role="2s7ueQ" value="oI9Ys1lFm/error" />
+                            <property role="2s7ueQ" value="error" />
                             <node concept="Xl_RD" id="3Be4SRvxg6z" role="2s7u9n">
                               <property role="Xl_RC" value="incompatible type" />
                             </node>
@@ -16073,7 +16070,7 @@
             </node>
             <node concept="1KehLL" id="35YJGAK1kdv" role="lGtFl">
               <property role="1K8rM7" value="Constant_1tuneh_a0f0" />
-              <property role="1Kfyot" value="Fg1jLUVyTf/left" />
+              <property role="1Kfyot" value="left" />
             </node>
           </node>
         </node>
@@ -19501,7 +19498,7 @@
                         <ref role="3A2yKK" node="35YJGAJTUl$" resolve="expr" />
                       </node>
                       <node concept="2s7oft" id="35YJGAJTWtw" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFj/warning" />
+                        <property role="2s7ueQ" value="warning" />
                         <node concept="Xl_RD" id="35YJGAJTWtA" role="2s7u9n">
                           <property role="Xl_RC" value="expression has no type" />
                         </node>
@@ -19563,7 +19560,7 @@
                         <ref role="3A2yKK" node="35YJGAJTUle" resolve="op" />
                       </node>
                       <node concept="2s7oft" id="35YJGAJTWu1" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFj/warning" />
+                        <property role="2s7ueQ" value="warning" />
                         <node concept="Xl_RD" id="35YJGAJTWu2" role="2s7u9n">
                           <property role="Xl_RC" value="no type" />
                         </node>
@@ -19625,7 +19622,7 @@
                         <ref role="3A2yKK" node="35YJGAJTUkS" resolve="vd" />
                       </node>
                       <node concept="2s7oft" id="35YJGAJTW_H" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFj/warning" />
+                        <property role="2s7ueQ" value="warning" />
                         <node concept="Xl_RD" id="35YJGAJTW_I" role="2s7u9n">
                           <property role="Xl_RC" value="no type" />
                         </node>
@@ -19687,7 +19684,7 @@
                         <ref role="3A2yKK" node="35YJGAJTUky" resolve="ac" />
                       </node>
                       <node concept="2s7oft" id="35YJGAJTWH_" role="2OqNvi">
-                        <property role="2s7ueQ" value="oI9Ys1lFj/warning" />
+                        <property role="2s7ueQ" value="warning" />
                         <node concept="Xl_RD" id="35YJGAJTWHA" role="2s7u9n">
                           <property role="Xl_RC" value="no type" />
                         </node>
@@ -21696,7 +21693,6 @@
                           <node concept="2EMmih" id="6EY0p2yPlzG" role="lGtFl">
                             <property role="P4ACc" value="7a5dda62-9140-4668-ab76-d5ed1746f2b2/1185281562361/1185281562362" />
                             <property role="2qtEX9" value="errorText" />
-                            <property role="3qcH_f" value="true" />
                             <node concept="Xl_RD" id="6EY0p2yN7iy" role="2c44t1">
                               <property role="Xl_RC" value="type is unknown" />
                             </node>
@@ -21752,7 +21748,6 @@
                           <node concept="2EMmih" id="27bTNFf1_H0" role="lGtFl">
                             <property role="P4ACc" value="7a5dda62-9140-4668-ab76-d5ed1746f2b2/1185281562361/1185281562362" />
                             <property role="2qtEX9" value="errorText" />
-                            <property role="3qcH_f" value="true" />
                             <node concept="3cpWs3" id="27bTNFf1_H1" role="2c44t1">
                               <node concept="Xl_RD" id="27bTNFf1_H2" role="3uHU7w">
                                 <property role="Xl_RC" value="]" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
index e6dba203..b4d10125 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
@@ -22,10 +22,10 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 0d316e78..1629a8f5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -2,12 +2,12 @@
 <model ref="r:fa6dd7ac-0e7d-4b3f-be36-f9e40c08eea0(jetbrains.mps.baseLanguageExt.test.types@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <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="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 927734df..3d9bf0f3 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -258,7 +258,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.baseLanguageExt.test" />
         <property role="3LESm3" value="e44e7802-2e40-482b-9b1c-6d42660a6a11" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="69UmpDmJW8L" role="3LF7KH">
           <node concept="2Ry0Ak" id="69UmpDmJW9Q" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
@@ -310,7 +310,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="typechecking.samples.baseLanguage" />
         <property role="3LESm3" value="3ddddf69-9ff0-426b-9365-51ae7356fb82" />
-        <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="aoJFB" value="sources and tests" />
         <node concept="55IIr" id="69UmpDmJW3z" role="3LF7KH">
           <node concept="2Ry0Ak" id="69UmpDmJW46" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
diff --git a/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
index f694015e..74af164b 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
+++ b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
@@ -19,7 +19,7 @@
     <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
     <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
index 458ed22a..b167a216 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
@@ -2,10 +2,10 @@
 <model ref="r:824b7f7a-36f1-4ceb-b9c5-4f2330a84b68(typechecking.samples.baseLanguage.bounds.bad@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
index de68049b..909a10ba 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
@@ -2,10 +2,10 @@
 <model ref="r:3c98ca77-7294-4178-95ee-dc8a69bdf136(typechecking.samples.baseLanguage.bounds@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
index 342ec56b..2f6cbd81 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
@@ -2,13 +2,13 @@
 <model ref="r:89f58693-874d-4459-b352-b95efabcc527(typechecking.samples.baseLanguage.codeAnal@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -279,7 +279,7 @@
           <node concept="9aQIb" id="2rIdnPwwLPG" role="9aQIa">
             <node concept="3clFbS" id="2rIdnPwwLPH" role="9aQI4">
               <node concept="RRSsy" id="2rIdnPuCRgJ" role="3cqZAp">
-                <property role="RRSoG" value="gZ5fksE/warn" />
+                <property role="RRSoG" value="warn" />
                 <node concept="Xl_RD" id="2rIdnPuCRgL" role="RRSoy">
                   <property role="Xl_RC" value="Test is disabled in non-CI enviroment" />
                 </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
index 6c59ed97..4b9154d8 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:edd793b1-5d54-477c-b734-287412ef4ebc(typechecking.samples.baseLanguage.features@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
index b572ba93..4649b6fb 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:f8b60e06-37d4-4bdb-8c1d-f824bd01dff4(typechecking.samples.baseLanguage.helloWorld@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
index 5585a50f..6830f991 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:eff88867-8c71-468f-947b-72ebaca06455(typechecking.samples.baseLanguage.simpleGenerics@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
index b80157b6..06892f2c 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
@@ -2,9 +2,9 @@
 <model ref="r:0972c651-627a-4ccd-a36d-473e448a2f07(typechecking.samples.baseLanguage.slice@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
index 1bb5469e..ad39c299 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
@@ -22,12 +22,12 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />