diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 6fac9580..f2656fe0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -19730,7 +19730,7 @@
     <node concept="2tJIrI" id="JOGAOsG6Mv" role="jymVt" />
     <node concept="3Tm1VV" id="JOGAOsG6LK" role="1B3o_S" />
     <node concept="n94m4" id="JOGAOsG6LL" role="lGtFl">
-      <ref role="n9lRv" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+      <ref role="n9lRv" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
     </node>
     <node concept="17Uvod" id="JOGAOt0ycr" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -19755,10 +19755,10 @@
     <node concept="3lhOvk" id="JOGAOsHmdz" role="3lj3bC">
       <ref role="3lhOvi" node="JOGAOsG6LJ" resolve="_TermTable" />
       <ref role="2sgKRv" node="5hSMZ_lNDE_" resolve="dataformtable_class" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
     </node>
     <node concept="3aamgX" id="5hSMZ_lfQ86" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
       <node concept="14YyZ8" id="5hSMZ_lfXvV" role="1lVwrX">
         <node concept="14ZrTv" id="5hSMZ_ljA5j" role="14ZwWg">
           <node concept="30G5F_" id="5hSMZ_ljA5k" role="150hEN">
@@ -19897,7 +19897,7 @@
                                     <node concept="1PxgMI" id="3kjrYXAJAdN" role="2Oq$k0">
                                       <property role="1BlNFB" value="true" />
                                       <node concept="chp4Y" id="JOGAOsGSXE" role="3oSUPX">
-                                        <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                                        <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
                                       </node>
                                       <node concept="2OqwBi" id="3kjrYXAJ$7j" role="1m5AlR">
                                         <node concept="1iwH7S" id="3kjrYXAJz9G" role="2Oq$k0" />
@@ -19951,7 +19951,7 @@
                             <node concept="1PxgMI" id="3kjrYXAJFsq" role="2Oq$k0">
                               <property role="1BlNFB" value="true" />
                               <node concept="chp4Y" id="JOGAOsGY9c" role="3oSUPX">
-                                <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                                <ref role="cht4Q" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
                               </node>
                               <node concept="2OqwBi" id="3kjrYXAJFss" role="1m5AlR">
                                 <node concept="1iwH7S" id="3kjrYXAJFst" role="2Oq$k0" />
@@ -19984,6 +19984,27 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="3MfP0fwjxqd" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:3MfP0fwgGck" resolve="TermConstructorDataForm" />
+      <node concept="gft3U" id="3MfP0fwjBy1" role="1lVwrX">
+        <node concept="10Nm6u" id="3MfP0fwjBy9" role="gfFT$">
+          <node concept="29HgVG" id="3MfP0fwjByk" role="lGtFl">
+            <node concept="3NFfHV" id="3MfP0fwjByp" role="3NFExx">
+              <node concept="3clFbS" id="3MfP0fwjByq" role="2VODD2">
+                <node concept="3clFbF" id="3MfP0fwjB$$" role="3cqZAp">
+                  <node concept="2OqwBi" id="3MfP0fwjBIn" role="3clFbG">
+                    <node concept="30H73N" id="3MfP0fwjB$z" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3MfP0fwjBRs" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:3MfP0fwgGcw" resolve="constructor" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="24ciDNzqU8o" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:24ciDNzqIuw" resolve="TermType" />
       <node concept="1Koe21" id="24ciDNzqUp4" role="1lVwrX">
@@ -20003,12 +20024,12 @@
     <node concept="2rT7sh" id="5hSMZ_lNDE_" role="2rTMjI">
       <property role="TrG5h" value="dataformtable_class" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
-      <ref role="2rTdP9" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+      <ref role="2rTdP9" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
     </node>
     <node concept="2rT7sh" id="1L74NXG7ihq" role="2rTMjI">
       <property role="TrG5h" value="dataformfeature_method" />
       <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-      <ref role="2rTdP9" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+      <ref role="2rTdP9" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     </node>
     <node concept="3aamgX" id="4nUKN9YPm7g" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
@@ -20034,13 +20055,13 @@
       <property role="TrG5h" value="prototypeStack" />
       <node concept="2BANLN" id="4lCLOtwvRjl" role="1N15GL">
         <node concept="3Tqbb2" id="4lCLOtwvScp" role="_ZDj9">
-          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
         </node>
       </node>
     </node>
     <node concept="3aamgX" id="4lCLOtwvW$M" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
       <node concept="1Koe21" id="4lCLOtww00p" role="1lVwrX">
         <node concept="9aQIb" id="4lCLOtww00y" role="1Koe22">
           <node concept="3clFbS" id="4lCLOtww00z" role="9aQI4">
@@ -20078,7 +20099,7 @@
     </node>
     <node concept="3aamgX" id="4lCLOtwvLkd" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
       <node concept="30G5F_" id="4lCLOtwvMqp" role="30HLyM">
         <node concept="3clFbS" id="4lCLOtwvMqq" role="2VODD2">
           <node concept="3clFbF" id="4lCLOtwvTpG" role="3cqZAp">
@@ -20109,7 +20130,7 @@
                                 <node concept="3cpWsn" id="4vr5SApb_lX" role="3cpWs9">
                                   <property role="TrG5h" value="dfdecl" />
                                   <node concept="3Tqbb2" id="4vr5SApb_kb" role="1tU5fm">
-                                    <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                                    <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
                                   </node>
                                   <node concept="2OqwBi" id="4vr5SApb_lY" role="33vP2m">
                                     <node concept="v3LJS" id="4vr5SApb_lZ" role="2Oq$k0">
@@ -20279,7 +20300,7 @@
                       <node concept="2ShNRf" id="4vr5SApbiKh" role="v9R3O">
                         <node concept="2Jqq0_" id="4vr5SApbkxE" role="2ShVmc">
                           <node concept="3Tqbb2" id="4vr5SApbkJK" role="HW$YZ">
-                            <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                            <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -20296,7 +20317,7 @@
     </node>
     <node concept="3aamgX" id="4lCLOtwwaTw" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
       <node concept="30G5F_" id="4lCLOtwwaTx" role="30HLyM">
         <node concept="3clFbS" id="4lCLOtwwaTy" role="2VODD2">
           <node concept="3clFbF" id="4lCLOtwwaTz" role="3cqZAp">
@@ -20461,7 +20482,7 @@
     <property role="TrG5h" value="term_feature_override" />
     <node concept="3aamgX" id="3kjrYXAPmgG" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
       <node concept="30G5F_" id="3kjrYXAPmwz" role="30HLyM">
         <node concept="3clFbS" id="3kjrYXAPmw$" role="2VODD2">
           <node concept="3clFbF" id="3kjrYXAPmBH" role="3cqZAp">
@@ -20521,7 +20542,7 @@
     </node>
     <node concept="3aamgX" id="3kjrYXAPsCJ" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
       <node concept="30G5F_" id="3kjrYXAPsCK" role="30HLyM">
         <node concept="3clFbS" id="3kjrYXAPsCL" role="2VODD2">
           <node concept="3clFbF" id="3kjrYXAPsCM" role="3cqZAp">
@@ -20581,7 +20602,7 @@
     </node>
     <node concept="3aamgX" id="1fvYCPA6Ndu" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
       <node concept="30G5F_" id="1fvYCPA6Ndv" role="30HLyM">
         <node concept="3clFbS" id="1fvYCPA6Ndw" role="2VODD2">
           <node concept="3clFbF" id="1fvYCPA6Ndx" role="3cqZAp">
@@ -20648,7 +20669,7 @@
     <node concept="1N15co" id="3kjrYXAPl_p" role="1s_3oS">
       <property role="TrG5h" value="feature" />
       <node concept="3Tqbb2" id="3kjrYXAPlNR" role="1N15GL">
-        <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+        <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
       </node>
     </node>
     <node concept="j$LIH" id="3kjrYXAPkLh" role="jxRDz">
@@ -20960,7 +20981,7 @@
     <property role="3GE5qa" value="term" />
     <node concept="3aamgX" id="JOGAOsGlpV" role="3aUrZf">
       <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+      <ref role="30HIoZ" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
       <node concept="gft3U" id="JOGAOsGmnd" role="1lVwrX">
         <node concept="1oi5Wm" id="JOGAOsGmwQ" role="gfFT$">
           <property role="TrG5h" value="name" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 1acf7f93..372a0d58 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1961,13 +1961,13 @@
   </node>
   <node concept="13h7C7" id="JOGAOsxFgi">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <ref role="13h7C2" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
     <node concept="13i0hz" id="4lCLOtww4qi" role="13h7CS">
       <property role="TrG5h" value="prototypesStack" />
       <node concept="3Tm1VV" id="4lCLOtww4qj" role="1B3o_S" />
       <node concept="2BANLN" id="4lCLOtww4G2" role="3clF45">
         <node concept="3Tqbb2" id="4lCLOtww4H2" role="_ZDj9">
-          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
         </node>
       </node>
       <node concept="3clFbS" id="4lCLOtww4ql" role="3clF47">
@@ -1976,13 +1976,13 @@
             <property role="TrG5h" value="stack" />
             <node concept="2BANLN" id="4lCLOtww5ji" role="1tU5fm">
               <node concept="3Tqbb2" id="4lCLOtww5jl" role="_ZDj9">
-                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
               </node>
             </node>
             <node concept="2ShNRf" id="4lCLOtww5jw" role="33vP2m">
               <node concept="2Jqq0_" id="4lCLOtww5jx" role="2ShVmc">
                 <node concept="3Tqbb2" id="4lCLOtww5jy" role="HW$YZ">
-                  <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                  <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
                 </node>
               </node>
             </node>
@@ -1992,7 +1992,7 @@
           <node concept="3cpWsn" id="4lCLOtww5EX" role="3cpWs9">
             <property role="TrG5h" value="prototype" />
             <node concept="3Tqbb2" id="4lCLOtww5CJ" role="1tU5fm">
-              <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+              <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
             </node>
             <node concept="2OqwBi" id="4lCLOtww5EY" role="33vP2m">
               <node concept="13iPFW" id="4lCLOtww5EZ" role="2Oq$k0" />
@@ -2066,7 +2066,7 @@
       <node concept="3Tm1VV" id="7c96q9tALRs" role="1B3o_S" />
       <node concept="A3Dl8" id="7c96q9tAM63" role="3clF45">
         <node concept="3Tqbb2" id="7c96q9tAM6o" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3clFbS" id="7c96q9tALRu" role="3clF47">
@@ -2090,7 +2090,7 @@
       <node concept="3Tm1VV" id="7c96q9tCSXA" role="1B3o_S" />
       <node concept="A3Dl8" id="7c96q9tCSXB" role="3clF45">
         <node concept="3Tqbb2" id="7c96q9tCSXC" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3clFbS" id="7c96q9tCSXD" role="3clF47">
@@ -2146,7 +2146,7 @@
                   <node concept="2Xjw5R" id="4MEOIDG8np9" role="2OqNvi">
                     <node concept="1xMEDy" id="4MEOIDG8npb" role="1xVPHs">
                       <node concept="chp4Y" id="JOGAOsX26P" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                        <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
                       </node>
                     </node>
                   </node>
@@ -2169,7 +2169,7 @@
   </node>
   <node concept="13h7C7" id="JOGAOsxidP">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+    <ref role="13h7C2" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
     <node concept="13i0hz" id="5hSMZ_lRESV" role="13h7CS">
       <property role="TrG5h" value="runtimeClassName" />
       <node concept="3Tm1VV" id="5hSMZ_lRESW" role="1B3o_S" />
@@ -2225,13 +2225,13 @@
   </node>
   <node concept="13h7C7" id="JOGAOsxlgX">
     <property role="3GE5qa" value="term" />
-    <ref role="13h7C2" to="wq2x:JOGAOsxiLy" resolve="DataFormTemplate" />
+    <ref role="13h7C2" to="wq2x:JOGAOsxiLy" resolve="TermTemplate" />
     <node concept="13i0hz" id="5UYwY$H7MGm" role="13h7CS">
       <property role="TrG5h" value="valueFeatures" />
       <node concept="3Tm1VV" id="5UYwY$H7MGn" role="1B3o_S" />
       <node concept="A3Dl8" id="5UYwY$H7MID" role="3clF45">
         <node concept="3Tqbb2" id="5UYwY$H7MIQ" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3clFbS" id="5UYwY$H7MGp" role="3clF47">
@@ -2274,7 +2274,7 @@
       <node concept="3Tm1VV" id="5UYwY$H7TrM" role="1B3o_S" />
       <node concept="A3Dl8" id="5UYwY$H7TDk" role="3clF45">
         <node concept="3Tqbb2" id="5UYwY$H7TDx" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3clFbS" id="5UYwY$H7TrO" role="3clF47">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 4dfd9573..8d8ab941 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -2220,7 +2220,7 @@
   </node>
   <node concept="1M2fIO" id="JOGAOsxTE1">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1M2myG" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+    <ref role="1M2myG" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
     <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:JOGAOsxTDo" resolve="feature" />
       <node concept="3dgokm" id="6fXjIfxgfU1" role="1N6uqs">
@@ -2229,7 +2229,7 @@
             <node concept="3cpWsn" id="6fXjIfxgfU4" role="3cpWs9">
               <property role="TrG5h" value="dfd" />
               <node concept="3Tqbb2" id="6fXjIfxgfU5" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+                <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
               </node>
               <node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
                 <node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
@@ -2237,7 +2237,7 @@
                   <node concept="2Xjw5R" id="6fXjIfxgfU9" role="2OqNvi">
                     <node concept="1xMEDy" id="6fXjIfxgfUa" role="1xVPHs">
                       <node concept="chp4Y" id="JOGAOsxUUx" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                        <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                       </node>
                     </node>
                     <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
@@ -2308,7 +2308,7 @@
   </node>
   <node concept="1M2fIO" id="4vr5SAprtjH">
     <property role="3GE5qa" value="term" />
-    <ref role="1M2myG" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <ref role="1M2myG" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
     <node concept="1N5Pfh" id="4vr5SAprtjI" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:JOGAOsxaCh" resolve="prototype" />
       <node concept="3dgokm" id="4vr5SAprtjM" role="1N6uqs">
@@ -2326,7 +2326,7 @@
                       <node concept="1PxgMI" id="4vr5SAprBxC" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
                         <node concept="chp4Y" id="4vr5SAprBxD" role="3oSUPX">
-                          <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                          <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
                         </node>
                         <node concept="2OqwBi" id="4vr5SAprBxE" role="1m5AlR">
                           <node concept="2rP1CM" id="4vr5SAprBxF" role="2Oq$k0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 7e6e737d..782ed8ab 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -8200,7 +8200,7 @@
   </node>
   <node concept="24kQdi" id="JOGAOsxiLE">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     <node concept="3EZMnI" id="1CcQBrPqjR2" role="2wV5jI">
       <node concept="3F0ifn" id="1CcQBrPqjR9" role="3EZMnx">
         <property role="3F0ifm" value="final" />
@@ -8227,7 +8227,7 @@
       <node concept="3F0A7n" id="JOGAOsx_Ch" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <node concept="A1WHr" id="JOGAOsx_Ci" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+          <ref role="2ZyFGn" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
         </node>
       </node>
       <node concept="3EZMnI" id="JOGAOsx_Cj" role="3EZMnx">
@@ -8262,7 +8262,7 @@
   <node concept="1h_SRR" id="JOGAOsxj5_">
     <property role="TrG5h" value="DataFormFeature_final" />
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1h_SK9" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+    <ref role="1h_SK9" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     <node concept="1hA7zw" id="1CcQBrPqIC5" role="1h_SK8">
       <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
       <node concept="1hAIg9" id="1CcQBrPqIC6" role="1hA7z_">
@@ -8300,7 +8300,7 @@
   </node>
   <node concept="IW6AY" id="JOGAOsxkwf">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="aqKnT" to="wq2x:JOGAOsxiL_" resolve="DataFormFeature" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     <node concept="1Qtc8_" id="1CcQBrPqlWP" role="IW6Ez">
       <node concept="3cWJ9i" id="1CcQBrPqlWT" role="1Qtc8$">
         <node concept="CtIbL" id="1CcQBrPqlWV" role="CtIbM">
@@ -8388,7 +8388,7 @@
   </node>
   <node concept="24kQdi" id="JOGAOsxTDr">
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1XX52x" to="wq2x:JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
     <node concept="3EZMnI" id="1L74NXFMBU5" role="2wV5jI">
       <node concept="1iCGBv" id="1L74NXFMBUc" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:JOGAOsxTDo" resolve="feature" />
@@ -8414,7 +8414,7 @@
   </node>
   <node concept="24kQdi" id="JOGAOsxX6Q">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
     <node concept="3EZMnI" id="1L74NXElXMk" role="2wV5jI">
       <node concept="l2Vlx" id="1L74NXElXMn" role="2iSdaV" />
       <node concept="1iCGBv" id="5hSMZ_l942J" role="3EZMnx">
@@ -8462,7 +8462,7 @@
   </node>
   <node concept="3p36aQ" id="JOGAOsxYtS">
     <property role="3GE5qa" value="term" />
-    <ref role="aqKnT" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
     <node concept="2F$Pav" id="7XmdqtdOhCF" role="3ft7WO">
       <node concept="3eGOop" id="7XmdqtdOhD8" role="2$S_pN">
         <node concept="ucgPf" id="7XmdqtdOhDa" role="3aKz83">
@@ -8471,12 +8471,12 @@
               <node concept="3cpWsn" id="7XmdqtdOxrV" role="3cpWs9">
                 <property role="TrG5h" value="df" />
                 <node concept="3Tqbb2" id="7XmdqtdOxrT" role="1tU5fm">
-                  <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                  <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                 </node>
                 <node concept="2ShNRf" id="7XmdqtdOxrW" role="33vP2m">
                   <node concept="3zrR0B" id="7XmdqtdOxrX" role="2ShVmc">
                     <node concept="3Tqbb2" id="7XmdqtdOxrY" role="3zrR0E">
-                      <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                      <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                     </node>
                   </node>
                 </node>
@@ -8506,7 +8506,7 @@
         </node>
       </node>
       <node concept="3Tqbb2" id="7XmdqtdOhCX" role="2ZBHrp">
-        <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+        <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
       </node>
       <node concept="2$S_p_" id="7XmdqtdOhHi" role="2$S_pT">
         <node concept="3clFbS" id="7XmdqtdOhHj" role="2VODD2">
@@ -8515,7 +8515,7 @@
               <node concept="2OqwBi" id="7XmdqtdOrx1" role="2Oq$k0">
                 <node concept="1rpKSd" id="7XmdqtdOril" role="2Oq$k0" />
                 <node concept="1j9C0f" id="7XmdqtdOrJl" role="2OqNvi">
-                  <ref role="1j9C0d" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                  <ref role="1j9C0d" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
                 </node>
               </node>
               <node concept="13MTOL" id="JOGAOsy1e8" role="2OqNvi">
@@ -8529,7 +8529,7 @@
   </node>
   <node concept="IW6AY" id="JOGAOsxCR1">
     <property role="3GE5qa" value="term" />
-    <ref role="aqKnT" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
     <node concept="1Qtc8_" id="4vr5SApqcy2" role="IW6Ez">
       <node concept="3cWJ9i" id="4vr5SApqcOk" role="1Qtc8$">
         <node concept="CtIbL" id="4vr5SApqcOm" role="CtIbM">
@@ -8596,7 +8596,7 @@
                   <node concept="1PxgMI" id="7c96q9tzDxt" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
                     <node concept="chp4Y" id="JOGAOsxD_G" role="3oSUPX">
-                      <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+                      <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
                     </node>
                     <node concept="2OqwBi" id="7c96q9tzC66" role="1m5AlR">
                       <node concept="7Obwk" id="7c96q9tzBTo" role="2Oq$k0" />
@@ -8676,14 +8676,14 @@
           </node>
         </node>
         <node concept="3Tqbb2" id="7c96q9tzBJN" role="2ZBHrp">
-          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
         </node>
       </node>
     </node>
   </node>
   <node concept="24kQdi" id="JOGAOsxEW6">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
     <node concept="3EZMnI" id="4MEOIDFttNp" role="2wV5jI">
       <node concept="3F0ifn" id="4vr5SApqlad" role="3EZMnx">
         <property role="3F0ifm" value="open" />
@@ -8706,7 +8706,7 @@
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <ref role="1k5W1q" to="qgy9:4bWqD4C2vDI" resolve="Term" />
         <node concept="A1WHr" id="7c96q9tzV90" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+          <ref role="2ZyFGn" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
         </node>
       </node>
       <node concept="3EZMnI" id="7c96q9t$nwo" role="3EZMnx">
@@ -8751,7 +8751,7 @@
   <node concept="1h_SRR" id="4vr5SAprGdP">
     <property role="3GE5qa" value="term" />
     <property role="TrG5h" value="DataForm_open_DELETE" />
-    <ref role="1h_SK9" to="wq2x:JOGAOsxaC9" resolve="DataFormDeclaration" />
+    <ref role="1h_SK9" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
     <node concept="1hA7zw" id="4vr5SAprGdQ" role="1h_SK8">
       <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
       <node concept="1hAIg9" id="4vr5SAprGdR" role="1hA7z_">
@@ -8775,7 +8775,7 @@
   </node>
   <node concept="24kQdi" id="JOGAOsxaCz">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:JOGAOsxaCw" resolve="DataFormTable" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
     <node concept="3EZMnI" id="5hSMZ_lNwqE" role="2wV5jI">
       <node concept="3EZMnI" id="5hSMZ_lNwqF" role="3EZMnx">
         <node concept="VPM3Z" id="5hSMZ_lNwqG" role="3F10Kt">
@@ -8829,7 +8829,7 @@
   </node>
   <node concept="24kQdi" id="JOGAOsxlgm">
     <property role="3GE5qa" value="term" />
-    <ref role="1XX52x" to="wq2x:JOGAOsxiLy" resolve="DataFormTemplate" />
+    <ref role="1XX52x" to="wq2x:JOGAOsxiLy" resolve="TermTemplate" />
     <node concept="3EZMnI" id="1pPth$m6bZO" role="2wV5jI">
       <node concept="3F0ifn" id="1pPth$m6bZV" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -8887,5 +8887,63 @@
       <node concept="l2Vlx" id="24ciDNzqIwn" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="3MfP0fwgGcn">
+    <property role="3GE5qa" value="dataform" />
+    <ref role="1XX52x" to="wq2x:3MfP0fwgGck" resolve="TermConstructorDataForm" />
+    <node concept="3EZMnI" id="3MfP0fwgGcp" role="2wV5jI">
+      <node concept="3F1sOY" id="3MfP0fwgGcy" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:3MfP0fwgGcw" resolve="constructor" />
+      </node>
+      <node concept="l2Vlx" id="3MfP0fwgGcs" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p36aQ" id="3MfP0fwgGqi">
+    <property role="3GE5qa" value="dataform" />
+    <ref role="aqKnT" to="wq2x:3MfP0fwgGck" resolve="TermConstructorDataForm" />
+    <node concept="3N5dw7" id="3MfP0fwgGql" role="3ft7WO">
+      <node concept="3N5aqt" id="3MfP0fwgGqm" role="3Na0zg">
+        <node concept="3clFbS" id="3MfP0fwgGqn" role="2VODD2">
+          <node concept="3cpWs8" id="3MfP0fwgS01" role="3cqZAp">
+            <node concept="3cpWsn" id="3MfP0fwgS02" role="3cpWs9">
+              <property role="TrG5h" value="tcdf" />
+              <node concept="3Tqbb2" id="3MfP0fwgRZM" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:3MfP0fwgGck" resolve="TermConstructorDataForm" />
+              </node>
+              <node concept="2ShNRf" id="3MfP0fwgS03" role="33vP2m">
+                <node concept="3zrR0B" id="3MfP0fwgS04" role="2ShVmc">
+                  <node concept="3Tqbb2" id="3MfP0fwgS05" role="3zrR0E">
+                    <ref role="ehGHo" to="wq2x:3MfP0fwgGck" resolve="TermConstructorDataForm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3MfP0fwgH4a" role="3cqZAp">
+            <node concept="2OqwBi" id="3MfP0fwgSzP" role="3clFbG">
+              <node concept="2OqwBi" id="3MfP0fwgSb4" role="2Oq$k0">
+                <node concept="37vLTw" id="3MfP0fwgS06" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3MfP0fwgS02" resolve="tcdf" />
+                </node>
+                <node concept="3TrEf2" id="3MfP0fwgSnr" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:3MfP0fwgGcw" resolve="constructor" />
+                </node>
+              </node>
+              <node concept="2oxUTD" id="3MfP0fwgSKu" role="2OqNvi">
+                <node concept="3N4pyC" id="3MfP0fwgSTp" role="2oxUTC" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3MfP0fwgT1o" role="3cqZAp">
+            <node concept="37vLTw" id="3MfP0fwgT1m" role="3clFbG">
+              <ref role="3cqZAo" node="3MfP0fwgS02" resolve="tcdf" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2kknPJ" id="3MfP0fwgGs$" role="2klrvf">
+        <ref role="2ZyFGn" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
index 1ccdb53a..24147991 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
@@ -4732,7 +4732,7 @@
               <node concept="2OqwBi" id="5VJ3UjC9usA" role="3uHU7B">
                 <node concept="1mIQ4w" id="5VJ3UjC9uDf" role="2OqNvi">
                   <node concept="chp4Y" id="5VJ3UjC9uG6" role="cj9EA">
-                    <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                    <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="5VJ3UjCclRj" role="2Oq$k0">
@@ -4742,7 +4742,7 @@
               <node concept="2OqwBi" id="5VJ3UjC9v9s" role="3uHU7w">
                 <node concept="1mIQ4w" id="5VJ3UjC9v9w" role="2OqNvi">
                   <node concept="chp4Y" id="5VJ3UjC9v9x" role="cj9EA">
-                    <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                    <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="5VJ3UjCcm8F" role="2Oq$k0">
@@ -4757,7 +4757,7 @@
                   <node concept="1PxgMI" id="5VJ3UjC9GQV" role="37wK5m">
                     <property role="1BlNFB" value="true" />
                     <node concept="chp4Y" id="5VJ3UjC9GQW" role="3oSUPX">
-                      <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                      <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                     </node>
                     <node concept="37vLTw" id="5VJ3UjCcoBD" role="1m5AlR">
                       <ref role="3cqZAo" node="1RMe_qTgvnI" resolve="l" />
@@ -4766,7 +4766,7 @@
                   <node concept="1PxgMI" id="5VJ3UjC9CbJ" role="37wK5m">
                     <property role="1BlNFB" value="true" />
                     <node concept="chp4Y" id="5VJ3UjC9EYR" role="3oSUPX">
-                      <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                      <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                     </node>
                     <node concept="37vLTw" id="5VJ3UjCcsl2" role="1m5AlR">
                       <ref role="3cqZAo" node="1RMe_qTgtzY" resolve="r" />
@@ -5261,7 +5261,7 @@
               </node>
               <node concept="1mIQ4w" id="5VJ3UjC8x4C" role="2OqNvi">
                 <node concept="chp4Y" id="5VJ3UjC8xa6" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+                  <ref role="cht4Q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
                 </node>
               </node>
             </node>
@@ -5363,13 +5363,13 @@
       <node concept="37vLTG" id="5VJ3UjC8TZG" role="3clF46">
         <property role="TrG5h" value="df1" />
         <node concept="3Tqbb2" id="5VJ3UjC8TZH" role="1tU5fm">
-          <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
         </node>
       </node>
       <node concept="37vLTG" id="5VJ3UjC8TZI" role="3clF46">
         <property role="TrG5h" value="df2" />
         <node concept="3Tqbb2" id="5VJ3UjC8TZJ" role="1tU5fm">
-          <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
+          <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
         </node>
       </node>
       <node concept="3clFbS" id="5VJ3UjC8TZK" role="3clF47">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 8011cec5..87308c8f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1861,14 +1861,14 @@
     <property role="TrG5h" value="ChildFeature" />
     <property role="34LRSv" value="child" />
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="TermFeature" />
     <node concept="t5JxF" id="3MfP0fwg5vf" role="lGtFl">
       <property role="t5JxN" value="Feature declaration of child term." />
     </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxiL_">
     <property role="EcuMT" value="861509610434276453" />
-    <property role="TrG5h" value="DataFormFeature" />
+    <property role="TrG5h" value="TermFeature" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
     <property role="3GE5qa" value="term.feature" />
@@ -1888,22 +1888,22 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uK" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermFeature!! Defines a term feature." />
+      <property role="t5JxN" value="Defines a term feature." />
       <node concept="t5JxR" id="3MfP0fwg5vc" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxiLy" resolve="DataFormTemplate" />
+        <ref role="t5JxO" node="JOGAOsxiLy" resolve="TermTemplate" />
       </node>
     </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxTDl">
     <property role="EcuMT" value="861509610434435669" />
     <property role="3GE5qa" value="term.feature" />
-    <property role="TrG5h" value="DataFormFeatureOverride" />
+    <property role="TrG5h" value="TermFeatureOverride" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxTDo" role="1TKVEi">
       <property role="IQ2ns" value="861509610434435672" />
       <property role="20kJfa" value="feature" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
+      <ref role="20lvS9" node="JOGAOsxiL_" resolve="TermFeature" />
     </node>
     <node concept="1TJgyj" id="JOGAOsxTDm" role="1TKVEi">
       <property role="IQ2ns" value="861509610434435670" />
@@ -1913,9 +1913,9 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uI" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermFeatureOverride!! Allows to override default feature value in term constructor" />
+      <property role="t5JxN" value="Allows to override default feature value in term constructor" />
       <node concept="t5JxR" id="3MfP0fwg5uX" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
+        <ref role="t5JxO" node="JOGAOsxanH" resolve="TermConstructor" />
       </node>
     </node>
   </node>
@@ -1924,7 +1924,7 @@
     <property role="3GE5qa" value="term.feature" />
     <property role="TrG5h" value="ListFeature" />
     <property role="34LRSv" value="list" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="TermFeature" />
     <node concept="t5JxF" id="3MfP0fwg5w7" role="lGtFl">
       <property role="t5JxN" value="Feature declaration of a list of child terms." />
     </node>
@@ -1934,36 +1934,36 @@
     <property role="TrG5h" value="ValueFeature" />
     <property role="34LRSv" value="value" />
     <property role="3GE5qa" value="term.feature" />
-    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="DataFormFeature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="TermFeature" />
     <node concept="t5JxF" id="3MfP0fwg5w9" role="lGtFl">
       <property role="t5JxN" value="Feature declaration of an Object value." />
     </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxanH">
     <property role="EcuMT" value="861509610434242029" />
-    <property role="TrG5h" value="DataFormConstructor" />
+    <property role="TrG5h" value="TermConstructor" />
     <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     <node concept="1TJgyj" id="JOGAOsxaC6" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243078" />
       <property role="20kJfa" value="decl" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="TermDeclaration" />
     </node>
     <node concept="1TJgyj" id="JOGAOsxaC4" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243076" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="override" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="JOGAOsxTDl" resolve="DataFormFeatureOverride" />
+      <ref role="20lvS9" node="JOGAOsxTDl" resolve="TermFeatureOverride" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uG" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermConstructor!! Creates a term using the template. Enables to override features." />
+      <property role="t5JxN" value="Creates a term using the template. Enables to override features." />
     </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxaC9">
     <property role="EcuMT" value="861509610434243081" />
-    <property role="TrG5h" value="DataFormDeclaration" />
+    <property role="TrG5h" value="TermDeclaration" />
     <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="4vr5SApqc6O" role="1TKVEl">
@@ -1976,7 +1976,7 @@
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="template" />
       <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="JOGAOsxiLy" resolve="DataFormTemplate" />
+      <ref role="20lvS9" node="JOGAOsxiLy" resolve="TermTemplate" />
     </node>
     <node concept="PrWs8" id="JOGAOsxaCa" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@@ -1984,18 +1984,18 @@
     <node concept="1TJgyj" id="JOGAOsxaCh" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243089" />
       <property role="20kJfa" value="prototype" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="TermDeclaration" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uQ" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermDeclaration!! Contains term template. Provides possibility to extend another term declaration." />
+      <property role="t5JxN" value="Contains term template. Provides possibility to extend another term declaration." />
       <node concept="t5JxR" id="3MfP0fwg5v7" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxaCw" resolve="DataFormTable" />
+        <ref role="t5JxO" node="JOGAOsxaCw" resolve="TermTable" />
       </node>
     </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxaCw">
     <property role="EcuMT" value="861509610434243104" />
-    <property role="TrG5h" value="DataFormTable" />
+    <property role="TrG5h" value="TermTable" />
     <property role="34LRSv" value="DataForm Table" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="term" />
@@ -2005,18 +2005,18 @@
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="contents" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="JOGAOsxaC9" resolve="DataFormDeclaration" />
+      <ref role="20lvS9" node="JOGAOsxaC9" resolve="TermDeclaration" />
     </node>
     <node concept="PrWs8" id="JOGAOsxfAQ" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uO" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermTable!! Contains term declarations." />
+      <property role="t5JxN" value="Contains term declarations." />
     </node>
   </node>
   <node concept="1TIwiD" id="JOGAOsxiLy">
     <property role="EcuMT" value="861509610434276450" />
-    <property role="TrG5h" value="DataFormTemplate" />
+    <property role="TrG5h" value="TermTemplate" />
     <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="JOGAOsxiLz" role="1TKVEi">
@@ -2024,12 +2024,12 @@
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="feature" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="JOGAOsxiL_" resolve="DataFormFeature" />
+      <ref role="20lvS9" node="JOGAOsxiL_" resolve="TermFeature" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uM" role="lGtFl">
-      <property role="t5JxN" value="!!FIXME rename to TermTemplate!! Defines a term structure by enumerating features." />
+      <property role="t5JxN" value="Defines a term structure by enumerating features." />
       <node concept="t5JxR" id="3MfP0fwg5v2" role="t5JxU">
-        <ref role="t5JxO" node="JOGAOsxanH" resolve="DataFormConstructor" />
+        <ref role="t5JxO" node="JOGAOsxanH" resolve="TermConstructor" />
       </node>
     </node>
   </node>
@@ -2047,5 +2047,21 @@
     <property role="34LRSv" value="term" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
   </node>
+  <node concept="1TIwiD" id="3MfP0fwgGck">
+    <property role="EcuMT" value="4363939677057762068" />
+    <property role="3GE5qa" value="dataform" />
+    <property role="TrG5h" value="TermConstructorDataForm" />
+    <ref role="1TJDcQ" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
+    <node concept="t5JxF" id="3MfP0fwgGcl" role="lGtFl">
+      <property role="t5JxN" value="Allows to use term constructor as data form." />
+    </node>
+    <node concept="1TJgyj" id="3MfP0fwgGcw" role="1TKVEi">
+      <property role="IQ2ns" value="4363939677057762080" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="constructor" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="JOGAOsxanH" resolve="TermConstructor" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index ab503214..e0e8843c 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -579,27 +579,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="3MfP0fwjxqd" role="3acgRq">
-      <ref role="30HIoZ" to="5j4j:3MfP0fwgGck" resolve="TermConstructorDataForm" />
-      <node concept="gft3U" id="3MfP0fwjBy1" role="1lVwrX">
-        <node concept="10Nm6u" id="3MfP0fwjBy9" role="gfFT$">
-          <node concept="29HgVG" id="3MfP0fwjByk" role="lGtFl">
-            <node concept="3NFfHV" id="3MfP0fwjByp" role="3NFExx">
-              <node concept="3clFbS" id="3MfP0fwjByq" role="2VODD2">
-                <node concept="3clFbF" id="3MfP0fwjB$$" role="3cqZAp">
-                  <node concept="2OqwBi" id="3MfP0fwjBIn" role="3clFbG">
-                    <node concept="30H73N" id="3MfP0fwjB$z" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="3MfP0fwjBRs" role="2OqNvi">
-                      <ref role="3Tt5mk" to="5j4j:3MfP0fwgGcw" resolve="constructor" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="4lNgnaL7Fky" role="3acgRq">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="5j4j:5yqFHXo6Ubn" resolve="DataForm" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index b3460eb4..fc4ed85d 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -32,7 +32,6 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -4267,63 +4266,5 @@
       <node concept="l2Vlx" id="4nUKN9YNYrU" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="3MfP0fwgGcn">
-    <property role="3GE5qa" value="dataform" />
-    <ref role="1XX52x" to="5j4j:3MfP0fwgGck" resolve="TermConstructorDataForm" />
-    <node concept="3EZMnI" id="3MfP0fwgGcp" role="2wV5jI">
-      <node concept="3F1sOY" id="3MfP0fwgGcy" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:3MfP0fwgGcw" resolve="constructor" />
-      </node>
-      <node concept="l2Vlx" id="3MfP0fwgGcs" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="3p36aQ" id="3MfP0fwgGqi">
-    <property role="3GE5qa" value="dataform" />
-    <ref role="aqKnT" to="5j4j:3MfP0fwgGck" resolve="TermConstructorDataForm" />
-    <node concept="3N5dw7" id="3MfP0fwgGql" role="3ft7WO">
-      <node concept="3N5aqt" id="3MfP0fwgGqm" role="3Na0zg">
-        <node concept="3clFbS" id="3MfP0fwgGqn" role="2VODD2">
-          <node concept="3cpWs8" id="3MfP0fwgS01" role="3cqZAp">
-            <node concept="3cpWsn" id="3MfP0fwgS02" role="3cpWs9">
-              <property role="TrG5h" value="tcdf" />
-              <node concept="3Tqbb2" id="3MfP0fwgRZM" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:3MfP0fwgGck" resolve="TermConstructorDataForm" />
-              </node>
-              <node concept="2ShNRf" id="3MfP0fwgS03" role="33vP2m">
-                <node concept="3zrR0B" id="3MfP0fwgS04" role="2ShVmc">
-                  <node concept="3Tqbb2" id="3MfP0fwgS05" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:3MfP0fwgGck" resolve="TermConstructorDataForm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="3MfP0fwgH4a" role="3cqZAp">
-            <node concept="2OqwBi" id="3MfP0fwgSzP" role="3clFbG">
-              <node concept="2OqwBi" id="3MfP0fwgSb4" role="2Oq$k0">
-                <node concept="37vLTw" id="3MfP0fwgS06" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3MfP0fwgS02" resolve="tcdf" />
-                </node>
-                <node concept="3TrEf2" id="3MfP0fwgSnr" role="2OqNvi">
-                  <ref role="3Tt5mk" to="5j4j:3MfP0fwgGcw" resolve="constructor" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="3MfP0fwgSKu" role="2OqNvi">
-                <node concept="3N4pyC" id="3MfP0fwgSTp" role="2oxUTC" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="3MfP0fwgT1o" role="3cqZAp">
-            <node concept="37vLTw" id="3MfP0fwgT1m" role="3clFbG">
-              <ref role="3cqZAo" node="3MfP0fwgS02" resolve="tcdf" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2kknPJ" id="3MfP0fwgGs$" role="2klrvf">
-        <ref role="2ZyFGn" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index dc4a65d4..fd4c7c2d 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -9,7 +9,6 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
@@ -492,21 +491,5 @@
       <ref role="20lvS9" node="5yqFHXo6Ubn" resolve="DataForm" />
     </node>
   </node>
-  <node concept="1TIwiD" id="3MfP0fwgGck">
-    <property role="EcuMT" value="4363939677057762068" />
-    <property role="3GE5qa" value="dataform" />
-    <property role="TrG5h" value="TermConstructorDataForm" />
-    <ref role="1TJDcQ" node="5yqFHXo6Ubn" resolve="DataForm" />
-    <node concept="t5JxF" id="3MfP0fwgGcl" role="lGtFl">
-      <property role="t5JxN" value="Allows to use term constructor as data form." />
-    </node>
-    <node concept="1TJgyj" id="3MfP0fwgGcw" role="1TKVEi">
-      <property role="IQ2ns" value="4363939677057762080" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="constructor" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="wq2x:JOGAOsxanH" resolve="DataFormConstructor" />
-    </node>
-  </node>
 </model>