From 4389b349d772b078880cf9901a90a334bee15421 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 2 May 2019 14:43:17 +0200
Subject: [PATCH] Adapt to the changes in reactor API.

---
 .../jetbrains.mps.lang.coderules.eval.mps     |  10 +-
 .../models/jetbrains.mps.logic.predicate.mps  | 298 +++++++++---------
 .../models/plugin.mps                         | 124 +++++---
 .../models/service.mps                        |  20 +-
 .../mps/logic/test/logical@tests.mps          |   4 +-
 .../jetbrains/mps/logic/test/unification.mps  |  20 ++
 .../mps/logic/test/unification@tests.mps      | 116 +++----
 .../jetbrains.mps.typechecking@tests.mps      |  16 +-
 8 files changed, 324 insertions(+), 284 deletions(-)

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 1b939261..2c79e4ba 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
@@ -7741,7 +7741,7 @@
         <node concept="37vLTG" id="4TCblo5JLfn" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="4TCblo5JLfk" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="3cqZAl" id="1n2ZgJ3MiVq" role="3clF45" />
@@ -7757,7 +7757,7 @@
         <node concept="37vLTG" id="2_NfR5whEhG" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="2_NfR5whEhH" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="3cqZAl" id="2_NfR5whEhI" role="3clF45" />
@@ -7773,7 +7773,7 @@
         <node concept="37vLTG" id="2UGjFq48gIe" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="2UGjFq48gIf" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="3cqZAl" id="2UGjFq48gIg" role="3clF45" />
@@ -7789,7 +7789,7 @@
         <node concept="37vLTG" id="2T1p0CFMNWv" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="2T1p0CFMNWw" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="3cqZAl" id="2T1p0CFMNWx" role="3clF45" />
@@ -7805,7 +7805,7 @@
         <node concept="37vLTG" id="2UGjFq48h1H" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="2UGjFq48h1I" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="3cqZAl" id="2UGjFq48h1J" role="3clF45" />
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 6bd9de18..68ad4f4d 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
@@ -904,7 +904,7 @@
                     </node>
                     <node concept="10QFUN" id="2UGjFq4lTCj" role="37wK5m">
                       <node concept="3uibUv" id="2UGjFq4lTCk" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lTCl" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                         </node>
@@ -920,7 +920,7 @@
               <node concept="1Wc70l" id="2UGjFq4lTCo" role="3eO9$A">
                 <node concept="2ZW3vV" id="2UGjFq4lTCp" role="3uHU7w">
                   <node concept="3uibUv" id="5cDlfXt7dlz" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lTDg" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lTDe" resolve="right" />
@@ -946,7 +946,7 @@
                         <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
                       </node>
                       <node concept="3uibUv" id="2UGjFq4lTC_" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lTCA" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                         </node>
@@ -975,7 +975,7 @@
                 </node>
                 <node concept="2ZW3vV" id="2UGjFq4lTCJ" role="3uHU7B">
                   <node concept="3uibUv" id="5cDlfXt7eh8" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lTDl" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
@@ -993,7 +993,7 @@
                         <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
                       </node>
                       <node concept="3uibUv" id="2UGjFq4lTCS" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lTCT" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                         </node>
@@ -1001,7 +1001,7 @@
                     </node>
                     <node concept="10QFUN" id="2UGjFq4lTCU" role="37wK5m">
                       <node concept="3uibUv" id="2UGjFq4lTCV" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lTCW" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4lWIN" resolve="TERM" />
                         </node>
@@ -1017,7 +1017,7 @@
               <node concept="1Wc70l" id="2UGjFq4lTCZ" role="3eO9$A">
                 <node concept="2ZW3vV" id="2UGjFq4lTD0" role="3uHU7w">
                   <node concept="3uibUv" id="5cDlfXt7fg3" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lTDp" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lTDe" resolve="right" />
@@ -1025,7 +1025,7 @@
                 </node>
                 <node concept="2ZW3vV" id="2UGjFq4lTD3" role="3uHU7B">
                   <node concept="3uibUv" id="5cDlfXt7fd7" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lTDo" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lTDc" resolve="left" />
@@ -1168,7 +1168,7 @@
                       <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="5TfjU0x$Mm7" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="5TfjU0x_9T$" role="11_B2D">
                         <ref role="16sUi3" node="5TfjU0x_7hm" resolve="T" />
                       </node>
@@ -1176,7 +1176,7 @@
                   </node>
                   <node concept="10QFUN" id="5TfjU0x$Mm9" role="37wK5m">
                     <node concept="3uibUv" id="5TfjU0x$Mma" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="5TfjU0x_abK" role="11_B2D">
                         <ref role="16sUi3" node="5TfjU0x_7hm" resolve="T" />
                       </node>
@@ -1192,7 +1192,7 @@
             <node concept="1Wc70l" id="5TfjU0x$Mme" role="3clFbw">
               <node concept="2ZW3vV" id="5TfjU0x$Mmf" role="3uHU7w">
                 <node concept="3uibUv" id="5TfjU0x$Mmg" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 </node>
                 <node concept="37vLTw" id="5TfjU0x$Mmh" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4mbm6" resolve="right" />
@@ -1200,7 +1200,7 @@
               </node>
               <node concept="2ZW3vV" id="5TfjU0x$Mmi" role="3uHU7B">
                 <node concept="3uibUv" id="5TfjU0x$Mmj" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 </node>
                 <node concept="37vLTw" id="5TfjU0x$Mmk" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
@@ -1217,7 +1217,7 @@
                         <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
                       </node>
                       <node concept="3uibUv" id="5TfjU0x$Mmr" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="5TfjU0x_aKF" role="11_B2D">
                           <ref role="16sUi3" node="5TfjU0x_7hm" resolve="T" />
                         </node>
@@ -1240,7 +1240,7 @@
                   <node concept="1eOMI4" id="5TfjU0x$Mmz" role="3fr31v">
                     <node concept="2ZW3vV" id="5TfjU0x$Mm$" role="1eOMHV">
                       <node concept="3uibUv" id="5TfjU0x$Mm_" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="5TfjU0x$MmA" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4mbm6" resolve="right" />
@@ -1250,7 +1250,7 @@
                 </node>
                 <node concept="2ZW3vV" id="5TfjU0x$MmB" role="3uHU7B">
                   <node concept="3uibUv" id="5TfjU0x$MmC" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="5TfjU0x$MmD" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
@@ -1273,7 +1273,7 @@
                     </node>
                     <node concept="10QFUN" id="5TfjU0x$MmL" role="37wK5m">
                       <node concept="3uibUv" id="5TfjU0x$MmM" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="5TfjU0x_jF0" role="11_B2D">
                           <ref role="16sUi3" node="5TfjU0x_7hm" resolve="T" />
                         </node>
@@ -1289,7 +1289,7 @@
               <node concept="1Wc70l" id="5TfjU0x$MmQ" role="3eO9$A">
                 <node concept="2ZW3vV" id="5TfjU0x$MmR" role="3uHU7w">
                   <node concept="3uibUv" id="5TfjU0x$MmS" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="5TfjU0x$MmT" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4mbm6" resolve="right" />
@@ -1299,7 +1299,7 @@
                   <node concept="1eOMI4" id="5TfjU0x$MmV" role="3fr31v">
                     <node concept="2ZW3vV" id="5TfjU0x$MmW" role="1eOMHV">
                       <node concept="3uibUv" id="5TfjU0x$MmX" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="5TfjU0x$MmY" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4mbm4" resolve="left" />
@@ -1484,7 +1484,7 @@
                         <node concept="3cpWsn" id="6MYr6JwRS$H" role="3cpWs9">
                           <property role="TrG5h" value="bvarLogical" />
                           <node concept="3uibUv" id="6MYr6JwRS$v" role="1tU5fm">
-                            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                             <node concept="3uibUv" id="6MYr6JwSaxS" role="11_B2D">
                               <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                             </node>
@@ -1596,7 +1596,7 @@
                           <node concept="3cpWsn" id="3gNap3fZiSP" role="3cpWs9">
                             <property role="TrG5h" value="bvarLogical" />
                             <node concept="3uibUv" id="3gNap3fZiSQ" role="1tU5fm">
-                              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                               <node concept="3uibUv" id="3gNap3g018A" role="11_B2D">
                                 <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                               </node>
@@ -1636,7 +1636,7 @@
                                 <node concept="3cpWsn" id="3gNap3fZmj4" role="3cpWs9">
                                   <property role="TrG5h" value="left" />
                                   <node concept="3uibUv" id="3gNap3fZmiC" role="1tU5fm">
-                                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                                     <node concept="3uibUv" id="3gNap3g07tK" role="11_B2D">
                                       <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                     </node>
@@ -1646,7 +1646,7 @@
                                       <ref role="3cqZAo" node="3gNap3fZiSP" resolve="bvarLogical" />
                                     </node>
                                     <node concept="liA8E" id="3gNap3fZmj7" role="2OqNvi">
-                                      <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                      <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                                     </node>
                                   </node>
                                 </node>
@@ -1746,7 +1746,7 @@
                                           <ref role="3cqZAo" node="3gNap3fZmj4" resolve="left" />
                                         </node>
                                         <node concept="liA8E" id="3gNap3fZp4c" role="2OqNvi">
-                                          <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                                          <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                                           <node concept="37vLTw" id="3gNap3fZp55" role="37wK5m">
                                             <ref role="3cqZAo" node="3gNap3fZluk" resolve="value" />
                                           </node>
@@ -1774,7 +1774,7 @@
                               <node concept="3cpWsn" id="3gNap3fZrMs" role="3cpWs9">
                                 <property role="TrG5h" value="left" />
                                 <node concept="3uibUv" id="3gNap3fZrM4" role="1tU5fm">
-                                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                                   <node concept="3uibUv" id="3gNap3g07dj" role="11_B2D">
                                     <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                   </node>
@@ -1784,7 +1784,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZiSP" resolve="bvarLogical" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZrMv" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -1793,7 +1793,7 @@
                               <node concept="3cpWsn" id="3gNap3fZkKR" role="3cpWs9">
                                 <property role="TrG5h" value="right" />
                                 <node concept="3uibUv" id="3gNap3fZkKS" role="1tU5fm">
-                                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                                   <node concept="3uibUv" id="3gNap3g07gr" role="11_B2D">
                                     <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                   </node>
@@ -1817,7 +1817,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZsjf" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -1905,7 +1905,7 @@
                                         <ref role="3cqZAo" node="3gNap3fZrMs" resolve="left" />
                                       </node>
                                       <node concept="liA8E" id="7fidXgOaBT_" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                                        <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                                         <node concept="37vLTw" id="7fidXgOaBTA" role="37wK5m">
                                           <ref role="3cqZAo" node="3gNap3fZkKR" resolve="right" />
                                         </node>
@@ -2036,7 +2036,7 @@
         <node concept="37vLTG" id="4U_yxogBZsN" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="6MYr6Jwz28e" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="5TfjU0xzHrn" role="11_B2D">
               <ref role="16sUi3" node="5TfjU0xzEQN" resolve="T" />
             </node>
@@ -2068,7 +2068,7 @@
         <node concept="37vLTG" id="4U_yxogBZLE" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="6MYr6Jwz28h" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="3qTvmN" id="5TfjU0xJquy" role="11_B2D" />
           </node>
         </node>
@@ -2085,7 +2085,7 @@
             <node concept="3cpWsn" id="6b_Nj5K6khc" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="6b_Nj5K6kh3" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3qTvmN" id="6b_Nj5K6kh6" role="11_B2D" />
               </node>
               <node concept="2OqwBi" id="6b_Nj5K6khd" role="33vP2m">
@@ -2093,7 +2093,7 @@
                   <ref role="3cqZAo" node="4U_yxogBZLE" resolve="left" />
                 </node>
                 <node concept="liA8E" id="6b_Nj5K6khf" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2116,7 +2116,7 @@
                   <node concept="1eOMI4" id="6b_Nj5K6ogY" role="2Oq$k0">
                     <node concept="10QFUN" id="6b_Nj5K6ogV" role="1eOMHV">
                       <node concept="3uibUv" id="6b_Nj5K6onh" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="6b_Nj5K6oVX" role="11_B2D">
                           <ref role="16sUi3" node="5TfjU0xJAYc" resolve="T" />
                         </node>
@@ -2127,7 +2127,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="1bm7a6EV5ci" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                    <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                     <node concept="1eOMI4" id="5TfjU0xyP_X" role="37wK5m">
                       <node concept="10QFUN" id="5TfjU0xyP_U" role="1eOMHV">
                         <node concept="16syzq" id="5TfjU0xJFts" role="10QFUM">
@@ -2186,7 +2186,7 @@
         <node concept="37vLTG" id="4U_yxogC05J" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="6MYr6Jwz28n" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="5TfjU0xzy_y" role="11_B2D">
               <ref role="16sUi3" node="5TfjU0xzvGM" resolve="T" />
             </node>
@@ -2195,7 +2195,7 @@
         <node concept="37vLTG" id="4U_yxogC0jU" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="6MYr6Jwz28q" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="5TfjU0xzz_q" role="11_B2D">
               <ref role="16sUi3" node="5TfjU0xzvGM" resolve="T" />
             </node>
@@ -2208,7 +2208,7 @@
             <node concept="3cpWsn" id="7d$oK1$rAnE" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="6MYr6Jwz28t" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="5TfjU0xz$x6" role="11_B2D">
                   <ref role="16sUi3" node="5TfjU0xzvGM" resolve="T" />
                 </node>
@@ -2218,7 +2218,7 @@
                   <ref role="3cqZAo" node="4U_yxogC05J" resolve="left" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$rAnI" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2227,7 +2227,7 @@
             <node concept="3cpWsn" id="7d$oK1$rAnK" role="3cpWs9">
               <property role="TrG5h" value="rightRepr" />
               <node concept="3uibUv" id="6MYr6Jwz28w" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="5TfjU0xz_b9" role="11_B2D">
                   <ref role="16sUi3" node="5TfjU0xzvGM" resolve="T" />
                 </node>
@@ -2237,7 +2237,7 @@
                   <ref role="3cqZAo" node="4U_yxogC0jU" resolve="right" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$rAnO" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2364,7 +2364,7 @@
                 <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="1POzLwzdIw9" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="37vLTw" id="1POzLwzdIwa" role="37wK5m">
                   <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                 </node>
@@ -2384,7 +2384,7 @@
         <node concept="37vLTG" id="1POzLwyWxZf" role="3clF46">
           <property role="TrG5h" value="logical" />
           <node concept="3uibUv" id="1POzLwyWxZg" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="3qTvmN" id="1POzLwyWxZh" role="11_B2D" />
           </node>
         </node>
@@ -2399,7 +2399,7 @@
             <node concept="3cpWsn" id="1POzLwyX6pI" role="3cpWs9">
               <property role="TrG5h" value="repr" />
               <node concept="3uibUv" id="1POzLwyX6px" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3qTvmN" id="1POzLwyX6p$" role="11_B2D" />
               </node>
               <node concept="2OqwBi" id="1POzLwyX6pJ" role="33vP2m">
@@ -2407,7 +2407,7 @@
                   <ref role="3cqZAo" node="1POzLwyWxZf" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="1POzLwyX6pL" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2440,7 +2440,7 @@
                 <node concept="3cpWsn" id="1POzLwyWxYm" role="3cpWs9">
                   <property role="TrG5h" value="termLeftRepr" />
                   <node concept="3uibUv" id="1POzLwyWxYn" role="1tU5fm">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="16syzq" id="1POzLwyWSnC" role="11_B2D">
                       <ref role="16sUi3" node="5TfjU0xz4dl" resolve="TERM" />
                     </node>
@@ -2450,7 +2450,7 @@
                       <ref role="3cqZAo" node="1POzLwyX6pI" resolve="repr" />
                     </node>
                     <node concept="3uibUv" id="1POzLwyWxYr" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="1POzLwyWSJo" role="11_B2D">
                         <ref role="16sUi3" node="5TfjU0xz4dl" resolve="TERM" />
                       </node>
@@ -2714,7 +2714,7 @@
                           <node concept="3cpWsn" id="3gNap3fZ_6T" role="3cpWs9">
                             <property role="TrG5h" value="bndLeft" />
                             <node concept="3uibUv" id="3gNap3fZ_6U" role="1tU5fm">
-                              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                               <node concept="3qTvmN" id="3gNap3fZ_6V" role="11_B2D" />
                             </node>
                             <node concept="2OqwBi" id="3gNap3fZ_6W" role="33vP2m">
@@ -2735,7 +2735,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="3gNap3fZ_6Y" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -2746,7 +2746,7 @@
                               <node concept="3cpWsn" id="3gNap3fZ_70" role="3cpWs9">
                                 <property role="TrG5h" value="bndRight" />
                                 <node concept="3uibUv" id="3gNap3fZ_71" role="1tU5fm">
-                                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                                   <node concept="3qTvmN" id="3gNap3fZ_72" role="11_B2D" />
                                 </node>
                                 <node concept="2OqwBi" id="3gNap3fZ_73" role="33vP2m">
@@ -2765,7 +2765,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZ_7a" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -2984,7 +2984,7 @@
         <node concept="37vLTG" id="4U_yxogC1eI" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="6MYr6Jwz28z" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="5TfjU0xBye8" role="11_B2D">
               <ref role="16sUi3" node="5TfjU0xBs31" resolve="T" />
             </node>
@@ -3016,7 +3016,7 @@
         <node concept="37vLTG" id="4U_yxogC1Ek" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="6MYr6Jwz28A" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="3qTvmN" id="5TfjU0xJJxB" role="11_B2D" />
           </node>
         </node>
@@ -3052,7 +3052,7 @@
                               <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                             </node>
                             <node concept="liA8E" id="5TfjU0xJFH9" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -3073,7 +3073,7 @@
                     <node concept="3cpWsn" id="5TfjU0xCkrV" role="3cpWs9">
                       <property role="TrG5h" value="termLeftRepr" />
                       <node concept="3uibUv" id="5TfjU0xCkrW" role="1tU5fm">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="5TfjU0xCkrX" role="11_B2D">
                           <ref role="16sUi3" node="6MYr6Jw$T5v" resolve="TERM" />
                         </node>
@@ -3085,12 +3085,12 @@
                               <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                             </node>
                             <node concept="liA8E" id="5TfjU0xJFHd" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
                         <node concept="3uibUv" id="5TfjU0xCks0" role="10QFUM">
-                          <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                          <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                           <node concept="16syzq" id="5TfjU0xCks1" role="11_B2D">
                             <ref role="16sUi3" node="6MYr6Jw$T5v" resolve="TERM" />
                           </node>
@@ -3175,7 +3175,7 @@
                                 <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                               </node>
                               <node concept="liA8E" id="5TfjU0xJFHp" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -3242,7 +3242,7 @@
                               <node concept="3cpWsn" id="5TfjU0xHMGZ" role="3cpWs9">
                                 <property role="TrG5h" value="bndLeft" />
                                 <node concept="3uibUv" id="5TfjU0xHMH0" role="1tU5fm">
-                                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                                   <node concept="3qTvmN" id="5TfjU0xHV1U" role="11_B2D" />
                                 </node>
                                 <node concept="2OqwBi" id="5TfjU0xHMH2" role="33vP2m">
@@ -3263,7 +3263,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5TfjU0xHMHa" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -3274,7 +3274,7 @@
                                   <node concept="3cpWsn" id="5TfjU0xHMHe" role="3cpWs9">
                                     <property role="TrG5h" value="bndRight" />
                                     <node concept="3uibUv" id="5TfjU0xHMHf" role="1tU5fm">
-                                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                                       <node concept="3qTvmN" id="5TfjU0xHMHg" role="11_B2D" />
                                     </node>
                                     <node concept="2OqwBi" id="5TfjU0xHMHh" role="33vP2m">
@@ -3293,7 +3293,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="5TfjU0xHMHo" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                        <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                                       </node>
                                     </node>
                                   </node>
@@ -3487,7 +3487,7 @@
                       <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xJFHh" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                     </node>
                   </node>
                 </node>
@@ -3508,7 +3508,7 @@
                             <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                           </node>
                           <node concept="liA8E" id="5TfjU0xJFHl" role="2OqNvi">
-                            <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                            <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                           </node>
                         </node>
                       </node>
@@ -3542,7 +3542,7 @@
         <node concept="37vLTG" id="4U_yxogC2zy" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="6MYr6Jwz28G" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="5TfjU0xDw1d" role="11_B2D">
               <ref role="16sUi3" node="5TfjU0xDjwQ" resolve="T" />
             </node>
@@ -3551,7 +3551,7 @@
         <node concept="37vLTG" id="4U_yxogC2z$" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="6MYr6Jwz28J" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="5TfjU0xDzo5" role="11_B2D">
               <ref role="16sUi3" node="5TfjU0xDjwQ" resolve="T" />
             </node>
@@ -3564,7 +3564,7 @@
             <node concept="3cpWsn" id="7d$oK1$nL7F" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="6MYr6Jwz28M" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="5TfjU0xH76F" role="11_B2D">
                   <ref role="16sUi3" node="5TfjU0xDjwQ" resolve="T" />
                 </node>
@@ -3574,7 +3574,7 @@
                   <ref role="3cqZAo" node="4U_yxogC2zy" resolve="left" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$nL7J" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -3583,7 +3583,7 @@
             <node concept="3cpWsn" id="7d$oK1$nLDN" role="3cpWs9">
               <property role="TrG5h" value="rightRepr" />
               <node concept="3uibUv" id="6MYr6Jwz28P" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="5TfjU0xHaCr" role="11_B2D">
                   <ref role="16sUi3" node="5TfjU0xDjwQ" resolve="T" />
                 </node>
@@ -3593,7 +3593,7 @@
                   <ref role="3cqZAo" node="4U_yxogC2z$" resolve="right" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$nLDR" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -3777,7 +3777,7 @@
                   <ref role="37wK5l" node="4U_yxogC1Eh" resolve="askUni_logical_val" />
                   <node concept="10QFUN" id="2T1p0CFz6ar" role="37wK5m">
                     <node concept="3uibUv" id="2T1p0CFz6as" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="2T1p0CFz6at" role="11_B2D">
                         <ref role="16sUi3" node="6MYr6JwM1_T" resolve="TERM" />
                       </node>
@@ -3818,7 +3818,7 @@
                     <ref role="37wK5l" node="4U_yxogC2zx" resolve="ask_logical_logical" />
                     <node concept="10QFUN" id="2T1p0CFz6aG" role="37wK5m">
                       <node concept="3uibUv" id="2T1p0CFz6aH" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2T1p0CFz6aI" role="11_B2D">
                           <ref role="16sUi3" node="6MYr6JwM1_T" resolve="TERM" />
                         </node>
@@ -4062,7 +4062,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="3FIATxbQg$Q" role="3clF45">
-          <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+          <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
           <node concept="16syzq" id="3FIATxbQg$R" role="11_B2D">
             <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
           </node>
@@ -4098,7 +4098,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="3gNap3fzGMi" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="16syzq" id="3gNap3fzGMj" role="11_B2D">
                       <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
                     </node>
@@ -4140,7 +4140,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="3gNap3fZim_" role="3clF45">
-          <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+          <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
           <node concept="16syzq" id="3gNap3fZimA" role="11_B2D">
             <ref role="16sUi3" node="3gNap3fZimC" resolve="T" />
           </node>
@@ -4173,7 +4173,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="3gNap3fZimQ" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="16syzq" id="3gNap3fZimR" role="11_B2D">
                       <ref role="16sUi3" node="3gNap3fZimC" resolve="T" />
                     </node>
@@ -4445,7 +4445,7 @@
                   <node concept="1eOMI4" id="2UGjFq4l$3n" role="37wK5m">
                     <node concept="10QFUN" id="2UGjFq4l$3o" role="1eOMHV">
                       <node concept="3uibUv" id="2UGjFq4l$3p" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="3uibUv" id="2UGjFq4l$3q" role="11_B2D">
                           <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                         </node>
@@ -4461,7 +4461,7 @@
             </node>
             <node concept="2ZW3vV" id="2UGjFq4l$3t" role="3clFbw">
               <node concept="3uibUv" id="5cDlfXt5M5X" role="2ZW6by">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               </node>
               <node concept="37vLTw" id="2UGjFq4l$3O" role="2ZW6bz">
                 <ref role="3cqZAo" node="2UGjFq4l$3L" resolve="test" />
@@ -4569,7 +4569,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lzaB" role="37wK5m">
                     <node concept="10QFUN" id="2UGjFq4lzaC" role="1eOMHV">
                       <node concept="3uibUv" id="2UGjFq4lzaD" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="3uibUv" id="2UGjFq4lzaE" role="11_B2D">
                           <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                         </node>
@@ -4588,7 +4588,7 @@
                 <ref role="3cqZAo" node="2UGjFq4lzb1" resolve="test" />
               </node>
               <node concept="3uibUv" id="5cDlfXt5MgC" role="2ZW6by">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               </node>
             </node>
             <node concept="3eNFk2" id="2UGjFq4lzaK" role="3eNLev">
@@ -4676,7 +4676,7 @@
         <node concept="37vLTG" id="6infEALAKQI" role="3clF46">
           <property role="TrG5h" value="logical" />
           <node concept="3uibUv" id="6infEALAKQJ" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="3uibUv" id="6infEALAKQK" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
@@ -4689,7 +4689,7 @@
             <node concept="3cpWsn" id="6infEALBcln" role="3cpWs9">
               <property role="TrG5h" value="repr" />
               <node concept="3uibUv" id="6infEALBclo" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="6infEALBclp" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                 </node>
@@ -4699,7 +4699,7 @@
                   <ref role="3cqZAo" node="6infEALAKQI" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="6infEALBcls" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -4763,7 +4763,7 @@
                     <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                   </node>
                   <node concept="liA8E" id="6infEALBvmp" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                    <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                     <node concept="10M0yZ" id="6infEALBvoZ" role="37wK5m">
                       <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
                       <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
@@ -4808,7 +4808,7 @@
         <node concept="37vLTG" id="6infEALAKR3" role="3clF46">
           <property role="TrG5h" value="logical" />
           <node concept="3uibUv" id="6infEALAKR4" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="3uibUv" id="6infEALAKR5" role="11_B2D">
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
@@ -4821,7 +4821,7 @@
             <node concept="3cpWsn" id="6infEALBa$A" role="3cpWs9">
               <property role="TrG5h" value="repr" />
               <node concept="3uibUv" id="6infEALBa$x" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="6infEALBa$$" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                 </node>
@@ -4831,7 +4831,7 @@
                   <ref role="3cqZAo" node="6infEALAKR3" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="6infEALBa$D" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -5144,7 +5144,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4lBz3" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="2UGjFq4lBz4" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                       </node>
@@ -5152,7 +5152,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4lBz5" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4lBz6" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="2UGjFq4lBz7" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                       </node>
@@ -5168,7 +5168,7 @@
             <node concept="1Wc70l" id="2UGjFq4lBza" role="3clFbw">
               <node concept="2ZW3vV" id="2UGjFq4lBzb" role="3uHU7w">
                 <node concept="3uibUv" id="5cDlfXt5OgE" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lB$E" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -5176,7 +5176,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4lBze" role="3uHU7B">
                 <node concept="3uibUv" id="5cDlfXt5Ofi" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lB$z" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -5193,7 +5193,7 @@
                         <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
                       </node>
                       <node concept="3uibUv" id="2UGjFq4lBzn" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lBzo" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                         </node>
@@ -5216,7 +5216,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lBzv" role="3fr31v">
                     <node concept="2ZW3vV" id="2UGjFq4lBzw" role="1eOMHV">
                       <node concept="3uibUv" id="5cDlfXt5OR2" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="2UGjFq4lB$w" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -5226,7 +5226,7 @@
                 </node>
                 <node concept="2ZW3vV" id="2UGjFq4lBzz" role="3uHU7B">
                   <node concept="3uibUv" id="5cDlfXt5OPp" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lB$v" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -5249,7 +5249,7 @@
                     </node>
                     <node concept="10QFUN" id="2UGjFq4lBzH" role="37wK5m">
                       <node concept="3uibUv" id="2UGjFq4lBzI" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lBzJ" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4mCKS" resolve="T" />
                         </node>
@@ -5265,7 +5265,7 @@
               <node concept="1Wc70l" id="2UGjFq4lBzM" role="3eO9$A">
                 <node concept="2ZW3vV" id="2UGjFq4lBzN" role="3uHU7w">
                   <node concept="3uibUv" id="5cDlfXt5Pc9" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lB$u" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -5275,7 +5275,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lBzR" role="3fr31v">
                     <node concept="2ZW3vV" id="2UGjFq4lBzS" role="1eOMHV">
                       <node concept="3uibUv" id="5cDlfXt5Pas" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="2UGjFq4lB$D" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -5315,7 +5315,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lB$8" role="3fr31v">
                     <node concept="2ZW3vV" id="2UGjFq4lB$9" role="1eOMHV">
                       <node concept="3uibUv" id="5cDlfXt5PvF" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="2UGjFq4lB$r" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4lB$n" resolve="left" />
@@ -5327,7 +5327,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lB$d" role="3fr31v">
                     <node concept="2ZW3vV" id="2UGjFq4lB$e" role="1eOMHV">
                       <node concept="3uibUv" id="5cDlfXt5Px$" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="2UGjFq4lB$s" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4lB$p" resolve="right" />
@@ -5440,7 +5440,7 @@
                       <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
                     </node>
                     <node concept="3uibUv" id="2UGjFq4lGAh" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="2UGjFq4lGAi" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                       </node>
@@ -5448,7 +5448,7 @@
                   </node>
                   <node concept="10QFUN" id="2UGjFq4lGAj" role="37wK5m">
                     <node concept="3uibUv" id="2UGjFq4lGAk" role="10QFUM">
-                      <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                      <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       <node concept="16syzq" id="2UGjFq4lGAl" role="11_B2D">
                         <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                       </node>
@@ -5464,7 +5464,7 @@
             <node concept="1Wc70l" id="2UGjFq4lGAo" role="3clFbw">
               <node concept="2ZW3vV" id="2UGjFq4lGAp" role="3uHU7w">
                 <node concept="3uibUv" id="5cDlfXt5P_1" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lGBM" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -5472,7 +5472,7 @@
               </node>
               <node concept="2ZW3vV" id="2UGjFq4lGAs" role="3uHU7B">
                 <node concept="3uibUv" id="5cDlfXt5Pzu" role="2ZW6by">
-                  <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                  <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 </node>
                 <node concept="37vLTw" id="2UGjFq4lGBG" role="2ZW6bz">
                   <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -5489,7 +5489,7 @@
                         <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
                       </node>
                       <node concept="3uibUv" id="2UGjFq4lGA_" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lGAA" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                         </node>
@@ -5512,7 +5512,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lGAH" role="3fr31v">
                     <node concept="2ZW3vV" id="2UGjFq4lGAI" role="1eOMHV">
                       <node concept="3uibUv" id="5cDlfXt5PF5" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="2UGjFq4lGBH" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -5522,7 +5522,7 @@
                 </node>
                 <node concept="2ZW3vV" id="2UGjFq4lGAL" role="3uHU7B">
                   <node concept="3uibUv" id="5cDlfXt5PDh" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lGBN" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -5545,7 +5545,7 @@
                     </node>
                     <node concept="10QFUN" id="2UGjFq4lGAV" role="37wK5m">
                       <node concept="3uibUv" id="2UGjFq4lGAW" role="10QFUM">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                         <node concept="16syzq" id="2UGjFq4lGAX" role="11_B2D">
                           <ref role="16sUi3" node="2UGjFq4lHLA" resolve="T" />
                         </node>
@@ -5561,7 +5561,7 @@
               <node concept="1Wc70l" id="2UGjFq4lGB0" role="3eO9$A">
                 <node concept="2ZW3vV" id="2UGjFq4lGB1" role="3uHU7w">
                   <node concept="3uibUv" id="5cDlfXt5PK3" role="2ZW6by">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                   </node>
                   <node concept="37vLTw" id="2UGjFq4lGBP" role="2ZW6bz">
                     <ref role="3cqZAo" node="2UGjFq4lGBC" resolve="right" />
@@ -5571,7 +5571,7 @@
                   <node concept="1eOMI4" id="2UGjFq4lGB5" role="3fr31v">
                     <node concept="2ZW3vV" id="2UGjFq4lGB6" role="1eOMHV">
                       <node concept="3uibUv" id="5cDlfXt5PIb" role="2ZW6by">
-                        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                       </node>
                       <node concept="37vLTw" id="2UGjFq4lGBT" role="2ZW6bz">
                         <ref role="3cqZAo" node="2UGjFq4lGBA" resolve="left" />
@@ -5744,7 +5744,7 @@
                         <node concept="3cpWsn" id="6SwZmzBBYus" role="3cpWs9">
                           <property role="TrG5h" value="vLogical" />
                           <node concept="3uibUv" id="6SwZmzBBYut" role="1tU5fm">
-                            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                             <node concept="3uibUv" id="6SwZmzBBYuu" role="11_B2D">
                               <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                             </node>
@@ -5769,7 +5769,7 @@
                         <node concept="3cpWsn" id="6SwZmzBCqdA" role="3cpWs9">
                           <property role="TrG5h" value="tLogical" />
                           <node concept="3uibUv" id="6SwZmzBCqdB" role="1tU5fm">
-                            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                             <node concept="3uibUv" id="6SwZmzBCqdC" role="11_B2D">
                               <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                             </node>
@@ -5805,7 +5805,7 @@
                               <ref role="3cqZAo" node="6SwZmzBCqdA" resolve="tLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBCwD7" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="6SwZmzBCs5M" role="3uHU7B">
@@ -5813,7 +5813,7 @@
                               <ref role="3cqZAo" node="6SwZmzBBYus" resolve="vLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBCtkA" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -5873,7 +5873,7 @@
                           <node concept="3cpWsn" id="6SwZmzBGn_t" role="3cpWs9">
                             <property role="TrG5h" value="vLogical" />
                             <node concept="3uibUv" id="6SwZmzBGn_u" role="1tU5fm">
-                              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                               <node concept="3qTvmN" id="6SwZmzBGn_v" role="11_B2D" />
                             </node>
                             <node concept="1rXfSq" id="6SwZmzBGn_w" role="33vP2m">
@@ -5893,7 +5893,7 @@
                           <node concept="3cpWsn" id="6SwZmzBGn__" role="3cpWs9">
                             <property role="TrG5h" value="tLogical" />
                             <node concept="3uibUv" id="6SwZmzBGn_A" role="1tU5fm">
-                              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                               <node concept="3qTvmN" id="6SwZmzBGn_B" role="11_B2D" />
                             </node>
                             <node concept="1rXfSq" id="6SwZmzBGn_C" role="33vP2m">
@@ -5924,7 +5924,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGn__" resolve="tLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGn_O" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="6SwZmzBGn_P" role="3uHU7B">
@@ -5932,7 +5932,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGn_t" resolve="vLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGn_R" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -6067,7 +6067,7 @@
         <node concept="37vLTG" id="3HJTsBn4V_r" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="3HJTsBn4V_s" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQ7Bx" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQ5Cq" resolve="T" />
             </node>
@@ -6099,7 +6099,7 @@
         <node concept="37vLTG" id="3HJTsBn4V_C" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="3HJTsBn4V_D" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQoGG" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQnR4" resolve="T" />
             </node>
@@ -6118,7 +6118,7 @@
             <node concept="3cpWsn" id="3HJTsBn77YW" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="3HJTsBn79hD" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="6MYr6JwQpP1" role="11_B2D">
                   <ref role="16sUi3" node="6MYr6JwQnR4" resolve="T" />
                 </node>
@@ -6128,7 +6128,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4V_C" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn77Z0" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6213,7 +6213,7 @@
         <node concept="37vLTG" id="3HJTsBn4V_R" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="3HJTsBn4V_S" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQtLp" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
             </node>
@@ -6222,7 +6222,7 @@
         <node concept="37vLTG" id="3HJTsBn4V_U" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="3HJTsBn4V_V" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQuP9" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
             </node>
@@ -6254,7 +6254,7 @@
             <node concept="3cpWsn" id="3HJTsBn6R7x" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="3HJTsBn6UOm" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="6MYr6JwQvoS" role="11_B2D">
                   <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
                 </node>
@@ -6264,7 +6264,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4V_R" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6R7_" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6273,7 +6273,7 @@
             <node concept="3cpWsn" id="3HJTsBn6R7B" role="3cpWs9">
               <property role="TrG5h" value="rightRepr" />
               <node concept="3uibUv" id="3HJTsBn6WzP" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="6MYr6JwQvEZ" role="11_B2D">
                   <ref role="16sUi3" node="6MYr6JwQsDp" resolve="T" />
                 </node>
@@ -6283,7 +6283,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4V_U" resolve="right" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6R7F" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6469,7 +6469,7 @@
                         <node concept="3cpWsn" id="6SwZmzBD5Al" role="3cpWs9">
                           <property role="TrG5h" value="vLogical" />
                           <node concept="3uibUv" id="6SwZmzBD5Am" role="1tU5fm">
-                            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                             <node concept="3uibUv" id="6SwZmzBD5An" role="11_B2D">
                               <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                             </node>
@@ -6494,7 +6494,7 @@
                         <node concept="3cpWsn" id="6SwZmzBD5Av" role="3cpWs9">
                           <property role="TrG5h" value="tLogical" />
                           <node concept="3uibUv" id="6SwZmzBD5Aw" role="1tU5fm">
-                            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                             <node concept="3uibUv" id="6SwZmzBD5Ax" role="11_B2D">
                               <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                             </node>
@@ -6530,7 +6530,7 @@
                               <ref role="3cqZAo" node="6SwZmzBD5Av" resolve="tLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBD5AK" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="6SwZmzBD5AL" role="3uHU7B">
@@ -6538,7 +6538,7 @@
                               <ref role="3cqZAo" node="6SwZmzBD5Al" resolve="vLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBD5AN" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -6598,7 +6598,7 @@
                           <node concept="3cpWsn" id="6SwZmzBGbbY" role="3cpWs9">
                             <property role="TrG5h" value="vLogical" />
                             <node concept="3uibUv" id="6SwZmzBGbbQ" role="1tU5fm">
-                              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                               <node concept="3qTvmN" id="6SwZmzBGdiR" role="11_B2D" />
                             </node>
                             <node concept="1rXfSq" id="6SwZmzBGbbZ" role="33vP2m">
@@ -6618,7 +6618,7 @@
                           <node concept="3cpWsn" id="6SwZmzBGfdN" role="3cpWs9">
                             <property role="TrG5h" value="tLogical" />
                             <node concept="3uibUv" id="6SwZmzBGfdO" role="1tU5fm">
-                              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                               <node concept="3qTvmN" id="6SwZmzBGfdP" role="11_B2D" />
                             </node>
                             <node concept="1rXfSq" id="6SwZmzBGfdQ" role="33vP2m">
@@ -6649,7 +6649,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGfdN" resolve="tLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGgQ$" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="6SwZmzBGgQ_" role="3uHU7B">
@@ -6657,7 +6657,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGbbY" resolve="vLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGgQB" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -6743,7 +6743,7 @@
         <node concept="37vLTG" id="3HJTsBn4VAp" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="3HJTsBn4VAq" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQEWs" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQDrB" resolve="T" />
             </node>
@@ -6775,7 +6775,7 @@
         <node concept="37vLTG" id="3HJTsBn4VAC" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="3HJTsBn4VAD" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQHqG" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQGB9" resolve="T" />
             </node>
@@ -6794,7 +6794,7 @@
             <node concept="3cpWsn" id="3HJTsBn6Ehk" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="3HJTsBn6Fci" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="6MYr6JwQIFk" role="11_B2D">
                   <ref role="16sUi3" node="6MYr6JwQGB9" resolve="T" />
                 </node>
@@ -6804,7 +6804,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4VAC" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6Eho" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6868,7 +6868,7 @@
         <node concept="37vLTG" id="3HJTsBn4VAT" role="3clF46">
           <property role="TrG5h" value="left" />
           <node concept="3uibUv" id="3HJTsBn4VAU" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQLAe" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
             </node>
@@ -6877,7 +6877,7 @@
         <node concept="37vLTG" id="3HJTsBn4VAW" role="3clF46">
           <property role="TrG5h" value="right" />
           <node concept="3uibUv" id="3HJTsBn4VAX" role="1tU5fm">
-            <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+            <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
             <node concept="16syzq" id="6MYr6JwQMz4" role="11_B2D">
               <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
             </node>
@@ -6890,7 +6890,7 @@
             <node concept="3cpWsn" id="3HJTsBn61Rr" role="3cpWs9">
               <property role="TrG5h" value="leftRepr" />
               <node concept="3uibUv" id="3HJTsBn6y1d" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="6MYr6JwQN3J" role="11_B2D">
                   <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
                 </node>
@@ -6900,7 +6900,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4VAT" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn61Rv" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6909,7 +6909,7 @@
             <node concept="3cpWsn" id="3HJTsBn61Rx" role="3cpWs9">
               <property role="TrG5h" value="rightRepr" />
               <node concept="3uibUv" id="3HJTsBn6yZM" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="16syzq" id="6MYr6JwQNvZ" role="11_B2D">
                   <ref role="16sUi3" node="6MYr6JwQJMk" resolve="T" />
                 </node>
@@ -6919,7 +6919,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4VAW" resolve="right" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn61R_" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -7163,7 +7163,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="6SwZmzBBLve" role="3clF45">
-          <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+          <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
           <node concept="16syzq" id="6SwZmzBBLvf" role="11_B2D">
             <ref role="16sUi3" node="6SwZmzBBLvh" resolve="TERM" />
           </node>
@@ -7199,7 +7199,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="6SwZmzBBLvv" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="16syzq" id="6SwZmzBBLvw" role="11_B2D">
                       <ref role="16sUi3" node="6SwZmzBBLvh" resolve="TERM" />
                     </node>
@@ -7241,7 +7241,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="6SwZmzBBLvI" role="3clF45">
-          <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+          <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
           <node concept="16syzq" id="6SwZmzBBLvJ" role="11_B2D">
             <ref role="16sUi3" node="6SwZmzBBLvL" resolve="T" />
           </node>
@@ -7274,7 +7274,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="6SwZmzBBLvY" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="16syzq" id="6SwZmzBBLvZ" role="11_B2D">
                       <ref role="16sUi3" node="6SwZmzBBLvL" resolve="T" />
                     </node>
@@ -7710,7 +7710,7 @@
                 <ref role="37wK5l" node="6MYr6Jx1D_6" resolve="_ask" />
                 <node concept="10QFUN" id="2UGjFq4lQVF" role="37wK5m">
                   <node concept="3uibUv" id="2UGjFq4lQVG" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="3qTvmN" id="2UGjFq4lQVH" role="11_B2D" />
                   </node>
                   <node concept="2OqwBi" id="2UGjFq4lR8D" role="10QFUP">
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 238e10e0..ec4d5651 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -6061,7 +6061,7 @@
       <node concept="37vLTG" id="YGS68MEg3Q" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg3R" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg3S" role="3clF45" />
@@ -6078,7 +6078,7 @@
       <node concept="37vLTG" id="YGS68MEg3Y" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg3Z" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg40" role="3clF45" />
@@ -6095,7 +6095,7 @@
       <node concept="37vLTG" id="YGS68MEg46" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg47" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg48" role="3clF45" />
@@ -6112,7 +6112,7 @@
       <node concept="37vLTG" id="2_NfR5wh9fc" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2_NfR5wh9fd" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="2_NfR5wh9fe" role="3clF45" />
@@ -6129,7 +6129,7 @@
       <node concept="37vLTG" id="YGS68MEg4e" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MEg4f" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MEg4g" role="3clF45" />
@@ -7133,7 +7133,7 @@
       <node concept="37vLTG" id="3mz2_dYayts" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="3mz2_dYfdao" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3mz2_dYay7y" role="1B3o_S" />
@@ -7155,7 +7155,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYfcTc" role="3clF45">
-        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
       </node>
     </node>
     <node concept="2tJIrI" id="3mz2_dYfbSs" role="jymVt" />
@@ -7380,14 +7380,14 @@
         <node concept="3clFbF" id="3mz2_dYeZM0" role="3cqZAp">
           <node concept="2ShNRf" id="3mz2_dYeZM1" role="3clFbG">
             <node concept="1pGfFk" id="3mz2_dYeZM2" role="2ShVmc">
-              <ref role="37wK5l" node="3mz2_dYeSui" resolve="Snapshot.MatchRuleSnapshot" />
+              <ref role="37wK5l" node="3mz2_dYeSui" resolve="Snapshot.RuleMatchSnapshot" />
               <node concept="Xjq3P" id="19wqdqOpE9g" role="37wK5m" />
               <node concept="2OqwBi" id="3mz2_dYf1SI" role="37wK5m">
                 <node concept="37vLTw" id="3mz2_dYeZM3" role="2Oq$k0">
                   <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYf1Xs" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                  <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3mz2_dYeZM4" role="37wK5m">
@@ -7397,7 +7397,7 @@
                     <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYeZM7" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                   </node>
                 </node>
               </node>
@@ -7408,7 +7408,7 @@
                     <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYf24v" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                   </node>
                 </node>
               </node>
@@ -7419,11 +7419,11 @@
       <node concept="37vLTG" id="3mz2_dYeZLV" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYf1sN" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYf76w" role="3clF45">
-        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
       </node>
       <node concept="3Tmbuc" id="19wqdqOq7BK" role="1B3o_S" />
     </node>
@@ -8060,7 +8060,7 @@
     <node concept="2tJIrI" id="6QkkSol$YK6" role="jymVt" />
     <node concept="312cEu" id="3mz2_dYeR7o" role="jymVt">
       <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="MatchRuleSnapshot" />
+      <property role="TrG5h" value="RuleMatchSnapshot" />
       <node concept="2tJIrI" id="3mz2_dYeS1y" role="jymVt" />
       <node concept="3clFbW" id="3mz2_dYeSui" role="jymVt">
         <node concept="37vLTG" id="19wqdqOpm6O" role="3clF46">
@@ -8146,7 +8146,7 @@
       <node concept="2tJIrI" id="6Uh0cilklX9" role="jymVt" />
       <node concept="3Tm6S6" id="3mz2_dYeROi" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYeRSG" role="EKbjA">
-        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
       </node>
       <node concept="3clFb_" id="3mz2_dYeRVo" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -8569,6 +8569,26 @@
         </node>
       </node>
       <node concept="2tJIrI" id="60zk4o7lrIn" role="jymVt" />
+      <node concept="3clFb_" id="3T3QA3WscfK" role="jymVt">
+        <property role="TrG5h" value="invocationContext" />
+        <node concept="3Tm1VV" id="3T3QA3WscfL" role="1B3o_S" />
+        <node concept="3uibUv" id="3T3QA3WscfN" role="3clF45">
+          <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+        </node>
+        <node concept="3clFbS" id="3T3QA3WscfO" role="3clF47">
+          <node concept="YS8fn" id="3T3QA3Wsdfw" role="3cqZAp">
+            <node concept="2ShNRf" id="3T3QA3Wsdfx" role="YScLw">
+              <node concept="1pGfFk" id="3T3QA3Wsdfy" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="3T3QA3WscfP" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3T3QA3Wsdsk" role="jymVt" />
       <node concept="3clFb_" id="6Uh0cilkrIv" role="jymVt">
         <property role="TrG5h" value="original" />
         <property role="1EzhhJ" value="false" />
@@ -14148,7 +14168,7 @@
           <property role="TrG5h" value="match" />
           <node concept="1LlUBW" id="6bBjpI83oo_" role="1tU5fm">
             <node concept="3uibUv" id="6bBjpI83ooA" role="1Lm7xW">
-              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
             </node>
             <node concept="3uibUv" id="32fHqDfefKU" role="1Lm7xW">
               <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -14212,7 +14232,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4LmiAf" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4LmiAg" role="1Lm7xW">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
           <node concept="3uibUv" id="32fHqDfef9h" role="1Lm7xW">
             <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -14230,7 +14250,7 @@
           <property role="TrG5h" value="match" />
           <node concept="1LlUBW" id="6bBjpI85Qrt" role="1tU5fm">
             <node concept="3uibUv" id="6bBjpI85Qru" role="1Lm7xW">
-              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
             </node>
             <node concept="3uibUv" id="6bBjpI85Qrw" role="1Lm7xW">
               <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
@@ -14291,7 +14311,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4LmYK$" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4LmYK_" role="1Lm7xW">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
           <node concept="3uibUv" id="4VwaB4LmYKA" role="1Lm7xW">
             <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
@@ -14310,7 +14330,7 @@
           <property role="TrG5h" value="match" />
           <node concept="1LlUBW" id="4VwaB4LGpdV" role="1tU5fm">
             <node concept="3uibUv" id="4VwaB4LGpdW" role="1Lm7xW">
-              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
             </node>
           </node>
         </node>
@@ -14367,7 +14387,7 @@
         <ref role="3uigEE" node="4VwaB4LlZ1n" resolve="ActivationNodes.DefaultTreeNode" />
         <node concept="1LlUBW" id="4VwaB4LGpe8" role="11_B2D">
           <node concept="3uibUv" id="4VwaB4LGpe9" role="1Lm7xW">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
       </node>
@@ -26546,7 +26566,7 @@
               </node>
               <node concept="1LlUBW" id="6bBjpI85VsC" role="1tU5fm">
                 <node concept="3uibUv" id="6bBjpI85VsD" role="1Lm7xW">
-                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                 </node>
                 <node concept="3uibUv" id="32fHqDff1js" role="1Lm7xW">
                   <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -26587,7 +26607,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="6RFuZEC71Wp" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                   </node>
                 </node>
               </node>
@@ -26937,7 +26957,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFILaH" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFILaI" role="1Lm7xW">
-                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                 </node>
                 <node concept="3uibUv" id="32fHqDfegQp" role="1Lm7xW">
                   <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
@@ -26988,7 +27008,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="2T1p0CFILb7" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                   </node>
                 </node>
               </node>
@@ -27118,7 +27138,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFIO93" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFIO94" role="1Lm7xW">
-                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                 </node>
                 <node concept="3uibUv" id="2T1p0CFIO95" role="1Lm7xW">
                   <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
@@ -27208,7 +27228,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="2T1p0CFIMZD" role="1tU5fm">
                 <node concept="3uibUv" id="2T1p0CFIMZE" role="1Lm7xW">
-                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                 </node>
               </node>
               <node concept="2OqwBi" id="2T1p0CFIMZF" role="33vP2m">
@@ -27267,7 +27287,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2T1p0CFIN07" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
+                        <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                       </node>
                     </node>
                   </node>
@@ -27296,7 +27316,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2T1p0CFIN0l" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
+                        <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                       </node>
                     </node>
                   </node>
@@ -27725,7 +27745,7 @@
                     <property role="TrG5h" value="data" />
                     <node concept="1LlUBW" id="6_UQWSXemqg" role="1tU5fm">
                       <node concept="3uibUv" id="6_UQWSXemqh" role="1Lm7xW">
-                        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                       </node>
                       <node concept="3uibUv" id="6_UQWSXemqi" role="1Lm7xW">
                         <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
@@ -28159,7 +28179,7 @@
               <property role="TrG5h" value="data" />
               <node concept="1LlUBW" id="5TpjAH61t3d" role="1tU5fm">
                 <node concept="3uibUv" id="5TpjAH61t3e" role="1Lm7xW">
-                  <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                  <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                 </node>
                 <node concept="3uibUv" id="5TpjAH61t3f" role="1Lm7xW">
                   <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
@@ -28335,7 +28355,7 @@
       <node concept="37vLTG" id="YGS68MDFvd" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFve" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFvf" role="3clF45" />
@@ -28345,7 +28365,7 @@
           <node concept="3cpWsn" id="3wxtToDRFe4" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="3wxtToDRFdG" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
             </node>
             <node concept="2OqwBi" id="3wxtToDRFe5" role="33vP2m">
               <node concept="1rXfSq" id="3wxtToE2swg" role="2Oq$k0">
@@ -28381,7 +28401,7 @@
                     <node concept="3uibUv" id="3wxtToDRFei" role="1tU5fm">
                       <ref role="3uigEE" node="3wxtToDPbdf" resolve="Snapshot.History.Record" />
                       <node concept="3uibUv" id="3wxtToDRFej" role="11_B2D">
-                        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                       </node>
                     </node>
                   </node>
@@ -28473,7 +28493,7 @@
       <node concept="37vLTG" id="YGS68MDFvN" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFvO" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFvP" role="3clF45" />
@@ -28507,7 +28527,7 @@
                           <ref role="3cqZAo" node="YGS68MDFvN" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFw6" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -28529,7 +28549,7 @@
       <node concept="37vLTG" id="YGS68MDFw8" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFw9" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFwa" role="3clF45" />
@@ -28539,7 +28559,7 @@
           <node concept="3cpWsn" id="3wxtToDTkjy" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="3wxtToDTkjz" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
             </node>
             <node concept="2OqwBi" id="3wxtToDTkj$" role="33vP2m">
               <node concept="1rXfSq" id="3wxtToE2rTQ" role="2Oq$k0">
@@ -28575,7 +28595,7 @@
                     <node concept="3uibUv" id="3wxtToDTkjL" role="1tU5fm">
                       <ref role="3uigEE" node="3wxtToDPbdf" resolve="Snapshot.History.Record" />
                       <node concept="3uibUv" id="3wxtToDTkjM" role="11_B2D">
-                        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                       </node>
                     </node>
                   </node>
@@ -28613,7 +28633,7 @@
                           <ref role="3cqZAo" node="YGS68MDFw8" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFww" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~MatchRule.rule()" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -28705,7 +28725,7 @@
       <node concept="37vLTG" id="32fHqDfcLw8" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="32fHqDfcLw9" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="32fHqDfcLwa" role="3clF45" />
@@ -28718,7 +28738,7 @@
           <node concept="3cpWsn" id="3wxtToDTqkG" role="3cpWs9">
             <property role="TrG5h" value="snapshot" />
             <node concept="3uibUv" id="3wxtToDTqkH" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+              <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
             </node>
             <node concept="2OqwBi" id="3wxtToDTqkI" role="33vP2m">
               <node concept="1rXfSq" id="3wxtToE2rn4" role="2Oq$k0">
@@ -28754,7 +28774,7 @@
                     <node concept="3uibUv" id="3wxtToDTqkV" role="1tU5fm">
                       <ref role="3uigEE" node="3wxtToDPbdf" resolve="Snapshot.History.Record" />
                       <node concept="3uibUv" id="3wxtToDTqkW" role="11_B2D">
-                        <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+                        <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
                       </node>
                     </node>
                   </node>
@@ -28792,7 +28812,7 @@
                           <ref role="3cqZAo" node="32fHqDfcLw8" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="32fHqDfcR9$" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -28848,7 +28868,7 @@
       <node concept="37vLTG" id="YGS68MDFwX" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="YGS68MDFwY" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="YGS68MDFwZ" role="3clF45" />
@@ -28882,7 +28902,7 @@
                           <ref role="3cqZAo" node="YGS68MDFwX" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFxg" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -29922,7 +29942,7 @@
         <node concept="37vLTG" id="YGS68MJoYg" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="YGS68MJoYh" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="37vLTG" id="32fHqDfev9p" role="3clF46">
@@ -30040,7 +30060,7 @@
         <node concept="37vLTG" id="YGS68MJoZ2" role="3clF46">
           <property role="TrG5h" value="matchRule" />
           <node concept="3uibUv" id="YGS68MJoZ3" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+            <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
           </node>
         </node>
         <node concept="3clFbS" id="YGS68MJoZ4" role="3clF47">
@@ -30138,7 +30158,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZ2" resolve="matchRule" />
                   </node>
                   <node concept="liA8E" id="YGS68MJoZH" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
                   </node>
                 </node>
               </node>
@@ -30214,7 +30234,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZ2" resolve="matchRule" />
                   </node>
                   <node concept="liA8E" id="YGS68MJp0b" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
                   </node>
                 </node>
               </node>
@@ -30361,7 +30381,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="YGS68MJp1a" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                   </node>
                 </node>
                 <node concept="liA8E" id="YGS68MJp1b" role="2OqNvi">
@@ -30453,7 +30473,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="32fHqDfdi_M" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~MatchRule.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                      <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
                     </node>
                   </node>
                   <node concept="liA8E" id="32fHqDfdi_N" role="2OqNvi">
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index fb808184..cb38eb15 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -2789,7 +2789,7 @@
       <node concept="37vLTG" id="2UGjFq4bW0h" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2UGjFq4bW0i" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bW0j" role="3clF45" />
@@ -2808,7 +2808,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd0CJ" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="trying" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="trying" />
                   <node concept="37vLTw" id="5mg4ZgLd2rq" role="37wK5m">
                     <ref role="3cqZAo" node="2UGjFq4bW0h" resolve="matchRule" />
                   </node>
@@ -2848,7 +2848,7 @@
       <node concept="37vLTG" id="2T1p0CFMVBA" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2T1p0CFMVBB" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="2T1p0CFMVBC" role="3clF45" />
@@ -2867,7 +2867,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd4fK" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="reject" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="reject" />
                   <node concept="37vLTw" id="5mg4ZgLd4fL" role="37wK5m">
                     <ref role="3cqZAo" node="2T1p0CFMVBA" resolve="matchRule" />
                   </node>
@@ -2907,7 +2907,7 @@
       <node concept="37vLTG" id="7nPD14NbLve" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="7nPD14NbLvf" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="7nPD14NbLvg" role="3clF45" />
@@ -2926,7 +2926,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd70F" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="trigger" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="trigger" />
                   <node concept="37vLTw" id="5mg4ZgLd70G" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLve" resolve="matchRule" />
                   </node>
@@ -2966,7 +2966,7 @@
       <node concept="37vLTG" id="2_NfR5wi4YF" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2_NfR5wi4YG" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="2_NfR5wi4YH" role="3clF45" />
@@ -2985,7 +2985,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd9Lq" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="retry" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="retry" />
                   <node concept="37vLTw" id="5mg4ZgLd9Lr" role="37wK5m">
                     <ref role="3cqZAo" node="2_NfR5wi4YF" resolve="matchRule" />
                   </node>
@@ -3025,7 +3025,7 @@
       <node concept="37vLTG" id="2UGjFq4bWOF" role="3clF46">
         <property role="TrG5h" value="matchRule" />
         <node concept="3uibUv" id="2UGjFq4bWOG" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~MatchRule" resolve="MatchRule" />
+          <ref role="3uigEE" to="w7la:~RuleMatch" resolve="RuleMatch" />
         </node>
       </node>
       <node concept="3cqZAl" id="2UGjFq4bWOH" role="3clF45" />
@@ -3044,7 +3044,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLdbU1" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.MatchRule):void" resolve="finish" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="finish" />
                   <node concept="37vLTw" id="5mg4ZgLdbU2" role="37wK5m">
                     <ref role="3cqZAo" node="2UGjFq4bWOF" resolve="matchRule" />
                   </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 7e071cf5..f02cb457 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
@@ -3352,7 +3352,7 @@
           <node concept="3cpWsn" id="YbzkzLjZPS" role="3cpWs9">
             <property role="TrG5h" value="nl" />
             <node concept="3uibUv" id="YbzkzLjZPM" role="1tU5fm">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="YbzkzLjZPP" role="11_B2D">
                 <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
               </node>
@@ -3375,7 +3375,7 @@
               <ref role="3cqZAo" node="YbzkzLjZPS" resolve="nl" />
             </node>
             <node concept="liA8E" id="YbzkzLk7wn" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object)" resolve="setValue" />
+              <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
               <node concept="37vLTw" id="YbzkzLkaf1" role="37wK5m">
                 <ref role="3cqZAo" node="2DKqMqOq_PA" resolve="tf" />
               </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index abea9aa9..7fc89a10 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -1037,6 +1037,26 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="3T3QA3Ws6vd" role="jymVt" />
+    <node concept="3clFb_" id="3T3QA3Ws5UR" role="jymVt">
+      <property role="TrG5h" value="invocationContext" />
+      <node concept="3Tm1VV" id="3T3QA3Ws5US" role="1B3o_S" />
+      <node concept="3uibUv" id="3T3QA3Ws5UU" role="3clF45">
+        <ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
+      </node>
+      <node concept="3clFbS" id="3T3QA3Ws5UV" role="3clF47">
+        <node concept="YS8fn" id="3T3QA3Ws6F_" role="3cqZAp">
+          <node concept="2ShNRf" id="3T3QA3Ws6FA" role="YScLw">
+            <node concept="1pGfFk" id="3T3QA3Ws6FB" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3T3QA3Ws5UW" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="60zk4o7hk1i" role="jymVt" />
     <node concept="312cEg" id="60zk4o6U4yP" role="jymVt">
       <property role="TrG5h" value="myPredicate" />
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 15ea2026..b4e78ca1 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
@@ -227,7 +227,7 @@
     <node concept="3clFb_" id="5TfjU0xmBIV" role="jymVt">
       <property role="TrG5h" value="logical" />
       <node concept="3uibUv" id="5TfjU0xmBIW" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="5TfjU0xmBIX" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
@@ -263,7 +263,7 @@
             <node concept="3cpWsn" id="5TfjU0xmAUC" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="5TfjU0xmAUD" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="5TfjU0xmAUE" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -280,7 +280,7 @@
             <node concept="3cpWsn" id="5TfjU0xmAUI" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="5TfjU0xmAUJ" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="5TfjU0xmAUK" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -297,7 +297,7 @@
             <node concept="3cpWsn" id="5TfjU0xmAUO" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="5TfjU0xmAUP" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="5TfjU0xmAUQ" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -334,7 +334,7 @@
                 <ref role="3cqZAo" node="5TfjU0xmAUC" resolve="x" />
               </node>
               <node concept="liA8E" id="5TfjU0xmGY8" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="5TfjU0xmH22" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -364,7 +364,7 @@
                 <ref role="3cqZAo" node="5TfjU0xmAUI" resolve="y" />
               </node>
               <node concept="liA8E" id="5TfjU0xmLGH" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="5TfjU0xmLLa" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -394,7 +394,7 @@
                 <ref role="3cqZAo" node="5TfjU0xmAUO" resolve="z" />
               </node>
               <node concept="liA8E" id="5TfjU0xmNLi" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="5TfjU0xmNRG" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -1104,7 +1104,7 @@
               <node concept="1eOMI4" id="3gNap3g8LL3" role="2Oq$k0">
                 <node concept="10QFUN" id="3gNap3g8LL0" role="1eOMHV">
                   <node concept="3uibUv" id="3gNap3g8LLe" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="17QB3L" id="3gNap3g8LLm" role="11_B2D" />
                   </node>
                   <node concept="1rXfSq" id="3gNap3g8LL5" role="10QFUP">
@@ -1116,7 +1116,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g8MRy" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="3gNap3g8MRS" role="37wK5m">
                   <property role="Xl_RC" value="xyz" />
                 </node>
@@ -2484,7 +2484,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1OShD0IfIGc" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
               </node>
             </node>
             <node concept="2OqwBi" id="1OShD0IfI6R" role="3tpDZB">
@@ -2495,7 +2495,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1OShD0IfIj2" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -3249,7 +3249,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfxL5W" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
               </node>
             </node>
             <node concept="2OqwBi" id="kTK1BfxL5X" role="3tpDZB">
@@ -3260,7 +3260,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfxL60" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -3376,7 +3376,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3HJTsBn466m" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3HJTsBn466n" role="2OqNvi">
@@ -3539,7 +3539,7 @@
               <node concept="1eOMI4" id="3gNap3g8lvt" role="2Oq$k0">
                 <node concept="10QFUN" id="3gNap3g8lvq" role="1eOMHV">
                   <node concept="3uibUv" id="3gNap3g8lvB" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="17QB3L" id="3gNap3g8lwr" role="11_B2D" />
                   </node>
                   <node concept="1rXfSq" id="3gNap3g8lvv" role="10QFUP">
@@ -3551,7 +3551,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g8lCn" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="3gNap3g8lCK" role="37wK5m">
                   <property role="Xl_RC" value="xyz" />
                 </node>
@@ -3801,7 +3801,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="kTK1BfyxPc" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfyxPd" role="2OqNvi">
@@ -4008,7 +4008,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6MYr6Jy8m2W" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~JoinableLogical.findRoot():jetbrains.mps.logic.reactor.logical.JoinableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jy8m2X" role="2OqNvi">
@@ -6853,7 +6853,7 @@
     <node concept="3clFb_" id="6N2bvv_uPxw" role="jymVt">
       <property role="TrG5h" value="logical" />
       <node concept="3uibUv" id="6N2bvv_uPxX" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="6N2bvv_uPy5" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
@@ -6952,7 +6952,7 @@
     <node concept="3clFb_" id="390NiL15T3$" role="jymVt">
       <property role="TrG5h" value="asTermLogical" />
       <node concept="3uibUv" id="390NiL15T4j" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="390NiL15Ye$" role="11_B2D">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
@@ -6980,7 +6980,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="390NiL162LH" role="10QFUM">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="390NiL162LO" role="11_B2D">
                 <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
               </node>
@@ -7005,7 +7005,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6SwZmzBDAqC" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="6SwZmzBDD40" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~String" resolve="String" />
         </node>
@@ -7033,7 +7033,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="6SwZmzBDE9Z" role="10QFUM">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="6SwZmzBDEHe" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~String" resolve="String" />
               </node>
@@ -7053,7 +7053,7 @@
             <node concept="3cpWsn" id="6N2bvv_uTT3" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="6N2bvv_uTSY" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="6N2bvv_uTT1" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -7070,7 +7070,7 @@
             <node concept="3cpWsn" id="6N2bvv_uTTM" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="6N2bvv_uTTG" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="6N2bvv_uTTJ" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -7087,7 +7087,7 @@
             <node concept="3cpWsn" id="6N2bvv_uWqJ" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="6N2bvv_uWqK" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="6N2bvv_uWqL" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -7141,7 +7141,7 @@
                 <ref role="3cqZAo" node="6N2bvv_uTT3" resolve="x" />
               </node>
               <node concept="liA8E" id="6N2bvv_uVfr" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="6N2bvv_uVfI" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -7187,7 +7187,7 @@
                 <ref role="3cqZAo" node="6N2bvv_uTTM" resolve="y" />
               </node>
               <node concept="liA8E" id="6N2bvv_uWmD" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="6N2bvv_uWmW" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -7217,7 +7217,7 @@
                 <ref role="3cqZAo" node="6N2bvv_uWqJ" resolve="z" />
               </node>
               <node concept="liA8E" id="6N2bvv_uWrJ" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="6N2bvv_uWrK" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -7682,7 +7682,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzB$SYy" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzB$T98" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzB$ThZ" role="37wK5m">
@@ -7766,7 +7766,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBDVxE" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBDVCz" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBDxdZ" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBDVQT" role="37wK5m">
@@ -8207,7 +8207,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL15UsS" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL15U$k" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL15UG0" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL15UG2" role="1ojpOf">
@@ -8263,7 +8263,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBF$71" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBF$j1" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBF$wl" role="37wK5m">
@@ -8315,7 +8315,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBEcXI" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="6SwZmzBEd4F" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -8364,7 +8364,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBEnlT" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBEntc" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBDxdZ" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBEnGV" role="37wK5m">
@@ -8545,7 +8545,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBARwE" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBAR$P" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBARGN" role="37wK5m">
@@ -8713,7 +8713,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL16XbS" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL16Xcr" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL16Xgj" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL16Xgl" role="1ojpOf">
@@ -8793,7 +8793,7 @@
     <node concept="3clFb_" id="390NiL15h0_" role="jymVt">
       <property role="TrG5h" value="logical" />
       <node concept="3uibUv" id="390NiL15h0A" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="390NiL15h0B" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
@@ -8892,7 +8892,7 @@
     <node concept="3clFb_" id="390NiL16pUf" role="jymVt">
       <property role="TrG5h" value="asTermLogical" />
       <node concept="3uibUv" id="390NiL16pUg" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="390NiL16pUh" role="11_B2D">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
@@ -8920,7 +8920,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="390NiL16pUt" role="10QFUM">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="390NiL16pUu" role="11_B2D">
                 <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
               </node>
@@ -8945,7 +8945,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6SwZmzBEAPr" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="6SwZmzBEAPs" role="11_B2D">
           <ref role="3uigEE" to="wyt6:~String" resolve="String" />
         </node>
@@ -8973,7 +8973,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="6SwZmzBEAPC" role="10QFUM">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="6SwZmzBEAPD" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~String" resolve="String" />
               </node>
@@ -8993,7 +8993,7 @@
             <node concept="3cpWsn" id="390NiL14HhZ" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="390NiL14Hi0" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="390NiL14Hi1" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -9010,7 +9010,7 @@
             <node concept="3cpWsn" id="390NiL14Hi5" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="390NiL14Hi6" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="390NiL14Hi7" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -9027,7 +9027,7 @@
             <node concept="3cpWsn" id="390NiL14Hib" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="390NiL14Hic" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                 <node concept="3uibUv" id="390NiL14Hid" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -9091,7 +9091,7 @@
                 <ref role="3cqZAo" node="390NiL14HhZ" resolve="x" />
               </node>
               <node concept="liA8E" id="390NiL14Hir" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="390NiL14His" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -9147,7 +9147,7 @@
                 <ref role="3cqZAo" node="390NiL14Hi5" resolve="y" />
               </node>
               <node concept="liA8E" id="390NiL14HiB" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="390NiL14HiC" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -9182,7 +9182,7 @@
                 <ref role="3cqZAo" node="390NiL14Hib" resolve="z" />
               </node>
               <node concept="liA8E" id="390NiL14HiN" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="390NiL14HiO" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -9677,7 +9677,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBAFqu" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBAFuk" role="37wK5m">
                   <ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBAFBb" role="37wK5m">
@@ -9761,7 +9761,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBF8hC" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBF8hD" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBEAPo" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBF8hE" role="37wK5m">
@@ -10232,7 +10232,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL16dSg" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL16dSh" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL16dSi" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL16dSj" role="1ojpOf">
@@ -10288,7 +10288,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBFIh7" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBFIh8" role="37wK5m">
                   <ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBFIh9" role="37wK5m">
@@ -10340,7 +10340,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBFOXV" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="Xl_RD" id="6SwZmzBFOXW" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -10389,7 +10389,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBFSS4" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBFSS5" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBEAPo" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBFSS6" role="37wK5m">
@@ -10559,7 +10559,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBB4Lf" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBB4Pq" role="37wK5m">
                   <ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBB4YH" role="37wK5m">
@@ -10722,7 +10722,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL171eP" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL171eQ" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL171eR" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL171eS" role="1ojpOf">
@@ -10966,7 +10966,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1POzLwzc6O$" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="1POzLwzcVuk" role="11_B2D">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
@@ -10994,7 +10994,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="1POzLwzcOAS" role="10QFUM">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="1POzLwzcW9r" role="11_B2D">
                 <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
               </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 361a6935..0db41139 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -2395,7 +2395,7 @@
     <node concept="3clFb_" id="390NiL15T3$" role="jymVt">
       <property role="TrG5h" value="asTermLogical" />
       <node concept="3uibUv" id="390NiL15T4j" role="3clF45">
-        <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+        <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
         <node concept="3uibUv" id="6SwZmzBzs3_" role="11_B2D">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
@@ -2423,7 +2423,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="390NiL162LH" role="10QFUM">
-              <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+              <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="390NiL162LO" role="11_B2D">
                 <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
               </node>
@@ -3416,7 +3416,7 @@
               <node concept="1eOMI4" id="2dF51l1dp$h" role="2Oq$k0">
                 <node concept="10QFUN" id="2dF51l1dp$e" role="1eOMHV">
                   <node concept="3uibUv" id="2dF51l1dp$Q" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="3uibUv" id="2dF51l1drx0" role="11_B2D">
                       <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
@@ -3442,7 +3442,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2dF51l1dtwt" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="37vLTw" id="2dF51l1dBeg" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1d$S6" resolve="foo1" />
                 </node>
@@ -3496,7 +3496,7 @@
               <node concept="1eOMI4" id="2dF51l1dNCp" role="2Oq$k0">
                 <node concept="10QFUN" id="2dF51l1dNCq" role="1eOMHV">
                   <node concept="3uibUv" id="2dF51l1dNCr" role="10QFUM">
-                    <ref role="3uigEE" to="bj13:~JoinableLogical" resolve="JoinableLogical" />
+                    <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="3uibUv" id="2dF51l1dNCs" role="11_B2D">
                       <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
@@ -3522,7 +3522,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2dF51l1dNC$" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
                 <node concept="37vLTw" id="2dF51l1dNHz" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1dEVg" resolve="foo2" />
                 </node>
@@ -3880,7 +3880,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBzJKn" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBzLb3" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBzLhd" role="37wK5m">
@@ -4140,7 +4140,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBGFuM" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~JoinableLogical.union(jetbrains.mps.logic.reactor.logical.JoinableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBGFuN" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBGFuO" role="37wK5m">