diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps
index cabc9da4..a3fe510a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps
@@ -81,6 +81,7 @@
       </concept>
       <concept id="2555875871752198907" name="org.mpsqa.lint.generic.structure.ConceptFunctionParameter_MPSProject" flags="ng" index="1MG55F" />
       <concept id="2555875871751836213" name="org.mpsqa.lint.generic.structure.CheckableScript" flags="ng" index="1MIHA_">
+        <property id="6685385159444651026" name="skipEvaluation" index="3zADTN" />
         <child id="7741759128795038158" name="additionalParameters" index="2j1K4A" />
         <child id="1716492013482699988" name="checkingClosure" index="14J5yK" />
         <child id="2555875871751847640" name="explanation" index="1MIJl8" />
@@ -579,6 +580,7 @@
   </node>
   <node concept="1MIHA_" id="2xFKNLWB3BI">
     <property role="TrG5h" value="slow_checking_of_models" />
+    <property role="3zADTN" value="true" />
     <node concept="2j1LYv" id="2xFKNLWB3BJ" role="2j1YRv">
       <node concept="2j1LYi" id="2xFKNLWB3BK" role="2j1YQj">
         <ref role="2j1LYj" node="2xFKNLWB3BS" resolve="moduleNameRegex" />
@@ -666,14 +668,14 @@
         </node>
       </node>
       <node concept="1PaTwC" id="2xFKNLWB3Cr" role="1PaQFQ">
-        <node concept="3oM_SD" id="6o7R8_BquPx" role="1PaTwD">
+        <node concept="3oM_SD" id="47tbZooKZbP" role="1PaTwD">
           <property role="3oM_SC" value="moduleNameRegex" />
         </node>
         <node concept="3oM_SD" id="2xFKNLWB3Ct" role="1PaTwD">
           <property role="3oM_SC" value="-" />
         </node>
         <node concept="3oM_SD" id="2xFKNLWB3Cu" role="1PaTwD">
-          <property role="3oM_SC" value="substring" />
+          <property role="3oM_SC" value="regex" />
         </node>
         <node concept="3oM_SD" id="2xFKNLWB3Cv" role="1PaTwD">
           <property role="3oM_SC" value="of" />
@@ -694,19 +696,22 @@
           <property role="3oM_SC" value="the" />
         </node>
         <node concept="3oM_SD" id="2xFKNLWB3C_" role="1PaTwD">
-          <property role="3oM_SC" value="root" />
-        </node>
-        <node concept="3oM_SD" id="2xFKNLWB3CA" role="1PaTwD">
-          <property role="3oM_SC" value="nodes" />
+          <property role="3oM_SC" value="models" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3CB" role="1PaTwD">
-          <property role="3oM_SC" value="will" />
+        <node concept="3oM_SD" id="47tbZooKZc4" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3CC" role="1PaTwD">
+        <node concept="3oM_SD" id="47tbZooKZck" role="1PaTwD">
           <property role="3oM_SC" value="be" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3CD" role="1PaTwD">
-          <property role="3oM_SC" value="tested" />
+        <node concept="3oM_SD" id="47tbZooKZc_" role="1PaTwD">
+          <property role="3oM_SC" value="checked" />
+        </node>
+        <node concept="3oM_SD" id="47tbZooKZcR" role="1PaTwD">
+          <property role="3oM_SC" value="are" />
+        </node>
+        <node concept="3oM_SD" id="47tbZooKZek" role="1PaTwD">
+          <property role="3oM_SC" value="located" />
         </node>
       </node>
       <node concept="1PaTwC" id="2xFKNLWB3CE" role="1PaQFQ">
@@ -803,7 +808,7 @@
           <property role="3oM_SC" value="-" />
         </node>
         <node concept="3oM_SD" id="2xFKNLWB3Da" role="1PaTwD">
-          <property role="3oM_SC" value="substring" />
+          <property role="3oM_SC" value="regex" />
         </node>
         <node concept="3oM_SD" id="2xFKNLWB3Db" role="1PaTwD">
           <property role="3oM_SC" value="of" />
@@ -817,26 +822,17 @@
         <node concept="3oM_SD" id="2xFKNLWB3De" role="1PaTwD">
           <property role="3oM_SC" value="name" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Df" role="1PaTwD">
-          <property role="3oM_SC" value="where" />
+        <node concept="3oM_SD" id="47tbZooKZeM" role="1PaTwD">
+          <property role="3oM_SC" value="to" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Dg" role="1PaTwD">
-          <property role="3oM_SC" value="the" />
-        </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Dh" role="1PaTwD">
-          <property role="3oM_SC" value="root" />
+        <node concept="3oM_SD" id="47tbZooKZeZ" role="1PaTwD">
+          <property role="3oM_SC" value="check" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Di" role="1PaTwD">
-          <property role="3oM_SC" value="nodes" />
-        </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Dj" role="1PaTwD">
-          <property role="3oM_SC" value="will" />
-        </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Dk" role="1PaTwD">
-          <property role="3oM_SC" value="be" />
+        <node concept="3oM_SD" id="47tbZooKZfd" role="1PaTwD">
+          <property role="3oM_SC" value="for" />
         </node>
-        <node concept="3oM_SD" id="2xFKNLWB3Dl" role="1PaTwD">
-          <property role="3oM_SC" value="tested" />
+        <node concept="3oM_SD" id="47tbZooKZfG" role="1PaTwD">
+          <property role="3oM_SC" value="performance" />
         </node>
       </node>
       <node concept="1PaTwC" id="2xFKNLWB3Dm" role="1PaQFQ">
@@ -991,12 +987,12 @@
                 <node concept="37vLTw" id="2xFKNLWBCwz" role="37wK5m">
                   <ref role="3cqZAo" node="2xFKNLWB3Ee" resolve="models" />
                 </node>
-                <node concept="2j1LYi" id="2xFKNLWBCw$" role="37wK5m">
-                  <ref role="2j1LYj" node="2xFKNLWB3BU" resolve="modelNameRegex" />
-                </node>
                 <node concept="2j1LYi" id="2xFKNLWBCw_" role="37wK5m">
                   <ref role="2j1LYj" node="2xFKNLWB3BS" resolve="moduleNameRegex" />
                 </node>
+                <node concept="2j1LYi" id="2xFKNLWBCw$" role="37wK5m">
+                  <ref role="2j1LYj" node="2xFKNLWB3BU" resolve="modelNameRegex" />
+                </node>
                 <node concept="1MG55F" id="2xFKNLWBCwA" role="37wK5m" />
                 <node concept="2j1LYi" id="2xFKNLWBCwB" role="37wK5m">
                   <ref role="2j1LYj" node="2xFKNLWB3BW" resolve="timeBoundInMillis" />
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps
index b9c62d14..65f85234 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps
@@ -587,7 +587,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="6o7R8__uliY" role="3cqZAp" />
             <node concept="3cpWs8" id="2xFKNLWAQJk" role="3cqZAp">
               <node concept="3cpWsn" id="2xFKNLWAQJn" role="3cpWs9">
                 <property role="TrG5h" value="start" />
@@ -937,7 +936,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="53wV48CwXGY" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                      <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                       <node concept="37vLTw" id="2xFKNLWA5dR" role="37wK5m">
                         <ref role="3cqZAo" node="2xFKNLWA1Hy" resolve="moduleNameSubstring" />
                       </node>
@@ -960,7 +959,7 @@
                       <node concept="LkI2h" id="53wV48CwXH8" role="2OqNvi" />
                     </node>
                     <node concept="liA8E" id="53wV48CwXH9" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                      <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                       <node concept="37vLTw" id="2xFKNLWA4UC" role="37wK5m">
                         <ref role="3cqZAo" node="2xFKNLWA24e" resolve="modelNameSubstring" />
                       </node>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
index ea8073f8..8605fe27 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
@@ -53,7 +53,6 @@
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
     <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="0" />
   </languageVersions>
   <dependencyVersions>