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 961231cd..d9827f12 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
@@ -725,7 +725,7 @@
                 </node>
                 <node concept="2SmgA7" id="7km57Pkdjt1" role="2OqNvi">
                   <node concept="chp4Y" id="7lt0LtPNOKQ" role="1dBWTz">
-                    <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                    <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                   </node>
                 </node>
               </node>
@@ -741,12 +741,12 @@
     </node>
     <node concept="2rT7sh" id="4MqhgXUaC7X" role="2rTMjI">
       <property role="TrG5h" value="handler_template_class" />
-      <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+      <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
     <node concept="2rT7sh" id="7P_FdVQ488b" role="2rTMjI">
       <property role="TrG5h" value="handler_template_constructor" />
-      <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+      <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
       <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
     </node>
     <node concept="2rT7sh" id="2RRx4MZAapX" role="2rTMjI">
@@ -825,7 +825,7 @@
       <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
     </node>
     <node concept="3lhOvk" id="4MqhgXUaA0d" role="3lj3bC">
-      <ref role="30HIoZ" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+      <ref role="30HIoZ" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
       <ref role="3lhOvi" node="4MqhgXU9Ebr" resolve="HandlerTemplateImpl" />
       <ref role="2sgKRv" node="4MqhgXUaC7X" resolve="handler_template_class" />
     </node>
@@ -852,7 +852,7 @@
               <node concept="2OqwBi" id="36tQV5A_uXY" role="3fr31v">
                 <node concept="30H73N" id="36tQV5A_uXZ" role="2Oq$k0" />
                 <node concept="1BlSNk" id="36tQV5A_uY0" role="2OqNvi">
-                  <ref role="1BmUXE" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                  <ref role="1BmUXE" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                   <ref role="1Bn3mz" to="wq2x:36tQV5Anslx" resolve="template" />
                 </node>
               </node>
@@ -1405,7 +1405,7 @@
       <ref role="1puQsG" node="4vbeH84MZvs" resolve="localvars_make_unique" />
     </node>
     <node concept="aNPBN" id="4vbeH84CQ5c" role="aQYdv">
-      <ref role="aOQi4" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+      <ref role="aOQi4" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
     </node>
   </node>
   <node concept="1pmfR0" id="4vbeH84AvBw">
@@ -3151,7 +3151,7 @@
                         </node>
                         <node concept="2SmgA7" id="4MqhgXUayhW" role="2OqNvi">
                           <node concept="chp4Y" id="4MqhgXUayDv" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                           </node>
                         </node>
                       </node>
@@ -11138,7 +11138,7 @@
     </node>
     <node concept="3Tm1VV" id="4MqhgXU9Ebs" role="1B3o_S" />
     <node concept="n94m4" id="4MqhgXU9Ebt" role="lGtFl">
-      <ref role="n9lRv" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+      <ref role="n9lRv" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
     </node>
     <node concept="3uibUv" id="4MqhgXUa3o$" role="EKbjA">
       <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
@@ -11152,7 +11152,7 @@
             <node concept="3cpWs3" id="4MqhgXUaaTa" role="3clFbG">
               <node concept="2OqwBi" id="4MqhgXUabZl" role="3uHU7w">
                 <node concept="35c_gC" id="4MqhgXUab9q" role="2Oq$k0">
-                  <ref role="35c_gD" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                  <ref role="35c_gD" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                 </node>
                 <node concept="3n3YKJ" id="4MqhgXUacB0" role="2OqNvi" />
               </node>
@@ -14793,7 +14793,7 @@
                         </node>
                         <node concept="2SmgA7" id="6tPOoeT43EP" role="2OqNvi">
                           <node concept="chp4Y" id="6tPOoeT43EQ" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                           </node>
                         </node>
                       </node>
@@ -15491,7 +15491,7 @@
                         </node>
                         <node concept="2SmgA7" id="NKt6ynYgyZ" role="2OqNvi">
                           <node concept="chp4Y" id="NKt6ynYgz0" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                           </node>
                         </node>
                       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index c24a668c..95719705 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1289,13 +1289,13 @@
   </node>
   <node concept="13h7C7" id="34$A1Mf3_W$">
     <property role="3GE5qa" value="rule" />
-    <ref role="13h7C2" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+    <ref role="13h7C2" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
     <node concept="13i0hz" id="34$A1Mf3_WJ" role="13h7CS">
       <property role="TrG5h" value="handlerClosure" />
       <node concept="3Tm1VV" id="34$A1Mf3_WK" role="1B3o_S" />
       <node concept="A3Dl8" id="34$A1Mf3MzM" role="3clF45">
         <node concept="3Tqbb2" id="34$A1Mf3M$j" role="A3Ik2">
-          <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+          <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
         </node>
       </node>
       <node concept="3clFbS" id="34$A1Mf3_WM" role="3clF47">
@@ -1303,12 +1303,12 @@
           <node concept="3cpWsn" id="34$A1Mf3MMy" role="3cpWs9">
             <property role="TrG5h" value="closure" />
             <node concept="2I9FWS" id="34$A1Mf3MMv" role="1tU5fm">
-              <ref role="2I9WkF" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+              <ref role="2I9WkF" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
             </node>
             <node concept="2ShNRf" id="34$A1Mf3MMz" role="33vP2m">
               <node concept="2T8Vx0" id="34$A1Mf3MM$" role="2ShVmc">
                 <node concept="2I9FWS" id="34$A1Mf3MM_" role="2T96Bj">
-                  <ref role="2I9WkF" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                  <ref role="2I9WkF" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                 </node>
               </node>
             </node>
@@ -1347,7 +1347,7 @@
       <node concept="37vLTG" id="34$A1Mf3DIf" role="3clF46">
         <property role="TrG5h" value="collection" />
         <node concept="2I9FWS" id="34$A1Mf3DIt" role="1tU5fm">
-          <ref role="2I9WkF" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+          <ref role="2I9WkF" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
         </node>
       </node>
       <node concept="3Tm6S6" id="34$A1Mf3_ZB" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 29dd5002..6d19af36 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -1078,7 +1078,7 @@
                             <node concept="2Xjw5R" id="34$A1Mf4Hzh" role="2OqNvi">
                               <node concept="1xMEDy" id="34$A1Mf4Hzi" role="1xVPHs">
                                 <node concept="chp4Y" id="34$A1Mf4Hzj" role="ri$Ld">
-                                  <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                                  <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                                 </node>
                               </node>
                             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 67ea14ca..b52636f0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -819,7 +819,7 @@
     </node>
   </node>
   <node concept="24kQdi" id="6p0DfM0dr8L">
-    <ref role="1XX52x" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+    <ref role="1XX52x" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
     <node concept="3EZMnI" id="6p0DfM0drav" role="2wV5jI">
       <node concept="PMmxH" id="6p0DfM0drif" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
@@ -829,7 +829,7 @@
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <ref role="1k5W1q" to="tpen:hFIVf2f" resolve="ClassName" />
         <node concept="A1WHr" id="34$A1Mf2Ry1" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+          <ref role="2ZyFGn" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
         </node>
       </node>
       <node concept="3EZMnI" id="34$A1Mf2yYf" role="3EZMnx">
@@ -4590,7 +4590,7 @@
   </node>
   <node concept="IW6AY" id="34$A1Mf2_6Z">
     <property role="3GE5qa" value="rule" />
-    <ref role="aqKnT" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+    <ref role="aqKnT" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
     <node concept="1Qtc8_" id="34$A1Mf2_73" role="IW6Ez">
       <node concept="1GhOrh" id="34$A1Mf2BGj" role="1Qtc8A">
         <node concept="1GhMSn" id="34$A1Mf2BGl" role="1GhOrs">
@@ -4600,14 +4600,14 @@
                 <node concept="2OqwBi" id="34$A1Mf2Cso" role="2Oq$k0">
                   <node concept="1rpKSd" id="34$A1Mf2Cf5" role="2Oq$k0" />
                   <node concept="3lApI0" id="34$A1Mf2CB9" role="2OqNvi">
-                    <ref role="3lApI3" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                    <ref role="3lApI3" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                   </node>
                 </node>
                 <node concept="66VNe" id="34$A1Mf2HZq" role="2OqNvi">
                   <node concept="2ShNRf" id="34$A1Mf2IZR" role="576Qk">
                     <node concept="2HTt$P" id="34$A1Mf2JmN" role="2ShVmc">
                       <node concept="3Tqbb2" id="34$A1Mf2JTf" role="2HTBi0">
-                        <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                        <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                       </node>
                       <node concept="7Obwk" id="34$A1Mf2K9p" role="2HTEbv" />
                     </node>
@@ -4654,7 +4654,7 @@
           </node>
         </node>
         <node concept="3Tqbb2" id="34$A1Mf2BVj" role="2ZBHrp">
-          <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+          <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
         </node>
       </node>
       <node concept="3cWJ9i" id="34$A1Mf2_77" role="1Qtc8$">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
index 073157ac..4b99e734 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
@@ -183,7 +183,7 @@
                         <node concept="2Rxl7S" id="2TtA2rKdxwW" role="2OqNvi" />
                       </node>
                       <node concept="chp4Y" id="6fXjIfxgneU" role="3oSUPX">
-                        <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                        <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                       </node>
                     </node>
                     <node concept="3Tsc0h" id="1HWyn8jHUQx" role="2OqNvi">
@@ -376,7 +376,7 @@
                           <node concept="2Rxl7S" id="2TtA2rKerk_" role="2OqNvi" />
                         </node>
                         <node concept="chp4Y" id="6fXjIfxgnf5" role="3oSUPX">
-                          <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                          <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
                         </node>
                       </node>
                       <node concept="3Tsc0h" id="1HWyn8jHIDb" role="2OqNvi">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 4cd6c360..4540f10b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -78,17 +78,17 @@
     </language>
   </registry>
   <node concept="1TIwiD" id="7eGEHDlgPKk">
-    <property role="TrG5h" value="Handler" />
+    <property role="TrG5h" value="RulesList" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="rule" />
-    <property role="34LRSv" value="handler" />
+    <property role="34LRSv" value="rulesList" />
     <property role="EcuMT" value="8335224865066015764" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="34$A1Mf2w7l" role="1TKVEi">
       <property role="IQ2ns" value="3541122455446356437" />
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="extends" />
-      <ref role="20lvS9" node="7eGEHDlgPKk" resolve="Handler" />
+      <ref role="20lvS9" node="7eGEHDlgPKk" resolve="RulesList" />
     </node>
     <node concept="1TJgyj" id="1HWyn8jEsaE" role="1TKVEi">
       <property role="IQ2ns" value="1980609059185345194" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index e3f08260..a12589c6 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -195,7 +195,7 @@
       <concept id="3026409000515975840" name="jetbrains.mps.lang.coderules.structure.QueryParameterDeclaration" flags="ng" index="2_cOLj">
         <child id="3026409000516797621" name="type" index="2_9F96" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 46b806ab..41a45588 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -229,7 +229,7 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 8fff2571..cab9bc44 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -318,7 +318,7 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index c4f813e0..4d209b39 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -188,7 +188,7 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index 676b3ed9..a8970e8f 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -96,7 +96,7 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 0a5b385b..9d583165 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -421,7 +421,7 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index c9e5b772..34e37253 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 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
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 38904ed2..62d3e6fe 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
@@ -643,7 +643,7 @@
       <concept id="3026409000515975840" name="jetbrains.mps.lang.coderules.structure.QueryParameterDeclaration" flags="ng" index="2_cOLj">
         <child id="3026409000516797621" name="type" index="2_9F96" />
       </concept>
-      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+      <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />