From be734e6745b1252f81d9a2c63611ddbac77bd09b Mon Sep 17 00:00:00 2001
From: ratiud <extern.daniel.ratiu@volkswagen.de>
Date: Sun, 12 Jan 2025 20:52:58 +0100
Subject: [PATCH] safety: cleanup code to get green linters

---
 .../com.fasten.safety.bayesian_network.mpl    |  5 +-
 ....fasten.safety.bayesian_network.editor.mps |  1 -
 ...com.fasten.safety.fmea.iso26262.editor.mps |  1 -
 .../com.fasten.safety.fmea.mpl                |  4 +-
 .../models/com.fasten.safety.fmea.editor.mps  |  1 -
 ...om.fasten.safety.hiphops.arch.behavior.mps | 54 ++++++++++++++++---
 ...eddr.formal.safety.argument.modelquery.mpl |  1 -
 ...rmal.safety.argument.modelquery.editor.mps |  1 -
 ...r.formal.safety.argument.visualisation.mpl |  3 +-
 ...l.safety.argument.visualisation.editor.mps |  1 -
 ....mbeddr.formal.safety.gsn.ext.behavior.mps |  1 -
 .../com.mbeddr.formal.safety.iso26262.mpl     |  4 +-
 ...m.mbeddr.formal.safety.iso26262.editor.mps |  1 -
 ...sten.safety.hiphops.sandbox._010_smoke.mps | 44 +++++++--------
 ...y.doc2word._100_gsn_documents_testdata.mps |  2 +-
 15 files changed, 74 insertions(+), 50 deletions(-)

diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
index fd2f668c..bcb7f826 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.fasten.safety.bayesian_network" uuid="14289527-ae82-48f0-ab60-380cec6ac506" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -12,10 +12,10 @@
   </facets>
   <accessoryModels />
   <dependencies>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
+    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -62,7 +62,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="14289527-ae82-48f0-ab60-380cec6ac506(com.fasten.safety.bayesian_network)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
index 967c5cd7..55388b0a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
@@ -9,7 +9,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
index 2313f41c..6e74ce3e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="0" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
index 4a53f517..9d664400 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.fasten.safety.fmea" uuid="b43c548b-f75f-46e2-ad24-de9edd93e95e" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
@@ -60,7 +59,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="b43c548b-f75f-46e2-ad24-de9edd93e95e(com.fasten.safety.fmea)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
index 0e0f546e..aacd0813 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
@@ -10,7 +10,6 @@
   </languages>
   <imports>
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="arip" ref="r:05796a31-2f42-44d2-9b5e-7769941d865b(com.fasten.safety.fmea.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
index ab9a239a..a641a250 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
@@ -16,6 +16,7 @@
     <import index="ii8j" ref="r:a06544ed-39eb-44c0-b516-bb222deb41dc(com.fasten.safety.hiphops.structure)" />
     <import index="7wf3" ref="r:c49134f0-ff6f-4ef4-ad9f-10c1a3f47c1a(com.mbeddr.formal.base.arch.behavior)" />
     <import index="h4ob" ref="r:c1b5027c-c0fd-4ce6-a884-7934c1083045(com.fasten.safety.hiphops.util)" />
+    <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -41,6 +42,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -113,12 +117,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="13h7C7" id="1TeaL8RdRMo">
-    <ref role="13h7C2" to="zsc5:1TeaL8Rdz2m" resolve="LogicalTypeFailureModes" />
-    <node concept="13hLZK" id="1TeaL8RdRMp" role="13h7CW">
-      <node concept="3clFbS" id="1TeaL8RdRMq" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="1TeaL8Rem0F">
     <ref role="13h7C2" to="zsc5:1TeaL8Rddhw" resolve="IFFMEA" />
     <node concept="13hLZK" id="1TeaL8Rem0G" role="13h7CW">
@@ -240,6 +238,50 @@
       </node>
       <node concept="17QB3L" id="1f_hJh28xoo" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="59o88jXkJNA" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" to="ox2v:4_pH3zvp0Zq" resolve="renderReadable" />
+      <node concept="3Tm1VV" id="59o88jXkJNB" role="1B3o_S" />
+      <node concept="3clFbS" id="59o88jXkJNS" role="3clF47">
+        <node concept="3clFbF" id="59o88jXkLko" role="3cqZAp">
+          <node concept="3cpWs3" id="59o88jXkQVA" role="3clFbG">
+            <node concept="2OqwBi" id="59o88jXkSNF" role="3uHU7w">
+              <node concept="2OqwBi" id="59o88jXkRFJ" role="2Oq$k0">
+                <node concept="13iPFW" id="59o88jXkR0Z" role="2Oq$k0" />
+                <node concept="3TrEf2" id="59o88jXkSpc" role="2OqNvi">
+                  <ref role="3Tt5mk" to="ii8j:1TeaL8RefrY" resolve="failureMode" />
+                </node>
+              </node>
+              <node concept="3TrcHB" id="59o88jXkT68" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+            <node concept="3cpWs3" id="59o88jXkQPd" role="3uHU7B">
+              <node concept="2OqwBi" id="59o88jXkPcI" role="3uHU7B">
+                <node concept="2OqwBi" id="59o88jXkO36" role="2Oq$k0">
+                  <node concept="2OqwBi" id="59o88jXkLzP" role="2Oq$k0">
+                    <node concept="13iPFW" id="59o88jXkLkn" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="59o88jXkNMG" role="2OqNvi">
+                      <ref role="3Tt5mk" to="zsc5:62cfieEOV22" resolve="port" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="59o88jXkOW4" role="2OqNvi">
+                    <ref role="3Tt5mk" to="3whv:7RhjhI7$li3" resolve="port" />
+                  </node>
+                </node>
+                <node concept="3TrcHB" id="59o88jXkP$q" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="59o88jXkQUs" role="3uHU7w">
+                <property role="Xl_RC" value="." />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="59o88jXkJNT" role="3clF45" />
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
index de09622b..cbd97b75 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
@@ -83,7 +83,6 @@
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
index 04c01d8a..7e8d14e5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
@@ -7,7 +7,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
index bd2a7445..9fe23eee 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.argument.visualisation" uuid="04d81d12-7048-4552-9a53-86a271c0f094" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
index d81636e7..23b6f8cd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
@@ -8,7 +8,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="tlox" ref="56f134c7-a829-428d-9119-715369c69768/java:net.sf.jtreemap.swing.provider(org.mpsqa.treemap.lib/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
index f87cc029..9dbcff6a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
@@ -14,7 +14,6 @@
     <import index="w873" ref="r:0de03bcd-6ad8-423c-b85e-ae3dd18ed2b3(com.mbeddr.formal.base.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="mcvo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure.language(MPS.Core/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
index e6fd48b5..6c0cd8c6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.iso26262" uuid="a798113f-e2cd-4e21-a8e2-ca1903cb9c43" languageVersion="1" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
@@ -64,7 +63,6 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
     <module reference="a798113f-e2cd-4e21-a8e2-ca1903cb9c43(com.mbeddr.formal.safety.iso26262)" version="0" />
     <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
index b175b3b2..f73d8548 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
@@ -9,7 +9,6 @@
   </languages>
   <imports>
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="1w8j" ref="r:0631ef51-dd11-46fa-a4db-001e68da09c6(com.mbeddr.formal.safety.iso26262.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
index d78d39f7..8580ca59 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
@@ -1125,7 +1125,7 @@
           <property role="gqqTZ" value="12.0" />
           <property role="gqqTW" value="280.0" />
           <property role="gqqTX" value="106.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDm" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1143,7 +1143,7 @@
           <property role="gqqTZ" value="138.0" />
           <property role="gqqTW" value="280.0" />
           <property role="gqqTX" value="111.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDq" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1161,7 +1161,7 @@
           <property role="gqqTZ" value="82.9" />
           <property role="gqqTW" value="12.0" />
           <property role="gqqTX" value="183.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDu" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1178,21 +1178,13 @@
         <node concept="gqqVs" id="4TCu33h1eDw" role="37mO4d">
           <property role="gqqTZ" value="153.95" />
           <property role="gqqTW" value="180.0" />
-          <property role="gqqTX" value="60.0" />
-          <property role="gqqTy" value="60.0" />
+          <property role="gqqTX" value="62.0" />
+          <property role="gqqTy" value="62.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDy" role="1pap1a">
             <property role="1pa3iD" value="port" />
             <property role="2gRgW$" value="1259048879" />
           </node>
-          <node concept="1pa3jb" id="4TCu33h1eDz" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809310" />
-            <property role="2gRgW$" value="1844411357" />
-          </node>
-          <node concept="1pa3jb" id="4TCu33h1eD$" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809312" />
-            <property role="2gRgW$" value="1376814111" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="4TCu33h1eDA" role="37mRID">
@@ -1201,7 +1193,7 @@
           <property role="gqqTZ" value="17.950000000000003" />
           <property role="gqqTW" value="180.0" />
           <property role="gqqTX" value="116.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDB" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1218,21 +1210,13 @@
         <node concept="gqqVs" id="4TCu33h1eDD" role="37mO4d">
           <property role="gqqTZ" value="144.4" />
           <property role="gqqTW" value="80.0" />
-          <property role="gqqTX" value="60.0" />
-          <property role="gqqTy" value="60.0" />
+          <property role="gqqTX" value="62.0" />
+          <property role="gqqTy" value="62.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDF" role="1pap1a">
             <property role="1pa3iD" value="port" />
             <property role="2gRgW$" value="1259048879" />
           </node>
-          <node concept="1pa3jb" id="4TCu33h1eDG" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809313" />
-            <property role="2gRgW$" value="1844411357" />
-          </node>
-          <node concept="1pa3jb" id="4TCu33h1eDH" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809315" />
-            <property role="2gRgW$" value="1376814111" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="4TCu33h1eDJ" role="37mRID">
@@ -1261,6 +1245,18 @@
           </node>
         </node>
       </node>
+      <node concept="37mRIm" id="59o88jXktUq" role="37mRID">
+        <property role="37mO49" value="5649897883596809310" />
+        <node concept="2VclpC" id="59o88jXktUp" role="37mO4d" />
+      </node>
+      <node concept="37mRIm" id="59o88jXktUs" role="37mRID">
+        <property role="37mO49" value="5649897883596809313" />
+        <node concept="2VclpC" id="59o88jXktUr" role="37mO4d" />
+      </node>
+      <node concept="37mRIm" id="59o88jXktUu" role="37mRID">
+        <property role="37mO49" value="5649897883596809316" />
+        <node concept="2VclpC" id="59o88jXktUt" role="37mO4d" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
index 77ce281b..d7e39270 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
@@ -221,7 +221,7 @@
   </node>
   <node concept="qdN4g" id="3mpcDUdycH1">
     <property role="yApLE" value="1" />
-    <property role="TrG5h" value="_110_argument_over_hazards" />
+    <property role="TrG5h" value="_110_argument_over_hazards_doc" />
     <ref role="qdN4h" node="3mpcDUdya9X" resolve="_110_argument_over_hazards" />
     <ref role="G9hjw" node="3mpcDUdy7QQ" resolve="config" />
     <node concept="1mvXsy" id="3mpcDUdycH7" role="1_0VJ0">