diff --git a/.mps/modules.xml b/.mps/modules.xml
index 2365d713..ff15ebc9 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -33,8 +33,8 @@
       <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.sandbox/jetbrains.mps.fitch.sandbox.msd" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl" folder="samples.lambdacalc" />
-      <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/build/build.msd" folder="samples.lambdacalc" />
-      <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/sample.demo/sample.demo.msd" folder="samples.lambdacalc" />
+      <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/sample.lambdacalc.demo/sample.lambdacalc.demo.msd" folder="samples.lambdacalc" />
+      <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="samples.mpscore.tests" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd" folder="samples.mpscore.build" />
@@ -42,4 +42,4 @@
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="samples.mpscore.samples" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/lambdacalc/.mps/modules.xml b/samples/lambdacalc/.mps/modules.xml
index ff58a981..a5e43651 100644
--- a/samples/lambdacalc/.mps/modules.xml
+++ b/samples/lambdacalc/.mps/modules.xml
@@ -4,7 +4,7 @@
     <projectModules>
       <modulePath path="$PROJECT_DIR$/languages/sample.lambdacalc/sample.lambdacalc.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/build/build.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/sample.demo/sample.demo.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/sample.lambdacalc.demo/sample.lambdacalc.demo.msd" folder="" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 2deac70a..6184709a 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -43,7 +43,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.sample.lambdacalc, java.compile.sample.demo" />
+  <target name="compileJava" depends="java.compile.sample.lambdacalc, java.compile.sample.lambdacalc.demo" />
   
   <target name="processResources" />
   
@@ -139,7 +139,7 @@
         <module file="${basedir}/languages/sample.lambdacalc/sample.lambdacalc.mpl" bootstrap="true" />
       </chunk>
       <chunk>
-        <module file="${basedir}/solutions/sample.demo/sample.demo.msd" />
+        <module file="${basedir}/solutions/sample.lambdacalc.demo/sample.lambdacalc.demo.msd" />
       </chunk>
       <jvmargs>
         <arg value="-Xmx512m" />
@@ -210,19 +210,19 @@
     </javac>
   </target>
   
-  <target name="java.compile.sample.demo">
-    <mkdir dir="${basedir}/solutions/sample.demo/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/sample.demo" />
-    <javac destdir="${build.tmp}/java/out/sample.demo" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.sample.lambdacalc.demo">
+    <mkdir dir="${basedir}/solutions/sample.lambdacalc.demo/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/sample.lambdacalc.demo" />
+    <javac destdir="${build.tmp}/java/out/sample.lambdacalc.demo" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/solutions/sample.demo/source_gen" />
+        <path location="${basedir}/solutions/sample.lambdacalc.demo/source_gen" />
       </src>
       <classpath />
     </javac>
   </target>
   
   <target name="cleanSources">
-    <delete dir="${basedir}/solutions/sample.demo/source_gen" />
+    <delete dir="${basedir}/solutions/sample.lambdacalc.demo/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps b/samples/lambdacalc/solutions/sample.lambdacalc.demo/models/sample.lambdacalc.demo.mps
similarity index 99%
rename from samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps
rename to samples/lambdacalc/solutions/sample.lambdacalc.demo/models/sample.lambdacalc.demo.mps
index 9b8e0b77..04c58b56 100644
--- a/samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps
+++ b/samples/lambdacalc/solutions/sample.lambdacalc.demo/models/sample.lambdacalc.demo.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:64f472af-c4b1-4900-9ea3-aec5c51b6e6e(sample.demo.fooblah)">
+<model ref="r:64f472af-c4b1-4900-9ea3-aec5c51b6e6e(sample.lambdacalc.demo)">
   <persistence version="9" />
   <languages>
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc" version="0" />
diff --git a/samples/lambdacalc/solutions/sample.demo/sample.demo.msd b/samples/lambdacalc/solutions/sample.lambdacalc.demo/sample.lambdacalc.demo.msd
similarity index 77%
rename from samples/lambdacalc/solutions/sample.demo/sample.demo.msd
rename to samples/lambdacalc/solutions/sample.lambdacalc.demo/sample.lambdacalc.demo.msd
index eed97c06..f6730ee0 100644
--- a/samples/lambdacalc/solutions/sample.demo/sample.demo.msd
+++ b/samples/lambdacalc/solutions/sample.lambdacalc.demo/sample.lambdacalc.demo.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="sample.demo" uuid="05f15741-5274-4aed-a086-84d9a15ab93b" moduleVersion="0" compileInMPS="true">
+<solution name="sample.lambdacalc.demo" uuid="05f15741-5274-4aed-a086-84d9a15ab93b" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -11,7 +11,7 @@
     <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:sample.lambdacalc" version="0" />
   </languageVersions>
   <dependencyVersions>
-    <module reference="05f15741-5274-4aed-a086-84d9a15ab93b(sample.demo)" version="0" />
+    <module reference="05f15741-5274-4aed-a086-84d9a15ab93b(sample.lambdacalc.demo)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/sample.lamdacalc.build.mps
similarity index 97%
rename from samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
rename to samples/lambdacalc/solutions/samples.lambdacalc.build/models/sample.lamdacalc.build.mps
index 8dd2693f..8e64f106 100644
--- a/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/sample.lamdacalc.build.mps
@@ -152,16 +152,16 @@
       </node>
       <node concept="1E1JtA" id="7E7FS_VaVB_" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="sample.demo" />
+        <property role="TrG5h" value="sample.lambdacalc.demo" />
         <property role="3LESm3" value="05f15741-5274-4aed-a086-84d9a15ab93b" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="7E7FS_VaVBC" role="3LF7KH">
           <node concept="2Ry0Ak" id="7E7FS_VaVC3" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
             <node concept="2Ry0Ak" id="7E7FS_VaVC8" role="2Ry0An">
-              <property role="2Ry0Am" value="sample.demo" />
-              <node concept="2Ry0Ak" id="7E7FS_VaVCd" role="2Ry0An">
-                <property role="2Ry0Am" value="sample.demo.msd" />
+              <property role="2Ry0Am" value="sample.lambdacalc.demo" />
+              <node concept="2Ry0Ak" id="3kk50IPE9wL" role="2Ry0An">
+                <property role="2Ry0Am" value="sample.lambdacalc.demo.msd" />
               </node>
             </node>
           </node>
diff --git a/samples/lambdacalc/solutions/build/build.msd b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
similarity index 89%
rename from samples/lambdacalc/solutions/build/build.msd
rename to samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
index 82f2b519..064111a0 100644
--- a/samples/lambdacalc/solutions/build/build.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="build" uuid="dc70cc8a-128e-4f6c-ad96-05b193c44372" moduleVersion="0" compileInMPS="true">
+<solution name="samples.lambdacalc.build" uuid="dc70cc8a-128e-4f6c-ad96-05b193c44372" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -24,9 +24,9 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
-    <module reference="dc70cc8a-128e-4f6c-ad96-05b193c44372(build)" version="0" />
     <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
     <module reference="bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.typechecking.build)" version="0" />
+    <module reference="dc70cc8a-128e-4f6c-ad96-05b193c44372(samples.lambdacalc.build)" version="0" />
   </dependencyVersions>
 </solution>