diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps
index 0700db0a..63dc331d 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps
@@ -307,7 +307,7 @@
         <ref role="1NtTu8" to="8tt8:7_8aRkgDGQg" resolve="binding" />
       </node>
       <node concept="3F0ifn" id="7_8aRkgE086" role="3EZMnx">
-        <property role="3F0ifm" value="-&gt;" />
+        <property role="3F0ifm" value="→" />
       </node>
       <node concept="3F1sOY" id="7_8aRkgE08J" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:7_8aRkgDGQl" resolve="expr" />
@@ -781,7 +781,7 @@
         <ref role="1NtTu8" to="8tt8:3_qfG1EP6Op" resolve="argType" />
       </node>
       <node concept="3F0ifn" id="3_qfG1EP6OI" role="3EZMnx">
-        <property role="3F0ifm" value="-&gt;" />
+        <property role="3F0ifm" value="→" />
       </node>
       <node concept="3F1sOY" id="3_qfG1EP6OV" role="3EZMnx">
         <property role="1$x2rV" value="?" />
@@ -898,10 +898,9 @@
         </node>
       </node>
       <node concept="3F0ifn" id="12dHl3ZCFaC" role="3EZMnx">
-        <property role="3F0ifm" value="forall" />
+        <property role="3F0ifm" value="∀" />
       </node>
       <node concept="3F2HdR" id="48ZGLP7q1QZ" role="3EZMnx">
-        <property role="2czwfO" value=" " />
         <property role="1cu_pB" value="0" />
         <ref role="1NtTu8" to="8tt8:48ZGLP7q1Qc" resolve="typeVars" />
         <node concept="2iRfu4" id="48ZGLP7q1R2" role="2czzBx" />
@@ -911,6 +910,9 @@
         <node concept="11L4FC" id="1IKbs5XoXAX" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
+        <node concept="11LMrY" id="1IKbs5XHOf$" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="3F1sOY" id="12dHl3ZCFaK" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:12dHl3ZCFaI" resolve="type" />
@@ -1032,7 +1034,7 @@
         <ref role="1NtTu8" to="8tt8:JqEP$8fvqp" resolve="expr" />
       </node>
       <node concept="3F0ifn" id="JqEP$8fvqZ" role="3EZMnx">
-        <property role="3F0ifm" value="::" />
+        <property role="3F0ifm" value="∷" />
       </node>
       <node concept="3F1sOY" id="JqEP$8fvrf" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:JqEP$8fvrd" resolve="ann" />
@@ -1066,7 +1068,7 @@
         <ref role="1NtTu8" to="8tt8:JqEP$8fvrp" resolve="var" />
       </node>
       <node concept="3F0ifn" id="JqEP$8fvsq" role="3EZMnx">
-        <property role="3F0ifm" value="::" />
+        <property role="3F0ifm" value="∷" />
       </node>
       <node concept="3F1sOY" id="JqEP$8fvsK" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:JqEP$8fvrd" resolve="ann" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps
index c44184eb..7efe7484 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps
@@ -259,21 +259,21 @@
     <property role="EcuMT" value="4774429934441520217" />
     <property role="3GE5qa" value="type" />
     <property role="TrG5h" value="BoolType" />
-    <property role="34LRSv" value="bool" />
+    <property role="34LRSv" value="Bool" />
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
   </node>
   <node concept="1TIwiD" id="492bFERognf">
     <property role="EcuMT" value="4774429934441530831" />
     <property role="3GE5qa" value="expr.const" />
     <property role="TrG5h" value="True" />
-    <property role="34LRSv" value="true" />
+    <property role="34LRSv" value="True" />
     <ref role="1TJDcQ" node="7_8aRkgDGQe" resolve="Const" />
   </node>
   <node concept="1TIwiD" id="492bFERojSn">
     <property role="EcuMT" value="4774429934441545239" />
     <property role="3GE5qa" value="expr.const" />
     <property role="TrG5h" value="False" />
-    <property role="34LRSv" value="false" />
+    <property role="34LRSv" value="False" />
     <ref role="1TJDcQ" node="7_8aRkgDGQe" resolve="Const" />
   </node>
   <node concept="1TIwiD" id="3g9UT2j9I06">
@@ -310,6 +310,7 @@
     <property role="EcuMT" value="1192808835813875324" />
     <property role="3GE5qa" value="type" />
     <property role="TrG5h" value="ForallType" />
+    <property role="34LRSv" value="forall" />
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
     <node concept="1TJgyj" id="12dHl3ZCFaI" role="1TKVEi">
       <property role="IQ2ns" value="1192808835813913262" />
@@ -448,6 +449,7 @@
     <property role="EcuMT" value="854183478222197450" />
     <property role="3GE5qa" value="type" />
     <property role="TrG5h" value="PairType" />
+    <property role="34LRSv" value="pair" />
     <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
     <node concept="1TJgyj" id="JqEP$8shbd" role="1TKVEi">
       <property role="IQ2ns" value="854183478222197453" />