diff --git a/samples/fitch/.mps/migration.xml b/samples/fitch/.mps/migration.xml
index f5b58e7f..00395c95 100644
--- a/samples/fitch/.mps/migration.xml
+++ b/samples/fitch/.mps/migration.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
   </component>
 </project>
\ No newline at end of file
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index c564da8d..51d79030 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:a40f7100-fd07-4b1c-98c5-112d92c92128(samples.fitch.firstOrderLogic.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
@@ -307,10 +307,6 @@
       <concept id="8581119423153238082" name="jetbrains.mps.lang.coderules.structure.NodeAnchor" flags="ng" index="3BlFb$">
         <child id="8581119423153238083" name="node" index="3BlFb_" />
       </concept>
-      <concept id="1877115349178398764" name="jetbrains.mps.lang.coderules.structure.EqualsConstraint" flags="ng" index="3GeI9q">
-        <child id="1877115349178398815" name="right" index="3GeI8D" />
-        <child id="1877115349178398813" name="left" index="3GeI8F" />
-      </concept>
       <concept id="1553157749316176827" name="jetbrains.mps.lang.coderules.structure.PatternLogicalVariable" flags="ng" index="1HFMs5">
         <child id="5131913661993028915" name="variable" index="1uarlU" />
         <child id="5131913661993028917" name="value" index="1uarlW" />
@@ -397,11 +393,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="3w0n0hzlYj1" role="3cqZAp">
-            <node concept="3GeI9q" id="3w0n0hzlYiV" role="3Aqpz8">
-              <node concept="aZ4PW" id="3w0n0hzlYje" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN57" role="3Aqpz8">
+              <node concept="aZ4PW" id="3w0n0hzlYje" role="3A8wtg">
                 <node concept="3txIi4" id="3w0n0hzlYjk" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJ8V" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJ8V" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
                 <node concept="nsMwS" id="7VBaGntKJ8W" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
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 d7235d11..49577766 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -67,7 +67,7 @@
     <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="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="14" />
+    <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="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" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 36fd8ff5..ad0f6cda 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(samples.fitch.herbrandLogic.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" 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="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
@@ -402,10 +402,6 @@
       <concept id="8581119423153238082" name="jetbrains.mps.lang.coderules.structure.NodeAnchor" flags="ng" index="3BlFb$">
         <child id="8581119423153238083" name="node" index="3BlFb_" />
       </concept>
-      <concept id="1877115349178398764" name="jetbrains.mps.lang.coderules.structure.EqualsConstraint" flags="ng" index="3GeI9q">
-        <child id="1877115349178398815" name="right" index="3GeI8D" />
-        <child id="1877115349178398813" name="left" index="3GeI8F" />
-      </concept>
       <concept id="1553157749316176827" name="jetbrains.mps.lang.coderules.structure.PatternLogicalVariable" flags="ng" index="1HFMs5">
         <child id="5131913661993028915" name="variable" index="1uarlU" />
         <child id="5131913661993028917" name="value" index="1uarlW" />
@@ -455,11 +451,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="Vo$tzLEEIh" role="3cqZAp">
-            <node concept="3GeI9q" id="Vo$tzLEEIe" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLEEIz" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN5r" role="3Aqpz8">
+              <node concept="aZ4PW" id="Vo$tzLEEIz" role="3A8wtg">
                 <node concept="3txIi4" id="Vo$tzLEEID" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJam" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJam" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
                 <node concept="nsMwS" id="7VBaGntKJan" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ6S" resolve="variable" />
@@ -562,11 +558,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="Vo$tzLEFMr" role="3cqZAp">
-            <node concept="3GeI9q" id="Vo$tzLEFMs" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLEFMt" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN5s" role="3Aqpz8">
+              <node concept="aZ4PW" id="Vo$tzLEFMt" role="3A8wtg">
                 <node concept="3txIi4" id="Vo$tzLEFMu" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJap" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJap" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
                 <node concept="nsMwS" id="7VBaGntKJaq" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ6W" resolve="variable" />
@@ -743,11 +739,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="Vo$tzLIpZC" role="3cqZAp">
-            <node concept="3GeI9q" id="Vo$tzLIpZD" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLIpZE" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN5t" role="3Aqpz8">
+              <node concept="aZ4PW" id="Vo$tzLIpZE" role="3A8wtg">
                 <node concept="3txIi4" id="Vo$tzLIpZF" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJav" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJav" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6Y" resolve="Relation" />
                 <node concept="nsMwS" id="7VBaGntKJaw" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ70" resolve="name" />
@@ -798,11 +794,11 @@
       <node concept="3uniRm" id="Vo$tzLIbP6" role="3unh6L">
         <node concept="3clFbS" id="Vo$tzLIbPc" role="3uniRr">
           <node concept="3Aqczg" id="Vo$tzLIbPb" role="3cqZAp">
-            <node concept="3GeI9q" id="Vo$tzLIbP8" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLIbPi" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN5u" role="3Aqpz8">
+              <node concept="aZ4PW" id="Vo$tzLIbPi" role="3A8wtg">
                 <node concept="3txIi4" id="Vo$tzLIbPo" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJab" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJab" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ72" resolve="Object" />
                 <node concept="nsMwS" id="7VBaGntKJac" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ74" resolve="name" />
@@ -873,15 +869,15 @@
           <node concept="3clFbJ" id="2oO2uzBX6DW" role="3cqZAp">
             <node concept="3clFbS" id="2oO2uzBX6DX" role="3clFbx">
               <node concept="3Aqczg" id="2oO2uzBX6DY" role="3cqZAp">
-                <node concept="3GeI9q" id="2oO2uzBX6DZ" role="3Aqpz8">
-                  <node concept="aZ4PW" id="2oO2uzBX6E1" role="3GeI8D">
+                <node concept="3A8Hvi" id="5TfjU0xtN5v" role="3Aqpz8">
+                  <node concept="aZ4PW" id="2oO2uzBX6LO" role="3A8wtg">
+                    <node concept="3txIi4" id="2oO2uzBX6LU" role="aZ4eD" />
+                  </node>
+                  <node concept="aZ4PW" id="2oO2uzBX6E1" role="3A8w4Q">
                     <node concept="37vLTw" id="2oO2uzBX6E2" role="aZ4eD">
                       <ref role="3cqZAo" node="2oO2uzBX6DP" resolve="VarSubs" />
                     </node>
                   </node>
-                  <node concept="aZ4PW" id="2oO2uzBX6LO" role="3GeI8F">
-                    <node concept="3txIi4" id="2oO2uzBX6LU" role="aZ4eD" />
-                  </node>
                 </node>
               </node>
               <node concept="3clFbH" id="2oO2uzBX6E3" role="3cqZAp" />
@@ -895,11 +891,11 @@
             <node concept="9aQIb" id="2oO2uzBX6E7" role="9aQIa">
               <node concept="3clFbS" id="2oO2uzBX6E8" role="9aQI4">
                 <node concept="3Aqczg" id="Vo$tzLIbUM" role="3cqZAp">
-                  <node concept="3GeI9q" id="Vo$tzLIbUJ" role="3Aqpz8">
-                    <node concept="aZ4PW" id="Vo$tzLIbUT" role="3GeI8F">
+                  <node concept="3A8Hvi" id="5TfjU0xtN5w" role="3Aqpz8">
+                    <node concept="aZ4PW" id="Vo$tzLIbUT" role="3A8wtg">
                       <node concept="3txIi4" id="Vo$tzLIbUZ" role="aZ4eD" />
                     </node>
-                    <node concept="ns1u0" id="7VBaGntKJay" role="3GeI8D">
+                    <node concept="ns1u0" id="7VBaGntKJay" role="3A8w4Q">
                       <ref role="ns1xF" node="7VBaGntKJ75" resolve="Variable" />
                       <node concept="nsMwS" id="7VBaGntKJaz" role="ns1xD">
                         <ref role="nsMwP" node="7VBaGntKJ77" resolve="name" />
@@ -1026,11 +1022,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="Vo$tzLIpQv" role="3cqZAp">
-            <node concept="3GeI9q" id="Vo$tzLIpQp" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLIpQR" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN5x" role="3Aqpz8">
+              <node concept="aZ4PW" id="Vo$tzLIpQR" role="3A8wtg">
                 <node concept="3txIi4" id="Vo$tzLIpRh" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJaB" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJaB" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ78" resolve="Function" />
                 <node concept="nsMwS" id="7VBaGntKJaC" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ7a" resolve="name" />
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 9c4e1a1b..c47d4437 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -68,7 +68,7 @@
     <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="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="14" />
+    <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="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" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index 6d9942c9..fc6ee723 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
+    <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="8" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
@@ -234,6 +234,10 @@
       <concept id="7368070394769139970" name="jetbrains.mps.lang.coderules.structure.RuleInputReference" flags="ng" index="3A2sRY">
         <reference id="7368070394769213644" name="declaration" index="3A2yKK" />
       </concept>
+      <concept id="7368070394770780974" name="jetbrains.mps.lang.coderules.structure.UnifiesConstraint" flags="ng" index="3A8Hvi">
+        <child id="7368070394770793930" name="value" index="3A8w4Q" />
+        <child id="7368070394770793388" name="assignee" index="3A8wtg" />
+      </concept>
       <concept id="7368070394766963750" name="jetbrains.mps.lang.coderules.structure.Head" flags="ng" index="3Aq93q">
         <property id="7368070394767443940" name="keep" index="3ArMco" />
       </concept>
@@ -257,10 +261,6 @@
       <concept id="8581119423153238082" name="jetbrains.mps.lang.coderules.structure.NodeAnchor" flags="ng" index="3BlFb$">
         <child id="8581119423153238083" name="node" index="3BlFb_" />
       </concept>
-      <concept id="1877115349178398764" name="jetbrains.mps.lang.coderules.structure.EqualsConstraint" flags="ng" index="3GeI9q">
-        <child id="1877115349178398815" name="right" index="3GeI8D" />
-        <child id="1877115349178398813" name="left" index="3GeI8F" />
-      </concept>
       <concept id="1553157749316176827" name="jetbrains.mps.lang.coderules.structure.PatternLogicalVariable" flags="ng" index="1HFMs5">
         <child id="5131913661993028915" name="variable" index="1uarlU" />
         <child id="5131913661993028917" name="value" index="1uarlW" />
@@ -306,11 +306,11 @@
       <node concept="3uniRm" id="5RfK0kxl0X2" role="3unh6L">
         <node concept="3clFbS" id="5RfK0kxl0X9" role="3uniRr">
           <node concept="3Aqczg" id="5RfK0kxl0YB" role="3cqZAp">
-            <node concept="3GeI9q" id="5RfK0kxl0Yx" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxl0YQ" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN79" role="3Aqpz8">
+              <node concept="aZ4PW" id="5RfK0kxl0YQ" role="3A8wtg">
                 <node concept="3txIi4" id="5RfK0kxl0ZL" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJe2" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJe2" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ7X" resolve="Const" />
                 <node concept="nsMwS" id="7VBaGntKJe3" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ7Z" resolve="name" />
@@ -418,11 +418,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="5RfK0kxlc3S" role="3cqZAp">
-            <node concept="3GeI9q" id="5RfK0kxlc3M" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxlc4q" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN7a" role="3Aqpz8">
+              <node concept="aZ4PW" id="5RfK0kxlc4q" role="3A8wtg">
                 <node concept="3txIi4" id="5RfK0kxlc4w" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJeh" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJeh" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
                 <node concept="nsMwS" id="7VBaGntKJei" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ82" resolve="conjuncts" />
@@ -532,11 +532,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="5RfK0kxld9U" role="3cqZAp">
-            <node concept="3GeI9q" id="5RfK0kxld9V" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxld9W" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN7b" role="3Aqpz8">
+              <node concept="aZ4PW" id="5RfK0kxld9W" role="3A8wtg">
                 <node concept="3txIi4" id="5RfK0kxld9X" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJf3" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJf3" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
                 <node concept="nsMwS" id="7VBaGntKJf4" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ85" resolve="disjuncts" />
@@ -596,11 +596,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="5RfK0kxlwEC" role="3cqZAp">
-            <node concept="3GeI9q" id="5RfK0kxlwEy" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxlwEN" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN7c" role="3Aqpz8">
+              <node concept="aZ4PW" id="5RfK0kxlwEN" role="3A8wtg">
                 <node concept="3txIi4" id="5RfK0kxlwET" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJej" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJej" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
                 <node concept="nsMwS" id="7VBaGntKJek" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ88" resolve="target" />
@@ -691,11 +691,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="5RfK0kxlxKk" role="3cqZAp">
-            <node concept="3GeI9q" id="5RfK0kxlxKe" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxlxK$" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN7d" role="3Aqpz8">
+              <node concept="aZ4PW" id="5RfK0kxlxK$" role="3A8wtg">
                 <node concept="3txIi4" id="5RfK0kxlxKE" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJeG" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJeG" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
                 <node concept="nsMwS" id="7VBaGntKJeH" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ8b" resolve="antecedent" />
@@ -794,11 +794,11 @@
             </node>
           </node>
           <node concept="3Aqczg" id="5RfK0kxly76" role="3cqZAp">
-            <node concept="3GeI9q" id="5RfK0kxly77" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxly78" role="3GeI8F">
+            <node concept="3A8Hvi" id="5TfjU0xtN7e" role="3Aqpz8">
+              <node concept="aZ4PW" id="5RfK0kxly78" role="3A8wtg">
                 <node concept="3txIi4" id="5RfK0kxly79" role="aZ4eD" />
               </node>
-              <node concept="ns1u0" id="7VBaGntKJeP" role="3GeI8D">
+              <node concept="ns1u0" id="7VBaGntKJeP" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
                 <node concept="nsMwS" id="7VBaGntKJeQ" role="ns1xD">
                   <ref role="nsMwP" node="7VBaGntKJ8f" resolve="antecedent" />
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 6341d77f..8c102866 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -66,7 +66,7 @@
     <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="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="14" />
+    <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="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" />
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index 506e93aa..2bf2e3cc 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -2,7 +2,7 @@
 <model ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)">
   <persistence version="9" />
   <languages>
-    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
+    <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="8" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 06463014..27952cfa 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -66,7 +66,7 @@
     <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="0" />
-    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="14" />
+    <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="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" />