diff --git a/samples/lambdacalc/.mps/modules.xml b/samples/lambdacalc/.mps/modules.xml
index 432dd620..ea877cca 100644
--- a/samples/lambdacalc/.mps/modules.xml
+++ b/samples/lambdacalc/.mps/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/languages/sample.fooblin/sample.fooblin.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/languages/sample.lambdacalc/sample.lambdacalc.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/sample.demo/sample.demo.msd" folder="" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/behavior.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.behavior.mps
similarity index 99%
rename from samples/lambdacalc/languages/sample.fooblin/models/behavior.mps
rename to samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.behavior.mps
index f0c5da27..1891dfe3 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/behavior.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.behavior.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.fooblin.behavior)">
+<model ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.lambdacalc.behavior)">
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
@@ -8,7 +8,7 @@
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)" />
+    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
   </imports>
   <registry>
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/constraints.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps
similarity index 99%
rename from samples/lambdacalc/languages/sample.fooblin/models/constraints.mps
rename to samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps
index 7d77a3e8..9a2d021c 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/constraints.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.constraints.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:49af371c-e432-4e5a-a3df-e689ebe20a8d(sample.fooblin.constraints)">
+<model ref="r:49af371c-e432-4e5a-a3df-e689ebe20a8d(sample.lambdacalc.constraints)">
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
@@ -11,7 +11,7 @@
     <import index="tpcg" ref="r:00000000-0000-4000-0000-011c8959028c(jetbrains.mps.lang.structure.constraints)" />
     <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)" />
+    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/editor.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps
similarity index 99%
rename from samples/lambdacalc/languages/sample.fooblin/models/editor.mps
rename to samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps
index 3c183880..d5328bee 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a4cbccba-ea60-4d22-9e76-4b461414bf5b(sample.fooblin.editor)">
+<model ref="r:a4cbccba-ea60-4d22-9e76-4b461414bf5b(sample.lambdacalc.editor)">
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
@@ -8,7 +8,7 @@
   <imports>
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)" />
+    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/structure.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps
similarity index 99%
rename from samples/lambdacalc/languages/sample.fooblin/models/structure.mps
rename to samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps
index 7b235e36..4f52c641 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/structure.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.structure.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)">
+<model ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/types.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
similarity index 99%
rename from samples/lambdacalc/languages/sample.fooblin/models/types.mps
rename to samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
index 75b69a1e..b131773d 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.fooblin.types)">
+<model ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.lambdacalc.types)">
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.typesystem2" version="0" />
@@ -12,15 +12,15 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)" />
+    <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.lambdacalc.structure)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
-    <import index="1x08" ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.fooblin.behavior)" />
+    <import index="1x08" ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.lambdacalc.behavior)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
-    <import index="69ci" ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.fooblin.types)" />
+    <import index="69ci" ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.lambdacalc.types)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="6bz1" ref="r:d3905048-7598-4a84-931a-cbbcbcda146d(jetbrains.mps.lang.intentions.methods)" implicit="true" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/typesystem.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps
similarity index 80%
rename from samples/lambdacalc/languages/sample.fooblin/models/typesystem.mps
rename to samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps
index ec1de910..258b113c 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/typesystem.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.typesystem.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ea716504-770e-4d8e-a992-900e08e75062(sample.fooblin.typesystem)">
+<model ref="r:ea716504-770e-4d8e-a992-900e08e75062(sample.lambdacalc.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
diff --git a/samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
similarity index 97%
rename from samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl
rename to samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
index 8704c996..9ac3799f 100644
--- a/samples/lambdacalc/languages/sample.fooblin/sample.fooblin.mpl
+++ b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="sample.fooblin" uuid="af858d84-85f2-42f4-a854-0b3c6b5cd482" languageVersion="0" moduleVersion="0">
+<language namespace="sample.lambdacalc" uuid="af858d84-85f2-42f4-a854-0b3c6b5cd482" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -9,7 +9,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">af858d84-85f2-42f4-a854-0b3c6b5cd482(sample.fooblin)</dependency>
+    <dependency reexport="false">af858d84-85f2-42f4-a854-0b3c6b5cd482(sample.lambdacalc)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>