diff --git a/.gitmodules b/.gitmodules
index 7c79c718..fa0bd1b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "mps-unification"]
-	path = solutions/jetbrains.mps.unification/imports/mps-unification
+[submodule "mps--unification"]
+	path = solutions/jetbrains.mps.unification.tree/imports/mps-unification
 	url = git@github.com:fisakov/mps-unification.git
diff --git a/.mps/modules.xml b/.mps/modules.xml
index d613697d..e8e37978 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -8,7 +8,7 @@
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.unification/jetbrains.mps.unification.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/jetbrains.mps.unification.tree.msd" folder="" />
     </projectModules>
   </component>
 </project>
diff --git a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index c2a4377d..7225f6b0 100644
--- a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -16,7 +16,7 @@
       <external-templates />
       <dependencies>
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-        <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification)</dependency>
+        <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)</dependency>
       </dependencies>
       <usedLanguages>
         <usedLanguage>b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</usedLanguage>
@@ -31,7 +31,7 @@
   </generators>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification)</dependency>
+    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)</dependency>
   </dependencies>
   <usedLanguages>
     <usedLanguage>aee9cad2-acd4-4608-aef2-0004f6a1cdbd(jetbrains.mps.lang.actions)</usedLanguage>
diff --git a/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 689e2f65..83a4f447 100644
--- a/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification)</dependency>
+    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
diff --git a/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd b/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd
index b3fcab33..6d94a227 100644
--- a/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd
+++ b/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd
@@ -11,7 +11,7 @@
     <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="false">7ab0c079-df36-45eb-a614-81cf81174043(jetbrains.mps.jchr.sandbox)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="true">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification)</dependency>
+    <dependency reexport="true">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)</dependency>
   </dependencies>
   <usedLanguages>
     <usedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</usedLanguage>
diff --git a/solutions/jetbrains.mps.unification/imports/mps-unification b/solutions/jetbrains.mps.unification.tree/imports/mps-unification
similarity index 100%
rename from solutions/jetbrains.mps.unification/imports/mps-unification
rename to solutions/jetbrains.mps.unification.tree/imports/mps-unification
diff --git a/solutions/jetbrains.mps.unification/jetbrains.mps.unification.msd b/solutions/jetbrains.mps.unification.tree/jetbrains.mps.unification.tree.msd
similarity index 88%
rename from solutions/jetbrains.mps.unification/jetbrains.mps.unification.msd
rename to solutions/jetbrains.mps.unification.tree/jetbrains.mps.unification.tree.msd
index db1bbbc6..fda1b01c 100644
--- a/solutions/jetbrains.mps.unification/jetbrains.mps.unification.msd
+++ b/solutions/jetbrains.mps.unification.tree/jetbrains.mps.unification.tree.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.unification" uuid="7526e0cf-1ce7-46f8-a555-9eca1e06c23b" compileInMPS="true">
+<solution name="jetbrains.mps.unification.tree" uuid="7526e0cf-1ce7-46f8-a555-9eca1e06c23b" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
diff --git a/solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/ast.mps b/solutions/jetbrains.mps.unification.tree/models/jetbrains/mps/unification/ast.mps
similarity index 100%
rename from solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/ast.mps
rename to solutions/jetbrains.mps.unification.tree/models/jetbrains/mps/unification/ast.mps
diff --git a/solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/tree.mps b/solutions/jetbrains.mps.unification.tree/models/jetbrains/mps/unification/tree.mps
similarity index 100%
rename from solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/tree.mps
rename to solutions/jetbrains.mps.unification.tree/models/jetbrains/mps/unification/tree.mps