diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 025fbc1e..9bc27071 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -846,7 +846,7 @@
       <ref role="2rZz_L" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
     </node>
     <node concept="3aamgX" id="6dMt3c5atGl" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="gft3U" id="6dMt3c5au09" role="1lVwrX">
         <node concept="10Nm6u" id="6dMt3c5au0f" role="gfFT$">
           <node concept="1sPUBX" id="6dMt3c5au0m" role="lGtFl">
@@ -1257,7 +1257,7 @@
     <property role="TrG5h" value="LogicalVariable" />
     <node concept="3aamgX" id="6dMt3c5ap00" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="30G5F_" id="6dMt3c5ap7i" role="30HLyM">
         <node concept="3clFbS" id="6dMt3c5ap7j" role="2VODD2">
           <node concept="3clFbF" id="6dMt3c5apcd" role="3cqZAp">
@@ -1370,7 +1370,7 @@
     </node>
     <node concept="3aamgX" id="6dMt3c5apH0" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="30G5F_" id="6dMt3c5apH1" role="30HLyM">
         <node concept="3clFbS" id="6dMt3c5apH2" role="2VODD2">
           <node concept="3clFbF" id="6dMt3c5apH3" role="3cqZAp">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 3899bc7e..e584324d 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -459,7 +459,7 @@
   </node>
   <node concept="1M2fIO" id="7E86$tK_SDr">
     <property role="3GE5qa" value="logical" />
-    <ref role="1M2myG" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+    <ref role="1M2myG" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="1N5Pfh" id="7E86$tK_SGg" role="1Mr941">
       <ref role="1N5Vy1" to="5j4j:7E86$tK_PaH" resolve="declaration" />
       <node concept="3dgokm" id="6fXjIfxgfOn" role="1N6uqs">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
index 92dffa1a..0a56a9c5 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -2321,7 +2321,7 @@
   </node>
   <node concept="24kQdi" id="7E86$tK_Puj">
     <property role="3GE5qa" value="logical" />
-    <ref role="1XX52x" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+    <ref role="1XX52x" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="3EZMnI" id="6p0DfM0eyCR" role="2wV5jI">
       <node concept="1iCGBv" id="2E5lcNn53QK" role="3EZMnx">
         <ref role="1NtTu8" to="5j4j:7E86$tK_PaH" resolve="declaration" />
@@ -3186,7 +3186,7 @@
   </node>
   <node concept="24kQdi" id="4sSe4$p4oOX">
     <property role="3GE5qa" value="logical" />
-    <ref role="1XX52x" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+    <ref role="1XX52x" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
     <node concept="3EZMnI" id="4sSe4$p4oOZ" role="2wV5jI">
       <node concept="3F1sOY" id="4sSe4$p4oPk" role="3EZMnx">
         <ref role="1NtTu8" to="5j4j:4sSe4$p4oON" resolve="variable" />
@@ -3203,7 +3203,7 @@
   </node>
   <node concept="IW6AY" id="4hPXq9Jm69G">
     <property role="3GE5qa" value="logical" />
-    <ref role="aqKnT" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+    <ref role="aqKnT" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="1Qtc8_" id="4hPXq9Jm69H" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm69I" role="1Qtc8$">
         <node concept="CtIbL" id="4hPXq9Jm69J" role="CtIbM">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
index b530ed13..4a1813e2 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -279,7 +279,7 @@
   </node>
   <node concept="1TIwiD" id="7E86$tK_OxQ">
     <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalVariableReference" />
+    <property role="TrG5h" value="LogicalVariable" />
     <property role="EcuMT" value="8829335963593820278" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="7E86$tK_PaH" role="1TKVEi">
@@ -372,7 +372,7 @@
   </node>
   <node concept="1TIwiD" id="4sSe4$p4oOM">
     <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="AssignedLogicalVariable" />
+    <property role="TrG5h" value="PatternLogicalVariable" />
     <property role="EcuMT" value="5131913661993028914" />
     <ref role="1TJDcQ" node="7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="4sSe4$p4oON" role="1TKVEi">
@@ -380,7 +380,7 @@
       <property role="20kJfa" value="variable" />
       <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="5131913661993028915" />
-      <ref role="20lvS9" node="7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="20lvS9" node="7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
     <node concept="1TJgyj" id="4sSe4$p4oOP" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index d1d7fb49..66d59f21 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -369,7 +369,7 @@
     </node>
     <node concept="1YaCAy" id="2c3nq4GQw_H" role="1YuTPh">
       <property role="TrG5h" value="lvr" />
-      <ref role="1YaFvo" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="1YaFvo" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
   </node>
   <node concept="1YbPZF" id="7dgRGU4$_5X">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 0bc7668f..2ab71603 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -3000,7 +3000,7 @@
                           </node>
                           <node concept="1mIQ4w" id="4sSe4$p4Z88" role="2OqNvi">
                             <node concept="chp4Y" id="4sSe4$pmZYT" role="cj9EA">
-                              <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                              <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                             </node>
                           </node>
                         </node>
@@ -3112,7 +3112,7 @@
                                                   <ref role="3cqZAo" node="4sSe4$p5z8D" resolve="it" />
                                                 </node>
                                                 <node concept="chp4Y" id="6fXjIfxgng2" role="3oSUPX">
-                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                                                 </node>
                                               </node>
                                               <node concept="3TrEf2" id="4sSe4$p8ymx" role="2OqNvi">
@@ -3128,7 +3128,7 @@
                                               </node>
                                               <node concept="1mIQ4w" id="4sSe4$p5z8B" role="2OqNvi">
                                                 <node concept="chp4Y" id="4sSe4$p5z8C" role="cj9EA">
-                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                                                 </node>
                                               </node>
                                             </node>
@@ -3175,7 +3175,7 @@
                                                 <ref role="3cqZAo" node="4sSe4$p5lcB" resolve="it" />
                                               </node>
                                               <node concept="chp4Y" id="6fXjIfxgnfO" role="3oSUPX">
-                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                                               </node>
                                             </node>
                                             <node concept="3TrEf2" id="4sSe4$p8$9K" role="2OqNvi">
@@ -3191,7 +3191,7 @@
                                             </node>
                                             <node concept="1mIQ4w" id="4sSe4$p5odr" role="2OqNvi">
                                               <node concept="chp4Y" id="4sSe4$p5pHN" role="cj9EA">
-                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                                               </node>
                                             </node>
                                           </node>
@@ -3241,7 +3241,7 @@
                         </node>
                         <node concept="1mIQ4w" id="4sSe4$p51UK" role="2OqNvi">
                           <node concept="chp4Y" id="4sSe4$pn0PY" role="cj9EA">
-                            <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                            <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                           </node>
                         </node>
                       </node>
@@ -7056,7 +7056,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="75vUFrSLxt2" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="gft3U" id="75vUFrSLC88" role="1lVwrX">
         <node concept="10Nm6u" id="75vUFrSLCfF" role="gfFT$">
           <node concept="1sPUBX" id="75vUFrSLCfM" role="lGtFl">
@@ -7090,7 +7090,7 @@
       </node>
     </node>
     <node concept="3aamgX" id="75vUFrSLPhb" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="gft3U" id="75vUFrSLPhc" role="1lVwrX">
         <node concept="10Nm6u" id="75vUFrSLPhd" role="gfFT$">
           <node concept="1sPUBX" id="75vUFrSLPhe" role="lGtFl">
@@ -11324,7 +11324,7 @@
     <property role="TrG5h" value="logical_local_reference" />
     <node concept="3aamgX" id="75vUFrSLwr_" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="30G5F_" id="75vUFrSLwtZ" role="30HLyM">
         <node concept="3clFbS" id="75vUFrSLwu0" role="2VODD2">
           <node concept="3clFbF" id="75vUFrSLwwx" role="3cqZAp">
@@ -11386,7 +11386,7 @@
     </node>
     <node concept="3aamgX" id="75vUFrSLwKw" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="30G5F_" id="75vUFrSLwXb" role="30HLyM">
         <node concept="3clFbS" id="75vUFrSLwXc" role="2VODD2">
           <node concept="3clFbF" id="75vUFrSLx4s" role="3cqZAp">
@@ -13204,7 +13204,7 @@
     <property role="TrG5h" value="logical_variable_reference" />
     <node concept="3aamgX" id="452KZTbxZc3" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="1Koe21" id="452KZTbxZc4" role="1lVwrX">
         <node concept="312cEu" id="452KZTbxZc5" role="1Koe22">
           <property role="2bfB8j" value="true" />
@@ -13315,7 +13315,7 @@
     </node>
     <node concept="3aamgX" id="452KZTbxZcP" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="30HIoZ" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
       <node concept="1Koe21" id="452KZTbxZcQ" role="1lVwrX">
         <node concept="312cEu" id="452KZTbxZcR" role="1Koe22">
           <property role="2bfB8j" value="true" />
@@ -20098,7 +20098,7 @@
                                         <node concept="2NL2c5" id="5hSMZ_ljIGk" role="2OqNvi" />
                                       </node>
                                       <node concept="359W_D" id="5hSMZ_ljIGl" role="3uHU7w">
-                                        <ref role="359W_E" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                        <ref role="359W_E" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                                         <ref role="359W_F" to="5j4j:4sSe4$p4oOP" resolve="value" />
                                       </node>
                                     </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 475c6594..8ac5fc1b 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -5517,14 +5517,14 @@
                 <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
                 <node concept="3bvxqY" id="4hPXq9JmeuH" role="37wK5m" />
                 <node concept="prKvN" id="4hPXq9Jmeuw" role="37wK5m">
-                  <ref role="prhl4" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+                  <ref role="prhl4" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
                   <ref role="prhl7" to="5j4j:7E86$tK_PaH" resolve="declaration" />
                 </node>
                 <node concept="3cmrfG" id="4hPXq9Jmeux" role="37wK5m">
                   <property role="3cmrfH" value="-1" />
                 </node>
                 <node concept="3TUQnm" id="4hPXq9Jmeuy" role="37wK5m">
-                  <ref role="3TV0OU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+                  <ref role="3TV0OU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
                 </node>
               </node>
             </node>
@@ -5576,12 +5576,12 @@
               <node concept="3cpWsn" id="4hPXq9Jmevi" role="3cpWs9">
                 <property role="TrG5h" value="lvr" />
                 <node concept="3Tqbb2" id="4hPXq9Jmevj" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+                  <ref role="ehGHo" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
                 </node>
                 <node concept="2OqwBi" id="4hPXq9Jmevk" role="33vP2m">
                   <node concept="1rpKSd" id="4hPXq9JmevC" role="2Oq$k0" />
                   <node concept="15TzpJ" id="4hPXq9Jmevm" role="2OqNvi">
-                    <ref role="I8UWU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+                    <ref role="I8UWU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
                   </node>
                 </node>
               </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index 928a2383..b4727b2e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -187,13 +187,13 @@
   </node>
   <node concept="2S6QgY" id="4sSe4$p4oTF">
     <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalVariable_specifyValue" />
-    <ref role="2ZfgGC" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+    <property role="TrG5h" value="LogicalVariable_setPattern" />
+    <ref role="2ZfgGC" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     <node concept="2S6ZIM" id="4sSe4$p4oTG" role="2ZfVej">
       <node concept="3clFbS" id="4sSe4$p4oTH" role="2VODD2">
         <node concept="3clFbF" id="4sSe4$p4p2B" role="3cqZAp">
           <node concept="Xl_RD" id="4sSe4$p4p2A" role="3clFbG">
-            <property role="Xl_RC" value="Specify Value" />
+            <property role="Xl_RC" value="Set Pattern" />
           </node>
         </node>
       </node>
@@ -202,14 +202,14 @@
       <node concept="3clFbS" id="4sSe4$p4oTJ" role="2VODD2">
         <node concept="3cpWs8" id="4sSe4$p4w5F" role="3cqZAp">
           <node concept="3cpWsn" id="4sSe4$p4w5G" role="3cpWs9">
-            <property role="TrG5h" value="alv" />
+            <property role="TrG5h" value="plv" />
             <node concept="3Tqbb2" id="4sSe4$p4w5D" role="1tU5fm">
-              <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+              <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
             </node>
             <node concept="2ShNRf" id="4sSe4$p4w5H" role="33vP2m">
               <node concept="3zrR0B" id="4sSe4$p4w5I" role="2ShVmc">
                 <node concept="3Tqbb2" id="4sSe4$p4w5J" role="3zrR0E">
-                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                  <ref role="ehGHo" to="5j4j:4sSe4$p4oOM" resolve="PatternLogicalVariable" />
                 </node>
               </node>
             </node>
@@ -220,7 +220,7 @@
             <node concept="2Sf5sV" id="4sSe4$p4FXa" role="2Oq$k0" />
             <node concept="1P9Npp" id="4sSe4$p4Ggq" role="2OqNvi">
               <node concept="37vLTw" id="4sSe4$p4Gl8" role="1P9ThW">
-                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
+                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
               </node>
             </node>
           </node>
@@ -233,7 +233,7 @@
             </node>
             <node concept="2OqwBi" id="4sSe4$p4we2" role="37vLTJ">
               <node concept="37vLTw" id="4sSe4$p4w5K" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
+                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
               </node>
               <node concept="3TrEf2" id="4sSe4$p4wkM" role="2OqNvi">
                 <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
@@ -252,7 +252,7 @@
             </node>
             <node concept="2OqwBi" id="4sSe4$p4wYQ" role="37vLTJ">
               <node concept="37vLTw" id="4sSe4$p4wSL" role="2Oq$k0">
-                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="alv" />
+                <ref role="3cqZAo" node="4sSe4$p4w5G" resolve="plv" />
               </node>
               <node concept="3TrEf2" id="4sSe4$p4x9l" role="2OqNvi">
                 <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index cf0b9606..af81930a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -873,7 +873,7 @@
       <property role="20kJfa" value="typeVar" />
       <property role="20lbJX" value="1" />
       <property role="IQ2ns" value="1302893676238674275" />
-      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
     <node concept="1TJgyj" id="18kNIl0jL3E" role="1TKVEi">
       <property role="IQ2ns" value="1302893676238672106" />
@@ -1232,7 +1232,7 @@
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="typeVar" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
+      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
     </node>
     <node concept="1TJgyj" id="5hSMZ_lrcKO" role="1TKVEi">
       <property role="IQ2ns" value="6086839168131714100" />