diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 0a1b2784..1ed9cc5b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -1669,7 +1669,7 @@
         <node concept="3clFbF" id="4MqhgXUNKmT" role="3cqZAp">
           <node concept="2ShNRf" id="4MqhgXUNKmP" role="3clFbG">
             <node concept="1pGfFk" id="4MqhgXUNKOX" role="2ShVmc">
-              <ref role="37wK5l" node="4MqhgXUM$CT" resolve="RulesListBuilder.HandlerImpl" />
+              <ref role="37wK5l" node="4MqhgXUM$CT" resolve="RulesListBuilder.RulesListImpl" />
             </node>
           </node>
         </node>
@@ -1678,7 +1678,7 @@
     <node concept="2tJIrI" id="4MqhgXUMb3H" role="jymVt" />
     <node concept="312cEu" id="4MqhgXUMzTQ" role="jymVt">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="HandlerImpl" />
+      <property role="TrG5h" value="RulesListImpl" />
       <node concept="2tJIrI" id="4MqhgXUM$3u" role="jymVt" />
       <node concept="3clFbW" id="4MqhgXUM$CT" role="jymVt">
         <node concept="3cqZAl" id="4MqhgXUM$CV" role="3clF45" />
@@ -1860,7 +1860,7 @@
       </node>
       <node concept="TZ5HA" id="2$$Q_FeW4_3" role="TZ5H$">
         <node concept="1dT_AC" id="2$$Q_FeW4_4" role="1dT_Ay">
-          <property role="1dT_AB" value="Instance of RulesList produced by toHandler() returns the rules sorted by location key." />
+          <property role="1dT_AB" value="Instance of RulesList produced by toRulesList() returns the rules sorted by location key." />
         </node>
       </node>
     </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 42051f02..53d3a519 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -2831,8 +2831,8 @@
                   <ref role="37wK5l" to="33ny:~Set.hashCode()" resolve="hashCode" />
                 </node>
               </node>
-              <node concept="3cmrfG" id="tc9pc3$O$I" role="3uHU7B">
-                <property role="3cmrfH" value="17" />
+              <node concept="3cmrfG" id="4t5t2tePTKR" role="3uHU7B">
+                <property role="3cmrfH" value="23" />
               </node>
             </node>
           </node>