diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 29e1a75c..d76c97fa 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -165,26 +165,26 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="861509610434242029" name="" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="" index="ns1xF" />
-        <child id="861509610434243076" name="" index="ns1xD" />
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="" index="ns1xc" />
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="" index="ns1xx" />
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276453" name="" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="" index="nspS5" />
+      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
       </concept>
-      <concept id="861509610434276450" name="" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="" index="nspSe" />
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
-      <concept id="861509610434294982" name="" flags="ng" index="nssqF" />
-      <concept id="861509610434435669" name="" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="" index="nsMwP" />
-        <child id="861509610434435670" name="" index="nsMwV" />
+      <concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@@ -201,7 +201,7 @@
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
-      <concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
+      <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
         <child id="6097203247147235901" name="logical" index="3h32gL" />
         <child id="6097203247141261094" name="code" index="3hEL4E" />
@@ -360,9 +360,9 @@
                         <ref role="a7OzE" node="7lt0LtPOZW8" resolve="T" />
                       </node>
                       <node concept="ns1u0" id="7mB3viLbLNi" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt6y" />
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
                         <node concept="nsMwS" id="7mB3viLdI7t" role="ns1xD">
-                          <ref role="nsMwP" node="7mB3viLdDa5" />
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                           <node concept="1nq8_$" id="7mB3viLdI7A" role="nsMwV">
                             <node concept="a7P8L" id="7mB3viLdI7$" role="1nq8_t">
                               <ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
@@ -370,7 +370,7 @@
                           </node>
                         </node>
                         <node concept="nsMwS" id="7mB3viLbLNk" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt6$" />
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                           <node concept="1nq8_$" id="7mB3viLbLOy" role="nsMwV">
                             <node concept="a7P8L" id="7mB3viLbLOw" role="1nq8_t">
                               <ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
@@ -484,15 +484,15 @@
                         <ref role="a7OzE" node="7mB3viLi4pQ" resolve="A" />
                       </node>
                       <node concept="ns1u0" id="7mB3viLi4rf" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt6y" />
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
                         <node concept="nsMwS" id="7mB3viLi4rl" role="ns1xD">
-                          <ref role="nsMwP" node="7mB3viLdDa5" />
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                           <node concept="Xl_RD" id="7mB3viLi4rr" role="nsMwV">
                             <property role="Xl_RC" value="Integer" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="7mB3viLi4rh" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt6$" />
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                           <node concept="1nq8_$" id="7mB3viLi4v0" role="nsMwV">
                             <node concept="a7P8L" id="7mB3viLi4uY" role="1nq8_t">
                               <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
@@ -506,15 +506,15 @@
                         <ref role="a7OzE" node="7mB3viLi4qh" resolve="B" />
                       </node>
                       <node concept="ns1u0" id="7mB3viLi4vZ" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt6y" />
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
                         <node concept="nsMwS" id="7mB3viLi4w0" role="ns1xD">
-                          <ref role="nsMwP" node="7mB3viLdDa5" />
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                           <node concept="Xl_RD" id="7mB3viLi4w1" role="nsMwV">
                             <property role="Xl_RC" value="Integer" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="7mB3viLi4w2" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt6$" />
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                           <node concept="1nq8_$" id="7mB3viLi4w3" role="nsMwV">
                             <node concept="a7P8L" id="7mB3viLi4wZ" role="1nq8_t">
                               <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
@@ -589,15 +589,15 @@
                         <ref role="a7OzE" node="5TXeSYT5cnn" resolve="A" />
                       </node>
                       <node concept="ns1u0" id="2DIFeUB7n6m" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt6y" />
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
                         <node concept="nsMwS" id="2DIFeUB7n6n" role="ns1xD">
-                          <ref role="nsMwP" node="7mB3viLdDa5" />
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                           <node concept="Xl_RD" id="2DIFeUB7n6o" role="nsMwV">
                             <property role="Xl_RC" value="String" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="2DIFeUB7n6p" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt6$" />
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                           <node concept="1nq8_$" id="2DIFeUB7n6q" role="nsMwV">
                             <node concept="a7P8L" id="2DIFeUB7sez" role="1nq8_t">
                               <ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
@@ -611,15 +611,15 @@
                         <ref role="a7OzE" node="5TXeSYT5cno" resolve="B" />
                       </node>
                       <node concept="ns1u0" id="2DIFeUB7n6u" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt6y" />
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
                         <node concept="nsMwS" id="2DIFeUB7n6v" role="ns1xD">
-                          <ref role="nsMwP" node="7mB3viLdDa5" />
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                           <node concept="Xl_RD" id="2DIFeUB7n6w" role="nsMwV">
                             <property role="Xl_RC" value="String" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="2DIFeUB7n6x" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt6$" />
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                           <node concept="1nq8_$" id="2DIFeUB7n6y" role="nsMwV">
                             <node concept="a7P8L" id="2DIFeUB7seD" role="1nq8_t">
                               <ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
@@ -1038,15 +1038,15 @@
               </node>
             </node>
             <node concept="ns1u0" id="7mB3viLcOh9" role="3A8w4Q">
-              <ref role="ns1xF" node="JOGAOsVt6y" />
+              <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
               <node concept="nsMwS" id="7mB3viLdDgZ" role="ns1xD">
-                <ref role="nsMwP" node="7mB3viLdDa5" />
+                <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                 <node concept="Xl_RD" id="7mB3viLdDh5" role="nsMwV">
                   <property role="Xl_RC" value="Integer" />
                 </node>
               </node>
               <node concept="nsMwS" id="7mB3viLcOhb" role="ns1xD">
-                <ref role="nsMwP" node="JOGAOsVt6$" />
+                <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                 <node concept="37vLTw" id="1ALxU7reSPU" role="nsMwV">
                   <ref role="3cqZAo" node="1ALxU7reSPQ" resolve="val" />
                 </node>
@@ -1132,15 +1132,15 @@
               </node>
             </node>
             <node concept="ns1u0" id="7mB3viLdDcc" role="3A8w4Q">
-              <ref role="ns1xF" node="JOGAOsVt6y" />
+              <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
               <node concept="nsMwS" id="7mB3viLdDce" role="ns1xD">
-                <ref role="nsMwP" node="7mB3viLdDa5" />
+                <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                 <node concept="Xl_RD" id="7mB3viLdDcD" role="nsMwV">
                   <property role="Xl_RC" value="String" />
                 </node>
               </node>
               <node concept="nsMwS" id="7mB3viLdDci" role="ns1xD">
-                <ref role="nsMwP" node="JOGAOsVt6$" />
+                <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                 <node concept="37vLTw" id="1ALxU7rfknU" role="nsMwV">
                   <ref role="3cqZAo" node="1ALxU7rfknQ" resolve="val" />
                 </node>
@@ -1200,9 +1200,9 @@
               <ref role="a7OzE" node="1ALxU7rh13o" resolve="Type" />
             </node>
             <node concept="ns1u0" id="1ALxU7rhb4_" role="3A8w4Q">
-              <ref role="ns1xF" node="JOGAOsVt6y" />
+              <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
               <node concept="nsMwS" id="1ALxU7rhbwt" role="ns1xD">
-                <ref role="nsMwP" node="7mB3viLdDa5" />
+                <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                 <node concept="Xl_RD" id="1ALxU7rhcod" role="nsMwV">
                   <property role="Xl_RC" value="Pair" />
                 </node>
@@ -1265,9 +1265,9 @@
               </node>
             </node>
             <node concept="ns1u0" id="7mB3viLggs9" role="3A8w4Q">
-              <ref role="ns1xF" node="JOGAOsVt6y" />
+              <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
               <node concept="nsMwS" id="7mB3viLggsn" role="ns1xD">
-                <ref role="nsMwP" node="7mB3viLdDa5" />
+                <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
                 <node concept="2OqwBi" id="1ALxU7rgm5L" role="nsMwV">
                   <node concept="3hN9Ij" id="1ALxU7rglY_" role="2Oq$k0">
                     <ref role="3hLkJx" node="1ALxU7rgfrQ" resolve="type" />
@@ -1278,7 +1278,7 @@
                 </node>
               </node>
               <node concept="nsMwS" id="7mB3viLggsC" role="ns1xD">
-                <ref role="nsMwP" node="JOGAOsVt6$" />
+                <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
                 <node concept="2OqwBi" id="1ALxU7rgnGQ" role="nsMwV">
                   <node concept="3hN9Ij" id="1ALxU7rgn_E" role="2Oq$k0">
                     <ref role="3hLkJx" node="1ALxU7rgfrQ" resolve="type" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
index 401eadb1..57041188 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
@@ -309,13 +309,13 @@
       <concept id="6928531011217258898" name="jetbrains.mps.lang.coderules.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
         <child id="6928531011217290187" name="variable" index="2aLmnP" />
       </concept>
-      <concept id="861509610434242029" name="" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="" index="ns1xF" />
-        <child id="861509610434243076" name="" index="ns1xD" />
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434435669" name="" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="" index="nsMwP" />
-        <child id="861509610434435670" name="" index="nsMwV" />
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@@ -325,7 +325,7 @@
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
-      <concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
+      <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247182936001" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraint" flags="ng" index="3jbYBd">
         <reference id="6097203247182937177" name="template" index="3jbY9l" />
         <child id="6097203247182937145" name="input" index="3jbY8P" />
@@ -1076,9 +1076,9 @@
                             <ref role="a7OzE" node="7qe1GumRXOO" resolve="T" />
                           </node>
                           <node concept="ns1u0" id="7qe1GumRXOW" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="7qe1GumRXOX" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="7qe1GumRXOY" role="nsMwV">
                                 <node concept="a7P8L" id="7qe1GumRXOZ" role="1nq8_t">
                                   <ref role="a7OzE" node="7qe1GumRXOP" resolve="L" />
@@ -1086,7 +1086,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="7qe1GumRXP0" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="7qe1GumRXP1" role="nsMwV">
                                 <node concept="a7P8L" id="7qe1GumRXP2" role="1nq8_t">
                                   <ref role="a7OzE" node="7qe1GumRXOQ" resolve="R" />
@@ -1198,9 +1198,9 @@
                             <ref role="a7OzE" node="5TXeSYT54SR" resolve="T" />
                           </node>
                           <node concept="ns1u0" id="Jfcwnvuw$6" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="Jfcwnvuw$7" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="Jfcwnvuw$8" role="nsMwV">
                                 <node concept="a7P8L" id="Jfcwnvuw$9" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT54SS" resolve="L" />
@@ -1208,7 +1208,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="Jfcwnvuw$a" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="Jfcwnvuw$b" role="nsMwV">
                                 <node concept="a7P8L" id="Jfcwnvuw$c" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT54ST" resolve="R" />
@@ -1310,7 +1310,7 @@
                             <ref role="a7OzE" node="5TXeSYT559h" resolve="TLocal" />
                           </node>
                           <node concept="ns1u0" id="Jfcwnvuw$E" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                           </node>
                         </node>
                       </node>
@@ -1330,9 +1330,9 @@
                             <ref role="a7OzE" node="5TXeSYT5510" resolve="T" />
                           </node>
                           <node concept="ns1u0" id="Jfcwnvuw$J" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="Jfcwnvuw$K" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="Jfcwnvuw$L" role="nsMwV">
                                 <node concept="a7P8L" id="Jfcwnvuw$M" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT5511" resolve="L" />
@@ -1340,7 +1340,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="Jfcwnvuw$N" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="Jfcwnvuw$O" role="nsMwV">
                                 <node concept="a7P8L" id="Jfcwnvuw$P" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT5512" resolve="R" />
@@ -1452,7 +1452,7 @@
                             <ref role="a7OzE" node="5TXeSYT55hP" resolve="TLocal" />
                           </node>
                           <node concept="ns1u0" id="JfcwnvuwDW" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                           </node>
                         </node>
                       </node>
@@ -1462,9 +1462,9 @@
                             <ref role="a7OzE" node="5TXeSYT55hS" resolve="T" />
                           </node>
                           <node concept="ns1u0" id="JfcwnvuwBn" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="JfcwnvuwBo" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="JfcwnvuwBp" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvuwBq" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55hT" resolve="L" />
@@ -1472,7 +1472,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="JfcwnvuwBr" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="JfcwnvuwBs" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvuwBt" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55hU" resolve="R" />
@@ -1587,9 +1587,9 @@
                             <ref role="a7OzE" node="5TXeSYT55s8" resolve="T" />
                           </node>
                           <node concept="ns1u0" id="JfcwnvuwE1" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="JfcwnvuwE2" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="JfcwnvuwE3" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvuwE4" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55s9" resolve="L" />
@@ -1597,7 +1597,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="JfcwnvuwE5" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="JfcwnvuwE6" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvuwE7" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55sa" resolve="R" />
@@ -1726,9 +1726,9 @@
                             <ref role="a7OzE" node="5TXeSYT55$O" resolve="T" />
                           </node>
                           <node concept="ns1u0" id="4t6qIYSPdaT" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="4t6qIYSPdaU" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="4t6qIYSPdaV" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYSPdaW" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55$P" resolve="L" />
@@ -1736,7 +1736,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="4t6qIYSPdaX" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="4t6qIYSPdaY" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYSPdo8" role="1nq8_t">
                                   <ref role="a7OzE" node="4t6qIYSPdm_" resolve="Local2" />
@@ -1758,9 +1758,9 @@
                             <ref role="a7OzE" node="5TXeSYT55G1" resolve="T1" />
                           </node>
                           <node concept="ns1u0" id="4t6qIYSPdty" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="4t6qIYSPdtC" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="4t6qIYSPdtI" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYT2aT_" role="1nq8_t">
                                   <ref role="a7OzE" node="4t6qIYT2aJm" resolve="Local3" />
@@ -1768,7 +1768,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="4t6qIYSPdtP" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="4t6qIYSPdvJ" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYSPdvQ" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55$Q" resolve="R" />
@@ -1886,9 +1886,9 @@
                       <node concept="3I6s7M" id="4t6qIYSPqax" role="3I6sU7">
                         <node concept="3A8Hvi" id="4t6qIYSPqay" role="3I6s78">
                           <node concept="ns1u0" id="4t6qIYSPqa$" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="4t6qIYSPqa_" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="4t6qIYSPqaA" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYSPqaB" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55Om" resolve="L" />
@@ -1896,7 +1896,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="4t6qIYSPqaC" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="4t6qIYSPqaD" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYTd8QF" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT55Og" resolve="Local2" />
@@ -2007,9 +2007,9 @@
                             <ref role="a7OzE" node="5TXeSYT564w" resolve="Local" />
                           </node>
                           <node concept="ns1u0" id="4t6qIYTd7Er" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="4t6qIYTd7Es" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="4t6qIYTd7Et" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYTd7Eu" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT564B" resolve="L" />
@@ -2017,7 +2017,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="4t6qIYTd7Ev" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueX" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueX" resolve="snd" />
                               <node concept="1nq8_$" id="4t6qIYTd7Ew" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYTd8S2" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT564x" resolve="Local2" />
@@ -2033,9 +2033,9 @@
                             <ref role="a7OzE" node="5TXeSYT564x" resolve="Local2" />
                           </node>
                           <node concept="ns1u0" id="4t6qIYTd8JD" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JfcwnvuueH" />
+                            <ref role="ns1xF" to="zuft:JfcwnvuueH" resolve="Pair" />
                             <node concept="nsMwS" id="4t6qIYTd8KA" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JfcwnvuueR" />
+                              <ref role="nsMwP" to="zuft:JfcwnvuueR" resolve="fst" />
                               <node concept="1nq8_$" id="4t6qIYTd8KG" role="nsMwV">
                                 <node concept="a7P8L" id="4t6qIYTd8Tv" role="1nq8_t">
                                   <ref role="a7OzE" node="5TXeSYT564y" resolve="Local3" />
@@ -3180,9 +3180,9 @@
                             </node>
                           </node>
                           <node concept="ns1u0" id="JfcwnvutGa" role="3AunhB">
-                            <ref role="ns1xF" to="zuft:JOGAOsVt6y" />
+                            <ref role="ns1xF" to="zuft:JOGAOsVt6y" resolve="Type" />
                             <node concept="nsMwS" id="JfcwnvutGg" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:7mB3viLdDa5" />
+                              <ref role="nsMwP" to="zuft:7mB3viLdDa5" resolve="name" />
                               <node concept="1nq8_$" id="JfcwnvutGm" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvutGk" role="1nq8_t">
                                   <ref role="a7OzE" node="48ZGLP7phr7" resolve="NewTV" />
@@ -3190,7 +3190,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="JfcwnvutGB" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JOGAOsVt6$" />
+                              <ref role="nsMwP" to="zuft:JOGAOsVt6$" resolve="val" />
                               <node concept="1nq8_$" id="JfcwnvutGK" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvutGI" role="1nq8_t">
                                   <ref role="a7OzE" node="48ZGLP7pgwC" resolve="E" />
@@ -3268,9 +3268,9 @@
                             <ref role="a7OzE" node="JfcwnvutMw" resolve="G" />
                           </node>
                           <node concept="ns1u0" id="JfcwnvutH8" role="3A8w4Q">
-                            <ref role="ns1xF" to="zuft:JOGAOsVt6y" />
+                            <ref role="ns1xF" to="zuft:JOGAOsVt6y" resolve="Type" />
                             <node concept="nsMwS" id="JfcwnvutH9" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:7mB3viLdDa5" />
+                              <ref role="nsMwP" to="zuft:7mB3viLdDa5" resolve="name" />
                               <node concept="1nq8_$" id="JfcwnvutHa" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvutHb" role="1nq8_t">
                                   <ref role="a7OzE" node="JfcwnvutGZ" resolve="NewTV" />
@@ -3278,7 +3278,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="JfcwnvutHc" role="ns1xD">
-                              <ref role="nsMwP" to="zuft:JOGAOsVt6$" />
+                              <ref role="nsMwP" to="zuft:JOGAOsVt6$" resolve="val" />
                               <node concept="1nq8_$" id="JfcwnvutHd" role="nsMwV">
                                 <node concept="a7P8L" id="JfcwnvutHe" role="1nq8_t">
                                   <ref role="a7OzE" node="JfcwnvutGX" resolve="E" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
index ce647573..834eef3f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
@@ -738,7 +738,7 @@
                             <ref role="3cqZAo" node="4ekZiHebZ7u" resolve="a" />
                           </node>
                           <node concept="liA8E" id="4ekZiHebZ7t" role="2OqNvi">
-                            <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmtpy" />
+                            <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
                           </node>
                         </node>
                       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index f11da43d..a4f7a76b 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -843,7 +843,7 @@
                               <ref role="3cqZAo" node="4ekZiHe5EMl" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4ekZiHe5EMk" role="2OqNvi">
-                              <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmtpy" />
+                              <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
                             </node>
                           </node>
                         </node>
@@ -876,7 +876,7 @@
                                   <ref role="3cqZAo" node="4ekZiHe5GEP" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="4ekZiHe5GEO" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmtpy" />
+                                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
                                 </node>
                               </node>
                             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 2cce75f5..722ae437 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -8536,7 +8536,7 @@
                   <ref role="3cqZAo" node="7i3KM7glTNp" resolve="aspectClique" />
                 </node>
                 <node concept="liA8E" id="7i3KM7glTMN" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmtpy" />
+                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
                 </node>
               </node>
             </node>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 223a3087..c56a7a42 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -198,26 +198,26 @@
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
-      <concept id="861509610434242029" name="" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="" index="ns1xF" />
-        <child id="861509610434243076" name="" index="ns1xD" />
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="" index="ns1xc" />
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="" index="ns1xx" />
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276453" name="" flags="ng" index="nspS8">
-        <property id="861509610434276456" name="" index="nspS5" />
+      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
+        <property id="861509610434276456" name="final" index="nspS5" />
       </concept>
-      <concept id="861509610434276450" name="" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="" index="nspSe" />
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
-      <concept id="861509610434289827" name="" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="" index="nsMwP" />
-        <child id="861509610434435670" name="" index="nsMwV" />
+      <concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@@ -227,7 +227,7 @@
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
-      <concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
+      <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
         <reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
         <child id="6097203247156107501" name="input" index="3ix8rx" />
@@ -362,9 +362,9 @@
               </node>
             </node>
             <node concept="ns1u0" id="7VBaGntKJ8V" role="3A8w4Q">
-              <ref role="ns1xF" node="7VBaGntKJ6C" />
+              <ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
               <node concept="nsMwS" id="7VBaGntKJ8W" role="ns1xD">
-                <ref role="nsMwP" node="7VBaGntKJ6E" />
+                <ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
                 <node concept="1nq8_$" id="3w0n0hzlYjG" role="nsMwV">
                   <node concept="a7P8L" id="3w0n0hzlYjF" role="1nq8_t">
                     <ref role="a7OzE" node="3w0n0hzlYhK" resolve="Left" />
@@ -372,7 +372,7 @@
                 </node>
               </node>
               <node concept="nsMwS" id="7VBaGntKJ8X" role="ns1xD">
-                <ref role="nsMwP" node="7VBaGntKJ6F" />
+                <ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
                 <node concept="1nq8_$" id="3w0n0hzlYwu" role="nsMwV">
                   <node concept="a7P8L" id="3w0n0hzlYwt" role="1nq8_t">
                     <ref role="a7OzE" node="3w0n0hzlYhT" resolve="Right" />
@@ -478,9 +478,9 @@
                     <ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
                     <node concept="1HFMs5" id="7VBaGntKIM7" role="3AunhB">
                       <node concept="ns1u0" id="7VBaGntKJ94" role="1uarlW">
-                        <ref role="ns1xF" node="7VBaGntKJ6C" />
+                        <ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
                         <node concept="nsMwS" id="7VBaGntKJ95" role="ns1xD">
-                          <ref role="nsMwP" node="7VBaGntKJ6E" />
+                          <ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
                           <node concept="1nq8_$" id="3w0n0hzmj5J" role="nsMwV">
                             <node concept="a7P8L" id="3w0n0hzmj5I" role="1nq8_t">
                               <ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
@@ -488,7 +488,7 @@
                           </node>
                         </node>
                         <node concept="nsMwS" id="7VBaGntKJ96" role="ns1xD">
-                          <ref role="nsMwP" node="7VBaGntKJ6F" />
+                          <ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
                           <node concept="1nq8_$" id="3w0n0hzmjcz" role="nsMwV">
                             <node concept="a7P8L" id="2gcGVmG$Rdc" role="1nq8_t">
                               <ref role="a7OzE" node="3w0n0hzmj4c" resolve="Term" />
@@ -1113,9 +1113,9 @@
                         <ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
                         <node concept="1HFMs5" id="7VBaGntKIM5" role="3AunhB">
                           <node concept="ns1u0" id="7VBaGntKJ8Y" role="1uarlW">
-                            <ref role="ns1xF" node="7VBaGntKJ6C" />
+                            <ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
                             <node concept="nsMwS" id="7VBaGntKJ8Z" role="ns1xD">
-                              <ref role="nsMwP" node="7VBaGntKJ6E" />
+                              <ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
                               <node concept="1nq8_$" id="3w0n0hzmnoI" role="nsMwV">
                                 <node concept="a7P8L" id="3w0n0hzmnoH" role="1nq8_t">
                                   <ref role="a7OzE" node="3w0n0hzmjfs" resolve="EqLeft" />
@@ -1123,7 +1123,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="7VBaGntKJ90" role="ns1xD">
-                              <ref role="nsMwP" node="7VBaGntKJ6F" />
+                              <ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
                               <node concept="1nq8_$" id="3w0n0hzmnri" role="nsMwV">
                                 <node concept="a7P8L" id="3w0n0hzmnrh" role="1nq8_t">
                                   <ref role="a7OzE" node="3w0n0hzmjfI" resolve="EqRight" />
@@ -1894,9 +1894,9 @@
                         <ref role="3AqCNq" to="6r1k:2aBGSFgfwNi" resolve="conclusion" />
                         <node concept="1HFMs5" id="7VBaGntKIM6" role="3AunhB">
                           <node concept="ns1u0" id="7VBaGntKJ91" role="1uarlW">
-                            <ref role="ns1xF" node="7VBaGntKJ6C" />
+                            <ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
                             <node concept="nsMwS" id="7VBaGntKJ92" role="ns1xD">
-                              <ref role="nsMwP" node="7VBaGntKJ6E" />
+                              <ref role="nsMwP" node="7VBaGntKJ6E" resolve="left" />
                               <node concept="1nq8_$" id="3w0n0hznwzX" role="nsMwV">
                                 <node concept="a7P8L" id="3w0n0hznwzY" role="1nq8_t">
                                   <ref role="a7OzE" node="3w0n0hznw$l" resolve="EqLeft" />
@@ -1904,7 +1904,7 @@
                               </node>
                             </node>
                             <node concept="nsMwS" id="7VBaGntKJ93" role="ns1xD">
-                              <ref role="nsMwP" node="7VBaGntKJ6F" />
+                              <ref role="nsMwP" node="7VBaGntKJ6F" resolve="right" />
                               <node concept="1nq8_$" id="3w0n0hznw$3" role="nsMwV">
                                 <node concept="a7P8L" id="3w0n0hznw$4" role="1nq8_t">
                                   <ref role="a7OzE" node="3w0n0hznw$m" resolve="EqRight" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index ab73b3de..37848af3 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -271,26 +271,26 @@
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
-      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.DataFormConstructor" flags="ng" index="ns1u0">
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.DataFormTable" flags="ng" index="ns1xd">
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
         <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.DataFormFeature" flags="ng" index="nspS8">
+      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
         <property id="861509610434276456" name="final" index="nspS5" />
       </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.DataFormTemplate" flags="ng" index="nspSf">
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
       <concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
       <concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
         <reference id="861509610434435672" name="feature" index="nsMwP" />
         <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index 6e4b5e68..74412499 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -97,8 +97,8 @@
       <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
-      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalDataForm" flags="ng" index="3wAshV">
-        <child id="960803923479549586" name="logical" index="3wAq21" />
+      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
+        <child id="960803923479549586" name="variable" index="3wAq21" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -155,26 +155,26 @@
         <child id="1618328391714763070" name="macro" index="0oKgB" />
         <child id="6097203247162410403" name="prototype" index="3iTdIJ" />
       </concept>
-      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.DataFormConstructor" flags="ng" index="ns1u0">
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.DataFormTable" flags="ng" index="ns1xd">
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
         <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.DataFormFeature" flags="ng" index="nspS8">
+      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
         <property id="861509610434276456" name="final" index="nspS5" />
       </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.DataFormTemplate" flags="ng" index="nspSf">
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
       <concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
       <concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
         <reference id="861509610434435672" name="feature" index="nsMwP" />
         <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index 326d33f4..394d3c1b 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -91,13 +91,13 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="861509610434243104" name="" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="" index="ns1xc" />
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="" flags="ng" index="ns1x$">
-        <child id="861509610434243084" name="" index="ns1xx" />
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
+        <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276450" name="" flags="ng" index="nspSf" />
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf" />
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index abc1310b..d198d46f 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -218,8 +218,8 @@
       <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalDataForm" flags="ng" index="3wAshV">
-        <child id="960803923479549586" name="logical" index="3wAq21" />
+      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
+        <child id="960803923479549586" name="variable" index="3wAq21" />
       </concept>
       <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
         <child id="8713947027062064784" name="logical" index="1FtiSR" />
@@ -385,25 +385,25 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.DataFormConstructor" flags="ng" index="ns1u0">
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.DataFormTable" flags="ng" index="ns1xd">
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
         <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.DataFormFeature" flags="ng" index="nspS8">
+      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
         <property id="861509610434276456" name="final" index="nspS5" />
       </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.DataFormTemplate" flags="ng" index="nspSf">
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
       <concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
       <concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
         <reference id="861509610434435672" name="feature" index="nsMwP" />
         <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
index d685ace4..f35880fd 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
@@ -195,25 +195,25 @@
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
-      <concept id="861509610434242029" name="" flags="ng" index="ns1u0">
-        <reference id="861509610434243078" name="" index="ns1xF" />
-        <child id="861509610434243076" name="" index="ns1xD" />
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
+        <reference id="861509610434243078" name="decl" index="ns1xF" />
+        <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="" flags="ng" index="ns1xd">
-        <child id="861509610434243105" name="" index="ns1xc" />
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
+        <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="" flags="ng" index="ns1x$">
-        <property id="5177758076344254900" name="" index="3uGXoX" />
-        <reference id="861509610434243089" name="" index="ns1xW" />
-        <child id="861509610434243084" name="" index="ns1xx" />
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
+        <property id="5177758076344254900" name="open" index="3uGXoX" />
+        <reference id="861509610434243089" name="prototype" index="ns1xW" />
+        <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434305888" name="" flags="ng" index="nsiOd" />
-      <concept id="861509610434276450" name="" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="" index="nspSe" />
+      <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
+        <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
-      <concept id="861509610434435669" name="" flags="ng" index="nsMwS">
-        <reference id="861509610434435672" name="" index="nsMwP" />
-        <child id="861509610434435670" name="" index="nsMwV" />
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
+        <reference id="861509610434435672" name="feature" index="nsMwP" />
+        <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
@@ -227,7 +227,7 @@
       <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
-      <concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
+      <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
         <child id="6097203247147235901" name="logical" index="3h32gL" />
         <child id="6097203247141261094" name="code" index="3hEL4E" />
@@ -428,9 +428,9 @@
               <ref role="a7OzE" node="4E290qPYynt" resolve="Type" />
             </node>
             <node concept="ns1u0" id="4E290qPYMxa" role="3A8w4Q">
-              <ref role="ns1xF" node="4E290qPYB6e" />
+              <ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
               <node concept="nsMwS" id="4E290qPYMxW" role="ns1xD">
-                <ref role="nsMwP" node="4E290qPYBjo" />
+                <ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
                 <node concept="1nq8_$" id="4E290qPYMyR" role="nsMwV">
                   <node concept="a7P8L" id="4E290qPYMyQ" role="1nq8_t">
                     <ref role="a7OzE" node="4E290qPYySZ" resolve="CompT" />
@@ -508,9 +508,9 @@
                         </node>
                       </node>
                       <node concept="ns1u0" id="4E290qPZMdM" role="3AunhB">
-                        <ref role="ns1xF" node="4E290qPYB6e" />
+                        <ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
                         <node concept="nsMwS" id="4E290qPZMeh" role="ns1xD">
-                          <ref role="nsMwP" node="4E290qPYBjo" />
+                          <ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
                           <node concept="1nq8_$" id="4E290qPZMfc" role="nsMwV">
                             <node concept="a7P8L" id="4E290qPZMfb" role="1nq8_t">
                               <ref role="a7OzE" node="4E290qPYTGQ" resolve="CompTypes" />
@@ -764,7 +764,7 @@
                                   <ref role="a7OzE" node="4E290qPZCaH" resolve="IndexT" />
                                 </node>
                                 <node concept="ns1u0" id="4E290qPZwqf" role="3AunhB">
-                                  <ref role="ns1xF" to="kqnc:JOGAOsVt2E" />
+                                  <ref role="ns1xF" to="kqnc:JOGAOsVt2E" resolve="_int_" />
                                 </node>
                               </node>
                             </node>
@@ -896,9 +896,9 @@
                                       <ref role="a7OzE" node="4E290qPZqQk" resolve="TupleType" />
                                     </node>
                                     <node concept="ns1u0" id="4E290qPZr0k" role="3AunhB">
-                                      <ref role="ns1xF" node="4E290qPYB6e" />
+                                      <ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
                                       <node concept="nsMwS" id="4E290qPZr0L" role="ns1xD">
-                                        <ref role="nsMwP" node="4E290qPYBjo" />
+                                        <ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
                                         <node concept="1nq8_$" id="4E290qPZr1G" role="nsMwV">
                                           <node concept="a7P8L" id="4E290qPZr1F" role="1nq8_t">
                                             <ref role="a7OzE" node="4E290qPYXCS" resolve="ComponentTypesList" />
@@ -1106,9 +1106,9 @@
                     </node>
                     <node concept="1HFMs5" id="1mdVbTSaq2o" role="3AunhB">
                       <node concept="ns1u0" id="JOGAOsVt9$" role="1uarlW">
-                        <ref role="ns1xF" node="4E290qPYB6e" />
+                        <ref role="ns1xF" node="4E290qPYB6e" resolve="tuple" />
                         <node concept="nsMwS" id="2WQBycG$n_7" role="ns1xD">
-                          <ref role="nsMwP" node="4E290qPYBjo" />
+                          <ref role="nsMwP" node="4E290qPYBjo" resolve="types" />
                           <node concept="1nq8_$" id="2WQBycG$nAg" role="nsMwV">
                             <node concept="a7P8L" id="2WQBycG$nAf" role="1nq8_t">
                               <ref role="a7OzE" node="5upUcEtdY0_" resolve="CompTypes" />
@@ -1212,7 +1212,7 @@
     </node>
     <node concept="ns1x$" id="4E290qPYB6e" role="ns1xc">
       <property role="TrG5h" value="tuple" />
-      <ref role="ns1xW" node="4lCLOtwq2MF" />
+      <ref role="ns1xW" node="4lCLOtwq2MF" resolve="type" />
       <node concept="nspSf" id="4E290qPYB6f" role="ns1xx">
         <node concept="nsiOd" id="4E290qPYBjo" role="nspSe">
           <property role="TrG5h" value="types" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 5014fc57..b9e23b41 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -264,7 +264,7 @@
       <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
-      <concept id="2381360340662937504" name="" flags="ng" index="32pEOW" />
+      <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="4957570047283823112" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackConstraint" flags="ng" index="1lHd6T">
         <property id="4957570047283824112" name="severity" index="1lHdp1" />
         <child id="4957570047284421439" name="message" index="1ljv2e" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 7b476a45..af45f233 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -418,8 +418,8 @@
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
         <property id="7571593955706137638" name="value" index="1oi5yK" />
       </concept>
-      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalDataForm" flags="ng" index="3wAshV">
-        <child id="960803923479549586" name="logical" index="3wAq21" />
+      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
+        <child id="960803923479549586" name="variable" index="3wAq21" />
       </concept>
       <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
         <child id="8713947027062064784" name="logical" index="1FtiSR" />
@@ -668,28 +668,28 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.DataFormConstructor" flags="ng" index="ns1u0">
+      <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
       </concept>
-      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.DataFormTable" flags="ng" index="ns1xd">
+      <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
         <child id="861509610434243105" name="contents" index="ns1xc" />
       </concept>
-      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.DataFormDeclaration" flags="ng" index="ns1x$">
+      <concept id="861509610434243081" name="jetbrains.mps.lang.coderules.structure.TermDeclaration" flags="ng" index="ns1x$">
         <property id="5177758076344254900" name="open" index="3uGXoX" />
         <reference id="861509610434243089" name="prototype" index="ns1xW" />
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434305888" name="jetbrains.mps.lang.coderules.structure.ListFeature" flags="ng" index="nsiOd" />
-      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.DataFormFeature" flags="ng" index="nspS8">
+      <concept id="861509610434276453" name="jetbrains.mps.lang.coderules.structure.TermFeature" flags="ng" index="nspS8">
         <property id="861509610434276456" name="final" index="nspS5" />
       </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.DataFormTemplate" flags="ng" index="nspSf">
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
         <child id="861509610434276451" name="feature" index="nspSe" />
       </concept>
       <concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
       <concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
-      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.DataFormFeatureOverride" flags="ng" index="nsMwS">
+      <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
         <reference id="861509610434435672" name="feature" index="nsMwP" />
         <child id="861509610434435670" name="getter" index="nsMwV" />
       </concept>
@@ -797,8 +797,8 @@
       <concept id="3575255234174969664" name="jetbrains.mps.lang.coderules.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
         <child id="3575255234174969665" name="rule" index="1nLNNK" />
       </concept>
-      <concept id="4363939677057762068" name="" flags="ng" index="3sNhsn">
-        <child id="4363939677057762080" name="" index="3sNhsz" />
+      <concept id="4363939677057762068" name="jetbrains.mps.lang.coderules.structure.TermConstructorDataForm" flags="ng" index="3sNhsn">
+        <child id="4363939677057762080" name="constructor" index="3sNhsz" />
       </concept>
       <concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
       <concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps
index 8dc8fa34..fe2e3fc8 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps
@@ -149,7 +149,7 @@
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
                   <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
                     <node concept="ZC_QK" id="4E290qQ0kDi" role="2tJFKM">
-                      <ref role="2aWVGs" to="qwqz:4E290qQ09_i" resolve="DemoTuples" />
+                      <ref role="2aWVGs" to="qwqz:4E290qQ09_i" resolve="DemoIndexedTuples" />
                     </node>
                   </node>
                 </node>