Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script06.rxtst
===================================================================
diff -u -r82902a907f3e77c55c0d03268f47a7a568182d12 -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script06.rxtst	(.../Script06.rxtst)	(revision 82902a907f3e77c55c0d03268f47a7a568182d12)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script06.rxtst	(.../Script06.rxtst)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -1143,7 +1143,7 @@
 					</param>
 					<param
 					name="PrefixFMInStateFA"
-					value="Traject>Generieke faalpaden>">
+					value="Traject>@GF>">
 					</param>
 					<param
 					name="SuffixSections"
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script17.rxtst
===================================================================
diff -u -r212d20dbc3f0791a301c538717fc8c14954602ab -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script17.rxtst	(.../Script17.rxtst)	(revision 212d20dbc3f0791a301c538717fc8c14954602ab)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script17.rxtst	(.../Script17.rxtst)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -3256,7 +3256,7 @@
 						12-2&gt;@STPH
 					</td>
 					<td>
-						12-2&gt;Generieke faalpaden&gt;@STPH&gt;Invoer&gt;Vakindeling
+						12-2&gt;@GF&gt;@STPH&gt;Invoer&gt;Vakindeling
 					</td>
 					<td>
 						12-2&gt;@STPH&gt;Invoer&gt;Profielschematisaties
@@ -3274,10 +3274,10 @@
 						12-2&gt;@STPH&gt;Berekeningen
 					</td>
 					<td>
-						12-2&gt;Generieke faalpaden&gt;@STPH&gt;Oordeel&gt;Scenario's
+						12-2&gt;@GF&gt;@STPH&gt;Oordeel&gt;Scenario's
 					</td>
 					<td>
-						12-2&gt;Generieke faalpaden&gt;@STPH&gt;Oordeel&gt;Resultaat
+						12-2&gt;@GF&gt;@STPH&gt;Oordeel&gt;Resultaat
 					</td>
 					<td>
 						12-2&gt;@GEKB
@@ -3333,7 +3333,7 @@
 						12-2&gt;@GEKB
 					</td>
 					<td>
-						12-2&gt;Generieke faalpaden&gt;@GEKB&gt;Invoer&gt;Vakindeling
+						12-2&gt;@GF&gt;@GEKB&gt;Invoer&gt;Vakindeling
 					</td>
 					<td>
 					</td>
@@ -3350,10 +3350,10 @@
 						12-2&gt;@GEKB&gt;Berekeningen
 					</td>
 					<td>
-						12-2&gt;Generieke faalpaden&gt;@GEKB&gt;Oordeel&gt;Scenario's
+						12-2&gt;@GF&gt;@GEKB&gt;Oordeel&gt;Scenario's
 					</td>
 					<td>
-						12-2&gt;Generieke faalpaden&gt;@GEKB&gt;Oordeel&gt;Resultaat
+						12-2&gt;@GF&gt;@GEKB&gt;Oordeel&gt;Resultaat
 					</td>
 					<td>
 						12-2&gt;@STBI
@@ -3408,7 +3408,7 @@
 						41-1&gt;@STBI
 					</td>
 					<td>
-						41-1&gt;Generieke faalpaden&gt;@STBI&gt;Invoer&gt;Vakindeling
+						41-1&gt;@GF&gt;@STBI&gt;Invoer&gt;Vakindeling
 					</td>
 					<td>
 						41-1&gt;@STBI&gt;Invoer&gt;Profielschematisaties
@@ -3426,10 +3426,10 @@
 						41-1&gt;@STBI&gt;Berekeningen
 					</td>
 					<td>
-						41-1&gt;Generieke faalpaden&gt;@STBI&gt;Oordeel&gt;Scenario's
+						41-1&gt;@GF&gt;@STBI&gt;Oordeel&gt;Scenario's
 					</td>
 					<td>
-						41-1&gt;Generieke faalpaden&gt;@STBI&gt;Oordeel&gt;Resultaat
+						41-1&gt;@GF&gt;@STBI&gt;Oordeel&gt;Resultaat
 					</td>
 					<td>
 						41-1&gt;@HTKW
@@ -3485,7 +3485,7 @@
 						36-2&gt;@HTKW
 					</td>
 					<td>
-						36-2&gt;Generieke faalpaden&gt;@HTKW&gt;Invoer&gt;Vakindeling
+						36-2&gt;@GF&gt;@HTKW&gt;Invoer&gt;Vakindeling
 					</td>
 					<td>
 					</td>
@@ -3503,10 +3503,10 @@
 						36-2&gt;@HTKW&gt;Berekeningen
 					</td>
 					<td>
-						36-2&gt;Generieke faalpaden&gt;@HTKW&gt;Oordeel&gt;Scenario's
+						36-2&gt;@GF&gt;@HTKW&gt;Oordeel&gt;Scenario's
 					</td>
 					<td>
-						36-2&gt;Generieke faalpaden&gt;@HTKW&gt;Oordeel&gt;Resultaat
+						36-2&gt;@GF&gt;@HTKW&gt;Oordeel&gt;Resultaat
 					</td>
 					<td>
 						36-2&gt;@BSKW
@@ -3562,7 +3562,7 @@
 						34-1&gt;@BSKW
 					</td>
 					<td>
-						34-1&gt;Generieke faalpaden&gt;@BSKW&gt;Invoer&gt;Vakindeling
+						34-1&gt;@GF&gt;@BSKW&gt;Invoer&gt;Vakindeling
 					</td>
 					<td>
 					</td>
@@ -3580,10 +3580,10 @@
 						34-1&gt;@BSKW&gt;Berekeningen
 					</td>
 					<td>
-						34-1&gt;Generieke faalpaden&gt;@BSKW&gt;Oordeel&gt;Scenario's
+						34-1&gt;@GF&gt;@BSKW&gt;Oordeel&gt;Scenario's
 					</td>
 					<td>
-						34-1&gt;Generieke faalpaden&gt;@BSKW&gt;Oordeel&gt;Resultaat
+						34-1&gt;@GF&gt;@BSKW&gt;Oordeel&gt;Resultaat
 					</td>
 					<td>
 						34-1&gt;@STKWp
@@ -3639,7 +3639,7 @@
 						44-2&gt;@STKWp
 					</td>
 					<td>
-						44-2&gt;Generieke faalpaden&gt;@STKWp&gt;Invoer&gt;Vakindeling
+						44-2&gt;@GF&gt;@STKWp&gt;Invoer&gt;Vakindeling
 					</td>
 					<td>
 					</td>
@@ -3657,10 +3657,10 @@
 						44-2&gt;@STKWp&gt;Berekeningen
 					</td>
 					<td>
-						44-2&gt;Generieke faalpaden&gt;@STKWp&gt;Oordeel&gt;Scenario's
+						44-2&gt;@GF&gt;@STKWp&gt;Oordeel&gt;Scenario's
 					</td>
 					<td>
-						44-2&gt;Generieke faalpaden&gt;@STKWp&gt;Oordeel&gt;Resultaat
+						44-2&gt;@GF&gt;@STKWp&gt;Oordeel&gt;Resultaat
 					</td>
 					<td>
 						44-2&gt;@STKWp&gt;Berekeningen
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script19.rxtst
===================================================================
diff -u -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50 -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script19.rxtst	(.../Script19.rxtst)	(revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script19.rxtst	(.../Script19.rxtst)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -26,6 +26,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="f1631db4-d974-4bd8-a22c-dbb96e9fdddd"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -34,20 +42,20 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="f1631db4-d974-4bd8-a22c-dbb96e9fdddd"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="0a0498ed-9d9d-4ee4-8577-bfa5abfe2d05"
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="82d272ca-2451-4b3b-9301-57f1f78753a7"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -56,14 +64,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="82d272ca-2451-4b3b-9301-57f1f78753a7"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="0b008510-0332-4f98-a045-6254149543a0"
@@ -1482,8 +1482,8 @@
 			name="SelectStateWithCalculations">
 				<parameters>
 					<param
-					name="stateWithCalculations"
-					value="Sterkte">
+					name="stateName"
+					value="@SB">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -1634,8 +1634,8 @@
 			name="SelectStateHBC">
 				<parameters>
 					<param
-					name="stateWithCalculations"
-					value="Hydraulische">
+					name="stateName"
+					value="@HyB">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -2356,6 +2356,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="8cf19852-2f50-4cbc-ab0e-64ba790f2df9"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -2364,14 +2372,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="8cf19852-2f50-4cbc-ab0e-64ba790f2df9"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="d95f7327-8c7d-4b8d-a276-5a363721d777"
@@ -2722,8 +2722,8 @@
 			name="SelectStateCalculations">
 				<parameters>
 					<param
-					name="stateWithCalculations"
-					value="Sterkte">
+					name="stateName"
+					value="@SB">
 					</param>
 				</parameters>
 			</smartfoldernode>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script20.rxtst
===================================================================
diff -u -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50 -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script20.rxtst	(.../Script20.rxtst)	(revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script20.rxtst	(.../Script20.rxtst)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -350,8 +350,8 @@
 			name="SelectStateWithHBC">
 				<parameters>
 					<param
-					name="stateWithHBC"
-					value="Hydraulische">
+					name="stateNameWithHBC"
+					value="@HyB">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -466,6 +466,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="554a176c-4fac-4683-a23a-7bc9d17c822f"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -474,20 +482,20 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="554a176c-4fac-4683-a23a-7bc9d17c822f"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="4328510d-6fcf-464c-a832-f74124cceaba"
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="4c6c6a01-b1b1-4e90-af7d-f7b026dcc54d"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -496,14 +504,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="4c6c6a01-b1b1-4e90-af7d-f7b026dcc54d"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<smartfoldernode
 			id="4369cb7f-b6d3-4757-a40f-8a68494a29da"
@@ -687,8 +687,8 @@
 			name="SelectStateWithCalculations">
 				<parameters>
 					<param
-					name="stateWithCalculations"
-					value="Sterkte">
+					name="stateName"
+					value="@SB">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -845,8 +845,8 @@
 			name="SelectStateWithCalculations">
 				<parameters>
 					<param
-					name="stateWithCalculations"
-					value="Sterkte">
+					name="stateName"
+					value="@SB">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -1043,6 +1043,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateName"
+					datasourceid="ff975747-306b-4cfe-8fd4-eb3fb0de1826"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -1051,14 +1059,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="ff975747-306b-4cfe-8fd4-eb3fb0de1826"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="6d553bd3-8128-4897-b71b-d3967ebc9f1c"
@@ -1199,6 +1199,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateNameWithHBC"
+					datasourceid="2fc008ea-b0a3-4264-b074-d3051786566c"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -1207,14 +1215,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithHBC"
-					datasourceid="2fc008ea-b0a3-4264-b074-d3051786566c"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="8cd7ede6-b322-41ef-b90b-d46b2020d79b"
@@ -2390,8 +2390,8 @@
 			name="SelectStateWithCalculations">
 				<parameters>
 					<param
-					name="stateWithCalculations"
-					value="Sterkte">
+					name="stateName"
+					value="@SB">
 					</param>
 				</parameters>
 			</smartfoldernode>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script27.rxtst
===================================================================
diff -u -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50 -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script27.rxtst	(.../Script27.rxtst)	(revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script27.rxtst	(.../Script27.rxtst)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -3026,6 +3026,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="stateWithCalculations"
+					datasourceid="9a85db2e-f039-49e7-bed7-f36c802ad6c2"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="StateWithCalculations"
@@ -3034,14 +3042,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="stateWithCalculations"
-					datasourceid="9a85db2e-f039-49e7-bed7-f36c802ad6c2"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<smartfoldernode
 			errorbehavior="ContinueNextIteration"
@@ -5503,14 +5503,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
-				<missingdatavariablesbinding>
+				<databinding>
 					<var
 					dataname="StateWithCalculations"
 					datasourceid="e9f97e7e-0679-44f7-91f3-fdc9ab5754bc"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
 					</var>
-				</missingdatavariablesbinding>
+				</databinding>
 			</testmodule>
 			<smartfoldernode
 			id="ff073895-6a94-444e-8434-eb9e684bc5e7"
@@ -7109,7 +7109,7 @@
 						STPH
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						Traject&gt;@STPH&gt;Berekeningen&gt;12_2_02500
@@ -7129,7 +7129,7 @@
 						GEKB
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						Traject&gt;@GEKB&gt;Berekeningen
@@ -7149,7 +7149,7 @@
 						STBI
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						Traject&gt;@STBI&gt;Berekeningen&gt;Vak_41-123
@@ -7169,7 +7169,7 @@
 						HTKW
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						Traject&gt;@HTKW&gt;Berekeningen
@@ -7189,7 +7189,7 @@
 						BSKW
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						Traject&gt;@BSKW&gt;Berekeningen
@@ -7209,7 +7209,7 @@
 						STKWp
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						Traject&gt;@STKWp&gt;Berekeningen
@@ -7229,7 +7229,7 @@
 						ZST
 					</td>
 					<td>
-						Hydraulische
+						@HyB
 					</td>
 					<td>
 						Traject&gt;@ZST&gt;Hydraulische belastingen&gt;blokken en zuilen
@@ -7249,7 +7249,7 @@
 						AGK
 					</td>
 					<td>
-						Hydraulische
+						@HyB
 					</td>
 					<td>
 						Traject&gt;@AGK&gt;Hydraulische belastingen
@@ -7269,7 +7269,7 @@
 						GEBU
 					</td>
 					<td>
-						Hydraulische
+						@HyB
 					</td>
 					<td>
 						Traject&gt;@GEBU&gt;Hydraulische belastingen&gt;golfoploop en golfklap
@@ -7425,7 +7425,7 @@
 						STPH
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						input27_B_STPH.risk
@@ -7463,7 +7463,7 @@
 						STBI
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						input27_B_STBI.risk
@@ -7501,7 +7501,7 @@
 						GEKB
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						input27_B_GEKB.risk
@@ -7539,7 +7539,7 @@
 						BSKW
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						input27_B_BSKW.risk
@@ -7577,7 +7577,7 @@
 						HTKW
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						input27_B_HTKW.risk
@@ -7615,7 +7615,7 @@
 						STKWp
 					</td>
 					<td>
-						Sterkte
+						@SB
 					</td>
 					<td>
 						input27_B_STKWp.risk
@@ -7653,7 +7653,7 @@
 						ZST
 					</td>
 					<td>
-						Hydraulische
+						@HyB
 					</td>
 					<td>
 						input27_B_ZST.risk
@@ -7691,7 +7691,7 @@
 						AGK
 					</td>
 					<td>
-						Hydraulische
+						@HyB
 					</td>
 					<td>
 						input27_B_AGK.risk
@@ -7729,7 +7729,7 @@
 						GEBU
 					</td>
 					<td>
-						Hydraulische
+						@HyB
 					</td>
 					<td>
 						input27_B_GEBU.risk
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst
===================================================================
diff -u -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50 -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst	(.../Script29.rxtst)	(revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst	(.../Script29.rxtst)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -101,6 +101,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="nameState"
+					datasourceid="92d15ab5-01db-4817-81c6-28cfb61a0057"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="stateCalculations"
@@ -109,14 +117,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="nameStateFA"
-					datasourceid="92d15ab5-01db-4817-81c6-28cfb61a0057"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="05ef89cd-ada2-4f40-a763-9e0cfd1c9e35"
@@ -153,6 +153,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="nameState"
+					datasourceid="451c2b85-8ed2-4788-ad44-81c3482d2750"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="stateCalculations"
@@ -161,14 +169,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="nameStateTR"
-					datasourceid="451c2b85-8ed2-4788-ad44-81c3482d2750"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="0aeeb249-886d-4346-aad5-593e19dee32b"
@@ -369,11 +369,11 @@
 			</smartfoldernode>
 			<smartfoldernode
 			id="19ed3775-279e-4955-97b2-3dc0b5408c33"
-			name="SetStateFailurePathsAssembly">
+			name="SetStateResultsAssembly">
 				<parameters>
 					<param
-					name="nameStateFA"
-					value="Faalpaden">
+					name="nameState"
+					value="@RA">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -489,7 +489,7 @@
 					</param>
 					<param
 					name="SubstringGenericFailurePaths"
-					value="Generieke faalpaden">
+					value="@GF">
 					</param>
 					<param
 					name="wildcardCharacter"
@@ -767,11 +767,11 @@
 			</testmodule>
 			<smartfoldernode
 			id="3789e403-9ec5-4959-8ef7-03c7af296b21"
-			name="SetStateFailurePathsAssembly">
+			name="SetStateResultsAssembly">
 				<parameters>
 					<param
-					name="nameStateFA"
-					value="Faalpaden">
+					name="nameState"
+					value="@RA">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -1039,8 +1039,8 @@
 			name="SetStateTraject">
 				<parameters>
 					<param
-					name="nameStateTR"
-					value="Traject">
+					name="nameState"
+					value="@TR">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -1148,12 +1148,6 @@
 			name="a)BackgroundMap">
 			</smartfoldernode>
 			<testmodule
-			id="4dd8e7e7-5aa8-4657-964e-5a1204700ecd"
-			name="CreateScreenshotEntireDesktop"
-			ref="0f7ebadb-0285-4449-9422-0cd6fde5bf4d"
-			type="Recording">
-			</testmodule>
-			<testmodule
 			id="4e0209f2-4974-409f-859c-a96c00c8dd6f"
 			name="OpenViewForCurrentlySelectedItemInProjectExplorer"
 			ref="6295dc9c-a237-4ff3-b0ac-355382aaa3df"
@@ -1348,11 +1342,11 @@
 			</testmodule>
 			<smartfoldernode
 			id="66985f9c-b944-45ea-9b6d-d3c1e4b1de0f"
-			name="SetStateFailurePathsAssembly">
+			name="SetStateResultsAssembly">
 				<parameters>
 					<param
-					name="nameStateFA"
-					value="Faalpaden">
+					name="nameState"
+					value="@RA">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -1767,10 +1761,6 @@
 					</var>
 				</missingdatabinding>
 			</testmodule>
-			<testcase
-			id="85a3c9f1-960b-4f4d-b379-d5c05acbe835"
-			name="TakeScreenshotOfDesktop">
-			</testcase>
 			<smartfoldernode
 			id="85c80477-b489-48ce-858b-44638a9a14a5"
 			name="ReportScreenShotOfApplication">
@@ -1851,11 +1841,11 @@
 			</smartfoldernode>
 			<smartfoldernode
 			id="92d15ab5-01db-4817-81c6-28cfb61a0057"
-			name="SetStateFailurePathsAssembly">
+			name="SetStateResultsAssembly">
 				<parameters>
 					<param
-					name="nameStateFA"
-					value="Faalpaden">
+					name="nameState"
+					value="@RA">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -2237,8 +2227,8 @@
 			name="SetStateTraject">
 				<parameters>
 					<param
-					name="nameStateFA"
-					value="Traject">
+					name="nameState"
+					value="@TR">
 					</param>
 				</parameters>
 			</smartfoldernode>
@@ -2247,6 +2237,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="nameState"
+					datasourceid="66985f9c-b944-45ea-9b6d-d3c1e4b1de0f"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="stateCalculations"
@@ -2255,14 +2253,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="nameStateFA"
-					datasourceid="66985f9c-b944-45ea-9b6d-d3c1e4b1de0f"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="a7ac2e20-3b99-4b19-b40e-b243cd793b2d"
@@ -2565,6 +2555,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="nameState"
+					datasourceid="a567a181-7393-443c-9396-c15f458fad26"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="stateCalculations"
@@ -2573,14 +2571,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="nameStateFA"
-					datasourceid="a567a181-7393-443c-9396-c15f458fad26"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<smartfoldernode
 			datasource="script29b_LoopHideAllLayers"
@@ -3014,6 +3004,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="nameState"
+					datasourceid="3789e403-9ec5-4959-8ef7-03c7af296b21"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="stateCalculations"
@@ -3022,14 +3020,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="nameStateFA"
-					datasourceid="3789e403-9ec5-4959-8ef7-03c7af296b21"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="ed5b6e4a-db7c-4f4f-b2ea-cf6208bb2256"
@@ -3153,6 +3143,14 @@
 			name="SelectState"
 			ref="c80e171a-4479-4f25-8072-e92859e1fa11"
 			type="Recording">
+				<databinding>
+					<var
+					dataname="nameState"
+					datasourceid="19ed3775-279e-4955-97b2-3dc0b5408c33"
+					variableid="b3e82724-3cc6-4007-932a-4693bb8aaeec"
+					variablename="stateName">
+					</var>
+				</databinding>
 				<missingdatabinding>
 					<var
 					dataname="stateCalculations"
@@ -3161,14 +3159,6 @@
 					variablename="StateToSelect">
 					</var>
 				</missingdatabinding>
-				<missingdatavariablesbinding>
-					<var
-					dataname="nameStateFA"
-					datasourceid="19ed3775-279e-4955-97b2-3dc0b5408c33"
-					variableid="dd230550-3763-4882-aad6-2c842903d448"
-					variablename="StateToSelect">
-					</var>
-				</missingdatavariablesbinding>
 			</testmodule>
 			<testmodule
 			id="fe5937d2-4f4b-4f48-96ca-c5579492e67c"
@@ -3185,14 +3175,6 @@
 				id="d9f46e49-056c-4e8b-a453-306c17602806"
 				name="Script29">
 					<testcase
-					id="85a3c9f1-960b-4f4d-b379-d5c05acbe835"
-					name="TakeScreenshotOfDesktop">
-						<testmodule
-						id="4dd8e7e7-5aa8-4657-964e-5a1204700ecd"
-						name="CreateScreenshotEntireDesktop">
-						</testmodule>
-					</testcase>
-					<testcase
 					id="21114deb-06e3-49f6-85ff-11b20b73d8e5"
 					name="script29_Gegevens_tonen_op_kaart">
 						<setup
@@ -3240,7 +3222,7 @@
 							</smartfoldernode>
 							<smartfoldernode
 							id="66985f9c-b944-45ea-9b6d-d3c1e4b1de0f"
-							name="SetStateFailurePathsAssembly">
+							name="SetStateResultsAssembly">
 								<testmodule
 								id="a7a1ebd5-c3d2-4b74-8613-82b450d167c4"
 								name="SelectState">
@@ -3519,7 +3501,7 @@
 								</smartfoldernode>
 								<smartfoldernode
 								id="19ed3775-279e-4955-97b2-3dc0b5408c33"
-								name="SetStateFailurePathsAssembly">
+								name="SetStateResultsAssembly">
 									<testmodule
 									id="fd9810a9-5a92-4a03-a363-cdd0a496815e"
 									name="SelectState">
@@ -3715,7 +3697,7 @@
 								</smartfoldernode>
 								<smartfoldernode
 								id="3789e403-9ec5-4959-8ef7-03c7af296b21"
-								name="SetStateFailurePathsAssembly">
+								name="SetStateResultsAssembly">
 									<testmodule
 									id="e9602b84-a632-4951-959e-0913e3e40972"
 									name="SelectState">
@@ -3916,7 +3898,7 @@
 							</smartfoldernode>
 							<smartfoldernode
 							id="92d15ab5-01db-4817-81c6-28cfb61a0057"
-							name="SetStateFailurePathsAssembly">
+							name="SetStateResultsAssembly">
 								<testmodule
 								id="05753ec9-a56b-4945-a9a0-8f1c33a495bf"
 								name="SelectState">
@@ -5617,9 +5599,6 @@
 			id="8443b3bb-b263-4823-ac47-9fb80d61b0fa">
 			</testcontainer>
 			<testcontainer
-			id="85a3c9f1-960b-4f4d-b379-d5c05acbe835">
-			</testcontainer>
-			<testcontainer
 			id="85c80477-b489-48ce-858b-44638a9a14a5">
 			</testcontainer>
 			<testcontainer
Index: System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/StringHelpers.cs
===================================================================
diff -u -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50 -r890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361
--- System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/StringHelpers.cs	(.../StringHelpers.cs)	(revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
+++ System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/StringHelpers.cs	(.../StringHelpers.cs)	(revision 890aa8593e729b2a3fe9c9aedbb4dc4ef55cf361)
@@ -137,6 +137,8 @@
                 {"@HyB",   "Hydraulische"},
                 {"@SB",    "Sterkte"},
                 {"@TR",    "Traject"},
+                {"@SF",    "Specifieke faalmechanismen"},
+                {"@GF",    "Generieke faalmechanismen"},
                 {"@RA",    "assemblage"}
             };
             foreach (var item in replacementsPath) {