diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index e108410f..04ff12a4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -40,7 +40,6 @@
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" />
     <import index="ggp6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.lang.pattern.util(MPS.Core/)" />
   </imports>
@@ -191,11 +190,10 @@
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </concept>
       <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@@ -6356,14 +6354,13 @@
                 <ref role="2Oxat5" node="3j46jeGWT2_" resolve="coerceResult" />
               </node>
             </node>
-            <node concept="2ShNRf" id="4pwDyRBsdya" role="37vLTx">
-              <node concept="1pGfFk" id="4pwDyRBsdyb" role="2ShVmc">
-                <ref role="37wK5l" to="z9ve:~LogicalImpl.&lt;init&gt;(java.lang.String)" resolve="LogicalImpl" />
-                <node concept="3Tqbb2" id="4pwDyRBshWN" role="1pMfVU" />
-                <node concept="Xl_RD" id="4pwDyRBsi7v" role="37wK5m">
-                  <property role="Xl_RC" value="result" />
-                </node>
+            <node concept="2YIFZM" id="4WeLqVvgVbK" role="37vLTx">
+              <ref role="37wK5l" to="bj13:~LogicalKt.newLogical(java.lang.String)" resolve="newLogical" />
+              <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+              <node concept="Xl_RD" id="4pwDyRBsi7v" role="37wK5m">
+                <property role="Xl_RC" value="result" />
               </node>
+              <node concept="3Tqbb2" id="4WeLqVvh8ra" role="3PaCim" />
             </node>
           </node>
         </node>
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 c21d4c01..bdf3fc2a 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
@@ -36,7 +36,6 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
-    <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
@@ -695,8 +694,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="YbzkzLdcYi" role="37wK5m">
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <node concept="37vLTw" id="YbzkzLdgPX" role="37wK5m">
                   <ref role="3cqZAo" node="6N2bvv_ux$t" resolve="name" />
                 </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 11f9cf8b..9eb0dfca 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
@@ -51,7 +51,6 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
@@ -7697,15 +7696,13 @@
                   <node concept="37vLTw" id="1C_jAsqzYdJ" role="37wK5m">
                     <ref role="3cqZAo" node="1z4$59iqHlx" resolve="targetConcept" />
                   </node>
-                  <node concept="2ShNRf" id="1C_jAsqzYdK" role="37wK5m">
-                    <node concept="1pGfFk" id="1C_jAsqzYdL" role="2ShVmc">
-                      <property role="373rjd" value="true" />
-                      <ref role="37wK5l" to="z9ve:~LogicalImpl.&lt;init&gt;(java.lang.String)" resolve="LogicalImpl" />
-                      <node concept="3Tqbb2" id="1C_jAsqzYdM" role="1pMfVU" />
-                      <node concept="Xl_RD" id="1C_jAsqzYdN" role="37wK5m">
-                        <property role="Xl_RC" value="CoerceResult" />
-                      </node>
+                  <node concept="2YIFZM" id="4WeLqVvgVbK" role="37wK5m">
+                    <ref role="37wK5l" to="bj13:~LogicalKt.newLogical(java.lang.String)" resolve="newLogical" />
+                    <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                    <node concept="Xl_RD" id="4pwDyRBsi7v" role="37wK5m">
+                      <property role="Xl_RC" value="CoerceResult" />
                     </node>
+                    <node concept="3Tqbb2" id="4WeLqVvh8ra" role="3PaCim" />
                   </node>
                 </node>
               </node>
@@ -7770,15 +7767,13 @@
                   <node concept="37vLTw" id="1C_jAsq$6uG" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd7MH$F" resolve="target" />
                   </node>
-                  <node concept="2ShNRf" id="1C_jAsq$6uH" role="37wK5m">
-                    <node concept="1pGfFk" id="1C_jAsq$6uI" role="2ShVmc">
-                      <property role="373rjd" value="true" />
-                      <ref role="37wK5l" to="z9ve:~LogicalImpl.&lt;init&gt;(java.lang.String)" resolve="LogicalImpl" />
-                      <node concept="3Tqbb2" id="1C_jAsq$6uJ" role="1pMfVU" />
-                      <node concept="Xl_RD" id="1C_jAsq$6uK" role="37wK5m">
-                        <property role="Xl_RC" value="CoerceResult" />
-                      </node>
+                  <node concept="2YIFZM" id="4WeLqVvhVrF" role="37wK5m">
+                    <ref role="37wK5l" to="bj13:~LogicalKt.newLogical(java.lang.String)" resolve="newLogical" />
+                    <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                    <node concept="Xl_RD" id="4WeLqVvhVrG" role="37wK5m">
+                      <property role="Xl_RC" value="CoerceResult" />
                     </node>
+                    <node concept="3Tqbb2" id="4WeLqVvhVrH" role="3PaCim" />
                   </node>
                 </node>
               </node>
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 c9a38bca..972cd469 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
@@ -16,7 +16,6 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
@@ -2032,8 +2031,8 @@
       <node concept="3clFbS" id="2DKqMqOqk7o" role="3clF47">
         <node concept="3clFbF" id="YbzkzLjwMU" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLjwMV" role="3clFbG">
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.anonLogical(java.lang.Object)" resolve="anonLogical" />
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.anonLogical(java.lang.Object)" resolve="anonLogical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
             <node concept="10QFUN" id="YbzkzLjzs_" role="37wK5m">
               <node concept="3uibUv" id="YbzkzLjzsA" role="10QFUM">
                 <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
@@ -2075,8 +2074,8 @@
               </node>
             </node>
             <node concept="2YIFZM" id="YbzkzLjZPT" role="33vP2m">
-              <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
-              <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+              <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+              <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
               <node concept="37vLTw" id="YbzkzLjZPU" role="37wK5m">
                 <ref role="3cqZAo" node="2DKqMqOq_P$" resolve="name" />
               </node>
@@ -2564,8 +2563,8 @@
       <node concept="3clFbS" id="6yEjedm6G_T" role="3clF47">
         <node concept="3clFbF" id="YbzkzLfoao" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLjlXO" role="3clFbG">
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.anonLogical(java.lang.Object)" resolve="anonLogical" />
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.anonLogical(java.lang.Object)" resolve="anonLogical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
             <node concept="37vLTw" id="YbzkzLjlXP" role="37wK5m">
               <ref role="3cqZAo" node="6yEjedm6GJE" resolve="tf" />
             </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 168e1749..369998f5 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -20,7 +20,6 @@
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="u132" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:junit.framework(JUnit/)" />
-    <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -250,8 +249,8 @@
       <node concept="3clFbS" id="5TfjU0xmBIZ" role="3clF47">
         <node concept="3clFbF" id="YbzkzLgS5K" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLgS5L" role="3clFbG">
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
             <node concept="37vLTw" id="YbzkzLgS5M" role="37wK5m">
               <ref role="3cqZAo" node="5TfjU0xmBJ5" resolve="name" />
             </node>
@@ -6443,8 +6442,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="YbzkzLheK2" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
                 <node concept="37vLTw" id="YbzkzLheK3" role="37wK5m">
                   <ref role="3cqZAo" node="3K_0akS$LQl" resolve="name" />
                 </node>
@@ -6470,8 +6469,8 @@
       <node concept="3clFbS" id="3K_0akS$NEe" role="3clF47">
         <node concept="3clFbF" id="YbzkzLhwOm" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLhwOo" role="3clFbG">
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
             <node concept="37vLTw" id="YbzkzLhwOp" role="37wK5m">
               <ref role="3cqZAo" node="3K_0akS$NJK" resolve="name" />
             </node>
@@ -6499,8 +6498,8 @@
       <node concept="3clFbS" id="6yEjedm8Fwu" role="3clF47">
         <node concept="3clFbF" id="YbzkzLhKKZ" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLhP2$" role="3clFbG">
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
             <node concept="37vLTw" id="YbzkzLhTj3" role="37wK5m">
               <ref role="3cqZAo" node="6yEjedm8H7d" resolve="meta" />
             </node>
@@ -7284,8 +7283,8 @@
       <node concept="3clFbS" id="6N2bvv_uPx$" role="3clF47">
         <node concept="3clFbF" id="YbzkzLfoao" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLfsHa" role="3clFbG">
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
             <node concept="37vLTw" id="YbzkzLfxuE" role="37wK5m">
               <ref role="3cqZAo" node="6N2bvv_uPya" resolve="name" />
             </node>
@@ -7318,8 +7317,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgFeV" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <node concept="2ShNRf" id="4U$Q3dKgFeW" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgFeX" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -7358,8 +7357,8 @@
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <ref role="37wK5l" to="oy3s:3gNap3fZcVn" resolve="asValue" />
               <node concept="2YIFZM" id="4U$Q3dKgOOo" role="37wK5m">
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <node concept="2ShNRf" id="4U$Q3dKgOOp" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgOOq" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -9234,8 +9233,8 @@
       <node concept="3clFbS" id="390NiL15h0D" role="3clF47">
         <node concept="3clFbF" id="YbzkzLiyLY" role="3cqZAp">
           <node concept="2YIFZM" id="YbzkzLiyLZ" role="3clFbG">
-            <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-            <ref role="37wK5l" to="z9ve:~LogicalImplKt.namedLogical(java.lang.String)" resolve="namedLogical" />
+            <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+            <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
             <node concept="37vLTw" id="YbzkzLiyM0" role="37wK5m">
               <ref role="3cqZAo" node="390NiL15h0J" resolve="name" />
             </node>
@@ -9268,8 +9267,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgIjc" role="37wK5m">
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <node concept="2ShNRf" id="4U$Q3dKgIjd" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgIje" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -9308,8 +9307,8 @@
               <ref role="37wK5l" to="oy3s:3gNap3fZcVn" resolve="asValue" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgQcN" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <node concept="2ShNRf" id="4U$Q3dKgQcO" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgQcP" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -11267,8 +11266,8 @@
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <ref role="37wK5l" to="oy3s:3gNap3fZcVn" resolve="asValue" />
               <node concept="2YIFZM" id="4U$Q3dKgR5d" role="37wK5m">
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <node concept="2ShNRf" id="4U$Q3dKgR5e" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgR5f" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -11307,8 +11306,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgIQ1" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <node concept="2ShNRf" id="4U$Q3dKgIQ2" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgIQ3" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -11347,8 +11346,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgJ2V" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <node concept="2ShNRf" id="4U$Q3dKgJ2W" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgJ2X" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.String,java.lang.Class)" resolve="MetaLogical" />
@@ -11383,8 +11382,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgJjY" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <node concept="2ShNRf" id="4U$Q3dKgJjZ" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgJk0" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
@@ -11416,8 +11415,8 @@
               <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
               <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgKzY" role="37wK5m">
-                <ref role="1Pybhc" to="z9ve:~LogicalImplKt" resolve="LogicalImplKt" />
-                <ref role="37wK5l" to="z9ve:~LogicalImplKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
+                <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
+                <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <node concept="2ShNRf" id="4U$Q3dKgKzZ" role="37wK5m">
                   <node concept="1pGfFk" id="4U$Q3dKgK$0" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />