diff --git a/.mps/modules.xml b/.mps/modules.xml
index 0db045f4..eb6f98e9 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -10,8 +10,8 @@
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="typechecking.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking.annotation" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="typechecking.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" folder="typechecking.sample" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="typechecking.sample" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="typechecking.sample" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.plugin" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
diff --git a/build.xml b/build.xml
index b4ea1cb4..f8dfc9a5 100644
--- a/build.xml
+++ b/build.xml
@@ -611,42 +611,42 @@
       <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.baseLanguageExt.test-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.sample" type="solution" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82">
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.sample" type="solution" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
         </dependencies>
         <classpath>
           <entry path="." />
         </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.sample-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sample.msd" />
+        <sources jar="jetbrains.mps.typechecking.sample-src.jar" descriptor="jetbrains.mps.typechecking.sample.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.jar" />
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
+      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.sample" includes="icons/**, resources/**" />
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sample-models">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.sample-models">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen">
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sample-models" prefix="module/models" />
+      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.sample-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.test.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.test.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.test.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.sample.test" type="solution" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455">
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.sample.test" type="solution" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
@@ -665,27 +665,27 @@
         <classpath>
           <entry path="." />
         </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.sample.test-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sample.test.msd" />
+        <sources jar="jetbrains.mps.typechecking.sample.test-src.jar" descriptor="jetbrains.mps.typechecking.sample.test.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.test.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample.test" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sample.test.jar" />
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.test.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
+      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.sample.test" includes="icons/**, resources/**" />
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sample.test-models">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.sample.test-models">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.test-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen">
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.test-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sample.test-models" prefix="module/models" />
+      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.sample.test-models" prefix="module/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar/META-INF" />
@@ -1343,7 +1343,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.lang.typesystem2.sample.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
   
   <target name="processResources" />
   
@@ -1458,8 +1458,8 @@
       </chunk>
       <chunk>
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" />
-        <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" />
-        <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" />
+        <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" />
+        <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" />
       </chunk>
       <jvmargs>
         <arg value="-Xmx512m" />
@@ -2324,13 +2324,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sample">
-    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.jetbrains.mps.typechecking.sample">
+    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" />
+        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/source_gen" />
       </src>
       <classpath />
     </javac>
@@ -2409,17 +2409,16 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sample.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sample, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, fetchDependencies">
-    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample.test" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen" />
-        <pathelement path="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/test_gen/" />
+        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
+        <pathelement path="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/test_gen/" />
       </src>
       <classpath>
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
@@ -2439,6 +2438,7 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
@@ -2547,12 +2547,12 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.helper.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.runtime.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleplugin.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.template.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" />
+      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
@@ -2563,8 +2563,8 @@
     <path id="mps.tests.path">
       <pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.test.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.test.jar" />
+      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.test.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
     <path id="long.class.path">
@@ -2636,11 +2636,11 @@
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen" />
+    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/source_gen" />
+    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/test_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/test_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/test_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/test_gen" />
+    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/test_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 07454663..d22357a8 100644
--- a/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -1253,7 +1253,7 @@
       </node>
       <node concept="1E1JtA" id="46o4wsH5O3R" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.typesystem2.sample" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.sample" />
         <property role="3LESm3" value="3ddddf69-9ff0-426b-9365-51ae7356fb82" />
         <property role="2GAjPV" value="false" />
         <property role="aoJFB" value="sources" />
@@ -1263,9 +1263,9 @@
             <node concept="2Ry0Ak" id="46o4wsH5OqI" role="2Ry0An">
               <property role="2Ry0Am" value="solutions" />
               <node concept="2Ry0Ak" id="46o4wsH5Ozv" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.sample" />
-                <node concept="2Ry0Ak" id="46o4wsH5OGg" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.sample.msd" />
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample" />
+                <node concept="2Ry0Ak" id="6HVcbo5ENxy" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.msd" />
                 </node>
               </node>
             </node>
@@ -1346,7 +1346,7 @@
       </node>
       <node concept="1E1JtA" id="46o4wsH5Nat" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.typesystem2.sample.test" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.sample.test" />
         <property role="3LESm3" value="1b65dfe8-24ff-41c3-9a3e-70f102942455" />
         <property role="2GAjPV" value="false" />
         <property role="aoJFB" value="sources and tests" />
@@ -1356,9 +1356,9 @@
             <node concept="2Ry0Ak" id="46o4wsH5Ns8" role="2Ry0An">
               <property role="2Ry0Am" value="solutions" />
               <node concept="2Ry0Ak" id="46o4wsH5N$_" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.sample.test" />
-                <node concept="2Ry0Ak" id="46o4wsH5NH2" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.sample.test.msd" />
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test" />
+                <node concept="2Ry0Ak" id="6HVcbo5ENDO" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test.msd" />
                 </node>
               </node>
             </node>
@@ -1373,7 +1373,7 @@
         <node concept="1SiIV0" id="46o4wsH5OPm" role="3bR37C">
           <node concept="3bR9La" id="46o4wsH5OPn" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="46o4wsH5O3R" resolve="jetbrains.mps.lang.typesystem2.sample" />
+            <ref role="3bR37D" node="46o4wsH5O3R" resolve="jetbrains.mps.typechecking.sample" />
           </node>
         </node>
         <node concept="1SiIV0" id="46o4wsH5OPq" role="3bR37C">
@@ -1447,10 +1447,10 @@
           <ref role="L2wRA" node="46o4wsHqZu7" resolve="jetbrains.mps.baseLanguageExt.test" />
         </node>
         <node concept="L2wRC" id="46o4wsHr0Fr" role="39821P">
-          <ref role="L2wRA" node="46o4wsH5O3R" resolve="jetbrains.mps.lang.typesystem2.sample" />
+          <ref role="L2wRA" node="46o4wsH5O3R" resolve="jetbrains.mps.typechecking.sample" />
         </node>
         <node concept="L2wRC" id="46o4wsHr0QF" role="39821P">
-          <ref role="L2wRA" node="46o4wsH5Nat" resolve="jetbrains.mps.lang.typesystem2.sample.test" />
+          <ref role="L2wRA" node="46o4wsH5Nat" resolve="jetbrains.mps.typechecking.sample.test" />
         </node>
         <node concept="L2wRC" id="46o4wsHrP6K" role="39821P">
           <ref role="L2wRA" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
similarity index 93%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
index 9509c0c6..f0804041 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.lang.typesystem2.sample.test" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="jetbrains.mps.typechecking.sample.test" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,7 @@
   </models>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.lang.typesystem2.sample)</dependency>
+    <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
   </dependencies>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
similarity index 98%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
index 207ad83c..d9c681c3 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a202971f-09c7-4f25-ad39-9e8d7cea42b6(jetbrains.mps.lang.typesystem2.sample.bounds.bad@tests)">
+<model ref="r:a202971f-09c7-4f25-ad39-9e8d7cea42b6(jetbrains.mps.typechecking.sample.bounds.bad@tests)">
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
@@ -8,7 +8,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
   </languages>
   <imports>
-    <import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.lang.typesystem2.sample.bounds.bad)" />
+    <import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
   </imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
index 7f4fd518..8814f70c 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:8ad218aa-30cf-43e1-943f-6aaa337bc0f1(jetbrains.mps.lang.typesystem2.sample.bounds@tests)">
+<model ref="r:8ad218aa-30cf-43e1-943f-6aaa337bc0f1(jetbrains.mps.typechecking.sample.bounds@tests)">
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
@@ -11,7 +11,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
   </languages>
   <imports>
-    <import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.lang.typesystem2.sample.bounds)" />
+    <import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
   </imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
similarity index 98%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
index f50de3fd..3c6f021b 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:74d091dd-b4c4-4c22-9b9e-48f0c0d02732(jetbrains.mps.lang.typesystem2.sample.codeAnal@tests)">
+<model ref="r:74d091dd-b4c4-4c22-9b9e-48f0c0d02732(jetbrains.mps.typechecking.sample.codeAnal@tests)">
   <persistence version="9" />
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
@@ -9,7 +9,7 @@
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
-    <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.lang.typesystem2.sample.codeAnal)" />
+    <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
   </imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
similarity index 98%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
index f5a3b5a4..9507f170 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4d0004a7-688b-46e2-9a51-6d4553087b2c(jetbrains.mps.lang.typesystem2.sample.helloWorld@tests)">
+<model ref="r:4d0004a7-688b-46e2-9a51-6d4553087b2c(jetbrains.mps.typechecking.sample.helloWorld@tests)">
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
@@ -8,7 +8,7 @@
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.lang.typesystem2.sample.helloWorld)" />
+    <import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.typechecking.sample.helloWorld)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
   </imports>
   <registry>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
similarity index 98%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
index dd2a0863..eb901bac 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:f0251dd8-330d-4d61-a7ea-bb5950a5a85a(jetbrains.mps.lang.typesystem2.sample.simpleGenerics@tests)">
+<model ref="r:f0251dd8-330d-4d61-a7ea-bb5950a5a85a(jetbrains.mps.typechecking.sample.simpleGenerics@tests)">
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
@@ -8,7 +8,7 @@
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="waaz" ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.lang.typesystem2.sample.simpleGenerics)" />
+    <import index="waaz" ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.typechecking.sample.simpleGenerics)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
   </imports>
   <registry>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
index 5725929b..bcc947a7 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:5a2264dd-763c-4885-aafc-b21e89958de8(jetbrains.mps.lang.typesystem2.sample.slice@tests)">
+<model ref="r:5a2264dd-763c-4885-aafc-b21e89958de8(jetbrains.mps.typechecking.sample.slice@tests)">
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
@@ -8,7 +8,7 @@
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="9oqm" ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.lang.typesystem2.sample.slice)" />
+    <import index="9oqm" ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.typechecking.sample.slice)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
   </imports>
   <registry>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample@tests.mps
similarity index 93%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample@tests.mps
index 536cfd71..f273f4b2 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:dfdbef38-4e11-48e8-9622-22e284fc6feb(jetbrains.mps.lang.typesystem2.sample@tests)">
+<model ref="r:dfdbef38-4e11-48e8-9622-22e284fc6feb(jetbrains.mps.typechecking.sample@tests)">
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd b/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd
similarity index 90%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd
index 5b0364e6..ece6f702 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.lang.typesystem2.sample" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82" moduleVersion="0" compileInMPS="true">
+<solution name="jetbrains.mps.typechecking.sample" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.bad.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.bad.mps
index b6ac8050..72173e59 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.bad.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.lang.typesystem2.sample.bounds.bad)" doNotGenerate="true">
+<model ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.mps
index 78ba23eb..92c445e0 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.lang.typesystem2.sample.bounds)" doNotGenerate="true">
+<model ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.codeAnal.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.codeAnal.mps
index b735f571..685b89db 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.codeAnal.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.lang.typesystem2.sample.codeAnal)" doNotGenerate="true">
+<model ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.helloWorld.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.helloWorld.mps
index 8c470c1f..0f5b251f 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.helloWorld.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.lang.typesystem2.sample.helloWorld)">
+<model ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.typechecking.sample.helloWorld)">
   <persistence version="9" />
   <languages>
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.simpleGenerics.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.simpleGenerics.mps
index de2ec4b8..6425d9e9 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.simpleGenerics.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.lang.typesystem2.sample.simpleGenerics)">
+<model ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.typechecking.sample.simpleGenerics)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.slice.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.slice.mps
index c3d256f9..106d5c60 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.slice.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.lang.typesystem2.sample.slice)">
+<model ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.typechecking.sample.slice)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/typesystem2.sandbox.sample.iml b/typechecking/solutions/jetbrains.mps.typechecking.sample/typesystem2.sandbox.sample.iml
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/typesystem2.sandbox.sample.iml
rename to typechecking/solutions/jetbrains.mps.typechecking.sample/typesystem2.sandbox.sample.iml