From a27cdecc6718730854e3de403722ea6d65720f05 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 31 Aug 2016 12:02:05 +0200
Subject: [PATCH] Renamings and refactorings in the logic api. Use TreeForm
 name for the tree abstraction. Rename Atom, Func etc. and the usages.

---
 .../languageModels/plugin.mps                 |   2 +-
 .../generator/template/main@generator.mps     |  18 +-
 .../lang/typesystem2/samplechecker/runner.mps |  14 +-
 .../lang/typesystem2/samplechecker/util.mps   |  36 +-
 .../typesystem2/sampleplugin/jchr/plugin.mps  |  62 +-
 .../jetbrains/mps/logic/jchr/predicate.mps    |  96 +--
 .../generator/template/main@generator.mps     |   8 +-
 .../languageModels/behavior.mps               |  14 +-
 .../languageModels/typesystem.mps             |   2 +-
 .../models/jetbrains/mps/logic/builtin.mps    |  66 +-
 .../jetbrains/mps/logic/builtin/program.mps   |  26 +-
 .../mps/logic/builtin/unification.mps         |  14 +-
 .../models/jetbrains/mps/logic/atom.mps       | 644 +++++++++---------
 .../mps/logic/test/logical@tests.mps          | 406 +++++------
 .../mps/logic/test/unification@tests.mps      | 206 +++---
 .../models/types.mps                          |   2 +-
 .../samplechecker/handle/test/util@tests.mps  | 110 +--
 .../typesystem2/samplechecker/handle/util.mps | 200 +++---
 .../lang/typesystem2/sampleplugin/plugin.mps  | 164 ++---
 .../generator/template/main@generator.mps     |  22 +-
 .../mps/lang/typesystem2/program.mps          |  12 +-
 21 files changed, 1062 insertions(+), 1062 deletions(-)

diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
index 9546f85f..e390f93b 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
@@ -1318,7 +1318,7 @@
                                     <node concept="2dOGH5" id="2ev$9JFzGsK" role="1r8FgC">
                                       <property role="Lv5iS" value="true" />
                                       <node concept="Xl_RD" id="2ev$9JFzGsL" role="2dOGIY">
-                                        <property role="Xl_RC" value="jetbrains.mps.logic.atom.Atom" />
+                                        <property role="Xl_RC" value="jetbrains.mps.logic.atom.TreeForm" />
                                       </node>
                                       <node concept="Xl_RD" id="2ev$9JFzGsM" role="2dOGIT">
                                         <property role="Xl_RC" value="fixed" />
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
index 795f503a..27dba340 100644
--- a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
+++ b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
@@ -304,7 +304,7 @@
     <property role="TrG5h" value="Stuff" />
     <node concept="2tJIrI" id="35Lj3TiRjxl" role="jymVt" />
     <node concept="2YIFZL" id="35Lj3TiRjRb" role="jymVt">
-      <property role="TrG5h" value="atom" />
+      <property role="TrG5h" value="treeForm" />
       <node concept="37vLTG" id="35Lj3TiRke1" role="3clF46">
         <property role="TrG5h" value="param" />
         <node concept="3uibUv" id="35Lj3TiRkkj" role="1tU5fm">
@@ -482,7 +482,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="35Lj3TiSq77" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="35Lj3TiRjRe" role="1B3o_S" />
       <node concept="3clFbS" id="35Lj3TiRjRf" role="3clF47">
@@ -617,7 +617,7 @@
       <node concept="gft3U" id="35Lj3TiR81W" role="1lVwrX">
         <node concept="2YIFZM" id="6yEjedmrPFl" role="gfFT$">
           <ref role="1Pybhc" node="35Lj3TiR8No" resolve="Stuff" />
-          <ref role="37wK5l" node="35Lj3TiRjRb" resolve="atom" />
+          <ref role="37wK5l" node="35Lj3TiRjRb" resolve="treeForm" />
           <node concept="10Nm6u" id="35Lj3TiSD25" role="37wK5m">
             <node concept="2b32R4" id="35Lj3TiSFbs" role="lGtFl">
               <node concept="3JmXsc" id="35Lj3TiSFbu" role="2P8S$">
@@ -671,7 +671,7 @@
           <node concept="gft3U" id="4OKkcneWb1C" role="150oIE">
             <node concept="2YIFZM" id="7HUwyZbd5nK" role="gfFT$">
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asTreeForm" />
               <node concept="2ShNRf" id="7nPD14NOHH4" role="37wK5m">
                 <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
                   <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
@@ -685,13 +685,13 @@
         </node>
         <node concept="gft3U" id="4OKkcneWczK" role="14YRTM">
           <node concept="2YIFZM" id="7HUwyZbd5Au" role="gfFT$">
-            <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+            <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asTreeForm" />
             <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
             <node concept="2ShNRf" id="2Dg5bSg3RdY" role="37wK5m">
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
                 <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                 <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -752,7 +752,7 @@
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
         <node concept="2YIFZM" id="29_L5zQWy8l" role="gfFT$">
           <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
           <node concept="Xl_RD" id="29_L5zQWy8m" role="37wK5m">
             <property role="Xl_RC" value="node" />
             <node concept="17Uvod" id="29_L5zQWJXC" role="lGtFl">
@@ -939,7 +939,7 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
       <node concept="gft3U" id="6UqNvvALIHq" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALIHr" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
           <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
           <node concept="Xl_RD" id="6UqNvvALIHs" role="37wK5m">
             <property role="Xl_RC" value="name" />
@@ -1119,7 +1119,7 @@
       <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="List" />
       <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
           <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
           <node concept="10Nm6u" id="7HUwyZb7cIG" role="37wK5m">
             <node concept="2b32R4" id="7HUwyZb7cIH" role="lGtFl">
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
index 07ecaf00..8785df9a 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
@@ -394,9 +394,9 @@
                     <property role="TrG5h" value="doPrint" />
                     <property role="1EzhhJ" value="false" />
                     <node concept="37vLTG" id="6r6omRld9An" role="3clF46">
-                      <property role="TrG5h" value="atom" />
+                      <property role="TrG5h" value="tf" />
                       <node concept="3uibUv" id="6r6omRld9Ao" role="1tU5fm">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="17QB3L" id="6r6omRld9Ap" role="3clF45" />
@@ -412,7 +412,7 @@
                               <ref role="37wK5l" to="poio:4peSo3CHBfF" resolve="print" />
                               <ref role="1Pybhc" to="poio:4peSo3CHy8D" resolve="NodePrinter" />
                               <node concept="37vLTw" id="6r6omRld9Qi" role="37wK5m">
-                                <ref role="3cqZAo" node="6r6omRld9An" resolve="atom" />
+                                <ref role="3cqZAo" node="6r6omRld9An" resolve="tf" />
                               </node>
                             </node>
                           </node>
@@ -957,13 +957,13 @@
                         <ref role="37wK5l" to="poio:4peSo3D04j7" resolve="print" />
                         <node concept="2YIFZM" id="1jo82tq2Chm" role="37wK5m">
                           <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                          <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                          <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                           <node concept="10QFUN" id="1jo82tq2Chn" role="37wK5m">
                             <node concept="37vLTw" id="1jo82tq2Cho" role="10QFUP">
                               <ref role="3cqZAo" node="4ef1vBgB8od" resolve="value" />
                             </node>
                             <node concept="3uibUv" id="1jo82tq2Chp" role="10QFUM">
-                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                           </node>
                         </node>
@@ -1010,7 +1010,7 @@
               <node concept="22lmx$" id="4ef1vBgB9ih" role="3clFbw">
                 <node concept="2ZW3vV" id="4ef1vBgB9oR" role="3uHU7w">
                   <node concept="3uibUv" id="6yEjedmh7Et" role="2ZW6by">
-                    <ref role="3uigEE" to="95zw:4U_yxogAknZ" resolve="AtomLogical" />
+                    <ref role="3uigEE" to="95zw:4U_yxogAknZ" resolve="TreeFormLogical" />
                   </node>
                   <node concept="37vLTw" id="4ef1vBgB9nh" role="2ZW6bz">
                     <ref role="3cqZAo" node="4ef1vBgAG$q" resolve="arg" />
@@ -1018,7 +1018,7 @@
                 </node>
                 <node concept="2ZW3vV" id="4ef1vBgB2pz" role="3uHU7B">
                   <node concept="3uibUv" id="4ef1vBgB2qV" role="2ZW6by">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                   <node concept="37vLTw" id="4ef1vBgB8VE" role="2ZW6bz">
                     <ref role="3cqZAo" node="4ef1vBgB8od" resolve="value" />
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
index e24330fd..a7ed3631 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
@@ -320,9 +320,9 @@
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="print" />
       <node concept="37vLTG" id="4peSo3CHB$z" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CHBGl" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHB5z" role="3clF47">
@@ -343,7 +343,7 @@
           <node concept="1rXfSq" id="4peSo3CILpz" role="3clFbG">
             <ref role="37wK5l" node="4peSo3CIJRO" resolve="doPrint" />
             <node concept="37vLTw" id="6HT7BWBRhCT" role="37wK5m">
-              <ref role="3cqZAo" node="4peSo3CHB$z" resolve="atom" />
+              <ref role="3cqZAo" node="4peSo3CHB$z" resolve="tf" />
             </node>
             <node concept="2ShNRf" id="4peSo3D1xgT" role="37wK5m">
               <node concept="HV5vD" id="4peSo3D1x$v" role="2ShVmc">
@@ -376,9 +376,9 @@
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="print" />
       <node concept="37vLTG" id="4peSo3D04j8" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3D04j9" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D075N" role="3clF46">
@@ -405,7 +405,7 @@
           <node concept="1rXfSq" id="4peSo3D1wNo" role="3clFbG">
             <ref role="37wK5l" node="4peSo3CIJRO" resolve="doPrint" />
             <node concept="37vLTw" id="6HT7BWBRh_w" role="37wK5m">
-              <ref role="3cqZAo" node="4peSo3D04j8" resolve="atom" />
+              <ref role="3cqZAo" node="4peSo3D04j8" resolve="tf" />
             </node>
             <node concept="37vLTw" id="4peSo3D1xXE" role="37wK5m">
               <ref role="3cqZAo" node="4peSo3D075N" resolve="variableSymbol" />
@@ -436,9 +436,9 @@
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="doPrint" />
       <node concept="37vLTG" id="4peSo3CIJRP" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CIJRQ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D1wUl" role="3clF46">
@@ -467,7 +467,7 @@
                     <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="4peSo3CIJS2" role="37wK5m">
-                      <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+                      <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
                     </node>
                   </node>
                 </node>
@@ -484,7 +484,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="4peSo3CIJS7" role="2Oq$k0">
-              <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+              <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
             </node>
           </node>
           <node concept="9aQIb" id="4peSo3CIJS8" role="9aQIa">
@@ -493,7 +493,7 @@
                 <node concept="2OqwBi" id="4peSo3CIJSb" role="3clFbG">
                   <node concept="2ShNRf" id="4peSo3CIJSc" role="2Oq$k0">
                     <node concept="1pGfFk" id="4peSo3CIJSd" role="2ShVmc">
-                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                       <node concept="2ShNRf" id="4peSo3CINyv" role="37wK5m">
                         <node concept="1pGfFk" id="4peSo3CINPP" role="2ShVmc">
                           <ref role="37wK5l" node="4peSo3CIw3p" resolve="NodePrinter" />
@@ -511,9 +511,9 @@
                     <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
                     <node concept="2YIFZM" id="6HT7BWBRh6I" role="37wK5m">
                       <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <node concept="37vLTw" id="6HT7BWBRhg3" role="37wK5m">
-                        <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+                        <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
                       </node>
                     </node>
                   </node>
@@ -592,7 +592,7 @@
     <node concept="2tJIrI" id="4peSo3CIBGi" role="jymVt" />
     <node concept="3Tm1VV" id="4peSo3CHy8E" role="1B3o_S" />
     <node concept="3uibUv" id="4peSo3CHzrM" role="EKbjA">
-      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
     </node>
     <node concept="3clFb_" id="4peSo3CHzzR" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -604,7 +604,7 @@
       <node concept="37vLTG" id="4peSo3CHzzV" role="3clF46">
         <property role="TrG5h" value="cb" />
         <node concept="3uibUv" id="4peSo3CHzzW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHz$5" role="3clF47">
@@ -889,7 +889,7 @@
       <node concept="37vLTG" id="4peSo3CHz$A" role="3clF46">
         <property role="TrG5h" value="listb" />
         <node concept="3uibUv" id="5YIOneOU7$j" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
     </node>
@@ -983,7 +983,7 @@
       <node concept="37vLTG" id="4peSo3CHz$c" role="3clF46">
         <property role="TrG5h" value="valb" />
         <node concept="3uibUv" id="5YIOneONkSZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
           <node concept="16syzq" id="5YIOneONkT0" role="11_B2D">
             <ref role="16sUi3" node="4peSo3CHz$i" resolve="V" />
           </node>
@@ -1066,7 +1066,7 @@
       <node concept="37vLTG" id="4peSo3CHz$q" role="3clF46">
         <property role="TrG5h" value="varb" />
         <node concept="3uibUv" id="5YIOneOSlWm" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableFunc" />
+          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableNode" />
         </node>
       </node>
     </node>
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
index d1769420..0eac170f 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
@@ -527,11 +527,11 @@
     </language>
   </registry>
   <node concept="312cEu" id="4sVJFklM5v4">
-    <property role="TrG5h" value="AtomProducer" />
+    <property role="TrG5h" value="TreeFormProducer" />
     <node concept="2tJIrI" id="4sVJFklM5wv" role="jymVt" />
     <node concept="2tJIrI" id="4sVJFklM9Jn" role="jymVt" />
     <node concept="2YIFZL" id="4sVJFklTh$z" role="jymVt">
-      <property role="TrG5h" value="produceAtom" />
+      <property role="TrG5h" value="produceTreeForm" />
       <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
@@ -541,12 +541,12 @@
           <node concept="2OqwBi" id="4sVJFklSnn$" role="3clFbG">
             <node concept="2ShNRf" id="4sVJFklMnGN" role="2Oq$k0">
               <node concept="1pGfFk" id="4sVJFklMonE" role="2ShVmc">
-                <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                 <node concept="2ShNRf" id="4sVJFklMqNI" role="37wK5m">
                   <node concept="1pGfFk" id="4sVJFklSvMk" role="2ShVmc">
-                    <ref role="37wK5l" node="4sVJFklSuPv" resolve="AtomProducer.Walker" />
+                    <ref role="37wK5l" node="4sVJFklSuPv" resolve="TreeFormProducer.Walker" />
                     <node concept="37vLTw" id="4sVJFklSR6l" role="37wK5m">
-                      <ref role="3cqZAo" node="4sVJFklMatE" resolve="atomNode" />
+                      <ref role="3cqZAo" node="4sVJFklMatE" resolve="tfNode" />
                     </node>
                     <node concept="37vLTw" id="2$F5QpuuL_k" role="37wK5m">
                       <ref role="3cqZAo" node="2$F5QputKOD" resolve="namingContext" />
@@ -558,7 +558,7 @@
             <node concept="liA8E" id="4sVJFklSs1w" role="2OqNvi">
               <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
               <node concept="37vLTw" id="4sVJFklSs3T" role="37wK5m">
-                <ref role="3cqZAo" node="5s497VqXKRl" resolve="atom" />
+                <ref role="3cqZAo" node="5s497VqXKRl" resolve="tf" />
               </node>
             </node>
           </node>
@@ -566,15 +566,15 @@
         <node concept="3clFbH" id="4sVJFklN_7g" role="3cqZAp" />
       </node>
       <node concept="37vLTG" id="4sVJFklMatE" role="3clF46">
-        <property role="TrG5h" value="atomNode" />
+        <property role="TrG5h" value="tfNode" />
         <node concept="3Tqbb2" id="4sVJFklMdJa" role="1tU5fm">
           <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
         </node>
       </node>
       <node concept="37vLTG" id="5s497VqXKRl" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="5s497VqXKRk" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="2$F5QputKOD" role="3clF46">
@@ -594,7 +594,7 @@
       <node concept="2tJIrI" id="4sVJFklMpRo" role="jymVt" />
       <node concept="3clFbW" id="4sVJFklSuPv" role="jymVt">
         <node concept="37vLTG" id="4sVJFklSvYG" role="3clF46">
-          <property role="TrG5h" value="atomNode" />
+          <property role="TrG5h" value="tfNode" />
           <node concept="3Tqbb2" id="4sVJFklSw9L" role="1tU5fm">
             <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
           </node>
@@ -615,7 +615,7 @@
               </node>
               <node concept="2ArzE6" id="4sVJFklS$L2" role="2OqNvi">
                 <node concept="37vLTw" id="4sVJFklS$VS" role="25WWJ7">
-                  <ref role="3cqZAo" node="4sVJFklSvYG" resolve="atomNode" />
+                  <ref role="3cqZAo" node="4sVJFklSvYG" resolve="tfNode" />
                 </node>
               </node>
             </node>
@@ -638,7 +638,7 @@
       <node concept="2tJIrI" id="4sVJFklStNu" role="jymVt" />
       <node concept="3Tm6S6" id="4sVJFklMoWf" role="1B3o_S" />
       <node concept="3uibUv" id="4sVJFklMp_t" role="EKbjA">
-        <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
       <node concept="3clFb_" id="4sVJFklM5Pn" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -650,7 +650,7 @@
         <node concept="37vLTG" id="4sVJFklM5Pr" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="4sVJFklM5Ps" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="4sVJFklM5P_" role="3clF47">
@@ -734,7 +734,7 @@
                   <node concept="3clFbS" id="4sVJFklSLY3" role="9aQI4">
                     <node concept="3cpWs8" id="4sVJFklSBpE" role="3cqZAp">
                       <node concept="3cpWsn" id="4sVJFklSBpF" role="3cpWs9">
-                        <property role="TrG5h" value="atom" />
+                        <property role="TrG5h" value="tfNode" />
                         <node concept="3Tqbb2" id="4sVJFklSBpC" role="1tU5fm">
                           <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
                         </node>
@@ -754,7 +754,7 @@
                         <node concept="2OqwBi" id="4sVJFklSNmp" role="37vLTx">
                           <node concept="2OqwBi" id="4sVJFklSMQq" role="2Oq$k0">
                             <node concept="37vLTw" id="4sVJFklSBpI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4sVJFklSBpF" resolve="atom" />
+                              <ref role="3cqZAo" node="4sVJFklSBpF" resolve="tfNode" />
                             </node>
                             <node concept="3TrEf2" id="4sVJFklSNaf" role="2OqNvi">
                               <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
@@ -944,7 +944,7 @@
                     <node concept="3clFbS" id="6BU$YTNEWiL" role="9aQI4">
                       <node concept="3cpWs8" id="6BU$YTNEWiM" role="3cqZAp">
                         <node concept="3cpWsn" id="6BU$YTNEWiN" role="3cpWs9">
-                          <property role="TrG5h" value="atom" />
+                          <property role="TrG5h" value="tfNode" />
                           <node concept="3Tqbb2" id="6BU$YTNEWiO" role="1tU5fm">
                             <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
                           </node>
@@ -964,7 +964,7 @@
                           <node concept="2OqwBi" id="6BU$YTNEWiU" role="37vLTx">
                             <node concept="2OqwBi" id="6BU$YTNEWiV" role="2Oq$k0">
                               <node concept="37vLTw" id="6BU$YTNEWiW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6BU$YTNEWiN" resolve="atom" />
+                                <ref role="3cqZAo" node="6BU$YTNEWiN" resolve="tfNode" />
                               </node>
                               <node concept="3TrEf2" id="6BU$YTNEWiX" role="2OqNvi">
                                 <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
@@ -1354,7 +1354,7 @@
         <node concept="37vLTG" id="4sVJFklM5Q6" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$i" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -1654,7 +1654,7 @@
                             <node concept="1eOMI4" id="7nPD14NOvtT" role="2Oq$k0">
                               <node concept="10QFUN" id="7nPD14NOvtU" role="1eOMHV">
                                 <node concept="3uibUv" id="7nPD14NOvtV" role="10QFUM">
-                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                 </node>
                                 <node concept="37vLTw" id="7nPD14NOvtW" role="10QFUP">
                                   <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
@@ -1702,7 +1702,7 @@
         <node concept="37vLTG" id="4sVJFklM5PG" role="3clF46">
           <property role="TrG5h" value="valf" />
           <node concept="3uibUv" id="5YIOneONkSX" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONkSY" role="11_B2D">
               <ref role="16sUi3" node="4sVJFklM5PM" resolve="V" />
             </node>
@@ -2085,7 +2085,7 @@
         <node concept="37vLTG" id="4sVJFklM5PU" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWl" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -2892,7 +2892,7 @@
                         </node>
                         <node concept="2oxUTD" id="ZqZbw4SOEP" role="2OqNvi">
                           <node concept="3B5_sB" id="ZqZbw4SQFi" role="2oxUTC">
-                            <ref role="3B5MYn" to="95zw:4U_yxogAknZ" resolve="AtomLogical" />
+                            <ref role="3B5MYn" to="95zw:4U_yxogAknZ" resolve="TreeFormLogical" />
                           </node>
                         </node>
                       </node>
@@ -2901,7 +2901,7 @@
                   </node>
                   <node concept="2OqwBi" id="aFQeb4cur6" role="3clFbw">
                     <node concept="3VsKOn" id="aFQeb4iXWd" role="2Oq$k0">
-                      <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="liA8E" id="aFQeb4cv04" role="2OqNvi">
                       <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
@@ -3419,7 +3419,7 @@
                 <node concept="3clFbF" id="2ev$9JFIWZ3" role="3cqZAp">
                   <node concept="37vLTI" id="2ev$9JFIWZ5" role="3clFbG">
                     <node concept="3B5_sB" id="2ev$9JFIWW$" role="37vLTx">
-                      <ref role="3B5MYn" to="95zw:4U_yxogAknZ" resolve="AtomLogical" />
+                      <ref role="3B5MYn" to="95zw:4U_yxogAknZ" resolve="TreeFormLogical" />
                     </node>
                     <node concept="37vLTw" id="2ev$9JFIWZ9" role="37vLTJ">
                       <ref role="3cqZAo" node="2ev$9JFIWWz" resolve="cls" />
@@ -3430,7 +3430,7 @@
               </node>
               <node concept="2OqwBi" id="2ev$9JFISH2" role="3clFbw">
                 <node concept="3VsKOn" id="2ev$9JFISxf" role="2Oq$k0">
-                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="liA8E" id="2ev$9JFITPN" role="2OqNvi">
                   <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
@@ -5409,7 +5409,7 @@
           <node concept="3clFbS" id="4sVJFklUwde" role="3clFbx">
             <node concept="3cpWs8" id="4sVJFklUwdf" role="3cqZAp">
               <node concept="3cpWsn" id="4sVJFklUwdg" role="3cpWs9">
-                <property role="TrG5h" value="atomNode" />
+                <property role="TrG5h" value="tfNode" />
                 <node concept="3Tqbb2" id="4sVJFklUwdh" role="1tU5fm">
                   <ref role="ehGHo" to="5j4j:6$jH9oLmUCq" resolve="AtomExpression" />
                 </node>
@@ -5436,15 +5436,15 @@
             </node>
             <node concept="3clFbF" id="4sVJFklUwdn" role="3cqZAp">
               <node concept="2YIFZM" id="4sVJFklUwdo" role="3clFbG">
-                <ref role="1Pybhc" node="4sVJFklM5v4" resolve="AtomProducer" />
-                <ref role="37wK5l" node="4sVJFklTh$z" resolve="produceAtom" />
+                <ref role="1Pybhc" node="4sVJFklM5v4" resolve="TreeFormProducer" />
+                <ref role="37wK5l" node="4sVJFklTh$z" resolve="produceTreeForm" />
                 <node concept="37vLTw" id="4sVJFklUwdp" role="37wK5m">
-                  <ref role="3cqZAo" node="4sVJFklUwdg" resolve="atomNode" />
+                  <ref role="3cqZAo" node="4sVJFklUwdg" resolve="tfNode" />
                 </node>
                 <node concept="1eOMI4" id="4sVJFklUwdr" role="37wK5m">
                   <node concept="10QFUN" id="4sVJFklUwds" role="1eOMHV">
                     <node concept="3uibUv" id="4sVJFklUwdt" role="10QFUM">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="37vLTw" id="4sVJFklUwe2" role="10QFUP">
                       <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
@@ -5460,7 +5460,7 @@
           </node>
           <node concept="2ZW3vV" id="4sVJFklUwdx" role="3clFbw">
             <node concept="3uibUv" id="4sVJFklUwdy" role="2ZW6by">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="37vLTw" id="4sVJFklUwdZ" role="2ZW6bz">
               <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
diff --git a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
index f982fc3a..4c6be324 100644
--- a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
@@ -417,13 +417,13 @@
       <node concept="37vLTG" id="4OsiK2BAm0x" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4OsiK2BAm4d" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4OsiK2BAm7X" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4OsiK2BAm87" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4OsiK2BAlI8" role="3clF45" />
@@ -447,13 +447,13 @@
       <node concept="37vLTG" id="4U_yxogCcGJ" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCcGK" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCcGL" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCd0t" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="4U_yxogCcGN" role="3clF45" />
@@ -477,13 +477,13 @@
       <node concept="37vLTG" id="4U_yxogCdjZ" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCdk0" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCdjX" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCdjY" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4U_yxogCdk1" role="3clF45" />
@@ -507,13 +507,13 @@
       <node concept="37vLTG" id="4U_yxogCe_V" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCe_W" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCe_X" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCf2Z" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="4U_yxogCe_Z" role="3clF45" />
@@ -537,13 +537,13 @@
       <node concept="37vLTG" id="4OsiK2BAohR" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4OsiK2BAohS" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4OsiK2BAohT" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4OsiK2BAohU" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCa6w" role="3clF45" />
@@ -567,13 +567,13 @@
       <node concept="37vLTG" id="4U_yxogC9UI" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogC9UJ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogC9UK" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCabD" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCc3n" role="3clF45" />
@@ -597,13 +597,13 @@
       <node concept="37vLTG" id="4U_yxogCan0" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCan1" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCamY" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCamZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCch8" role="3clF45" />
@@ -627,13 +627,13 @@
       <node concept="37vLTG" id="4U_yxogCbuE" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCbuF" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCbuG" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCbIA" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCcuX" role="3clF45" />
@@ -4459,13 +4459,13 @@
       <node concept="37vLTG" id="6MYr6JwItZL" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwItZM" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwItZN" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwItZO" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwItZP" role="3clF45" />
@@ -4504,13 +4504,13 @@
       <node concept="37vLTG" id="6MYr6JwItZX" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwItZY" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwItZZ" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwIu00" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwIu01" role="3clF45" />
@@ -4549,13 +4549,13 @@
       <node concept="37vLTG" id="6MYr6JwIu09" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwIu0a" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwIu0b" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwIu0c" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwIu0d" role="3clF45" />
@@ -4594,13 +4594,13 @@
       <node concept="37vLTG" id="6MYr6JwIu0l" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwIu0m" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwIu0n" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwIu0o" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwIu0p" role="3clF45" />
@@ -4639,13 +4639,13 @@
       <node concept="37vLTG" id="6MYr6JwUNOd" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNOe" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNOf" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNOg" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNOh" role="3clF45" />
@@ -4684,13 +4684,13 @@
       <node concept="37vLTG" id="6MYr6JwUNOC" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNOD" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNOE" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNOF" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNOG" role="3clF45" />
@@ -4729,13 +4729,13 @@
       <node concept="37vLTG" id="6MYr6JwUNP3" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNP4" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNP5" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNP6" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNP7" role="3clF45" />
@@ -4774,13 +4774,13 @@
       <node concept="37vLTG" id="6MYr6JwUNPu" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNPv" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNPw" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNPx" role="1tU5fm">
-          <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+          <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNPy" role="3clF45" />
@@ -5127,7 +5127,7 @@
                     <ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
                   </node>
                   <node concept="3uibUv" id="3FIATxbQg$J" role="10QFUM">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -5225,7 +5225,7 @@
     </node>
   </node>
   <node concept="312cEu" id="4U_yxogAknZ">
-    <property role="TrG5h" value="AtomLogical" />
+    <property role="TrG5h" value="TreeFormLogical" />
     <node concept="2tJIrI" id="4U_yxogB9ZV" role="jymVt" />
     <node concept="3clFbW" id="4U_yxogBkww" role="jymVt">
       <node concept="3cqZAl" id="4U_yxogBkwx" role="3clF45" />
@@ -5317,15 +5317,15 @@
           <ref role="37wK5l" node="3HJTsBmBVmo" resolve="JchrLogical" />
           <node concept="10Nm6u" id="3HJTsBmCNtN" role="37wK5m" />
           <node concept="37vLTw" id="6SkxsM$302O" role="37wK5m">
-            <ref role="3cqZAo" node="6SkxsM$2XXX" resolve="atom" />
+            <ref role="3cqZAo" node="6SkxsM$2XXX" resolve="tf" />
           </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="6SkxsM$bMBA" role="1B3o_S" />
       <node concept="37vLTG" id="6SkxsM$2XXX" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="6SkxsM$2XXW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -5342,7 +5342,7 @@
             <ref role="3cqZAo" node="1GDBwhEEM36" resolve="name" />
           </node>
           <node concept="37vLTw" id="1GDBwhEEL86" role="37wK5m">
-            <ref role="3cqZAo" node="1GDBwhEEL88" resolve="atom" />
+            <ref role="3cqZAo" node="1GDBwhEEL88" resolve="tf" />
           </node>
         </node>
       </node>
@@ -5352,9 +5352,9 @@
         <node concept="17QB3L" id="1GDBwhEEM3$" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="1GDBwhEEL88" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="1GDBwhEEL89" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -5391,7 +5391,7 @@
       </node>
       <node concept="3Tm1VV" id="3mz2_dYqDhF" role="1B3o_S" />
       <node concept="3uibUv" id="3mz2_dYqNyR" role="3clF45">
-        <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+        <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
       </node>
     </node>
     <node concept="2tJIrI" id="4U_yxogCsEV" role="jymVt" />
@@ -5399,14 +5399,14 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="findRoot" />
       <node concept="3uibUv" id="3HJTsBn63I2" role="3clF45">
-        <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+        <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
       </node>
       <node concept="3Tm1VV" id="dfChU1gct0" role="1B3o_S" />
       <node concept="3clFbS" id="dfChU1gct6" role="3clF47">
         <node concept="3clFbF" id="dfChU1ggsh" role="3cqZAp">
           <node concept="10QFUN" id="3HJTsBmKpNm" role="3clFbG">
             <node concept="3uibUv" id="3HJTsBn64qV" role="10QFUM">
-              <ref role="3uigEE" node="4U_yxogAknZ" resolve="AtomLogical" />
+              <ref role="3uigEE" node="4U_yxogAknZ" resolve="TreeFormLogical" />
             </node>
             <node concept="1rXfSq" id="dfChU1ggsg" role="10QFUP">
               <ref role="37wK5l" to="eifs:~Logical.find():runtime.Logical" resolve="find" />
@@ -5427,7 +5427,7 @@
       <node concept="3uibUv" id="6yEjedmaeEx" role="3clF45">
         <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
         <node concept="3uibUv" id="20WMLipvJgu" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="6yEjedmaeEy" role="3clF47">
@@ -5473,7 +5473,7 @@
             <node concept="3uibUv" id="7HUwyZazx80" role="1tU5fm">
               <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
               <node concept="3uibUv" id="7HUwyZazx81" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="1rXfSq" id="5NuEpF1xSw$" role="33vP2m">
@@ -5485,7 +5485,7 @@
           <node concept="3cpWsn" id="3v$7B1Kczo1" role="3cpWs9">
             <property role="TrG5h" value="value" />
             <node concept="3uibUv" id="3v$7B1KcznY" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3v$7B1Kczo2" role="33vP2m">
               <node concept="37vLTw" id="3v$7B1Kczo3" role="2Oq$k0">
@@ -5572,13 +5572,13 @@
     <node concept="3uibUv" id="4U_yxogB8or" role="1zkMxy">
       <ref role="3uigEE" node="3HJTsBmBSJa" resolve="JchrLogical" />
       <node concept="3uibUv" id="4U_yxogB8yy" role="11_B2D">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
     </node>
     <node concept="3uibUv" id="7HUwyZazx8k" role="EKbjA">
       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
       <node concept="3uibUv" id="7HUwyZazx8l" role="11_B2D">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
     </node>
     <node concept="3UR2Jj" id="2ev$9JF$huc" role="lGtFl">
diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 9b5bad87..7f9e87d6 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -345,7 +345,7 @@
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
                 <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                 <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -405,7 +405,7 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
         <node concept="2YIFZM" id="29_L5zQWy8l" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
           <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
           <node concept="Xl_RD" id="29_L5zQWy8m" role="37wK5m">
             <property role="Xl_RC" value="node" />
@@ -593,7 +593,7 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
       <node concept="gft3U" id="6UqNvvALIHq" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALIHr" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
           <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
           <node concept="Xl_RD" id="6UqNvvALIHs" role="37wK5m">
             <property role="Xl_RC" value="name" />
@@ -773,7 +773,7 @@
       <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="List" />
       <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
           <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
           <node concept="10Nm6u" id="7HUwyZb7cIG" role="37wK5m">
             <node concept="2b32R4" id="7HUwyZb7cIH" role="lGtFl">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 832c5064..c4da5e23 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -168,7 +168,7 @@
         </node>
         <node concept="3cpWs8" id="7MlQDeOyTig" role="3cqZAp">
           <node concept="3cpWsn" id="7MlQDeOyTih" role="3cpWs9">
-            <property role="TrG5h" value="atom" />
+            <property role="TrG5h" value="tfNode" />
             <node concept="3Tqbb2" id="7MlQDeOyTie" role="1tU5fm">
               <ref role="ehGHo" to="5j4j:5lJXKARS0" resolve="Atom" />
             </node>
@@ -185,7 +185,7 @@
         <node concept="1_3QMa" id="6Sag3Ksyion" role="3cqZAp">
           <node concept="2OqwBi" id="3U_KxQf9l_b" role="1_3QMn">
             <node concept="37vLTw" id="3U_KxQf9l_c" role="2Oq$k0">
-              <ref role="3cqZAo" node="7MlQDeOyTih" resolve="atom" />
+              <ref role="3cqZAo" node="7MlQDeOyTih" resolve="tfNode" />
             </node>
             <node concept="2yIwOk" id="3U_KxQf9l_d" role="2OqNvi" />
           </node>
@@ -196,7 +196,7 @@
             <node concept="3clFbS" id="6Sag3KsyiIx" role="3Kbo56">
               <node concept="3cpWs6" id="6Sag3KsyiJ4" role="3cqZAp">
                 <node concept="3B5_sB" id="6Sag3Ksyj85" role="3cqZAk">
-                  <ref role="3B5MYn" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="3B5MYn" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                 </node>
               </node>
             </node>
@@ -216,7 +216,7 @@
         </node>
         <node concept="3clFbF" id="6Sag3KsyjWy" role="3cqZAp">
           <node concept="3B5_sB" id="7MlQDeOyUrC" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3B5MYn" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -264,7 +264,7 @@
       <node concept="3clFbS" id="7FFmDVAL6W0" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaOi" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaOh" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3B5MYn" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -315,7 +315,7 @@
       <node concept="3clFbS" id="7FFmDVAL75b" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaK9" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaK8" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3B5MYn" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
       </node>
@@ -339,7 +339,7 @@
       <node concept="3clFbS" id="7FFmDVAL79t" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaDE" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaDD" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3B5MYn" to="ie8e:3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index d5f3cf32..94cceead 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -188,7 +188,7 @@
         <node concept="mw_s8" id="1pt0VTMFgab" role="1ZfhKB">
           <node concept="2c44tf" id="1pt0VTMFga7" role="mwGJk">
             <node concept="3uibUv" id="6r6omRlboX3" role="2c44tc">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index 1762193c..ccf87cfc 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -241,7 +241,7 @@
     <property role="TrG5h" value="LogicalUtil" />
     <node concept="2tJIrI" id="7HUwyZb7alE" role="jymVt" />
     <node concept="2YIFZL" id="7HUwyZb7b7C" role="jymVt">
-      <property role="TrG5h" value="asAtomArray" />
+      <property role="TrG5h" value="asTreeFormArray" />
       <node concept="37vLTG" id="7HUwyZb7b7D" role="3clF46">
         <property role="TrG5h" value="multiMetaLogical" />
         <node concept="3uibUv" id="7HUwyZb7bf2" role="1tU5fm">
@@ -250,7 +250,7 @@
       </node>
       <node concept="10Q1$e" id="7HUwyZb7b7G" role="3clF45">
         <node concept="3uibUv" id="7HUwyZb7b7H" role="10Q1$1">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7HUwyZb7b7I" role="1B3o_S" />
@@ -260,7 +260,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="7HUwyZb7b7T" role="1tU5fm">
               <node concept="3uibUv" id="7HUwyZb7b7U" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="7HUwyZb7b7V" role="33vP2m">
@@ -276,7 +276,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="7HUwyZb7b81" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -295,7 +295,7 @@
                   </node>
                 </node>
                 <node concept="1rXfSq" id="7HUwyZbdRag" role="37vLTx">
-                  <ref role="37wK5l" node="7HUwyZb7chj" resolve="asAtom" />
+                  <ref role="37wK5l" node="7HUwyZb7chj" resolve="asTreeForm" />
                   <node concept="2OqwBi" id="7HUwyZbdRec" role="37wK5m">
                     <node concept="37vLTw" id="7HUwyZbdRce" role="2Oq$k0">
                       <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
@@ -346,7 +346,7 @@
     </node>
     <node concept="2tJIrI" id="7HUwyZb7clq" role="jymVt" />
     <node concept="2YIFZL" id="7HUwyZb7chj" role="jymVt">
-      <property role="TrG5h" value="asAtom" />
+      <property role="TrG5h" value="asTreeForm" />
       <node concept="16euLQ" id="4TCblo5YIpd" role="16eVyc">
         <property role="TrG5h" value="T" />
       </node>
@@ -358,14 +358,14 @@
         </node>
       </node>
       <node concept="3uibUv" id="7HUwyZb7cho" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="7HUwyZb7chp" role="1B3o_S" />
       <node concept="3clFbS" id="7HUwyZb7chq" role="3clF47">
         <node concept="3clFbF" id="7HUwyZbdQz9" role="3cqZAp">
           <node concept="2ShNRf" id="7HUwyZbdQz7" role="3clFbG">
             <node concept="1pGfFk" id="7HUwyZbdQMO" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:7HUwyZbdNAd" resolve="MetaLogicalAtom" />
+              <ref role="37wK5l" to="oy3s:7HUwyZbdNAd" resolve="MetaLogicalTreeForm" />
               <node concept="37vLTw" id="7HUwyZbdQO9" role="37wK5m">
                 <ref role="3cqZAo" node="7HUwyZb7chk" resolve="metaLogical" />
               </node>
@@ -376,7 +376,7 @@
     </node>
     <node concept="2tJIrI" id="4TCblo5YI1R" role="jymVt" />
     <node concept="2YIFZL" id="4TCblo5YI1H" role="jymVt">
-      <property role="TrG5h" value="asAtom" />
+      <property role="TrG5h" value="asTreeForm" />
       <node concept="37vLTG" id="4TCblo5YI1I" role="3clF46">
         <property role="TrG5h" value="logical" />
         <node concept="3uibUv" id="4TCblo5YI1J" role="1tU5fm">
@@ -387,14 +387,14 @@
         </node>
       </node>
       <node concept="3uibUv" id="4TCblo5YI1K" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5YI1L" role="1B3o_S" />
       <node concept="3clFbS" id="4TCblo5YI1M" role="3clF47">
         <node concept="3clFbF" id="4TCblo5YITN" role="3cqZAp">
           <node concept="2ShNRf" id="4TCblo5YITJ" role="3clFbG">
             <node concept="1pGfFk" id="4TCblo5YJa3" role="2ShVmc">
-              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalAtom" />
+              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
               <node concept="37vLTw" id="4TCblo5YJCY" role="37wK5m">
                 <ref role="3cqZAo" node="4TCblo5YI1I" resolve="logical" />
               </node>
@@ -435,16 +435,16 @@
             <node concept="liA8E" id="4TCblo5Nl7d" role="2OqNvi">
               <ref role="37wK5l" to="ie8e:3OPtF02TgQt" resolve="map" />
               <node concept="37vLTw" id="4TCblo5Nl9o" role="37wK5m">
-                <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="atom" />
+                <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="tf" />
               </node>
             </node>
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="4TCblo5NkAJ" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4TCblo5NkFx" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4TCblo5NkwR" role="3clF46">
@@ -454,7 +454,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4TCblo5Nlai" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5NkoK" role="1B3o_S" />
     </node>
@@ -499,9 +499,9 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="canMap" />
         <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
-          <property role="TrG5h" value="atom" />
+          <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
@@ -514,7 +514,7 @@
               </node>
               <node concept="2OqwBi" id="5BGv8yzxm1a" role="3uHU7B">
                 <node concept="37vLTw" id="5BGv8yzxlPP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="atom" />
+                  <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                 </node>
                 <node concept="liA8E" id="5BGv8yzxmhs" role="2OqNvi">
                   <ref role="37wK5l" to="ie8e:5BGv8yzvvIZ" resolve="variablesCount" />
@@ -529,20 +529,20 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="map" />
         <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
-          <property role="TrG5h" value="atom" />
+          <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
           <property role="TrG5h" value="fallback" />
           <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="Atom.Mapper" />
+            <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="TreeForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
         <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
           <node concept="3clFbJ" id="5BGv8yzxmXQ" role="3cqZAp">
@@ -550,7 +550,7 @@
               <node concept="3cpWs6" id="5BGv8yzxnrb" role="3cqZAp">
                 <node concept="2ShNRf" id="4TCblo5Pq8Z" role="3cqZAk">
                   <node concept="1pGfFk" id="4TCblo5PqjT" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalAtom" />
+                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
                     <node concept="2OqwBi" id="4TCblo5PabD" role="37wK5m">
                       <node concept="37vLTw" id="4TCblo5PabE" role="2Oq$k0">
                         <ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
@@ -561,10 +561,10 @@
                           <node concept="1eOMI4" id="4TCblo5PabH" role="2Oq$k0">
                             <node concept="10QFUN" id="4TCblo5PabI" role="1eOMHV">
                               <node concept="37vLTw" id="4TCblo5PabJ" role="10QFUP">
-                                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                               </node>
                               <node concept="3uibUv" id="4TCblo5PabK" role="10QFUM">
-                                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                               </node>
                             </node>
                           </node>
@@ -581,10 +581,10 @@
             </node>
             <node concept="2ZW3vV" id="4TCblo5MCk$" role="3clFbw">
               <node concept="3uibUv" id="4TCblo5MCof" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
               </node>
               <node concept="37vLTw" id="bUIfhjJCGB" role="2ZW6bz">
-                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
               </node>
             </node>
             <node concept="9aQIb" id="5BGv8yzxoqo" role="9aQIa">
@@ -592,7 +592,7 @@
                 <node concept="3cpWs6" id="5BGv8yzxpdJ" role="3cqZAp">
                   <node concept="2OqwBi" id="5BGv8yzxl7m" role="3cqZAk">
                     <node concept="37vLTw" id="5BGv8yzxkWc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                      <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                     </node>
                     <node concept="liA8E" id="5BGv8yzxlnb" role="2OqNvi">
                       <ref role="37wK5l" to="ie8e:3OPtF02Tjpr" resolve="mapRecursively" />
@@ -1000,7 +1000,7 @@
                               <node concept="3uibUv" id="4TCblo5Z8NB" role="10QFUM">
                                 <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
                                 <node concept="3uibUv" id="4TCblo5Z9P0" role="11_B2D">
-                                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                                 </node>
                               </node>
                             </node>
@@ -1025,7 +1025,7 @@
                         <ref role="1Pybhc" node="677NV565N1x" resolve="LogicalUtil" />
                         <node concept="10QFUN" id="4TCblo5Nskr" role="37wK5m">
                           <node concept="3uibUv" id="4TCblo5Nskp" role="10QFUM">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                           <node concept="37vLTw" id="4TCblo5NsuL" role="10QFUP">
                             <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
@@ -1042,7 +1042,7 @@
               </node>
               <node concept="2ZW3vV" id="4TCblo5NptX" role="3clFbw">
                 <node concept="3uibUv" id="4TCblo5NpxS" role="2ZW6by">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="4TCblo5Nppi" role="2ZW6bz">
                   <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
@@ -1320,7 +1320,7 @@
               <node concept="3eNFk2" id="4sSe4$prurd" role="3eNLev">
                 <node concept="2ZW3vV" id="4sSe4$prvtz" role="3eO9$A">
                   <node concept="3uibUv" id="4sSe4$ps1yr" role="2ZW6by">
-                    <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Func" />
+                    <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Node" />
                   </node>
                   <node concept="37vLTw" id="4sSe4$prv0k" role="2ZW6bz">
                     <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
@@ -1340,7 +1340,7 @@
                       <node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
                         <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
                         <node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
-                          <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
index 1016a2a1..2d7232a0 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
@@ -1869,7 +1869,7 @@
                       <node concept="3eNFk2" id="5rhZO$TZT6F" role="3eNLev">
                         <node concept="2ZW3vV" id="5rhZO$TZT6G" role="3eO9$A">
                           <node concept="3uibUv" id="5rhZO$TZT6H" role="2ZW6by">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                           <node concept="37vLTw" id="5rhZO$TZT6I" role="2ZW6bz">
                             <ref role="3cqZAo" node="5rhZO$TZT8h" resolve="arg" />
@@ -1885,13 +1885,13 @@
                             <node concept="2OqwBi" id="5rhZO$TZT6N" role="3clFbG">
                               <node concept="2ShNRf" id="5rhZO$TZT6O" role="2Oq$k0">
                                 <node concept="1pGfFk" id="5rhZO$TZT6P" role="2ShVmc">
-                                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                                   <node concept="2ShNRf" id="5rhZO$TZT6Q" role="37wK5m">
                                     <node concept="YeOm9" id="5rhZO$TZT6R" role="2ShVmc">
                                       <node concept="1Y3b0j" id="5rhZO$TZT6S" role="YeSDq">
                                         <property role="2bfB8j" value="true" />
                                         <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                        <ref role="1Y3XeK" to="ie8e:2ev$9JFHDMZ" resolve="AtomWalk.IdleWalker" />
+                                        <ref role="1Y3XeK" to="ie8e:2ev$9JFHDMZ" resolve="TreeFormWalk.IdleWalker" />
                                         <node concept="3Tm1VV" id="5rhZO$TZT6T" role="1B3o_S" />
                                         <node concept="3clFb_" id="5rhZO$TZT6U" role="jymVt">
                                           <property role="1EzhhJ" value="false" />
@@ -1919,7 +1919,7 @@
                                                             <node concept="1eOMI4" id="7nPD14NHhhR" role="2Oq$k0">
                                                               <node concept="10QFUN" id="7nPD14NHhhS" role="1eOMHV">
                                                                 <node concept="3uibUv" id="7nPD14NHhhT" role="10QFUM">
-                                                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                                                 </node>
                                                                 <node concept="37vLTw" id="7nPD14NHhhU" role="10QFUP">
                                                                   <ref role="3cqZAo" node="5rhZO$TZT7p" resolve="val" />
@@ -1943,7 +1943,7 @@
                                                         <node concept="1eOMI4" id="5rhZO$TZT7h" role="2Oq$k0">
                                                           <node concept="10QFUN" id="5rhZO$TZT7i" role="1eOMHV">
                                                             <node concept="3uibUv" id="5rhZO$TZT7j" role="10QFUM">
-                                                              <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                                              <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                                             </node>
                                                             <node concept="37vLTw" id="5rhZO$TZT7k" role="10QFUP">
                                                               <ref role="3cqZAo" node="5rhZO$TZT7p" resolve="val" />
@@ -1957,7 +1957,7 @@
                                                     </node>
                                                     <node concept="2ZW3vV" id="5rhZO$TZT7m" role="3uHU7B">
                                                       <node concept="3uibUv" id="5rhZO$TZT7n" role="2ZW6by">
-                                                        <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                                        <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                                       </node>
                                                       <node concept="37vLTw" id="5rhZO$TZT7o" role="2ZW6bz">
                                                         <ref role="3cqZAo" node="5rhZO$TZT7p" resolve="val" />
@@ -1994,7 +1994,7 @@
                                           <node concept="37vLTG" id="5rhZO$TZT7x" role="3clF46">
                                             <property role="TrG5h" value="valb" />
                                             <node concept="3uibUv" id="5rhZO$TZT7y" role="1tU5fm">
-                                              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+                                              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
                                               <node concept="16syzq" id="5rhZO$TZT7z" role="11_B2D">
                                                 <ref role="16sUi3" node="5rhZO$TZT6X" resolve="V" />
                                               </node>
@@ -2024,7 +2024,7 @@
                                                             <node concept="1eOMI4" id="7nPD14NHhsp" role="2Oq$k0">
                                                               <node concept="10QFUN" id="7nPD14NHhsq" role="1eOMHV">
                                                                 <node concept="3uibUv" id="7nPD14NHhsr" role="10QFUM">
-                                                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                                                  <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                                                 </node>
                                                                 <node concept="37vLTw" id="7nPD14NHhss" role="10QFUP">
                                                                   <ref role="3cqZAo" node="5rhZO$TZT82" resolve="a" />
@@ -2045,7 +2045,7 @@
                                                   <node concept="1Wc70l" id="5rhZO$TZT7R" role="3clFbw">
                                                     <node concept="2ZW3vV" id="5rhZO$TZT7S" role="3uHU7B">
                                                       <node concept="3uibUv" id="5rhZO$TZT7T" role="2ZW6by">
-                                                        <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                                        <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                                       </node>
                                                       <node concept="37vLTw" id="5rhZO$TZT7U" role="2ZW6bz">
                                                         <ref role="3cqZAo" node="5rhZO$TZT82" resolve="a" />
@@ -2056,7 +2056,7 @@
                                                         <node concept="1eOMI4" id="5rhZO$TZT7X" role="2Oq$k0">
                                                           <node concept="10QFUN" id="5rhZO$TZT7Y" role="1eOMHV">
                                                             <node concept="3uibUv" id="5rhZO$TZT7Z" role="10QFUM">
-                                                              <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalAtom" />
+                                                              <ref role="3uigEE" to="oy3s:7HUwyZbdMWH" resolve="MetaLogicalTreeForm" />
                                                             </node>
                                                             <node concept="37vLTw" id="5rhZO$TZT80" role="10QFUP">
                                                               <ref role="3cqZAo" node="5rhZO$TZT82" resolve="a" />
@@ -2074,7 +2074,7 @@
                                               <node concept="3cpWsn" id="5rhZO$TZT82" role="1Duv9x">
                                                 <property role="TrG5h" value="a" />
                                                 <node concept="3uibUv" id="5rhZO$TZT83" role="1tU5fm">
-                                                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                                                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                                                 </node>
                                               </node>
                                               <node concept="2OqwBi" id="5rhZO$TZT84" role="1DdaDG">
@@ -2099,7 +2099,7 @@
                                           <node concept="37vLTG" id="5rhZO$TZT8a" role="3clF46">
                                             <property role="TrG5h" value="listb" />
                                             <node concept="3uibUv" id="5rhZO$TZT8b" role="1tU5fm">
-                                              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                                              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                                             </node>
                                           </node>
                                         </node>
@@ -2116,7 +2116,7 @@
                                       <ref role="3cqZAo" node="5rhZO$TZT8h" resolve="arg" />
                                     </node>
                                     <node concept="3uibUv" id="5rhZO$TZT8g" role="10QFUM">
-                                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index c266169d..bdf38860 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -166,7 +166,7 @@
     </language>
   </registry>
   <node concept="312cEu" id="7HUwyZbdMWH">
-    <property role="TrG5h" value="MetaLogicalAtom" />
+    <property role="TrG5h" value="MetaLogicalTreeForm" />
     <node concept="2tJIrI" id="7HUwyZbdN_B" role="jymVt" />
     <node concept="3clFbW" id="7HUwyZbdNAd" role="jymVt">
       <node concept="3cqZAl" id="7HUwyZbdNAf" role="3clF45" />
@@ -256,7 +256,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="7HUwyZbdPnr" role="11_B2D">
             <node concept="3uibUv" id="7HUwyZbdPns" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -325,7 +325,7 @@
     </node>
   </node>
   <node concept="312cEu" id="4TCblo5MJ1m">
-    <property role="TrG5h" value="LogicalAtom" />
+    <property role="TrG5h" value="LogicalTreeForm" />
     <node concept="2tJIrI" id="4TCblo5MOJG" role="jymVt" />
     <node concept="312cEg" id="4TCblo5MOOn" role="jymVt">
       <property role="TrG5h" value="logical" />
@@ -538,7 +538,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="4TCblo5MWaF" role="11_B2D">
             <node concept="3uibUv" id="4TCblo5MWaG" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -682,7 +682,7 @@
           <node concept="3fqX7Q" id="4TCblo5N6Ds" role="3clFbw">
             <node concept="2ZW3vV" id="4TCblo5N6QY" role="3fr31v">
               <node concept="3uibUv" id="4TCblo5N6YK" role="2ZW6by">
-                <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalAtom" />
+                <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalTreeForm" />
               </node>
               <node concept="37vLTw" id="4TCblo5N6Ff" role="2ZW6bz">
                 <ref role="3cqZAo" node="4TCblo5N1M1" resolve="that" />
@@ -707,7 +707,7 @@
                       <ref role="3cqZAo" node="4TCblo5N1M1" resolve="that" />
                     </node>
                     <node concept="3uibUv" id="4TCblo5N9Mf" role="10QFUM">
-                      <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalAtom" />
+                      <ref role="3uigEE" node="4TCblo5MJ1m" resolve="LogicalTreeForm" />
                     </node>
                   </node>
                 </node>
@@ -766,7 +766,7 @@
                     <ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
                   </node>
                   <node concept="3uibUv" id="3FIATxbQg$J" role="10QFUM">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
diff --git a/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps b/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
index ca421d3c..56ad0b5c 100644
--- a/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
+++ b/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
@@ -559,11 +559,11 @@
       <node concept="37vLTG" id="3OPtF02UImY" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02UImZ" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02UIn0" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="3OPtF02UIn2" role="1B3o_S" />
       <node concept="3clFbS" id="3OPtF02UIn9" role="3clF47">
@@ -603,7 +603,7 @@
       <node concept="37vLTG" id="dfChU1lVFJ" role="3clF46">
         <property role="TrG5h" value="parent" />
         <node concept="3uibUv" id="dfChU1lVFK" role="1tU5fm">
-          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
         </node>
       </node>
       <node concept="3cqZAl" id="dfChU1lVFM" role="3clF45" />
@@ -626,7 +626,7 @@
       <node concept="37vLTG" id="104EUzFOQG9" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="104EUzFOQGa" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="104EUzFOQGb" role="3clF45">
@@ -693,7 +693,7 @@
       <property role="TrG5h" value="V" />
     </node>
     <node concept="3uibUv" id="104EUzFNZ6w" role="EKbjA">
-      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
     </node>
     <node concept="3clFb_" id="1mP5b6jQ__L" role="jymVt">
       <property role="TrG5h" value="equals" />
@@ -901,7 +901,7 @@
     </node>
   </node>
   <node concept="312cEu" id="1msb0mq99GH">
-    <property role="TrG5h" value="ValueFunc" />
+    <property role="TrG5h" value="ValueNode" />
     <node concept="3Tm1VV" id="1msb0mq99GI" role="1B3o_S" />
     <node concept="2tJIrI" id="5JQSuNsx59n" role="jymVt" />
     <node concept="2YIFZL" id="6cHSm2DiUE1" role="jymVt">
@@ -921,7 +921,7 @@
         <property role="TrG5h" value="terms" />
         <node concept="8X2XB" id="6cHSm2Dj6fi" role="1tU5fm">
           <node concept="3uibUv" id="6cHSm2DiZDH" role="8Xvag">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -990,7 +990,7 @@
         <node concept="3clFbF" id="6cHSm2DiUEa" role="3cqZAp">
           <node concept="2ShNRf" id="6cHSm2DiUEb" role="3clFbG">
             <node concept="1pGfFk" id="6cHSm2DiUEc" role="2ShVmc">
-              <ref role="37wK5l" node="1msb0mq99PP" resolve="ValueFunc" />
+              <ref role="37wK5l" node="1msb0mq99PP" resolve="ValueNode" />
               <node concept="16syzq" id="6cHSm2DiUEd" role="1pMfVU">
                 <ref role="16sUi3" node="6cHSm2DiUE2" resolve="V" />
               </node>
@@ -1013,7 +1013,7 @@
       </node>
       <node concept="3Tm1VV" id="6cHSm2DiUEh" role="1B3o_S" />
       <node concept="3uibUv" id="6cHSm2DiUEi" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="6cHSm2DiUEj" role="11_B2D">
           <ref role="16sUi3" node="6cHSm2DiUE2" resolve="V" />
         </node>
@@ -1024,7 +1024,7 @@
       <node concept="3cqZAl" id="1msb0mq99PQ" role="3clF45" />
       <node concept="3clFbS" id="1msb0mq99PS" role="3clF47">
         <node concept="XkiVB" id="1msb0mq9YEk" role="3cqZAp">
-          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Func" />
+          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Node" />
           <node concept="37vLTw" id="1R$Cm9qHaIM" role="37wK5m">
             <ref role="3cqZAo" node="1msb0mq99VR" resolve="symbolPath" />
           </node>
@@ -1047,7 +1047,7 @@
         <property role="TrG5h" value="values" />
         <node concept="10Q1$e" id="5BGv8yzwnHg" role="1tU5fm">
           <node concept="3uibUv" id="6cHSm2DiTyM" role="10Q1$1">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1102,7 +1102,7 @@
               <node concept="3cpWsn" id="5YIOneOMGa4" role="3cpWs9">
                 <property role="TrG5h" value="ch" />
                 <node concept="3uibUv" id="5YIOneOMGa5" role="1tU5fm">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="AH0OO" id="5YIOneOMGa6" role="33vP2m">
                   <node concept="37vLTw" id="5YIOneOMGa7" role="AHEQo">
@@ -1223,7 +1223,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="1bm7a6EZOQ6" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="1bm7a6EZRhu" role="11_B2D">
           <ref role="16sUi3" node="1msb0mq99K4" resolve="V" />
         </node>
@@ -1232,7 +1232,7 @@
       <node concept="3clFbS" id="1bm7a6EXT8i" role="3clF47">
         <node concept="3clFbF" id="1bm7a6EXU3e" role="3cqZAp">
           <node concept="2YIFZM" id="1bm7a6EXU99" role="3clFbG">
-            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueNode" />
             <ref role="37wK5l" node="6cHSm2DiUE1" resolve="create" />
             <node concept="1rXfSq" id="1OShD0HF7nU" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
@@ -1254,7 +1254,7 @@
       <node concept="37vLTG" id="3OPtF02TY7L" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02TY7M" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3OPtF02TY7P" role="1B3o_S" />
@@ -1275,7 +1275,7 @@
           <node concept="3cpWsn" id="4sgxfjnBLNe" role="3cpWs9">
             <property role="TrG5h" value="lastArg" />
             <node concept="3uibUv" id="4sgxfjnBLNf" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="10Nm6u" id="4sgxfjnBLNg" role="33vP2m" />
           </node>
@@ -1287,7 +1287,7 @@
               <node concept="3cpWsn" id="4sgxfjnBLNl" role="3cpWs9">
                 <property role="TrG5h" value="arg" />
                 <node concept="3uibUv" id="4sgxfjnBLNm" role="1tU5fm">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="AH0OO" id="bUIfhjJNrA" role="33vP2m">
                   <node concept="37vLTw" id="bUIfhjJNZm" role="AHEQo">
@@ -1380,7 +1380,7 @@
             <property role="TrG5h" value="values" />
             <node concept="10Q1$e" id="4sgxfjnBLNT" role="1tU5fm">
               <node concept="3uibUv" id="4sgxfjnBLNU" role="10Q1$1">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="4sgxfjnBLNV" role="33vP2m">
@@ -1394,7 +1394,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="4sgxfjnBLNZ" role="3$_nBY">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -1529,7 +1529,7 @@
         </node>
         <node concept="3clFbF" id="3OPtF02Uiiw" role="3cqZAp">
           <node concept="2YIFZM" id="3OPtF02UiXe" role="3clFbG">
-            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueNode" />
             <ref role="37wK5l" node="6cHSm2DiUE1" resolve="create" />
             <node concept="1rXfSq" id="1OShD0HF70Q" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
@@ -1541,7 +1541,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02V_L3" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="3OPtF02V_L4" role="11_B2D">
           <ref role="16sUi3" node="1msb0mq99K4" resolve="V" />
         </node>
@@ -1554,7 +1554,7 @@
       <node concept="37vLTG" id="47nvOnTS3tv" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="3JgCwkqhJK9" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02YXD2" role="3clF45">
@@ -1674,7 +1674,7 @@
           <node concept="3cpWsn" id="2q_78a93qsC" role="1Duv9x">
             <property role="TrG5h" value="val" />
             <node concept="3uibUv" id="6cHSm2DjgfN" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="1rXfSq" id="2q_78a93qsE" role="1DdaDG">
@@ -1709,15 +1709,15 @@
       <property role="TrG5h" value="V" />
     </node>
     <node concept="3uibUv" id="1msb0mq9VxT" role="1zkMxy">
-      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
     </node>
   </node>
   <node concept="312cEu" id="1msb0mq9ID4">
-    <property role="TrG5h" value="Func" />
+    <property role="TrG5h" value="Node" />
     <property role="1sVAO0" value="true" />
     <node concept="3Tm1VV" id="1msb0mq9ID5" role="1B3o_S" />
     <node concept="3uibUv" id="104EUzGgROM" role="EKbjA">
-      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
     </node>
     <node concept="2tJIrI" id="6$jH9oLc2sE" role="jymVt" />
     <node concept="3clFbW" id="1msb0mq9JZ8" role="jymVt">
@@ -1774,7 +1774,7 @@
         <property role="TrG5h" value="arguments" />
         <node concept="10Q1$e" id="1msb0mq9K4Q" role="1tU5fm">
           <node concept="3uibUv" id="3H0z$hTtmtl" role="10Q1$1">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1794,7 +1794,7 @@
         <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
         <node concept="3qUE_q" id="3H0z$hTtspr" role="11_B2D">
           <node concept="3uibUv" id="3H0z$hTtswN" role="3qUE_r">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1945,7 +1945,7 @@
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="1bm7a6EZcE2" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+        <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
       </node>
       <node concept="3Tm1VV" id="1bm7a6EYD0z" role="1B3o_S" />
       <node concept="3clFbS" id="1bm7a6EYD0A" role="3clF47" />
@@ -1960,11 +1960,11 @@
       <node concept="37vLTG" id="3OPtF02TqPC" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02TqPD" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02Tu6P" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+        <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
       </node>
       <node concept="3Tm1VV" id="3OPtF02TqPG" role="1B3o_S" />
       <node concept="3clFbS" id="3OPtF02TqPP" role="3clF47" />
@@ -2001,7 +2001,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="2QE4RCGnD6S" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+        <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
       </node>
       <node concept="2AHcQZ" id="2QE4RCGnDKs" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -2014,7 +2014,7 @@
       <node concept="37vLTG" id="dfChU1lNtY" role="3clF46">
         <property role="TrG5h" value="parent" />
         <node concept="3uibUv" id="dfChU1lNtZ" role="1tU5fm">
-          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
         </node>
       </node>
       <node concept="3cqZAl" id="dfChU1lNu1" role="3clF45" />
@@ -2147,11 +2147,11 @@
           <node concept="3cpWsn" id="1mP5b6jP_If" role="3cpWs9">
             <property role="TrG5h" value="that" />
             <node concept="3uibUv" id="1mP5b6jP_Ig" role="1tU5fm">
-              <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+              <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
             </node>
             <node concept="10QFUN" id="1mP5b6jP_Ih" role="33vP2m">
               <node concept="3uibUv" id="1mP5b6jP_Ii" role="10QFUM">
-                <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+                <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
               </node>
               <node concept="37vLTw" id="1mP5b6jP_Ij" role="10QFUP">
                 <ref role="3cqZAo" node="1mP5b6jP_Ik" resolve="o" />
@@ -2402,7 +2402,7 @@
       <node concept="3Tmbuc" id="1bm7a6EXJmm" role="1B3o_S" />
       <node concept="10Q1$e" id="1bm7a6EXKLY" role="3clF45">
         <node concept="3uibUv" id="3H0z$hTtvcM" role="10Q1$1">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -2433,7 +2433,7 @@
         <node concept="10Oyi0" id="6$jH9oLbMMK" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="3H0z$hTtvlF" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tmbuc" id="6$jH9oLbKCq" role="1B3o_S" />
       <node concept="3clFbS" id="6$jH9oLbK0r" role="3clF47">
@@ -2455,7 +2455,7 @@
       <node concept="3Tmbuc" id="bUIfhjJIVQ" role="1B3o_S" />
       <node concept="10Q1$e" id="5JQSuNswjSV" role="1tU5fm">
         <node concept="3uibUv" id="3H0z$hTttJ3" role="10Q1$1">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -2478,10 +2478,10 @@
     </node>
   </node>
   <node concept="312cEu" id="5JQSuNswOXL">
-    <property role="TrG5h" value="StemFunc" />
+    <property role="TrG5h" value="CompositeNode" />
     <node concept="3Tm1VV" id="5JQSuNswOXM" role="1B3o_S" />
     <node concept="3uibUv" id="5JQSuNswOY9" role="1zkMxy">
-      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
     </node>
     <node concept="2tJIrI" id="5JQSuNsxgT7" role="jymVt" />
     <node concept="2YIFZL" id="5JQSuNsxhfn" role="jymVt">
@@ -2498,7 +2498,7 @@
         <property role="TrG5h" value="terms" />
         <node concept="8X2XB" id="5JQSuNsxh_S" role="1tU5fm">
           <node concept="3uibUv" id="5JQSuNsxhtQ" role="8Xvag">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -2583,11 +2583,11 @@
           <node concept="3cpWsn" id="1R$Cm9qGVi$" role="3cpWs9">
             <property role="TrG5h" value="br" />
             <node concept="3uibUv" id="1R$Cm9qGVio" role="1tU5fm">
-              <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+              <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
             </node>
             <node concept="2ShNRf" id="1R$Cm9qGVi_" role="33vP2m">
               <node concept="1pGfFk" id="1R$Cm9qGViA" role="2ShVmc">
-                <ref role="37wK5l" node="5JQSuNswP2z" resolve="StemFunc" />
+                <ref role="37wK5l" node="5JQSuNswP2z" resolve="CompositeNode" />
                 <node concept="37vLTw" id="6$jH9oLdIkd" role="37wK5m">
                   <ref role="3cqZAo" node="6$jH9oLdIka" resolve="path" />
                 </node>
@@ -2620,7 +2620,7 @@
           <node concept="3cpWsn" id="1R$Cm9qGVt9" role="1Duv9x">
             <property role="TrG5h" value="ch" />
             <node concept="3uibUv" id="1R$Cm9qGVEy" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="1R$Cm9qGWcp" role="1DdaDG">
@@ -2635,7 +2635,7 @@
       </node>
       <node concept="3Tm1VV" id="5JQSuNsxh5a" role="1B3o_S" />
       <node concept="3uibUv" id="5JQSuNsxhdt" role="3clF45">
-        <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+        <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="5JQSuNsxgYt" role="jymVt" />
@@ -2643,7 +2643,7 @@
       <node concept="3cqZAl" id="5JQSuNswP2$" role="3clF45" />
       <node concept="3clFbS" id="5JQSuNswP2A" role="3clF47">
         <node concept="XkiVB" id="5JQSuNswQer" role="3cqZAp">
-          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Func" />
+          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Node" />
           <node concept="37vLTw" id="1R$Cm9qH7KO" role="37wK5m">
             <ref role="3cqZAo" node="5JQSuNswP3S" resolve="symbolPath" />
           </node>
@@ -2666,7 +2666,7 @@
         <property role="TrG5h" value="terms" />
         <node concept="10Q1$e" id="5JQSuNswQ9p" role="1tU5fm">
           <node concept="3uibUv" id="dfChU1lAUt" role="10Q1$1">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -2680,7 +2680,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="1bm7a6EZ0kf" role="3clF45">
-        <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+        <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
       </node>
       <node concept="3Tm1VV" id="1bm7a6EY4Ic" role="1B3o_S" />
       <node concept="3clFbS" id="1bm7a6EY4Ih" role="3clF47">
@@ -2689,7 +2689,7 @@
             <property role="TrG5h" value="copy" />
             <node concept="10Q1$e" id="1bm7a6F2ReC" role="1tU5fm">
               <node concept="3uibUv" id="dfChU1mp8C" role="10Q1$1">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1bm7a6F2ReN" role="33vP2m">
@@ -2703,7 +2703,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="dfChU1moFh" role="3$_nBY">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2764,7 +2764,7 @@
         <node concept="3clFbF" id="1bm7a6EY9N8" role="3cqZAp">
           <node concept="2YIFZM" id="1bm7a6EYa5i" role="3clFbG">
             <ref role="37wK5l" node="5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="1rXfSq" id="1OShD0HEWkI" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
             </node>
@@ -2785,7 +2785,7 @@
       <node concept="37vLTG" id="3OPtF02T_i4" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02T_i5" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3OPtF02T_i8" role="1B3o_S" />
@@ -2806,7 +2806,7 @@
           <node concept="3cpWsn" id="4sgxfjnB7NY" role="3cpWs9">
             <property role="TrG5h" value="lastArg" />
             <node concept="3uibUv" id="4sgxfjnB7NZ" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="10Nm6u" id="4sgxfjnB9tj" role="33vP2m" />
           </node>
@@ -2818,7 +2818,7 @@
               <node concept="3cpWsn" id="4sgxfjnBevF" role="3cpWs9">
                 <property role="TrG5h" value="arg" />
                 <node concept="3uibUv" id="4sgxfjnBevB" role="1tU5fm">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="AH0OO" id="bUIfhjJZSW" role="33vP2m">
                   <node concept="37vLTw" id="bUIfhjJZB7" role="AHHXb">
@@ -2911,7 +2911,7 @@
             <property role="TrG5h" value="copy" />
             <node concept="10Q1$e" id="3OPtF02TEoJ" role="1tU5fm">
               <node concept="3uibUv" id="1OShD0HXz2S" role="10Q1$1">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="3OPtF02TEoL" role="33vP2m">
@@ -2925,7 +2925,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="1OShD0HY4e9" role="3$_nBY">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -3060,7 +3060,7 @@
         </node>
         <node concept="3clFbF" id="3OPtF02TEp9" role="3cqZAp">
           <node concept="2YIFZM" id="1OShD0HXM0v" role="3clFbG">
-            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="1Pybhc" node="5JQSuNswOXL" resolve="CompositeNode" />
             <ref role="37wK5l" node="5JQSuNsxhfn" resolve="create" />
             <node concept="1rXfSq" id="1OShD0HXM0w" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
@@ -3072,7 +3072,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1OShD0HXE6k" role="3clF45">
-        <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+        <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="47nvOnTRJ2E" role="jymVt" />
@@ -3082,7 +3082,7 @@
       <node concept="37vLTG" id="47nvOnTRK6r" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="3JgCwkqhww$" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02YOLj" role="3clF45">
@@ -3136,7 +3136,7 @@
     <node concept="3UR2Jj" id="5lJXKwWWB" role="lGtFl">
       <node concept="TZ5HA" id="5lJXKwWWC" role="TZ5H$">
         <node concept="1dT_AC" id="5lJXKwWWD" role="1dT_Ay">
-          <property role="1dT_AB" value="The &quot;framework&quot; branch, that is a branch that allows only other branches as its children. An example " />
+          <property role="1dT_AB" value="The &quot;framework&quot; node, that is a node that allows only other nodes as its children. An example " />
         </node>
       </node>
       <node concept="TZ5HA" id="5lJXKwXZy" role="TZ5H$">
@@ -3146,7 +3146,7 @@
       </node>
       <node concept="TZ5HA" id="5lJXKwZsB" role="TZ5H$">
         <node concept="1dT_AC" id="5lJXKwZsC" role="1dT_Ay">
-          <property role="1dT_AB" value="here are branches too." />
+          <property role="1dT_AB" value="here are nodes too." />
         </node>
       </node>
     </node>
@@ -3265,7 +3265,7 @@
         </node>
         <node concept="3clFbF" id="5JQSuNsxbY4" role="3cqZAp">
           <node concept="2YIFZM" id="5JQSuNsxbYI" role="3clFbG">
-            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueNode" />
             <ref role="37wK5l" node="6cHSm2DiUE1" resolve="create" />
             <node concept="16syzq" id="uNmovXiRyh" role="3PaCim">
               <ref role="16sUi3" node="53iOybEKVf$" resolve="V" />
@@ -3281,7 +3281,7 @@
       </node>
       <node concept="3Tm1VV" id="5JQSuNsx4HC" role="1B3o_S" />
       <node concept="3uibUv" id="5JQSuNsx4HR" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="53iOybEKVXJ" role="11_B2D">
           <ref role="16sUi3" node="53iOybEKVf$" resolve="V" />
         </node>
@@ -3310,7 +3310,7 @@
       <node concept="3clFbS" id="6cHSm2DiB$Y" role="3clF47">
         <node concept="3clFbF" id="6cHSm2DiB_w" role="3cqZAp">
           <node concept="2YIFZM" id="6cHSm2DiB_x" role="3clFbG">
-            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="1Pybhc" node="1msb0mq99GH" resolve="ValueNode" />
             <ref role="37wK5l" node="6cHSm2DiUE1" resolve="create" />
             <node concept="16syzq" id="6cHSm2DiB_y" role="3PaCim">
               <ref role="16sUi3" node="6cHSm2DiB_C" resolve="T" />
@@ -3326,7 +3326,7 @@
       </node>
       <node concept="3Tm1VV" id="6cHSm2DiB__" role="1B3o_S" />
       <node concept="3uibUv" id="6cHSm2DiB_A" role="3clF45">
-        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="6cHSm2DiB_B" role="11_B2D">
           <ref role="16sUi3" node="6cHSm2DiB_C" resolve="T" />
         </node>
@@ -3334,7 +3334,7 @@
       <node concept="16euLQ" id="6cHSm2DiB_C" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6cHSm2DiMip" role="3ztrMU">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -3423,7 +3423,7 @@
         </node>
         <node concept="3clFbF" id="uNmovXjx0L" role="3cqZAp">
           <node concept="2YIFZM" id="uNmovXjx0M" role="3clFbG">
-            <ref role="1Pybhc" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="1Pybhc" node="uNmovXiSQ6" resolve="VariableNode" />
             <ref role="37wK5l" node="uNmovXj0Sl" resolve="create" />
             <node concept="37vLTw" id="uNmovXjx0N" role="37wK5m">
               <ref role="3cqZAo" node="uNmovXjpEC" resolve="symbol" />
@@ -3436,7 +3436,7 @@
       </node>
       <node concept="3Tm1VV" id="uNmovXiRmW" role="1B3o_S" />
       <node concept="3uibUv" id="uNmovXjpC8" role="3clF45">
-        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
       </node>
       <node concept="37vLTG" id="uNmovXjpEC" role="3clF46">
         <property role="TrG5h" value="symbol" />
@@ -3462,7 +3462,7 @@
     <property role="TrG5h" value="Variable" />
     <node concept="3Tm1VV" id="uNmovXiEd5" role="1B3o_S" />
     <node concept="3uibUv" id="1bm7a6F1kuO" role="EKbjA">
-      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
     </node>
     <node concept="2tJIrI" id="uNmovXiELu" role="jymVt" />
     <node concept="2YIFZL" id="uNmovXiPrH" role="jymVt">
@@ -3592,7 +3592,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="6Sag3KsvboK" role="11_B2D">
             <node concept="3uibUv" id="6Sag3Ksvbx5" role="3qUE_r">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -3615,7 +3615,7 @@
             <node concept="92FcH" id="6OUp3PsUjSh" role="qph3F">
               <node concept="TZ5HA" id="6OUp3PsUjSj" role="2XjZqd" />
               <node concept="VXe08" id="6OUp3PsUmmU" role="92FcQ">
-                <ref role="VXe09" node="5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="VXe09" node="5JQSuNswOXL" resolve="CompositeNode" />
               </node>
             </node>
           </node>
@@ -3822,11 +3822,11 @@
       <node concept="37vLTG" id="3OPtF02ULUO" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02ULUP" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02ULUQ" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="3OPtF02ULUS" role="1B3o_S" />
       <node concept="3clFbS" id="3OPtF02ULUY" role="3clF47">
@@ -3863,7 +3863,7 @@
       <node concept="37vLTG" id="dfChU1m0qN" role="3clF46">
         <property role="TrG5h" value="parent" />
         <node concept="3uibUv" id="dfChU1m0qO" role="1tU5fm">
-          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
         </node>
       </node>
       <node concept="3cqZAl" id="dfChU1m0qQ" role="3clF45" />
@@ -3886,7 +3886,7 @@
       <node concept="37vLTG" id="104EUzFOWtI" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="104EUzFOWtJ" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="104EUzFOWtK" role="3clF45">
@@ -4088,10 +4088,10 @@
     </node>
   </node>
   <node concept="312cEu" id="uNmovXiSQ6">
-    <property role="TrG5h" value="VariableFunc" />
+    <property role="TrG5h" value="VariableNode" />
     <node concept="3Tm1VV" id="uNmovXiSQ7" role="1B3o_S" />
     <node concept="3uibUv" id="uNmovXiTJU" role="1zkMxy">
-      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
     </node>
     <node concept="2tJIrI" id="uNmovXiU1L" role="jymVt" />
     <node concept="2YIFZL" id="uNmovXj0Sl" role="jymVt">
@@ -4116,7 +4116,7 @@
         <node concept="3clFbF" id="uNmovXj0St" role="3cqZAp">
           <node concept="2ShNRf" id="uNmovXj0Su" role="3clFbG">
             <node concept="1pGfFk" id="uNmovXj0Sv" role="2ShVmc">
-              <ref role="37wK5l" node="uNmovXiUjX" resolve="VariableFunc" />
+              <ref role="37wK5l" node="uNmovXiUjX" resolve="VariableNode" />
               <node concept="2YIFZM" id="6$jH9oLdFwL" role="37wK5m">
                 <ref role="37wK5l" node="1R$Cm9qEBDL" resolve="create" />
                 <ref role="1Pybhc" node="1R$Cm9qEqLU" resolve="Path" />
@@ -4133,7 +4133,7 @@
       </node>
       <node concept="3Tm1VV" id="uNmovXj0Sz" role="1B3o_S" />
       <node concept="3uibUv" id="uNmovXj0S$" role="3clF45">
-        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="uNmovXiYkR" role="jymVt" />
@@ -4141,7 +4141,7 @@
       <node concept="3cqZAl" id="uNmovXiUjY" role="3clF45" />
       <node concept="3clFbS" id="uNmovXiUk0" role="3clF47">
         <node concept="XkiVB" id="uNmovXiZm2" role="3cqZAp">
-          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Func" />
+          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Node" />
           <node concept="37vLTw" id="1R$Cm9qHdqU" role="37wK5m">
             <ref role="3cqZAo" node="uNmovXiUR1" resolve="symbolPath" />
           </node>
@@ -4279,13 +4279,13 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="1bm7a6EZL18" role="3clF45">
-        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
       </node>
       <node concept="3Tm1VV" id="1bm7a6EXEaO" role="1B3o_S" />
       <node concept="3clFbS" id="1bm7a6EXEaT" role="3clF47">
         <node concept="3clFbF" id="1bm7a6EXPjz" role="3cqZAp">
           <node concept="2YIFZM" id="1bm7a6EXPoQ" role="3clFbG">
-            <ref role="1Pybhc" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="1Pybhc" node="uNmovXiSQ6" resolve="VariableNode" />
             <ref role="37wK5l" node="uNmovXj0Sl" resolve="create" />
             <node concept="1rXfSq" id="1OShD0HF8LH" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
@@ -4307,11 +4307,11 @@
       <node concept="37vLTG" id="3OPtF02UnMK" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02UnML" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3uibUv" id="5s497VqKvnu" role="3clF45">
-        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+        <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
       </node>
       <node concept="3Tm1VV" id="3OPtF02UnMO" role="1B3o_S" />
       <node concept="2AHcQZ" id="3OPtF02UnMQ" role="2AJF6D">
@@ -4398,7 +4398,7 @@
         <node concept="3clFbF" id="3OPtF02UDkD" role="3cqZAp">
           <node concept="2YIFZM" id="3OPtF02UDuZ" role="3clFbG">
             <ref role="37wK5l" node="uNmovXj0Sl" resolve="create" />
-            <ref role="1Pybhc" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="1Pybhc" node="uNmovXiSQ6" resolve="VariableNode" />
             <node concept="1rXfSq" id="1OShD0HF92A" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
             </node>
@@ -4416,7 +4416,7 @@
       <node concept="37vLTG" id="47nvOnTSfYc" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="3JgCwkqhKOZ" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02YZi_" role="3clF45">
@@ -4565,7 +4565,7 @@
           <node concept="3cpWsn" id="2q_78a93wx1" role="1Duv9x">
             <property role="TrG5h" value="var" />
             <node concept="3uibUv" id="3H0z$hTu$Xl" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="1rXfSq" id="2q_78a93wx4" role="1DdaDG">
@@ -5062,13 +5062,13 @@
     </node>
   </node>
   <node concept="3HP615" id="1bm7a6EXvsP">
-    <property role="TrG5h" value="Atom" />
+    <property role="TrG5h" value="TreeForm" />
     <node concept="2tJIrI" id="1bm7a6EXvMM" role="jymVt" />
     <node concept="3clFb_" id="1bm7a6EXvNI" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="1bm7a6FcGgl" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1bm7a6EXvNL" role="1B3o_S" />
       <node concept="3clFbS" id="1bm7a6EXvNM" role="3clF47" />
@@ -5080,11 +5080,11 @@
       <node concept="37vLTG" id="3OPtF02TkqL" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3OPtF02Tk$O" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02TkeC" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="3OPtF02Tjpu" role="1B3o_S" />
       <node concept="3clFbS" id="3OPtF02Tjpv" role="3clF47" />
@@ -5097,7 +5097,7 @@
       <node concept="3clFbS" id="2QE4RCGndDa" role="3clF47" />
       <node concept="3Tm1VV" id="2QE4RCGndDb" role="1B3o_S" />
       <node concept="3uibUv" id="2QE4RCGndw1" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
     </node>
     <node concept="2tJIrI" id="dfChU1lDK8" role="jymVt" />
@@ -5107,7 +5107,7 @@
       <node concept="37vLTG" id="dfChU1lHv$" role="3clF46">
         <property role="TrG5h" value="parent" />
         <node concept="3uibUv" id="dfChU1lIPj" role="1tU5fm">
-          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+          <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
         </node>
       </node>
       <node concept="3cqZAl" id="dfChU1lFHn" role="3clF45" />
@@ -5121,7 +5121,7 @@
       <node concept="37vLTG" id="104EUzFOBnE" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="104EUzFOBnF" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="104EUzFOBnG" role="3clF45">
@@ -5149,13 +5149,13 @@
         <node concept="37vLTG" id="3OPtF02TgVl" role="3clF46">
           <property role="TrG5h" value="tp" />
           <node concept="3uibUv" id="5s497VqCJhY" role="1tU5fm">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="3Tm1VV" id="3OPtF02TgQw" role="1B3o_S" />
         <node concept="3clFbS" id="3OPtF02TgQx" role="3clF47" />
         <node concept="3uibUv" id="5s497VqO5R3" role="3clF45">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="2tJIrI" id="3OPtF02TdWb" role="jymVt" />
@@ -5177,7 +5177,7 @@
         <node concept="37vLTG" id="104EUzFOARI" role="3clF46">
           <property role="TrG5h" value="terms" />
           <node concept="3uibUv" id="104EUzFOARJ" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
       </node>
@@ -5188,7 +5188,7 @@
         <node concept="37vLTG" id="104EUzFOARQ" role="3clF46">
           <property role="TrG5h" value="values" />
           <node concept="3uibUv" id="104EUzFOARR" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="104EUzFOARS" role="11_B2D">
               <ref role="16sUi3" node="104EUzFOARW" resolve="V" />
             </node>
@@ -5211,7 +5211,7 @@
         <node concept="37vLTG" id="104EUzFOARZ" role="3clF46">
           <property role="TrG5h" value="variables" />
           <node concept="3uibUv" id="104EUzFOAS0" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
         <node concept="3uibUv" id="104EUzFOAS1" role="3clF45">
@@ -5232,7 +5232,7 @@
         <node concept="37vLTG" id="104EUzFOAS9" role="3clF46">
           <property role="TrG5h" value="list" />
           <node concept="3uibUv" id="104EUzFOASa" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -5288,7 +5288,7 @@
           <node concept="37vLTG" id="6HT7BWBQcNP" role="3clF46">
             <property role="TrG5h" value="terms" />
             <node concept="3uibUv" id="6HT7BWBQcNQ" role="1tU5fm">
-              <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+              <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
             </node>
           </node>
           <node concept="3clFbS" id="6HT7BWBQcNR" role="3clF47">
@@ -5306,7 +5306,7 @@
           <node concept="37vLTG" id="6HT7BWBQcNV" role="3clF46">
             <property role="TrG5h" value="values" />
             <node concept="3uibUv" id="6HT7BWBQcNW" role="1tU5fm">
-              <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+              <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
               <node concept="16syzq" id="6HT7BWBQcNX" role="11_B2D">
                 <ref role="16sUi3" node="6HT7BWBQcO1" resolve="V" />
               </node>
@@ -5335,7 +5335,7 @@
           <node concept="37vLTG" id="6HT7BWBQcO6" role="3clF46">
             <property role="TrG5h" value="variables" />
             <node concept="3uibUv" id="6HT7BWBQcO7" role="1tU5fm">
-              <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+              <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
             </node>
           </node>
           <node concept="3uibUv" id="6HT7BWBQcO8" role="3clF45">
@@ -5361,7 +5361,7 @@
           <node concept="37vLTG" id="6HT7BWBQcOj" role="3clF46">
             <property role="TrG5h" value="list" />
             <node concept="3uibUv" id="6HT7BWBQcOk" role="1tU5fm">
-              <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+              <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
             </node>
           </node>
           <node concept="3clFbS" id="6HT7BWBQcOl" role="3clF47">
@@ -5425,7 +5425,7 @@
         </node>
         <node concept="3Tm1VV" id="6HT7BWBQcxw" role="1B3o_S" />
         <node concept="3uibUv" id="6HT7BWBQcHt" role="EKbjA">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="2tJIrI" id="104EUzG8L8d" role="jymVt" />
@@ -5437,7 +5437,7 @@
     </node>
   </node>
   <node concept="312cEu" id="1hOy_Afq4Fn">
-    <property role="TrG5h" value="AtomWalk" />
+    <property role="TrG5h" value="TreeFormWalk" />
     <node concept="2tJIrI" id="47nvOnU4JVV" role="jymVt" />
     <node concept="3HP615" id="3JgCwkqiP3h" role="jymVt">
       <property role="TrG5h" value="Walker" />
@@ -5453,7 +5453,7 @@
         <node concept="37vLTG" id="3JgCwkqiP3t" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="5YIOneOLnpq" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
       </node>
@@ -5472,7 +5472,7 @@
         <node concept="37vLTG" id="3JgCwkqiP3C" role="3clF46">
           <property role="TrG5h" value="valb" />
           <node concept="3uibUv" id="5YIOneONkT5" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONkT6" role="11_B2D">
               <ref role="16sUi3" node="3JgCwkqiP3H" resolve="V" />
             </node>
@@ -5491,7 +5491,7 @@
         <node concept="37vLTG" id="3JgCwkqiP3N" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWp" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -5507,7 +5507,7 @@
         <node concept="37vLTG" id="3JgCwkqmHc4" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$m" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -5570,7 +5570,7 @@
         <node concept="37vLTG" id="2ev$9JFHHx3" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="2ev$9JFHHx4" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="2ev$9JFHHxd" role="3clF47">
@@ -5603,7 +5603,7 @@
         <node concept="37vLTG" id="2ev$9JFHHxk" role="3clF46">
           <property role="TrG5h" value="valb" />
           <node concept="3uibUv" id="5YIOneONkSP" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONlbt" role="11_B2D">
               <ref role="16sUi3" node="2ev$9JFHHxq" resolve="V" />
             </node>
@@ -5628,7 +5628,7 @@
         <node concept="37vLTG" id="2ev$9JFHHxy" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWi" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -5650,7 +5650,7 @@
         <node concept="37vLTG" id="2ev$9JFHHxI" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$e" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -5708,7 +5708,7 @@
       </node>
       <node concept="3Tm1VV" id="2ev$9JFHDN0" role="1B3o_S" />
       <node concept="3uibUv" id="2ev$9JFHGVP" role="EKbjA">
-        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
     </node>
     <node concept="2tJIrI" id="3JgCwkqhoku" role="jymVt" />
@@ -5733,7 +5733,7 @@
       <node concept="37vLTG" id="47nvOnTQN9E" role="3clF46">
         <property role="TrG5h" value="walker" />
         <node concept="3uibUv" id="3JgCwkqj7Js" role="1tU5fm">
-          <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+          <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
         </node>
       </node>
     </node>
@@ -5743,7 +5743,7 @@
       <node concept="37vLTG" id="1hOy_Afq6Lg" role="3clF46">
         <property role="TrG5h" value="tp" />
         <node concept="3uibUv" id="1hOy_AfqoVv" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="1hOy_Afq63M" role="3clF45" />
@@ -5780,7 +5780,7 @@
                   <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                   <node concept="3qUE_q" id="47nvOnTToTV" role="11_B2D">
                     <node concept="3uibUv" id="47nvOnTTpNL" role="3qUE_r">
-                      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -5847,7 +5847,7 @@
                     <node concept="3cpWsn" id="7d$oK1$HfcP" role="3cpWs9">
                       <property role="TrG5h" value="next" />
                       <node concept="3uibUv" id="7d$oK1$HfcQ" role="1tU5fm">
-                        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                       <node concept="2OqwBi" id="7d$oK1$HfcS" role="33vP2m">
                         <node concept="37vLTw" id="7d$oK1$HfcT" role="2Oq$k0">
@@ -5898,7 +5898,7 @@
       <node concept="37vLTG" id="47nvOnTQNVL" role="3clF46">
         <property role="TrG5h" value="terms" />
         <node concept="3uibUv" id="47nvOnTQNVM" role="1tU5fm">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="3clFbS" id="47nvOnTQNVR" role="3clF47">
@@ -5997,7 +5997,7 @@
       <node concept="37vLTG" id="3OPtF03nbZw" role="3clF46">
         <property role="TrG5h" value="lf" />
         <node concept="3uibUv" id="3OPtF03nbZx" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
       <node concept="3clFbS" id="3OPtF03nbZA" role="3clF47">
@@ -6100,7 +6100,7 @@
       <node concept="37vLTG" id="47nvOnTQNVy" role="3clF46">
         <property role="TrG5h" value="vb" />
         <node concept="3uibUv" id="47nvOnTQNVz" role="1tU5fm">
-          <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+          <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
           <node concept="16syzq" id="47nvOnTQNV$" role="11_B2D">
             <ref role="16sUi3" node="47nvOnTQNVB" resolve="V" />
           </node>
@@ -6298,7 +6298,7 @@
       <node concept="37vLTG" id="47nvOnTQNVX" role="3clF46">
         <property role="TrG5h" value="vb" />
         <node concept="3uibUv" id="47nvOnTQNVY" role="1tU5fm">
-          <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+          <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF02ZgRq" role="3clF45">
@@ -6470,7 +6470,7 @@
     <node concept="3clFb_" id="3JgCwkqnB43" role="jymVt">
       <property role="TrG5h" value="walker" />
       <node concept="3uibUv" id="3JgCwkqnN3O" role="3clF45">
-        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
       <node concept="3Tmbuc" id="3JgCwkqnKcG" role="1B3o_S" />
       <node concept="3clFbS" id="3JgCwkqnB47" role="3clF47">
@@ -6504,7 +6504,7 @@
       <property role="TrG5h" value="walker" />
       <node concept="3Tm6S6" id="47nvOnTQNCB" role="1B3o_S" />
       <node concept="3uibUv" id="3JgCwkqj19S" role="1tU5fm">
-        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
     </node>
     <node concept="2tJIrI" id="47nvOnTQQhN" role="jymVt" />
@@ -6517,7 +6517,7 @@
           <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
           <node concept="3qUE_q" id="47nvOnTTkCz" role="11_B2D">
             <node concept="3uibUv" id="47nvOnTQTwl" role="3qUE_r">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -6529,7 +6529,7 @@
             <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
             <node concept="3qUE_q" id="47nvOnTTwAd" role="11_B2D">
               <node concept="3uibUv" id="47nvOnTTwAe" role="3qUE_r">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -6539,7 +6539,7 @@
     <node concept="2tJIrI" id="1hOy_Afq6Rc" role="jymVt" />
     <node concept="3Tm1VV" id="1hOy_Afq4Fo" role="1B3o_S" />
     <node concept="3uibUv" id="3JgCwkqhFHO" role="EKbjA">
-      <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+      <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
     </node>
   </node>
   <node concept="312cEu" id="3JgCwkqd3K7">
@@ -6565,7 +6565,7 @@
       <node concept="16euLQ" id="5s497VqA14z" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5s497VqA1Tk" role="3ztrMU">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -6590,7 +6590,7 @@
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="3OPtF03gFpS" role="3clF45">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
         </node>
         <node concept="3Tm1VV" id="3OPtF03gFks" role="1B3o_S" />
         <node concept="3clFbS" id="3OPtF03gFkt" role="3clF47" />
@@ -6611,7 +6611,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3OPtF03nYWo" role="11_B2D">
             <node concept="3uibUv" id="3OPtF03nYWp" role="3qUE_r">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -6650,7 +6650,7 @@
       <node concept="37vLTG" id="3OPtF03hjym" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="3OPtF03hjCw" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3OPtF03hjJa" role="3clF46">
@@ -6686,7 +6686,7 @@
           <node concept="2OqwBi" id="3OPtF03isrf" role="3clFbG">
             <node concept="2ShNRf" id="3OPtF03isbr" role="2Oq$k0">
               <node concept="1pGfFk" id="3OPtF03ism_" role="2ShVmc">
-                <ref role="37wK5l" node="47nvOnTQN6Q" resolve="AtomWalk" />
+                <ref role="37wK5l" node="47nvOnTQN6Q" resolve="TreeFormWalk" />
                 <node concept="37vLTw" id="3OPtF03isou" role="37wK5m">
                   <ref role="3cqZAo" node="3OPtF03irY$" resolve="finder" />
                 </node>
@@ -6716,7 +6716,7 @@
       <node concept="37vLTG" id="3OPtF03pX12" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="3OPtF03pX13" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3OPtF03pX15" role="3clF46">
@@ -6757,7 +6757,7 @@
           <node concept="2OqwBi" id="3OPtF03pX1i" role="3clFbG">
             <node concept="2ShNRf" id="3OPtF03pX1j" role="2Oq$k0">
               <node concept="1pGfFk" id="3OPtF03pX1k" role="2ShVmc">
-                <ref role="37wK5l" node="47nvOnTQN6Q" resolve="AtomWalk" />
+                <ref role="37wK5l" node="47nvOnTQN6Q" resolve="TreeFormWalk" />
                 <node concept="37vLTw" id="3OPtF03pX1l" role="37wK5m">
                   <ref role="3cqZAo" node="3OPtF03pX1c" resolve="finder" />
                 </node>
@@ -6784,7 +6784,7 @@
       <node concept="37vLTG" id="3JgCwkqd8vb" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="3AEuFq_Ridy" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3JgCwkqd8vd" role="3clF46">
@@ -6834,7 +6834,7 @@
           <node concept="2OqwBi" id="3JgCwkqd8vq" role="3clFbG">
             <node concept="2ShNRf" id="3JgCwkqd8vr" role="2Oq$k0">
               <node concept="1pGfFk" id="3JgCwkqd8vs" role="2ShVmc">
-                <ref role="37wK5l" node="47nvOnTQN6Q" resolve="AtomWalk" />
+                <ref role="37wK5l" node="47nvOnTQN6Q" resolve="TreeFormWalk" />
                 <node concept="37vLTw" id="3JgCwkqd8vt" role="37wK5m">
                   <ref role="3cqZAo" node="3JgCwkqd8vk" resolve="finder" />
                 </node>
@@ -6886,7 +6886,7 @@
           <node concept="3uibUv" id="3OPtF03ipIx" role="1tU5fm">
             <ref role="3uigEE" node="3OPtF03axxl" resolve="Finders.Condition" />
             <node concept="3uibUv" id="5s497VqA51K" role="11_B2D">
-              <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+              <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
             </node>
           </node>
         </node>
@@ -6902,7 +6902,7 @@
         <node concept="37vLTG" id="3OPtF03hrN3" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="3OPtF03hrN4" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="3OPtF03hrNd" role="3clF47">
@@ -6986,7 +6986,7 @@
         <node concept="37vLTG" id="3OPtF03qfYR" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$h" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -7015,7 +7015,7 @@
         <node concept="37vLTG" id="3OPtF03hrNk" role="3clF46">
           <property role="TrG5h" value="valb" />
           <node concept="3uibUv" id="5YIOneONkSV" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONkSW" role="11_B2D">
               <ref role="16sUi3" node="3OPtF03hrNq" resolve="V" />
             </node>
@@ -7044,7 +7044,7 @@
         <node concept="37vLTG" id="3OPtF03hrNy" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWk" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -7117,7 +7117,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="3OPtF03hrNF" role="3clF45">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
         </node>
         <node concept="3Tm1VV" id="3OPtF03hrNH" role="1B3o_S" />
         <node concept="3clFbS" id="3OPtF03hrNJ" role="3clF47">
@@ -7161,7 +7161,7 @@
         <property role="TrG5h" value="result" />
         <node concept="3Tm6S6" id="3OPtF03htyA" role="1B3o_S" />
         <node concept="3uibUv" id="3OPtF03htIL" role="1tU5fm">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="312cEg" id="3OPtF03huAJ" role="jymVt">
@@ -7170,7 +7170,7 @@
         <node concept="3uibUv" id="3OPtF03huNP" role="1tU5fm">
           <ref role="3uigEE" node="3OPtF03axxl" resolve="Finders.Condition" />
           <node concept="3uibUv" id="5s497VqA6Sq" role="11_B2D">
-            <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+            <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
           </node>
         </node>
       </node>
@@ -7178,11 +7178,11 @@
       <node concept="16euLQ" id="3OPtF03hrbY" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="3OPtF03hreJ" role="3ztrMU">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF03hrvE" role="EKbjA">
-        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
       <node concept="3uibUv" id="3OPtF03hrHZ" role="EKbjA">
         <ref role="3uigEE" node="3OPtF03gqwb" resolve="Finders.ITermFinder" />
@@ -7254,7 +7254,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3OPtF03oA1_" role="11_B2D">
             <node concept="3uibUv" id="3OPtF03oA1A" role="3qUE_r">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -7385,7 +7385,7 @@
         <node concept="37vLTG" id="3OPtF03oA1L" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$l" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -7400,7 +7400,7 @@
         <node concept="37vLTG" id="3OPtF03oA2_" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="3OPtF03oA2A" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="3OPtF03oA2J" role="3clF47">
@@ -7508,7 +7508,7 @@
         <node concept="37vLTG" id="3OPtF03oA3b" role="3clF46">
           <property role="TrG5h" value="valb" />
           <node concept="3uibUv" id="5YIOneONkT3" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONkT4" role="11_B2D">
               <ref role="16sUi3" node="3OPtF03oA3h" resolve="V" />
             </node>
@@ -7537,7 +7537,7 @@
         <node concept="37vLTG" id="3OPtF03oA3E" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWo" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -7568,7 +7568,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3OPtF03oA4b" role="11_B2D">
             <node concept="3uibUv" id="3OPtF03oA4c" role="3qUE_r">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -7588,13 +7588,13 @@
       </node>
       <node concept="3Tmbuc" id="3OPtF03oA4i" role="1B3o_S" />
       <node concept="3uibUv" id="3OPtF03oGCx" role="EKbjA">
-        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
       <node concept="3uibUv" id="3OPtF03oA4k" role="EKbjA">
         <ref role="3uigEE" node="3OPtF03nYWl" resolve="Finders.IListFinder" />
       </node>
       <node concept="3uibUv" id="3t7_2FgCYaL" role="1zkMxy">
-        <ref role="3uigEE" node="2ev$9JFHDMZ" resolve="AtomWalk.IdleWalker" />
+        <ref role="3uigEE" node="2ev$9JFHDMZ" resolve="TreeFormWalk.IdleWalker" />
       </node>
     </node>
     <node concept="2tJIrI" id="3OPtF03pMbF" role="jymVt" />
@@ -7690,7 +7690,7 @@
         <node concept="37vLTG" id="3OPtF03cqRf" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="3OPtF03cqRg" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="3OPtF03cqRo" role="3clF47">
@@ -7773,7 +7773,7 @@
         <node concept="37vLTG" id="3OPtF03qnsi" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$g" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -7890,7 +7890,7 @@
         <node concept="37vLTG" id="3OPtF03cGBG" role="3clF46">
           <property role="TrG5h" value="valb" />
           <node concept="3uibUv" id="5YIOneONkST" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONkSU" role="11_B2D">
               <ref role="16sUi3" node="3OPtF03cGBM" resolve="V" />
             </node>
@@ -7982,7 +7982,7 @@
         <node concept="37vLTG" id="3OPtF03cWxj" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWj" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -8089,7 +8089,7 @@
       </node>
       <node concept="3Tm6S6" id="3OPtF03pQuW" role="1B3o_S" />
       <node concept="3uibUv" id="3JgCwkqk8Dw" role="EKbjA">
-        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+        <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
       <node concept="3uibUv" id="3JgCwkqkWe0" role="EKbjA">
         <ref role="3uigEE" node="3JgCwkqkUKX" resolve="Finders.IValueFinder" />
@@ -8227,7 +8227,7 @@
     <node concept="3Tm1VV" id="3JgCwkqd3K8" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="3OPtF03lco4">
-    <property role="TrG5h" value="ListFunc" />
+    <property role="TrG5h" value="ListNode" />
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="3OPtF03lcol" role="jymVt" />
     <node concept="2YIFZL" id="1OShD0HS45f" role="jymVt">
@@ -8236,12 +8236,12 @@
         <property role="TrG5h" value="elements" />
         <node concept="8X2XB" id="1OShD0HSHQT" role="1tU5fm">
           <node concept="3uibUv" id="1OShD0HSc66" role="8Xvag">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="1OShD0HS7CO" role="3clF45">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="1OShD0HS45i" role="1B3o_S" />
       <node concept="3clFbS" id="1OShD0HS45j" role="3clF47">
@@ -8264,13 +8264,13 @@
       <node concept="37vLTG" id="1OShD0HH7Kl" role="3clF46">
         <property role="TrG5h" value="head" />
         <node concept="3uibUv" id="3H0z$hTtGFH" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="1OShD0HH8we" role="3clF46">
         <property role="TrG5h" value="tail" />
         <node concept="3uibUv" id="1OShD0HH909" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
       <node concept="3Tm6S6" id="3t7_2Fg$$N9" role="1B3o_S" />
@@ -8279,11 +8279,11 @@
           <node concept="3cpWsn" id="1OShD0HHaVQ" role="3cpWs9">
             <property role="TrG5h" value="cons" />
             <node concept="3uibUv" id="1OShD0HHaVR" role="1tU5fm">
-              <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListFunc.Cons" />
+              <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListNode.Cons" />
             </node>
             <node concept="2ShNRf" id="1OShD0HHaVT" role="33vP2m">
               <node concept="1pGfFk" id="1OShD0HHaVU" role="2ShVmc">
-                <ref role="37wK5l" node="3OPtF03lcvJ" resolve="ListFunc.Cons" />
+                <ref role="37wK5l" node="3OPtF03lcvJ" resolve="ListNode.Cons" />
                 <node concept="37vLTw" id="1OShD0HHaVV" role="37wK5m">
                   <ref role="3cqZAo" node="1OShD0HH7Kl" resolve="head" />
                 </node>
@@ -8328,7 +8328,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1OShD0HH3oG" role="3clF45">
-        <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListFunc.Cons" />
+        <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListNode.Cons" />
       </node>
     </node>
     <node concept="2tJIrI" id="1OShD0I3zFc" role="jymVt" />
@@ -8346,11 +8346,11 @@
           <node concept="3cpWsn" id="1OShD0I3vRC" role="3cpWs9">
             <property role="TrG5h" value="alias" />
             <node concept="3uibUv" id="1OShD0I3JjP" role="1tU5fm">
-              <ref role="3uigEE" node="1OShD0I20qU" resolve="ListFunc.Alias" />
+              <ref role="3uigEE" node="1OShD0I20qU" resolve="ListNode.Alias" />
             </node>
             <node concept="2ShNRf" id="1OShD0I3vRF" role="33vP2m">
               <node concept="1pGfFk" id="1OShD0I3vRG" role="2ShVmc">
-                <ref role="37wK5l" node="1OShD0I20qW" resolve="ListFunc.Alias" />
+                <ref role="37wK5l" node="1OShD0I20qW" resolve="ListNode.Alias" />
                 <node concept="37vLTw" id="1OShD0I3vRH" role="37wK5m">
                   <ref role="3cqZAo" node="1OShD0I3vRv" resolve="var" />
                 </node>
@@ -8379,7 +8379,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1OShD0I40pS" role="3clF45">
-        <ref role="3uigEE" node="1OShD0I20qU" resolve="ListFunc.Alias" />
+        <ref role="3uigEE" node="1OShD0I20qU" resolve="ListNode.Alias" />
       </node>
     </node>
     <node concept="2tJIrI" id="1OShD0HRYaK" role="jymVt" />
@@ -8391,7 +8391,7 @@
         <property role="TrG5h" value="elements" />
         <node concept="10Q1$e" id="3OPtF03lcoP" role="1tU5fm">
           <node concept="3uibUv" id="3H0z$hTtP2m" role="10Q1$1">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -8410,7 +8410,7 @@
             <node concept="3cpWs6" id="5cGCTtqwSTO" role="3cqZAp">
               <node concept="10QFUN" id="5cGCTtqwU3b" role="3cqZAk">
                 <node concept="3uibUv" id="5cGCTtqwU38" role="10QFUM">
-                  <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="AH0OO" id="5cGCTtqwZBu" role="10QFUP">
                   <node concept="3cmrfG" id="5cGCTtqx046" role="AHEQo">
@@ -8426,7 +8426,7 @@
           <node concept="1Wc70l" id="5cGCTtqwPf4" role="3clFbw">
             <node concept="2ZW3vV" id="5cGCTtqwRCJ" role="3uHU7w">
               <node concept="3uibUv" id="5cGCTtqwRM6" role="2ZW6by">
-                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
               </node>
               <node concept="AH0OO" id="5cGCTtqwQpn" role="2ZW6bz">
                 <node concept="3cmrfG" id="5cGCTtqwQxI" role="AHEQo">
@@ -8475,7 +8475,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="3H0z$hTtPPK" role="1tU5fm">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -8483,10 +8483,10 @@
               <node concept="3cpWsn" id="1OShD0HG9s2" role="3cpWs9">
                 <property role="TrG5h" value="tail" />
                 <node concept="3uibUv" id="1OShD0HG9rK" role="1tU5fm">
-                  <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="1OShD0HG9s3" role="33vP2m">
-                  <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
                   <ref role="37wK5l" node="3OPtF03lcoL" resolve="createList" />
                   <node concept="37vLTw" id="1OShD0HG9s5" role="37wK5m">
                     <ref role="3cqZAo" node="3OPtF03lcoO" resolve="elements" />
@@ -8534,11 +8534,11 @@
                 <node concept="3cpWsn" id="3OPtF03lcpQ" role="3cpWs9">
                   <property role="TrG5h" value="nil" />
                   <node concept="3uibUv" id="3OPtF03lcpR" role="1tU5fm">
-                    <ref role="3uigEE" node="3OPtF03lcyJ" resolve="ListFunc.Nil" />
+                    <ref role="3uigEE" node="3OPtF03lcyJ" resolve="ListNode.Nil" />
                   </node>
                   <node concept="2ShNRf" id="3OPtF03lcpT" role="33vP2m">
                     <node concept="1pGfFk" id="3OPtF03lcpU" role="2ShVmc">
-                      <ref role="37wK5l" node="3OPtF03lcyL" resolve="ListFunc.Nil" />
+                      <ref role="37wK5l" node="3OPtF03lcyL" resolve="ListNode.Nil" />
                     </node>
                   </node>
                 </node>
@@ -8564,7 +8564,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="3H0z$hTtR1m" role="1tU5fm">
-                    <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -8615,10 +8615,10 @@
                       <node concept="3cpWsn" id="1OShD0IbQqK" role="3cpWs9">
                         <property role="TrG5h" value="tail" />
                         <node concept="3uibUv" id="1OShD0IbQqL" role="1tU5fm">
-                          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
                         </node>
                         <node concept="2YIFZM" id="1OShD0IbQqN" role="33vP2m">
-                          <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+                          <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
                           <ref role="37wK5l" node="3OPtF03lcoL" resolve="createList" />
                           <node concept="37vLTw" id="1OShD0IbQqO" role="37wK5m">
                             <ref role="3cqZAo" node="3OPtF03lcoO" resolve="elements" />
@@ -8668,7 +8668,7 @@
       </node>
       <node concept="3Tm6S6" id="3OPtF03lcq6" role="1B3o_S" />
       <node concept="3uibUv" id="3OPtF03lcq7" role="3clF45">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="6HT7BWBQJVg" role="jymVt" />
@@ -8687,7 +8687,7 @@
               <node concept="liA8E" id="6HT7BWBQWBM" role="2OqNvi">
                 <ref role="37wK5l" node="6Sag3Ksv6No" resolve="canRepresent" />
                 <node concept="3VsKOn" id="6HT7BWBQXfZ" role="37wK5m">
-                  <ref role="3VsUkX" node="3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="3VsUkX" node="3OPtF03lco4" resolve="ListNode" />
                 </node>
               </node>
             </node>
@@ -8716,7 +8716,7 @@
       <node concept="3cqZAl" id="3OPtF03lcrV" role="3clF45" />
       <node concept="3clFbS" id="3OPtF03lcrW" role="3clF47">
         <node concept="XkiVB" id="3OPtF03lcrX" role="3cqZAp">
-          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Func" />
+          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Node" />
           <node concept="37vLTw" id="3OPtF03lcrY" role="37wK5m">
             <ref role="3cqZAo" node="3OPtF03lcs8" resolve="symbolPath" />
           </node>
@@ -8729,7 +8729,7 @@
                 <ref role="3cqZAo" node="3OPtF03lcsc" resolve="tail" />
               </node>
               <node concept="3uibUv" id="3OPtF03lcs6" role="3g7fb8">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -8763,13 +8763,13 @@
       <node concept="37vLTG" id="3OPtF03lcsa" role="3clF46">
         <property role="TrG5h" value="value" />
         <node concept="3uibUv" id="3H0z$hTtTvx" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3OPtF03lcsc" role="3clF46">
         <property role="TrG5h" value="tail" />
         <node concept="3uibUv" id="3OPtF03lcsd" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
     </node>
@@ -8778,14 +8778,14 @@
       <node concept="3cqZAl" id="3OPtF03lcsh" role="3clF45" />
       <node concept="3clFbS" id="3OPtF03lcsi" role="3clF47">
         <node concept="XkiVB" id="3OPtF03lcsj" role="3cqZAp">
-          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Func" />
+          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Node" />
           <node concept="37vLTw" id="3OPtF03lcsk" role="37wK5m">
             <ref role="3cqZAo" node="3OPtF03lcss" resolve="symbolPath" />
           </node>
           <node concept="2ShNRf" id="3OPtF03lcso" role="37wK5m">
             <node concept="3g6Rrh" id="3OPtF03lcsp" role="2ShVmc">
               <node concept="3uibUv" id="3OPtF03lcsq" role="3g7fb8">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -8807,7 +8807,7 @@
       <node concept="3cqZAl" id="1OShD0I2Mcq" role="3clF45" />
       <node concept="3clFbS" id="1OShD0I2Mcr" role="3clF47">
         <node concept="XkiVB" id="1OShD0I2Mcs" role="3cqZAp">
-          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Func" />
+          <ref role="37wK5l" node="1msb0mq9JZ8" resolve="Node" />
           <node concept="37vLTw" id="1OShD0I2Mct" role="37wK5m">
             <ref role="3cqZAo" node="1OShD0I2Mc_" resolve="symbolPath" />
           </node>
@@ -8817,7 +8817,7 @@
                 <ref role="3cqZAo" node="1OShD0I2RTL" resolve="value" />
               </node>
               <node concept="3uibUv" id="1OShD0I2Mcz" role="3g7fb8">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -8841,7 +8841,7 @@
       <node concept="37vLTG" id="1OShD0I2RTL" role="3clF46">
         <property role="TrG5h" value="value" />
         <node concept="3uibUv" id="3H0z$hTtUqT" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -8853,7 +8853,7 @@
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3qUE_q" id="5YIOneOT4dd" role="11_B2D">
           <node concept="3uibUv" id="5YIOneOT4dn" role="3qUE_r">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -8865,14 +8865,14 @@
             <node concept="3uibUv" id="5YIOneOT7XS" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
               <node concept="3uibUv" id="5YIOneOT7XV" role="11_B2D">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="5YIOneOT7XY" role="33vP2m">
               <node concept="1pGfFk" id="5YIOneOT7XZ" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                 <node concept="3uibUv" id="5YIOneOT7Y0" role="1pMfVU">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -8910,7 +8910,7 @@
       <node concept="37vLTG" id="3OPtF03lcur" role="3clF46">
         <property role="TrG5h" value="visitor" />
         <node concept="3uibUv" id="3OPtF03lcus" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
       <node concept="3uibUv" id="3OPtF03lcut" role="3clF45">
@@ -8939,7 +8939,7 @@
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="copyRecursively" />
       <node concept="3uibUv" id="3t7_2Fh5pfx" role="3clF45">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="3t7_2Fh5nOg" role="1B3o_S" />
       <node concept="2AHcQZ" id="3t7_2Fh5nOi" role="2AJF6D">
@@ -8954,11 +8954,11 @@
       <node concept="37vLTG" id="3t7_2Fh5nOn" role="3clF46">
         <property role="TrG5h" value="mapper" />
         <node concept="3uibUv" id="3t7_2Fh5nOo" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+          <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
         </node>
       </node>
       <node concept="3uibUv" id="3t7_2Fh5sxc" role="3clF45">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="3t7_2Fh5nOq" role="1B3o_S" />
       <node concept="2AHcQZ" id="3t7_2Fh5nOs" role="2AJF6D">
@@ -9062,7 +9062,7 @@
           <node concept="3cpWsn" id="2q_78a92HDJ" role="1Duv9x">
             <property role="TrG5h" value="br" />
             <node concept="3uibUv" id="3H0z$hTtZCT" role="1tU5fm">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="1rXfSq" id="2q_78a92HDM" role="1DdaDG">
@@ -9130,7 +9130,7 @@
         <node concept="3uibUv" id="3OPtF03lcvl" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="3H0z$hTu13J" role="11_B2D">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -9156,14 +9156,14 @@
     <node concept="3clFb_" id="3OPtF03lcvw" role="jymVt">
       <property role="TrG5h" value="tip" />
       <node concept="3uibUv" id="3OPtF03lcvx" role="3clF45">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tmbuc" id="3t7_2Fg_9v$" role="1B3o_S" />
       <node concept="3clFbS" id="3OPtF03lcv$" role="3clF47">
         <node concept="3clFbF" id="3OPtF03lcv_" role="3cqZAp">
           <node concept="10QFUN" id="3OPtF03lcvB" role="3clFbG">
             <node concept="3uibUv" id="3OPtF03lcvC" role="10QFUM">
-              <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+              <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="1rXfSq" id="3OPtF03lcvE" role="10QFUP">
               <ref role="37wK5l" node="6$jH9oLbK0n" resolve="argAt" />
@@ -9186,25 +9186,25 @@
         <node concept="37vLTG" id="3OPtF03lcvK" role="3clF46">
           <property role="TrG5h" value="head" />
           <node concept="3uibUv" id="3H0z$hTu5rB" role="1tU5fm">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="37vLTG" id="3OPtF03lcvO" role="3clF46">
           <property role="TrG5h" value="tail" />
           <node concept="3uibUv" id="3OPtF03lcvP" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
         <node concept="3cqZAl" id="3OPtF03lcvR" role="3clF45" />
         <node concept="3clFbS" id="3OPtF03lcvS" role="3clF47">
           <node concept="XkiVB" id="3OPtF03lcvT" role="3cqZAp">
-            <ref role="37wK5l" node="3OPtF03lcrU" resolve="ListFunc" />
+            <ref role="37wK5l" node="3OPtF03lcrU" resolve="ListNode" />
             <node concept="2YIFZM" id="3OPtF03lcvU" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qEBDL" resolve="create" />
               <ref role="1Pybhc" node="1R$Cm9qEqLU" resolve="Path" />
               <node concept="Rm8GO" id="1OShD0HGB9i" role="37wK5m">
                 <ref role="Rm8GQ" node="3OPtF03lc$8" resolve="CONS" />
-                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListFunc.Symbols" />
+                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListNode.Symbols" />
               </node>
             </node>
             <node concept="37vLTw" id="3OPtF03lcvY" role="37wK5m">
@@ -9222,7 +9222,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="copyRecursively" />
         <node concept="3uibUv" id="3OPtF03lcwb" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListFunc.Cons" />
+          <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListNode.Cons" />
         </node>
         <node concept="3Tm1VV" id="3OPtF03lcwd" role="1B3o_S" />
         <node concept="2AHcQZ" id="3OPtF03lcwe" role="2AJF6D">
@@ -9233,7 +9233,7 @@
             <node concept="3cpWsn" id="3OPtF03lcwh" role="3cpWs9">
               <property role="TrG5h" value="headCopy" />
               <node concept="3uibUv" id="3H0z$hTu6uc" role="1tU5fm">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="1OShD0HKGvi" role="33vP2m">
                 <node concept="1rXfSq" id="1OShD0HKGvj" role="2Oq$k0">
@@ -9249,7 +9249,7 @@
             <node concept="3cpWsn" id="3OPtF03lcwp" role="3cpWs9">
               <property role="TrG5h" value="tailCopy" />
               <node concept="3uibUv" id="3OPtF03lcwq" role="1tU5fm">
-                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
               </node>
               <node concept="2OqwBi" id="3OPtF03lcws" role="33vP2m">
                 <node concept="1rXfSq" id="3OPtF03lcwt" role="2Oq$k0">
@@ -9264,7 +9264,7 @@
           <node concept="3clFbF" id="1OShD0HKRKf" role="3cqZAp">
             <node concept="2YIFZM" id="1OShD0HKRKh" role="3clFbG">
               <ref role="37wK5l" node="1OShD0HGZnt" resolve="createCons" />
-              <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+              <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="1OShD0HKRKi" role="37wK5m">
                 <ref role="3cqZAo" node="3OPtF03lcwh" resolve="headCopy" />
               </node>
@@ -9282,7 +9282,7 @@
         <node concept="37vLTG" id="3OPtF03lcwM" role="3clF46">
           <property role="TrG5h" value="mapper" />
           <node concept="3uibUv" id="3OPtF03lcwN" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+            <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="3OPtF03lcwO" role="1B3o_S" />
@@ -9305,7 +9305,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="3H0z$hTuaUu" role="1tU5fm">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -9313,7 +9313,7 @@
             <node concept="3cpWsn" id="3OPtF03lcx1" role="3cpWs9">
               <property role="TrG5h" value="tailMap" />
               <node concept="3uibUv" id="3OPtF03lcx2" role="1tU5fm">
-                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
               </node>
               <node concept="2OqwBi" id="3OPtF03lcx4" role="33vP2m">
                 <node concept="1rXfSq" id="3OPtF03lcx5" role="2Oq$k0">
@@ -9331,7 +9331,7 @@
           <node concept="3clFbF" id="1OShD0HKNbM" role="3cqZAp">
             <node concept="2YIFZM" id="1OShD0HKNbO" role="3clFbG">
               <ref role="37wK5l" node="1OShD0HGZnt" resolve="createCons" />
-              <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+              <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="1OShD0HKNbP" role="37wK5m">
                 <ref role="3cqZAo" node="3OPtF03lcwS" resolve="headMap" />
               </node>
@@ -9342,7 +9342,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="3OPtF03lcxp" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListFunc.Cons" />
+          <ref role="3uigEE" node="3OPtF03lcvH" resolve="ListNode.Cons" />
         </node>
       </node>
       <node concept="2tJIrI" id="3OPtF03lcxr" role="jymVt" />
@@ -9373,7 +9373,7 @@
                 </node>
                 <node concept="Rm8GO" id="1OShD0I5481" role="3uHU7w">
                   <ref role="Rm8GQ" node="3OPtF03lc$8" resolve="CONS" />
-                  <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListFunc.Symbols" />
+                  <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListNode.Symbols" />
                 </node>
               </node>
             </node>
@@ -9392,7 +9392,7 @@
           <node concept="3uibUv" id="3OPtF03lcxQ" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~List" resolve="List" />
             <node concept="3uibUv" id="3H0z$hTugCA" role="11_B2D">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -9435,7 +9435,7 @@
         <property role="TrG5h" value="tip" />
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="3t7_2Fg_ebD" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
         <node concept="3Tmbuc" id="3t7_2Fg_ebE" role="1B3o_S" />
         <node concept="3clFbS" id="3t7_2Fg_ebL" role="3clF47">
@@ -9465,7 +9465,7 @@
         </node>
         <node concept="3Tm6S6" id="3OPtF03lcyc" role="1B3o_S" />
         <node concept="3uibUv" id="3H0z$hTuhjD" role="3clF45">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="2tJIrI" id="3OPtF03lcye" role="jymVt" />
@@ -9484,20 +9484,20 @@
                 </node>
               </node>
               <node concept="3uibUv" id="3OPtF03lcyl" role="10QFUM">
-                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
               </node>
             </node>
           </node>
         </node>
         <node concept="3Tm6S6" id="3OPtF03lcyn" role="1B3o_S" />
         <node concept="3uibUv" id="3OPtF03lcyo" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
       <node concept="2tJIrI" id="3OPtF03lcyq" role="jymVt" />
       <node concept="3Tm1VV" id="3OPtF03lcyB" role="1B3o_S" />
       <node concept="3uibUv" id="3OPtF03lcyC" role="1zkMxy">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="3OPtF03lcyI" role="jymVt" />
@@ -9511,13 +9511,13 @@
         <node concept="3cqZAl" id="3OPtF03lcyM" role="3clF45" />
         <node concept="3clFbS" id="3OPtF03lcyN" role="3clF47">
           <node concept="XkiVB" id="3OPtF03lcyO" role="3cqZAp">
-            <ref role="37wK5l" node="3OPtF03lcsg" resolve="ListFunc" />
+            <ref role="37wK5l" node="3OPtF03lcsg" resolve="ListNode" />
             <node concept="2YIFZM" id="3OPtF03lcyP" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qEBDL" resolve="create" />
               <ref role="1Pybhc" node="1R$Cm9qEqLU" resolve="Path" />
               <node concept="Rm8GO" id="3OPtF03lcyQ" role="37wK5m">
                 <ref role="Rm8GQ" node="3OPtF03lc$7" resolve="NIL" />
-                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListFunc.Symbols" />
+                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListNode.Symbols" />
               </node>
             </node>
           </node>
@@ -9536,13 +9536,13 @@
           <node concept="3clFbF" id="3OPtF03lcz5" role="3cqZAp">
             <node concept="2ShNRf" id="3OPtF03lcz6" role="3clFbG">
               <node concept="1pGfFk" id="3OPtF03lcz7" role="2ShVmc">
-                <ref role="37wK5l" node="3OPtF03lcyL" resolve="ListFunc.Nil" />
+                <ref role="37wK5l" node="3OPtF03lcyL" resolve="ListNode.Nil" />
               </node>
             </node>
           </node>
         </node>
         <node concept="3uibUv" id="3OPtF03lcz9" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lcyJ" resolve="ListFunc.Nil" />
+          <ref role="3uigEE" node="3OPtF03lcyJ" resolve="ListNode.Nil" />
         </node>
       </node>
       <node concept="2tJIrI" id="3OPtF03lczb" role="jymVt" />
@@ -9552,7 +9552,7 @@
         <node concept="37vLTG" id="3OPtF03lczd" role="3clF46">
           <property role="TrG5h" value="mapper" />
           <node concept="3uibUv" id="3OPtF03lcze" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+            <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="3OPtF03lczf" role="1B3o_S" />
@@ -9563,13 +9563,13 @@
           <node concept="3clFbF" id="3OPtF03lczi" role="3cqZAp">
             <node concept="2ShNRf" id="3OPtF03lczj" role="3clFbG">
               <node concept="1pGfFk" id="3OPtF03lczk" role="2ShVmc">
-                <ref role="37wK5l" node="3OPtF03lcyL" resolve="ListFunc.Nil" />
+                <ref role="37wK5l" node="3OPtF03lcyL" resolve="ListNode.Nil" />
               </node>
             </node>
           </node>
         </node>
         <node concept="3uibUv" id="3OPtF03lczm" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lcyJ" resolve="ListFunc.Nil" />
+          <ref role="3uigEE" node="3OPtF03lcyJ" resolve="ListNode.Nil" />
         </node>
       </node>
       <node concept="2tJIrI" id="3OPtF03lczo" role="jymVt" />
@@ -9596,7 +9596,7 @@
         <property role="TrG5h" value="tip" />
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="3t7_2Fg_g6M" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
         <node concept="3Tmbuc" id="3t7_2Fg_g6N" role="1B3o_S" />
         <node concept="3clFbS" id="3t7_2Fg_g6U" role="3clF47">
@@ -9617,7 +9617,7 @@
           <node concept="3uibUv" id="3OPtF03lczS" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~List" resolve="List" />
             <node concept="3uibUv" id="3H0z$hTujbW" role="11_B2D">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -9636,7 +9636,7 @@
       </node>
       <node concept="3Tm1VV" id="3OPtF03lc$0" role="1B3o_S" />
       <node concept="3uibUv" id="3OPtF03lc$3" role="1zkMxy">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="1OShD0I256B" role="jymVt" />
@@ -9656,13 +9656,13 @@
         <node concept="3cqZAl" id="1OShD0I20qX" role="3clF45" />
         <node concept="3clFbS" id="1OShD0I20qY" role="3clF47">
           <node concept="XkiVB" id="1OShD0I20qZ" role="3cqZAp">
-            <ref role="37wK5l" node="1OShD0I2Mcp" resolve="ListFunc" />
+            <ref role="37wK5l" node="1OShD0I2Mcp" resolve="ListNode" />
             <node concept="2YIFZM" id="1OShD0I20r0" role="37wK5m">
               <ref role="37wK5l" node="1R$Cm9qEBDL" resolve="create" />
               <ref role="1Pybhc" node="1R$Cm9qEqLU" resolve="Path" />
               <node concept="Rm8GO" id="1OShD0I2j4m" role="37wK5m">
                 <ref role="Rm8GQ" node="1OShD0I1R$K" resolve="ALIAS" />
-                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListFunc.Symbols" />
+                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListNode.Symbols" />
               </node>
             </node>
             <node concept="37vLTw" id="1OShD0I2mpa" role="37wK5m">
@@ -9677,7 +9677,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="copyRecursively" />
         <node concept="3uibUv" id="1OShD0I2Zn0" role="3clF45">
-          <ref role="3uigEE" node="1OShD0I20qU" resolve="ListFunc.Alias" />
+          <ref role="3uigEE" node="1OShD0I20qU" resolve="ListNode.Alias" />
         </node>
         <node concept="3Tm1VV" id="1OShD0I2Zn2" role="1B3o_S" />
         <node concept="2AHcQZ" id="1OShD0I2Zn3" role="2AJF6D">
@@ -9703,7 +9703,7 @@
           <node concept="3clFbF" id="1OShD0I7YSW" role="3cqZAp">
             <node concept="2YIFZM" id="1OShD0I7YSY" role="3clFbG">
               <ref role="37wK5l" node="1OShD0I3vRu" resolve="createAlias" />
-              <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+              <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="1OShD0I7YSZ" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0I2Zn6" resolve="varCopy" />
               </node>
@@ -9718,7 +9718,7 @@
         <node concept="37vLTG" id="1OShD0I2Znq" role="3clF46">
           <property role="TrG5h" value="mapper" />
           <node concept="3uibUv" id="1OShD0I2Znr" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+            <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="1OShD0I2Zns" role="1B3o_S" />
@@ -9728,9 +9728,9 @@
         <node concept="3clFbS" id="1OShD0I2Znu" role="3clF47">
           <node concept="3cpWs8" id="6HT7BWBOytl" role="3cqZAp">
             <node concept="3cpWsn" id="6HT7BWBOytm" role="3cpWs9">
-              <property role="TrG5h" value="atom" />
+              <property role="TrG5h" value="tf" />
               <node concept="3uibUv" id="6HT7BWBOytj" role="1tU5fm">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBOytn" role="33vP2m">
                 <node concept="37vLTw" id="6HT7BWBOyto" role="2Oq$k0">
@@ -9750,13 +9750,13 @@
               <node concept="3cpWs6" id="6HT7BWBOznG" role="3cqZAp">
                 <node concept="2YIFZM" id="1OShD0I7__u" role="3cqZAk">
                   <ref role="37wK5l" node="1OShD0I3vRu" resolve="createAlias" />
-                  <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
                   <node concept="10QFUN" id="6HT7BWBOIM8" role="37wK5m">
                     <node concept="3uibUv" id="6HT7BWBOIM6" role="10QFUM">
                       <ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
                     </node>
                     <node concept="37vLTw" id="6HT7BWBOIM7" role="10QFUP">
-                      <ref role="3cqZAo" node="6HT7BWBOytm" resolve="atom" />
+                      <ref role="3cqZAo" node="6HT7BWBOytm" resolve="tf" />
                     </node>
                   </node>
                 </node>
@@ -9768,7 +9768,7 @@
                 <ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="37vLTw" id="6HT7BWBOz67" role="2ZW6bz">
-                <ref role="3cqZAo" node="6HT7BWBOytm" resolve="atom" />
+                <ref role="3cqZAo" node="6HT7BWBOytm" resolve="tf" />
               </node>
             </node>
             <node concept="3eNFk2" id="6HT7BWBOAfD" role="3eNLev">
@@ -9776,9 +9776,9 @@
                 <node concept="3cpWs6" id="6HT7BWBOC5z" role="3cqZAp">
                   <node concept="2YIFZM" id="6HT7BWBOGwz" role="3cqZAk">
                     <ref role="37wK5l" node="1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListFunc" />
+                    <ref role="1Pybhc" node="3OPtF03lco4" resolve="ListNode" />
                     <node concept="37vLTw" id="6HT7BWBOGw$" role="37wK5m">
-                      <ref role="3cqZAo" node="6HT7BWBOytm" resolve="atom" />
+                      <ref role="3cqZAo" node="6HT7BWBOytm" resolve="tf" />
                     </node>
                   </node>
                 </node>
@@ -9786,10 +9786,10 @@
               </node>
               <node concept="2ZW3vV" id="6HT7BWBOAYX" role="3eO9$A">
                 <node concept="3uibUv" id="6HT7BWBOExh" role="2ZW6by">
-                  <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="37vLTw" id="6HT7BWBOARN" role="2ZW6bz">
-                  <ref role="3cqZAo" node="6HT7BWBOytm" resolve="atom" />
+                  <ref role="3cqZAo" node="6HT7BWBOytm" resolve="tf" />
                 </node>
               </node>
             </node>
@@ -9801,7 +9801,7 @@
                       <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
                       <node concept="3cpWs3" id="6HT7BWBONr_" role="37wK5m">
                         <node concept="37vLTw" id="6HT7BWBONt3" role="3uHU7w">
-                          <ref role="3cqZAo" node="6HT7BWBOytm" resolve="atom" />
+                          <ref role="3cqZAo" node="6HT7BWBOytm" resolve="tf" />
                         </node>
                         <node concept="Xl_RD" id="6HT7BWBONfA" role="3uHU7B">
                           <property role="Xl_RC" value="unexpected map result: " />
@@ -9815,7 +9815,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="6HT7BWBOHkC" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
       <node concept="2tJIrI" id="1OShD0I2ZnQ" role="jymVt" />
@@ -9892,7 +9892,7 @@
             <node concept="3cpWs3" id="1OShD0I61XL" role="3clFbG">
               <node concept="Rm8GO" id="1OShD0I64yC" role="3uHU7B">
                 <ref role="Rm8GQ" node="1OShD0I1R$K" resolve="ALIAS" />
-                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListFunc.Symbols" />
+                <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListNode.Symbols" />
               </node>
               <node concept="2YIFZM" id="1OShD0I2Zo1" role="3uHU7w">
                 <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
@@ -9917,7 +9917,7 @@
           <node concept="3uibUv" id="1OShD0I2Zo9" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~List" resolve="List" />
             <node concept="3uibUv" id="3H0z$hTuqdU" role="11_B2D">
-              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -9947,7 +9947,7 @@
         <property role="TrG5h" value="tip" />
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="3t7_2Fg_is5" role="3clF45">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
         <node concept="3Tmbuc" id="3t7_2Fg_is6" role="1B3o_S" />
         <node concept="3clFbS" id="3t7_2Fg_isd" role="3clF47">
@@ -9961,7 +9961,7 @@
       </node>
       <node concept="3Tm1VV" id="1OShD0I20rI" role="1B3o_S" />
       <node concept="3uibUv" id="1OShD0I20rM" role="1zkMxy">
-        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
       </node>
     </node>
     <node concept="2tJIrI" id="3OPtF03lc$5" role="jymVt" />
@@ -10013,21 +10013,21 @@
       <node concept="2tJIrI" id="1OShD0I1Zul" role="jymVt" />
       <node concept="QsSxf" id="3OPtF03lc$7" role="Qtgdg">
         <property role="TrG5h" value="NIL" />
-        <ref role="37wK5l" node="1OShD0I1UxM" resolve="ListFunc.Symbols" />
+        <ref role="37wK5l" node="1OShD0I1UxM" resolve="ListNode.Symbols" />
         <node concept="Xl_RD" id="1OShD0I20hE" role="37wK5m">
           <property role="Xl_RC" value="NIL" />
         </node>
       </node>
       <node concept="QsSxf" id="3OPtF03lc$8" role="Qtgdg">
         <property role="TrG5h" value="CONS" />
-        <ref role="37wK5l" node="1OShD0I1UxM" resolve="ListFunc.Symbols" />
+        <ref role="37wK5l" node="1OShD0I1UxM" resolve="ListNode.Symbols" />
         <node concept="Xl_RD" id="1OShD0I20lu" role="37wK5m">
           <property role="Xl_RC" value=":" />
         </node>
       </node>
       <node concept="QsSxf" id="1OShD0I1R$K" role="Qtgdg">
         <property role="TrG5h" value="ALIAS" />
-        <ref role="37wK5l" node="1OShD0I1UxM" resolve="ListFunc.Symbols" />
+        <ref role="37wK5l" node="1OShD0I1UxM" resolve="ListNode.Symbols" />
         <node concept="Xl_RD" id="1OShD0I20pU" role="37wK5m">
           <property role="Xl_RC" value="&amp;" />
         </node>
@@ -10042,14 +10042,14 @@
     <node concept="2tJIrI" id="3OPtF03lc$a" role="jymVt" />
     <node concept="3Tm1VV" id="3OPtF03lc_V" role="1B3o_S" />
     <node concept="3uibUv" id="3OPtF03lc_Z" role="1zkMxy">
-      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Func" />
+      <ref role="3uigEE" node="1msb0mq9ID4" resolve="Node" />
     </node>
   </node>
   <node concept="312cEu" id="5s497VqXwA7">
     <property role="TrG5h" value="PrettyPrinter" />
     <node concept="3Tm1VV" id="5s497VqXwA8" role="1B3o_S" />
     <node concept="3uibUv" id="5s497VqXwGs" role="EKbjA">
-      <ref role="3uigEE" node="3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+      <ref role="3uigEE" node="3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
     </node>
     <node concept="2tJIrI" id="5s497VqXx1L" role="jymVt" />
     <node concept="2YIFZL" id="5s497VqXK1B" role="jymVt">
@@ -10094,7 +10094,7 @@
       <node concept="37vLTG" id="5s497VqXKRl" role="3clF46">
         <property role="TrG5h" value="tbr" />
         <node concept="3uibUv" id="5s497VqXKRk" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="5s497VrdmAW" role="3clF46">
@@ -10148,7 +10148,7 @@
       <node concept="37vLTG" id="3gJBs5s$Nca" role="3clF46">
         <property role="TrG5h" value="tbr" />
         <node concept="3uibUv" id="3gJBs5s$Ncb" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3gJBs5s$Ncd" role="3clF46">
@@ -10158,7 +10158,7 @@
       <node concept="37vLTG" id="3gJBs5s$P_F" role="3clF46">
         <property role="TrG5h" value="symbolProvider" />
         <node concept="3uibUv" id="3gJBs5s$PN2" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
     </node>
@@ -10170,7 +10170,7 @@
       <node concept="37vLTG" id="3gJBs5s$T2T" role="3clF46">
         <property role="TrG5h" value="tbr" />
         <node concept="3uibUv" id="3gJBs5s$T2U" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3gJBs5s$T2W" role="3clF46">
@@ -10253,7 +10253,7 @@
                     <node concept="2OqwBi" id="3gJBs5s$T2J" role="3clFbG">
                       <node concept="2ShNRf" id="3gJBs5s$T2K" role="2Oq$k0">
                         <node concept="1pGfFk" id="3gJBs5s$T2L" role="2ShVmc">
-                          <ref role="37wK5l" node="47nvOnTQN6Q" resolve="AtomWalk" />
+                          <ref role="37wK5l" node="47nvOnTQN6Q" resolve="TreeFormWalk" />
                           <node concept="37vLTw" id="3gJBs5s$T4b" role="37wK5m">
                             <ref role="3cqZAo" node="3gJBs5s$T2W" resolve="printer" />
                           </node>
@@ -10390,7 +10390,7 @@
       <node concept="37vLTG" id="3gJBs5s$5nP" role="3clF46">
         <property role="TrG5h" value="symbolProvider" />
         <node concept="3uibUv" id="3gJBs5s$5uo" role="1tU5fm">
-          <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+          <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
         </node>
       </node>
     </node>
@@ -10423,7 +10423,7 @@
       <node concept="37vLTG" id="5s497VqXwH_" role="3clF46">
         <property role="TrG5h" value="cb" />
         <node concept="3uibUv" id="5s497VqXwHA" role="1tU5fm">
-          <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="3clFbS" id="5s497VqXwHJ" role="3clF47">
@@ -10572,7 +10572,7 @@
       <node concept="37vLTG" id="5s497VqXwNd" role="3clF46">
         <property role="TrG5h" value="listb" />
         <node concept="3uibUv" id="5YIOneOU7$k" role="1tU5fm">
-          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
     </node>
@@ -10667,7 +10667,7 @@
       <node concept="37vLTG" id="5s497VqXwMN" role="3clF46">
         <property role="TrG5h" value="valb" />
         <node concept="3uibUv" id="5YIOneONkT1" role="1tU5fm">
-          <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+          <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
           <node concept="16syzq" id="5YIOneONkT2" role="11_B2D">
             <ref role="16sUi3" node="5s497VqXwMT" resolve="V" />
           </node>
@@ -10795,7 +10795,7 @@
       <node concept="37vLTG" id="5s497VqXwN1" role="3clF46">
         <property role="TrG5h" value="varb" />
         <node concept="3uibUv" id="5YIOneOSlWn" role="1tU5fm">
-          <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+          <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
         </node>
       </node>
     </node>
@@ -11464,7 +11464,7 @@
         <node concept="37vLTG" id="3gJBs5s$cUV" role="3clF46">
           <property role="TrG5h" value="terms" />
           <node concept="3uibUv" id="3gJBs5s$cUW" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="3gJBs5s$cV1" role="3clF47">
@@ -11486,7 +11486,7 @@
         <node concept="37vLTG" id="3gJBs5s$cV5" role="3clF46">
           <property role="TrG5h" value="values" />
           <node concept="3uibUv" id="3gJBs5s$cV6" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="3gJBs5s$cV7" role="11_B2D">
               <ref role="16sUi3" node="3gJBs5s$cVb" resolve="V" />
             </node>
@@ -11518,7 +11518,7 @@
         <node concept="37vLTG" id="3gJBs5s$cVg" role="3clF46">
           <property role="TrG5h" value="variables" />
           <node concept="3uibUv" id="3gJBs5s$cVh" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
         <node concept="3uibUv" id="3gJBs5s$cVi" role="3clF45">
@@ -11548,7 +11548,7 @@
         <node concept="37vLTG" id="3gJBs5s$cVs" role="3clF46">
           <property role="TrG5h" value="list" />
           <node concept="3uibUv" id="3gJBs5s$cVt" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
         <node concept="3clFbS" id="3gJBs5s$cVy" role="3clF47">
@@ -11619,7 +11619,7 @@
       </node>
       <node concept="3Tm1VV" id="3gJBs5s$bxs" role="1B3o_S" />
       <node concept="3uibUv" id="3gJBs5s$cLm" role="EKbjA">
-        <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+        <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
       </node>
     </node>
     <node concept="2tJIrI" id="5s497VqXz0L" role="jymVt" />
@@ -11684,7 +11684,7 @@
       <property role="TrG5h" value="symbolProvider" />
       <node concept="3Tm6S6" id="3gJBs5s$5vW" role="1B3o_S" />
       <node concept="3uibUv" id="3gJBs5s$5vY" role="1tU5fm">
-        <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+        <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
       </node>
     </node>
   </node>
@@ -11749,9 +11749,9 @@
                           <property role="TrG5h" value="doPrint" />
                           <property role="1EzhhJ" value="false" />
                           <node concept="37vLTG" id="6r6omRlcrc7" role="3clF46">
-                            <property role="TrG5h" value="atom" />
+                            <property role="TrG5h" value="tf" />
                             <node concept="3uibUv" id="6r6omRlcrc8" role="1tU5fm">
-                              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                           </node>
                           <node concept="17QB3L" id="6r6omRlcrc9" role="3clF45" />
@@ -11762,7 +11762,7 @@
                                 <ref role="37wK5l" node="5s497VqXK1B" resolve="prettyPrint" />
                                 <ref role="1Pybhc" node="5s497VqXwA7" resolve="PrettyPrinter" />
                                 <node concept="37vLTw" id="6r6omRld6tO" role="37wK5m">
-                                  <ref role="3cqZAo" node="6r6omRlcrc7" resolve="atom" />
+                                  <ref role="3cqZAo" node="6r6omRlcrc7" resolve="tf" />
                                 </node>
                                 <node concept="3cmrfG" id="6r6omRld6yn" role="37wK5m">
                                   <property role="3cmrfH" value="0" />
@@ -11888,7 +11888,7 @@
       <node concept="37vLTG" id="6r6omRlcouK" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="6r6omRlcouL" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="17QB3L" id="6r6omRlcpy3" role="3clF45" />
@@ -11922,7 +11922,7 @@
       <node concept="37vLTG" id="4peSo3CLb7u" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="4peSo3CLb7v" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="17QB3L" id="6r6omRlcoY5" role="3clF45" />
@@ -11942,9 +11942,9 @@
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="canMap" />
         <node concept="37vLTG" id="6HT7BWBOcP5" role="3clF46">
-          <property role="TrG5h" value="atom" />
+          <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBOfNy" role="1tU5fm">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="10P_77" id="6HT7BWBOc_Y" role="3clF45" />
@@ -11955,21 +11955,21 @@
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="map" />
         <node concept="37vLTG" id="3OPtF037E1D" role="3clF46">
-          <property role="TrG5h" value="atom" />
+          <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBOfXe" role="1tU5fm">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="37vLTG" id="3OPtF037G3a" role="3clF46">
           <property role="TrG5h" value="fallback" />
           <node concept="3uibUv" id="3OPtF037G8i" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+            <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="3OPtF037E1F" role="1B3o_S" />
         <node concept="3clFbS" id="3OPtF037E1G" role="3clF47" />
         <node concept="3uibUv" id="5s497VqzFLM" role="3clF45">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3OPtF031GQf" role="1B3o_S" />
@@ -11984,14 +11984,14 @@
         </node>
       </node>
       <node concept="3uibUv" id="5s497Vq$6sF" role="3clF45">
-        <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+        <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
       </node>
       <node concept="3Tm1VV" id="5s497VqteR9" role="1B3o_S" />
       <node concept="3clFbS" id="5s497VqteRa" role="3clF47">
         <node concept="3clFbF" id="5s497Vqtqbd" role="3cqZAp">
           <node concept="2ShNRf" id="5s497Vqtqbb" role="3clFbG">
             <node concept="1pGfFk" id="5s497VqtqE8" role="2ShVmc">
-              <ref role="37wK5l" node="5s497VqqLbx" resolve="Mappers.AtomMapper" />
+              <ref role="37wK5l" node="5s497VqqLbx" resolve="Mappers.TreeFormMapper" />
               <node concept="37vLTw" id="5s497VqtqM2" role="37wK5m">
                 <ref role="3cqZAo" node="5s497VqtgPx" resolve="delegate" />
               </node>
@@ -12003,7 +12003,7 @@
     <node concept="2tJIrI" id="5s497VqtbE$" role="jymVt" />
     <node concept="312cEu" id="5s497VqqJkg" role="jymVt">
       <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="AtomMapper" />
+      <property role="TrG5h" value="TreeFormMapper" />
       <node concept="2tJIrI" id="5s497VqqL8s" role="jymVt" />
       <node concept="3clFbW" id="5s497VqqLbx" role="jymVt">
         <node concept="37vLTG" id="5s497Vqr3WN" role="3clF46">
@@ -12037,18 +12037,18 @@
         <node concept="37vLTG" id="5s497VqDhXa" role="3clF46">
           <property role="TrG5h" value="tp" />
           <node concept="3uibUv" id="5s497VqDhXb" role="1tU5fm">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="3Tm1VV" id="5s497VqDhXd" role="1B3o_S" />
         <node concept="3uibUv" id="5s497VqDhXf" role="3clF45">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3clFbS" id="5s497VqDhXh" role="3clF47">
           <node concept="3cpWs6" id="5s497VquB$d" role="3cqZAp">
             <node concept="10QFUN" id="6HT7BWBO8S2" role="3cqZAk">
               <node concept="3uibUv" id="6HT7BWBO8RX" role="10QFUM">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBO8RY" role="10QFUP">
                 <node concept="37vLTw" id="6HT7BWBO8RZ" role="2Oq$k0">
@@ -12077,7 +12077,7 @@
         <node concept="37vLTG" id="5s497VqraRx" role="3clF46">
           <property role="TrG5h" value="terms" />
           <node concept="3uibUv" id="5s497VqraRy" role="1tU5fm">
-            <ref role="3uigEE" node="5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="3uigEE" node="5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="5s497VqraRB" role="3clF47">
@@ -12105,7 +12105,7 @@
         <node concept="37vLTG" id="5s497VqraS2" role="3clF46">
           <property role="TrG5h" value="list" />
           <node concept="3uibUv" id="5s497VqraS3" role="1tU5fm">
-            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListFunc" />
+            <ref role="3uigEE" node="3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
         <node concept="3clFbS" id="5s497VqraS8" role="3clF47">
@@ -12129,7 +12129,7 @@
         <node concept="37vLTG" id="5s497VqraRF" role="3clF46">
           <property role="TrG5h" value="values" />
           <node concept="3uibUv" id="5s497VqraRG" role="1tU5fm">
-            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueFunc" />
+            <ref role="3uigEE" node="1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5s497VqraRH" role="11_B2D">
               <ref role="16sUi3" node="5s497VqraRL" resolve="V" />
             </node>
@@ -12197,7 +12197,7 @@
         <node concept="37vLTG" id="5s497VqraRQ" role="3clF46">
           <property role="TrG5h" value="variables" />
           <node concept="3uibUv" id="5s497VqraRR" role="1tU5fm">
-            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableFunc" />
+            <ref role="3uigEE" node="uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
         <node concept="3uibUv" id="5s497VqraRS" role="3clF45">
@@ -12258,9 +12258,9 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
         <node concept="37vLTG" id="6HT7BWBOiW5" role="3clF46">
-          <property role="TrG5h" value="atom" />
+          <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBOkDZ" role="1tU5fm">
-            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="3clFbS" id="6HT7BWBOiVL" role="3clF47">
@@ -12274,7 +12274,7 @@
                   <node concept="liA8E" id="6HT7BWBOiVR" role="2OqNvi">
                     <ref role="37wK5l" node="3OPtF037E1C" resolve="map" />
                     <node concept="37vLTw" id="6HT7BWBOiW8" role="37wK5m">
-                      <ref role="3cqZAo" node="6HT7BWBOiW5" resolve="atom" />
+                      <ref role="3cqZAo" node="6HT7BWBOiW5" resolve="tf" />
                     </node>
                     <node concept="Xjq3P" id="6HT7BWBOiVT" role="37wK5m" />
                   </node>
@@ -12289,7 +12289,7 @@
               <node concept="liA8E" id="6HT7BWBOiVW" role="2OqNvi">
                 <ref role="37wK5l" node="6HT7BWBOcmA" resolve="canMap" />
                 <node concept="37vLTw" id="6HT7BWBOiW9" role="37wK5m">
-                  <ref role="3cqZAo" node="6HT7BWBOiW5" resolve="atom" />
+                  <ref role="3cqZAo" node="6HT7BWBOiW5" resolve="tf" />
                 </node>
               </node>
             </node>
@@ -12297,7 +12297,7 @@
               <node concept="3clFbS" id="6HT7BWBOiVZ" role="9aQI4">
                 <node concept="3cpWs6" id="6HT7BWBOiW0" role="3cqZAp">
                   <node concept="37vLTw" id="6HT7BWBOiW7" role="3cqZAk">
-                    <ref role="3cqZAo" node="6HT7BWBOiW5" resolve="atom" />
+                    <ref role="3cqZAo" node="6HT7BWBOiW5" resolve="tf" />
                   </node>
                 </node>
               </node>
@@ -12308,10 +12308,10 @@
       <node concept="2tJIrI" id="6HT7BWBOksZ" role="jymVt" />
       <node concept="3Tm6S6" id="5s497VqtaGv" role="1B3o_S" />
       <node concept="3uibUv" id="5s497VqqKLX" role="EKbjA">
-        <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+        <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
       </node>
       <node concept="3uibUv" id="5s497VqqKYG" role="EKbjA">
-        <ref role="3uigEE" node="104EUzFOARB" resolve="Atom.Visitor" />
+        <ref role="3uigEE" node="104EUzFOARB" resolve="TreeForm.Visitor" />
       </node>
       <node concept="312cEg" id="5s497VqrarK" role="jymVt">
         <property role="TrG5h" value="delegate" />
@@ -12325,7 +12325,7 @@
     <node concept="3Tm1VV" id="3OPtF02T8yy" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="6HT7BWBOXme">
-    <property role="TrG5h" value="AtomUtil" />
+    <property role="TrG5h" value="TreeFormUtil" />
     <node concept="2tJIrI" id="1jo82tq2GcC" role="jymVt" />
     <node concept="2YIFZL" id="6HT7BWBOXr$" role="jymVt">
       <property role="TrG5h" value="ground" />
@@ -12333,9 +12333,9 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="37vLTG" id="6HT7BWBOXuV" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="6HT7BWBOXvt" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="6HT7BWBOXna" role="3clF47">
@@ -12347,14 +12347,14 @@
             <node concept="liA8E" id="6HT7BWBPbjK" role="2OqNvi">
               <ref role="37wK5l" node="3OPtF02TgQt" resolve="map" />
               <node concept="37vLTw" id="6HT7BWBPbkG" role="37wK5m">
-                <ref role="3cqZAo" node="6HT7BWBOXuV" resolve="atom" />
+                <ref role="3cqZAo" node="6HT7BWBOXuV" resolve="tf" />
               </node>
             </node>
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="6HT7BWBOXnN" role="3clF45">
-        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="6HT7BWBOXn9" role="1B3o_S" />
     </node>
@@ -12378,9 +12378,9 @@
               <property role="1EzhhJ" value="false" />
               <property role="TrG5h" value="canMap" />
               <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
-                <property role="TrG5h" value="atom" />
+                <property role="TrG5h" value="tf" />
                 <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
@@ -12401,7 +12401,7 @@
                               <ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
                             </node>
                             <node concept="37vLTw" id="4sSe4$pxm8E" role="10QFUP">
-                              <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="atom" />
+                              <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                             </node>
                           </node>
                         </node>
@@ -12420,7 +12420,7 @@
                       <ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
                     </node>
                     <node concept="37vLTw" id="4sSe4$pxkXa" role="2ZW6bz">
-                      <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="atom" />
+                      <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                     </node>
                   </node>
                 </node>
@@ -12436,20 +12436,20 @@
               <property role="1EzhhJ" value="false" />
               <property role="TrG5h" value="map" />
               <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
-                <property role="TrG5h" value="atom" />
+                <property role="TrG5h" value="tf" />
                 <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
                 <property role="TrG5h" value="fallback" />
                 <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
-                  <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+                  <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
                 </node>
               </node>
               <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
               <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
                 <node concept="3clFbJ" id="4sSe4$pxtYI" role="3cqZAp">
@@ -12463,19 +12463,19 @@
                       <node concept="3cpWsn" id="6HT7BWBRA2x" role="3cpWs9">
                         <property role="TrG5h" value="val" />
                         <node concept="3uibUv" id="6HT7BWBRA2u" role="1tU5fm">
-                          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="10QFUN" id="6HT7BWBRA2y" role="33vP2m">
                           <node concept="2OqwBi" id="6HT7BWBRA2z" role="10QFUP">
                             <node concept="37vLTw" id="6HT7BWBRA2$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                              <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                             </node>
                             <node concept="liA8E" id="6HT7BWBRA2_" role="2OqNvi">
                               <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
                             </node>
                           </node>
                           <node concept="3uibUv" id="6HT7BWBRA2A" role="10QFUM">
-                            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" node="1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                       </node>
@@ -12500,7 +12500,7 @@
                       <ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
                     </node>
                     <node concept="37vLTw" id="4sSe4$pxub8" role="2ZW6bz">
-                      <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                      <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                     </node>
                   </node>
                   <node concept="9aQIb" id="4sSe4$pxw$3" role="9aQIa">
@@ -12508,7 +12508,7 @@
                       <node concept="3cpWs6" id="4sSe4$pxwZo" role="3cqZAp">
                         <node concept="2OqwBi" id="4sSe4$px$xJ" role="3cqZAk">
                           <node concept="37vLTw" id="4sSe4$px$l6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                            <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                           </node>
                           <node concept="liA8E" id="4sSe4$px$Jr" role="2OqNvi">
                             <ref role="37wK5l" node="3OPtF02Tjpr" resolve="mapRecursively" />
@@ -12533,7 +12533,7 @@
       <property role="TrG5h" value="GROUND_MAPPER" />
       <node concept="3Tm6S6" id="1jo82tq2G6J" role="1B3o_S" />
       <node concept="3uibUv" id="1jo82tq2G6K" role="1tU5fm">
-        <ref role="3uigEE" node="3OPtF02TdNT" resolve="Atom.Mapper" />
+        <ref role="3uigEE" node="3OPtF02TdNT" resolve="TreeForm.Mapper" />
       </node>
       <node concept="2YIFZM" id="1jo82tq2G6L" role="33vP2m">
         <ref role="37wK5l" node="5s497VqteR6" resolve="mapper" />
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index 7824399d..0c2cdc11 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -198,12 +198,12 @@
     </language>
   </registry>
   <node concept="3s_ewN" id="2ev$9JFBIYd">
-    <property role="3s_ewP" value="AtomWalk" />
+    <property role="3s_ewP" value="TreeFormWalk" />
     <node concept="2tJIrI" id="2ev$9JFEDVF" role="jymVt" />
     <node concept="3clFb_" id="2ev$9JFEJ94" role="jymVt">
       <property role="TrG5h" value="anyValues" />
       <node concept="3uibUv" id="2ev$9JFEJ95" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="2ev$9JFEJ96" role="11_B2D">
           <ref role="16sUi3" node="2ev$9JFEJ9e" resolve="T" />
         </node>
@@ -213,7 +213,7 @@
         <node concept="3clFbF" id="2ev$9JFEJ99" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEJ9a" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEJ9b" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
               <node concept="16syzq" id="2ev$9JFEJ9c" role="11_B2D">
                 <ref role="16sUi3" node="2ev$9JFEJ9e" resolve="T" />
               </node>
@@ -263,14 +263,14 @@
     <node concept="3clFb_" id="2ev$9JFEEfC" role="jymVt">
       <property role="TrG5h" value="anyTerms" />
       <node concept="3uibUv" id="2ev$9JFEFFy" role="3clF45">
-        <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+        <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
       </node>
       <node concept="3Tm1VV" id="2ev$9JFEEfF" role="1B3o_S" />
       <node concept="3clFbS" id="2ev$9JFEEfG" role="3clF47">
         <node concept="3clFbF" id="2ev$9JFEGHn" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEGHp" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEGHq" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+              <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
             </node>
             <node concept="2YIFZM" id="2ev$9JFEGHr" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
@@ -284,14 +284,14 @@
     <node concept="3clFb_" id="2ev$9JFEHV1" role="jymVt">
       <property role="TrG5h" value="anyList" />
       <node concept="3uibUv" id="2ev$9JFEHV2" role="3clF45">
-        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="2ev$9JFEHV4" role="1B3o_S" />
       <node concept="3clFbS" id="2ev$9JFEHV5" role="3clF47">
         <node concept="3clFbF" id="2ev$9JFEHV6" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEHV7" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEHV8" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="2YIFZM" id="2ev$9JFEHVa" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
@@ -303,10 +303,10 @@
     </node>
     <node concept="2tJIrI" id="2ev$9JFEZB_" role="jymVt" />
     <node concept="3clFb_" id="2ev$9JFF0nO" role="jymVt">
-      <property role="TrG5h" value="anyAtomArray" />
+      <property role="TrG5h" value="anyTreeFormArray" />
       <node concept="10Q1$e" id="2ev$9JFF0S3" role="3clF45">
         <node concept="3uibUv" id="2ev$9JFF0R$" role="10Q1$1">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2ev$9JFF0nR" role="1B3o_S" />
@@ -315,7 +315,7 @@
           <node concept="10QFUN" id="2ev$9JFF1GW" role="3clFbG">
             <node concept="10Q1$e" id="2ev$9JFF1GX" role="10QFUM">
               <node concept="3uibUv" id="2ev$9JFF1GY" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2YIFZM" id="2ev$9JFF1GZ" role="10QFUP">
@@ -328,12 +328,12 @@
     </node>
     <node concept="2tJIrI" id="5YVX0wIlgwQ" role="jymVt" />
     <node concept="3clFb_" id="5YVX0wIlg09" role="jymVt">
-      <property role="TrG5h" value="anyAtomList" />
+      <property role="TrG5h" value="anyTreeFormList" />
       <node concept="3uibUv" id="5YVX0wIlh32" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3qUE_q" id="5YVX0wIlh5r" role="11_B2D">
           <node concept="3uibUv" id="5YVX0wIlh7_" role="3qUE_r">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -349,7 +349,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="5YVX0wIlhe6" role="11_B2D">
                 <node concept="3uibUv" id="5YVX0wIlhe7" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -414,7 +414,7 @@
       <node concept="16euLQ" id="6MYr6Jxs5Fh" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6MYr6Jxs631" role="3ztrMU">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -424,18 +424,18 @@
       <node concept="37vLTG" id="5YVX0wIlmGv" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="5YVX0wIlmGw" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="5YVX0wIlo0b" role="3clF45">
-        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="5YVX0wIlmGy" role="1B3o_S" />
       <node concept="3clFbS" id="5YVX0wIlmGz" role="3clF47">
         <node concept="3clFbF" id="5YVX0wIlmG$" role="3cqZAp">
           <node concept="10QFUN" id="5YVX0wIlmG_" role="3clFbG">
             <node concept="3uibUv" id="5YVX0wIlo0W" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="2YIFZM" id="5YVX0wIlmGB" role="10QFUP">
               <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
@@ -454,11 +454,11 @@
       <node concept="37vLTG" id="2ev$9JFFaOy" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="2ev$9JFFaOz" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="2ev$9JFFaO_" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+        <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="2ev$9JFFaOA" role="11_B2D">
           <ref role="16sUi3" node="2ev$9JFFaOJ" resolve="T" />
         </node>
@@ -468,7 +468,7 @@
         <node concept="3clFbF" id="2ev$9JFFaOD" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFFaOE" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFFaOF" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
               <node concept="16syzq" id="2ev$9JFFaOG" role="11_B2D">
                 <ref role="16sUi3" node="2ev$9JFFaOJ" resolve="T" />
               </node>
@@ -496,9 +496,9 @@
         <node concept="3clFbS" id="2ev$9JFBKEc" role="3clF47">
           <node concept="3cpWs8" id="2ev$9JFBKEw" role="3cqZAp">
             <node concept="3cpWsn" id="2ev$9JFBKEx" role="3cpWs9">
-              <property role="TrG5h" value="atom" />
+              <property role="TrG5h" value="tf" />
               <node concept="3uibUv" id="2ev$9JFBKEy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFBKEz" role="33vP2m">
                 <node concept="1oi5UN" id="2ev$9JFBKE$" role="1oi0x0" />
@@ -510,13 +510,13 @@
             <node concept="3cpWsn" id="2ev$9JFBNlS" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="2ev$9JFBNlQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFBNlT" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFBNlU" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -552,7 +552,7 @@
             <node concept="2OqwBi" id="2ev$9JFBL8Z" role="3clFbG">
               <node concept="2ShNRf" id="2ev$9JFCM5m" role="2Oq$k0">
                 <node concept="1pGfFk" id="2ev$9JFCM5n" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="2ev$9JFCM5o" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
                   </node>
@@ -561,7 +561,7 @@
               <node concept="liA8E" id="2ev$9JFBLg6" role="2OqNvi">
                 <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFBLgX" role="37wK5m">
-                  <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="atom" />
+                  <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
                 </node>
               </node>
             </node>
@@ -580,13 +580,13 @@
                 <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="10QFUN" id="2ev$9JFDJDT" role="37wK5m">
                   <node concept="3uibUv" id="5cGCTtqzhLw" role="10QFUM">
-                    <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                    <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                   </node>
                   <node concept="2YIFZM" id="2ev$9JFDJDP" role="10QFUP">
                     <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                     <node concept="37vLTw" id="2ev$9JFDJDR" role="37wK5m">
-                      <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="atom" />
+                      <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
                     </node>
                   </node>
                 </node>
@@ -628,7 +628,7 @@
             <node concept="3cpWsn" id="2ev$9JFE0Mu" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="2ev$9JFE0Mv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFE10R" role="33vP2m">
                 <node concept="1oi5Wm" id="2ev$9JFE11a" role="1oi0x0">
@@ -642,13 +642,13 @@
           </node>
           <node concept="3cpWs8" id="2ev$9JFDTTY" role="3cqZAp">
             <node concept="3cpWsn" id="2ev$9JFDTTZ" role="3cpWs9">
-              <property role="TrG5h" value="atom" />
+              <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="6MYr6JxshWa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshYq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshYj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshYk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshYl" role="1oi0x0">
@@ -673,13 +673,13 @@
             <node concept="3cpWsn" id="2ev$9JFDVC6" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="2ev$9JFDVC7" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFDVC8" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFDVC9" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -741,7 +741,7 @@
             <node concept="2OqwBi" id="2ev$9JFDVCq" role="3clFbG">
               <node concept="2ShNRf" id="2ev$9JFDVCr" role="2Oq$k0">
                 <node concept="1pGfFk" id="2ev$9JFDVCs" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="2ev$9JFDVCt" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
                   </node>
@@ -750,7 +750,7 @@
               <node concept="liA8E" id="2ev$9JFDVCu" role="2OqNvi">
                 <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFDVCw" role="37wK5m">
-                  <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="atom" />
+                  <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="cn" />
                 </node>
               </node>
             </node>
@@ -770,7 +770,7 @@
                 <node concept="1rXfSq" id="2ev$9JFFcqm" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="2ev$9JFFcx8" role="37wK5m">
-                    <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="atom" />
+                    <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="cn" />
                   </node>
                 </node>
               </node>
@@ -847,7 +847,7 @@
             <node concept="3cpWsn" id="2ev$9JFFvPD" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="2ev$9JFFvPE" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFFwjN" role="33vP2m">
                 <node concept="1oi5Wm" id="2ev$9JFFwk6" role="1oi0x0">
@@ -863,11 +863,11 @@
             <node concept="3cpWsn" id="2ev$9JFFqmp" role="3cpWs9">
               <property role="TrG5h" value="child" />
               <node concept="3uibUv" id="6MYr6JxshSY" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshUH" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshUA" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshUB" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshUC" role="1oi0x0">
@@ -891,11 +891,11 @@
             <node concept="3cpWsn" id="2ev$9JFG2bt" role="3cpWs9">
               <property role="TrG5h" value="role" />
               <node concept="3uibUv" id="6MYr6JxshPC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshL0" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshRj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshKV" role="10QFUP">
                   <node concept="1oi5ST" id="6MYr6JxshKW" role="1oi0x0">
@@ -914,13 +914,13 @@
           </node>
           <node concept="3cpWs8" id="2ev$9JFFqmu" role="3cqZAp">
             <node concept="3cpWsn" id="2ev$9JFFqmv" role="3cpWs9">
-              <property role="TrG5h" value="atom" />
+              <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="6MYr6JxshwM" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshIN" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshIG" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshIH" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshII" role="1oi0x0">
@@ -944,13 +944,13 @@
             <node concept="3cpWsn" id="2ev$9JFFqmF" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="2ev$9JFFqmG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFFqmH" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFFqmI" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1012,7 +1012,7 @@
             <node concept="2OqwBi" id="2ev$9JFFqn5" role="3clFbG">
               <node concept="2ShNRf" id="2ev$9JFFqn6" role="2Oq$k0">
                 <node concept="1pGfFk" id="2ev$9JFFqn7" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="2ev$9JFFqn8" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
@@ -1021,7 +1021,7 @@
               <node concept="liA8E" id="2ev$9JFFqn9" role="2OqNvi">
                 <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFFqnb" role="37wK5m">
-                  <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="atom" />
+                  <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="cn" />
                 </node>
               </node>
             </node>
@@ -1041,7 +1041,7 @@
                 <node concept="1rXfSq" id="2ev$9JFFqnj" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="2ev$9JFFqnl" role="37wK5m">
-                    <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="atom" />
+                    <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="cn" />
                   </node>
                 </node>
               </node>
@@ -1182,13 +1182,13 @@
             <node concept="3cpWsn" id="6MYr6Jxs3nP" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="6MYr6Jxs3nQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="6MYr6Jxs3nR" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="6MYr6Jxs3nS" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1224,7 +1224,7 @@
             <node concept="2OqwBi" id="6MYr6Jxs3od" role="3clFbG">
               <node concept="2ShNRf" id="6MYr6Jxs3oe" role="2Oq$k0">
                 <node concept="1pGfFk" id="6MYr6Jxs3of" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="6MYr6Jxs3og" role="37wK5m">
                     <ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
                   </node>
@@ -1310,11 +1310,11 @@
             <node concept="3cpWsn" id="5YVX0wIjZEX" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6Jxsln8" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsloV" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsloO" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsloP" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsloQ" role="1oi0x0">
@@ -1339,11 +1339,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0aR" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6Jxslqr" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsluC" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxslux" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsluy" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsluz" role="1oi0x0">
@@ -1368,11 +1368,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0rD" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6Jxslwq" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jxslyd" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxsly6" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsly7" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsly8" role="1oi0x0">
@@ -1398,7 +1398,7 @@
             <node concept="3cpWsn" id="3t7_2FgLswv" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgLsww" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgLsIG" role="33vP2m">
                 <node concept="KCUsM" id="5YVX0wIlrxs" role="1oi0x0">
@@ -1472,7 +1472,7 @@
             <node concept="3cpWsn" id="7t5VLKGALW_" role="3cpWs9">
               <property role="TrG5h" value="toWalk" />
               <node concept="3uibUv" id="7t5VLKGALWA" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWB" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALWC" role="1oi0x0">
@@ -1494,13 +1494,13 @@
             <node concept="3cpWsn" id="5YVX0wIjRT4" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="5YVX0wIjRT5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="5YVX0wIjRT6" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="5YVX0wIjRT7" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1588,7 +1588,7 @@
             <node concept="2OqwBi" id="5YVX0wIjRTu" role="3clFbG">
               <node concept="2ShNRf" id="5YVX0wIjRTv" role="2Oq$k0">
                 <node concept="1pGfFk" id="5YVX0wIjRTw" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="5YVX0wIjRTx" role="37wK5m">
                     <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                   </node>
@@ -1737,11 +1737,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0sP" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6JxsnM$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnOq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnOj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnOk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnOl" role="1oi0x0">
@@ -1766,11 +1766,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0sY" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6JxsnQ0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnRQ" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnRJ" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnRK" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnRL" role="1oi0x0">
@@ -1795,11 +1795,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0t7" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6JxsnTt" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnVj" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnVc" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnVd" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnVe" role="1oi0x0">
@@ -1825,7 +1825,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_0vn" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2Fg_0vo" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_2r8" role="33vP2m">
                 <node concept="KCUsM" id="3t7_2Fg_2s4" role="1oi0x0">
@@ -1858,7 +1858,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_0xQ" role="3cpWs9">
               <property role="TrG5h" value="toWalk" />
               <node concept="3uibUv" id="3t7_2Fg_0xR" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_0xS" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2Fg_0xT" role="1oi0x0">
@@ -1879,13 +1879,13 @@
             <node concept="3cpWsn" id="3t7_2Fg_0Jn" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="3t7_2Fg_0Jo" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="3t7_2Fg_0Jp" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="3t7_2Fg_0Jq" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1973,7 +1973,7 @@
             <node concept="2OqwBi" id="3t7_2Fg_0Ui" role="3clFbG">
               <node concept="2ShNRf" id="3t7_2Fg_0Uj" role="2Oq$k0">
                 <node concept="1pGfFk" id="3t7_2Fg_0Uk" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="3t7_2Fg_0Ul" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2087,7 +2087,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_PE9" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="3t7_2Fg_PEa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_PFn" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2Fg_PFB" role="1oi0x0">
@@ -2111,7 +2111,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_PFW" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="3t7_2Fg_PFX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_PFY" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2Fg_PHa" role="1oi0x0">
@@ -2135,7 +2135,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_PIx" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="3t7_2Fg_PIy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_PIz" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2Fg_PK2" role="1oi0x0">
@@ -2160,7 +2160,7 @@
             <node concept="3cpWsn" id="7t5VLKGALTU" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="7t5VLKGALTV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALTW" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALU0" role="1oi0x0">
@@ -2198,7 +2198,7 @@
           <node concept="3clFbH" id="3t7_2Fg_PNe" role="3cqZAp" />
           <node concept="3cpWs8" id="5H6hZahmJ47" role="3cqZAp">
             <node concept="3cpWsn" id="5H6hZahmJ48" role="3cpWs9">
-              <property role="TrG5h" value="atoms" />
+              <property role="TrG5h" value="tfs" />
               <node concept="2OqwBi" id="5H6hZahmJ49" role="33vP2m">
                 <node concept="2YIFZM" id="5H6hZahmJ4a" role="2Oq$k0">
                   <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
@@ -2221,7 +2221,7 @@
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAfOL" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAfXo" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2232,7 +2232,7 @@
             <node concept="2ShNRf" id="3t7_2Fg_SdW" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2Fg_StU" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2Fg_S_c" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2Fg_SBC" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2Fg_PE9" resolve="first" />
@@ -2248,16 +2248,16 @@
             <node concept="2ShNRf" id="3t7_2FgA9lt" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgA9GV" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAhk3" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAhpW" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgAhpV" role="10QFUP">
-                    <ref role="3cqZAo" node="5H6hZahmJ48" resolve="atoms" />
+                    <ref role="3cqZAo" node="5H6hZahmJ48" resolve="tfs" />
                   </node>
                   <node concept="3uibUv" id="3t7_2FgAhwj" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAh_P" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2275,7 +2275,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk8E" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="3t7_2FgAk8F" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk8G" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAk8H" role="1oi0x0">
@@ -2299,7 +2299,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk8N" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="3t7_2FgAk8O" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk8P" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAk8Q" role="1oi0x0">
@@ -2323,7 +2323,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk8W" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="3t7_2FgAk8X" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk8Y" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAk8Z" role="1oi0x0">
@@ -2347,7 +2347,7 @@
             <node concept="3cpWsn" id="3t7_2FgAP_2" role="3cpWs9">
               <property role="TrG5h" value="fourth" />
               <node concept="3uibUv" id="3t7_2FgAP_3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAP_4" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAP_5" role="1oi0x0">
@@ -2372,7 +2372,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk96" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="3t7_2FgAk97" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk98" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgAk99" role="1oi0x0">
@@ -2402,17 +2402,17 @@
             <node concept="3cpWsn" id="3t7_2FgALMM" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="3t7_2FgALWp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2YIFZM" id="3t7_2FgALMN" role="33vP2m">
                 <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="3t7_2FgALMO" role="37wK5m">
                   <property role="Xl_RC" value="list" />
                 </node>
                 <node concept="2YIFZM" id="3t7_2FgALMP" role="37wK5m">
                   <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                  <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                   <node concept="37vLTw" id="3t7_2FgALMS" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2FgAk8W" resolve="third" />
                   </node>
@@ -2426,7 +2426,7 @@
           <node concept="3clFbH" id="3t7_2FgAk9l" role="3cqZAp" />
           <node concept="3cpWs8" id="3t7_2FgAk9m" role="3cqZAp">
             <node concept="3cpWsn" id="3t7_2FgAk9n" role="3cpWs9">
-              <property role="TrG5h" value="atoms1" />
+              <property role="TrG5h" value="tfs1" />
               <node concept="2OqwBi" id="3t7_2FgAk9o" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAk9p" role="2Oq$k0">
                   <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
@@ -2446,7 +2446,7 @@
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAk9v" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAk9w" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2454,7 +2454,7 @@
           </node>
           <node concept="3cpWs8" id="3t7_2FgAMoz" role="3cqZAp">
             <node concept="3cpWsn" id="3t7_2FgAMo$" role="3cpWs9">
-              <property role="TrG5h" value="atoms2" />
+              <property role="TrG5h" value="tfs2" />
               <node concept="2OqwBi" id="3t7_2FgAMo_" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAMoA" role="2Oq$k0">
                   <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
@@ -2474,7 +2474,7 @@
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAMoF" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAMoG" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2485,7 +2485,7 @@
             <node concept="2ShNRf" id="3t7_2FgAk9z" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgAk9$" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAk9_" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgAk9A" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAk8E" resolve="first" />
@@ -2498,16 +2498,16 @@
             <node concept="2ShNRf" id="3t7_2FgAk9D" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgAk9E" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAk9F" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAk9G" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgAk9H" role="10QFUP">
-                    <ref role="3cqZAo" node="3t7_2FgAk9n" resolve="atoms1" />
+                    <ref role="3cqZAo" node="3t7_2FgAk9n" resolve="tfs1" />
                   </node>
                   <node concept="3uibUv" id="3t7_2FgAk9I" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAk9J" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2518,7 +2518,7 @@
             <node concept="2ShNRf" id="3t7_2FgAMFp" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgAMFq" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAMFr" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgAMFu" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAk8W" resolve="third" />
@@ -2531,16 +2531,16 @@
             <node concept="2ShNRf" id="3t7_2FgAMFv" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgAMFw" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAMFx" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAMFy" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgAMUw" role="10QFUP">
-                    <ref role="3cqZAo" node="3t7_2FgAMo$" resolve="atoms2" />
+                    <ref role="3cqZAo" node="3t7_2FgAMo$" resolve="tfs2" />
                   </node>
                   <node concept="3uibUv" id="3t7_2FgAMF$" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAMF_" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2558,7 +2558,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvG9" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="3t7_2FgAvGa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGb" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAvGc" role="1oi0x0">
@@ -2582,7 +2582,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvGi" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="3t7_2FgAvGj" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGk" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAvGl" role="1oi0x0">
@@ -2606,7 +2606,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvGr" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="3t7_2FgAvGs" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGt" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAvGu" role="1oi0x0">
@@ -2630,7 +2630,7 @@
             <node concept="3cpWsn" id="3t7_2FgACZ0" role="3cpWs9">
               <property role="TrG5h" value="fourth" />
               <node concept="3uibUv" id="3t7_2FgACZ1" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgACZ2" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgACZ3" role="1oi0x0">
@@ -2655,7 +2655,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvG_" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgAvGA" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGB" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgAvGC" role="1oi0x0">
@@ -2727,7 +2727,7 @@
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAvGW" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAvGX" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2735,7 +2735,7 @@
           </node>
           <node concept="3cpWs8" id="3t7_2FgAwUK" role="3cqZAp">
             <node concept="3cpWsn" id="3t7_2FgAwUL" role="3cpWs9">
-              <property role="TrG5h" value="atoms1" />
+              <property role="TrG5h" value="tfs1" />
               <node concept="2OqwBi" id="3t7_2FgAwUM" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAwUN" role="2Oq$k0">
                   <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
@@ -2763,7 +2763,7 @@
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAwUT" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAwUU" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2771,7 +2771,7 @@
           </node>
           <node concept="3cpWs8" id="3t7_2FgA$lI" role="3cqZAp">
             <node concept="3cpWsn" id="3t7_2FgA$lJ" role="3cpWs9">
-              <property role="TrG5h" value="atoms2" />
+              <property role="TrG5h" value="tfs2" />
               <node concept="2OqwBi" id="3t7_2FgA$lK" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgA$lL" role="2Oq$k0">
                   <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
@@ -2799,7 +2799,7 @@
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgA$lT" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgA$lU" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2810,7 +2810,7 @@
             <node concept="2ShNRf" id="3t7_2FgAvH0" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgAvH1" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAvH2" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgAvH3" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAvG9" resolve="first" />
@@ -2823,16 +2823,16 @@
             <node concept="2ShNRf" id="3t7_2FgAvH6" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgAvH7" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAvH8" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAvH9" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgA_c2" role="10QFUP">
-                    <ref role="3cqZAo" node="3t7_2FgAwUL" resolve="atoms1" />
+                    <ref role="3cqZAo" node="3t7_2FgAwUL" resolve="tfs1" />
                   </node>
                   <node concept="3uibUv" id="3t7_2FgAvHb" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAvHc" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2843,7 +2843,7 @@
             <node concept="2ShNRf" id="3t7_2FgA$R8" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgA$R9" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgA$Ra" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgADjE" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAvGr" resolve="third" />
@@ -2856,16 +2856,16 @@
             <node concept="2ShNRf" id="3t7_2FgA$Re" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgA$Rf" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgA$Rg" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgA$Rh" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgA_gU" role="10QFUP">
-                    <ref role="3cqZAo" node="3t7_2FgA$lJ" resolve="atoms2" />
+                    <ref role="3cqZAo" node="3t7_2FgA$lJ" resolve="tfs2" />
                   </node>
                   <node concept="3uibUv" id="3t7_2FgA$Rj" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgA$Rk" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2880,7 +2880,7 @@
     <property role="3s_ewP" value="LogicalEquals" />
     <node concept="2tJIrI" id="2DKqMqOqk7b" role="jymVt" />
     <node concept="3clFb_" id="2DKqMqOqk7k" role="jymVt">
-      <property role="TrG5h" value="atomLogicalAnon" />
+      <property role="TrG5h" value="treeFormLogicalAnon" />
       <node concept="37vLTG" id="2DKqMqOqLKG" role="3clF46">
         <property role="TrG5h" value="wildcard" />
         <node concept="10P_77" id="2DKqMqOqLTM" role="1tU5fm" />
@@ -2888,7 +2888,7 @@
       <node concept="3uibUv" id="2DKqMqOqkb3" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOquKp" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOqk7n" role="1B3o_S" />
@@ -2899,12 +2899,12 @@
               <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
               <node concept="10QFUN" id="6yEjedm5h65" role="37wK5m">
                 <node concept="3uibUv" id="6yEjedm5hgr" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10Nm6u" id="6yEjedm5h64" role="10QFUP" />
               </node>
               <node concept="3uibUv" id="6yEjedm5cAk" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -2913,21 +2913,21 @@
     </node>
     <node concept="2tJIrI" id="7FFmDVAP6gh" role="jymVt" />
     <node concept="3clFb_" id="2DKqMqOq_Pz" role="jymVt">
-      <property role="TrG5h" value="atomLogical" />
+      <property role="TrG5h" value="treeFormLogical" />
       <node concept="37vLTG" id="2DKqMqOq_P$" role="3clF46">
         <property role="TrG5h" value="name" />
         <node concept="17QB3L" id="2DKqMqOq_P_" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="2DKqMqOq_PA" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="2DKqMqOq_PB" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="2DKqMqOq_PE" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOq_PF" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOq_PG" role="1B3o_S" />
@@ -2940,10 +2940,10 @@
                 <ref role="3cqZAo" node="2DKqMqOq_P$" resolve="name" />
               </node>
               <node concept="37vLTw" id="6yEjedm5dC2" role="37wK5m">
-                <ref role="3cqZAo" node="2DKqMqOq_PA" resolve="atom" />
+                <ref role="3cqZAo" node="2DKqMqOq_PA" resolve="tf" />
               </node>
               <node concept="3uibUv" id="6yEjedm5dei" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -2964,11 +2964,11 @@
               <node concept="3uibUv" id="2DKqMqOqvLI" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqvLL" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqvLR" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="atomLogicalAnon" />
+                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="treeFormLogicalAnon" />
                 <node concept="3clFbT" id="2DKqMqOqMAj" role="37wK5m">
                   <property role="3clFbU" value="true" />
                 </node>
@@ -2981,11 +2981,11 @@
               <node concept="3uibUv" id="2DKqMqOqw8y" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqw8_" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqw8N" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="atomLogicalAnon" />
+                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="treeFormLogicalAnon" />
                 <node concept="3clFbT" id="2DKqMqOqMBC" role="37wK5m">
                   <property role="3clFbU" value="false" />
                 </node>
@@ -2998,11 +2998,11 @@
               <node concept="3uibUv" id="2DKqMqOqzLb" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqzLc" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqzLd" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="atomLogicalAnon" />
+                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="treeFormLogicalAnon" />
                 <node concept="3clFbT" id="2DKqMqOqMDm" role="37wK5m">
                   <property role="3clFbU" value="false" />
                 </node>
@@ -3059,7 +3059,7 @@
         </node>
       </node>
       <node concept="3s$Bmu" id="2DKqMqOq_vg" role="3s_gse">
-        <property role="3s$Bm0" value="atoms" />
+        <property role="3s$Bm0" value="treeForms" />
         <node concept="3cqZAl" id="2DKqMqOq_vi" role="3clF45" />
         <node concept="3Tm1VV" id="2DKqMqOq_vk" role="1B3o_S" />
         <node concept="3clFbS" id="2DKqMqOq_vl" role="3clF47">
@@ -3069,11 +3069,11 @@
               <node concept="3uibUv" id="2DKqMqOqEKD" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEKG" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqEKL" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOq_Pz" resolve="atomLogical" />
+                <ref role="37wK5l" node="2DKqMqOq_Pz" resolve="treeFormLogical" />
                 <node concept="Xl_RD" id="2DKqMqOqEKM" role="37wK5m">
                   <property role="Xl_RC" value="A" />
                 </node>
@@ -3093,11 +3093,11 @@
               <node concept="3uibUv" id="2DKqMqOqEOa" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEOb" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqEOc" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOq_Pz" resolve="atomLogical" />
+                <ref role="37wK5l" node="2DKqMqOq_Pz" resolve="treeFormLogical" />
                 <node concept="Xl_RD" id="2DKqMqOqEOd" role="37wK5m">
                   <property role="Xl_RC" value="B" />
                 </node>
@@ -3117,11 +3117,11 @@
               <node concept="3uibUv" id="2DKqMqOqFhf" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqFhg" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqFhh" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOq_Pz" resolve="atomLogical" />
+                <ref role="37wK5l" node="2DKqMqOq_Pz" resolve="treeFormLogical" />
                 <node concept="Xl_RD" id="2DKqMqOqFhi" role="37wK5m">
                   <property role="Xl_RC" value="C" />
                 </node>
@@ -3144,11 +3144,11 @@
               <node concept="3uibUv" id="5kEUewdxWdZ" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdxWe2" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="5kEUewdxWe6" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="atomLogicalAnon" />
+                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="treeFormLogicalAnon" />
                 <node concept="3clFbT" id="5kEUewdxWe7" role="37wK5m">
                   <property role="3clFbU" value="false" />
                 </node>
@@ -3161,11 +3161,11 @@
               <node concept="3uibUv" id="5kEUewdy0lV" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdy0lW" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="5kEUewdy0lX" role="33vP2m">
-                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="atomLogicalAnon" />
+                <ref role="37wK5l" node="2DKqMqOqk7k" resolve="treeFormLogicalAnon" />
                 <node concept="3clFbT" id="5kEUewdy0lY" role="37wK5m">
                   <property role="3clFbU" value="false" />
                 </node>
@@ -3336,15 +3336,15 @@
     <node concept="3clFb_" id="6yEjedm6G_P" role="jymVt">
       <property role="TrG5h" value="logical" />
       <node concept="37vLTG" id="6yEjedm6GJE" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="6yEjedm6GNi" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="6yEjedm6GEk" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm6GEG" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="6yEjedm6GE4" role="1B3o_S" />
@@ -3354,7 +3354,7 @@
             <node concept="1pGfFk" id="6yEjedm6H80" role="2ShVmc">
               <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
               <node concept="37vLTw" id="6yEjedm6Ha_" role="37wK5m">
-                <ref role="3cqZAo" node="6yEjedm6GJE" resolve="atom" />
+                <ref role="3cqZAo" node="6yEjedm6GJE" resolve="tf" />
               </node>
             </node>
           </node>
@@ -3375,7 +3375,7 @@
               <node concept="3uibUv" id="6yEjedm6PY7" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6PYa" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6PYd" role="33vP2m">
@@ -3398,7 +3398,7 @@
             <node concept="3cpWsn" id="dfChU1g_c$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1g_cy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1g_c_" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1g_d$" role="1oi0x0">
@@ -3422,7 +3422,7 @@
             <node concept="3cpWsn" id="dfChU1g_fG" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1g_fH" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1g_fI" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1g_fJ" role="1oi0x0">
@@ -3444,7 +3444,7 @@
           <node concept="3vlDli" id="dfChU1g_hx" role="3cqZAp">
             <node concept="2YIFZM" id="6HT7BWBPqFA" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPqG2" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1g_fG" resolve="b" />
               </node>
@@ -3467,7 +3467,7 @@
               <node concept="3uibUv" id="6yEjedm6Hob" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Hoe" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6Hoh" role="33vP2m">
@@ -3492,7 +3492,7 @@
               <node concept="3uibUv" id="6yEjedm6QBT" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6QBW" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6QC4" role="33vP2m">
@@ -3525,7 +3525,7 @@
             <node concept="3cpWsn" id="1jo82tq3J3P" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1jo82tq3J3Q" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1jo82tq3J3R" role="33vP2m">
                 <node concept="1oi5UN" id="1jo82tq3J3S" role="1oi0x0">
@@ -3566,7 +3566,7 @@
             <node concept="3cpWsn" id="1jo82tq3J3Z" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1jo82tq3J40" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1jo82tq3J41" role="33vP2m">
                 <node concept="1oi5UN" id="1jo82tq3J42" role="1oi0x0">
@@ -3594,7 +3594,7 @@
           <node concept="3vlDli" id="1jo82tq3J48" role="3cqZAp">
             <node concept="2YIFZM" id="1jo82tq3J49" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="1jo82tq3J4a" role="37wK5m">
                 <ref role="3cqZAo" node="1jo82tq3J3Z" resolve="b" />
               </node>
@@ -3617,7 +3617,7 @@
               <node concept="3uibUv" id="6yEjedm6IgL" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6IgO" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6IgS" role="33vP2m">
@@ -3640,7 +3640,7 @@
             <node concept="3cpWsn" id="1OShD0HAz3X" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HAz3Y" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HAz3Z" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HAz40" role="1oi0x0">
@@ -3674,7 +3674,7 @@
             <node concept="3cpWsn" id="1OShD0HAz47" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HAz48" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HAz49" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HAz4a" role="1oi0x0">
@@ -3709,7 +3709,7 @@
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrIq" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrIr" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0HAz47" resolve="b" />
               </node>
@@ -3729,7 +3729,7 @@
               <node concept="3uibUv" id="6yEjedm6JaG" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JaJ" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6JaN" role="33vP2m">
@@ -3762,7 +3762,7 @@
             <node concept="3cpWsn" id="1OShD0HRNoP" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HRNoQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HRNoR" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HRNoS" role="1oi0x0">
@@ -3796,7 +3796,7 @@
             <node concept="3cpWsn" id="1OShD0HRNp2" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HRNp3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HRNp4" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HRNp5" role="1oi0x0">
@@ -3821,7 +3821,7 @@
             </node>
             <node concept="2YIFZM" id="6HT7BWBSfTf" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBSfTg" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0HRNp2" resolve="b" />
               </node>
@@ -3841,7 +3841,7 @@
               <node concept="3uibUv" id="6yEjedm6JUY" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JV1" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6JV4" role="33vP2m">
@@ -3857,7 +3857,7 @@
             <node concept="3cpWsn" id="1OShD0Ifj4$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ifj4_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ifj4A" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ifj4B" role="1oi0x0">
@@ -3874,7 +3874,7 @@
             <node concept="3cpWsn" id="1OShD0Ifj4M" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ifj4N" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ifj4O" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ifj4P" role="1oi0x0">
@@ -3899,7 +3899,7 @@
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJ8" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJ9" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0Ifj4M" resolve="b" />
               </node>
@@ -3919,7 +3919,7 @@
               <node concept="3uibUv" id="6yEjedm6Ktu" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Ktx" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6Kt_" role="33vP2m">
@@ -3939,7 +3939,7 @@
             <node concept="3cpWsn" id="dfChU1yMlk" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1yMll" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1yMlm" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1yMln" role="1oi0x0">
@@ -3964,7 +3964,7 @@
             <node concept="3cpWsn" id="dfChU1yMlu" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1yMlv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1yMlw" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1yMlx" role="1oi0x0">
@@ -3993,7 +3993,7 @@
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJv" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJw" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1yMlu" resolve="b" />
               </node>
@@ -4013,7 +4013,7 @@
               <node concept="3uibUv" id="6yEjedm6L2s" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6L2v" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6L2y" role="33vP2m">
@@ -4031,7 +4031,7 @@
             <node concept="3cpWsn" id="dfChU1DQLv" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1DQLw" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1DQLx" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1DQLy" role="1oi0x0">
@@ -4048,7 +4048,7 @@
             <node concept="3cpWsn" id="dfChU1DQLB" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1DQLC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1DQLD" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1DQLE" role="1oi0x0">
@@ -4071,7 +4071,7 @@
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJQ" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJR" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1DQLB" resolve="b" />
               </node>
@@ -4114,11 +4114,11 @@
             <node concept="3cpWsn" id="2S_ORi38Qgq" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="6MYr6Jy86h5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86gm" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86hI" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86gg" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86gh" role="1oi0x0">
@@ -4144,11 +4144,11 @@
             <node concept="3cpWsn" id="2S_ORi38Qg$" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="6MYr6Jy86in" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86js" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86jj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86jk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86jl" role="1oi0x0">
@@ -4180,7 +4180,7 @@
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrKd" role="3tpDZA">
               <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrKe" role="37wK5m">
                 <ref role="3cqZAo" node="2S_ORi38Qg$" resolve="b" />
               </node>
@@ -4191,7 +4191,7 @@
     </node>
   </node>
   <node concept="3s_ewN" id="1mP5b6jPiAZ">
-    <property role="3s_ewP" value="MatchAtom" />
+    <property role="3s_ewP" value="MatchTreeForm" />
     <node concept="3Tm1VV" id="1mP5b6jPiB0" role="1B3o_S" />
     <node concept="3s_gsd" id="1mP5b6jPiB1" role="3s_ewO">
       <node concept="3s$Bmu" id="1mP5b6jPr4u" role="3s_gse">
@@ -4204,7 +4204,7 @@
             <node concept="3cpWsn" id="1mP5b6jPriH" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jPriF" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jPriI" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jPriJ" role="1oi0x0" />
@@ -4216,7 +4216,7 @@
             <node concept="3cpWsn" id="1mP5b6jPrpZ" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jPrq0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jPrq1" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jPrq2" role="1oi0x0" />
@@ -4244,7 +4244,7 @@
             <node concept="3cpWsn" id="1mP5b6jQ$dL" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQ$dM" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQ$dN" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQ$dO" role="1oi0x0">
@@ -4263,7 +4263,7 @@
             <node concept="3cpWsn" id="1mP5b6jQ$dS" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQ$dT" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQ$dU" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQ$dV" role="1oi0x0">
@@ -4298,7 +4298,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNlb" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQNlc" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNld" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNle" role="1oi0x0">
@@ -4322,7 +4322,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNli" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQNlj" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNlk" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNll" role="1oi0x0">
@@ -4362,7 +4362,7 @@
             <node concept="3cpWsn" id="1mP5b6jQND6" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQND7" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQND8" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQND9" role="1oi0x0">
@@ -4396,7 +4396,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNDj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQNDk" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNDl" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNDm" role="1oi0x0">
@@ -4446,7 +4446,7 @@
             <node concept="3cpWsn" id="1OShD0HUxWm" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HUxWn" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUxWo" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUxWp" role="1oi0x0">
@@ -4480,7 +4480,7 @@
             <node concept="3cpWsn" id="1OShD0HUxWz" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HUxW$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUxW_" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUxWA" role="1oi0x0">
@@ -4530,7 +4530,7 @@
             <node concept="3cpWsn" id="1mP5b6jQOBl" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQOBm" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQOBn" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQOBo" role="1oi0x0">
@@ -4547,7 +4547,7 @@
             <node concept="3cpWsn" id="1mP5b6jQOBB" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQOBC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQOBD" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQOBE" role="1oi0x0">
@@ -4580,7 +4580,7 @@
             <node concept="3cpWsn" id="1OShD0HUzFH" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HUzFI" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUzFJ" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUzFK" role="1oi0x0">
@@ -4597,7 +4597,7 @@
             <node concept="3cpWsn" id="1OShD0HUzFO" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HUzFP" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUzFQ" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUzFR" role="1oi0x0">
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 5576e8ee..e8f655ba 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -237,7 +237,7 @@
                         <ref role="3cqZAo" node="21Zu7ABuute" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm5tU_" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                       </node>
                     </node>
                   </node>
@@ -278,7 +278,7 @@
                         <ref role="3cqZAo" node="3mz2_dYxTYE" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm5vBP" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                       </node>
                     </node>
                   </node>
@@ -315,12 +315,12 @@
                     <node concept="1pGfFk" id="6yEjedm6$Su" role="2ShVmc">
                       <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm6_je" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
                   <node concept="3uibUv" id="6yEjedm5xWn" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -341,7 +341,7 @@
             <node concept="3cpWsn" id="fHk0tWu_Mt" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="fHk0tWu_Mu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="fHk0tWuK3B" role="33vP2m">
                 <node concept="1oi5UN" id="fHk0tWuK7X" role="1oi0x0" />
@@ -352,7 +352,7 @@
             <node concept="3cpWsn" id="fHk0tWuKa4" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="fHk0tWuKa5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="fHk0tWuKa6" role="33vP2m">
                 <node concept="1oi5UN" id="fHk0tWuKa7" role="1oi0x0" />
@@ -388,7 +388,7 @@
             <node concept="3cpWsn" id="21Zu7ABuiLB" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABuiLC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABuiLD" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABuiLE" role="1oi0x0">
@@ -406,7 +406,7 @@
             <node concept="3cpWsn" id="21Zu7ABuiLH" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABuiLI" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABuiLJ" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABun6y" role="1oi0x0">
@@ -449,7 +449,7 @@
             <node concept="3cpWsn" id="53iOybEHDaF" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="53iOybEHDaG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="53iOybEHDaH" role="33vP2m">
                 <node concept="1oi5UN" id="53iOybEHDaI" role="1oi0x0">
@@ -467,7 +467,7 @@
             <node concept="3cpWsn" id="53iOybEHDaM" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="53iOybEHDaN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="53iOybEHDaO" role="33vP2m">
                 <node concept="1oi5UN" id="53iOybEHDaP" role="1oi0x0">
@@ -518,7 +518,7 @@
             <node concept="3cpWsn" id="21Zu7ABunhN" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABunhO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABunhP" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABunhQ" role="1oi0x0">
@@ -551,7 +551,7 @@
             <node concept="3cpWsn" id="21Zu7ABunhW" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABunhX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABunhY" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABunhZ" role="1oi0x0">
@@ -609,7 +609,7 @@
             <node concept="3cpWsn" id="21Zu7ABupTt" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABupTu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABupTv" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABupTw" role="1oi0x0">
@@ -640,7 +640,7 @@
             <node concept="3cpWsn" id="21Zu7ABupTD" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABupTE" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABupTF" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABupTG" role="1oi0x0">
@@ -698,7 +698,7 @@
             <node concept="3cpWsn" id="1OShD0I0umo" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I0ump" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I0umq" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I0umr" role="1oi0x0">
@@ -737,7 +737,7 @@
             <node concept="3cpWsn" id="1OShD0I0umz" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I0um$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I0um_" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I0umA" role="1oi0x0">
@@ -793,7 +793,7 @@
             <node concept="3cpWsn" id="1OShD0I168P" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I168Q" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I168R" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I168S" role="1oi0x0">
@@ -832,7 +832,7 @@
             <node concept="3cpWsn" id="1OShD0I16sw" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I16sx" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I16sy" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I16sz" role="1oi0x0">
@@ -898,7 +898,7 @@
             <node concept="3cpWsn" id="1OShD0I1vD7" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I1vD8" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I1vD9" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I1vDa" role="1oi0x0">
@@ -937,7 +937,7 @@
             <node concept="3cpWsn" id="1OShD0I1vDm" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I1vDn" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I1vDo" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I1vDp" role="1oi0x0">
@@ -1008,7 +1008,7 @@
             <node concept="3cpWsn" id="1OShD0If5uE" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0If5uF" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0If5uG" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0If5uH" role="1oi0x0">
@@ -1030,7 +1030,7 @@
             <node concept="3cpWsn" id="1OShD0If5uT" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0If5uU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0If5uV" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0If5uW" role="1oi0x0">
@@ -1084,7 +1084,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLIP" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="5_6ImQYXLIN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLIQ" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLIR" role="1oi0x0">
@@ -1102,7 +1102,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLKw" role="3cpWs9">
               <property role="TrG5h" value="bar" />
               <node concept="3uibUv" id="5_6ImQYXLKx" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLKy" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLKz" role="1oi0x0">
@@ -1120,7 +1120,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLLI" role="3cpWs9">
               <property role="TrG5h" value="bazz" />
               <node concept="3uibUv" id="5_6ImQYXLLJ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLLK" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLLL" role="1oi0x0">
@@ -1138,7 +1138,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLG2" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="5_6ImQYXLG0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLG3" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYXLG4" role="1oi0x0">
@@ -1203,7 +1203,7 @@
             <node concept="3cpWsn" id="5_6ImQYXR4P" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="5_6ImQYXR4Q" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXRaB" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYXRaS" role="1oi0x0">
@@ -1266,7 +1266,7 @@
             <node concept="3cpWsn" id="5_6ImQYY0qW" role="3cpWs9">
               <property role="TrG5h" value="expectedTail" />
               <node concept="3uibUv" id="5_6ImQYY0qN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY0qX" role="33vP2m">
                 <node concept="KCUsM" id="5_6ImQYY0qY" role="1oi0x0">
@@ -1325,7 +1325,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3rf" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="5_6ImQYY3rg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3rh" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYY3ri" role="1oi0x0">
@@ -1343,7 +1343,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3r$" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="5_6ImQYY3r_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3rA" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY3rB" role="1oi0x0">
@@ -1394,7 +1394,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3rY" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="5_6ImQYY3rZ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3s0" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY3s1" role="1oi0x0">
@@ -1457,7 +1457,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3so" role="3cpWs9">
               <property role="TrG5h" value="expectedTail" />
               <node concept="3uibUv" id="5_6ImQYY3sp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3sq" role="33vP2m">
                 <node concept="KCUsM" id="5_6ImQYY3sr" role="1oi0x0" />
@@ -1491,7 +1491,7 @@
             <node concept="3cpWsn" id="5_6ImQYY68i" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="5_6ImQYY68j" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY68k" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY68l" role="1oi0x0">
@@ -1534,7 +1534,7 @@
             <node concept="3cpWsn" id="5_6ImQYY68A" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="5_6ImQYY68B" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY68C" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY68D" role="1oi0x0">
@@ -1683,7 +1683,7 @@
                         <ref role="3cqZAo" node="6yEjedm71gR" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm71h4" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                       </node>
                     </node>
                   </node>
@@ -1724,7 +1724,7 @@
                         <ref role="3cqZAo" node="6yEjedm71h8" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm71hl" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                       </node>
                     </node>
                   </node>
@@ -1761,12 +1761,12 @@
                     <node concept="1pGfFk" id="6yEjedm71hz" role="2ShVmc">
                       <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm71h$" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
                   <node concept="3uibUv" id="6yEjedm71h_" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -1798,7 +1798,7 @@
                     <node concept="1pGfFk" id="6yEjedm9KbK" role="2ShVmc">
                       <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm9KAr" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
@@ -1873,7 +1873,7 @@
             <node concept="3cpWsn" id="1OShD0IfuGw" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfuGx" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfuGy" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfuGz" role="1oi0x0">
@@ -1915,7 +1915,7 @@
             <node concept="3cpWsn" id="1OShD0IfuGF" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfuGG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfuGH" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfuGI" role="1oi0x0">
@@ -2017,7 +2017,7 @@
             <node concept="3cpWsn" id="3HJTsBn443g" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3HJTsBn443h" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443i" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443j" role="1oi0x0">
@@ -2051,7 +2051,7 @@
             <node concept="3cpWsn" id="3HJTsBn443w" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3HJTsBn443x" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443y" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443z" role="1oi0x0">
@@ -2153,7 +2153,7 @@
             <node concept="3cpWsn" id="4XqG8ivynhQ" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="4XqG8ivynhR" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivynhS" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivynhT" role="1oi0x0">
@@ -2187,7 +2187,7 @@
             <node concept="3cpWsn" id="4XqG8ivy$Me" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="4XqG8ivy$Mf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivy$Mg" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivy$Mh" role="1oi0x0">
@@ -2217,7 +2217,7 @@
             <node concept="3cpWsn" id="4XqG8ivyni3" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="4XqG8ivyni4" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivyni5" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivyni6" role="1oi0x0">
@@ -2240,7 +2240,7 @@
             <node concept="3cpWsn" id="4XqG8ivy_$I" role="3cpWs9">
               <property role="TrG5h" value="d" />
               <node concept="3uibUv" id="4XqG8ivy_$J" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivy_$K" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivy_$L" role="1oi0x0">
@@ -2380,7 +2380,7 @@
             <node concept="3cpWsn" id="1OShD0IfNC5" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfNC6" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfNC7" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfNC8" role="1oi0x0">
@@ -2423,7 +2423,7 @@
             <node concept="3cpWsn" id="1OShD0IfNCg" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfNCh" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfNCi" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfNCj" role="1oi0x0">
@@ -2465,7 +2465,7 @@
             <node concept="3cpWsn" id="1OShD0IfOZy" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="1OShD0IfOZz" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfOZ$" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfOZ_" role="1oi0x0">
@@ -2612,7 +2612,7 @@
             <node concept="3cpWsn" id="1OShD0IfO_f" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="1OShD0IfO_g" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfO_h" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfO_k" role="1oi0x0">
@@ -2630,7 +2630,7 @@
             <node concept="3cpWsn" id="1OShD0IfOGV" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1OShD0IfOGW" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfOGX" role="33vP2m">
                 <node concept="1oi5UN" id="677NV56wbOC" role="1oi0x0">
@@ -2682,7 +2682,7 @@
             <node concept="3cpWsn" id="4XqG8ivylQZ" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="4XqG8ivylR0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylR1" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylR2" role="1oi0x0">
@@ -2725,7 +2725,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRf" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="4XqG8ivylRg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylRh" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylRi" role="1oi0x0">
@@ -2768,7 +2768,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRv" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="4XqG8ivylRw" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylRx" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylRy" role="1oi0x0">
@@ -2915,7 +2915,7 @@
             <node concept="3cpWsn" id="4XqG8ivylS2" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="4XqG8ivylS3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylS4" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylS5" role="1oi0x0">
@@ -2933,7 +2933,7 @@
             <node concept="3cpWsn" id="4XqG8ivylS9" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="4XqG8ivylSa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylSb" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylSc" role="1oi0x0">
@@ -2985,7 +2985,7 @@
             <node concept="3cpWsn" id="1OShD0IfW$y" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfW$z" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfW$$" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfW$_" role="1oi0x0">
@@ -3038,7 +3038,7 @@
             <node concept="3cpWsn" id="1OShD0IfW$L" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfW$M" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfW$N" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfW$O" role="1oi0x0">
@@ -3122,7 +3122,7 @@
             <node concept="3cpWsn" id="1OShD0IfYmM" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="1OShD0IfYmN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfYmO" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfYt5" role="1oi0x0">
@@ -3140,7 +3140,7 @@
             <node concept="3cpWsn" id="1OShD0IfYmT" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1OShD0IfYmU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfYmV" role="33vP2m">
                 <node concept="1oi5UN" id="677NV56wbOu" role="1oi0x0">
@@ -3192,7 +3192,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRu" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IgkRv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IgkRw" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IgkRx" role="1oi0x0">
@@ -3267,7 +3267,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRM" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IgkRN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IgkRO" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IgkRP" role="1oi0x0">
@@ -3458,7 +3458,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2i$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ig2i_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig2iA" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig2iB" role="1oi0x0">
@@ -3527,7 +3527,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2iS" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ig2iT" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig2iU" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig2iV" role="1oi0x0">
@@ -3676,7 +3676,7 @@
             <node concept="3cpWsn" id="1OShD0Ig9w4" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ig9w5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig9w6" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig9w7" role="1oi0x0">
@@ -3726,7 +3726,7 @@
             <node concept="3cpWsn" id="1OShD0Ig9wj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ig9wk" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig9wl" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig9wm" role="1oi0x0">
@@ -3858,7 +3858,7 @@
             <node concept="3cpWsn" id="1OShD0Igi9l" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Igi9m" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Igi9n" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Igi9o" role="1oi0x0">
@@ -3891,7 +3891,7 @@
             <node concept="3cpWsn" id="1OShD0Igi9u" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Igi9v" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Igi9w" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Igi9x" role="1oi0x0">
@@ -4007,7 +4007,7 @@
             <node concept="3cpWsn" id="4$OyT8ISnwf" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="4$OyT8ISnwg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISnwh" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ISw5n" role="1oi0x0">
@@ -4067,7 +4067,7 @@
             <node concept="3cpWsn" id="4$OyT8ISEPa" role="3cpWs9">
               <property role="TrG5h" value="pattern" />
               <node concept="3uibUv" id="4$OyT8ISEPb" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISEPc" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ISEPd" role="1oi0x0">
@@ -4226,7 +4226,7 @@
             <node concept="3cpWsn" id="4$OyT8ITVL6" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="4$OyT8ITVL7" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVL8" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ITVL9" role="1oi0x0">
@@ -4286,7 +4286,7 @@
             <node concept="3cpWsn" id="4$OyT8ITVLt" role="3cpWs9">
               <property role="TrG5h" value="pattern1" />
               <node concept="3uibUv" id="4$OyT8ITVLu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVLv" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ITVLw" role="1oi0x0">
@@ -4312,7 +4312,7 @@
             <node concept="3cpWsn" id="4$OyT8IUeDt" role="3cpWs9">
               <property role="TrG5h" value="pattern2" />
               <node concept="3uibUv" id="4$OyT8IUeDu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8IUeDv" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8IUeDw" role="1oi0x0">
@@ -4564,7 +4564,7 @@
       <node concept="3uibUv" id="6yEjedm86Fb" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm887F" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3K_0akS$NEd" role="1B3o_S" />
@@ -4577,7 +4577,7 @@
                 <ref role="3cqZAo" node="3K_0akS$NJK" resolve="name" />
               </node>
               <node concept="3uibUv" id="6yEjedm895I" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -4594,7 +4594,7 @@
       <node concept="3uibUv" id="6yEjedm8Fwr" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm8Fws" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="6yEjedm8Fwt" role="1B3o_S" />
@@ -4612,7 +4612,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8Fwz" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -4623,7 +4623,7 @@
         <node concept="3uibUv" id="6yEjedm8H9p" role="1tU5fm">
           <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
           <node concept="3uibUv" id="6yEjedm8Hc_" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -4642,7 +4642,7 @@
               <node concept="3uibUv" id="6yEjedm8aLn" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8bg7" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$NRs" role="33vP2m">
@@ -4665,7 +4665,7 @@
               <node concept="3uibUv" id="6yEjedm8btC" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8btD" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -4675,7 +4675,7 @@
             <node concept="3cpWsn" id="3K_0akS_eyb" role="3cpWs9">
               <property role="TrG5h" value="bar" />
               <node concept="3uibUv" id="3K_0akS_ey9" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_eyc" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_eyd" role="1oi0x0">
@@ -4729,7 +4729,7 @@
               <node concept="3uibUv" id="6yEjedm8iQc" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8jdG" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$OxM" role="33vP2m">
@@ -4741,7 +4741,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8P1G" role="37wK5m">
-                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                     </node>
                   </node>
                 </node>
@@ -4778,7 +4778,7 @@
               <node concept="3uibUv" id="6yEjedm8lL4" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8lL5" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -4788,7 +4788,7 @@
             <node concept="3cpWsn" id="3K_0akS_6Q7" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="3K_0akS_6Q5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_6Q8" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_6Q9" role="1oi0x0">
@@ -4835,7 +4835,7 @@
             <node concept="3cpWsn" id="6HT7BWBPd0T" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="6HT7BWBPd0L" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBPd0U" role="33vP2m">
                 <node concept="2OqwBi" id="6HT7BWBPd0V" role="2Oq$k0">
@@ -4856,7 +4856,7 @@
             <node concept="37vLTI" id="6HT7BWBPeDD" role="3clFbG">
               <node concept="2YIFZM" id="6HT7BWBPf0v" role="37vLTx">
                 <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                 <node concept="37vLTw" id="6HT7BWBPf1b" role="37wK5m">
                   <ref role="3cqZAo" node="6HT7BWBPd0T" resolve="value" />
                 </node>
@@ -4922,7 +4922,7 @@
             <node concept="3cpWsn" id="3t7_2FgLmhr" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgLmhs" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLmht" role="33vP2m">
                 <node concept="2OqwBi" id="3t7_2FgLmhu" role="2Oq$k0">
@@ -4930,7 +4930,7 @@
                     <node concept="1eOMI4" id="3t7_2FgLmhw" role="2Oq$k0">
                       <node concept="10QFUN" id="3t7_2FgLmhx" role="1eOMHV">
                         <node concept="3uibUv" id="3t7_2FgLmhy" role="10QFUM">
-                          <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Func" />
+                          <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Node" />
                         </node>
                         <node concept="37vLTw" id="3t7_2FgLmhz" role="10QFUP">
                           <ref role="3cqZAo" node="5YIOneOTrto" resolve="next" />
@@ -4961,7 +4961,7 @@
                   <node concept="1eOMI4" id="3t7_2FgLnID" role="2Oq$k0">
                     <node concept="10QFUN" id="3t7_2FgLnIE" role="1eOMHV">
                       <node concept="3uibUv" id="3t7_2FgLnIF" role="10QFUM">
-                        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3t7_2FgLnIG" role="10QFUP">
                         <ref role="3cqZAo" node="3t7_2FgLmhr" resolve="list" />
@@ -5004,7 +5004,7 @@
               <node concept="3uibUv" id="6yEjedm8o1P" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8o1Q" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5021,7 +5021,7 @@
               <node concept="3uibUv" id="6yEjedm8oFj" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8oFk" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5031,7 +5031,7 @@
             <node concept="3cpWsn" id="3K_0akS_pCK" role="3cpWs9">
               <property role="TrG5h" value="bar" />
               <node concept="3uibUv" id="3K_0akS_pCL" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_pCM" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_pCN" role="1oi0x0">
@@ -5073,7 +5073,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8Oi0" role="37wK5m">
-                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                     </node>
                   </node>
                 </node>
@@ -5081,7 +5081,7 @@
               <node concept="3uibUv" id="6yEjedm8$6V" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8$6W" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5116,7 +5116,7 @@
               <node concept="3uibUv" id="6yEjedm8pey" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8pez" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5126,7 +5126,7 @@
             <node concept="3cpWsn" id="3K_0akS_pDo" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="3K_0akS_pDp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_pDq" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_pDr" role="1oi0x0">
@@ -5191,7 +5191,7 @@
             <node concept="3cpWsn" id="6HT7BWBPhwM" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="6HT7BWBPhwJ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBPhwN" role="33vP2m">
                 <node concept="2OqwBi" id="6HT7BWBPhwO" role="2Oq$k0">
@@ -5212,7 +5212,7 @@
             <node concept="37vLTI" id="6HT7BWBPiGd" role="3clFbG">
               <node concept="2YIFZM" id="6HT7BWBPj3B" role="37vLTx">
                 <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                 <node concept="37vLTw" id="6HT7BWBPj4j" role="37wK5m">
                   <ref role="3cqZAo" node="6HT7BWBPhwM" resolve="value" />
                 </node>
@@ -5278,7 +5278,7 @@
             <node concept="3cpWsn" id="3t7_2FgLnZ$" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgLnZ_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLnZA" role="33vP2m">
                 <node concept="2OqwBi" id="3t7_2FgLnZB" role="2Oq$k0">
@@ -5286,7 +5286,7 @@
                     <node concept="1eOMI4" id="3t7_2FgLnZD" role="2Oq$k0">
                       <node concept="10QFUN" id="3t7_2FgLnZE" role="1eOMHV">
                         <node concept="3uibUv" id="3t7_2FgLnZF" role="10QFUM">
-                          <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Func" />
+                          <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Node" />
                         </node>
                         <node concept="37vLTw" id="3t7_2FgLnZG" role="10QFUP">
                           <ref role="3cqZAo" node="5YIOneOTmzN" resolve="next" />
@@ -5317,7 +5317,7 @@
                   <node concept="1eOMI4" id="3t7_2FgLoIi" role="2Oq$k0">
                     <node concept="10QFUN" id="3t7_2FgLoIj" role="1eOMHV">
                       <node concept="3uibUv" id="3t7_2FgLoIk" role="10QFUM">
-                        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3t7_2FgLoIl" role="10QFUP">
                         <ref role="3cqZAo" node="3t7_2FgLnZ$" resolve="list" />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
index 08608596..7867214e 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
@@ -9993,7 +9993,7 @@
               <property role="TrG5h" value="TailStub" />
             </node>
             <node concept="3uibUv" id="6OUp3PsRZ9G" role="3vLBG7">
-              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
             </node>
           </node>
           <node concept="3Aqczg" id="7LZcKzBwTPI" role="3cqZAp">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
index 101d455f..37627c9c 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
@@ -143,7 +143,7 @@
             <node concept="3cpWsn" id="7t5VLKGALSU" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALSV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALSW" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALSX" role="1oi0x0">
@@ -205,7 +205,7 @@
             <node concept="3cpWsn" id="7t5VLKGALTe" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALTf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALTg" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALTh" role="1oi0x0">
@@ -256,7 +256,7 @@
               <node concept="3uibUv" id="6yEjedm7dtr" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7jXZ" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="7t5VLKGALTw" role="33vP2m">
@@ -266,7 +266,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7hYU" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -322,7 +322,7 @@
             <node concept="3cpWsn" id="4JRKVCv8a6f" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="4JRKVCv8a6g" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4JRKVCv8a6h" role="33vP2m">
                 <node concept="1oi5ST" id="4JRKVCv8a6i" role="1oi0x0">
@@ -384,7 +384,7 @@
             <node concept="3cpWsn" id="7t5VLKGALTU" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALTV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALTW" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgGZ_3" role="1oi0x0">
@@ -446,7 +446,7 @@
             <node concept="3cpWsn" id="7t5VLKGALUe" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALUf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALUg" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgGZG8" role="1oi0x0">
@@ -511,7 +511,7 @@
               <node concept="3uibUv" id="6yEjedm7RDV" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7RDW" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7RDX" role="33vP2m">
@@ -521,7 +521,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7RE0" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -577,7 +577,7 @@
             <node concept="3cpWsn" id="7t5VLKGALUW" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALUX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALUY" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALUZ" role="1oi0x0">
@@ -639,7 +639,7 @@
             <node concept="3cpWsn" id="7t5VLKGALVi" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALVj" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALVk" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH1Hz" role="1oi0x0">
@@ -701,7 +701,7 @@
             <node concept="3cpWsn" id="7t5VLKGALVA" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALVB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALVC" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH1Jc" role="1oi0x0">
@@ -752,7 +752,7 @@
               <node concept="3uibUv" id="6yEjedm7ovG" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7ovH" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7ovI" role="33vP2m">
@@ -762,7 +762,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7ovL" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -818,7 +818,7 @@
             <node concept="3cpWsn" id="7t5VLKGALWf" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALWg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWh" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALWi" role="1oi0x0">
@@ -880,7 +880,7 @@
             <node concept="3cpWsn" id="7t5VLKGALW_" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALWA" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWB" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH3LN" role="1oi0x0">
@@ -942,7 +942,7 @@
             <node concept="3cpWsn" id="7t5VLKGALWT" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALWU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWV" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH3SN" role="1oi0x0">
@@ -1021,7 +1021,7 @@
               <node concept="3uibUv" id="6yEjedm7saG" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7saH" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7saI" role="33vP2m">
@@ -1031,7 +1031,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7saL" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -1087,7 +1087,7 @@
             <node concept="3cpWsn" id="7t5VLKGALXG" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALXH" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALXI" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALXJ" role="1oi0x0">
@@ -1149,7 +1149,7 @@
             <node concept="3cpWsn" id="7t5VLKGALY2" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALY3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALY4" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALY5" role="1oi0x0">
@@ -1258,7 +1258,7 @@
             <node concept="3cpWsn" id="7t5VLKGALYz" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALY$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALY_" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALYA" role="1oi0x0">
@@ -1431,7 +1431,7 @@
               <node concept="3uibUv" id="6yEjedm7vK5" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7vK6" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7vK7" role="33vP2m">
@@ -1441,7 +1441,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7vKa" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -1497,7 +1497,7 @@
             <node concept="3cpWsn" id="7t5VLKGALZK" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALZL" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALZM" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALZN" role="1oi0x0">
@@ -1589,7 +1589,7 @@
             <node concept="3cpWsn" id="3hfdu5cNgqA" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3hfdu5cNgqB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cNgqC" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cNgqD" role="1oi0x0">
@@ -1757,7 +1757,7 @@
             <node concept="3cpWsn" id="3hfdu5cNgre" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3hfdu5cNgrf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cNgrg" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cNgrh" role="1oi0x0">
@@ -1934,7 +1934,7 @@
               <node concept="3uibUv" id="6yEjedm7zhb" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7zhc" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7zhd" role="33vP2m">
@@ -1944,7 +1944,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7zhg" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2000,7 +2000,7 @@
             <node concept="3cpWsn" id="3hfdu5cNgsA" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3hfdu5cNgsB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cNgsC" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cNgsD" role="1oi0x0">
@@ -2072,7 +2072,7 @@
             <node concept="3cpWsn" id="3KV3FXk2oHN" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3KV3FXk2oHO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2oHP" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2oHQ" role="1oi0x0">
@@ -2295,7 +2295,7 @@
             <node concept="3cpWsn" id="3KV3FXk2oJ1" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3KV3FXk2oJ2" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2oJ3" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2oJ4" role="1oi0x0">
@@ -2474,7 +2474,7 @@
               <node concept="3uibUv" id="6yEjedm7AXY" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7AXZ" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7AY0" role="33vP2m">
@@ -2484,7 +2484,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7AY3" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2540,7 +2540,7 @@
             <node concept="3cpWsn" id="3KV3FXk2oKs" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXk2oKt" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2oKu" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2oKv" role="1oi0x0">
@@ -2612,7 +2612,7 @@
             <node concept="3cpWsn" id="3hfdu5cN_JW" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3hfdu5cN_JX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cN_JY" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cN_JZ" role="1oi0x0">
@@ -2780,7 +2780,7 @@
             <node concept="3cpWsn" id="3hfdu5cN_KU" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3hfdu5cN_KV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cN_KW" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cN_KX" role="1oi0x0">
@@ -2935,7 +2935,7 @@
               <node concept="3uibUv" id="6yEjedm7Ejw" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7Ejx" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7Ejy" role="33vP2m">
@@ -2945,7 +2945,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7Ej_" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -3001,7 +3001,7 @@
             <node concept="3cpWsn" id="3hfdu5cN_MP" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3hfdu5cN_MQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cN_MR" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cN_MS" role="1oi0x0">
@@ -3057,7 +3057,7 @@
             <node concept="3cpWsn" id="3KV3FXjXcpc" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3KV3FXjXcpd" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXjXcpe" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXjXcpf" role="1oi0x0">
@@ -3225,7 +3225,7 @@
             <node concept="3cpWsn" id="3KV3FXjXcq7" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3KV3FXjXcq8" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXjXcq9" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXjXcqa" role="1oi0x0">
@@ -3400,7 +3400,7 @@
               <node concept="3uibUv" id="6yEjedm7HxO" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7HxP" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7HxQ" role="33vP2m">
@@ -3410,7 +3410,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7HxT" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -3466,7 +3466,7 @@
             <node concept="3cpWsn" id="3KV3FXjXcrs" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXjXcrt" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXjXcru" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXjXcrv" role="1oi0x0">
@@ -3542,7 +3542,7 @@
             <node concept="3cpWsn" id="3KV3FXk18Nd" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3KV3FXk18Ne" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk18Nf" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk18Ng" role="1oi0x0">
@@ -3710,7 +3710,7 @@
             <node concept="3cpWsn" id="3KV3FXk18O5" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3KV3FXk18O6" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk18O7" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk18O8" role="1oi0x0">
@@ -3761,7 +3761,7 @@
               <node concept="3uibUv" id="6yEjedm7KDD" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7KDE" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7KDF" role="33vP2m">
@@ -3771,7 +3771,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7KDI" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -3827,7 +3827,7 @@
             <node concept="3cpWsn" id="3KV3FXk18Pu" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXk18Pv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk18Pw" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk18Px" role="1oi0x0">
@@ -3942,7 +3942,7 @@
             <node concept="3cpWsn" id="3KV3FXk2boN" role="3cpWs9">
               <property role="TrG5h" value="fullPaths" />
               <node concept="3uibUv" id="3KV3FXk2boO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2boP" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2boQ" role="1oi0x0">
@@ -4110,7 +4110,7 @@
             <node concept="3cpWsn" id="3KV3FXk2bpF" role="3cpWs9">
               <property role="TrG5h" value="startFrom" />
               <node concept="3uibUv" id="3KV3FXk2bpG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2bpH" role="33vP2m">
                 <node concept="1oi5UN" id="3KV3FXk2bpR" role="1oi0x0">
@@ -4137,7 +4137,7 @@
               <node concept="3uibUv" id="6yEjedm7VYx" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7VYy" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7VYz" role="33vP2m">
@@ -4147,7 +4147,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7VYA" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -4203,7 +4203,7 @@
             <node concept="3cpWsn" id="3KV3FXk2bqn" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXk2bqo" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2bqp" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2bqq" role="1oi0x0">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
index 9729db98..b2cf293d 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
@@ -350,7 +350,7 @@
         <node concept="3uibUv" id="7HUwyZazx7G" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7H" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -359,7 +359,7 @@
         <node concept="3uibUv" id="7HUwyZazx84" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx85" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -368,7 +368,7 @@
         <node concept="3uibUv" id="7HUwyZazx7U" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7V" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -379,7 +379,7 @@
           <node concept="3cpWsn" id="3KV3FXjZHhG" role="3cpWs9">
             <property role="TrG5h" value="leftVal" />
             <node concept="3uibUv" id="3KV3FXjZHhH" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXjZHhI" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXjZHhJ" role="2Oq$k0">
@@ -400,7 +400,7 @@
           <node concept="3cpWsn" id="3KV3FXjZHhO" role="3cpWs9">
             <property role="TrG5h" value="rightVal" />
             <node concept="3uibUv" id="3KV3FXjZHhP" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXjZHhQ" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXjZHhR" role="2Oq$k0">
@@ -464,7 +464,7 @@
             <node concept="3uibUv" id="3KV3FXk0pl4" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXk0pl7" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KV3FXk0ple" role="33vP2m">
@@ -698,7 +698,7 @@
       <node concept="3uibUv" id="3KV3FXk0o6d" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXk0oGr" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="3KV3FXjZPWJ" role="1B3o_S" />
@@ -710,7 +710,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="3KV3FXjZHic" role="11_B2D">
                 <node concept="3uibUv" id="3KV3FXjZHid" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -730,7 +730,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="3KV3FXjZHim" role="11_B2D">
                 <node concept="3uibUv" id="3KV3FXjZHin" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -820,14 +820,14 @@
             <node concept="3uibUv" id="3KV3FXjZMUe" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXjZMUf" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="3KV3FXjZMUg" role="33vP2m">
               <node concept="1pGfFk" id="3KV3FXjZMUh" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                 <node concept="3uibUv" id="3KV3FXjZMUi" role="1pMfVU">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -867,7 +867,7 @@
           <node concept="3cpWsn" id="3KV3FXjZMUx" role="1Duv9x">
             <property role="TrG5h" value="c" />
             <node concept="3uibUv" id="3KV3FXjZMUy" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXjZMUz" role="1DdaDG">
@@ -883,13 +883,13 @@
       <node concept="37vLTG" id="3KV3FXjZHfU" role="3clF46">
         <property role="TrG5h" value="leftVal" />
         <node concept="3uibUv" id="3KV3FXk0viY" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjZHfW" role="3clF46">
         <property role="TrG5h" value="rightVal" />
         <node concept="3uibUv" id="3KV3FXk0viZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -910,7 +910,7 @@
                       <ref role="3uigEE" to="33ny:~List" resolve="List" />
                       <node concept="3qUE_q" id="3KV3FXjZDGN" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDGO" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -930,7 +930,7 @@
                       <ref role="3uigEE" to="33ny:~List" resolve="List" />
                       <node concept="3qUE_q" id="3KV3FXjZDGX" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDGY" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -951,7 +951,7 @@
                       <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                       <node concept="3qUE_q" id="3KV3FXjZDH8" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDH9" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -972,7 +972,7 @@
                       <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                       <node concept="3qUE_q" id="3KV3FXjZDHg" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDHh" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -990,7 +990,7 @@
                   <node concept="3cpWsn" id="3KV3FXjZDHn" role="3cpWs9">
                     <property role="TrG5h" value="lastMatch" />
                     <node concept="3uibUv" id="3KV3FXjZDHo" role="1tU5fm">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="10Nm6u" id="3KV3FXjZDHp" role="33vP2m" />
                   </node>
@@ -1001,7 +1001,7 @@
                       <node concept="3cpWsn" id="3KV3FXjZDHt" role="3cpWs9">
                         <property role="TrG5h" value="nextLeft" />
                         <node concept="3uibUv" id="3KV3FXjZDHu" role="1tU5fm">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="2OqwBi" id="3KV3FXjZDHv" role="33vP2m">
                           <node concept="37vLTw" id="3KV3FXjZDHw" role="2Oq$k0">
@@ -1017,7 +1017,7 @@
                       <node concept="3cpWsn" id="3KV3FXjZDHz" role="3cpWs9">
                         <property role="TrG5h" value="nextRight" />
                         <node concept="3uibUv" id="3KV3FXjZDH$" role="1tU5fm">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="2OqwBi" id="3KV3FXjZDH_" role="33vP2m">
                           <node concept="37vLTw" id="3KV3FXjZDHA" role="2Oq$k0">
@@ -1172,7 +1172,7 @@
               <node concept="3cpWsn" id="3KV3FXjZDIB" role="1Duv9x">
                 <property role="TrG5h" value="nextPathRight" />
                 <node concept="3uibUv" id="3KV3FXjZDIC" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="37vLTw" id="3KV3FXjZDJ0" role="1DdaDG">
@@ -1183,7 +1183,7 @@
           <node concept="3cpWsn" id="3KV3FXjZDIE" role="1Duv9x">
             <property role="TrG5h" value="nextPathLeft" />
             <node concept="3uibUv" id="3KV3FXjZDIF" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXjZDJ4" role="1DdaDG">
@@ -1197,7 +1197,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3KV3FXjZDIJ" role="11_B2D">
             <node concept="3uibUv" id="3KV3FXjZDIK" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -1208,7 +1208,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3KV3FXjZDIN" role="11_B2D">
             <node concept="3uibUv" id="3KV3FXjZDIO" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -1269,7 +1269,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3KV3FXk0DmY" role="11_B2D">
             <node concept="3uibUv" id="3KV3FXk0DmZ" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -1283,14 +1283,14 @@
                 <node concept="3uibUv" id="3KV3FXk0Dlj" role="1tU5fm">
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3uibUv" id="3KV3FXk0Dlk" role="11_B2D">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="3KV3FXk0Dll" role="33vP2m">
                   <node concept="1pGfFk" id="3KV3FXk0Dlm" role="2ShVmc">
                     <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                     <node concept="3uibUv" id="3KV3FXk0Dln" role="1pMfVU">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -1303,7 +1303,7 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3qUE_q" id="3KV3FXk0Dlr" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk0Dls" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -1320,7 +1320,7 @@
               <node concept="3cpWsn" id="3KV3FXk0Dlw" role="3cpWs9">
                 <property role="TrG5h" value="next" />
                 <node concept="3uibUv" id="3KV3FXk0Dlx" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -1506,7 +1506,7 @@
                   <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                   <node concept="3qUE_q" id="3KV3FXk0DmL" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk0DmM" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -1532,7 +1532,7 @@
           <node concept="3cpWsn" id="3KV3FXk0DmT" role="1Duv9x">
             <property role="TrG5h" value="nextPath" />
             <node concept="3uibUv" id="3KV3FXk0DmU" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXk0Dn0" role="1DdaDG">
@@ -1597,14 +1597,14 @@
       <node concept="3uibUv" id="3KV3FXjZG67" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXjZG68" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="2ShNRf" id="3KV3FXjZGkF" role="33vP2m">
         <node concept="1pGfFk" id="3KV3FXjZGrO" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
           <node concept="3uibUv" id="3KV3FXjZGwh" role="1pMfVU">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1616,14 +1616,14 @@
       <node concept="3uibUv" id="3KV3FXjZG6c" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXjZG6d" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="2ShNRf" id="3KV3FXjZGzO" role="33vP2m">
         <node concept="1pGfFk" id="3KV3FXjZGzP" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
           <node concept="3uibUv" id="3KV3FXjZGzQ" role="1pMfVU">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1641,7 +1641,7 @@
         <property role="TrG5h" value="component" />
         <node concept="8X2XB" id="2DKqMqOstvZ" role="1tU5fm">
           <node concept="3uibUv" id="2DKqMqOssKq" role="8Xvag">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1673,7 +1673,7 @@
         <node concept="3uibUv" id="2DKqMqOsrn4" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="2DKqMqOsrob" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1695,7 +1695,7 @@
                   <ref role="3cqZAo" node="2DKqMqOsrmz" resolve="component" />
                 </node>
                 <node concept="3uibUv" id="2DKqMqOsv7K" role="1pMfVU">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -1709,7 +1709,7 @@
       <node concept="3uibUv" id="2DKqMqOsrU$" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="2DKqMqOsrX5" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOsrRy" role="1B3o_S" />
@@ -1732,7 +1732,7 @@
       <node concept="3uibUv" id="2DKqMqOsrkN" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="2DKqMqOsrla" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -1748,7 +1748,7 @@
         <node concept="3uibUv" id="7HUwyZazx7W" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7X" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1757,7 +1757,7 @@
         <node concept="3uibUv" id="7HUwyZazx7O" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7P" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1766,7 +1766,7 @@
         <node concept="3uibUv" id="7HUwyZazx8m" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx8n" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1777,7 +1777,7 @@
           <node concept="3cpWsn" id="3KV3FXk1h3U" role="3cpWs9">
             <property role="TrG5h" value="fullPathVal" />
             <node concept="3uibUv" id="3KV3FXk1h3N" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXk1h3V" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXk1h3W" role="2Oq$k0">
@@ -1798,7 +1798,7 @@
           <node concept="3cpWsn" id="3KV3FXk1iAk" role="3cpWs9">
             <property role="TrG5h" value="startFromVal" />
             <node concept="3uibUv" id="3KV3FXk1iAd" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXk1iAl" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXk1iAm" role="2Oq$k0">
@@ -1862,7 +1862,7 @@
             <node concept="3uibUv" id="3KV3FXk1ku3" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXk1ku6" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KV3FXk1kua" role="33vP2m">
@@ -2101,19 +2101,19 @@
       <node concept="37vLTG" id="3KV3FXk1k9N" role="3clF46">
         <property role="TrG5h" value="fullPathsVal" />
         <node concept="3uibUv" id="3KV3FXk1kby" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXk1kjq" role="3clF46">
         <property role="TrG5h" value="startFromVal" />
         <node concept="3uibUv" id="3KV3FXk1kll" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3KV3FXk1jRS" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXk1jTp" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="WauyOOvMr0" role="1B3o_S" />
@@ -2125,7 +2125,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="3KV3FXk1J2J" role="11_B2D">
                 <node concept="3uibUv" id="3KV3FXk1J2K" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2170,7 +2170,7 @@
             <node concept="3uibUv" id="3KV3FXk1KVp" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXk1L7M" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="10Nm6u" id="3KV3FXk2g7X" role="33vP2m" />
@@ -2184,14 +2184,14 @@
                 <node concept="3uibUv" id="3KV3FXk1Lsr" role="1tU5fm">
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3uibUv" id="3KV3FXk1Lss" role="11_B2D">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="3KV3FXk1Lst" role="33vP2m">
                   <node concept="1pGfFk" id="3KV3FXk1Lsu" role="2ShVmc">
                     <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                     <node concept="3uibUv" id="3KV3FXk1Lsv" role="1pMfVU">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2205,7 +2205,7 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3qUE_q" id="3KV3FXk1Nac" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk1Nad" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2224,7 +2224,7 @@
                   <node concept="3cpWsn" id="3KV3FXk1OU$" role="3cpWs9">
                     <property role="TrG5h" value="next" />
                     <node concept="3uibUv" id="3KV3FXk1OU_" role="1tU5fm">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="2OqwBi" id="3KV3FXk1OUA" role="33vP2m">
                       <node concept="37vLTw" id="3KV3FXk1OUB" role="2Oq$k0">
@@ -2303,7 +2303,7 @@
                   <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                   <node concept="3qUE_q" id="3KV3FXk1OyM" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk1OBU" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2393,7 +2393,7 @@
           <node concept="3cpWsn" id="3KV3FXk1KbY" role="1Duv9x">
             <property role="TrG5h" value="path" />
             <node concept="3uibUv" id="3KV3FXk1KuS" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXk1Kc4" role="1DdaDG">
@@ -2476,12 +2476,12 @@
         <node concept="3uibUv" id="5H6hZahoMS7" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="5H6hZahoMSO" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="5H6hZahs_Lp" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tmbuc" id="3KV3FXk1p2j" role="1B3o_S" />
       <node concept="3clFbS" id="5H6hZahoMlA" role="3clF47">
@@ -2490,7 +2490,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="5H6hZahszJ9" role="1tU5fm">
               <node concept="3uibUv" id="5H6hZahszJa" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="5H6hZahszJb" role="33vP2m">
@@ -2506,7 +2506,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="5H6hZahszJh" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2624,14 +2624,14 @@
       <node concept="37vLTG" id="3KV3FXjZT2X" role="3clF46">
         <property role="TrG5h" value="leftVal" />
         <node concept="3uibUv" id="3KV3FXjZT2Y" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3KV3FXjZT99" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3qUE_q" id="3KV3FXjZT9a" role="11_B2D">
           <node concept="3uibUv" id="3KV3FXjZT9b" role="3qUE_r">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -2667,13 +2667,13 @@
       <node concept="37vLTG" id="3KV3FXjZkR1" role="3clF46">
         <property role="TrG5h" value="nextLeft" />
         <node concept="3uibUv" id="3KV3FXjZkR2" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjZkR3" role="3clF46">
         <property role="TrG5h" value="nextRight" />
         <node concept="3uibUv" id="3KV3FXjZkR4" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="3KV3FXjZlf3" role="3clF45" />
@@ -2698,7 +2698,7 @@
               <node concept="1rXfSq" id="3KV3FXjZEPP" role="3clFbw">
                 <ref role="37wK5l" node="3KV3FXk0aK5" resolve="matches" />
                 <node concept="37vLTw" id="3KV3FXjZEPQ" role="37wK5m">
-                  <ref role="3cqZAo" node="3KV3FXjXlBn" resolve="atom" />
+                  <ref role="3cqZAo" node="3KV3FXjXlBn" resolve="tf" />
                 </node>
                 <node concept="37vLTw" id="3KV3FXjZEPR" role="37wK5m">
                   <ref role="3cqZAo" node="3KV3FXjXlPb" resolve="c" />
@@ -2709,7 +2709,7 @@
           <node concept="3cpWsn" id="3KV3FXjXlPb" role="1Duv9x">
             <property role="TrG5h" value="c" />
             <node concept="3uibUv" id="3KV3FXjXlPf" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXjXlPg" role="1DdaDG">
@@ -2723,9 +2723,9 @@
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjXlBn" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="3KV3FXjXlCO" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjXlEK" role="3clF46">
@@ -2733,7 +2733,7 @@
         <node concept="3uibUv" id="3KV3FXjXlGf" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="3KV3FXjXlHm" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -2780,7 +2780,7 @@
     <node concept="2tJIrI" id="2zBk6uIk5Xl" role="jymVt" />
     <node concept="3Tm1VV" id="2zBk6uIjXRT" role="1B3o_S" />
     <node concept="2YIFZL" id="1e3DfAArnOl" role="jymVt">
-      <property role="TrG5h" value="listOfListsAtom" />
+      <property role="TrG5h" value="listOfLists" />
       <property role="IEkAT" value="false" />
       <node concept="37vLTG" id="1e3DfAArnOm" role="3clF46">
         <property role="TrG5h" value="nlists" />
@@ -2791,7 +2791,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1e3DfAArnOp" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1e3DfAArnOq" role="1B3o_S" />
       <node concept="3clFbS" id="1e3DfAArnOr" role="3clF47">
@@ -2801,7 +2801,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="1e3DfAArnOv" role="1tU5fm">
               <node concept="3uibUv" id="1e3DfAArnOw" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1e3DfAArnOy" role="33vP2m">
@@ -2815,7 +2815,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="1e3DfAArnOC" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2845,7 +2845,7 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="2zBk6uIk6Ag" role="37vLTx">
-                  <ref role="37wK5l" node="1e3DfAArnP3" resolve="listAtom" />
+                  <ref role="37wK5l" node="1e3DfAArnP3" resolve="list" />
                   <ref role="1Pybhc" node="2zBk6uIjXRS" resolve="Lists" />
                   <node concept="37vLTw" id="1e3DfAArnOQ" role="37wK5m">
                     <ref role="3cqZAo" node="1e3DfAArnOR" resolve="nlist" />
@@ -2868,13 +2868,13 @@
         <node concept="3clFbF" id="1e3DfAArnOV" role="3cqZAp">
           <node concept="2YIFZM" id="1e3DfAArnOX" role="3clFbG">
             <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="Xl_RD" id="1e3DfAArnOY" role="37wK5m">
               <property role="Xl_RC" value="list" />
             </node>
             <node concept="2YIFZM" id="3t7_2FgCwcJ" role="37wK5m">
               <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-              <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+              <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="3t7_2FgCwcL" role="37wK5m">
                 <ref role="3cqZAo" node="1e3DfAArnOu" resolve="array" />
               </node>
@@ -2885,7 +2885,7 @@
     </node>
     <node concept="2tJIrI" id="2zBk6uIk71Q" role="jymVt" />
     <node concept="2YIFZL" id="1e3DfAArnP3" role="jymVt">
-      <property role="TrG5h" value="listAtom" />
+      <property role="TrG5h" value="list" />
       <property role="IEkAT" value="false" />
       <node concept="37vLTG" id="1e3DfAArnP4" role="3clF46">
         <property role="TrG5h" value="nlist" />
@@ -2894,7 +2894,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1e3DfAArnP6" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tmbuc" id="1e3DfAArqls" role="1B3o_S" />
       <node concept="3clFbS" id="1e3DfAArnP9" role="3clF47">
@@ -2904,7 +2904,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="1e3DfAArnPd" role="1tU5fm">
               <node concept="3uibUv" id="1e3DfAArnPe" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1e3DfAArnPg" role="33vP2m">
@@ -2918,7 +2918,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="1e3DfAArnPm" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2948,7 +2948,7 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="YGS68Nhrja" role="37vLTx">
-                  <ref role="37wK5l" node="YGS68N6Tbl" resolve="anchorAtom" />
+                  <ref role="37wK5l" node="YGS68N6Tbl" resolve="anchorTreeForm" />
                   <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
                   <node concept="37vLTw" id="YGS68Nhrjb" role="37wK5m">
                     <ref role="3cqZAo" node="1e3DfAArnP_" resolve="node" />
@@ -2969,13 +2969,13 @@
         <node concept="3clFbF" id="1e3DfAArnPD" role="3cqZAp">
           <node concept="2YIFZM" id="1e3DfAArnPE" role="3clFbG">
             <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="Xl_RD" id="1e3DfAArnPF" role="37wK5m">
               <property role="Xl_RC" value="list" />
             </node>
             <node concept="2YIFZM" id="3t7_2FgCsiN" role="37wK5m">
               <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-              <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+              <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="3t7_2FgCsiP" role="37wK5m">
                 <ref role="3cqZAo" node="1e3DfAArnPc" resolve="array" />
               </node>
@@ -2990,13 +2990,13 @@
     <property role="TrG5h" value="AnchorUtil" />
     <node concept="2tJIrI" id="4OKkcnfu_xp" role="jymVt" />
     <node concept="2YIFZL" id="4OKkcnfu_xq" role="jymVt">
-      <property role="TrG5h" value="anchorAtom" />
+      <property role="TrG5h" value="anchorTreeForm" />
       <node concept="37vLTG" id="4OKkcnfu_xr" role="3clF46">
         <property role="TrG5h" value="concept" />
         <node concept="3bZ5Sz" id="YGS68N6TkG" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4OKkcnfu_xt" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="4OKkcnfu_xu" role="1B3o_S" />
       <node concept="3clFbS" id="4OKkcnfu_xv" role="3clF47">
@@ -3018,13 +3018,13 @@
     </node>
     <node concept="2tJIrI" id="YGS68N6TfG" role="jymVt" />
     <node concept="2YIFZL" id="YGS68N6Tbl" role="jymVt">
-      <property role="TrG5h" value="anchorAtom" />
+      <property role="TrG5h" value="anchorTreeForm" />
       <node concept="37vLTG" id="YGS68N6Tbm" role="3clF46">
         <property role="TrG5h" value="node" />
         <node concept="3Tqbb2" id="YGS68N6Tbn" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="YGS68N6Tbo" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="YGS68N6Tbp" role="1B3o_S" />
       <node concept="3clFbS" id="YGS68N6Tbq" role="3clF47">
@@ -3045,7 +3045,7 @@
       <node concept="37vLTG" id="6_UQWSXaW4f" role="3clF46">
         <property role="TrG5h" value="maybeAnchor" />
         <node concept="3uibUv" id="6_UQWSXaW63" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="6_UQWSXb37t" role="3clF45">
@@ -3152,7 +3152,7 @@
       <property role="TrG5h" value="anchor" />
       <node concept="3Tmbuc" id="1e3DfAAraC0" role="1B3o_S" />
       <node concept="3uibUv" id="4OKkcnfu_xB" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="37vLTG" id="4OKkcnfu_xD" role="3clF46">
         <property role="TrG5h" value="node" />
@@ -3164,7 +3164,7 @@
             <node concept="3cpWs6" id="4OKkcnfu_xI" role="3cqZAp">
               <node concept="2YIFZM" id="4OKkcnfu_xJ" role="3cqZAk">
                 <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="4OKkcnfu_xK" role="37wK5m">
                   <property role="Xl_RC" value="node_1" />
                 </node>
@@ -3310,7 +3310,7 @@
                 <property role="TrG5h" value="paramsArr" />
                 <node concept="10Q1$e" id="5_6ImQZju9S" role="1tU5fm">
                   <node concept="3uibUv" id="5_6ImQZju9T" role="10Q1$1">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="5_6ImQZju9U" role="33vP2m">
@@ -3324,7 +3324,7 @@
                       </node>
                     </node>
                     <node concept="3uibUv" id="5_6ImQZjua0" role="3$_nBY">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -3375,7 +3375,7 @@
             <node concept="3cpWs6" id="6infEALwTvt" role="3cqZAp">
               <node concept="2YIFZM" id="6infEALwTvu" role="3cqZAk">
                 <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="6infEALwTvv" role="37wK5m">
                   <property role="Xl_RC" value="node_4" />
                 </node>
@@ -3411,13 +3411,13 @@
                 </node>
                 <node concept="2YIFZM" id="3t7_2FgCsY0" role="37wK5m">
                   <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                  <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                  <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                   <node concept="Xl_RD" id="3t7_2FgCsY1" role="37wK5m">
                     <property role="Xl_RC" value="parameter" />
                   </node>
                   <node concept="2YIFZM" id="3t7_2FgCvB0" role="37wK5m">
                     <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+                    <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
                     <node concept="37vLTw" id="5_6ImQZjxi9" role="37wK5m">
                       <ref role="3cqZAo" node="5_6ImQZju9R" resolve="paramsArr" />
                     </node>
@@ -3460,7 +3460,7 @@
             <node concept="3cpWs6" id="4OKkcnfu_yj" role="3cqZAp">
               <node concept="2YIFZM" id="4OKkcnfu_yk" role="3cqZAk">
                 <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="4OKkcnfu_yl" role="37wK5m">
                   <property role="Xl_RC" value="node_3" />
                 </node>
@@ -3551,7 +3551,7 @@
             <node concept="3cpWs6" id="4OKkcnfu_yR" role="3cqZAp">
               <node concept="2YIFZM" id="4OKkcnfu_yS" role="3cqZAk">
                 <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="4OKkcnfu_yT" role="37wK5m">
                   <property role="Xl_RC" value="node_3" />
                 </node>
@@ -3593,7 +3593,7 @@
         <node concept="3cpWs6" id="4OKkcnfu_z4" role="3cqZAp">
           <node concept="2YIFZM" id="4OKkcnfu_z5" role="3cqZAk">
             <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="Xl_RD" id="4OKkcnfu_z6" role="37wK5m">
               <property role="Xl_RC" value="node_2" />
             </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 72000e06..aba7a5ac 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -2734,14 +2734,14 @@
                       <node concept="3uibUv" id="HV6urVCET4" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCET5" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCET6" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCET7" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCET8" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCET9" role="10QFUP">
@@ -2763,7 +2763,7 @@
                     <node concept="3cpWsn" id="HV6urVCETf" role="3cpWs9">
                       <property role="TrG5h" value="anchor" />
                       <node concept="3uibUv" id="HV6urVCETg" role="1tU5fm">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
@@ -2792,7 +2792,7 @@
                         <node concept="37vLTI" id="HV6urVCETr" role="3clFbG">
                           <node concept="10QFUN" id="HV6urVCETs" role="37vLTx">
                             <node concept="3uibUv" id="HV6urVCETt" role="10QFUM">
-                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                             <node concept="37vLTw" id="HV6urVCETu" role="10QFUP">
                               <ref role="3cqZAo" node="HV6urVCETi" resolve="arg1" />
@@ -2807,7 +2807,7 @@
                     </node>
                     <node concept="2ZW3vV" id="HV6urVCETx" role="3clFbw">
                       <node concept="3uibUv" id="HV6urVCETy" role="2ZW6by">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                       <node concept="37vLTw" id="HV6urVCETz" role="2ZW6bz">
                         <ref role="3cqZAo" node="HV6urVCETi" resolve="arg1" />
@@ -2832,7 +2832,7 @@
                                     <node concept="3uibUv" id="HV6urVCETJ" role="10QFUM">
                                       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                                       <node concept="3uibUv" id="HV6urVCETK" role="11_B2D">
-                                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                                       </node>
                                     </node>
                                     <node concept="37vLTw" id="HV6urVCETL" role="10QFUP">
@@ -3029,14 +3029,14 @@
                       <node concept="3uibUv" id="HV6urVCEUJ" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCLNb" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEUK" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEUL" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCMgy" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCEUM" role="10QFUP">
@@ -3134,14 +3134,14 @@
                       <node concept="3uibUv" id="HV6urVCEVk" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCPsS" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEVl" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEVm" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCPVa" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCEVn" role="10QFUP">
@@ -3164,14 +3164,14 @@
                       <node concept="3uibUv" id="HV6urVCEVt" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCEVu" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEVv" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEVw" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCEVx" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCEVy" role="10QFUP">
@@ -7608,9 +7608,9 @@
                                 <property role="TrG5h" value="doPrint" />
                                 <property role="1EzhhJ" value="false" />
                                 <node concept="37vLTG" id="1pPth$l_Zkr" role="3clF46">
-                                  <property role="TrG5h" value="atom" />
+                                  <property role="TrG5h" value="tf" />
                                   <node concept="3uibUv" id="1pPth$l_Zks" role="1tU5fm">
-                                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                                   </node>
                                 </node>
                                 <node concept="17QB3L" id="1pPth$l_Zkt" role="3clF45" />
@@ -7626,7 +7626,7 @@
                                           <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
                                           <ref role="37wK5l" node="4peSo3CHBfF" resolve="print" />
                                           <node concept="37vLTw" id="1pPth$l_Zk_" role="37wK5m">
-                                            <ref role="3cqZAo" node="1pPth$l_Zkr" resolve="atom" />
+                                            <ref role="3cqZAo" node="1pPth$l_Zkr" resolve="tf" />
                                           </node>
                                         </node>
                                       </node>
@@ -9148,9 +9148,9 @@
                     <property role="TrG5h" value="doPrint" />
                     <property role="1EzhhJ" value="false" />
                     <node concept="37vLTG" id="7nPD14Nhk6K" role="3clF46">
-                      <property role="TrG5h" value="atom" />
+                      <property role="TrG5h" value="tf" />
                       <node concept="3uibUv" id="7nPD14Nhk6L" role="1tU5fm">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="17QB3L" id="7nPD14Nhk6M" role="3clF45" />
@@ -9166,7 +9166,7 @@
                               <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
                               <ref role="37wK5l" node="4peSo3CHBfF" resolve="print" />
                               <node concept="37vLTw" id="7nPD14Nhk6U" role="37wK5m">
-                                <ref role="3cqZAo" node="7nPD14Nhk6K" resolve="atom" />
+                                <ref role="3cqZAo" node="7nPD14Nhk6K" resolve="tf" />
                               </node>
                             </node>
                           </node>
@@ -17480,7 +17480,7 @@
                   <node concept="3uibUv" id="6QkkSolK_jp" role="1tU5fm">
                     <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                     <node concept="3uibUv" id="6QkkSolK_jq" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                   <node concept="1eOMI4" id="6QkkSolK_jr" role="33vP2m">
@@ -17488,7 +17488,7 @@
                       <node concept="3uibUv" id="6QkkSolK_jt" role="10QFUM">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="6QkkSolK_ju" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="6QkkSolK_jv" role="10QFUP">
@@ -17538,7 +17538,7 @@
             <node concept="3eNFk2" id="6QkkSolK_jJ" role="3eNLev">
               <node concept="2ZW3vV" id="6QkkSolK_jK" role="3eO9$A">
                 <node concept="3uibUv" id="6QkkSolK_jL" role="2ZW6by">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="6QkkSolK_jM" role="2ZW6bz">
                   <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
@@ -17565,12 +17565,12 @@
                       <ref role="37wK5l" to="4r4j:6_UQWSXaVTr" resolve="findReference" />
                       <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
                       <node concept="2YIFZM" id="6QkkSolK_jX" role="37wK5m">
-                        <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                        <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                         <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
                         <node concept="1eOMI4" id="6QkkSolK_jY" role="37wK5m">
                           <node concept="10QFUN" id="6QkkSolK_jZ" role="1eOMHV">
                             <node concept="3uibUv" id="6QkkSolK_k0" role="10QFUM">
-                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                             <node concept="37vLTw" id="6QkkSolK_k1" role="10QFUP">
                               <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
@@ -18405,7 +18405,7 @@
       <node concept="37vLTG" id="4pWvZ2njjOw" role="3clF46">
         <property role="TrG5h" value="anchor" />
         <node concept="3uibUv" id="4pWvZ2njjOx" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="HV6urVDcLx" role="3clF45">
@@ -18437,7 +18437,7 @@
           <node concept="3cpWsn" id="4pWvZ2njipz" role="3cpWs9">
             <property role="TrG5h" value="value" />
             <node concept="3uibUv" id="4pWvZ2njip$" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="4pWvZ2njip_" role="33vP2m">
               <node concept="2OqwBi" id="4pWvZ2njipA" role="2Oq$k0">
@@ -18469,7 +18469,7 @@
                     <ref role="37wK5l" node="4peSo3D04j7" resolve="print" />
                     <node concept="2YIFZM" id="4pWvZ2njipM" role="37wK5m">
                       <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <node concept="37vLTw" id="4pWvZ2njipN" role="37wK5m">
                         <ref role="3cqZAo" node="4pWvZ2njipz" resolve="value" />
                       </node>
@@ -18624,7 +18624,7 @@
         <node concept="3uibUv" id="63ioh_TVF7K" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TVF7L" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18640,7 +18640,7 @@
         <node concept="3uibUv" id="HV6urVCQ80" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCQ81" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18649,7 +18649,7 @@
         <node concept="3uibUv" id="HV6urVCQ83" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCQ84" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18682,7 +18682,7 @@
         <node concept="3uibUv" id="HV6urVCNox" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCNoy" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18723,7 +18723,7 @@
         <node concept="3uibUv" id="63ioh_TVMaj" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TVMak" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18756,7 +18756,7 @@
                 <node concept="3uibUv" id="63ioh_TVmoK" role="1tU5fm">
                   <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                   <node concept="3uibUv" id="63ioh_TVmYn" role="11_B2D">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="6HT7BWBSOYS" role="33vP2m">
@@ -18839,14 +18839,14 @@
                   <node concept="3uibUv" id="3gJBs5s_7I4" role="1tU5fm">
                     <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                     <node concept="3uibUv" id="4TCblo6gC1j" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                   <node concept="10QFUN" id="4TCblo6gCrJ" role="33vP2m">
                     <node concept="3uibUv" id="4TCblo6gCr_" role="10QFUM">
                       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                       <node concept="3uibUv" id="4TCblo6gCrA" role="11_B2D">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="4TCblo6gCrB" role="10QFUP">
@@ -18956,7 +18956,7 @@
         <node concept="3uibUv" id="4TCblo6gv5I" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="4TCblo6gv5J" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18990,7 +18990,7 @@
           <node concept="3cpWsn" id="4TCblo6gv4O" role="3cpWs9">
             <property role="TrG5h" value="boundValue" />
             <node concept="3uibUv" id="4TCblo6gv4P" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="4TCblo6gv4Q" role="33vP2m">
               <node concept="2OqwBi" id="4TCblo6gv4R" role="2Oq$k0">
@@ -19021,7 +19021,7 @@
                     <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
                     <ref role="37wK5l" node="4peSo3D04j7" resolve="print" />
                     <node concept="2YIFZM" id="4TCblo6gv53" role="37wK5m">
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
                       <node concept="37vLTw" id="4TCblo6gv54" role="37wK5m">
                         <ref role="3cqZAo" node="4TCblo6gv4O" resolve="boundValue" />
@@ -19165,7 +19165,7 @@
         <node concept="3uibUv" id="63ioh_TUSSq" role="11_B2D">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TUTD_" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -19178,7 +19178,7 @@
           <node concept="3uibUv" id="63ioh_TUUM4" role="1pMfVU">
             <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
             <node concept="3uibUv" id="63ioh_TUVz6" role="11_B2D">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -19466,15 +19466,15 @@
     </node>
     <node concept="2tJIrI" id="3mz2_dYc9vL" role="jymVt" />
     <node concept="2YIFZL" id="3mz2_dYbXuI" role="jymVt">
-      <property role="TrG5h" value="atomSnapshot" />
+      <property role="TrG5h" value="treeFormSnapshot" />
       <node concept="37vLTG" id="3mz2_dYbXuJ" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYbXYO" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYbYkL" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm6S6" id="3mz2_dYbXuM" role="1B3o_S" />
       <node concept="3clFbS" id="3mz2_dYbXuN" role="3clF47">
@@ -19644,7 +19644,7 @@
           <node concept="3eNFk2" id="3mz2_dYaDvF" role="3eNLev">
             <node concept="2ZW3vV" id="3mz2_dYaDDW" role="3eO9$A">
               <node concept="3uibUv" id="3mz2_dYaDLn" role="2ZW6by">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="37vLTw" id="3mz2_dYaDDm" role="2ZW6bz">
                 <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -19657,11 +19657,11 @@
                     <ref role="16sUi3" node="3mz2_dYb_lK" resolve="T" />
                   </node>
                   <node concept="1rXfSq" id="3mz2_dYbZrm" role="10QFUP">
-                    <ref role="37wK5l" node="3mz2_dYbXuI" resolve="atomSnapshot" />
+                    <ref role="37wK5l" node="3mz2_dYbXuI" resolve="treeFormSnapshot" />
                     <node concept="1eOMI4" id="3mz2_dYbZMJ" role="37wK5m">
                       <node concept="10QFUN" id="3mz2_dYbZMG" role="1eOMHV">
                         <node concept="3uibUv" id="3mz2_dYbZML" role="10QFUM">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="37vLTw" id="3mz2_dYbZMM" role="10QFUP">
                           <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -20250,9 +20250,9 @@
       <node concept="2tJIrI" id="3mz2_dYbeOi" role="jymVt" />
       <node concept="3clFb_" id="3mz2_dYaWni" role="jymVt">
         <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="asAtom" />
+        <property role="TrG5h" value="asTreeForm" />
         <node concept="3uibUv" id="3mz2_dYaWnj" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="3mz2_dYaWnk" role="1B3o_S" />
         <node concept="3clFbS" id="3mz2_dYaWnm" role="3clF47">
@@ -20268,9 +20268,9 @@
       <node concept="2tJIrI" id="3mz2_dYbeYW" role="jymVt" />
       <node concept="3clFb_" id="3mz2_dYaWnp" role="jymVt">
         <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="asAtom" />
+        <property role="TrG5h" value="asTreeForm" />
         <node concept="3uibUv" id="3mz2_dYaWnq" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="3mz2_dYaWnr" role="1B3o_S" />
         <node concept="37vLTG" id="3mz2_dYaWnt" role="3clF46">
@@ -20279,7 +20279,7 @@
             <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
             <node concept="3qUE_q" id="3mz2_dYaWnv" role="11_B2D">
               <node concept="3uibUv" id="3mz2_dYaWnw" role="3qUE_r">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -20304,7 +20304,7 @@
             <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
             <node concept="3qUE_q" id="3mz2_dYaWnB" role="11_B2D">
               <node concept="3uibUv" id="3mz2_dYaWnC" role="3qUE_r">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -20509,9 +20509,9 @@
               <property role="1EzhhJ" value="false" />
               <property role="TrG5h" value="canMap" />
               <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
-                <property role="TrG5h" value="atom" />
+                <property role="TrG5h" value="tf" />
                 <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
@@ -20525,7 +20525,7 @@
                     </node>
                     <node concept="2OqwBi" id="6HT7BWBQdzA" role="3uHU7w">
                       <node concept="37vLTw" id="6HT7BWBQdtS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="atom" />
+                        <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                       </node>
                       <node concept="liA8E" id="6HT7BWBQdDR" role="2OqNvi">
                         <ref role="37wK5l" to="ie8e:104EUzFOBnD" resolve="acceptVisitor" />
@@ -20533,7 +20533,7 @@
                           <node concept="YeOm9" id="6HT7BWBQdQT" role="2ShVmc">
                             <node concept="1Y3b0j" id="6HT7BWBQdQW" role="YeSDq">
                               <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" to="ie8e:6HT7BWBQcxv" resolve="Atom.Visitor.Stub" />
+                              <ref role="1Y3XeK" to="ie8e:6HT7BWBQcxv" resolve="TreeForm.Visitor.Stub" />
                               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                               <node concept="3Tm1VV" id="6HT7BWBQdQX" role="1B3o_S" />
                               <node concept="3clFb_" id="6HT7BWBQdTD" role="jymVt">
@@ -20584,20 +20584,20 @@
               <property role="1EzhhJ" value="false" />
               <property role="TrG5h" value="map" />
               <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
-                <property role="TrG5h" value="atom" />
+                <property role="TrG5h" value="tf" />
                 <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
                 <property role="TrG5h" value="fallback" />
                 <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="Atom.Mapper" />
+                  <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="TreeForm.Mapper" />
                 </node>
               </node>
               <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
               <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
                 <node concept="3cpWs8" id="3mz2_dYcBbl" role="3cqZAp">
@@ -20606,21 +20606,21 @@
                     <node concept="3uibUv" id="3mz2_dYcBbf" role="1tU5fm">
                       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                       <node concept="3uibUv" id="3mz2_dYcHfy" role="11_B2D">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="10QFUN" id="3mz2_dYcHQR" role="33vP2m">
                       <node concept="3uibUv" id="3mz2_dYcHQJ" role="10QFUM">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="3mz2_dYcHQK" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3mz2_dYcHQL" role="10QFUP">
                         <node concept="1eOMI4" id="3mz2_dYcHQM" role="2Oq$k0">
                           <node concept="10QFUN" id="3mz2_dYcHQN" role="1eOMHV">
                             <node concept="37vLTw" id="3mz2_dYcHQO" role="10QFUP">
-                              <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="atom" />
+                              <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                             </node>
                             <node concept="3uibUv" id="3mz2_dYcHQP" role="10QFUM">
                               <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
@@ -20674,7 +20674,7 @@
                       <node concept="3cpWs6" id="3mz2_dYcMNK" role="3cqZAp">
                         <node concept="2ShNRf" id="3mz2_dYcNtL" role="3cqZAk">
                           <node concept="1pGfFk" id="3mz2_dYcQi_" role="2ShVmc">
-                            <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalAtom" />
+                            <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalTreeForm" />
                             <node concept="1rXfSq" id="3mz2_dYcRe2" role="37wK5m">
                               <ref role="37wK5l" node="3mz2_dYc9vM" resolve="logicalSnapshot" />
                               <node concept="37vLTw" id="3mz2_dYcRXl" role="37wK5m">
@@ -20700,7 +20700,7 @@
       <property role="TrG5h" value="SNAPSHOT_MAPPER" />
       <node concept="3Tm6S6" id="1jo82tq2G6J" role="1B3o_S" />
       <node concept="3uibUv" id="1jo82tq2G6K" role="1tU5fm">
-        <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="Atom.Mapper" />
+        <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="TreeForm.Mapper" />
       </node>
       <node concept="2YIFZM" id="1jo82tq2G6L" role="33vP2m">
         <ref role="1Pybhc" to="ie8e:3OPtF02T8yx" resolve="Mappers" />
@@ -31062,9 +31062,9 @@
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="print" />
       <node concept="37vLTG" id="4peSo3CHB$z" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CHBGl" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHB5z" role="3clF47">
@@ -31085,7 +31085,7 @@
           <node concept="1rXfSq" id="4peSo3CILpz" role="3clFbG">
             <ref role="37wK5l" node="4peSo3CIJRO" resolve="doPrint" />
             <node concept="37vLTw" id="6HT7BWBRhCT" role="37wK5m">
-              <ref role="3cqZAo" node="4peSo3CHB$z" resolve="atom" />
+              <ref role="3cqZAo" node="4peSo3CHB$z" resolve="tf" />
             </node>
             <node concept="2ShNRf" id="4peSo3D1xgT" role="37wK5m">
               <node concept="HV5vD" id="4peSo3D1x$v" role="2ShVmc">
@@ -31118,9 +31118,9 @@
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="print" />
       <node concept="37vLTG" id="4peSo3D04j8" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3D04j9" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D075N" role="3clF46">
@@ -31147,7 +31147,7 @@
           <node concept="1rXfSq" id="4peSo3D1wNo" role="3clFbG">
             <ref role="37wK5l" node="4peSo3CIJRO" resolve="doPrint" />
             <node concept="37vLTw" id="6HT7BWBRh_w" role="37wK5m">
-              <ref role="3cqZAo" node="4peSo3D04j8" resolve="atom" />
+              <ref role="3cqZAo" node="4peSo3D04j8" resolve="tf" />
             </node>
             <node concept="37vLTw" id="4peSo3D1xXE" role="37wK5m">
               <ref role="3cqZAo" node="4peSo3D075N" resolve="variableSymbol" />
@@ -31178,9 +31178,9 @@
       <property role="od$2w" value="false" />
       <property role="TrG5h" value="doPrint" />
       <node concept="37vLTG" id="4peSo3CIJRP" role="3clF46">
-        <property role="TrG5h" value="atom" />
+        <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CIJRQ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D1wUl" role="3clF46">
@@ -31209,7 +31209,7 @@
                     <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="4peSo3CIJS2" role="37wK5m">
-                      <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+                      <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
                     </node>
                   </node>
                 </node>
@@ -31226,7 +31226,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="4peSo3CIJS7" role="2Oq$k0">
-              <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+              <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
             </node>
           </node>
           <node concept="9aQIb" id="4peSo3CIJS8" role="9aQIa">
@@ -31235,7 +31235,7 @@
                 <node concept="2OqwBi" id="4peSo3CIJSb" role="3clFbG">
                   <node concept="2ShNRf" id="4peSo3CIJSc" role="2Oq$k0">
                     <node concept="1pGfFk" id="4peSo3CIJSd" role="2ShVmc">
-                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="AtomWalk" />
+                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
                       <node concept="2ShNRf" id="4peSo3CINyv" role="37wK5m">
                         <node concept="1pGfFk" id="4peSo3CINPP" role="2ShVmc">
                           <ref role="37wK5l" node="4peSo3CIw3p" resolve="NodePrinter" />
@@ -31253,9 +31253,9 @@
                     <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
                     <node concept="2YIFZM" id="6HT7BWBRh6I" role="37wK5m">
                       <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="AtomUtil" />
+                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <node concept="37vLTw" id="6HT7BWBRhg3" role="37wK5m">
-                        <ref role="3cqZAo" node="4peSo3CIJRP" resolve="atom" />
+                        <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
                       </node>
                     </node>
                   </node>
@@ -31334,7 +31334,7 @@
     <node concept="2tJIrI" id="4peSo3CIBGi" role="jymVt" />
     <node concept="3Tm1VV" id="4peSo3CHy8E" role="1B3o_S" />
     <node concept="3uibUv" id="4peSo3CHzrM" role="EKbjA">
-      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="AtomWalk.Walker" />
+      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
     </node>
     <node concept="3clFb_" id="4peSo3CHzzR" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -31346,7 +31346,7 @@
       <node concept="37vLTG" id="4peSo3CHzzV" role="3clF46">
         <property role="TrG5h" value="cb" />
         <node concept="3uibUv" id="4peSo3CHzzW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="StemFunc" />
+          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHz$5" role="3clF47">
@@ -31631,7 +31631,7 @@
       <node concept="37vLTG" id="4peSo3CHz$A" role="3clF46">
         <property role="TrG5h" value="listb" />
         <node concept="3uibUv" id="5YIOneOU7$j" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListFunc" />
+          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
     </node>
@@ -31725,7 +31725,7 @@
       <node concept="37vLTG" id="4peSo3CHz$c" role="3clF46">
         <property role="TrG5h" value="valb" />
         <node concept="3uibUv" id="5YIOneONkSZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueFunc" />
+          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
           <node concept="16syzq" id="5YIOneONkT0" role="11_B2D">
             <ref role="16sUi3" node="4peSo3CHz$i" resolve="V" />
           </node>
@@ -31808,7 +31808,7 @@
       <node concept="37vLTG" id="4peSo3CHz$q" role="3clF46">
         <property role="TrG5h" value="varb" />
         <node concept="3uibUv" id="5YIOneOSlWm" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableFunc" />
+          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableNode" />
         </node>
       </node>
     </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 409707bb..c6b7730c 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -9724,7 +9724,7 @@
                                 </node>
                               </node>
                               <node concept="3uibUv" id="1L74NXGlUxQ" role="3clF45">
-                                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                               </node>
                               <node concept="3Tmbuc" id="1L74NXGlU7F" role="1B3o_S" />
                               <node concept="3clFbS" id="1L74NXGlGt6" role="3clF47">
@@ -10465,7 +10465,7 @@
             </node>
           </node>
           <node concept="3uibUv" id="1L74NXG5Fnm" role="3clF45">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
           <node concept="3Tmbuc" id="1L74NXG5G7o" role="1B3o_S" />
           <node concept="3clFbS" id="1L74NXG5FfZ" role="3clF47">
@@ -11225,7 +11225,7 @@
         <node concept="3clFb_" id="1L74NXEvZZv" role="jymVt">
           <property role="TrG5h" value="typeTerm" />
           <node concept="3uibUv" id="4gW0vesTxMA" role="3clF45">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
           <node concept="3Tm1VV" id="1L74NXEUsh1" role="1B3o_S" />
           <node concept="3clFbS" id="1L74NXEvZZz" role="3clF47">
@@ -11300,7 +11300,7 @@
             </node>
           </node>
           <node concept="3uibUv" id="4gW0vesTAtz" role="3clF45">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
           <node concept="3Tm1VV" id="1L74NXFPMn6" role="1B3o_S" />
           <node concept="3clFbS" id="1L74NXFPMn9" role="3clF47">
@@ -11742,7 +11742,7 @@
           <node concept="3clFb_" id="1L74NXFZxBo" role="jymVt">
             <property role="TrG5h" value="feature" />
             <node concept="3uibUv" id="1L74NXFZxOu" role="3clF45">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="3Tm1VV" id="1L74NXFZxBr" role="1B3o_S" />
             <node concept="3clFbS" id="1L74NXFZxBs" role="3clF47">
@@ -16756,7 +16756,7 @@
           </node>
           <node concept="1Koe21" id="1sCZQVfjxug" role="150oIE">
             <node concept="3VsKOn" id="1sCZQVfjxuh" role="1Koe22">
-              <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="1sCZQVfjxui" role="lGtFl" />
             </node>
           </node>
@@ -16784,7 +16784,7 @@
                   </node>
                   <node concept="2c44tf" id="6MYr6JxnB0K" role="3JuZjQ">
                     <node concept="3uibUv" id="6MYr6JxnB0L" role="2c44tc">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -16793,7 +16793,7 @@
           </node>
           <node concept="1Koe21" id="6MYr6JxnB0M" role="150oIE">
             <node concept="3VsKOn" id="6MYr6JxnB0N" role="1Koe22">
-              <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="6MYr6JxnB0O" role="lGtFl" />
               <node concept="1ZhdrF" id="6MYr6JxnBgh" role="lGtFl">
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
@@ -16963,7 +16963,7 @@
           </node>
           <node concept="1Koe21" id="49L2l3F7Wp7" role="150oIE">
             <node concept="3uibUv" id="49L2l3F7WC9" role="1Koe22">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="49L2l3F7WCe" role="lGtFl" />
             </node>
           </node>
@@ -16991,7 +16991,7 @@
                   </node>
                   <node concept="2c44tf" id="6MYr6Jxp5Pc" role="3JuZjQ">
                     <node concept="3uibUv" id="6MYr6Jxp5Pd" role="2c44tc">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -17000,7 +17000,7 @@
           </node>
           <node concept="1Koe21" id="6MYr6Jxp5Pe" role="150oIE">
             <node concept="3uibUv" id="6MYr6Jxp5Pf" role="1Koe22">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="6MYr6Jxp5Pg" role="lGtFl" />
               <node concept="29HgVG" id="6MYr6Jxp6cC" role="lGtFl">
                 <node concept="3NFfHV" id="6MYr6Jxp6cD" role="3NFExx">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
index 203f39c4..295bc087 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
@@ -3148,7 +3148,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4gW0vesTseu" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1L74NXEx75C" role="1B3o_S" />
       <node concept="3clFbS" id="1L74NXEx75D" role="3clF47">
@@ -3223,7 +3223,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4gW0vesTEXg" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1L74NXGis3F" role="1B3o_S" />
       <node concept="3clFbS" id="1L74NXGis3G" role="3clF47">
@@ -3287,7 +3287,7 @@
         <node concept="3bZ5Sz" id="1L74NXF7OB2" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4gW0vesTFpY" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1L74NXF7OB7" role="1B3o_S" />
       <node concept="3clFbS" id="1L74NXF7OB8" role="3clF47">
@@ -3525,7 +3525,7 @@
                 <property role="Xl_RC" value="Pattern" />
               </node>
               <node concept="3VsKOn" id="18kNIl0Glkd" role="37wK5m">
-                <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+                <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="18kNIl0Glke" role="37wK5m">
                 <node concept="37vLTw" id="18kNIl0Glkf" role="2Oq$k0">
@@ -3716,7 +3716,7 @@
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="typeTerm" />
         <node concept="3uibUv" id="4gW0vesT_Kt" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="1L74NXETJCf" role="1B3o_S" />
         <node concept="3clFbS" id="1L74NXETJCg" role="3clF47" />
@@ -3732,7 +3732,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="4gW0vesTEqs" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
+          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="1L74NXFPEk7" role="1B3o_S" />
         <node concept="3clFbS" id="1L74NXFPEk8" role="3clF47" />