From e29a0576e2d969230e901ac81431a9d8aa03c698 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 18 Jul 2018 15:12:21 +0200
Subject: [PATCH] Rename the root project and artifacts to "coderules".

---
 .travis.yml                                   |   4 +-
 build.gradle                                  |   6 +-
 build.xml                                     | 134 +++++++-------
 .../jetbrains.mps.typechecking.build.mps      |  14 +-
 samples/fitch/.mps/libraries.xml              |   2 +-
 samples/fitch/build.xml                       | 128 ++++++-------
 .../models/jetbrains.mps.fitch.build.mps      |  10 +-
 samples/lambdacalc/.mps/libraries.xml         |   2 +-
 samples/lambdacalc/build.xml                  |  68 +++----
 .../build/models/sample.lamdacalc.build.mps   |  10 +-
 samples/mpscore/.mps/libraries.xml            |   2 +-
 samples/mpscore/build.xml                     | 168 +++++++++---------
 ...ns.mps.coderules.samples.mpscore.build.mps |  10 +-
 updatePlugins.xml                             |   4 -
 14 files changed, 279 insertions(+), 283 deletions(-)
 delete mode 100755 updatePlugins.xml

diff --git a/.travis.yml b/.travis.yml
index a24c5737..a46a8308 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ deploy:
   - provider: releases
     api_key:
       secure: dOEX78/Th6n5XAbfQKT8DCQbQOqE9C4etqtH7OsI4snYAUkZdxHmdmuFWoMqwnU9nbR+17+2f9XPpE9BfslnxMP21lvn6AP5jScFgeZzV1KJ7kPg1H8buxLvGiQLq1vjNBrmT/Fg5S7tZFWSljEVKRQczpbijdtiTTzdRu/dGCPrLJiijS1uSJet6AwJ4qd+HIXsrVlPny5XL36SCiF88HiYO1vMQFo3pOPCrELfSLHHmLohcdcLy21BTMsbaZwrFzgb4xnmoFRRMiqVOi0z/zOTCNz6AWwfZ+RrAS2YmBSMeIL0R0K22P1WStg1NiYYaapoMf1AESW0VdKm6bSxD2SgxdG7V0hGbOFpzd5uZ22PxtishIfWerwvHCOey2JgH/xl4oGmLqwxmaWJMIrsWI5ObSePFbukKH6kkdGCrZq83cnJonYNb8KckBN997iQI12AKahUDnHg+Se62KANqogcWpWCztCAzgyqOb0swYBQ53vUzwciwul2yzr8Hrm5N32OY9UcK5Hx9pRtSr3c9ykJybdPnzUcCJGdxvNdDek21fx41q+1Qr2EgeJon8BmBpyLwfngIL3DRFEcfxQzramV6kVRI1T67Pk6xD+mVrYDGFbGAGkElEvdrlnOFzWv0Pza8cIv9i13B4sNdQOYtyEwaT0UvzklMVHw8ifYT0M=
-    file: build/artifacts/typechecking-plugin//typechecking-0.5.zip
+    file: build/artifacts/coderules/coderules-0.5.zip
     skip_cleanup: true
     on:
       branch: master
@@ -19,4 +19,4 @@ deploy:
       branch: master
       tags: true
     target_branch: updates
-    local_dir: build/artifacts/typechecking-plugin/updates
+    local_dir: build/artifacts/coderules/updates
diff --git a/build.gradle b/build.gradle
index ab9c13c4..ee0750ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,16 +84,16 @@ task generateUpdatePluginsXml {
     tagMatcher().find()
   }
   doLast {
-    def updatesDir = project.projectDir.absolutePath + "/build/artifacts/typechecking-plugin/updates"
+    def updatesDir = project.projectDir.absolutePath + "/build/artifacts/coderules/updates"
     mkdir(updatesDir)
 
     def baseUrl = "https://github.com/fisakov/constraints-typechecking/releases/download"
-    def zip = "/typechecking-0.5.zip"
+    def zip = "/coderules-0.5.zip"
 
     file(updatesDir + "/updatePlugins.xml").withWriter { w ->
        new MarkupBuilder(new IndentPrinter(w, "    ", true)).
          plugins {
-           plugin( id: "jetbrains.mps.typechecking" ,
+           plugin( id: "jetbrains.mps.coderules" ,
                    url: baseUrl + "/$System.env.TRAVIS_TAG" + zip ,
                    version: "${tagMatcher()[0][1]}-b${tagMatcher()[0][2]}" )
          { }
diff --git a/build.xml b/build.xml
index d1ea6fa6..32c4464c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,8 @@
-<project name="typechecking-plugin" default="build">
+<project name="coderules" default="build">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
-  <property name="build.tmp" location="${build.dir}/tmp/typechecking-plugin" />
-  <property name="build.layout" location="${build.dir}/artifacts/typechecking-plugin" />
+  <property name="build.tmp" location="${build.dir}/tmp/coderules" />
+  <property name="build.layout" location="${build.dir}/artifacts/coderules" />
   <property name="ci.build.num" value="9999" />
   <property name="mps.macro.coderules_home" location="${basedir}" />
   <property name="mps_home" location="${basedir}/MPS_HOME" />
@@ -1330,14 +1330,14 @@
     <copy todir="${build.layout}/deploy/lib">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib" />
     </copy>
-    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip" />
-    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip/typechecking" />
-    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip/typechecking/META-INF" />
-    <echoxml file="${build.tmp}/default/typechecking-0.5.zip/typechecking/META-INF/plugin.xml">
+    <mkdir dir="${build.tmp}/default/coderules-0.5.zip" />
+    <mkdir dir="${build.tmp}/default/coderules-0.5.zip/coderules" />
+    <mkdir dir="${build.tmp}/default/coderules-0.5.zip/coderules/META-INF" />
+    <echoxml file="${build.tmp}/default/coderules-0.5.zip/coderules/META-INF/plugin.xml">
       <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-        <id>jetbrains.mps.typechecking</id>
-        <name>Typechecking with Constraint Rules</name>
-        <description>Experimental support for type checking with constraint rules</description>
+        <id>jetbrains.mps.coderules</id>
+        <name>Code Rules</name>
+        <description>Code rules and constraint handling (experimental)</description>
         <version>0.5-b${ci.build.num}</version>
         <vendor url="jetbrains.com/mps">JetBrains s.r.o.</vendor>
         
@@ -1346,7 +1346,7 @@
         </extensions>
       </idea-plugin>
     </echoxml>
-    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages" />
+    <mkdir dir="${build.tmp}/default/coderules-0.5.zip/coderules/languages" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.build.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.build.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.build.jar1/META-INF/module.xml">
@@ -1358,7 +1358,7 @@
         <sources jar="jetbrains.mps.typechecking.build-src.jar" descriptor="jetbrains.mps.typechecking.build.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.build.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.build.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.build" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.build.jar1" />
@@ -1366,7 +1366,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.build-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.build/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.build-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.build-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.build/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1399,7 +1399,7 @@
         <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.dataform.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.dataform.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.dataform.jar1" />
@@ -1427,7 +1427,7 @@
         <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar1" />
     </jar>
@@ -1437,7 +1437,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.dataform-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.dataform-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1484,7 +1484,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.logic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1512,7 +1512,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar1" />
     </jar>
@@ -1522,7 +1522,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.logic-languageModels1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1556,11 +1556,11 @@
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1" />
     </jar>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" prefix="module" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar1" />
@@ -1585,7 +1585,7 @@
         <sources jar="jetbrains.mps.logic.runtime-src.jar" descriptor="jetbrains.mps.logic.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.logic/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1594,7 +1594,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.logic-runtime-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1635,7 +1635,7 @@
         <sources jar="jetbrains.mps.lang.coderules-src.jar" descriptor="jetbrains.mps.lang.coderules.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.coderules" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1666,7 +1666,7 @@
         <sources jar="jetbrains.mps.lang.coderules-src.jar" descriptor="jetbrains.mps.lang.coderules.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderules-generator.jar1" />
     </jar>
@@ -1676,7 +1676,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-languageModels1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1717,7 +1717,7 @@
         <sources jar="jetbrains.mps.lang.coderules.runtime-src.jar" descriptor="jetbrains.mps.lang.coderules.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1726,7 +1726,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-runtime-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1759,7 +1759,7 @@
         <sources jar="jetbrains.mps.lang.coderules.template-src.jar" descriptor="jetbrains.mps.lang.coderules.template.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1768,7 +1768,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1806,7 +1806,7 @@
         <sources jar="jetbrains.mps.coderules-src.jar" descriptor="jetbrains.mps.coderules.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar1" />
@@ -1814,7 +1814,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1849,7 +1849,7 @@
         <sources jar="jetbrains.mps.coderules.ui-src.jar" descriptor="jetbrains.mps.coderules.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules.ui.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ui.jar1" />
@@ -1857,7 +1857,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ui-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1892,7 +1892,7 @@
         <sources jar="jetbrains.mps.lang.typechecking-src.jar" descriptor="jetbrains.mps.lang.typechecking.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.jar1" />
@@ -1921,7 +1921,7 @@
         <sources jar="jetbrains.mps.lang.typechecking-src.jar" descriptor="jetbrains.mps.lang.typechecking.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking-generator.jar1" />
     </jar>
@@ -1931,7 +1931,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.typechecking-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1968,7 +1968,7 @@
         <sources jar="jetbrains.mps.lang.typechecking.runtime-src.jar" descriptor="jetbrains.mps.lang.typechecking.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.runtime.jar1" />
@@ -1976,7 +1976,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.typechecking.runtime-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2011,7 +2011,7 @@
         <sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -2020,7 +2020,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2050,7 +2050,7 @@
         <sources jar="jetbrains.mps.typechecking.reporting-src.jar" descriptor="jetbrains.mps.typechecking.reporting.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.reporting.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.reporting.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar1" />
@@ -2058,7 +2058,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.reporting-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.reporting-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.reporting-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2093,7 +2093,7 @@
         <sources jar="jetbrains.mps.typechecking.ui-src.jar" descriptor="jetbrains.mps.typechecking.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.ui.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -2102,7 +2102,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.ui-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.typechecking.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2137,7 +2137,7 @@
         <sources jar="jetbrains.mps.lang.typechecking-src.jar" descriptor="jetbrains.mps.lang.typechecking.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.jar2" />
@@ -2166,7 +2166,7 @@
         <sources jar="jetbrains.mps.lang.typechecking-src.jar" descriptor="jetbrains.mps.lang.typechecking.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking-generator.jar2" />
     </jar>
@@ -2176,7 +2176,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.typechecking-models2">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2213,7 +2213,7 @@
         <sources jar="jetbrains.mps.lang.typechecking.runtime-src.jar" descriptor="jetbrains.mps.lang.typechecking.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.runtime.jar2" />
@@ -2221,7 +2221,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.typechecking.runtime-models2">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.typechecking.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2257,7 +2257,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.smodel.types" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -2285,7 +2285,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar1" />
     </jar>
@@ -2295,7 +2295,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.smodel.types-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2332,7 +2332,7 @@
         <sources jar="jetbrains.mps.controlflow-src.jar" descriptor="jetbrains.mps.controlflow.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.jar1" />
@@ -2340,7 +2340,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.controlflow-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.controlflow-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2374,7 +2374,7 @@
         <sources jar="jetbrains.mps.controlflow.ui-src.jar" descriptor="jetbrains.mps.controlflow.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar1" />
@@ -2382,7 +2382,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.controlflow.ui-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.controlflow.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2417,7 +2417,7 @@
         <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar1" />
@@ -2446,7 +2446,7 @@
         <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar1" />
     </jar>
@@ -2456,7 +2456,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.controlflow-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2493,7 +2493,7 @@
         <sources jar="jetbrains.mps.lang.controlflow.runtime-src.jar" descriptor="jetbrains.mps.lang.controlflow.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar1" />
@@ -2501,7 +2501,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.controlflow.runtime-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2511,12 +2511,12 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.controlflow.runtime-models1" prefix="module/models" />
     </jar>
-    <zip destfile="${build.layout}/typechecking-0.5.zip">
-      <zipfileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/lib" prefix="typechecking/lib" />
-      <zipfileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules/lib" prefix="typechecking/lib" />
-      <fileset dir="${build.tmp}/default/typechecking-0.5.zip" />
+    <zip destfile="${build.layout}/coderules-0.5.zip">
+      <zipfileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/lib" prefix="coderules/lib" />
+      <zipfileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules/lib" prefix="coderules/lib" />
+      <fileset dir="${build.tmp}/default/coderules-0.5.zip" />
     </zip>
-    <echo file="${build.layout}/build.properties">typechecking-plugin.ci.build.num=${ci.build.num}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
+    <echo file="${build.layout}/build.properties">coderules.ci.build.num=${ci.build.num}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
   </target>
   
   <target name="buildDependents" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index f7ce7302..5fe52f22 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -167,7 +167,7 @@
   </registry>
   <node concept="1l3spW" id="1BDNG5xBZgg">
     <property role="2DA0ip" value="../../../" />
-    <property role="TrG5h" value="typechecking-plugin" />
+    <property role="TrG5h" value="coderules" />
     <node concept="22LTRH" id="7Ant4WkHLti" role="1hWBAP">
       <property role="TrG5h" value="testconfig" />
       <node concept="22LTRF" id="46o4wsHrLsQ" role="22LTRK">
@@ -183,15 +183,15 @@
       </node>
     </node>
     <node concept="m$_wf" id="7BVjoXzUx67" role="3989C9">
-      <property role="m$_wk" value="jetbrains.mps.typechecking" />
+      <property role="m$_wk" value="jetbrains.mps.coderules" />
       <node concept="3_J27D" id="7BVjoXzUx68" role="m$_yQ">
         <node concept="3Mxwew" id="7BVjoXzUx6h" role="3MwsjC">
-          <property role="3MwjfP" value="Typechecking with Constraint Rules" />
+          <property role="3MwjfP" value="Code Rules" />
         </node>
       </node>
       <node concept="3_J27D" id="7BVjoXzUx69" role="m_cZH">
         <node concept="3Mxwew" id="7BVjoXzUx6j" role="3MwsjC">
-          <property role="3MwjfP" value="typechecking" />
+          <property role="3MwjfP" value="coderules" />
         </node>
       </node>
       <node concept="3_J27D" id="7BVjoXzUx6a" role="m$_w8">
@@ -204,7 +204,7 @@
       </node>
       <node concept="3_J27D" id="3AC_dXTSEnT" role="3s6cr7">
         <node concept="3Mxwew" id="3AC_dXTSEnV" role="3MwsjC">
-          <property role="3MwjfP" value="Experimental support for type checking with constraint rules" />
+          <property role="3MwjfP" value="Code rules and constraint handling (experimental)" />
         </node>
       </node>
       <node concept="2iUeEo" id="3AC_dXTSEsp" role="2iVFfd">
@@ -2348,11 +2348,11 @@
       <node concept="3981dG" id="65DJywFjdtY" role="39821P">
         <node concept="3_J27D" id="65DJywFjdtZ" role="Nbhlr">
           <node concept="3Mxwew" id="65DJywFjdwr" role="3MwsjC">
-            <property role="3MwjfP" value="typechecking-0.5.zip" />
+            <property role="3MwjfP" value="coderules-0.5.zip" />
           </node>
         </node>
         <node concept="m$_wl" id="65DJywFjdwt" role="39821P">
-          <ref role="m_rDy" node="7BVjoXzUx67" resolve="jetbrains.mps.typechecking" />
+          <ref role="m_rDy" node="7BVjoXzUx67" resolve="jetbrains.mps.coderules" />
           <node concept="398223" id="65DJywFkEum" role="39821P">
             <node concept="3_J27D" id="65DJywFkEuo" role="Nbhlr">
               <node concept="3Mxwew" id="65DJywFkExe" role="3MwsjC">
diff --git a/samples/fitch/.mps/libraries.xml b/samples/fitch/.mps/libraries.xml
index f8cd8b60..942100be 100644
--- a/samples/fitch/.mps/libraries.xml
+++ b/samples/fitch/.mps/libraries.xml
@@ -7,7 +7,7 @@
           <value>
             <Library>
               <option name="name" value="coderules" />
-              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/typechecking-plugin/deploy" />
+              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/coderules/deploy" />
             </Library>
           </value>
         </entry>
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index d6c53a4f..f3282882 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -3,12 +3,12 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/fitch" />
   <property name="build.layout" location="${build.dir}/artifacts/fitch" />
-  <property name="coderules_deploy" location="${basedir}/../../build/artifacts/typechecking-plugin" />
+  <property name="coderules_art" location="${basedir}/../../build/artifacts/coderules" />
   <property name="mps_home" location="${basedir}/../../MPS_HOME" />
   <property name="artifacts.mps" location="${mps_home}" />
-  <property name="artifacts.typechecking-plugin" location="${coderules_deploy}" />
+  <property name="artifacts.coderules" location="${coderules_art}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
-  <property file="${artifacts.typechecking-plugin}/build.properties" prefix="import.typechecking-plugin" />
+  <property file="${artifacts.coderules}/build.properties" prefix="import.coderules" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
   <property name="mps.date" value="${import.mps.mps.date}" />
   <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
@@ -16,7 +16,7 @@
   <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
   <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
-  <property name="typechecking-plugin.ci.build.num" value="${import.typechecking-plugin.typechecking-plugin.ci.build.num}" />
+  <property name="coderules.ci.build.num" value="${import.coderules.coderules.ci.build.num}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
@@ -29,7 +29,7 @@
   
   <target name="assemble" depends="declare-mps-tasks, classes">
     <mkdir dir="${build.layout}" />
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}typechecking-plugin.ci.build.num=${typechecking-plugin.ci.build.num}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}</echo>
   </target>
   
   <target name="buildDependents" />
@@ -46,6 +46,18 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -124,18 +136,6 @@
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.migration.util.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <chunk>
         <module file="${basedir}/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl" />
@@ -148,7 +148,7 @@
       <jvmargs>
         <arg value="-Xmx512m" />
       </jvmargs>
-      <macro name="coderules_deploy" path="${coderules_deploy}" />
+      <macro name="coderules_art" path="${coderules_art}" />
       <macro name="mps_home" path="${mps_home}" />
     </generate>
   </target>
@@ -202,25 +202,25 @@
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
@@ -300,19 +300,19 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
@@ -394,19 +394,19 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
@@ -486,18 +486,18 @@
         <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps b/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
index 28942f6a..c4bd776e 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
+++ b/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
@@ -266,7 +266,7 @@
     <node concept="3b7kt6" id="4$bYnYI$RBZ" role="10PD9s" />
     <node concept="10PD9b" id="4$bYnYI$RC4" role="10PD9s" />
     <node concept="398rNT" id="4$bYnYI$RCy" role="1l3spd">
-      <property role="TrG5h" value="coderules_deploy" />
+      <property role="TrG5h" value="coderules_art" />
       <node concept="55IIr" id="4$bYnYI$RCE" role="398pKh">
         <node concept="2Ry0Ak" id="4$bYnYI$RCJ" role="iGT6I">
           <property role="2Ry0Am" value=".." />
@@ -276,8 +276,8 @@
               <property role="2Ry0Am" value="build" />
               <node concept="2Ry0Ak" id="4$bYnYI$RD1" role="2Ry0An">
                 <property role="2Ry0Am" value="artifacts" />
-                <node concept="2Ry0Ak" id="4$bYnYI$RD6" role="2Ry0An">
-                  <property role="2Ry0Am" value="typechecking-plugin" />
+                <node concept="2Ry0Ak" id="5CiHmuT4_6V" role="2Ry0An">
+                  <property role="2Ry0Am" value="coderules" />
                 </node>
               </node>
             </node>
@@ -306,9 +306,9 @@
       </node>
     </node>
     <node concept="2sgV4H" id="4$bYnYI$URi" role="1l3spa">
-      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="typechecking-plugin" />
+      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="coderules" />
       <node concept="398BVA" id="4$bYnYI$URn" role="2JcizS">
-        <ref role="398BVh" node="4$bYnYI$RCy" resolve="coderules_deploy" />
+        <ref role="398BVh" node="4$bYnYI$RCy" resolve="coderules_art" />
       </node>
     </node>
   </node>
diff --git a/samples/lambdacalc/.mps/libraries.xml b/samples/lambdacalc/.mps/libraries.xml
index f8cd8b60..942100be 100644
--- a/samples/lambdacalc/.mps/libraries.xml
+++ b/samples/lambdacalc/.mps/libraries.xml
@@ -7,7 +7,7 @@
           <value>
             <Library>
               <option name="name" value="coderules" />
-              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/typechecking-plugin/deploy" />
+              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/coderules/deploy" />
             </Library>
           </value>
         </entry>
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 6e258f3d..e8bb3aa0 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -3,12 +3,12 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/lambdacalc" />
   <property name="build.layout" location="${build.dir}/artifacts/lambdacalc" />
-  <property name="coderules_deploy" location="${basedir}/../../build/artifacts/typechecking-plugin" />
+  <property name="coderules_art" location="${basedir}/../../build/artifacts/coderules" />
   <property name="mps_home" location="${basedir}/../../MPS_HOME" />
   <property name="artifacts.mps" location="${mps_home}" />
-  <property name="artifacts.typechecking-plugin" location="${coderules_deploy}" />
+  <property name="artifacts.coderules" location="${coderules_art}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
-  <property file="${artifacts.typechecking-plugin}/build.properties" prefix="import.typechecking-plugin" />
+  <property file="${artifacts.coderules}/build.properties" prefix="import.coderules" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
   <property name="mps.date" value="${import.mps.mps.date}" />
   <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
@@ -16,7 +16,7 @@
   <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
   <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
-  <property name="typechecking-plugin.ci.build.num" value="${import.typechecking-plugin.typechecking-plugin.ci.build.num}" />
+  <property name="coderules.ci.build.num" value="${import.coderules.coderules.ci.build.num}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
@@ -29,7 +29,7 @@
   
   <target name="assemble" depends="classes, declare-mps-tasks">
     <mkdir dir="${build.layout}" />
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}typechecking-plugin.ci.build.num=${typechecking-plugin.ci.build.num}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}</echo>
   </target>
   
   <target name="buildDependents" />
@@ -56,6 +56,18 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -124,18 +136,6 @@
       <library file="${artifacts.mps}/lib/mps-openapi.jar" />
       <library file="${artifacts.mps}/lib/mps-platform.jar" />
       <library file="${artifacts.mps}/lib/mps-tuples.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <chunk bootstrap="true">
         <module file="${basedir}/languages/sample.lambdacalc/sample.lambdacalc.mpl" bootstrap="true" />
       </chunk>
@@ -145,7 +145,7 @@
       <jvmargs>
         <arg value="-Xmx512m" />
       </jvmargs>
-      <macro name="coderules_deploy" path="${coderules_deploy}" />
+      <macro name="coderules_art" path="${coderules_art}" />
       <macro name="mps_home" path="${mps_home}" />
     </generate>
   </target>
@@ -189,24 +189,24 @@
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
diff --git a/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps b/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
index ba01d96d..8dd2693f 100644
--- a/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
@@ -175,9 +175,9 @@
       </node>
     </node>
     <node concept="2sgV4H" id="7E7FS_VaV_t" role="1l3spa">
-      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="typechecking-plugin" />
+      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="coderules" />
       <node concept="398BVA" id="7E7FS_VaV_y" role="2JcizS">
-        <ref role="398BVh" node="7E7FS_VaSma" resolve="coderules_deploy" />
+        <ref role="398BVh" node="7E7FS_VaSma" resolve="coderules_art" />
       </node>
     </node>
     <node concept="55IIr" id="7E7FS_VaSlT" role="auvoZ" />
@@ -185,7 +185,7 @@
     <node concept="10PD9b" id="7E7FS_VaSlV" role="10PD9s" />
     <node concept="3b7kt6" id="7E7FS_VaSm0" role="10PD9s" />
     <node concept="398rNT" id="7E7FS_VaSma" role="1l3spd">
-      <property role="TrG5h" value="coderules_deploy" />
+      <property role="TrG5h" value="coderules_art" />
       <node concept="55IIr" id="7E7FS_VaSmc" role="398pKh">
         <node concept="2Ry0Ak" id="7E7FS_VaSn8" role="iGT6I">
           <property role="2Ry0Am" value=".." />
@@ -195,8 +195,8 @@
               <property role="2Ry0Am" value="build" />
               <node concept="2Ry0Ak" id="7E7FS_VaVA4" role="2Ry0An">
                 <property role="2Ry0Am" value="artifacts" />
-                <node concept="2Ry0Ak" id="7E7FS_VaVA9" role="2Ry0An">
-                  <property role="2Ry0Am" value="typechecking-plugin" />
+                <node concept="2Ry0Ak" id="5CiHmuT4DQ6" role="2Ry0An">
+                  <property role="2Ry0Am" value="coderules" />
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/.mps/libraries.xml b/samples/mpscore/.mps/libraries.xml
index f8cd8b60..942100be 100644
--- a/samples/mpscore/.mps/libraries.xml
+++ b/samples/mpscore/.mps/libraries.xml
@@ -7,7 +7,7 @@
           <value>
             <Library>
               <option name="name" value="coderules" />
-              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/typechecking-plugin/deploy" />
+              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/coderules/deploy" />
             </Library>
           </value>
         </entry>
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 6e93fa1b..ac9b87a3 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -5,11 +5,11 @@
   <property name="build.layout" location="${build.dir}/artifacts/mpscore" />
   <property name="mps_home" location="${basedir}/../../MPS_HOME" />
   <property name="mps.macro.mpscore_home" location="${basedir}" />
-  <property name="coderules_plugin" location="${basedir}/../../build/artifacts/typechecking-plugin" />
+  <property name="coderules_art" location="${basedir}/../../build/artifacts/coderules" />
   <property name="artifacts.mps" location="${mps_home}" />
-  <property name="artifacts.typechecking-plugin" location="${coderules_plugin}" />
+  <property name="artifacts.coderules" location="${coderules_art}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
-  <property file="${artifacts.typechecking-plugin}/build.properties" prefix="import.typechecking-plugin" />
+  <property file="${artifacts.coderules}/build.properties" prefix="import.coderules" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
   <property name="mps.date" value="${import.mps.mps.date}" />
   <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
@@ -17,7 +17,7 @@
   <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
   <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
   <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
-  <property name="typechecking-plugin.ci.build.num" value="${import.typechecking-plugin.typechecking-plugin.ci.build.num}" />
+  <property name="coderules.ci.build.num" value="${import.coderules.coderules.ci.build.num}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
@@ -191,7 +191,7 @@
       <zipfileset file="${basedir}/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.typechecking.sample.test-models" prefix="module/models" />
     </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}typechecking-plugin.ci.build.num=${typechecking-plugin.ci.build.num}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}</echo>
   </target>
   
   <target name="buildDependents" />
@@ -218,6 +218,23 @@
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.controlflow.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.controlflow.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.test.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -296,23 +313,6 @@
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.controlflow.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.test.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <chunk>
         <module file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
         <module file="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
@@ -326,7 +326,7 @@
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
       <macro name="mps.macro.mpscore_home" path="${mps.macro.mpscore_home}" />
-      <macro name="coderules_plugin" path="${coderules_plugin}" />
+      <macro name="coderules_art" path="${coderules_art}" />
     </generate>
   </target>
   
@@ -372,27 +372,27 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.controlflow.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.controlflow.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
@@ -444,16 +444,16 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.test.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="mockito-core-2.0.3-beta.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="objenesis-2.1.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.test.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="mockito-core-2.0.3-beta.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="objenesis-2.1.jar" />
       </classpath>
     </javac>
   </target>
@@ -511,34 +511,51 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
-        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
       </classpath>
     </javac>
   </target>
   
   <target name="test.testconfig" depends="assemble">
     <path id="mps.libraries.path">
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.controlflow.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.dataform.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.controlflow.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.test.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.jar" />
+      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.reporting.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -613,23 +630,6 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.controlflow.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.test.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
-      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
diff --git a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps b/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
index bb520723..7a901db8 100644
--- a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
@@ -130,7 +130,7 @@
       <node concept="55IIr" id="46o4wsH3mGg" role="398pKh" />
     </node>
     <node concept="398rNT" id="5VQ8Sex_oaS" role="1l3spd">
-      <property role="TrG5h" value="coderules_plugin" />
+      <property role="TrG5h" value="coderules_art" />
       <node concept="55IIr" id="5VQ8Sex_odz" role="398pKh">
         <node concept="2Ry0Ak" id="5VQ8Sex_odA" role="iGT6I">
           <property role="2Ry0Am" value=".." />
@@ -140,8 +140,8 @@
               <property role="2Ry0Am" value="build" />
               <node concept="2Ry0Ak" id="5VQ8Sex_og3" role="2Ry0An">
                 <property role="2Ry0Am" value="artifacts" />
-                <node concept="2Ry0Ak" id="5VQ8Sex_ohC" role="2Ry0An">
-                  <property role="2Ry0Am" value="typechecking-plugin" />
+                <node concept="2Ry0Ak" id="5CiHmuT4vvj" role="2Ry0An">
+                  <property role="2Ry0Am" value="coderules" />
                 </node>
               </node>
             </node>
@@ -181,9 +181,9 @@
       </node>
     </node>
     <node concept="2sgV4H" id="69UmpDmJQIZ" role="1l3spa">
-      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="typechecking-plugin" />
+      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="coderules" />
       <node concept="398BVA" id="5VQ8Sex_oug" role="2JcizS">
-        <ref role="398BVh" node="5VQ8Sex_oaS" resolve="coderules_plugin" />
+        <ref role="398BVh" node="5VQ8Sex_oaS" resolve="coderules_art" />
       </node>
     </node>
     <node concept="2G$12M" id="69UmpDmJW20" role="3989C9">
diff --git a/updatePlugins.xml b/updatePlugins.xml
deleted file mode 100755
index 3d782ad7..00000000
--- a/updatePlugins.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<plugins>
-    <plugin id="jetbrains.mps.typechecking" url="https://github.com/fisakov/constraints-typechecking/releases/download/v0.2-snapshot.17/typechecking-0.2.zip" version="0.2-b17" >
-    </plugin>
-</plugins>