From 5b28f2d72c3a5c70cbb73ebe8e3033b81e95010d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= <sergej@koscejev.cz>
Date: Wed, 20 Mar 2024 15:36:18 +0100
Subject: [PATCH] Run rerunnable migrations

---
 .../test.org.mpsqa.arch.msd                   |   1 +
 .../models/org.mpsqa.build.allScripts.mps     | 147 +++++++++++++++
 .../models/org.mpsqa.build.sandboxes.mps      |  38 ++++
 .../org.mpsqa.build._010_base_build.mps       |  51 ++++++
 .../org.mpsqa.build._020_testing_build.mps    |  32 ++++
 .../org.mpsqa.build._030_clones_build.mps     |  32 ++++
 .../org.mpsqa.build._040_mutant_build.mps     |  51 ++++++
 .../org.mpsqa.build._080_lint_build.mps       |  48 +++++
 .../org.mpsqa.build._100_allInOne_build.mps   |  28 +++
 .../models/org.mpsqa.clones.config.editor.mps |  22 +--
 .../org.mpsqa.clones.config.intentions.mps    |   2 +-
 .../org.mpsqa.clones.config.structure.mps     |  12 +-
 .../models/org.mpsqa.clones.build.mps         |  16 ++
 ...qa.clones.config.pluginSolution.plugin.mps |   8 +-
 .../models/utils.mps                          |   6 +-
 .../org.mpsqa.clones.core/models/algo.mps     |  62 +++----
 .../org.mpsqa.clones.core/models/hashcode.mps | 108 ++++++++---
 .../models/management.mps                     |  58 +++---
 .../models/plugin.mps                         |  50 +++---
 .../models/ui.mps                             | 170 +++++++++---------
 .../models/visualization.mps                  | 117 ++++++++----
 .../org.mpsqa.clones.config.sandbox.msd       |   5 +
 .../models/_010_headless_runner_1@tests.mps   |   2 +-
 .../test.org.mpsqa.clones.headless.msd        |   1 +
 .../models/_000_infrastructure@tests.mps      |  16 +-
 .../_010_identical_java_statements@tests.mps  |   2 +-
 .../models/_020_overlapping_clones@tests.mps  |   2 +-
 .../_200_save_load_filter_clones@tests.mps    |   4 +-
 ...estcode._010_identical_java_statements.mps |  24 +--
 .../testcode._020_overlapping_clones.mps      |  12 +-
 .../test.org.mpsqa.clones.msd                 |   1 +
 .../org.mpsqa.deprecated.typesystem.mps       |   4 +-
 .../test.org.mpsqa.deprecated.msd             |   1 +
 .../models/org.mpsqa.lint.build.mps           |  19 ++
 .../test.org.mpsqa.mutant.demolang.msd        |   1 +
 ...ildIntegration.jacoco.codeowners.tests.msd |   1 +
 ....mpsqa.testcov.jacoco.rt.visualization.mps |  58 +++++-
 .../models/org.mpsqa.testing.tests.build.mps  |  15 ++
 .../models/org.mpsqa.lancov.editor.mps        |  42 ++---
 .../models/org.mpsqa.lancov.intentions.mps    |   6 +-
 .../test.org.mpsqa.lancov.fragments.msd       |   1 +
 41 files changed, 962 insertions(+), 314 deletions(-)

diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
index 626c6f79..007fe124 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <languageVersions>
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
index fdf6cf6a..c2b5cfae 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
@@ -74,6 +74,9 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -188,6 +191,30 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7Jaw" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7Jax" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7Jay" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="55IIr" id="46QW9mm7Jaz" role="3LXTmr">
+            <node concept="2Ry0Ak" id="46QW9mm7Ja$" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7Ja_" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7JaA" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.build" />
+                  <node concept="2Ry0Ak" id="46QW9mm7JaB" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7JaC" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.build.allScripts" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="1E1JtA" id="5Xjjs0Nf2r4" role="3989C9">
       <property role="TrG5h" value="org.mpsqa.build" />
@@ -248,6 +275,30 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7JaE" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7JaF" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7JaG" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="55IIr" id="46QW9mm7JaH" role="3LXTmr">
+            <node concept="2Ry0Ak" id="46QW9mm7JaI" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7JaJ" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7JaK" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.build" />
+                  <node concept="2Ry0Ak" id="46QW9mm7JaL" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7JaM" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.build" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2igEWh" id="3GDqItDloKJ" role="1hWBAP">
       <property role="3UIfUI" value="1024" />
@@ -316,6 +367,30 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7JaO" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7JaP" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7JaQ" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="55IIr" id="46QW9mm7JaR" role="3LXTmr">
+            <node concept="2Ry0Ak" id="46QW9mm7JaS" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7JaT" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7JaU" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.build" />
+                  <node concept="2Ry0Ak" id="46QW9mm7JaV" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7JaW" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.build.sandboxes" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="1E1JtA" id="2WwuhUZ0zPP" role="3989C9">
       <property role="BnDLt" value="true" />
@@ -381,6 +456,30 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7JaY" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7JaZ" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7Jb0" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="55IIr" id="46QW9mm7Jb1" role="3LXTmr">
+            <node concept="2Ry0Ak" id="46QW9mm7Jb2" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jb3" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jb4" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones" />
+                  <node concept="2Ry0Ak" id="46QW9mm7Jb5" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7Jb6" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.clones.build" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="1E1JtA" id="2WwuhUZ3iEo" role="3989C9">
       <property role="BnDLt" value="true" />
@@ -446,6 +545,30 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7Jb8" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7Jb9" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7Jba" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="55IIr" id="46QW9mm7Jbb" role="3LXTmr">
+            <node concept="2Ry0Ak" id="46QW9mm7Jbc" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jbd" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jbe" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint" />
+                  <node concept="2Ry0Ak" id="46QW9mm7Jbf" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7Jbg" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.lint.build" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="1E1JtA" id="2WwuhUZ0zTl" role="3989C9">
       <property role="BnDLt" value="true" />
@@ -511,6 +634,30 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7Jbi" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7Jbj" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7Jbk" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="55IIr" id="46QW9mm7Jbl" role="3LXTmr">
+            <node concept="2Ry0Ak" id="46QW9mm7Jbm" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jbn" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jbo" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.testing" />
+                  <node concept="2Ry0Ak" id="46QW9mm7Jbp" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7Jbq" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.testing.tests.build" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
index 5c5f4021..6dd6b852 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
@@ -210,6 +210,25 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7Jbv" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7Jbw" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7Jbx" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="398BVA" id="46QW9mm7Jby" role="3LXTmr">
+            <ref role="398BVh" node="57r710zgQhu" resolve="languages" />
+            <node concept="2Ry0Ak" id="46QW9mm7Jbz" role="iGT6I">
+              <property role="2Ry0Am" value="org.mpsqa.mutant" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jb$" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jb_" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.mutant.demolang" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="1E1JtD" id="57r710zgDbF" role="3989C9">
       <property role="BnDLt" value="true" />
@@ -418,6 +437,25 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7JbB" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7JbC" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7JbD" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="398BVA" id="46QW9mm7JbE" role="3LXTmr">
+            <ref role="398BVh" node="57r710zgQhu" resolve="languages" />
+            <node concept="2Ry0Ak" id="46QW9mm7JbF" role="iGT6I">
+              <property role="2Ry0Am" value="org.mpsqa.deprecated" />
+              <node concept="2Ry0Ak" id="46QW9mm7JbG" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7JbH" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.deprecated.example_lan" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2sgV4H" id="57r710zgEGP" role="1l3spa">
       <ref role="1l3spb" to="m9y5:1YSnQiVh0x1" resolve="org.mpsqa.unused" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
index 9b53969c..a7c8a3f6 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._010_base_build.mps
@@ -102,6 +102,9 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -459,6 +462,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7JbM" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7JbN" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7JbO" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7JbP" role="3LXTmr">
+              <ref role="398BVh" node="7C9PHv6FBIL" resolve="mpsqa.base.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7JbQ" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7JbR" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.base.lib" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7C9PHv6FBMC" role="2G$12L">
         <property role="TrG5h" value="org.mpsqa.treemap.lib" />
@@ -579,6 +598,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7JbT" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7JbU" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7JbV" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7JbW" role="3LXTmr">
+              <ref role="398BVh" node="7C9PHv6FBIL" resolve="mpsqa.base.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7JbX" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7JbY" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.treemap.lib" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="zudvsqcgIl" role="2G$12L">
         <property role="TrG5h" value="org.mpsqa.base.utils" />
@@ -623,6 +658,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jc0" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jc1" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jc2" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jc3" role="3LXTmr">
+              <ref role="398BVh" node="7C9PHv6FBIL" resolve="mpsqa.base.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jc4" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jc5" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.base.utils" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="7C9PHv6FBIQ" role="auvoZ" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps
index 7e07a1ce..216dc0b8 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._020_testing_build.mps
@@ -378,6 +378,22 @@
             <ref role="3bR37D" to="2tou:7C9PHv6FBJ1" resolve="org.mpsqa.base.lib" />
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7JcV" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7JcW" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7JcX" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7JcY" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.testing.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7JcZ" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jd0" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.gentest.baseline" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="67NgLmjPxB5" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -577,6 +593,22 @@
             <ref role="3bR37D" to="2tou:zudvsqcgIl" resolve="org.mpsqa.base.utils" />
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jd2" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jd3" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jd4" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jd5" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.testing.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jd6" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jd7" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.testcov.jacoco.rt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="67NgLmjPxID" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
index 7bdd1006..cd7b4930 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
@@ -306,6 +306,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jd9" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jda" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jdb" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jdc" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jdd" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jde" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.core" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2JVMSZMFXgM" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -455,6 +471,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jdg" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jdh" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jdi" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jdj" role="3LXTmr">
+              <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jdk" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jdl" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.clones.java.pluginSolution" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2JVMSZMFXgS" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
index 351cb386..625b88de 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
@@ -103,6 +103,9 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
@@ -319,6 +322,22 @@
             <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7JcA" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7JcB" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7JcC" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7JcD" role="3LXTmr">
+              <ref role="398BVh" node="3PN66LDqBYT" resolve="mpsqa.mutant.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7JcE" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7JcF" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.mutant.base" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3PN66LDqBZb" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -358,6 +377,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7JcH" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7JcI" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7JcJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7JcK" role="3LXTmr">
+              <ref role="398BVh" node="3PN66LDqBYT" resolve="mpsqa.mutant.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7JcL" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7JcM" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.mutant.pluginSolution" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3PN66LDqBZd" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -451,6 +486,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7JcO" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7JcP" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7JcQ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7JcR" role="3LXTmr">
+              <ref role="398BVh" node="3PN66LDqBYT" resolve="mpsqa.mutant.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7JcS" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7JcT" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.mutant" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="3PN66LDqBYY" role="auvoZ" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
index 5451f785..75e1a3ee 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@@ -453,6 +453,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jcv" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jcw" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jcx" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jcy" role="3LXTmr">
+              <ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jcz" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jc$" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint.generic.linters_library.quickfixes" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3ywQ_KXEkYC" role="2G$12L">
         <property role="TrG5h" value="org.mpsqa.lint.generic.linters_library" />
@@ -551,6 +567,22 @@
             <ref role="3bR37D" to="ffeo:4IP11oWmB07" resolve="jetbrains.mps.ide.modelchecker.platform" />
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jch" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jci" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jcj" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jck" role="3LXTmr">
+              <ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jcl" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jcm" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint.generic.linters_library" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="51obkXDz7OB" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -690,6 +722,22 @@
             <ref role="3bR37D" to="ffeo:7pdFgzxlDoP" resolve="jetbrains.mps.build.mps" />
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jco" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jcp" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jcq" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm7Jcr" role="3LXTmr">
+              <ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jcs" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jct" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint.mps_lang.linters_library" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="3dqUbgQmcy$" role="auvoZ" />
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
index 7a347084..03d2a8be 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
@@ -102,6 +102,9 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -208,6 +211,31 @@
           </node>
         </node>
       </node>
+      <node concept="3rtmxn" id="46QW9mm7Jc7" role="3bR31x">
+        <node concept="3LXTmp" id="46QW9mm7Jc8" role="3rtmxm">
+          <node concept="3qWCbU" id="46QW9mm7Jc9" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="398BVA" id="46QW9mm7Jca" role="3LXTmr">
+            <ref role="398BVh" node="3PN66LDqBU_" resolve="mpsqa.home" />
+            <node concept="2Ry0Ak" id="46QW9mm7Jcb" role="iGT6I">
+              <property role="2Ry0Am" value="code" />
+              <node concept="2Ry0Ak" id="46QW9mm7Jcc" role="2Ry0An">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jcd" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.build" />
+                  <node concept="2Ry0Ak" id="46QW9mm7Jce" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="46QW9mm7Jcf" role="2Ry0An">
+                      <property role="2Ry0Am" value="org.mpsqa.build" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2sgV4H" id="3PN66LDqBUy" role="1l3spa">
       <ref role="1l3spb" to="2tou:7C9PHv6FBIG" resolve="org.mpsqa.base" />
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
index 9c92d00c..2ea9b39e 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
@@ -161,13 +161,13 @@
         <node concept="3F0ifn" id="6dJ4vxiQBTa" role="3EZMnx">
           <property role="3F0ifm" value="minimal/maximal suffix size - minimal/maximal depth of a node to be considered part of a clone" />
           <node concept="VechU" id="6dJ4vxiQBT$" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="6dJ4vxiQBTb" role="3EZMnx">
           <property role="3F0ifm" value="minimal number of siblings - minimal number of sibling nodes of a clone (similar to 'number of lines')" />
           <node concept="VechU" id="6dJ4vxiQBTC" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="2iRkQZ" id="1GhTetdXFIN" role="2iSdaV" />
@@ -233,13 +233,13 @@
         <node concept="3F0ifn" id="6dJ4vxiQBNT" role="3EZMnx">
           <property role="3F0ifm" value="If considered modules is not empty, then we take all modules with matching names and then filter out the modules whose names match the ignored modules." />
           <node concept="VechU" id="6dJ4vxiQBNU" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="6dJ4vxiQBNV" role="3EZMnx">
           <property role="3F0ifm" value="If considered modules is empty, then we take all modules from scope and then filter out the modules whose names match the ignored modules." />
           <node concept="VechU" id="6dJ4vxiQBNW" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="2iRkQZ" id="6dJ4vxiQBNX" role="2iSdaV" />
@@ -258,7 +258,7 @@
           <node concept="3F0ifn" id="1GhTetdXIsN" role="2czzBI">
             <property role="3F0ifm" value="all modules in scope" />
             <node concept="VechU" id="1GhTetdXNNL" role="3F10Kt">
-              <property role="Vb096" value="lightGray" />
+              <property role="Vb096" value="fLJRk5A/lightGray" />
             </node>
           </node>
         </node>
@@ -278,7 +278,7 @@
           <node concept="3F0ifn" id="1GhTetdXNNv" role="2czzBI">
             <property role="3F0ifm" value="no module is ignored" />
             <node concept="VechU" id="1GhTetdXNNI" role="3F10Kt">
-              <property role="Vb096" value="lightGray" />
+              <property role="Vb096" value="fLJRk5A/lightGray" />
             </node>
           </node>
         </node>
@@ -298,7 +298,7 @@
           <node concept="3F0ifn" id="1GhTetdXNNy" role="2czzBI">
             <property role="3F0ifm" value="no model is ignored" />
             <node concept="VechU" id="1GhTetdXNNF" role="3F10Kt">
-              <property role="Vb096" value="lightGray" />
+              <property role="Vb096" value="fLJRk5A/lightGray" />
             </node>
           </node>
         </node>
@@ -318,7 +318,7 @@
           <node concept="3F0ifn" id="1GhTetdXNN_" role="2czzBI">
             <property role="3F0ifm" value="no concept is ignored" />
             <node concept="VechU" id="1GhTetdXNNC" role="3F10Kt">
-              <property role="Vb096" value="lightGray" />
+              <property role="Vb096" value="fLJRk5A/lightGray" />
             </node>
           </node>
         </node>
@@ -363,7 +363,7 @@
       <node concept="3F0ifn" id="1GhTetdXIt5" role="3EZMnx">
         <property role="3F0ifm" value="(regex)" />
         <node concept="VechU" id="1GhTetdXL87" role="3F10Kt">
-          <property role="Vb096" value="gray" />
+          <property role="Vb096" value="fLJRk5_/gray" />
         </node>
       </node>
     </node>
@@ -414,7 +414,7 @@
                 <ref role="3cqZAo" node="4vctr_xUKaj" resolve="context" />
               </node>
               <node concept="liA8E" id="4vctr_xULPZ" role="2OqNvi">
-                <ref role="37wK5l" to="cj4x:~EditorContext.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
@@ -439,7 +439,7 @@
       <node concept="3F0A7n" id="2VgkkwRqN6x" role="3EZMnx">
         <ref role="1NtTu8" to="mpzi:2VgkkwRqN63" resolve="val" />
         <node concept="VechU" id="2VgkkwRqN6B" role="3F10Kt">
-          <property role="Vb096" value="gray" />
+          <property role="Vb096" value="fLJRk5_/gray" />
         </node>
       </node>
       <node concept="3F0ifn" id="2VgkkwRqPcP" role="3EZMnx">
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
index f2ed2c2c..f88017e3 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
@@ -125,7 +125,7 @@
               <ref role="3cqZAo" node="4vctr_xUKaj" resolve="context" />
             </node>
             <node concept="liA8E" id="4vctr_xULPZ" role="2OqNvi">
-              <ref role="37wK5l" to="cj4x:~EditorContext.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
index ee954bcd..f517dd10 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
@@ -70,35 +70,35 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2VgkkwRm66h" role="1TKVEi">
       <property role="IQ2ns" value="3373285491508535697" />
-      <property role="20lmBu" value="aggregation" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="scope" />
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" node="2VgkkwRm66t" resolve="CloneDetectionScopeBase" />
     </node>
     <node concept="1TJgyj" id="1GhTetdWNt7" role="1TKVEi">
       <property role="IQ2ns" value="1950591795724498759" />
-      <property role="20lmBu" value="aggregation" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="consideredModules" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="2VgkkwRqN5V" resolve="IIgnoreElement" />
     </node>
     <node concept="1TJgyj" id="7vLq_hstMma" role="1TKVEi">
       <property role="IQ2ns" value="8642806070461801866" />
-      <property role="20lmBu" value="aggregation" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="ignoredModules" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="2VgkkwRqN5V" resolve="IIgnoreElement" />
     </node>
     <node concept="1TJgyj" id="7vLq_hstMmd" role="1TKVEi">
       <property role="IQ2ns" value="8642806070461801869" />
-      <property role="20lmBu" value="aggregation" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="ignoredModels" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="2VgkkwRqN5V" resolve="IIgnoreElement" />
     </node>
     <node concept="1TJgyj" id="GBiWXwJuSz" role="1TKVEi">
       <property role="IQ2ns" value="803694412562296355" />
-      <property role="20lmBu" value="aggregation" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="ignoredConcepts" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="2VgkkwRqN5V" resolve="IIgnoreElement" />
@@ -111,7 +111,7 @@
     </node>
     <node concept="1TJgyj" id="6n_zVnCj$Yw" role="1TKVEi">
       <property role="IQ2ns" value="7342432778946760608" />
-      <property role="20lmBu" value="aggregation" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="postprocessor" />
       <ref role="20lvS9" node="6n_zVnCdQPg" resolve="IClonesPostprocessor" />
     </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
index 182b7eb7..8126bf64 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
@@ -346,6 +346,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm84U2" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm84U3" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm84U4" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm84U5" role="3LXTmr">
+              <ref role="398BVh" node="1GhTetdB0oc" resolve="mpsqa.clones.home" />
+              <node concept="2Ry0Ak" id="46QW9mm84U6" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="46QW9mm84U7" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.org.mpsqa.clones" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="22LTRH" id="2JVMSZMFYqK" role="1hWBAP">
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
index a8278594..55f54054 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
@@ -211,7 +211,7 @@
             </node>
             <node concept="2YIFZM" id="7WP_sw5xgmj" role="33vP2m">
               <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project):jetbrains.mps.project.MPSProject" resolve="fromIdeaProject" />
+              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
               <node concept="2OqwBi" id="7WP_sw5xgmk" role="37wK5m">
                 <node concept="2WthIp" id="7WP_sw5xgml" role="2Oq$k0" />
                 <node concept="1DTwFV" id="7WP_sw5xgmm" role="2OqNvi">
@@ -263,11 +263,11 @@
         <node concept="3clFbF" id="2VgkkwRpz_S" role="3cqZAp">
           <node concept="2OqwBi" id="2VgkkwRp$0_" role="3clFbG">
             <node concept="2YIFZM" id="2VgkkwRpzTt" role="2Oq$k0">
-              <ref role="37wK5l" to="xygl:~ProgressManager.getInstance():com.intellij.openapi.progress.ProgressManager" resolve="getInstance" />
+              <ref role="37wK5l" to="xygl:~ProgressManager.getInstance()" resolve="getInstance" />
               <ref role="1Pybhc" to="xygl:~ProgressManager" resolve="ProgressManager" />
             </node>
             <node concept="liA8E" id="2VgkkwRp$bn" role="2OqNvi">
-              <ref role="37wK5l" to="xygl:~ProgressManager.run(com.intellij.openapi.progress.Task):void" resolve="run" />
+              <ref role="37wK5l" to="xygl:~ProgressManager.run(com.intellij.openapi.progress.Task)" resolve="run" />
               <node concept="2ShNRf" id="2VgkkwRp$ck" role="37wK5m">
                 <node concept="YeOm9" id="2VgkkwRp$B3" role="2ShVmc">
                   <node concept="1Y3b0j" id="2VgkkwRp$B6" role="YeSDq">
@@ -328,7 +328,7 @@
                         <ref role="3cqZAo" node="7WP_sw5xgmi" resolve="proj" />
                       </node>
                       <node concept="liA8E" id="2VgkkwRpHWg" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                        <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
                       </node>
                     </node>
                     <node concept="Xl_RD" id="2VgkkwRpE5r" role="37wK5m">
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
index 9bdddc40..26da313d 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
@@ -327,7 +327,7 @@
           </node>
         </node>
         <node concept="RRSsy" id="wcbKZIWUVZ" role="3cqZAp">
-          <property role="RRSoG" value="info" />
+          <property role="RRSoG" value="h1akgim/info" />
           <node concept="3cpWs3" id="wcbKZIWUW0" role="RRSoy">
             <node concept="2OqwBi" id="wcbKZIWUW1" role="3uHU7w">
               <node concept="37vLTw" id="wcbKZIWUW2" role="2Oq$k0">
@@ -357,7 +357,7 @@
       <property role="TrG5h" value="buildCloneDetectionSettings" />
       <node concept="3clFbS" id="7vLq_hsu9VV" role="3clF47">
         <node concept="RRSsy" id="3yuAl1UJGQS" role="3cqZAp">
-          <property role="RRSoG" value="info" />
+          <property role="RRSoG" value="h1akgim/info" />
           <node concept="3cpWs3" id="3yuAl1UJJHu" role="RRSoy">
             <node concept="2OqwBi" id="3yuAl1UJK1s" role="3uHU7w">
               <node concept="37vLTw" id="3yuAl1UJJPE" role="2Oq$k0">
@@ -457,7 +457,7 @@
           <node concept="9aQIb" id="1GhTetdCzIr" role="9aQIa">
             <node concept="3clFbS" id="1GhTetdCzIs" role="9aQI4">
               <node concept="RRSsy" id="wcbKZJ57ie" role="3cqZAp">
-                <property role="RRSoG" value="error" />
+                <property role="RRSoG" value="gZ5fh_4/error" />
                 <node concept="Xl_RD" id="wcbKZJ57ig" role="RRSoy">
                   <property role="Xl_RC" value="unknown scope" />
                 </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
index a023210d..34015b84 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
@@ -427,7 +427,7 @@
               <ref role="3cqZAo" node="6dWFC76UDOE" resolve="pma" />
             </node>
             <node concept="liA8E" id="7vLq_hsteei" role="2OqNvi">
-              <ref role="37wK5l" to="mk90:~ProgressMonitorBase.start(java.lang.String,int):void" resolve="start" />
+              <ref role="37wK5l" to="mk90:~ProgressMonitorBase.start(java.lang.String,int)" resolve="start" />
               <node concept="Xl_RD" id="7vLq_hstegX" role="37wK5m">
                 <property role="Xl_RC" value="Detecting clones" />
               </node>
@@ -468,7 +468,7 @@
                       <ref role="3cqZAo" node="6dWFC76UDOE" resolve="pma" />
                     </node>
                     <node concept="liA8E" id="7vLq_hss6XA" role="2OqNvi">
-                      <ref role="37wK5l" to="mk90:~ProgressMonitorBase.subTask(int,org.jetbrains.mps.openapi.util.SubProgressKind):org.jetbrains.mps.openapi.util.ProgressMonitor" resolve="subTask" />
+                      <ref role="37wK5l" to="mk90:~ProgressMonitorBase.subTask(int,org.jetbrains.mps.openapi.util.SubProgressKind)" resolve="subTask" />
                       <node concept="2OqwBi" id="7vLq_hss6XB" role="37wK5m">
                         <node concept="37vLTw" id="7vLq_hss6XC" role="2Oq$k0">
                           <ref role="3cqZAo" node="7YZJmep_zRv" resolve="modelsList" />
@@ -489,7 +489,7 @@
                     <ref role="3cqZAo" node="7vLq_hss6Xz" resolve="subTask" />
                   </node>
                   <node concept="liA8E" id="6dWFC76UH5I" role="2OqNvi">
-                    <ref role="37wK5l" to="yyf4:~ProgressMonitor.start(java.lang.String,int):void" resolve="start" />
+                    <ref role="37wK5l" to="yyf4:~ProgressMonitor.start(java.lang.String,int)" resolve="start" />
                     <node concept="Xl_RD" id="6dWFC76UHc1" role="37wK5m">
                       <property role="Xl_RC" value="Populating Hashmap" />
                     </node>
@@ -507,7 +507,7 @@
                   <property role="TrG5h" value="initialTimestamp" />
                   <node concept="3cpWsb" id="4vC8GjwQWm5" role="1tU5fm" />
                   <node concept="2YIFZM" id="4vC8GjwQXza" role="33vP2m">
-                    <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                    <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                     <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                   </node>
                 </node>
@@ -526,7 +526,7 @@
                         <ref role="3cqZAo" node="7vLq_hss6Xz" resolve="subTask" />
                       </node>
                       <node concept="liA8E" id="6dWFC76UKKq" role="2OqNvi">
-                        <ref role="37wK5l" to="yyf4:~ProgressMonitor.advance(int):void" resolve="advance" />
+                        <ref role="37wK5l" to="yyf4:~ProgressMonitor.advance(int)" resolve="advance" />
                         <node concept="3cmrfG" id="7vLq_hsrbac" role="37wK5m">
                           <property role="3cmrfH" value="1" />
                         </node>
@@ -542,7 +542,7 @@
                         <ref role="3cqZAo" node="7vLq_hss6Xz" resolve="subTask" />
                       </node>
                       <node concept="liA8E" id="6dWFC76VW$o" role="2OqNvi">
-                        <ref role="37wK5l" to="yyf4:~ProgressMonitor.isCanceled():boolean" resolve="isCanceled" />
+                        <ref role="37wK5l" to="yyf4:~ProgressMonitor.isCanceled()" resolve="isCanceled" />
                       </node>
                     </node>
                   </node>
@@ -560,7 +560,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="E3aAvrSGtR" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SModel.isReadOnly():boolean" resolve="isReadOnly" />
+                          <ref role="37wK5l" to="mhbf:~SModel.isReadOnly()" resolve="isReadOnly" />
                         </node>
                       </node>
                     </node>
@@ -580,7 +580,7 @@
                   <property role="TrG5h" value="timestampAfterHashmapPopulation" />
                   <node concept="3cpWsb" id="4vC8GjwR1vV" role="1tU5fm" />
                   <node concept="2YIFZM" id="4vC8GjwR1vY" role="33vP2m">
-                    <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                    <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                     <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                   </node>
                 </node>
@@ -636,7 +636,7 @@
                           <ref role="3cqZAo" node="4vC8GjwR1vX" resolve="timestampAfterHashmapPopulation" />
                         </node>
                         <node concept="2YIFZM" id="4vC8GjwRiDx" role="3uHU7B">
-                          <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                          <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                           <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                         </node>
                       </node>
@@ -650,7 +650,7 @@
                     <ref role="3cqZAo" node="7vLq_hss6Xz" resolve="subTask" />
                   </node>
                   <node concept="liA8E" id="7vLq_hsrbsj" role="2OqNvi">
-                    <ref role="37wK5l" to="yyf4:~ProgressMonitor.done():void" resolve="done" />
+                    <ref role="37wK5l" to="yyf4:~ProgressMonitor.done()" resolve="done" />
                   </node>
                 </node>
               </node>
@@ -722,7 +722,7 @@
                 <ref role="3cqZAo" node="6dWFC76Vio8" resolve="pma" />
               </node>
               <node concept="liA8E" id="7vLq_hsrIHr" role="2OqNvi">
-                <ref role="37wK5l" to="mk90:~ProgressMonitorBase.subTask(int,org.jetbrains.mps.openapi.util.SubProgressKind):org.jetbrains.mps.openapi.util.ProgressMonitor" resolve="subTask" />
+                <ref role="37wK5l" to="mk90:~ProgressMonitorBase.subTask(int,org.jetbrains.mps.openapi.util.SubProgressKind)" resolve="subTask" />
                 <node concept="2OqwBi" id="7vLq_hsrIHs" role="37wK5m">
                   <node concept="2OqwBi" id="7vLq_hsrIHt" role="2Oq$k0">
                     <node concept="37vLTw" id="7vLq_hsrIHu" role="2Oq$k0">
@@ -746,7 +746,7 @@
               <ref role="3cqZAo" node="7vLq_hsrIHo" resolve="subTask" />
             </node>
             <node concept="liA8E" id="6dWFC76VmsF" role="2OqNvi">
-              <ref role="37wK5l" to="yyf4:~ProgressMonitor.start(java.lang.String,int):void" resolve="start" />
+              <ref role="37wK5l" to="yyf4:~ProgressMonitor.start(java.lang.String,int)" resolve="start" />
               <node concept="Xl_RD" id="6dWFC76Vmv3" role="37wK5m">
                 <property role="Xl_RC" value="Collecting Clones ..." />
               </node>
@@ -773,7 +773,7 @@
                   <ref role="3cqZAo" node="7vLq_hsrIHo" resolve="subTask" />
                 </node>
                 <node concept="liA8E" id="7vLq_hsrgAh" role="2OqNvi">
-                  <ref role="37wK5l" to="yyf4:~ProgressMonitor.advance(int):void" resolve="advance" />
+                  <ref role="37wK5l" to="yyf4:~ProgressMonitor.advance(int)" resolve="advance" />
                   <node concept="3cmrfG" id="7vLq_hsrgDP" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
@@ -789,7 +789,7 @@
                   <ref role="3cqZAo" node="7vLq_hsrIHo" resolve="subTask" />
                 </node>
                 <node concept="liA8E" id="6dWFC76VXCw" role="2OqNvi">
-                  <ref role="37wK5l" to="yyf4:~ProgressMonitor.isCanceled():boolean" resolve="isCanceled" />
+                  <ref role="37wK5l" to="yyf4:~ProgressMonitor.isCanceled()" resolve="isCanceled" />
                 </node>
               </node>
             </node>
@@ -886,7 +886,7 @@
               <ref role="3cqZAo" node="7vLq_hsrIHo" resolve="subTask" />
             </node>
             <node concept="liA8E" id="7vLq_hsrYA7" role="2OqNvi">
-              <ref role="37wK5l" to="yyf4:~ProgressMonitor.done():void" resolve="done" />
+              <ref role="37wK5l" to="yyf4:~ProgressMonitor.done()" resolve="done" />
             </node>
           </node>
         </node>
@@ -1207,7 +1207,7 @@
                   <node concept="2yIwOk" id="GBiWXwJoRl" role="2OqNvi" />
                 </node>
                 <node concept="liA8E" id="GBiWXwJred" role="2OqNvi">
-                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                 </node>
               </node>
             </node>
@@ -1608,21 +1608,21 @@
                   <ref role="3cqZAo" node="E3aAvrGraz" resolve="sb" />
                 </node>
                 <node concept="liA8E" id="E3aAvrGtuN" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="E3aAvrGtvt" role="37wK5m">
                     <property role="Xl_RC" value="size: " />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="E3aAvrGvBS" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuffer.append(int):java.lang.StringBuffer" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuffer.append(int)" resolve="append" />
                 <node concept="37vLTw" id="E3aAvrGvJ5" role="37wK5m">
                   <ref role="3cqZAo" node="7WP_sw5nVb6" resolve="numberOfSiblings" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="E3aAvrGIJx" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
               <node concept="Xl_RD" id="E3aAvrGJa_" role="37wK5m">
                 <property role="Xl_RC" value=" siblings\n" />
               </node>
@@ -1645,14 +1645,14 @@
                       <ref role="3cqZAo" node="E3aAvrGraz" resolve="sb" />
                     </node>
                     <node concept="liA8E" id="E3aAvrGRx$" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                       <node concept="Xl_RD" id="E3aAvrGRIM" role="37wK5m">
                         <property role="Xl_RC" value="\t" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="E3aAvrGUPq" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.Object):java.lang.StringBuffer" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.Object)" resolve="append" />
                     <node concept="2OqwBi" id="E3aAvrGVoA" role="37wK5m">
                       <node concept="2JrnkZ" id="E3aAvrHrKk" role="2Oq$k0">
                         <node concept="2GrUjf" id="E3aAvrHrc3" role="2JrQYb">
@@ -1660,13 +1660,13 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="E3aAvrGVoF" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                        <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                       </node>
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="E3aAvrHkXZ" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="E3aAvrHlD8" role="37wK5m">
                     <property role="Xl_RC" value="\n" />
                   </node>
@@ -1681,7 +1681,7 @@
               <ref role="3cqZAo" node="E3aAvrGraz" resolve="sb" />
             </node>
             <node concept="liA8E" id="E3aAvrHqH6" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1806,15 +1806,15 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="16s82eE5_1Q" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                          <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                         </node>
                       </node>
                       <node concept="liA8E" id="16s82eE5_Zd" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                       </node>
                     </node>
                     <node concept="liA8E" id="16s82eE691h" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.hashCode():int" resolve="hashCode" />
+                      <ref role="37wK5l" to="wyt6:~String.hashCode()" resolve="hashCode" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="16s82eE5wLM" role="3uHU7B">
@@ -2127,7 +2127,7 @@
                         <ref role="3cqZAo" node="7vLq_hsuTjG" resolve="moduleName" />
                       </node>
                       <node concept="liA8E" id="7vLq_hsvnpW" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                         <node concept="37vLTw" id="7vLq_hsvnxW" role="37wK5m">
                           <ref role="3cqZAo" node="7vLq_hsv9JJ" resolve="it" />
                         </node>
@@ -2184,7 +2184,7 @@
                         <ref role="3cqZAo" node="1GhTetdWR8i" resolve="moduleName" />
                       </node>
                       <node concept="liA8E" id="1GhTetdWR8c" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                         <node concept="37vLTw" id="1GhTetdWR8d" role="37wK5m">
                           <ref role="3cqZAo" node="1GhTetdWR8e" resolve="it" />
                         </node>
@@ -2226,7 +2226,7 @@
                         <ref role="3cqZAo" node="7vLq_hsvnHA" resolve="modelName" />
                       </node>
                       <node concept="liA8E" id="7vLq_hsvnHw" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                         <node concept="37vLTw" id="7vLq_hsvnHx" role="37wK5m">
                           <ref role="3cqZAo" node="7vLq_hsvnHy" resolve="it" />
                         </node>
@@ -2268,7 +2268,7 @@
                         <ref role="3cqZAo" node="GBiWXwJcrg" resolve="conceptName" />
                       </node>
                       <node concept="liA8E" id="GBiWXwJcra" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                        <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                         <node concept="37vLTw" id="GBiWXwJcrb" role="37wK5m">
                           <ref role="3cqZAo" node="GBiWXwJcrc" resolve="it" />
                         </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
index 3a411c24..aef11413 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
@@ -129,11 +129,8 @@
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
       </concept>
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -173,6 +170,14 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
@@ -240,7 +245,7 @@
               <ref role="3cqZAo" node="4elAKXimRJG" resolve="builder" />
             </node>
             <node concept="liA8E" id="7JEz8iltTgv" role="2OqNvi">
-              <ref role="37wK5l" to="qt06:~HashCodeBuilder.toHashCode():int" resolve="toHashCode" />
+              <ref role="37wK5l" to="qt06:~HashCodeBuilder.toHashCode()" resolve="toHashCode" />
             </node>
           </node>
         </node>
@@ -347,7 +352,7 @@
               <ref role="3cqZAo" node="4elAKXimXQY" resolve="builder" />
             </node>
             <node concept="liA8E" id="4vctr_xVLzC" role="2OqNvi">
-              <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object):org.apache.commons.lang3.builder.HashCodeBuilder" resolve="append" />
+              <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object)" resolve="append" />
               <node concept="2OqwBi" id="4vctr_xVNXt" role="37wK5m">
                 <node concept="2OqwBi" id="4vctr_xVN7Z" role="2Oq$k0">
                   <node concept="37vLTw" id="4vctr_xVLP3" role="2Oq$k0">
@@ -356,7 +361,7 @@
                   <node concept="2yIwOk" id="4vctr_xVNw4" role="2OqNvi" />
                 </node>
                 <node concept="liA8E" id="4vctr_xVSjU" role="2OqNvi">
-                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                 </node>
               </node>
             </node>
@@ -374,7 +379,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4elAKXimXR8" role="2OqNvi">
-              <ref role="37wK5l" to="mhbf:~SNode.getProperties():java.lang.Iterable" resolve="getProperties" />
+              <ref role="37wK5l" to="mhbf:~SNode.getProperties()" resolve="getProperties" />
             </node>
           </node>
           <node concept="3clFbS" id="4elAKXimXRa" role="2LFqv$">
@@ -389,14 +394,31 @@
                     <ref role="2Gs0qQ" node="4elAKXimXR3" resolve="p" />
                   </node>
                   <node concept="liA8E" id="4elAKXiosar" role="2OqNvi">
-                    <ref role="37wK5l" to="c17a:~SProperty.getType():org.jetbrains.mps.openapi.language.SDataType" resolve="getType" />
+                    <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3SKdUt" id="4elAKXip6HQ" role="3cqZAp">
-              <node concept="3SKdUq" id="4elAKXip6HS" role="3SKWNk">
-                <property role="3SKdUp" value="ignore &quot;simple&quot; properties with primitive types" />
+              <node concept="1PaTwC" id="46QW9mm85iN" role="1aUNEU">
+                <node concept="3oM_SD" id="46QW9mm85iO" role="1PaTwD">
+                  <property role="3oM_SC" value="ignore" />
+                </node>
+                <node concept="3oM_SD" id="46QW9mm85iP" role="1PaTwD">
+                  <property role="3oM_SC" value="&quot;simple&quot;" />
+                </node>
+                <node concept="3oM_SD" id="46QW9mm85iQ" role="1PaTwD">
+                  <property role="3oM_SC" value="properties" />
+                </node>
+                <node concept="3oM_SD" id="46QW9mm85iR" role="1PaTwD">
+                  <property role="3oM_SC" value="with" />
+                </node>
+                <node concept="3oM_SD" id="46QW9mm85iS" role="1PaTwD">
+                  <property role="3oM_SC" value="primitive" />
+                </node>
+                <node concept="3oM_SD" id="46QW9mm85iT" role="1PaTwD">
+                  <property role="3oM_SC" value="types" />
+                </node>
               </node>
             </node>
             <node concept="3clFbJ" id="4elAKXioKZO" role="3cqZAp">
@@ -413,7 +435,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4elAKXimXRh" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty):java.lang.String" resolve="getProperty" />
+                        <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
                         <node concept="2GrUjf" id="4elAKXimXRi" role="37wK5m">
                           <ref role="2Gs0qQ" node="4elAKXimXR3" resolve="p" />
                         </node>
@@ -436,7 +458,7 @@
                           <ref role="3cqZAo" node="4elAKXimXQY" resolve="builder" />
                         </node>
                         <node concept="liA8E" id="4elAKXimXRw" role="2OqNvi">
-                          <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object):org.apache.commons.lang3.builder.HashCodeBuilder" resolve="append" />
+                          <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object)" resolve="append" />
                           <node concept="37vLTw" id="4elAKXimXRx" role="37wK5m">
                             <ref role="3cqZAo" node="4elAKXimXRc" resolve="propertyValue" />
                           </node>
@@ -491,18 +513,18 @@
                             <ref role="3cqZAo" node="4elAKXimXQY" resolve="builder" />
                           </node>
                           <node concept="liA8E" id="4elAKXipmmp" role="2OqNvi">
-                            <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object):org.apache.commons.lang3.builder.HashCodeBuilder" resolve="append" />
+                            <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object)" resolve="append" />
                             <node concept="2OqwBi" id="4elAKXip$R5" role="37wK5m">
                               <node concept="2OqwBi" id="4elAKXipmLj" role="2Oq$k0">
                                 <node concept="2GrUjf" id="4elAKXipmvb" role="2Oq$k0">
                                   <ref role="2Gs0qQ" node="4elAKXimXR3" resolve="p" />
                                 </node>
                                 <node concept="liA8E" id="4elAKXip$hV" role="2OqNvi">
-                                  <ref role="37wK5l" to="c17a:~SProperty.getType():org.jetbrains.mps.openapi.language.SDataType" resolve="getType" />
+                                  <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="4elAKXip_xz" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                               </node>
                             </node>
                           </node>
@@ -516,7 +538,7 @@
                           <ref role="2Gs0qQ" node="4elAKXimXR3" resolve="p" />
                         </node>
                         <node concept="liA8E" id="1GhTetdSWXZ" role="2OqNvi">
-                          <ref role="37wK5l" to="c17a:~SProperty.getType():org.jetbrains.mps.openapi.language.SDataType" resolve="getType" />
+                          <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
                         </node>
                       </node>
                     </node>
@@ -538,7 +560,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4elAKXimXRE" role="2OqNvi">
-              <ref role="37wK5l" to="mhbf:~SNode.getChildren():java.lang.Iterable" resolve="getChildren" />
+              <ref role="37wK5l" to="mhbf:~SNode.getChildren()" resolve="getChildren" />
             </node>
           </node>
           <node concept="3clFbS" id="4elAKXimXRG" role="2LFqv$">
@@ -567,7 +589,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4elAKXimXRU" role="2OqNvi">
-              <ref role="37wK5l" to="mhbf:~SNode.getReferences():java.lang.Iterable" resolve="getReferences" />
+              <ref role="37wK5l" to="mhbf:~SNode.getReferences()" resolve="getReferences" />
             </node>
           </node>
           <node concept="3clFbS" id="4elAKXimXRW" role="2LFqv$">
@@ -582,7 +604,7 @@
                       <ref role="2Gs0qQ" node="4elAKXimXRP" resolve="ref" />
                     </node>
                     <node concept="liA8E" id="4elAKXinYjm" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SReference.getTargetNode():org.jetbrains.mps.openapi.model.SNode" resolve="getTargetNode" />
+                      <ref role="37wK5l" to="mhbf:~SReference.getTargetNode()" resolve="getTargetNode" />
                     </node>
                   </node>
                 </node>
@@ -594,7 +616,7 @@
                   <ref role="3cqZAo" node="4elAKXimXQY" resolve="builder" />
                 </node>
                 <node concept="liA8E" id="4elAKXinZpP" role="2OqNvi">
-                  <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object):org.apache.commons.lang3.builder.HashCodeBuilder" resolve="append" />
+                  <ref role="37wK5l" to="qt06:~HashCodeBuilder.append(java.lang.Object)" resolve="append" />
                   <node concept="37vLTw" id="4elAKXinZy0" role="37wK5m">
                     <ref role="3cqZAo" node="4elAKXinYh1" resolve="referencedNode" />
                   </node>
@@ -719,8 +741,46 @@
             </node>
             <node concept="3clFbS" id="2VgkkwRpcPh" role="1zc67A">
               <node concept="3SKdUt" id="3yuAl1ULkro" role="3cqZAp">
-                <node concept="3SKdUq" id="3yuAl1ULkrp" role="3SKWNk">
-                  <property role="3SKdUp" value="catch all eventual exceptions from getPresentation and go further with more generic information" />
+                <node concept="1PaTwC" id="46QW9mm85iU" role="1aUNEU">
+                  <node concept="3oM_SD" id="46QW9mm85iV" role="1PaTwD">
+                    <property role="3oM_SC" value="catch" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85iW" role="1PaTwD">
+                    <property role="3oM_SC" value="all" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85iX" role="1PaTwD">
+                    <property role="3oM_SC" value="eventual" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85iY" role="1PaTwD">
+                    <property role="3oM_SC" value="exceptions" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85iZ" role="1PaTwD">
+                    <property role="3oM_SC" value="from" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j0" role="1PaTwD">
+                    <property role="3oM_SC" value="getPresentation" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j1" role="1PaTwD">
+                    <property role="3oM_SC" value="and" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j2" role="1PaTwD">
+                    <property role="3oM_SC" value="go" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j3" role="1PaTwD">
+                    <property role="3oM_SC" value="further" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j4" role="1PaTwD">
+                    <property role="3oM_SC" value="with" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j5" role="1PaTwD">
+                    <property role="3oM_SC" value="more" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j6" role="1PaTwD">
+                    <property role="3oM_SC" value="generic" />
+                  </node>
+                  <node concept="3oM_SD" id="46QW9mm85j7" role="1PaTwD">
+                    <property role="3oM_SC" value="information" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -737,7 +797,7 @@
                   <node concept="2yIwOk" id="2VgkkwRpghV" role="2OqNvi" />
                 </node>
                 <node concept="liA8E" id="2VgkkwRpjoM" role="2OqNvi">
-                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
index 08ae5751..a445ecc5 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
@@ -334,7 +334,7 @@
                 <ref role="3cqZAo" node="6n_zVnCdU4H" resolve="path" />
               </node>
               <node concept="liA8E" id="wcbKZJ3_Zf" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
+                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
                 <node concept="Xl_RD" id="wcbKZJ3_Zg" role="37wK5m">
                   <property role="Xl_RC" value="\\\\" />
                 </node>
@@ -354,11 +354,11 @@
             <node concept="17QB3L" id="6dJ4vxiSVHv" role="1tU5fm" />
             <node concept="2OqwBi" id="6dJ4vxiSVy$" role="33vP2m">
               <node concept="2YIFZM" id="6dJ4vxiSVy_" role="2Oq$k0">
-                <ref role="37wK5l" to="18ew:~MacrosFactory.getGlobal():jetbrains.mps.util.MacroHelper" resolve="getGlobal" />
+                <ref role="37wK5l" to="18ew:~MacrosFactory.getGlobal()" resolve="getGlobal" />
                 <ref role="1Pybhc" to="18ew:~MacrosFactory" resolve="MacrosFactory" />
               </node>
               <node concept="liA8E" id="6dJ4vxiSVyA" role="2OqNvi">
-                <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String):java.lang.String" resolve="expandPath" />
+                <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String)" resolve="expandPath" />
                 <node concept="37vLTw" id="6dJ4vxiSVyB" role="37wK5m">
                   <ref role="3cqZAo" node="6n_zVnCdU4H" resolve="path" />
                 </node>
@@ -444,7 +444,7 @@
             </node>
             <node concept="2YIFZM" id="16s82eEomIq" role="33vP2m">
               <ref role="1Pybhc" to="vpqd:~DocumentBuilderFactory" resolve="DocumentBuilderFactory" />
-              <ref role="37wK5l" to="vpqd:~DocumentBuilderFactory.newInstance():javax.xml.parsers.DocumentBuilderFactory" resolve="newInstance" />
+              <ref role="37wK5l" to="vpqd:~DocumentBuilderFactory.newInstance()" resolve="newInstance" />
             </node>
           </node>
         </node>
@@ -1072,7 +1072,7 @@
                 <ref role="3cqZAo" node="6n_zVnCvTNR" resolve="path" />
               </node>
               <node concept="liA8E" id="wcbKZJ3_AD" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
+                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
                 <node concept="Xl_RD" id="wcbKZJ3_AE" role="37wK5m">
                   <property role="Xl_RC" value="\\\\" />
                 </node>
@@ -1093,10 +1093,10 @@
             <node concept="2OqwBi" id="6dJ4vxiT2g9" role="33vP2m">
               <node concept="2YIFZM" id="6dJ4vxiT2ga" role="2Oq$k0">
                 <ref role="1Pybhc" to="18ew:~MacrosFactory" resolve="MacrosFactory" />
-                <ref role="37wK5l" to="18ew:~MacrosFactory.getGlobal():jetbrains.mps.util.MacroHelper" resolve="getGlobal" />
+                <ref role="37wK5l" to="18ew:~MacrosFactory.getGlobal()" resolve="getGlobal" />
               </node>
               <node concept="liA8E" id="6dJ4vxiT2gb" role="2OqNvi">
-                <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String):java.lang.String" resolve="expandPath" />
+                <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String)" resolve="expandPath" />
                 <node concept="37vLTw" id="6dJ4vxiT2gc" role="37wK5m">
                   <ref role="3cqZAo" node="6n_zVnCvTNR" resolve="path" />
                 </node>
@@ -1194,7 +1194,7 @@
                     <ref role="3uigEE" to="vpqd:~DocumentBuilderFactory" resolve="DocumentBuilderFactory" />
                   </node>
                   <node concept="2YIFZM" id="16s82eEmQsh" role="33vP2m">
-                    <ref role="37wK5l" to="vpqd:~DocumentBuilderFactory.newInstance():javax.xml.parsers.DocumentBuilderFactory" resolve="newInstance" />
+                    <ref role="37wK5l" to="vpqd:~DocumentBuilderFactory.newInstance()" resolve="newInstance" />
                     <ref role="1Pybhc" to="vpqd:~DocumentBuilderFactory" resolve="DocumentBuilderFactory" />
                   </node>
                 </node>
@@ -1956,7 +1956,7 @@
                           <ref role="2Gs0qQ" node="7Ol$bN7M_sP" resolve="crtModule" />
                         </node>
                         <node concept="liA8E" id="16s82eEs1hm" role="2OqNvi">
-                          <ref role="37wK5l" to="lui2:~SModule.getModuleName():java.lang.String" resolve="getModuleName" />
+                          <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="16s82eEs1hn" role="37wK5m">
@@ -1965,11 +1965,11 @@
                             <ref role="2Gs0qQ" node="7Ol$bN7M_tk" resolve="crtModel" />
                           </node>
                           <node concept="liA8E" id="16s82eEs1hq" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SModel.getName():org.jetbrains.mps.openapi.model.SModelName" resolve="getName" />
+                            <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
                           </node>
                         </node>
                         <node concept="liA8E" id="16s82eEs1hr" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SModelName.getLongName():java.lang.String" resolve="getLongName" />
+                          <ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
                         </node>
                       </node>
                     </node>
@@ -2046,7 +2046,7 @@
                   <ref role="2Gs0qQ" node="7Ol$bN7M_sP" resolve="crtModule" />
                 </node>
                 <node concept="liA8E" id="7Ol$bN7M_tB" role="2OqNvi">
-                  <ref role="37wK5l" to="lui2:~SModule.getModels():java.lang.Iterable" resolve="getModels" />
+                  <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
                 </node>
               </node>
             </node>
@@ -2056,7 +2056,7 @@
               <ref role="3cqZAo" node="7Ol$bN7M$mM" resolve="repo" />
             </node>
             <node concept="liA8E" id="7Ol$bN7M_t6" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SRepository.getModules():java.lang.Iterable" resolve="getModules" />
+              <ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
             </node>
           </node>
         </node>
@@ -2183,11 +2183,11 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="6R7Q$YvcJaU" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6R7Q$YvcVsb" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="6R7Q$YvcyWO" role="3ElQJh">
@@ -2263,7 +2263,7 @@
                 <ref role="3cqZAo" node="16s82eE58lr" resolve="path" />
               </node>
               <node concept="liA8E" id="wcbKZJ3$ME" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
+                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
                 <node concept="Xl_RD" id="wcbKZJ3$Pw" role="37wK5m">
                   <property role="Xl_RC" value="\\\\" />
                 </node>
@@ -2284,10 +2284,10 @@
             <node concept="2OqwBi" id="6dJ4vxiSXK5" role="33vP2m">
               <node concept="2YIFZM" id="6dJ4vxiSXK6" role="2Oq$k0">
                 <ref role="1Pybhc" to="18ew:~MacrosFactory" resolve="MacrosFactory" />
-                <ref role="37wK5l" to="18ew:~MacrosFactory.getGlobal():jetbrains.mps.util.MacroHelper" resolve="getGlobal" />
+                <ref role="37wK5l" to="18ew:~MacrosFactory.getGlobal()" resolve="getGlobal" />
               </node>
               <node concept="liA8E" id="6dJ4vxiSXK7" role="2OqNvi">
-                <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String):java.lang.String" resolve="expandPath" />
+                <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String)" resolve="expandPath" />
                 <node concept="37vLTw" id="6dJ4vxiSXK8" role="37wK5m">
                   <ref role="3cqZAo" node="16s82eE58lr" resolve="path" />
                 </node>
@@ -2368,7 +2368,7 @@
                     <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                   </node>
                   <node concept="liA8E" id="6dJ4vxiT7nh" role="2OqNvi">
-                    <ref role="37wK5l" to="guwi:~File.getAbsolutePath():java.lang.String" resolve="getAbsolutePath" />
+                    <ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
                   </node>
                 </node>
               </node>
@@ -2512,11 +2512,11 @@
                         <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                       </node>
                       <node concept="liA8E" id="wcbKZIZqBu" role="2OqNvi">
-                        <ref role="37wK5l" to="guwi:~File.getName():java.lang.String" resolve="getName" />
+                        <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
                       </node>
                     </node>
                     <node concept="liA8E" id="wcbKZIZqBv" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                      <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                       <node concept="3cmrfG" id="wcbKZIZqBw" role="37wK5m">
                         <property role="3cmrfH" value="0" />
                       </node>
@@ -2527,11 +2527,11 @@
                               <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                             </node>
                             <node concept="liA8E" id="wcbKZIZqBA" role="2OqNvi">
-                              <ref role="37wK5l" to="guwi:~File.getName():java.lang.String" resolve="getName" />
+                              <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
                             </node>
                           </node>
                           <node concept="liA8E" id="wcbKZIZqBB" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="wcbKZIZtHR" role="3uHU7w">
@@ -2557,7 +2557,7 @@
                         <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                       </node>
                       <node concept="liA8E" id="wcbKZJ1a5q" role="2OqNvi">
-                        <ref role="37wK5l" to="guwi:~File.getParent():java.lang.String" resolve="getParent" />
+                        <ref role="37wK5l" to="guwi:~File.getParent()" resolve="getParent" />
                       </node>
                     </node>
                     <node concept="10M0yZ" id="wcbKZJ1a5r" role="3uHU7w">
@@ -2641,11 +2641,11 @@
                         <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                       </node>
                       <node concept="liA8E" id="wcbKZJwedG" role="2OqNvi">
-                        <ref role="37wK5l" to="guwi:~File.getName():java.lang.String" resolve="getName" />
+                        <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
                       </node>
                     </node>
                     <node concept="liA8E" id="wcbKZJwedH" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                      <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                       <node concept="3cmrfG" id="wcbKZJwedI" role="37wK5m">
                         <property role="3cmrfH" value="0" />
                       </node>
@@ -2656,11 +2656,11 @@
                               <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                             </node>
                             <node concept="liA8E" id="wcbKZJwedN" role="2OqNvi">
-                              <ref role="37wK5l" to="guwi:~File.getName():java.lang.String" resolve="getName" />
+                              <ref role="37wK5l" to="guwi:~File.getName()" resolve="getName" />
                             </node>
                           </node>
                           <node concept="liA8E" id="wcbKZJwedO" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="wcbKZJwedP" role="3uHU7w">
@@ -2686,7 +2686,7 @@
                         <ref role="3cqZAo" node="16s82eE58lg" resolve="myFile" />
                       </node>
                       <node concept="liA8E" id="wcbKZJwedY" role="2OqNvi">
-                        <ref role="37wK5l" to="guwi:~File.getParent():java.lang.String" resolve="getParent" />
+                        <ref role="37wK5l" to="guwi:~File.getParent()" resolve="getParent" />
                       </node>
                     </node>
                     <node concept="10M0yZ" id="wcbKZJwedZ" role="3uHU7w">
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
index 43294bfb..8480cef9 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
@@ -269,7 +269,7 @@
   <node concept="sEfby" id="7WP_sw5r_62">
     <property role="TrG5h" value="ClonesOverviewViewer" />
     <property role="2XNbzY" value="Clones Overview Viewer" />
-    <property role="2bmUCM" value="RIGHT" />
+    <property role="2bmUCM" value="2aGS$UDXOxV/RIGHT" />
     <node concept="2XrIbr" id="7WP_sw5x34O" role="2XNbBy">
       <property role="TrG5h" value="setClones" />
       <node concept="3cqZAl" id="7WP_sw5x3lA" role="3clF45" />
@@ -354,7 +354,7 @@
                 <ref role="37wK5l" to="kyr3:7WP_sw5s1HY" resolve="ClonesOverviewPanel" />
                 <node concept="2YIFZM" id="7WP_sw5wZ4d" role="37wK5m">
                   <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                  <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project):jetbrains.mps.project.MPSProject" resolve="fromIdeaProject" />
+                  <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
                   <node concept="2xqhHp" id="7WP_sw5x2tS" role="37wK5m" />
                 </node>
               </node>
@@ -397,7 +397,7 @@
             </node>
             <node concept="2YIFZM" id="7WP_sw5xgmj" role="33vP2m">
               <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project):jetbrains.mps.project.MPSProject" resolve="fromIdeaProject" />
+              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
               <node concept="2OqwBi" id="7WP_sw5xgmk" role="37wK5m">
                 <node concept="2WthIp" id="7WP_sw5xgml" role="2Oq$k0" />
                 <node concept="1DTwFV" id="7WP_sw5xgmm" role="2OqNvi">
@@ -410,7 +410,7 @@
         <node concept="3clFbJ" id="1oYl8FfqyLH" role="3cqZAp">
           <node concept="3clFbS" id="1oYl8FfqyLI" role="3clFbx">
             <node concept="2xdQw9" id="1oYl8FfqyLJ" role="3cqZAp">
-              <property role="2xdLsb" value="error" />
+              <property role="2xdLsb" value="gZ5fh_4/error" />
               <node concept="Xl_RD" id="1oYl8FfqyLK" role="9lYJi">
                 <property role="Xl_RC" value="could not get the MPSProject object" />
               </node>
@@ -504,7 +504,7 @@
             </node>
             <node concept="2YIFZM" id="7WP_sw5_SsD" role="33vP2m">
               <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project):jetbrains.mps.project.MPSProject" resolve="fromIdeaProject" />
+              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
               <node concept="2OqwBi" id="7WP_sw5_SsE" role="37wK5m">
                 <node concept="2WthIp" id="7WP_sw5_SsF" role="2Oq$k0" />
                 <node concept="1DTwFV" id="7WP_sw5_SsG" role="2OqNvi">
@@ -517,7 +517,7 @@
         <node concept="3clFbJ" id="1oYl8Ffqp1d" role="3cqZAp">
           <node concept="3clFbS" id="1oYl8Ffqp1f" role="3clFbx">
             <node concept="2xdQw9" id="1oYl8FfqycI" role="3cqZAp">
-              <property role="2xdLsb" value="error" />
+              <property role="2xdLsb" value="gZ5fh_4/error" />
               <node concept="Xl_RD" id="1oYl8FfqycK" role="9lYJi">
                 <property role="Xl_RC" value="could not get the MPSProject object" />
               </node>
@@ -549,7 +549,6 @@
   <node concept="sEfby" id="E3aAvrKKGx">
     <property role="TrG5h" value="ClonesDetailsViewer" />
     <property role="2XNbzY" value="Clone Details Viewer" />
-    <property role="2bmUCM" value="BOTTOM" />
     <node concept="2XrIbr" id="E3aAvrKKGy" role="2XNbBy">
       <property role="TrG5h" value="setClones" />
       <node concept="3cqZAl" id="E3aAvrKKGz" role="3clF45" />
@@ -611,7 +610,7 @@
                 <ref role="37wK5l" to="kyr3:E3aAvrKgH_" resolve="ClonesDetailsPanel" />
                 <node concept="2YIFZM" id="E3aAvrKKH0" role="37wK5m">
                   <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                  <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project):jetbrains.mps.project.MPSProject" resolve="fromIdeaProject" />
+                  <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
                   <node concept="2xqhHp" id="E3aAvrKKH1" role="37wK5m" />
                 </node>
               </node>
@@ -671,7 +670,7 @@
               <ref role="3cqZAo" node="E3aAvrKTm4" resolve="cdv" />
             </node>
             <node concept="liA8E" id="E3aAvrNCif" role="2OqNvi">
-              <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean):void" resolve="openToolLater" />
+              <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean)" resolve="openToolLater" />
               <node concept="3clFbT" id="E3aAvrNCoe" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
@@ -699,7 +698,6 @@
   <node concept="sEfby" id="5Dw7oA60$CB">
     <property role="TrG5h" value="ClonesTreemapViewer" />
     <property role="2XNbzY" value="Clone Treemap Viewer" />
-    <property role="2bmUCM" value="BOTTOM" />
     <node concept="2XrIbr" id="5Dw7oA60$CC" role="2XNbBy">
       <property role="TrG5h" value="setClones" />
       <node concept="3cqZAl" id="5Dw7oA60$CD" role="3clF45" />
@@ -773,7 +771,7 @@
               <ref role="3cqZAo" node="4elAKXis8gO" resolve="scrollPane" />
             </node>
             <node concept="liA8E" id="4elAKXis9tL" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JScrollPane.setHorizontalScrollBarPolicy(int):void" resolve="setHorizontalScrollBarPolicy" />
+              <ref role="37wK5l" to="dxuu:~JScrollPane.setHorizontalScrollBarPolicy(int)" resolve="setHorizontalScrollBarPolicy" />
               <node concept="10M0yZ" id="4elAKXis9tM" role="37wK5m">
                 <ref role="1PxDUh" to="dxuu:~JScrollPane" resolve="JScrollPane" />
                 <ref role="3cqZAo" to="dxuu:~ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED" resolve="HORIZONTAL_SCROLLBAR_AS_NEEDED" />
@@ -787,7 +785,7 @@
               <ref role="3cqZAo" node="4elAKXis8gO" resolve="scrollPane" />
             </node>
             <node concept="liA8E" id="4elAKXisadF" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JScrollPane.setVerticalScrollBarPolicy(int):void" resolve="setVerticalScrollBarPolicy" />
+              <ref role="37wK5l" to="dxuu:~JScrollPane.setVerticalScrollBarPolicy(int)" resolve="setVerticalScrollBarPolicy" />
               <node concept="10M0yZ" id="4elAKXisMhS" role="37wK5m">
                 <ref role="3cqZAo" to="dxuu:~ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS" resolve="VERTICAL_SCROLLBAR_ALWAYS" />
                 <ref role="1PxDUh" to="dxuu:~JScrollPane" resolve="JScrollPane" />
@@ -801,7 +799,7 @@
               <ref role="3cqZAo" node="4elAKXis8gO" resolve="scrollPane" />
             </node>
             <node concept="liA8E" id="4elAKXis9JU" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Component.setBounds(int,int,int,int):void" resolve="setBounds" />
+              <ref role="37wK5l" to="z60i:~Component.setBounds(int,int,int,int)" resolve="setBounds" />
               <node concept="3cmrfG" id="4elAKXis9JV" role="37wK5m">
                 <property role="3cmrfH" value="50" />
               </node>
@@ -833,7 +831,7 @@
                 <ref role="37wK5l" to="8tkk:5Dw7oA61kp6" resolve="ClonesTreemapPanel" />
                 <node concept="2YIFZM" id="5Dw7oA60$D5" role="37wK5m">
                   <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                  <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project):jetbrains.mps.project.MPSProject" resolve="fromIdeaProject" />
+                  <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
                   <node concept="2xqhHp" id="5Dw7oA60$D6" role="37wK5m" />
                 </node>
               </node>
@@ -980,7 +978,7 @@
       <property role="TrG5h" value="runClonesDetector" />
       <node concept="3clFbS" id="1oYl8Ffq4td" role="3clF47">
         <node concept="RRSsy" id="wcbKZJ4C3R" role="3cqZAp">
-          <property role="RRSoG" value="info" />
+          <property role="RRSoG" value="h1akgim/info" />
           <node concept="3cpWs3" id="wcbKZJ4CAL" role="RRSoy">
             <node concept="37vLTw" id="wcbKZJ4CLW" role="3uHU7w">
               <ref role="3cqZAo" node="1oYl8Ffq4i$" resolve="lastSettings" />
@@ -1001,7 +999,7 @@
                 <ref role="3cqZAo" node="1oYl8Ffq5$W" resolve="project" />
               </node>
               <node concept="liA8E" id="1oYl8FfqV46" role="2OqNvi">
-                <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
@@ -1162,7 +1160,7 @@
               <ref role="3cqZAo" node="6dWFC76UvXw" resolve="pma" />
             </node>
             <node concept="liA8E" id="7vLq_hssg$B" role="2OqNvi">
-              <ref role="37wK5l" to="mk90:~ProgressMonitorBase.done():void" resolve="done" />
+              <ref role="37wK5l" to="mk90:~ProgressMonitorBase.done()" resolve="done" />
             </node>
           </node>
         </node>
@@ -1209,7 +1207,7 @@
                   <ref role="3cqZAo" node="1oYl8FfqRO8" resolve="cv" />
                 </node>
                 <node concept="liA8E" id="7WP_sw5xmV7" role="2OqNvi">
-                  <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean):void" resolve="openToolLater" />
+                  <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean)" resolve="openToolLater" />
                   <node concept="3clFbT" id="7WP_sw5xmYE" role="37wK5m">
                     <property role="3clFbU" value="true" />
                   </node>
@@ -1335,7 +1333,7 @@
                       <ref role="3cqZAo" node="6dWFC76Wp_w" resolve="mpsProject" />
                     </node>
                     <node concept="liA8E" id="6dWFC76Wp6U" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                      <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
                     </node>
                   </node>
                   <node concept="Xl_RD" id="6dWFC76Wp6V" role="37wK5m">
@@ -1353,10 +1351,10 @@
           <node concept="2OqwBi" id="6dWFC76Wp6Y" role="3clFbG">
             <node concept="2YIFZM" id="6dWFC76Wp6Z" role="2Oq$k0">
               <ref role="1Pybhc" to="xygl:~ProgressManager" resolve="ProgressManager" />
-              <ref role="37wK5l" to="xygl:~ProgressManager.getInstance():com.intellij.openapi.progress.ProgressManager" resolve="getInstance" />
+              <ref role="37wK5l" to="xygl:~ProgressManager.getInstance()" resolve="getInstance" />
             </node>
             <node concept="liA8E" id="6dWFC76Wp70" role="2OqNvi">
-              <ref role="37wK5l" to="xygl:~ProgressManager.run(com.intellij.openapi.progress.Task):void" resolve="run" />
+              <ref role="37wK5l" to="xygl:~ProgressManager.run(com.intellij.openapi.progress.Task)" resolve="run" />
               <node concept="37vLTw" id="6dWFC76Wp71" role="37wK5m">
                 <ref role="3cqZAo" node="6dWFC76Wp6_" resolve="task" />
               </node>
@@ -1447,7 +1445,7 @@
                       <ref role="3cqZAo" node="1oYl8Ffq5JR" resolve="lastProject" />
                     </node>
                     <node concept="liA8E" id="6dWFC76Wr1j" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                      <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
                     </node>
                   </node>
                   <node concept="Xl_RD" id="6dWFC76Wr1k" role="37wK5m">
@@ -1465,10 +1463,10 @@
           <node concept="2OqwBi" id="6dWFC76Wr1n" role="3clFbG">
             <node concept="2YIFZM" id="6dWFC76Wr1o" role="2Oq$k0">
               <ref role="1Pybhc" to="xygl:~ProgressManager" resolve="ProgressManager" />
-              <ref role="37wK5l" to="xygl:~ProgressManager.getInstance():com.intellij.openapi.progress.ProgressManager" resolve="getInstance" />
+              <ref role="37wK5l" to="xygl:~ProgressManager.getInstance()" resolve="getInstance" />
             </node>
             <node concept="liA8E" id="6dWFC76Wr1p" role="2OqNvi">
-              <ref role="37wK5l" to="xygl:~ProgressManager.run(com.intellij.openapi.progress.Task):void" resolve="run" />
+              <ref role="37wK5l" to="xygl:~ProgressManager.run(com.intellij.openapi.progress.Task)" resolve="run" />
               <node concept="37vLTw" id="6dWFC76Wr1q" role="37wK5m">
                 <ref role="3cqZAo" node="6dWFC76Wr0Y" resolve="task" />
               </node>
@@ -1540,7 +1538,7 @@
                     <ref role="3cqZAo" node="4vC8GjwZp3J" resolve="project" />
                   </node>
                   <node concept="liA8E" id="4vC8GjwZzvY" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
               </node>
@@ -1569,7 +1567,7 @@
               <ref role="3cqZAo" node="4vC8GjwZoHR" resolve="ctv" />
             </node>
             <node concept="liA8E" id="4vC8GjwZoIa" role="2OqNvi">
-              <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean):void" resolve="openToolLater" />
+              <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean)" resolve="openToolLater" />
               <node concept="3clFbT" id="4vC8GjwZoIb" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
index 5c46801e..7eb86e58 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
@@ -674,7 +674,7 @@
                                   <ref role="3cqZAo" node="5YQNmM963wt" resolve="sb" />
                                 </node>
                                 <node concept="liA8E" id="5YQNmM98oLQ" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+                                  <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                                   <node concept="2OqwBi" id="5YQNmM98sZn" role="37wK5m">
                                     <node concept="1PxgMI" id="5YQNmM98rcu" role="2Oq$k0">
                                       <node concept="chp4Y" id="5YQNmM98rSa" role="3oSUPX">
@@ -710,7 +710,7 @@
                                     <ref role="3cqZAo" node="5YQNmM963wt" resolve="sb" />
                                   </node>
                                   <node concept="liA8E" id="5YQNmM99A99" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+                                    <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                                     <node concept="2OqwBi" id="5YQNmM99A9a" role="37wK5m">
                                       <node concept="2OqwBi" id="5YQNmM99DAQ" role="2Oq$k0">
                                         <node concept="37vLTw" id="5YQNmM99CkM" role="2Oq$k0">
@@ -719,7 +719,7 @@
                                         <node concept="2yIwOk" id="5YQNmM9a1$C" role="2OqNvi" />
                                       </node>
                                       <node concept="liA8E" id="5YQNmM9a2NM" role="2OqNvi">
-                                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                                       </node>
                                     </node>
                                   </node>
@@ -734,7 +734,7 @@
                               <ref role="3cqZAo" node="5YQNmM963wt" resolve="sb" />
                             </node>
                             <node concept="liA8E" id="5YQNmM9a7K3" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String):java.lang.StringBuffer" resolve="append" />
+                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
                               <node concept="Xl_RD" id="5YQNmM9a8Om" role="37wK5m">
                                 <property role="Xl_RC" value="/" />
                               </node>
@@ -753,7 +753,7 @@
                             <ref role="3cqZAo" node="5YQNmM963wt" resolve="sb" />
                           </node>
                           <node concept="liA8E" id="5YQNmM9aeIO" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                            <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                           </node>
                         </node>
                       </node>
@@ -768,7 +768,7 @@
               <ref role="3cqZAo" node="4vctr_xRQOe" resolve="proj" />
             </node>
             <node concept="liA8E" id="4vctr_xS4DJ" role="2OqNvi">
-              <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -947,7 +947,7 @@
         </node>
         <node concept="3clFbF" id="16s82eEv5Ls" role="3cqZAp">
           <node concept="3nyPlj" id="16s82eEv5Lr" role="3clFbG">
-            <ref role="37wK5l" to="c8ee:~AbstractTableModel.getColumnClass(int):java.lang.Class" resolve="getColumnClass" />
+            <ref role="37wK5l" to="c8ee:~AbstractTableModel.getColumnClass(int)" resolve="getColumnClass" />
             <node concept="37vLTw" id="16s82eEv5Lq" role="37wK5m">
               <ref role="3cqZAo" node="16s82eEv5Lm" resolve="i" />
             </node>
@@ -994,7 +994,7 @@
           <node concept="2OqwBi" id="16s82eEuM3q" role="3clFbG">
             <node concept="Xjq3P" id="16s82eEuLe9" role="2Oq$k0" />
             <node concept="liA8E" id="16s82eEuP0q" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setAutoCreateRowSorter(boolean):void" resolve="setAutoCreateRowSorter" />
+              <ref role="37wK5l" to="dxuu:~JTable.setAutoCreateRowSorter(boolean)" resolve="setAutoCreateRowSorter" />
               <node concept="3clFbT" id="16s82eEuQ3_" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
@@ -1036,7 +1036,7 @@
           <node concept="2OqwBi" id="7WP_sw5s1Ay" role="3clFbG">
             <node concept="Xjq3P" id="7WP_sw5s1Az" role="2Oq$k0" />
             <node concept="liA8E" id="7WP_sw5s1A$" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setModel(javax.swing.table.TableModel):void" resolve="setModel" />
+              <ref role="37wK5l" to="dxuu:~JTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
               <node concept="37vLTw" id="7WP_sw5s1A_" role="37wK5m">
                 <ref role="3cqZAo" node="7WP_sw5s1A8" resolve="tableModel" />
               </node>
@@ -1081,7 +1081,7 @@
               <ref role="3cqZAo" node="7WP_sw5xZTu" resolve="openDetails" />
             </node>
             <node concept="liA8E" id="7WP_sw5ydio" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="7WP_sw5y2ZQ" role="37wK5m">
                 <node concept="YeOm9" id="7WP_sw5y6MO" role="2ShVmc">
                   <node concept="1Y3b0j" id="7WP_sw5y6MR" role="YeSDq">
@@ -1120,7 +1120,7 @@
                                 <ref role="3cqZAo" node="7WP_sw5s1Ac" resolve="mpsProject" />
                               </node>
                               <node concept="liA8E" id="E3aAvrLksh" role="2OqNvi">
-                                <ref role="37wK5l" to="z1c3:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                                <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="E3aAvrLa0V" role="37wK5m">
@@ -1142,7 +1142,7 @@
               <ref role="3cqZAo" node="7WP_sw5xTVY" resolve="popup" />
             </node>
             <node concept="liA8E" id="7WP_sw5yCrb" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem):javax.swing.JMenuItem" resolve="add" />
+              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem)" resolve="add" />
               <node concept="37vLTw" id="7WP_sw5yCXf" role="37wK5m">
                 <ref role="3cqZAo" node="7WP_sw5xZTu" resolve="openDetails" />
               </node>
@@ -1153,7 +1153,7 @@
           <node concept="2OqwBi" id="7WP_sw5xRo5" role="3clFbG">
             <node concept="Xjq3P" id="7WP_sw5xQDP" role="2Oq$k0" />
             <node concept="liA8E" id="7WP_sw5xSBP" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setComponentPopupMenu(javax.swing.JPopupMenu):void" resolve="setComponentPopupMenu" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setComponentPopupMenu(javax.swing.JPopupMenu)" resolve="setComponentPopupMenu" />
               <node concept="37vLTw" id="7WP_sw5xXIo" role="37wK5m">
                 <ref role="3cqZAo" node="7WP_sw5xTVY" resolve="popup" />
               </node>
@@ -1165,7 +1165,7 @@
           <node concept="2OqwBi" id="4vctr_xQ57E" role="3clFbG">
             <node concept="Xjq3P" id="4vctr_xQ4m9" role="2Oq$k0" />
             <node concept="liA8E" id="4vctr_xQ7Rq" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener):void" resolve="addMouseListener" />
+              <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener)" resolve="addMouseListener" />
               <node concept="2ShNRf" id="4vctr_xQ8RW" role="37wK5m">
                 <node concept="YeOm9" id="4vctr_xQdkW" role="2ShVmc">
                   <node concept="1Y3b0j" id="4vctr_xQdkZ" role="YeSDq">
@@ -1206,7 +1206,7 @@
                                     <ref role="3cqZAo" node="7WP_sw5s1Ac" resolve="mpsProject" />
                                   </node>
                                   <node concept="liA8E" id="4vctr_xQjwI" role="2OqNvi">
-                                    <ref role="37wK5l" to="z1c3:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                                    <ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="4vctr_xQjwJ" role="37wK5m">
@@ -1224,14 +1224,14 @@
                                 <ref role="3cqZAo" node="4vctr_xQera" resolve="event" />
                               </node>
                               <node concept="liA8E" id="4vctr_xQhID" role="2OqNvi">
-                                <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount():int" resolve="getClickCount" />
+                                <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount()" resolve="getClickCount" />
                               </node>
                             </node>
                           </node>
                         </node>
                         <node concept="3clFbF" id="4vctr_xQerh" role="3cqZAp">
                           <node concept="3nyPlj" id="4vctr_xQerg" role="3clFbG">
-                            <ref role="37wK5l" to="hyam:~MouseAdapter.mouseClicked(java.awt.event.MouseEvent):void" resolve="mouseClicked" />
+                            <ref role="37wK5l" to="hyam:~MouseAdapter.mouseClicked(java.awt.event.MouseEvent)" resolve="mouseClicked" />
                             <node concept="37vLTw" id="4vctr_xQerf" role="37wK5m">
                               <ref role="3cqZAo" node="4vctr_xQera" resolve="event" />
                             </node>
@@ -1314,7 +1314,7 @@
         </node>
         <node concept="3clFbF" id="7WP_sw5s1Bq" role="3cqZAp">
           <node concept="1rXfSq" id="7WP_sw5s1Br" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+            <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
           </node>
         </node>
       </node>
@@ -1355,15 +1355,15 @@
               <node concept="2OqwBi" id="16s82eEwYsD" role="2Oq$k0">
                 <node concept="Xjq3P" id="16s82eEwYsE" role="2Oq$k0" />
                 <node concept="liA8E" id="16s82eEwYsF" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getRowSorter():javax.swing.RowSorter" resolve="getRowSorter" />
+                  <ref role="37wK5l" to="dxuu:~JTable.getRowSorter()" resolve="getRowSorter" />
                 </node>
               </node>
               <node concept="liA8E" id="16s82eEwYsG" role="2OqNvi">
-                <ref role="37wK5l" to="dxuu:~RowSorter.convertRowIndexToModel(int):int" resolve="convertRowIndexToModel" />
+                <ref role="37wK5l" to="dxuu:~RowSorter.convertRowIndexToModel(int)" resolve="convertRowIndexToModel" />
                 <node concept="2OqwBi" id="16s82eEwYsH" role="37wK5m">
                   <node concept="Xjq3P" id="16s82eEwYsI" role="2Oq$k0" />
                   <node concept="liA8E" id="16s82eEwYsJ" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~JTable.getSelectedRow():int" resolve="getSelectedRow" />
+                    <ref role="37wK5l" to="dxuu:~JTable.getSelectedRow()" resolve="getSelectedRow" />
                   </node>
                 </node>
               </node>
@@ -1483,7 +1483,7 @@
               <ref role="3cqZAo" node="7WP_sw5s1Ac" resolve="mpsProject" />
             </node>
             <node concept="liA8E" id="4vctr_xRNUK" role="2OqNvi">
-              <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1502,7 +1502,7 @@
         </node>
         <node concept="3clFbF" id="1zTNC9MGT4S" role="3cqZAp">
           <node concept="1rXfSq" id="1zTNC9MGT4Q" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+            <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
           </node>
         </node>
       </node>
@@ -1532,7 +1532,7 @@
         </node>
         <node concept="3clFbF" id="16s82eEB0zk" role="3cqZAp">
           <node concept="1rXfSq" id="16s82eEB0zi" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+            <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
           </node>
         </node>
       </node>
@@ -1589,7 +1589,7 @@
       <node concept="3clFbS" id="7WP_sw5s1I2" role="3clF47">
         <node concept="3clFbF" id="1oYl8Ffmx7E" role="3cqZAp">
           <node concept="1rXfSq" id="1oYl8Ffmx7C" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager):void" resolve="setLayout" />
+            <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager)" resolve="setLayout" />
             <node concept="2ShNRf" id="1oYl8Ffmy1s" role="37wK5m">
               <node concept="1pGfFk" id="1oYl8FfmAup" role="2ShVmc">
                 <ref role="37wK5l" to="dxuu:~BoxLayout.&lt;init&gt;(java.awt.Container,int)" resolve="BoxLayout" />
@@ -1639,7 +1639,7 @@
               <ref role="3cqZAo" node="7WP_sw5s1HR" resolve="clonesTable" />
             </node>
             <node concept="liA8E" id="7WP_sw5C$VN" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setFillsViewportHeight(boolean):void" resolve="setFillsViewportHeight" />
+              <ref role="37wK5l" to="dxuu:~JTable.setFillsViewportHeight(boolean)" resolve="setFillsViewportHeight" />
               <node concept="3clFbT" id="7WP_sw5C_z9" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
@@ -1648,7 +1648,7 @@
         </node>
         <node concept="3clFbF" id="7WP_sw5s1Id" role="3cqZAp">
           <node concept="1rXfSq" id="7WP_sw5s1Ie" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
             <node concept="37vLTw" id="7WP_sw5CKJV" role="37wK5m">
               <ref role="3cqZAo" node="7WP_sw5CEdN" resolve="clonesScrollPane" />
             </node>
@@ -1674,7 +1674,7 @@
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
             <node concept="liA8E" id="1oYl8FftPzQ" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager):void" resolve="setLayout" />
+              <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager)" resolve="setLayout" />
               <node concept="2ShNRf" id="1oYl8FftQBu" role="37wK5m">
                 <node concept="1pGfFk" id="1oYl8FftShG" role="2ShVmc">
                   <ref role="37wK5l" to="dxuu:~BoxLayout.&lt;init&gt;(java.awt.Container,int)" resolve="BoxLayout" />
@@ -1696,7 +1696,7 @@
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
             <node concept="liA8E" id="2k2dPZH6$re" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setMaximumSize(java.awt.Dimension):void" resolve="setMaximumSize" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setMaximumSize(java.awt.Dimension)" resolve="setMaximumSize" />
               <node concept="2ShNRf" id="2k2dPZH6$rf" role="37wK5m">
                 <node concept="1pGfFk" id="2k2dPZH6$rg" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
@@ -1717,7 +1717,7 @@
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
             <node concept="liA8E" id="2k2dPZH6$rm" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension):void" resolve="setPreferredSize" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
               <node concept="2ShNRf" id="2k2dPZH6$rn" role="37wK5m">
                 <node concept="1pGfFk" id="2k2dPZH6$ro" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
@@ -1768,7 +1768,7 @@
               <ref role="3cqZAo" node="1oYl8Ffs1gM" resolve="suffixSizePanel" />
             </node>
             <node concept="liA8E" id="1oYl8FfsqUH" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8Ffss3O" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8Ffshf5" resolve="maxSuffixSizeLabel" />
               </node>
@@ -1822,7 +1822,7 @@
               <ref role="3cqZAo" node="1oYl8FfrgXi" resolve="maximalSuffixSizeSpinner" />
             </node>
             <node concept="liA8E" id="1oYl8FfrH$S" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JSpinner.addChangeListener(javax.swing.event.ChangeListener):void" resolve="addChangeListener" />
+              <ref role="37wK5l" to="dxuu:~JSpinner.addChangeListener(javax.swing.event.ChangeListener)" resolve="addChangeListener" />
               <node concept="2ShNRf" id="1oYl8FfrHVY" role="37wK5m">
                 <node concept="YeOm9" id="1oYl8FfrL2V" role="2ShVmc">
                   <node concept="1Y3b0j" id="1oYl8FfrL2Y" role="YeSDq">
@@ -1850,7 +1850,7 @@
                                     <ref role="3cqZAo" node="6dJ4vxiOPoM" resolve="maximalSuffixSizeSpinnerModel" />
                                   </node>
                                   <node concept="liA8E" id="1oYl8FfrSQU" role="2OqNvi">
-                                    <ref role="37wK5l" to="dxuu:~SpinnerModel.getValue():java.lang.Object" resolve="getValue" />
+                                    <ref role="37wK5l" to="dxuu:~SpinnerModel.getValue()" resolve="getValue" />
                                   </node>
                                 </node>
                                 <node concept="10Oyi0" id="1oYl8FfrSQR" role="10QFUM" />
@@ -1881,7 +1881,7 @@
               <ref role="3cqZAo" node="1oYl8Ffs1gM" resolve="suffixSizePanel" />
             </node>
             <node concept="liA8E" id="1oYl8FfscyZ" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8FfsdD0" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8FfrgXi" resolve="maximalSuffixSizeSpinner" />
               </node>
@@ -1911,7 +1911,7 @@
               <ref role="3cqZAo" node="1oYl8Ffs1gM" resolve="suffixSizePanel" />
             </node>
             <node concept="liA8E" id="1oYl8Fft4B8" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8Fft4B9" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8Fft4B0" resolve="minSuffixSizeLabel" />
               </node>
@@ -1965,7 +1965,7 @@
               <ref role="3cqZAo" node="1oYl8Fft4Bk" resolve="minSuffixSizeSpinner" />
             </node>
             <node concept="liA8E" id="1oYl8Fft4Bs" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JSpinner.addChangeListener(javax.swing.event.ChangeListener):void" resolve="addChangeListener" />
+              <ref role="37wK5l" to="dxuu:~JSpinner.addChangeListener(javax.swing.event.ChangeListener)" resolve="addChangeListener" />
               <node concept="2ShNRf" id="1oYl8Fft4Bt" role="37wK5m">
                 <node concept="YeOm9" id="1oYl8Fft4Bu" role="2ShVmc">
                   <node concept="1Y3b0j" id="1oYl8Fft4Bv" role="YeSDq">
@@ -1993,7 +1993,7 @@
                                     <ref role="3cqZAo" node="6dJ4vxiOywv" resolve="minSuffixSizeSpinnerModel" />
                                   </node>
                                   <node concept="liA8E" id="1oYl8Fft4BH" role="2OqNvi">
-                                    <ref role="37wK5l" to="dxuu:~SpinnerModel.getValue():java.lang.Object" resolve="getValue" />
+                                    <ref role="37wK5l" to="dxuu:~SpinnerModel.getValue()" resolve="getValue" />
                                   </node>
                                 </node>
                                 <node concept="10Oyi0" id="1oYl8Fft4BI" role="10QFUM" />
@@ -2024,7 +2024,7 @@
               <ref role="3cqZAo" node="1oYl8Ffs1gM" resolve="suffixSizePanel" />
             </node>
             <node concept="liA8E" id="1oYl8Fft4BP" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8Fft4BQ" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8Fft4Bk" resolve="minSuffixSizeSpinner" />
               </node>
@@ -2037,7 +2037,7 @@
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
             <node concept="liA8E" id="1oYl8FfrqxQ" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8Ffs5gX" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8Ffs1gM" resolve="suffixSizePanel" />
               </node>
@@ -2080,7 +2080,7 @@
               <ref role="3cqZAo" node="1oYl8FfuPla" resolve="cloneSizePanel" />
             </node>
             <node concept="liA8E" id="1oYl8FfuPln" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8FfuPlo" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8FfuPlf" resolve="minCloneLengthLabel" />
               </node>
@@ -2134,7 +2134,7 @@
               <ref role="3cqZAo" node="1oYl8FfuPlz" resolve="minimalCloneLengthSpinner" />
             </node>
             <node concept="liA8E" id="1oYl8FfuPlF" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JSpinner.addChangeListener(javax.swing.event.ChangeListener):void" resolve="addChangeListener" />
+              <ref role="37wK5l" to="dxuu:~JSpinner.addChangeListener(javax.swing.event.ChangeListener)" resolve="addChangeListener" />
               <node concept="2ShNRf" id="1oYl8FfuPlG" role="37wK5m">
                 <node concept="YeOm9" id="1oYl8FfuPlH" role="2ShVmc">
                   <node concept="1Y3b0j" id="1oYl8FfuPlI" role="YeSDq">
@@ -2162,7 +2162,7 @@
                                     <ref role="3cqZAo" node="6dJ4vxiOn0y" resolve="minimalCloneLengthSpinnerModel" />
                                   </node>
                                   <node concept="liA8E" id="1oYl8FfuPlW" role="2OqNvi">
-                                    <ref role="37wK5l" to="dxuu:~SpinnerModel.getValue():java.lang.Object" resolve="getValue" />
+                                    <ref role="37wK5l" to="dxuu:~SpinnerModel.getValue()" resolve="getValue" />
                                   </node>
                                 </node>
                                 <node concept="10Oyi0" id="1oYl8FfuPlX" role="10QFUM" />
@@ -2193,7 +2193,7 @@
               <ref role="3cqZAo" node="1oYl8FfuPla" resolve="cloneSizePanel" />
             </node>
             <node concept="liA8E" id="1oYl8FfuPm4" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8FfuPm5" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8FfuPlz" resolve="minimalCloneLengthSpinner" />
               </node>
@@ -2206,7 +2206,7 @@
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
             <node concept="liA8E" id="1oYl8Ffvf5F" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8FfvgG5" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8FfuPla" resolve="cloneSizePanel" />
               </node>
@@ -2249,7 +2249,7 @@
               <ref role="3cqZAo" node="1oYl8FfoaKd" resolve="reRunButton" />
             </node>
             <node concept="liA8E" id="1oYl8FfoA2H" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="1oYl8FfoAH5" role="37wK5m">
                 <node concept="YeOm9" id="1oYl8FfoCnZ" role="2ShVmc">
                   <node concept="1Y3b0j" id="1oYl8FfoCo2" role="YeSDq">
@@ -2288,7 +2288,7 @@
               <ref role="3cqZAo" node="4vC8Gjx09w$" resolve="cloneBottomPanel" />
             </node>
             <node concept="liA8E" id="1oYl8Ffo71e" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="1oYl8FfoaKh" role="37wK5m">
                 <ref role="3cqZAo" node="1oYl8FfoaKd" resolve="reRunButton" />
               </node>
@@ -2318,7 +2318,7 @@
               <ref role="3cqZAo" node="16s82eEAAsI" resolve="resetOverview" />
             </node>
             <node concept="liA8E" id="16s82eEAAsQ" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="16s82eEAAsR" role="37wK5m">
                 <node concept="YeOm9" id="16s82eEAAsS" role="2ShVmc">
                   <node concept="1Y3b0j" id="16s82eEAAsT" role="YeSDq">
@@ -2361,7 +2361,7 @@
               <ref role="3cqZAo" node="4vC8Gjx09w$" resolve="cloneBottomPanel" />
             </node>
             <node concept="liA8E" id="16s82eEAAt6" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="16s82eEAAt7" role="37wK5m">
                 <ref role="3cqZAo" node="16s82eEAAsI" resolve="resetOverview" />
               </node>
@@ -2391,7 +2391,7 @@
               <ref role="3cqZAo" node="4vC8GjwZCAu" resolve="openTreemapButton" />
             </node>
             <node concept="liA8E" id="4vC8GjwZCAg" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="4vC8GjwZCAh" role="37wK5m">
                 <node concept="YeOm9" id="4vC8GjwZCAi" role="2ShVmc">
                   <node concept="1Y3b0j" id="4vC8GjwZCAj" role="YeSDq">
@@ -2441,7 +2441,7 @@
               <ref role="3cqZAo" node="4vC8Gjx09w$" resolve="cloneBottomPanel" />
             </node>
             <node concept="liA8E" id="4vC8Gjx0ows" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="4vC8Gjx0q6B" role="37wK5m">
                 <ref role="3cqZAo" node="4vC8GjwZCAu" resolve="openTreemapButton" />
               </node>
@@ -2454,7 +2454,7 @@
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
             <node concept="liA8E" id="4vC8GjwZCAb" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
               <node concept="37vLTw" id="4vC8Gjx0r46" role="37wK5m">
                 <ref role="3cqZAo" node="4vC8Gjx09w$" resolve="cloneBottomPanel" />
               </node>
@@ -2465,7 +2465,7 @@
         <node concept="3clFbH" id="1oYl8FfvtrG" role="3cqZAp" />
         <node concept="3clFbF" id="1oYl8Ffq2fg" role="3cqZAp">
           <node concept="1rXfSq" id="1oYl8Ffq2fe" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
             <node concept="37vLTw" id="1oYl8Ffq3Rf" role="37wK5m">
               <ref role="3cqZAo" node="2k2dPZH6$r7" resolve="settingsPanel" />
             </node>
@@ -2509,7 +2509,7 @@
                   <ref role="3cqZAo" node="6dJ4vxiOywv" resolve="minSuffixSizeSpinnerModel" />
                 </node>
                 <node concept="liA8E" id="6dJ4vxiPBHX" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~SpinnerModel.setValue(java.lang.Object):void" resolve="setValue" />
+                  <ref role="37wK5l" to="dxuu:~SpinnerModel.setValue(java.lang.Object)" resolve="setValue" />
                   <node concept="2OqwBi" id="6dJ4vxiPBHY" role="37wK5m">
                     <node concept="10M0yZ" id="6dJ4vxiPBHZ" role="2Oq$k0">
                       <ref role="1PxDUh" to="9vt7:1oYl8Ffq3Xu" resolve="ClonesDetectorRunner" />
@@ -2528,7 +2528,7 @@
                   <ref role="3cqZAo" node="6dJ4vxiOPoM" resolve="maximalSuffixSizeSpinnerModel" />
                 </node>
                 <node concept="liA8E" id="6dJ4vxiPB4X" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~SpinnerModel.setValue(java.lang.Object):void" resolve="setValue" />
+                  <ref role="37wK5l" to="dxuu:~SpinnerModel.setValue(java.lang.Object)" resolve="setValue" />
                   <node concept="2OqwBi" id="6dJ4vxiPBfy" role="37wK5m">
                     <node concept="10M0yZ" id="6dJ4vxiPB7j" role="2Oq$k0">
                       <ref role="1PxDUh" to="9vt7:1oYl8Ffq3Xu" resolve="ClonesDetectorRunner" />
@@ -2547,7 +2547,7 @@
                   <ref role="3cqZAo" node="6dJ4vxiOn0y" resolve="minimalCloneLengthSpinnerModel" />
                 </node>
                 <node concept="liA8E" id="6dJ4vxiPBII" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~SpinnerModel.setValue(java.lang.Object):void" resolve="setValue" />
+                  <ref role="37wK5l" to="dxuu:~SpinnerModel.setValue(java.lang.Object)" resolve="setValue" />
                   <node concept="2OqwBi" id="6dJ4vxiPBIJ" role="37wK5m">
                     <node concept="10M0yZ" id="6dJ4vxiPBIK" role="2Oq$k0">
                       <ref role="1PxDUh" to="9vt7:1oYl8Ffq3Xu" resolve="ClonesDetectorRunner" />
@@ -2712,7 +2712,7 @@
                     <node concept="37vLTI" id="E3aAvrHN$d" role="3clFbG">
                       <node concept="2YIFZM" id="E3aAvrHN$e" role="37vLTx">
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <ref role="37wK5l" to="wyt6:~Integer.toString(int):java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~Integer.toString(int)" resolve="toString" />
                         <node concept="3cpWs3" id="E3aAvrHN$f" role="37wK5m">
                           <node concept="3cmrfG" id="E3aAvrHN$g" role="3uHU7w">
                             <property role="3cmrfH" value="1" />
@@ -2815,7 +2815,7 @@
                                   <node concept="2yIwOk" id="E3aAvrIZNy" role="2OqNvi" />
                                 </node>
                                 <node concept="liA8E" id="E3aAvrJ5ju" role="2OqNvi">
-                                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                                 </node>
                               </node>
                               <node concept="37vLTw" id="E3aAvrIUit" role="37vLTJ">
@@ -2950,7 +2950,7 @@
                                   <node concept="2yIwOk" id="2tukI2XqaCQ" role="2OqNvi" />
                                 </node>
                                 <node concept="liA8E" id="2tukI2Xql2I" role="2OqNvi">
-                                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                                 </node>
                               </node>
                             </node>
@@ -3008,7 +3008,7 @@
                             </node>
                             <node concept="2YIFZM" id="2tukI2Xq_gg" role="3uHU7w">
                               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                              <ref role="37wK5l" to="wyt6:~String.join(java.lang.CharSequence,java.lang.Iterable):java.lang.String" resolve="join" />
+                              <ref role="37wK5l" to="wyt6:~String.join(java.lang.CharSequence,java.lang.Iterable)" resolve="join" />
                               <node concept="Xl_RD" id="2tukI2XqA0D" role="37wK5m">
                                 <property role="Xl_RC" value="," />
                               </node>
@@ -3047,7 +3047,7 @@
               <ref role="3cqZAo" node="4vctr_xQWKK" resolve="proj" />
             </node>
             <node concept="liA8E" id="4vctr_xRjTN" role="2OqNvi">
-              <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -3212,7 +3212,7 @@
           <node concept="2OqwBi" id="E3aAvrJysk" role="3clFbG">
             <node concept="Xjq3P" id="E3aAvrJysl" role="2Oq$k0" />
             <node concept="liA8E" id="E3aAvrJysm" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension):void" resolve="setPreferredSize" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
               <node concept="2ShNRf" id="E3aAvrJysn" role="37wK5m">
                 <node concept="1pGfFk" id="E3aAvrJyso" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
@@ -3249,7 +3249,7 @@
           <node concept="2OqwBi" id="E3aAvrJyss" role="3clFbG">
             <node concept="Xjq3P" id="E3aAvrJyst" role="2Oq$k0" />
             <node concept="liA8E" id="E3aAvrJysu" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setModel(javax.swing.table.TableModel):void" resolve="setModel" />
+              <ref role="37wK5l" to="dxuu:~JTable.setModel(javax.swing.table.TableModel)" resolve="setModel" />
               <node concept="37vLTw" id="E3aAvrJysv" role="37wK5m">
                 <ref role="3cqZAo" node="E3aAvrJys0" resolve="tableModel" />
               </node>
@@ -3294,7 +3294,7 @@
               <ref role="3cqZAo" node="E3aAvrJysC" resolve="gotoNode" />
             </node>
             <node concept="liA8E" id="E3aAvrJysK" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="E3aAvrJysL" role="37wK5m">
                 <node concept="YeOm9" id="E3aAvrJysM" role="2ShVmc">
                   <node concept="1Y3b0j" id="E3aAvrJysN" role="YeSDq">
@@ -3329,10 +3329,10 @@
                                 <node concept="2OqwBi" id="E3aAvrJyt3" role="3clFbG">
                                   <node concept="2YIFZM" id="E3aAvrJyt4" role="2Oq$k0">
                                     <ref role="1Pybhc" to="kz9k:~NavigationSupport" resolve="NavigationSupport" />
-                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.getInstance():jetbrains.mps.openapi.navigation.NavigationSupport" resolve="getInstance" />
+                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.getInstance()" resolve="getInstance" />
                                   </node>
                                   <node concept="liA8E" id="E3aAvrJyt5" role="2OqNvi">
-                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.openNode(jetbrains.mps.project.Project,org.jetbrains.mps.openapi.model.SNode,boolean,boolean):jetbrains.mps.openapi.editor.Editor" resolve="openNode" />
+                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.openNode(jetbrains.mps.project.Project,org.jetbrains.mps.openapi.model.SNode,boolean,boolean)" resolve="openNode" />
                                     <node concept="37vLTw" id="E3aAvrJyt6" role="37wK5m">
                                       <ref role="3cqZAo" node="E3aAvrJys5" resolve="mpsProject" />
                                     </node>
@@ -3355,7 +3355,7 @@
                               <ref role="3cqZAo" node="E3aAvrJys5" resolve="mpsProject" />
                             </node>
                             <node concept="liA8E" id="E3aAvrJyte" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
                             </node>
                           </node>
                         </node>
@@ -3373,7 +3373,7 @@
               <ref role="3cqZAo" node="E3aAvrJysy" resolve="popup" />
             </node>
             <node concept="liA8E" id="E3aAvrJyti" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem):javax.swing.JMenuItem" resolve="add" />
+              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem)" resolve="add" />
               <node concept="37vLTw" id="E3aAvrJytj" role="37wK5m">
                 <ref role="3cqZAo" node="E3aAvrJysC" resolve="gotoNode" />
               </node>
@@ -3402,7 +3402,7 @@
               <ref role="3cqZAo" node="4vctr_xSRp0" resolve="markClone" />
             </node>
             <node concept="liA8E" id="4vctr_xSRp8" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="4vctr_xSRp9" role="37wK5m">
                 <node concept="YeOm9" id="4vctr_xSRpa" role="2ShVmc">
                   <node concept="1Y3b0j" id="4vctr_xSRpb" role="YeSDq">
@@ -3527,10 +3527,10 @@
                                 <node concept="2OqwBi" id="4vctr_xSRpr" role="3clFbG">
                                   <node concept="2YIFZM" id="4vctr_xSRps" role="2Oq$k0">
                                     <ref role="1Pybhc" to="kz9k:~NavigationSupport" resolve="NavigationSupport" />
-                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.getInstance():jetbrains.mps.openapi.navigation.NavigationSupport" resolve="getInstance" />
+                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.getInstance()" resolve="getInstance" />
                                   </node>
                                   <node concept="liA8E" id="4vctr_xSRpt" role="2OqNvi">
-                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.openNode(jetbrains.mps.project.Project,org.jetbrains.mps.openapi.model.SNode,boolean,boolean):jetbrains.mps.openapi.editor.Editor" resolve="openNode" />
+                                    <ref role="37wK5l" to="kz9k:~NavigationSupport.openNode(jetbrains.mps.project.Project,org.jetbrains.mps.openapi.model.SNode,boolean,boolean)" resolve="openNode" />
                                     <node concept="37vLTw" id="4vctr_xSRpu" role="37wK5m">
                                       <ref role="3cqZAo" node="E3aAvrJys5" resolve="mpsProject" />
                                     </node>
@@ -3554,7 +3554,7 @@
                               <ref role="3cqZAo" node="E3aAvrJys5" resolve="mpsProject" />
                             </node>
                             <node concept="liA8E" id="4vctr_xSRp$" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
                             </node>
                           </node>
                         </node>
@@ -3572,7 +3572,7 @@
               <ref role="3cqZAo" node="E3aAvrJysy" resolve="popup" />
             </node>
             <node concept="liA8E" id="4vctr_xSRpC" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem):javax.swing.JMenuItem" resolve="add" />
+              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem)" resolve="add" />
               <node concept="37vLTw" id="4vctr_xSRpD" role="37wK5m">
                 <ref role="3cqZAo" node="4vctr_xSRp0" resolve="markClone" />
               </node>
@@ -3584,7 +3584,7 @@
           <node concept="2OqwBi" id="E3aAvrJyu3" role="3clFbG">
             <node concept="Xjq3P" id="E3aAvrJyu4" role="2Oq$k0" />
             <node concept="liA8E" id="E3aAvrJyu5" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setComponentPopupMenu(javax.swing.JPopupMenu):void" resolve="setComponentPopupMenu" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setComponentPopupMenu(javax.swing.JPopupMenu)" resolve="setComponentPopupMenu" />
               <node concept="37vLTw" id="E3aAvrJyu6" role="37wK5m">
                 <ref role="3cqZAo" node="E3aAvrJysy" resolve="popup" />
               </node>
@@ -3596,7 +3596,7 @@
           <node concept="2OqwBi" id="4vctr_xQruC" role="3clFbG">
             <node concept="Xjq3P" id="4vctr_xQruD" role="2Oq$k0" />
             <node concept="liA8E" id="4vctr_xQruE" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener):void" resolve="addMouseListener" />
+              <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener)" resolve="addMouseListener" />
               <node concept="2ShNRf" id="4vctr_xQruF" role="37wK5m">
                 <node concept="YeOm9" id="4vctr_xQruG" role="2ShVmc">
                   <node concept="1Y3b0j" id="4vctr_xQruH" role="YeSDq">
@@ -3633,10 +3633,10 @@
                                     <node concept="2OqwBi" id="4vctr_xQupB" role="3clFbG">
                                       <node concept="2YIFZM" id="4vctr_xQupC" role="2Oq$k0">
                                         <ref role="1Pybhc" to="kz9k:~NavigationSupport" resolve="NavigationSupport" />
-                                        <ref role="37wK5l" to="kz9k:~NavigationSupport.getInstance():jetbrains.mps.openapi.navigation.NavigationSupport" resolve="getInstance" />
+                                        <ref role="37wK5l" to="kz9k:~NavigationSupport.getInstance()" resolve="getInstance" />
                                       </node>
                                       <node concept="liA8E" id="4vctr_xQupD" role="2OqNvi">
-                                        <ref role="37wK5l" to="kz9k:~NavigationSupport.openNode(jetbrains.mps.project.Project,org.jetbrains.mps.openapi.model.SNode,boolean,boolean):jetbrains.mps.openapi.editor.Editor" resolve="openNode" />
+                                        <ref role="37wK5l" to="kz9k:~NavigationSupport.openNode(jetbrains.mps.project.Project,org.jetbrains.mps.openapi.model.SNode,boolean,boolean)" resolve="openNode" />
                                         <node concept="37vLTw" id="4vctr_xQupE" role="37wK5m">
                                           <ref role="3cqZAo" node="E3aAvrJys5" resolve="mpsProject" />
                                         </node>
@@ -3659,7 +3659,7 @@
                                   <ref role="3cqZAo" node="E3aAvrJys5" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="4vctr_xQupK" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -3673,14 +3673,14 @@
                                 <ref role="3cqZAo" node="4vctr_xQruM" resolve="event" />
                               </node>
                               <node concept="liA8E" id="4vctr_xQrv5" role="2OqNvi">
-                                <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount():int" resolve="getClickCount" />
+                                <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount()" resolve="getClickCount" />
                               </node>
                             </node>
                           </node>
                         </node>
                         <node concept="3clFbF" id="4vctr_xQrv6" role="3cqZAp">
                           <node concept="3nyPlj" id="4vctr_xQrv7" role="3clFbG">
-                            <ref role="37wK5l" to="hyam:~MouseAdapter.mouseClicked(java.awt.event.MouseEvent):void" resolve="mouseClicked" />
+                            <ref role="37wK5l" to="hyam:~MouseAdapter.mouseClicked(java.awt.event.MouseEvent)" resolve="mouseClicked" />
                             <node concept="37vLTw" id="4vctr_xQrv8" role="37wK5m">
                               <ref role="3cqZAo" node="4vctr_xQruM" resolve="event" />
                             </node>
@@ -3725,7 +3725,7 @@
         </node>
         <node concept="3clFbF" id="E3aAvrJyuj" role="3cqZAp">
           <node concept="1rXfSq" id="E3aAvrJyuk" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+            <ref role="37wK5l" to="z60i:~Component.repaint()" resolve="repaint" />
           </node>
         </node>
       </node>
@@ -3775,7 +3775,7 @@
               <node concept="2OqwBi" id="E3aAvrK6E4" role="25WWJ7">
                 <node concept="Xjq3P" id="E3aAvrK6E5" role="2Oq$k0" />
                 <node concept="liA8E" id="E3aAvrK6E6" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTable.getSelectedRow():int" resolve="getSelectedRow" />
+                  <ref role="37wK5l" to="dxuu:~JTable.getSelectedRow()" resolve="getSelectedRow" />
                 </node>
               </node>
             </node>
@@ -3811,7 +3811,7 @@
       <node concept="3clFbS" id="E3aAvrKgHD" role="3clF47">
         <node concept="3clFbF" id="E3aAvrKgHE" role="3cqZAp">
           <node concept="1rXfSq" id="E3aAvrKgHF" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager):void" resolve="setLayout" />
+            <ref role="37wK5l" to="z60i:~Container.setLayout(java.awt.LayoutManager)" resolve="setLayout" />
             <node concept="2ShNRf" id="E3aAvrKgHG" role="37wK5m">
               <node concept="1pGfFk" id="E3aAvrKgHH" role="2ShVmc">
                 <ref role="37wK5l" to="dxuu:~BoxLayout.&lt;init&gt;(java.awt.Container,int)" resolve="BoxLayout" />
@@ -3861,7 +3861,7 @@
               <ref role="3cqZAo" node="E3aAvrKgHR" resolve="clonesScrollPane" />
             </node>
             <node concept="liA8E" id="E3aAvrKgHZ" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension):void" resolve="setPreferredSize" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
               <node concept="2ShNRf" id="E3aAvrKgI0" role="37wK5m">
                 <node concept="1pGfFk" id="E3aAvrKgI1" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
@@ -3882,7 +3882,7 @@
               <ref role="3cqZAo" node="E3aAvrKgHv" resolve="cloneDetailsTable" />
             </node>
             <node concept="liA8E" id="E3aAvrKgI7" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setFillsViewportHeight(boolean):void" resolve="setFillsViewportHeight" />
+              <ref role="37wK5l" to="dxuu:~JTable.setFillsViewportHeight(boolean)" resolve="setFillsViewportHeight" />
               <node concept="3clFbT" id="E3aAvrKgI8" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
@@ -3891,7 +3891,7 @@
         </node>
         <node concept="3clFbF" id="E3aAvrKgI9" role="3cqZAp">
           <node concept="1rXfSq" id="E3aAvrKgIa" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
             <node concept="37vLTw" id="E3aAvrKgIb" role="37wK5m">
               <ref role="3cqZAo" node="E3aAvrKgHR" resolve="clonesScrollPane" />
             </node>
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
index 4cc6ac6e..9ad75b5b 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
@@ -172,11 +172,8 @@
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -251,6 +248,14 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
@@ -324,7 +329,7 @@
           <node concept="2OqwBi" id="4elAKXisKtu" role="3clFbG">
             <node concept="Xjq3P" id="4elAKXisLus" role="2Oq$k0" />
             <node concept="liA8E" id="4elAKXisKtw" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension):void" resolve="setPreferredSize" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
               <node concept="2ShNRf" id="4elAKXisKtx" role="37wK5m">
                 <node concept="1pGfFk" id="4elAKXisKty" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
@@ -353,7 +358,7 @@
       <node concept="3clFbS" id="5Dw7oA60FKw" role="3clF47">
         <node concept="3clFbF" id="5Dw7oA61sZT" role="3cqZAp">
           <node concept="1rXfSq" id="5Dw7oA61sZR" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.removeAll():void" resolve="removeAll" />
+            <ref role="37wK5l" to="z60i:~Container.removeAll()" resolve="removeAll" />
           </node>
         </node>
         <node concept="3clFbH" id="5Dw7oA61sqY" role="3cqZAp" />
@@ -381,7 +386,7 @@
                 <ref role="3cqZAo" node="5Dw7oA61uHH" resolve="builder" />
               </node>
               <node concept="liA8E" id="5Dw7oA61uHQ" role="2OqNvi">
-                <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.buildBranch(java.lang.String,net.sf.jtreemap.swing.TreeMapNode):net.sf.jtreemap.swing.TreeMapNode" resolve="buildBranch" />
+                <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.buildBranch(java.lang.String,net.sf.jtreemap.swing.TreeMapNode)" resolve="buildBranch" />
                 <node concept="Xl_RD" id="5Dw7oA61uHR" role="37wK5m">
                   <property role="Xl_RC" value="analyzed scope" />
                 </node>
@@ -433,7 +438,7 @@
                           <ref role="3cqZAo" node="5Dw7oA61uHH" resolve="builder" />
                         </node>
                         <node concept="liA8E" id="5Dw7oA61_Bv" role="2OqNvi">
-                          <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.buildBranch(java.lang.String,net.sf.jtreemap.swing.TreeMapNode):net.sf.jtreemap.swing.TreeMapNode" resolve="buildBranch" />
+                          <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.buildBranch(java.lang.String,net.sf.jtreemap.swing.TreeMapNode)" resolve="buildBranch" />
                           <node concept="2OqwBi" id="5Dw7oA61A2o" role="37wK5m">
                             <node concept="2GrUjf" id="5Dw7oA61_Vc" role="2Oq$k0">
                               <ref role="2Gs0qQ" node="5Dw7oA61vrM" resolve="m" />
@@ -525,7 +530,7 @@
                                 <node concept="2yIwOk" id="5Dw7oA62ayi" role="2OqNvi" />
                               </node>
                               <node concept="liA8E" id="5Dw7oA63AE2" role="2OqNvi">
-                                <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                                <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="5Dw7oA61QdT" role="3K4Cdx">
@@ -601,7 +606,7 @@
                               <ref role="3cqZAo" node="5Dw7oA61uHH" resolve="builder" />
                             </node>
                             <node concept="liA8E" id="5Dw7oA67JcN" role="2OqNvi">
-                              <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.buildLeaf(java.lang.String,double,net.sf.jtreemap.swing.Value,net.sf.jtreemap.swing.TreeMapNode):net.sf.jtreemap.swing.TreeMapNode" resolve="buildLeaf" />
+                              <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.buildLeaf(java.lang.String,double,net.sf.jtreemap.swing.Value,net.sf.jtreemap.swing.TreeMapNode)" resolve="buildLeaf" />
                               <node concept="37vLTw" id="5Dw7oA67JcO" role="37wK5m">
                                 <ref role="3cqZAo" node="5Dw7oA61PSM" resolve="name" />
                               </node>
@@ -649,7 +654,7 @@
               <ref role="3cqZAo" node="5Dw7oA61l$e" resolve="proj" />
             </node>
             <node concept="liA8E" id="7JEz8iltjLH" role="2OqNvi">
-              <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -665,7 +670,7 @@
                 <ref role="3cqZAo" node="5Dw7oA61uHH" resolve="builder" />
               </node>
               <node concept="liA8E" id="5Dw7oA61GDO" role="2OqNvi">
-                <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.getRoot():net.sf.jtreemap.swing.TreeMapNode" resolve="getRoot" />
+                <ref role="37wK5l" to="t49a:~TreeMapNodeBuilder.getRoot()" resolve="getRoot" />
               </node>
             </node>
           </node>
@@ -689,8 +694,58 @@
         </node>
         <node concept="3clFbH" id="16s82eE_RK6" role="3cqZAp" />
         <node concept="3SKdUt" id="16s82eE_VfO" role="3cqZAp">
-          <node concept="3SKdUq" id="16s82eE_VfQ" role="3SKWNk">
-            <property role="3SKdUp" value="we need this in order to speed-up the sorting of nodes - original implementation uses Bubble-Sort !!!" />
+          <node concept="1PaTwC" id="46QW9mm85jZ" role="1aUNEU">
+            <node concept="3oM_SD" id="46QW9mm85k0" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k1" role="1PaTwD">
+              <property role="3oM_SC" value="need" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k2" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k3" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k4" role="1PaTwD">
+              <property role="3oM_SC" value="order" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k5" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k6" role="1PaTwD">
+              <property role="3oM_SC" value="speed-up" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k7" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k8" role="1PaTwD">
+              <property role="3oM_SC" value="sorting" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85k9" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85ka" role="1PaTwD">
+              <property role="3oM_SC" value="nodes" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85kb" role="1PaTwD">
+              <property role="3oM_SC" value="-" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85kc" role="1PaTwD">
+              <property role="3oM_SC" value="original" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85kd" role="1PaTwD">
+              <property role="3oM_SC" value="implementation" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85ke" role="1PaTwD">
+              <property role="3oM_SC" value="uses" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85kf" role="1PaTwD">
+              <property role="3oM_SC" value="Bubble-Sort" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm85kg" role="1PaTwD">
+              <property role="3oM_SC" value="!!!" />
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="16s82eEzoXq" role="3cqZAp">
@@ -699,7 +754,7 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="16s82eEzuIs" role="2OqNvi">
-              <ref role="37wK5l" to="t49a:~JTreeMap.setStrategy(net.sf.jtreemap.swing.SplitStrategy):void" resolve="setStrategy" />
+              <ref role="37wK5l" to="t49a:~JTreeMap.setStrategy(net.sf.jtreemap.swing.SplitStrategy)" resolve="setStrategy" />
               <node concept="2ShNRf" id="16s82eEzw3Q" role="37wK5m">
                 <node concept="YeOm9" id="16s82eEzxUJ" role="2ShVmc">
                   <node concept="1Y3b0j" id="16s82eEzxUM" role="YeSDq">
@@ -727,7 +782,7 @@
                               <ref role="3cqZAo" node="16s82eEz$jS" resolve="v" />
                             </node>
                             <node concept="liA8E" id="16s82eE_iFL" role="2OqNvi">
-                              <ref role="37wK5l" to="33ny:~Vector.sort(java.util.Comparator):void" resolve="sort" />
+                              <ref role="37wK5l" to="33ny:~Vector.sort(java.util.Comparator)" resolve="sort" />
                               <node concept="2ShNRf" id="16s82eE_iM$" role="37wK5m">
                                 <node concept="YeOm9" id="16s82eE_iM_" role="2ShVmc">
                                   <node concept="1Y3b0j" id="16s82eE_iMA" role="YeSDq">
@@ -766,7 +821,7 @@
                                                 <ref role="3cqZAo" node="16s82eE_iMH" resolve="p1" />
                                               </node>
                                               <node concept="liA8E" id="16s82eE_iMR" role="2OqNvi">
-                                                <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight():double" resolve="getWeight" />
+                                                <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight()" resolve="getWeight" />
                                               </node>
                                             </node>
                                             <node concept="2OqwBi" id="16s82eE_iMS" role="3uHU7B">
@@ -774,7 +829,7 @@
                                                 <ref role="3cqZAo" node="16s82eE_iMF" resolve="p0" />
                                               </node>
                                               <node concept="liA8E" id="16s82eE_iMU" role="2OqNvi">
-                                                <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight():double" resolve="getWeight" />
+                                                <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight()" resolve="getWeight" />
                                               </node>
                                             </node>
                                           </node>
@@ -793,7 +848,7 @@
                                                   <ref role="3cqZAo" node="16s82eE_iMF" resolve="p0" />
                                                 </node>
                                                 <node concept="liA8E" id="16s82eE_iN5" role="2OqNvi">
-                                                  <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight():double" resolve="getWeight" />
+                                                  <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight()" resolve="getWeight" />
                                                 </node>
                                               </node>
                                               <node concept="2OqwBi" id="16s82eE_iN0" role="3uHU7w">
@@ -801,7 +856,7 @@
                                                   <ref role="3cqZAo" node="16s82eE_iMH" resolve="p1" />
                                                 </node>
                                                 <node concept="liA8E" id="16s82eE_iN2" role="2OqNvi">
-                                                  <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight():double" resolve="getWeight" />
+                                                  <ref role="37wK5l" to="t49a:~TreeMapNode.getWeight()" resolve="getWeight" />
                                                 </node>
                                               </node>
                                             </node>
@@ -836,7 +891,7 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="5Dw7oA64r69" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setFont(java.awt.Font):void" resolve="setFont" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setFont(java.awt.Font)" resolve="setFont" />
               <node concept="2ShNRf" id="5Dw7oA64r6a" role="37wK5m">
                 <node concept="1pGfFk" id="5Dw7oA64r6b" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Font.&lt;init&gt;(java.lang.String,int,int)" resolve="Font" />
@@ -859,7 +914,7 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="5Dw7oA64r6C" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension):void" resolve="setPreferredSize" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
               <node concept="2ShNRf" id="5Dw7oA64r6D" role="37wK5m">
                 <node concept="1pGfFk" id="5Dw7oA64r6E" role="2ShVmc">
                   <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
@@ -880,10 +935,10 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="5Dw7oA64r6K" role="2OqNvi">
-              <ref role="37wK5l" to="t49a:~JTreeMap.setBorder(javax.swing.border.Border):void" resolve="setBorder" />
+              <ref role="37wK5l" to="t49a:~JTreeMap.setBorder(javax.swing.border.Border)" resolve="setBorder" />
               <node concept="2YIFZM" id="5Dw7oA64r6L" role="37wK5m">
                 <ref role="1Pybhc" to="dxuu:~BorderFactory" resolve="BorderFactory" />
-                <ref role="37wK5l" to="dxuu:~BorderFactory.createEtchedBorder(int):javax.swing.border.Border" resolve="createEtchedBorder" />
+                <ref role="37wK5l" to="dxuu:~BorderFactory.createEtchedBorder(int)" resolve="createEtchedBorder" />
                 <node concept="10M0yZ" id="5Dw7oA64r6M" role="37wK5m">
                   <ref role="1PxDUh" to="9z78:~EtchedBorder" resolve="EtchedBorder" />
                   <ref role="3cqZAo" to="9z78:~EtchedBorder.LOWERED" resolve="LOWERED" />
@@ -898,7 +953,7 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="4vctr_xXsra" role="2OqNvi">
-              <ref role="37wK5l" to="t49a:~JTreeMap.setToolTipBuilder(net.sf.jtreemap.swing.IToolTipBuilder):void" resolve="setToolTipBuilder" />
+              <ref role="37wK5l" to="t49a:~JTreeMap.setToolTipBuilder(net.sf.jtreemap.swing.IToolTipBuilder)" resolve="setToolTipBuilder" />
               <node concept="2ShNRf" id="4vctr_xXt7n" role="37wK5m">
                 <node concept="YeOm9" id="4vctr_xXuHe" role="2ShVmc">
                   <node concept="1Y3b0j" id="4vctr_xXuHh" role="YeSDq">
@@ -983,7 +1038,7 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="5Dw7oA66r7K" role="2OqNvi">
-              <ref role="37wK5l" to="t49a:~JTreeMap.setColorProvider(net.sf.jtreemap.swing.ColorProvider):void" resolve="setColorProvider" />
+              <ref role="37wK5l" to="t49a:~JTreeMap.setColorProvider(net.sf.jtreemap.swing.ColorProvider)" resolve="setColorProvider" />
               <node concept="37vLTw" id="5Dw7oA66r7L" role="37wK5m">
                 <ref role="3cqZAo" node="5Dw7oA66r6z" resolve="provider" />
               </node>
@@ -1027,7 +1082,7 @@
               <ref role="3cqZAo" node="1zTNC9MF6M8" resolve="filter" />
             </node>
             <node concept="liA8E" id="1zTNC9MFfgM" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
               <node concept="2ShNRf" id="7WP_sw5y2ZQ" role="37wK5m">
                 <node concept="YeOm9" id="7WP_sw5y6MO" role="2ShVmc">
                   <node concept="1Y3b0j" id="7WP_sw5y6MR" role="YeSDq">
@@ -1057,7 +1112,7 @@
                                 <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
                               </node>
                               <node concept="liA8E" id="4elAKXitpXC" role="2OqNvi">
-                                <ref role="37wK5l" to="t49a:~JTreeMap.getActiveLeaf():net.sf.jtreemap.swing.TreeMapNode" resolve="getActiveLeaf" />
+                                <ref role="37wK5l" to="t49a:~JTreeMap.getActiveLeaf()" resolve="getActiveLeaf" />
                               </node>
                             </node>
                           </node>
@@ -1099,7 +1154,7 @@
               <ref role="3cqZAo" node="4elAKXiulTY" resolve="popup" />
             </node>
             <node concept="liA8E" id="4elAKXiusIV" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem):javax.swing.JMenuItem" resolve="add" />
+              <ref role="37wK5l" to="dxuu:~JPopupMenu.add(javax.swing.JMenuItem)" resolve="add" />
               <node concept="37vLTw" id="1zTNC9MF6Mc" role="37wK5m">
                 <ref role="3cqZAo" node="1zTNC9MF6M8" resolve="filter" />
               </node>
@@ -1112,7 +1167,7 @@
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
             <node concept="liA8E" id="4elAKXiuikI" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setComponentPopupMenu(javax.swing.JPopupMenu):void" resolve="setComponentPopupMenu" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setComponentPopupMenu(javax.swing.JPopupMenu)" resolve="setComponentPopupMenu" />
               <node concept="37vLTw" id="4elAKXiulU1" role="37wK5m">
                 <ref role="3cqZAo" node="4elAKXiulTY" resolve="popup" />
               </node>
@@ -1122,7 +1177,7 @@
         <node concept="3clFbH" id="1zTNC9MFpoM" role="3cqZAp" />
         <node concept="3clFbF" id="5Dw7oA61EnI" role="3cqZAp">
           <node concept="1rXfSq" id="5Dw7oA61EnG" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component):java.awt.Component" resolve="add" />
+            <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component)" resolve="add" />
             <node concept="37vLTw" id="4elAKXisrFk" role="37wK5m">
               <ref role="3cqZAo" node="5Dw7oA61GDS" resolve="jTreeMap" />
             </node>
diff --git a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
index 6c48919e..15d1109b 100644
--- a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
+++ b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
@@ -5,6 +5,11 @@
       <sourceRoot location="models" />
     </modelRoot>
   </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
   <sourcePath />
   <languageVersions>
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
index 7fcbab9a..1a0a3b12 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
@@ -150,7 +150,7 @@
                 <node concept="2OqwBi" id="2KLGrfl1HUJ" role="Vysub">
                   <node concept="1jxXqW" id="2KLGrfl1HUK" role="2Oq$k0" />
                   <node concept="liA8E" id="2KLGrfl1HUL" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c4:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
               </node>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
index 14e678e3..177dde28 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
index 466e562b..09225feb 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
@@ -229,7 +229,7 @@
           <node concept="2OqwBi" id="1GhTetdTTi$" role="ukAjM">
             <node concept="1jxXqW" id="1GhTetdTTi_" role="2Oq$k0" />
             <node concept="liA8E" id="1GhTetdTTiA" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -307,7 +307,7 @@
           <node concept="2OqwBi" id="1GhTetdTWCr" role="ukAjM">
             <node concept="1jxXqW" id="1GhTetdTWu0" role="2Oq$k0" />
             <node concept="liA8E" id="1GhTetdTXCQ" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -385,7 +385,7 @@
                           <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                         </node>
                         <node concept="liA8E" id="4elAKXiqGTF" role="2OqNvi">
-                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                           <node concept="Xl_RD" id="4elAKXiqGTG" role="37wK5m">
                             <property role="Xl_RC" value="something_1" />
                           </node>
@@ -409,7 +409,7 @@
                       <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                     </node>
                     <node concept="liA8E" id="E3aAvrCmH2" role="2OqNvi">
-                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                       <node concept="Xl_RD" id="E3aAvrCmH3" role="37wK5m">
                         <property role="Xl_RC" value="something else_1" />
                       </node>
@@ -423,7 +423,7 @@
                       <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
                     </node>
                     <node concept="liA8E" id="E3aAvrEm4j" role="2OqNvi">
-                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                       <node concept="Xl_RD" id="E3aAvrEm4k" role="37wK5m">
                         <property role="Xl_RC" value="something else else_1" />
                       </node>
@@ -456,7 +456,7 @@
                           <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                         </node>
                         <node concept="liA8E" id="E3aAvrCrVM" role="2OqNvi">
-                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                           <node concept="Xl_RD" id="E3aAvrCrVN" role="37wK5m">
                             <property role="Xl_RC" value="something_2" />
                           </node>
@@ -480,7 +480,7 @@
                       <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                     </node>
                     <node concept="liA8E" id="4elAKXiqfBV" role="2OqNvi">
-                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                       <node concept="Xl_RD" id="4elAKXiqfBW" role="37wK5m">
                         <property role="Xl_RC" value="something else_2" />
                       </node>
@@ -494,7 +494,7 @@
                       <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
                     </node>
                     <node concept="liA8E" id="4elAKXiqfC0" role="2OqNvi">
-                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                       <node concept="Xl_RD" id="4elAKXiqfC1" role="37wK5m">
                         <property role="Xl_RC" value="something else else_2" />
                       </node>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
index 09556319..a035d0e9 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
@@ -120,7 +120,7 @@
             <node concept="2OqwBi" id="4elAKXim_cy" role="33vP2m">
               <node concept="1jxXqW" id="4elAKXim_cz" role="2Oq$k0" />
               <node concept="liA8E" id="4elAKXim_c$" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
index 398b654c..6de6533e 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
@@ -120,7 +120,7 @@
             <node concept="2OqwBi" id="5YQNmM9b6pM" role="33vP2m">
               <node concept="1jxXqW" id="5YQNmM9b6q1" role="2Oq$k0" />
               <node concept="liA8E" id="5YQNmM9b6q2" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
index 3e0e8664..e4e08ef0 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
@@ -160,7 +160,7 @@
             <node concept="2OqwBi" id="16s82eEm5Ge" role="33vP2m">
               <node concept="1jxXqW" id="16s82eEm5Gl" role="2Oq$k0" />
               <node concept="liA8E" id="16s82eEm5Gm" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
@@ -227,7 +227,7 @@
             <property role="TrG5h" value="tempDir" />
             <node concept="17QB3L" id="16s82eEmiQD" role="1tU5fm" />
             <node concept="2YIFZM" id="16s82eEmiLl" role="33vP2m">
-              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String):java.lang.String" resolve="getProperty" />
+              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
               <node concept="Xl_RD" id="16s82eEmiLm" role="37wK5m">
                 <property role="Xl_RC" value="java.io.tmpdir" />
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
index feb8874b..e511377f 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
@@ -101,7 +101,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5dW8pSK6xtS" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5dW8pSK6xGm" role="37wK5m">
                 <property role="Xl_RC" value="something" />
               </node>
@@ -115,7 +115,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5dW8pSK6yVY" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5dW8pSK6z0F" role="37wK5m">
                 <property role="Xl_RC" value="something else" />
               </node>
@@ -129,7 +129,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5dW8pSK6$2q" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5dW8pSK6$2r" role="37wK5m">
                 <property role="Xl_RC" value="yet another thing" />
               </node>
@@ -160,7 +160,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5dW8pSK6_4p" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5dW8pSK6_4q" role="37wK5m">
                 <property role="Xl_RC" value="something" />
               </node>
@@ -174,7 +174,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5dW8pSK6_4u" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5dW8pSK6_4v" role="37wK5m">
                 <property role="Xl_RC" value="something else" />
               </node>
@@ -188,7 +188,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5dW8pSK6_4z" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5dW8pSK6_4$" role="37wK5m">
                 <property role="Xl_RC" value="yet another thing" />
               </node>
@@ -221,7 +221,7 @@
                   <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                 </node>
                 <node concept="liA8E" id="E3aAvrCmGX" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                   <node concept="Xl_RD" id="E3aAvrCmGY" role="37wK5m">
                     <property role="Xl_RC" value="something_1" />
                   </node>
@@ -245,7 +245,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="E3aAvrCmH2" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="E3aAvrCmH3" role="37wK5m">
                 <property role="Xl_RC" value="something else_1" />
               </node>
@@ -259,7 +259,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="E3aAvrEm4j" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="E3aAvrEm4k" role="37wK5m">
                 <property role="Xl_RC" value="something else else_1" />
               </node>
@@ -292,7 +292,7 @@
                   <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                 </node>
                 <node concept="liA8E" id="E3aAvrCrVM" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                   <node concept="Xl_RD" id="E3aAvrCrVN" role="37wK5m">
                     <property role="Xl_RC" value="something_2" />
                   </node>
@@ -316,7 +316,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="E3aAvrCrVU" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="E3aAvrCrVV" role="37wK5m">
                 <property role="Xl_RC" value="something else_2" />
               </node>
@@ -330,7 +330,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="E3aAvrElK$" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="E3aAvrElK_" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
index 168616a4..976eb85e 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
@@ -70,7 +70,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5YQNmM9b3UZ" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5YQNmM9b3Vk" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
@@ -84,7 +84,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5YQNmM9b3V1" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5YQNmM9b3Vl" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
@@ -98,7 +98,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5YQNmM9b3V3" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5YQNmM9b3Vm" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
@@ -112,7 +112,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5YQNmM9b3V5" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5YQNmM9b3Vn" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
@@ -126,7 +126,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="5YQNmM9b3V7" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="5YQNmM9b3Vo" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
@@ -140,7 +140,7 @@
               <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
             </node>
             <node concept="liA8E" id="6n_zVnCcyxW" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="6n_zVnCcyxX" role="37wK5m">
                 <property role="Xl_RC" value="something else else_2" />
               </node>
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
index 1ca9ba82..edef65e9 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
index fc58a588..ecc6f2b0 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
@@ -2,13 +2,11 @@
 <model ref="r:e84f5a39-9160-46c1-9a42-ca7f10ff13b9(org.mpsqa.deprecated.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
diff --git a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
index b20c32bb..ff6249f9 100644
--- a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
+++ b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
index 9e3eb470..bf10c635 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
@@ -92,6 +92,9 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -223,6 +226,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm87S9" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm87Sa" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm87Sb" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="46QW9mm87Sc" role="3LXTmr">
+              <ref role="398BVh" node="1GhTetdB0oc" resolve="mpsqa.lint.home" />
+              <node concept="2Ry0Ak" id="46QW9mm87Sd" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm87Se" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint.test" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="22LTRH" id="2JVMSZMFYqK" role="1hWBAP">
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
index ae51711a..c49a3ec9 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests.msd
index bb287b31..502f0fc7 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests.msd
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps
index fbed7fe3..4c43b8b7 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps
@@ -196,12 +196,8 @@
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -1126,8 +1122,58 @@
         </node>
         <node concept="3clFbH" id="16s82eE_RK6" role="3cqZAp" />
         <node concept="3SKdUt" id="16s82eE_VfO" role="3cqZAp">
-          <node concept="3SKdUq" id="16s82eE_VfQ" role="3SKWNk">
-            <property role="3SKdUp" value="we need this in order to speed-up the sorting of nodes - original implementation uses Bubble-Sort !!!" />
+          <node concept="1PaTwC" id="46QW9mm7J2k" role="1aUNEU">
+            <node concept="3oM_SD" id="46QW9mm7J2l" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2m" role="1PaTwD">
+              <property role="3oM_SC" value="need" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2n" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2o" role="1PaTwD">
+              <property role="3oM_SC" value="in" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2p" role="1PaTwD">
+              <property role="3oM_SC" value="order" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2q" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2r" role="1PaTwD">
+              <property role="3oM_SC" value="speed-up" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2s" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2t" role="1PaTwD">
+              <property role="3oM_SC" value="sorting" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2u" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2v" role="1PaTwD">
+              <property role="3oM_SC" value="nodes" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2w" role="1PaTwD">
+              <property role="3oM_SC" value="-" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2x" role="1PaTwD">
+              <property role="3oM_SC" value="original" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2y" role="1PaTwD">
+              <property role="3oM_SC" value="implementation" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2z" role="1PaTwD">
+              <property role="3oM_SC" value="uses" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2$" role="1PaTwD">
+              <property role="3oM_SC" value="Bubble-Sort" />
+            </node>
+            <node concept="3oM_SD" id="46QW9mm7J2_" role="1PaTwD">
+              <property role="3oM_SC" value="!!!" />
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="16s82eEzoXq" role="3cqZAp">
diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps
index 66f4f281..46a0acd5 100644
--- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps
+++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps
@@ -365,6 +365,21 @@
             <ref role="3bR37D" to="hx16:2WwuhUZ0zGG" resolve="org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator" />
           </node>
         </node>
+        <node concept="3rtmxn" id="46QW9mm7Jai" role="3bR31x">
+          <node concept="3LXTmp" id="46QW9mm7Jaj" role="3rtmxm">
+            <node concept="3qWCbU" id="46QW9mm7Jak" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="46QW9mm7Jal" role="3LXTmr">
+              <node concept="2Ry0Ak" id="46QW9mm7Jam" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="46QW9mm7Jan" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps
index 08d0f9bd..ef8e1f50 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.editor.mps
@@ -253,7 +253,7 @@
         <node concept="3F0ifn" id="640xwjo$i_7" role="3EZMnx">
           <property role="3F0ifm" value="call an intention (ALT+Enter) on this current node" />
           <node concept="VechU" id="640xwjo$i_8" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="640xwjo$i$U" role="3EZMnx" />
@@ -263,25 +263,25 @@
         <node concept="3F0ifn" id="6dJ4vxiQBTa" role="3EZMnx">
           <property role="3F0ifm" value="treshold: the minimum number of instances we expect for a concept in order NOT to consider it as &quot;dead&quot;" />
           <node concept="VechU" id="6dJ4vxiQBT$" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="5PcqW5OBmee" role="3EZMnx">
           <property role="3F0ifm" value="analysis scope: which concepts should be searched" />
           <node concept="VechU" id="5PcqW5OBmef" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="5PcqW5OBbBe" role="3EZMnx">
           <property role="3F0ifm" value="search scope: where to search for instances of concepts (e.g. in a set of modules, current project, global)" />
           <node concept="VechU" id="5PcqW5OBbBf" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="6dJ4vxiQBTb" role="3EZMnx">
           <property role="3F0ifm" value="postproccessor: what to do with identified nodes (e.g. save references into model, write in a file, typesystem error)" />
           <node concept="VechU" id="6dJ4vxiQBTC" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="2iRkQZ" id="1GhTetdXFIN" role="2iSdaV" />
@@ -535,67 +535,67 @@
         <node concept="3F0ifn" id="1YSnQiVhJvJ" role="3EZMnx">
           <property role="3F0ifm" value="this analysis aims to identify the fields of concepts which are not instantiated" />
           <node concept="VechU" id="1YSnQiVhJvK" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJAT" role="3EZMnx">
           <property role="3F0ifm" value="   - properties" />
           <node concept="VechU" id="1YSnQiVhJAU" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJJ8" role="3EZMnx">
           <property role="3F0ifm" value="      - boolean properties for which all concept instances have TRUE or FALSE value" />
           <node concept="VechU" id="1YSnQiVhJJ9" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJKI" role="3EZMnx">
           <property role="3F0ifm" value="      - integer properties for which all concept instances have only one value" />
           <node concept="VechU" id="1YSnQiVhJKJ" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJMs" role="3EZMnx">
           <property role="3F0ifm" value="      - string properties for which all concept instances have only one value" />
           <node concept="VechU" id="1YSnQiVhJMt" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhKd$" role="3EZMnx">
           <property role="3F0ifm" value="      - enumeration properties for which all concept instances do not cover all possible values" />
           <node concept="VechU" id="1YSnQiVhKd_" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJDn" role="3EZMnx">
           <property role="3F0ifm" value="   - children" />
           <node concept="VechU" id="1YSnQiVhJDo" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJRZ" role="3EZMnx">
           <property role="3F0ifm" value="      - with cardinality 0..1 or 0..n for which all concept instances have no child in this role " />
           <node concept="VechU" id="1YSnQiVhJS0" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJTX" role="3EZMnx">
           <property role="3F0ifm" value="      - with cardinality 1..n or 0..n for which all concept instances have one child in this role " />
           <node concept="VechU" id="1YSnQiVhJTY" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJW3" role="3EZMnx">
           <property role="3F0ifm" value="   - references" />
           <node concept="VechU" id="1YSnQiVhJW4" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhK4H" role="3EZMnx">
           <property role="3F0ifm" value="      - with cardinality 0..1 for which all concept instances have no reference in this role " />
           <node concept="VechU" id="1YSnQiVhK4I" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJ$F" role="3EZMnx" />
@@ -605,7 +605,7 @@
         <node concept="3F0ifn" id="1YSnQiVhJzC" role="3EZMnx">
           <property role="3F0ifm" value="call an intention (ALT+Enter) on this current node" />
           <node concept="VechU" id="1YSnQiVhJzD" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJvL" role="3EZMnx" />
@@ -615,25 +615,25 @@
         <node concept="3F0ifn" id="1YSnQiVhJvN" role="3EZMnx">
           <property role="3F0ifm" value="treshold: the minimum number of instances we expect for a concept in order NOT to consider it as &quot;dead&quot;" />
           <node concept="VechU" id="1YSnQiVhJvO" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJvP" role="3EZMnx">
           <property role="3F0ifm" value="analysis scope: which concepts should be searched" />
           <node concept="VechU" id="1YSnQiVhJvQ" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJvR" role="3EZMnx">
           <property role="3F0ifm" value="search scope: where to search for instances of concepts (e.g. in a set of modules, current project, global)" />
           <node concept="VechU" id="1YSnQiVhJvS" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="3F0ifn" id="1YSnQiVhJvT" role="3EZMnx">
           <property role="3F0ifm" value="postproccessor: what to do with identified nodes (e.g. save references into model, write in a file, typesystem error)" />
           <node concept="VechU" id="1YSnQiVhJvU" role="3F10Kt">
-            <property role="Vb096" value="gray" />
+            <property role="Vb096" value="fLJRk5_/gray" />
           </node>
         </node>
         <node concept="2iRkQZ" id="1YSnQiVhJvV" role="2iSdaV" />
diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps
index 54122746..04b35c96 100644
--- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps
+++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/models/org.mpsqa.lancov.intentions.mps
@@ -2316,8 +2316,10 @@
                                       </node>
                                       <node concept="2pJxcG" id="1YSnQiVpNaw" role="2pJxcM">
                                         <ref role="2pJxcJ" to="7ouc:1YSnQiVjV0N" resolve="explanation" />
-                                        <node concept="Xl_RD" id="1YSnQiVpNaz" role="28ntcv">
-                                          <property role="Xl_RC" value="no concept instance with cardinality higher than 1 found" />
+                                        <node concept="WxPPo" id="46QW9mm7OCY" role="28ntcv">
+                                          <node concept="Xl_RD" id="1YSnQiVpNaz" role="WxPPp">
+                                            <property role="Xl_RC" value="no concept instance with cardinality higher than 1 found" />
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
diff --git a/code/languages/org.mpsqa.unused/solutions/test.org.mpsqa.lancov.fragments/test.org.mpsqa.lancov.fragments.msd b/code/languages/org.mpsqa.unused/solutions/test.org.mpsqa.lancov.fragments/test.org.mpsqa.lancov.fragments.msd
index b09e33f1..31239823 100644
--- a/code/languages/org.mpsqa.unused/solutions/test.org.mpsqa.lancov.fragments/test.org.mpsqa.lancov.fragments.msd
+++ b/code/languages/org.mpsqa.unused/solutions/test.org.mpsqa.lancov.fragments/test.org.mpsqa.lancov.fragments.msd
@@ -9,6 +9,7 @@
     <facet type="java">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <sourcePath />
   <dependencies>