diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps
index 78a3cd72ad..63231a05b7 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps
@@ -195,12 +195,16 @@
       <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
         <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
       </concept>
+      <concept id="1219952072943" name="jetbrains.mps.lang.generator.structure.DropRootRule" flags="lg" index="aNPBN">
+        <reference id="1219952338328" name="applicableConcept" index="aOQi4" />
+      </concept>
       <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
         <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
       </concept>
       <concept id="1202776937179" name="jetbrains.mps.lang.generator.structure.AbandonInput_RuleConsequence" flags="lg" index="b5Tf3" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <property id="1184950341882" name="topPriorityGroup" index="3$yP7D" />
+        <child id="1219952894531" name="dropRootRule" index="aQYdv" />
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
         <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
         <child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
@@ -2282,6 +2286,9 @@
       <ref role="2rTdP9" to="x27k:5IYyAOzCrre" resolve="GlobalVariableDeclaration" />
       <ref role="2rZz_L" to="x27k:5IYyAOzCrre" resolve="GlobalVariableDeclaration" />
     </node>
+    <node concept="aNPBN" id="6leHaJc8tdw" role="aQYdv">
+      <ref role="aOQi4" to="x27k:5_l8w1EmTde" resolve="ImplementationModule" />
+    </node>
   </node>
   <node concept="1hFVJD" id="1x_Jrt9Ngzb">
     <property role="TrG5h" value="map_ImplementationModule_H" />
@@ -3092,151 +3099,6 @@
   <node concept="3owgHZ" id="7RiewQ_kNTW">
     <property role="TrG5h" value="map_ExternalModule" />
     <property role="3GE5qa" value="main" />
-    <node concept="n94m4" id="7RiewQ_kNTX" role="lGtFl">
-      <ref role="n9lRv" to="x27k:5_l8w1EmTcX" resolve="Module" />
-    </node>
-    <node concept="17Uvod" id="7RiewQ_kNV6" role="lGtFl">
-      <property role="2qtEX9" value="name" />
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-      <node concept="3zFVjK" id="7RiewQ_kNV9" role="3zH0cK">
-        <node concept="3clFbS" id="7RiewQ_kNVa" role="2VODD2">
-          <node concept="3clFbF" id="7RiewQ_kNVb" role="3cqZAp">
-            <node concept="2OqwBi" id="7RiewQ_kNVc" role="3clFbG">
-              <node concept="3TrcHB" id="7RiewQ_kNVd" role="2OqNvi">
-                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-              </node>
-              <node concept="30H73N" id="7RiewQ_kNVe" role="2Oq$k0" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="rcWE1" id="67O0HaCoQbo" role="1baaG3">
-      <property role="rcWEL" value="&quot;myHeader.h&quot;" />
-      <node concept="2b32R4" id="67O0HaCoQbq" role="lGtFl">
-        <node concept="3JmXsc" id="67O0HaCoQbt" role="2P8S$">
-          <node concept="3clFbS" id="67O0HaCoQbu" role="2VODD2">
-            <node concept="Jncv_" id="6xgYZveKHIE" role="3cqZAp">
-              <ref role="JncvD" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
-              <node concept="30H73N" id="6xgYZveKImF" role="JncvB" />
-              <node concept="3clFbS" id="6xgYZveKHII" role="Jncv$">
-                <node concept="3clFbJ" id="6xgYZvb1tl8" role="3cqZAp">
-                  <node concept="3clFbS" id="6xgYZvb1tla" role="3clFbx">
-                    <node concept="3cpWs6" id="6xgYZvb1RGs" role="3cqZAp">
-                      <node concept="2OqwBi" id="6xgYZvb1RGt" role="3cqZAk">
-                        <node concept="v3k3i" id="6xgYZvb1RGu" role="2OqNvi">
-                          <node concept="chp4Y" id="6xgYZvb1RGv" role="v3oSu">
-                            <ref role="cht4Q" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="6xgYZvb1RGw" role="2Oq$k0">
-                          <node concept="3Tsc0h" id="6xgYZveKBRP" role="2OqNvi">
-                            <ref role="3TtcxE" to="x27k:5jyom5fOqJU" resolve="descriptors" />
-                          </node>
-                          <node concept="Jnkvi" id="6xgYZveKOB$" role="2Oq$k0">
-                            <ref role="1M0zk5" node="6xgYZveKHIK" resolve="externalModule" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2qdxtjrxItv" role="3clFbw">
-                    <node concept="2OqwBi" id="2qdxtjrxERD" role="2Oq$k0">
-                      <node concept="2OqwBi" id="6xgYZveKPx4" role="2Oq$k0">
-                        <node concept="Jnkvi" id="6xgYZveKPx5" role="2Oq$k0">
-                          <ref role="1M0zk5" node="6xgYZveKHIK" resolve="externalModule" />
-                        </node>
-                        <node concept="3Tsc0h" id="2qdxtjrxCw4" role="2OqNvi">
-                          <ref role="3TtcxE" to="x27k:5jyom5fOqJU" resolve="descriptors" />
-                        </node>
-                      </node>
-                      <node concept="v3k3i" id="2qdxtjrxHqJ" role="2OqNvi">
-                        <node concept="chp4Y" id="2qdxtjrxHEG" role="v3oSu">
-                          <ref role="cht4Q" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3GX2aA" id="2qdxtjrxJaI" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="JncvC" id="6xgYZveKHIK" role="JncvA">
-                <property role="TrG5h" value="externalModule" />
-                <node concept="2jxLKc" id="6xgYZveKHIL" role="1tU5fm" />
-              </node>
-            </node>
-            <node concept="3cpWs6" id="6xgYZveKCYh" role="3cqZAp">
-              <node concept="2ShNRf" id="6xgYZveKDKT" role="3cqZAk">
-                <node concept="2HTt$P" id="6xgYZveKDKU" role="2ShVmc">
-                  <node concept="3Tqbb2" id="6xgYZveKDKV" role="2HTBi0" />
-                  <node concept="2pJPEk" id="6xgYZveKDKW" role="2HTEbv">
-                    <node concept="2pJPED" id="6xgYZveKDKX" role="2pJPEn">
-                      <ref role="2pJxaS" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
-                      <node concept="2pJxcG" id="6xgYZveKDKY" role="2pJxcM">
-                        <ref role="2pJxcJ" to="x27k:5jyom5fOqJg" resolve="path" />
-                        <node concept="WxPPo" id="59cfP9u6LLb" role="28ntcv">
-                          <node concept="3cpWs3" id="6xgYZveKDKZ" role="WxPPp">
-                            <node concept="3cpWs3" id="6xgYZveMcFC" role="3uHU7B">
-                              <node concept="2OqwBi" id="6xgYZveMdeJ" role="3uHU7w">
-                                <node concept="30H73N" id="6xgYZveMcR1" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="6xgYZveMdxG" role="2OqNvi">
-                                  <ref role="37wK5l" to="qd6m:1zF3M6MR330" resolve="getHeaderFileExtension" />
-                                </node>
-                              </node>
-                              <node concept="3cpWs3" id="6xgYZveMcic" role="3uHU7B">
-                                <node concept="Xl_RD" id="6xgYZveMcil" role="3uHU7w">
-                                  <property role="Xl_RC" value="." />
-                                </node>
-                                <node concept="3cpWs3" id="6xgYZveMbxN" role="3uHU7B">
-                                  <node concept="Xl_RD" id="6xgYZveKDL1" role="3uHU7B">
-                                    <property role="Xl_RC" value="\&quot;" />
-                                  </node>
-                                  <node concept="2OqwBi" id="6xgYZveMbUv" role="3uHU7w">
-                                    <node concept="30H73N" id="6xgYZveMbUw" role="2Oq$k0" />
-                                    <node concept="2qgKlT" id="6xgYZveMbUx" role="2OqNvi">
-                                      <ref role="37wK5l" to="qd6m:7Aba6BzsCXL" resolve="getHeaderFileName" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="Xl_RD" id="6xgYZveKDL5" role="3uHU7w">
-                              <property role="Xl_RC" value="\&quot;" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1pdMLZ" id="6CpO2H4IvHh" role="lGtFl">
-      <node concept="15lBmy" id="6CpO2H4IwTy" role="15mYut">
-        <node concept="3clFbS" id="6CpO2H4IwTz" role="2VODD2">
-          <node concept="3clFbF" id="6CpO2H4Iy5z" role="3cqZAp">
-            <node concept="37vLTI" id="6CpO2H4I_h8" role="3clFbG">
-              <node concept="2OqwBi" id="6CpO2H4I_JT" role="37vLTx">
-                <node concept="30H73N" id="6CpO2H4I_oX" role="2Oq$k0" />
-                <node concept="3TrcHB" id="6CpO2H4IDtd" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6CpO2H4Iybd" role="37vLTJ">
-                <node concept="3l3mFP" id="6CpO2H4Iy5y" role="2Oq$k0" />
-                <node concept="3TrcHB" id="6CpO2H4I$5l" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="4WHVk" id="3rj5gbxlZVC" role="3owgHT">
       <property role="TrG5h" value="x" />
       <node concept="3TlMh9" id="3rj5gbxlZVD" role="2DQcEM">
@@ -3681,6 +3543,151 @@
         <property role="34cw8o" value="copy function, but process references of internal elements (e.g. FunctionCall)" />
       </node>
     </node>
+    <node concept="n94m4" id="7RiewQ_kNTX" role="lGtFl">
+      <ref role="n9lRv" to="x27k:5_l8w1EmTcX" resolve="Module" />
+    </node>
+    <node concept="17Uvod" id="7RiewQ_kNV6" role="lGtFl">
+      <property role="2qtEX9" value="name" />
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <node concept="3zFVjK" id="7RiewQ_kNV9" role="3zH0cK">
+        <node concept="3clFbS" id="7RiewQ_kNVa" role="2VODD2">
+          <node concept="3clFbF" id="7RiewQ_kNVb" role="3cqZAp">
+            <node concept="2OqwBi" id="7RiewQ_kNVc" role="3clFbG">
+              <node concept="3TrcHB" id="7RiewQ_kNVd" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+              <node concept="30H73N" id="7RiewQ_kNVe" role="2Oq$k0" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="rcWE1" id="67O0HaCoQbo" role="1baaG3">
+      <property role="rcWEL" value="&quot;myHeader.h&quot;" />
+      <node concept="2b32R4" id="67O0HaCoQbq" role="lGtFl">
+        <node concept="3JmXsc" id="67O0HaCoQbt" role="2P8S$">
+          <node concept="3clFbS" id="67O0HaCoQbu" role="2VODD2">
+            <node concept="Jncv_" id="6xgYZveKHIE" role="3cqZAp">
+              <ref role="JncvD" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
+              <node concept="30H73N" id="6xgYZveKImF" role="JncvB" />
+              <node concept="3clFbS" id="6xgYZveKHII" role="Jncv$">
+                <node concept="3clFbJ" id="6xgYZvb1tl8" role="3cqZAp">
+                  <node concept="3clFbS" id="6xgYZvb1tla" role="3clFbx">
+                    <node concept="3cpWs6" id="6xgYZvb1RGs" role="3cqZAp">
+                      <node concept="2OqwBi" id="6xgYZvb1RGt" role="3cqZAk">
+                        <node concept="v3k3i" id="6xgYZvb1RGu" role="2OqNvi">
+                          <node concept="chp4Y" id="6xgYZvb1RGv" role="v3oSu">
+                            <ref role="cht4Q" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="6xgYZvb1RGw" role="2Oq$k0">
+                          <node concept="3Tsc0h" id="6xgYZveKBRP" role="2OqNvi">
+                            <ref role="3TtcxE" to="x27k:5jyom5fOqJU" resolve="descriptors" />
+                          </node>
+                          <node concept="Jnkvi" id="6xgYZveKOB$" role="2Oq$k0">
+                            <ref role="1M0zk5" node="6xgYZveKHIK" resolve="externalModule" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="2qdxtjrxItv" role="3clFbw">
+                    <node concept="2OqwBi" id="2qdxtjrxERD" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6xgYZveKPx4" role="2Oq$k0">
+                        <node concept="Jnkvi" id="6xgYZveKPx5" role="2Oq$k0">
+                          <ref role="1M0zk5" node="6xgYZveKHIK" resolve="externalModule" />
+                        </node>
+                        <node concept="3Tsc0h" id="2qdxtjrxCw4" role="2OqNvi">
+                          <ref role="3TtcxE" to="x27k:5jyom5fOqJU" resolve="descriptors" />
+                        </node>
+                      </node>
+                      <node concept="v3k3i" id="2qdxtjrxHqJ" role="2OqNvi">
+                        <node concept="chp4Y" id="2qdxtjrxHEG" role="v3oSu">
+                          <ref role="cht4Q" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3GX2aA" id="2qdxtjrxJaI" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="JncvC" id="6xgYZveKHIK" role="JncvA">
+                <property role="TrG5h" value="externalModule" />
+                <node concept="2jxLKc" id="6xgYZveKHIL" role="1tU5fm" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="6xgYZveKCYh" role="3cqZAp">
+              <node concept="2ShNRf" id="6xgYZveKDKT" role="3cqZAk">
+                <node concept="2HTt$P" id="6xgYZveKDKU" role="2ShVmc">
+                  <node concept="3Tqbb2" id="6xgYZveKDKV" role="2HTBi0" />
+                  <node concept="2pJPEk" id="6xgYZveKDKW" role="2HTEbv">
+                    <node concept="2pJPED" id="6xgYZveKDKX" role="2pJPEn">
+                      <ref role="2pJxaS" to="x27k:5jyom5fOqJw" resolve="HeaderDescriptor" />
+                      <node concept="2pJxcG" id="6xgYZveKDKY" role="2pJxcM">
+                        <ref role="2pJxcJ" to="x27k:5jyom5fOqJg" resolve="path" />
+                        <node concept="WxPPo" id="59cfP9u6LLb" role="28ntcv">
+                          <node concept="3cpWs3" id="6xgYZveKDKZ" role="WxPPp">
+                            <node concept="3cpWs3" id="6xgYZveMcFC" role="3uHU7B">
+                              <node concept="2OqwBi" id="6xgYZveMdeJ" role="3uHU7w">
+                                <node concept="30H73N" id="6xgYZveMcR1" role="2Oq$k0" />
+                                <node concept="2qgKlT" id="6xgYZveMdxG" role="2OqNvi">
+                                  <ref role="37wK5l" to="qd6m:1zF3M6MR330" resolve="getHeaderFileExtension" />
+                                </node>
+                              </node>
+                              <node concept="3cpWs3" id="6xgYZveMcic" role="3uHU7B">
+                                <node concept="Xl_RD" id="6xgYZveMcil" role="3uHU7w">
+                                  <property role="Xl_RC" value="." />
+                                </node>
+                                <node concept="3cpWs3" id="6xgYZveMbxN" role="3uHU7B">
+                                  <node concept="Xl_RD" id="6xgYZveKDL1" role="3uHU7B">
+                                    <property role="Xl_RC" value="\&quot;" />
+                                  </node>
+                                  <node concept="2OqwBi" id="6xgYZveMbUv" role="3uHU7w">
+                                    <node concept="30H73N" id="6xgYZveMbUw" role="2Oq$k0" />
+                                    <node concept="2qgKlT" id="6xgYZveMbUx" role="2OqNvi">
+                                      <ref role="37wK5l" to="qd6m:7Aba6BzsCXL" resolve="getHeaderFileName" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Xl_RD" id="6xgYZveKDL5" role="3uHU7w">
+                              <property role="Xl_RC" value="\&quot;" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1pdMLZ" id="6CpO2H4IvHh" role="lGtFl">
+      <node concept="15lBmy" id="6CpO2H4IwTy" role="15mYut">
+        <node concept="3clFbS" id="6CpO2H4IwTz" role="2VODD2">
+          <node concept="3clFbF" id="6CpO2H4Iy5z" role="3cqZAp">
+            <node concept="37vLTI" id="6CpO2H4I_h8" role="3clFbG">
+              <node concept="2OqwBi" id="6CpO2H4I_JT" role="37vLTx">
+                <node concept="30H73N" id="6CpO2H4I_oX" role="2Oq$k0" />
+                <node concept="3TrcHB" id="6CpO2H4IDtd" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6CpO2H4Iybd" role="37vLTJ">
+                <node concept="3l3mFP" id="6CpO2H4Iy5y" role="2Oq$k0" />
+                <node concept="3TrcHB" id="6CpO2H4I$5l" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="bUwia" id="35NyAcOx3U">
     <property role="TrG5h" value="removeCommentedAndEmptyCode" />
@@ -6058,6 +6065,10 @@
       <property role="TrG5h" value="declaration" />
       <node concept="10P_77" id="4sIWb0A6N1B" role="1N15GL" />
     </node>
+    <node concept="1N15co" id="AQl6ygK6Hx" role="1s_3oS">
+      <property role="TrG5h" value="forcePreventNameMangling" />
+      <node concept="10P_77" id="AQl6ygK9l4" role="1N15GL" />
+    </node>
     <node concept="1S7NMz" id="3zugmcFFrWo" role="13RCb5">
       <property role="TrG5h" value="aVar" />
       <property role="3mNisv" value="false" />
@@ -6279,10 +6290,6 @@
         </node>
       </node>
     </node>
-    <node concept="1N15co" id="AQl6ygK6Hx" role="1s_3oS">
-      <property role="TrG5h" value="forcePreventNameMangling" />
-      <node concept="10P_77" id="AQl6ygK9l4" role="1N15GL" />
-    </node>
   </node>
   <node concept="1pmfR0" id="2ofiXe_u6mZ">
     <property role="TrG5h" value="minimalNameMangling" />
@@ -6345,8 +6352,8 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="w3eGJcYxdn" role="2GsD0m">
-                <ref role="37wK5l" to="p8f0:w3eGJcRYxF" resolve="uniqueNodes" />
                 <ref role="1Pybhc" to="p8f0:w3eGJcGcTr" resolve="NameManglingHelper" />
+                <ref role="37wK5l" to="p8f0:w3eGJcRYxF" resolve="uniqueMangleableModuleContents" />
                 <node concept="1Q6Npb" id="w3eGJcYxdo" role="37wK5m" />
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
index 872b2fedd3..54cfa6f43b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
@@ -162,7 +162,7 @@
       <property role="IQ2ns" value="1317894735999388455" />
       <ref role="20lvS9" node="1x_Jrt9Mwpu" resolve="GenModuleH" />
     </node>
-    <node concept="PrWs8" id="6clJcrKkzPu" role="PzmwI">
+    <node concept="PrWs8" id="4zr6ozueESC" role="PzmwI">
       <ref role="PrY4T" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
     </node>
   </node>
@@ -223,7 +223,7 @@
       <property role="IQ2ns" value="9066372830133005542" />
       <ref role="20lvS9" node="7RiewQ_kN5M" resolve="GenExtModule" />
     </node>
-    <node concept="PrWs8" id="6clJcrKkyyF" role="PzmwI">
+    <node concept="PrWs8" id="4zr6ozufee$" role="PzmwI">
       <ref role="PrY4T" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
     </node>
   </node>
@@ -369,7 +369,7 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
     </node>
-    <node concept="PrWs8" id="1NwarDnRXZW" role="PzmwI">
+    <node concept="PrWs8" id="4zr6ozufeON" role="PzmwI">
       <ref role="PrY4T" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps
index 9e283e6267..e6c846b93c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -16,6 +16,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
@@ -81,8 +82,11 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
+        <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
+      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="8356039341262087992" name="line" index="1aUNEU" />
+        <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
@@ -103,6 +107,17 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
+      <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
+        <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
+        <child id="1883223317721008709" name="body" index="Jncv$" />
+        <child id="1883223317721008711" name="variable" index="JncvA" />
+        <child id="1883223317721008710" name="nodeExpression" index="JncvB" />
+      </concept>
+      <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
+      <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
@@ -137,6 +152,7 @@
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
       <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
+      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -169,141 +185,142 @@
   <node concept="312cEu" id="w3eGJcGcTr">
     <property role="TrG5h" value="NameManglingHelper" />
     <node concept="2tJIrI" id="w3eGJcRWkW" role="jymVt" />
-    <node concept="2YIFZL" id="w3eGJcRYxF" role="jymVt">
-      <property role="TrG5h" value="uniqueNodes" />
+    <node concept="2YIFZL" id="601qOas6EVy" role="jymVt">
+      <property role="TrG5h" value="uniqueMangleableModuleContents" />
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
-      <node concept="3clFbS" id="w3eGJcRYxI" role="3clF47">
-        <node concept="3cpWs8" id="7CwOa_hoPwA" role="3cqZAp">
-          <node concept="3cpWsn" id="7CwOa_hoPwD" role="3cpWs9">
-            <property role="TrG5h" value="nameMap" />
-            <node concept="3rvAFt" id="7CwOa_hoPww" role="1tU5fm">
-              <node concept="17QB3L" id="7CwOa_hoP_o" role="3rvQeY" />
-              <node concept="2hMVRd" id="7CwOa_hoSxP" role="3rvSg0">
-                <node concept="3Tqbb2" id="7CwOa_hoSGp" role="2hN53Y">
-                  <ref role="ehGHo" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
+      <node concept="3clFbS" id="601qOas6EVz" role="3clF47">
+        <node concept="3clFbH" id="601qOas6EV$" role="3cqZAp" />
+        <node concept="3cpWs8" id="601qOas6EV_" role="3cqZAp">
+          <node concept="3cpWsn" id="601qOas6EVA" role="3cpWs9">
+            <property role="TrG5h" value="allModuleContent" />
+            <node concept="3rvAFt" id="601qOas6EVB" role="1tU5fm">
+              <node concept="17QB3L" id="601qOas6EVC" role="3rvQeY" />
+              <node concept="2hMVRd" id="601qOas6EVD" role="3rvSg0">
+                <node concept="3Tqbb2" id="601qOas6EVE" role="2hN53Y">
+                  <ref role="ehGHo" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
                 </node>
               </node>
             </node>
-            <node concept="2ShNRf" id="7CwOa_hoT54" role="33vP2m">
-              <node concept="3rGOSV" id="7CwOa_hoT4S" role="2ShVmc">
-                <node concept="17QB3L" id="7CwOa_hoT4T" role="3rHrn6" />
-                <node concept="2hMVRd" id="7CwOa_hoT4U" role="3rHtpV">
-                  <node concept="3Tqbb2" id="7CwOa_hoT4V" role="2hN53Y">
-                    <ref role="ehGHo" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
+            <node concept="2ShNRf" id="601qOas6EVF" role="33vP2m">
+              <node concept="3rGOSV" id="601qOas6EVG" role="2ShVmc">
+                <node concept="17QB3L" id="601qOas6EVH" role="3rHrn6" />
+                <node concept="2hMVRd" id="601qOas6EVI" role="3rHtpV">
+                  <node concept="3Tqbb2" id="601qOas6EVJ" role="2hN53Y">
+                    <ref role="ehGHo" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="7CwOa_hphEj" role="3cqZAp" />
-        <node concept="2Gpval" id="7CwOa_hoQ2_" role="3cqZAp">
-          <node concept="2GrKxI" id="7CwOa_hoQ2B" role="2Gsz3X">
+        <node concept="3clFbH" id="601qOas6EVK" role="3cqZAp" />
+        <node concept="2Gpval" id="601qOas6EVL" role="3cqZAp">
+          <node concept="2GrKxI" id="601qOas6EVM" role="2Gsz3X">
             <property role="TrG5h" value="content" />
           </node>
-          <node concept="2OqwBi" id="7CwOa_hoQLY" role="2GsD0m">
-            <node concept="37vLTw" id="w3eGJcS5Gg" role="2Oq$k0">
-              <ref role="3cqZAo" node="w3eGJcRYy7" resolve="model" />
+          <node concept="2OqwBi" id="601qOas6EVN" role="2GsD0m">
+            <node concept="37vLTw" id="601qOas6EVO" role="2Oq$k0">
+              <ref role="3cqZAo" node="601qOas6EXb" resolve="model" />
             </node>
-            <node concept="2SmgA7" id="7CwOa_hoQWi" role="2OqNvi">
-              <node concept="chp4Y" id="34J_5JZVTeo" role="1dBWTz">
-                <ref role="cht4Q" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
+            <node concept="2SmgA7" id="601qOas6EVP" role="2OqNvi">
+              <node concept="chp4Y" id="601qOas6EVQ" role="1dBWTz">
+                <ref role="cht4Q" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
               </node>
             </node>
           </node>
-          <node concept="3clFbS" id="7CwOa_hoT7y" role="2LFqv$">
-            <node concept="3clFbJ" id="7CwOa_hoT7v" role="3cqZAp">
-              <node concept="3clFbS" id="7CwOa_hoT7w" role="3clFbx">
-                <node concept="3clFbF" id="7CwOa_hoW_e" role="3cqZAp">
-                  <node concept="37vLTI" id="7CwOa_hoZhl" role="3clFbG">
-                    <node concept="2ShNRf" id="7CwOa_hoZA3" role="37vLTx">
-                      <node concept="2i4dXS" id="7CwOa_hoZmQ" role="2ShVmc">
-                        <node concept="3Tqbb2" id="7CwOa_hoZmR" role="HW$YZ">
-                          <ref role="ehGHo" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
+          <node concept="3clFbS" id="601qOas6EVR" role="2LFqv$">
+            <node concept="3clFbJ" id="601qOas6EVS" role="3cqZAp">
+              <node concept="3clFbS" id="601qOas6EVT" role="3clFbx">
+                <node concept="3clFbF" id="601qOas6EVU" role="3cqZAp">
+                  <node concept="37vLTI" id="601qOas6EVV" role="3clFbG">
+                    <node concept="2ShNRf" id="601qOas6EVW" role="37vLTx">
+                      <node concept="2i4dXS" id="601qOas6EVX" role="2ShVmc">
+                        <node concept="3Tqbb2" id="601qOas6EVY" role="HW$YZ">
+                          <ref role="ehGHo" to="x27k:5_l8w1EmTdf" resolve="IModuleContent" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3EllGN" id="7CwOa_hoWOr" role="37vLTJ">
-                      <node concept="2OqwBi" id="7CwOa_hoWWZ" role="3ElVtu">
-                        <node concept="2GrUjf" id="7CwOa_hoWQ1" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="7CwOa_hoQ2B" resolve="content" />
+                    <node concept="3EllGN" id="601qOas6EVZ" role="37vLTJ">
+                      <node concept="2OqwBi" id="601qOas6EW0" role="3ElVtu">
+                        <node concept="2GrUjf" id="601qOas6EW1" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="601qOas6EVM" resolve="content" />
                         </node>
-                        <node concept="3TrcHB" id="7CwOa_hoXS_" role="2OqNvi">
+                        <node concept="3TrcHB" id="601qOas6EW2" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="7CwOa_hoW_d" role="3ElQJh">
-                        <ref role="3cqZAo" node="7CwOa_hoPwD" resolve="nameMap" />
+                      <node concept="37vLTw" id="601qOas6EW3" role="3ElQJh">
+                        <ref role="3cqZAo" node="601qOas6EVA" resolve="allModuleContent" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3clFbC" id="7CwOa_hoVr2" role="3clFbw">
-                <node concept="10Nm6u" id="7CwOa_hoVvD" role="3uHU7w" />
-                <node concept="3EllGN" id="7CwOa_hoTzy" role="3uHU7B">
-                  <node concept="2OqwBi" id="7CwOa_hoVBQ" role="3ElVtu">
-                    <node concept="2GrUjf" id="7CwOa_hoTM6" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="7CwOa_hoQ2B" resolve="content" />
+              <node concept="3clFbC" id="601qOas6EW4" role="3clFbw">
+                <node concept="10Nm6u" id="601qOas6EW5" role="3uHU7w" />
+                <node concept="3EllGN" id="601qOas6EW6" role="3uHU7B">
+                  <node concept="2OqwBi" id="601qOas6EW7" role="3ElVtu">
+                    <node concept="2GrUjf" id="601qOas6EW8" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="601qOas6EVM" resolve="content" />
                     </node>
-                    <node concept="3TrcHB" id="7CwOa_hoWvK" role="2OqNvi">
+                    <node concept="3TrcHB" id="601qOas6EW9" role="2OqNvi">
                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                     </node>
                   </node>
-                  <node concept="37vLTw" id="7CwOa_hoT8H" role="3ElQJh">
-                    <ref role="3cqZAo" node="7CwOa_hoPwD" resolve="nameMap" />
+                  <node concept="37vLTw" id="601qOas6EWa" role="3ElQJh">
+                    <ref role="3cqZAo" node="601qOas6EVA" resolve="allModuleContent" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7CwOa_hp0f8" role="3cqZAp">
-              <node concept="2OqwBi" id="7CwOa_hp2Im" role="3clFbG">
-                <node concept="3EllGN" id="7CwOa_hp0Nc" role="2Oq$k0">
-                  <node concept="2OqwBi" id="7CwOa_hp0VK" role="3ElVtu">
-                    <node concept="2GrUjf" id="7CwOa_hp0OM" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="7CwOa_hoQ2B" resolve="content" />
+            <node concept="3clFbF" id="601qOas6EWb" role="3cqZAp">
+              <node concept="2OqwBi" id="601qOas6EWc" role="3clFbG">
+                <node concept="3EllGN" id="601qOas6EWd" role="2Oq$k0">
+                  <node concept="2OqwBi" id="601qOas6EWe" role="3ElVtu">
+                    <node concept="2GrUjf" id="601qOas6EWf" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="601qOas6EVM" resolve="content" />
                     </node>
-                    <node concept="3TrcHB" id="7CwOa_hp26q" role="2OqNvi">
+                    <node concept="3TrcHB" id="601qOas6EWg" role="2OqNvi">
                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                     </node>
                   </node>
-                  <node concept="37vLTw" id="7CwOa_hp0f7" role="3ElQJh">
-                    <ref role="3cqZAo" node="7CwOa_hoPwD" resolve="nameMap" />
+                  <node concept="37vLTw" id="601qOas6EWh" role="3ElQJh">
+                    <ref role="3cqZAo" node="601qOas6EVA" resolve="allModuleContent" />
                   </node>
                 </node>
-                <node concept="TSZUe" id="7CwOa_hp5$6" role="2OqNvi">
-                  <node concept="2GrUjf" id="7CwOa_hp5CA" role="25WWJ7">
-                    <ref role="2Gs0qQ" node="7CwOa_hoQ2B" resolve="content" />
+                <node concept="TSZUe" id="601qOas6EWi" role="2OqNvi">
+                  <node concept="2GrUjf" id="601qOas6EWj" role="25WWJ7">
+                    <ref role="2Gs0qQ" node="601qOas6EVM" resolve="content" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="w3eGJcS5IR" role="3cqZAp" />
-        <node concept="3cpWs8" id="w3eGJcS5Mr" role="3cqZAp">
-          <node concept="3cpWsn" id="w3eGJcS5Mu" role="3cpWs9">
+        <node concept="3clFbH" id="601qOas6EWk" role="3cqZAp" />
+        <node concept="3cpWs8" id="601qOas6EWl" role="3cqZAp">
+          <node concept="3cpWsn" id="601qOas6EWm" role="3cpWs9">
             <property role="TrG5h" value="uniqueNodes" />
-            <node concept="2hMVRd" id="w3eGJcS5Mn" role="1tU5fm">
-              <node concept="3Tqbb2" id="w3eGJcS5OP" role="2hN53Y">
+            <node concept="2hMVRd" id="601qOas6EWn" role="1tU5fm">
+              <node concept="3Tqbb2" id="601qOas6EWo" role="2hN53Y">
                 <ref role="ehGHo" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
               </node>
             </node>
-            <node concept="2ShNRf" id="w3eGJcS6aU" role="33vP2m">
-              <node concept="2i4dXS" id="w3eGJcS6a7" role="2ShVmc">
-                <node concept="3Tqbb2" id="w3eGJcS6a8" role="HW$YZ">
+            <node concept="2ShNRf" id="601qOas6EWp" role="33vP2m">
+              <node concept="2i4dXS" id="601qOas6EWq" role="2ShVmc">
+                <node concept="3Tqbb2" id="601qOas6EWr" role="HW$YZ">
                   <ref role="ehGHo" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="w3eGJcS6bT" role="3cqZAp" />
-        <node concept="3SKdUt" id="7CwOa_hp8c4" role="3cqZAp">
-          <node concept="1PaTwC" id="13p6s1wtiMq" role="1aUNEU">
+        <node concept="3clFbH" id="601qOas6EWs" role="3cqZAp" />
+        <node concept="3SKdUt" id="601qOas6EWt" role="3cqZAp">
+          <node concept="1PaTwC" id="13p6s1wtiMq" role="3ndbpf">
             <node concept="3oM_SD" id="13p6s1wtiMr" role="1PaTwD">
-              <property role="3oM_SC" value="we" />
+              <property role="3oM_SC" value="We" />
             </node>
             <node concept="3oM_SD" id="13p6s1wtiMs" role="1PaTwD">
               <property role="3oM_SC" value="can" />
@@ -333,13 +350,34 @@
               <property role="3oM_SC" value="those" />
             </node>
             <node concept="3oM_SD" id="13p6s1wtiM_" role="1PaTwD">
-              <property role="3oM_SC" value="nodes" />
+              <property role="3oM_SC" value="module" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EWu" role="1PaTwD">
+              <property role="3oM_SC" value="content" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EWv" role="1PaTwD">
+              <property role="3oM_SC" value="elements" />
             </node>
             <node concept="3oM_SD" id="13p6s1wtiMA" role="1PaTwD">
-              <property role="3oM_SC" value="where" />
+              <property role="3oM_SC" value="that" />
             </node>
-            <node concept="3oM_SD" id="13p6s1wtiMB" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
+            <node concept="3oM_SD" id="601qOas6EWw" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EWx" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EWy" role="1PaTwD">
+              <property role="3oM_SC" value="name" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EWz" role="1PaTwD">
+              <property role="3oM_SC" value="mangled" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EW$" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="601qOas6EW_" role="1PaTwD">
+              <property role="3oM_SC" value="whose" />
             </node>
             <node concept="3oM_SD" id="13p6s1wtiMC" role="1PaTwD">
               <property role="3oM_SC" value="name" />
@@ -347,114 +385,117 @@
             <node concept="3oM_SD" id="13p6s1wtiMD" role="1PaTwD">
               <property role="3oM_SC" value="is" />
             </node>
-            <node concept="3oM_SD" id="13p6s1wtiME" role="1PaTwD">
+            <node concept="3oM_SD" id="601qOas6EWA" role="1PaTwD">
               <property role="3oM_SC" value="unique" />
             </node>
-            <node concept="3oM_SD" id="13p6s1wtiMF" role="1PaTwD">
-              <property role="3oM_SC" value="in" />
-            </node>
-            <node concept="3oM_SD" id="13p6s1wtiMG" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="13p6s1wtiMH" role="1PaTwD">
-              <property role="3oM_SC" value="map" />
-            </node>
           </node>
         </node>
-        <node concept="2Gpval" id="7CwOa_hpqnU" role="3cqZAp">
-          <node concept="2GrKxI" id="7CwOa_hpqnW" role="2Gsz3X">
+        <node concept="2Gpval" id="601qOas6EWB" role="3cqZAp">
+          <node concept="2GrKxI" id="601qOas6EWC" role="2Gsz3X">
             <property role="TrG5h" value="contentName" />
           </node>
-          <node concept="2OqwBi" id="7CwOa_hpr85" role="2GsD0m">
-            <node concept="37vLTw" id="7CwOa_hpqQO" role="2Oq$k0">
-              <ref role="3cqZAo" node="7CwOa_hoPwD" resolve="nameMap" />
+          <node concept="2OqwBi" id="601qOas6EWD" role="2GsD0m">
+            <node concept="37vLTw" id="601qOas6EWE" role="2Oq$k0">
+              <ref role="3cqZAo" node="601qOas6EVA" resolve="allModuleContent" />
             </node>
-            <node concept="3lbrtF" id="7CwOa_hptAr" role="2OqNvi" />
+            <node concept="3lbrtF" id="601qOas6EWF" role="2OqNvi" />
           </node>
-          <node concept="3clFbS" id="7CwOa_hpqo0" role="2LFqv$">
-            <node concept="3clFbJ" id="7CwOa_hptOY" role="3cqZAp">
-              <node concept="3clFbS" id="7CwOa_hptOZ" role="3clFbx">
-                <node concept="3clFbF" id="w3eGJcS7Tw" role="3cqZAp">
-                  <node concept="2OqwBi" id="w3eGJcS8bM" role="3clFbG">
-                    <node concept="37vLTw" id="w3eGJcS7Tv" role="2Oq$k0">
-                      <ref role="3cqZAo" node="w3eGJcS5Mu" resolve="uniqueNodes" />
-                    </node>
-                    <node concept="TSZUe" id="w3eGJcS9Lz" role="2OqNvi">
-                      <node concept="2OqwBi" id="w3eGJcSc0y" role="25WWJ7">
-                        <node concept="3EllGN" id="w3eGJcSa$V" role="2Oq$k0">
-                          <node concept="2GrUjf" id="w3eGJcSb4F" role="3ElVtu">
-                            <ref role="2Gs0qQ" node="7CwOa_hpqnW" resolve="contentName" />
-                          </node>
-                          <node concept="37vLTw" id="w3eGJcSa3T" role="3ElQJh">
-                            <ref role="3cqZAo" node="7CwOa_hoPwD" resolve="nameMap" />
+          <node concept="3clFbS" id="601qOas6EWG" role="2LFqv$">
+            <node concept="3clFbJ" id="601qOas6EWH" role="3cqZAp">
+              <node concept="3clFbS" id="601qOas6EWI" role="3clFbx">
+                <node concept="Jncv_" id="601qOas6EWJ" role="3cqZAp">
+                  <ref role="JncvD" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
+                  <node concept="3clFbS" id="601qOas6EWK" role="Jncv$">
+                    <node concept="3clFbF" id="601qOas6EWL" role="3cqZAp">
+                      <node concept="2OqwBi" id="601qOas6EWM" role="3clFbG">
+                        <node concept="37vLTw" id="601qOas6EWN" role="2Oq$k0">
+                          <ref role="3cqZAo" node="601qOas6EWm" resolve="uniqueNodes" />
+                        </node>
+                        <node concept="TSZUe" id="601qOas6EWO" role="2OqNvi">
+                          <node concept="Jnkvi" id="601qOas6EWP" role="25WWJ7">
+                            <ref role="1M0zk5" node="601qOas6EWQ" resolve="mangleable" />
                           </node>
                         </node>
-                        <node concept="1uHKPH" id="w3eGJcSeji" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
+                  <node concept="JncvC" id="601qOas6EWQ" role="JncvA">
+                    <property role="TrG5h" value="mangleable" />
+                    <node concept="2jxLKc" id="601qOas6EWR" role="1tU5fm" />
+                  </node>
+                  <node concept="2OqwBi" id="601qOas6EWS" role="JncvB">
+                    <node concept="3EllGN" id="601qOas6EWT" role="2Oq$k0">
+                      <node concept="2GrUjf" id="601qOas6EWU" role="3ElVtu">
+                        <ref role="2Gs0qQ" node="601qOas6EWC" resolve="contentName" />
+                      </node>
+                      <node concept="37vLTw" id="601qOas6EWV" role="3ElQJh">
+                        <ref role="3cqZAo" node="601qOas6EVA" resolve="allModuleContent" />
+                      </node>
+                    </node>
+                    <node concept="1uHKPH" id="601qOas6EWW" role="2OqNvi" />
+                  </node>
                 </node>
               </node>
-              <node concept="3clFbC" id="7CwOa_hpxXj" role="3clFbw">
-                <node concept="3cmrfG" id="7CwOa_hpy3$" role="3uHU7w">
+              <node concept="3clFbC" id="601qOas6EWX" role="3clFbw">
+                <node concept="3cmrfG" id="601qOas6EWY" role="3uHU7w">
                   <property role="3cmrfH" value="1" />
                 </node>
-                <node concept="2OqwBi" id="7CwOa_hpuZ4" role="3uHU7B">
-                  <node concept="3EllGN" id="7CwOa_hpugb" role="2Oq$k0">
-                    <node concept="2GrUjf" id="7CwOa_hpuuJ" role="3ElVtu">
-                      <ref role="2Gs0qQ" node="7CwOa_hpqnW" resolve="contentName" />
+                <node concept="2OqwBi" id="601qOas6EWZ" role="3uHU7B">
+                  <node concept="3EllGN" id="601qOas6EX0" role="2Oq$k0">
+                    <node concept="2GrUjf" id="601qOas6EX1" role="3ElVtu">
+                      <ref role="2Gs0qQ" node="601qOas6EWC" resolve="contentName" />
                     </node>
-                    <node concept="37vLTw" id="7CwOa_hptPm" role="3ElQJh">
-                      <ref role="3cqZAo" node="7CwOa_hoPwD" resolve="nameMap" />
+                    <node concept="37vLTw" id="601qOas6EX2" role="3ElQJh">
+                      <ref role="3cqZAo" node="601qOas6EVA" resolve="allModuleContent" />
                     </node>
                   </node>
-                  <node concept="34oBXx" id="7CwOa_hpxxS" role="2OqNvi" />
+                  <node concept="34oBXx" id="601qOas6EX3" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="w3eGJcS6e6" role="3cqZAp" />
-        <node concept="3cpWs6" id="w3eGJcSe_L" role="3cqZAp">
-          <node concept="37vLTw" id="w3eGJcSeDx" role="3cqZAk">
-            <ref role="3cqZAo" node="w3eGJcS5Mu" resolve="uniqueNodes" />
+        <node concept="3clFbH" id="601qOas6EX4" role="3cqZAp" />
+        <node concept="3cpWs6" id="601qOas6EX5" role="3cqZAp">
+          <node concept="2OqwBi" id="601qOas6EX6" role="3cqZAk">
+            <node concept="37vLTw" id="601qOas6EX7" role="2Oq$k0">
+              <ref role="3cqZAo" node="601qOas6EWm" resolve="uniqueNodes" />
+            </node>
+            <node concept="ANE8D" id="601qOas6EX8" role="2OqNvi" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="w3eGJcRYxq" role="1B3o_S" />
-      <node concept="2hMVRd" id="w3eGJcRYx_" role="3clF45">
-        <node concept="3Tqbb2" id="w3eGJcRYy2" role="2hN53Y">
-          <ref role="ehGHo" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
-        </node>
+      <node concept="3Tm1VV" id="601qOas6EX9" role="1B3o_S" />
+      <node concept="2I9FWS" id="601qOas6EXa" role="3clF45">
+        <ref role="2I9WkF" to="x27k:2ofiXe_tTHX" resolve="ICanMangleNames" />
       </node>
-      <node concept="37vLTG" id="w3eGJcRYy7" role="3clF46">
+      <node concept="37vLTG" id="601qOas6EXb" role="3clF46">
         <property role="TrG5h" value="model" />
-        <node concept="H_c77" id="w3eGJcRYy6" role="1tU5fm" />
+        <node concept="H_c77" id="601qOas6EXc" role="1tU5fm" />
       </node>
-      <node concept="P$JXv" id="w3eGJcSeK0" role="lGtFl">
-        <node concept="TZ5HA" id="w3eGJcSeK1" role="TZ5H$">
-          <node concept="1dT_AC" id="w3eGJcSeNw" role="1dT_Ay">
+      <node concept="P$JXv" id="601qOas6EXd" role="lGtFl">
+        <node concept="TZ5HA" id="601qOas6EXe" role="TZ5H$">
+          <node concept="1dT_AC" id="601qOas6EXf" role="1dT_Ay">
             <property role="1dT_AB" value="Returns those ICanMangleNames nodes from the model which have a unique name (within the model). " />
           </node>
         </node>
-        <node concept="TZ5HA" id="w3eGJcSeOt" role="TZ5H$">
-          <node concept="1dT_AC" id="w3eGJcSeOu" role="1dT_Ay">
+        <node concept="TZ5HA" id="601qOas6EXg" role="TZ5H$">
+          <node concept="1dT_AC" id="601qOas6EXh" role="1dT_Ay">
             <property role="1dT_AB" value="" />
           </node>
         </node>
-        <node concept="TZ5HA" id="w3eGJcSeOI" role="TZ5H$">
-          <node concept="1dT_AC" id="w3eGJcSeOJ" role="1dT_Ay">
+        <node concept="TZ5HA" id="601qOas6EXi" role="TZ5H$">
+          <node concept="1dT_AC" id="601qOas6EXj" role="1dT_Ay">
             <property role="1dT_AB" value="During generation these nodes will have the prevent name mangling flag set to true, so no" />
           </node>
         </node>
-        <node concept="TZ5HA" id="w3eGJcSeOW" role="TZ5H$">
-          <node concept="1dT_AC" id="w3eGJcSeOX" role="1dT_Ay">
+        <node concept="TZ5HA" id="601qOas6EXk" role="TZ5H$">
+          <node concept="1dT_AC" id="601qOas6EXl" role="1dT_Ay">
             <property role="1dT_AB" value="module name will be prepended to their name in C. " />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="w3eGJcRWl4" role="jymVt" />
     <node concept="3Tm1VV" id="w3eGJcGcTs" role="1B3o_S" />
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps
index 79fdcd2752..6ca679401c 100755
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
@@ -374,6 +375,7 @@
     <property role="R4oN_" value="import a standard header (e.g. &lt;stdio&gt;)" />
     <property role="34LRSv" value="header" />
     <property role="EcuMT" value="3830958861296798479" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="3kEjc_WIKGg" role="1TKVEl">
       <property role="TrG5h" value="headerFileName" />
       <property role="IQ2nx" value="3830958861296798480" />
@@ -1673,5 +1675,10 @@
       <ref role="2wpffI" node="3_CPcn39d$G" />
     </node>
   </node>
+  <node concept="PlHQZ" id="4zr6ozuiDB5">
+    <property role="EcuMT" value="5249817866266122693" />
+    <property role="3GE5qa" value="" />
+    <property role="TrG5h" value="IStdHeaderImport" />
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
index 06cff5ce08..f2c231d392 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
@@ -7583,31 +7583,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="7MLN0_LfB1K" role="3cqZAp">
-                    <node concept="2OqwBi" id="7MLN0_LfB1L" role="3clFbG">
-                      <node concept="2OqwBi" id="7MLN0_LfB1M" role="2Oq$k0">
-                        <node concept="37vLTw" id="7MLN0_LfB1N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
-                        </node>
-                        <node concept="3Tsc0h" id="7MLN0_LfB1O" role="2OqNvi">
-                          <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" resolve="referencedModules" />
-                        </node>
-                      </node>
-                      <node concept="TSZUe" id="7MLN0_LfB1P" role="2OqNvi">
-                        <node concept="2pJPEk" id="7MLN0_LfB1Q" role="25WWJ7">
-                          <node concept="2pJPED" id="7MLN0_LfB1R" role="2pJPEn">
-                            <ref role="2pJxaS" to="51wr:6GqYvBOf2Xb" resolve="ModuleRef" />
-                            <node concept="2pIpSj" id="7MLN0_LfB1S" role="2pJxcM">
-                              <ref role="2pIpSl" to="51wr:6GqYvBOf2Xc" resolve="module" />
-                              <node concept="36bGnv" id="68PB5rZquqK" role="28nt2d">
-                                <ref role="36bGnp" to="b609:7MLN0_L8ysW" resolve="libgen" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbF" id="5PZNJkfG6sV" role="3cqZAp">
                     <node concept="2OqwBi" id="5PZNJkfG6sW" role="3clFbG">
                       <node concept="2OqwBi" id="5PZNJkfG6sX" role="2Oq$k0">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
index 489aaf28bb..9ca81a64d1 100755
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="-1" />
     <use id="ebb5e132-d298-4649-b320-b3f4d7f3acff" name="com.mbeddr.core.debug.blext" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -240,6 +240,7 @@
       </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
+        <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
@@ -7967,7 +7968,46 @@
       <node concept="3clFbS" id="6TPUpo$Sq$0" role="3clF47">
         <node concept="3clFbJ" id="6TPUpo$SraN" role="3cqZAp">
           <node concept="3clFbS" id="6TPUpo$SraP" role="3clFbx">
+            <node concept="3SKdUt" id="601qOas6DNu" role="3cqZAp">
+              <node concept="1PaTwC" id="601qOas6DNv" role="1aUNEU">
+                <node concept="3oM_SD" id="601qOas6DNw" role="1PaTwD">
+                  <property role="3oM_SC" value="Return" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNx" role="1PaTwD">
+                  <property role="3oM_SC" value="true" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNy" role="1PaTwD">
+                  <property role="3oM_SC" value="if" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNz" role="1PaTwD">
+                  <property role="3oM_SC" value="given" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DN$" role="1PaTwD">
+                  <property role="3oM_SC" value="message" />
+                </node>
+              </node>
+            </node>
             <node concept="3SKdUt" id="6TPUpo$Sr4g" role="3cqZAp">
+              <node concept="1PaTwC" id="601qOas6$AG" role="3ndbpf">
+                <node concept="3oM_SD" id="6leHaJbkWHN" role="1PaTwD">
+                  <property role="3oM_SC" value="-" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbkXl4" role="1PaTwD">
+                  <property role="3oM_SC" value="ends" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbkXVD" role="1PaTwD">
+                  <property role="3oM_SC" value="with" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbkXVH" role="1PaTwD">
+                  <property role="3oM_SC" value="&quot;" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbkYy4" role="1PaTwD">
+                  <property role="3oM_SC" value="or" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbkYyi" role="1PaTwD">
+                  <property role="3oM_SC" value="'" />
+                </node>
+              </node>
               <node concept="1PaTwC" id="6TPUpo$Sr4h" role="1aUNEU">
                 <node concept="3oM_SD" id="6TPUpo$Sr4F" role="1PaTwD">
                   <property role="3oM_SC" value="Return" />
@@ -8117,6 +8157,28 @@
                 </node>
               </node>
             </node>
+            <node concept="3SKdUt" id="601qOas6DNd" role="3cqZAp">
+              <node concept="1PaTwC" id="601qOas6DNe" role="1aUNEU">
+                <node concept="3oM_SD" id="601qOas6DNi" role="1PaTwD">
+                  <property role="3oM_SC" value="-" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNj" role="1PaTwD">
+                  <property role="3oM_SC" value="starts" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNk" role="1PaTwD">
+                  <property role="3oM_SC" value="with" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNl" role="1PaTwD">
+                  <property role="3oM_SC" value="&quot;" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNm" role="1PaTwD">
+                  <property role="3oM_SC" value="or" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DNn" role="1PaTwD">
+                  <property role="3oM_SC" value="'" />
+                </node>
+              </node>
+            </node>
             <node concept="3SKdUt" id="59cfP9u6Mh9" role="3cqZAp">
               <node concept="1PaTwC" id="3$f8hf_N7Zj" role="1aUNEU">
                 <node concept="3oM_SD" id="3$f8hf_N7Zi" role="1PaTwD">
@@ -8148,7 +8210,7 @@
                   <node concept="liA8E" id="6TPUpo$St3V" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                     <node concept="Xl_RD" id="6TPUpo$St5h" role="37wK5m">
-                      <property role="Xl_RC" value=".*( |\\\\[nt]|0x|#|[\\(\\[\\{]|[\\+\\-*/]|[§~])" />
+                      <property role="Xl_RC" value=".*( |\\\\[nt]|0x|#|[\\(\\[\\{]|[\\+\\-*/]|[\&quot;']|[§~])" />
                     </node>
                   </node>
                 </node>
@@ -8194,6 +8256,26 @@
           </node>
           <node concept="3clFbS" id="3PUmE2muYe7" role="Jncv$">
             <node concept="3SKdUt" id="3PUmE2lLNbI" role="3cqZAp">
+              <node concept="1PaTwC" id="601qOas6$AT" role="3ndbpf">
+                <node concept="3oM_SD" id="6leHaJbl0l7" role="1PaTwD">
+                  <property role="3oM_SC" value="-" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbl0Wr" role="1PaTwD">
+                  <property role="3oM_SC" value="starts" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbl1yK" role="1PaTwD">
+                  <property role="3oM_SC" value="with" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbl1yO" role="1PaTwD">
+                  <property role="3oM_SC" value="&quot;" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbl29b" role="1PaTwD">
+                  <property role="3oM_SC" value="or" />
+                </node>
+                <node concept="3oM_SD" id="6leHaJbl29h" role="1PaTwD">
+                  <property role="3oM_SC" value="'" />
+                </node>
+              </node>
               <node concept="1PaTwC" id="3PUmE2lLNbJ" role="1aUNEU">
                 <node concept="3oM_SD" id="3PUmE2lLNbL" role="1PaTwD">
                   <property role="3oM_SC" value="Return" />
@@ -8352,6 +8434,28 @@
                 </node>
               </node>
             </node>
+            <node concept="3SKdUt" id="601qOas6DKl" role="3cqZAp">
+              <node concept="1PaTwC" id="601qOas6DKm" role="1aUNEU">
+                <node concept="3oM_SD" id="601qOas6DKq" role="1PaTwD">
+                  <property role="3oM_SC" value="-" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DKr" role="1PaTwD">
+                  <property role="3oM_SC" value="starts" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DKs" role="1PaTwD">
+                  <property role="3oM_SC" value="with" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DKt" role="1PaTwD">
+                  <property role="3oM_SC" value="&quot;" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DKu" role="1PaTwD">
+                  <property role="3oM_SC" value="or" />
+                </node>
+                <node concept="3oM_SD" id="601qOas6DKv" role="1PaTwD">
+                  <property role="3oM_SC" value="'" />
+                </node>
+              </node>
+            </node>
             <node concept="3SKdUt" id="59cfP9u6Mhr" role="3cqZAp">
               <node concept="1PaTwC" id="3$f8hf_NmoJ" role="1aUNEU">
                 <node concept="3oM_SD" id="3$f8hf_NmoI" role="1PaTwD">
@@ -8399,7 +8503,7 @@
                   <node concept="liA8E" id="6TPUpo$OfV3" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                     <node concept="Xl_RD" id="6TPUpo$OfV4" role="37wK5m">
-                      <property role="Xl_RC" value="( |\\\\[nt]|[\\.,:;?!]|[\\)\\]\\}]|[\\+\\-*/]|[%°]).*" />
+                      <property role="Xl_RC" value="( |\\\\[nt]|[\\.,:;?!]|[\\)\\]\\}]|[\\+\\-*/]|[\&quot;']|[%°]).*" />
                     </node>
                   </node>
                 </node>