Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script07.rxtst
===================================================================
diff -u -rdee89838c7c3fbce747fd91dcc17a270a569465c -rd846516c699d41b875656e96aed27f1ca86534c4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script07.rxtst	(.../Script07.rxtst)	(revision dee89838c7c3fbce747fd91dcc17a270a569465c)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script07.rxtst	(.../Script07.rxtst)	(revision d846516c699d41b875656e96aed27f1ca86534c4)
@@ -68,7 +68,7 @@
 				<parameters>
 					<param
 					name="pathToNormTreeItem"
-					value="Traject>Assemblage>Normklassen">
+					value="Traject>Assemblage>Veiligheidscategor">
 					</param>
 					<param
 					name="stateName"
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst
===================================================================
diff -u -rebff61cbd7c048492d3d83c413149a97c49d7dfe -rd846516c699d41b875656e96aed27f1ca86534c4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst	(.../Script15.rxtst)	(revision ebff61cbd7c048492d3d83c413149a97c49d7dfe)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst	(.../Script15.rxtst)	(revision d846516c699d41b875656e96aed27f1ca86534c4)
@@ -166,34 +166,6 @@
 				</conditiongroup>
 			</smartfoldernode>
 			<testmodule
-			id="0ae51d80-9408-4dbf-85f1-a51b661f36c9"
-			name="SetRangeInSmartFolder"
-			ref="3b9354d6-0537-452c-9857-667f5c0e7124"
-			type="UserCode">
-				<databinding>
-					<var
-					dataname="nameSmartFolderToSetRange"
-					datasourceid="b28a236b-613f-40f8-8fca-9fc994c25477"
-					variableid="e27c2717-8089-484f-8051-57077da63c0b"
-					variablename="nameOfSmartFolder">
-					</var>
-					<var
-					dataname="indexFMToCarryOutSeparateCalculation"
-					datasourceid="394ebd4a-a478-4652-a62c-20fa2acf9739"
-					variableid="cd1da467-8e84-488e-b503-621bd966f7be"
-					variablename="rangeToBeSetInSmartFolder">
-					</var>
-				</databinding>
-				<missingdatabinding>
-					<var
-					dataname="indexFMToCarryOutSeparateCalculation"
-					datasourceid="6246b962-c751-4777-a6b5-f5e452aa499e"
-					variableid="cd1da467-8e84-488e-b503-621bd966f7be"
-					variablename="rangeToBeSetInSmartFolder">
-					</var>
-				</missingdatabinding>
-			</testmodule>
-			<testmodule
 			id="0ba3f377-893d-4ade-b603-086435e4470c"
 			name="ValidateWaterLevelWaveHeightInDocumentView"
 			ref="c93bb1b9-c14c-4a0a-ae72-fe034593361b"
@@ -906,34 +878,6 @@
 				</parameters>
 			</smartfoldernode>
 			<testmodule
-			id="3d017260-2390-4393-a3b9-2f5585e1233e"
-			name="SetRangeInSmartFolder"
-			ref="3b9354d6-0537-452c-9857-667f5c0e7124"
-			type="UserCode">
-				<databinding>
-					<var
-					dataname="nameSmartFolderToSetRange"
-					datasourceid="a0157b87-e5a5-40ad-8a7a-568786c17fcc"
-					variableid="e27c2717-8089-484f-8051-57077da63c0b"
-					variablename="nameOfSmartFolder">
-					</var>
-					<var
-					dataname="indexFMToCarryOutSeparateCalculation"
-					datasourceid="394ebd4a-a478-4652-a62c-20fa2acf9739"
-					variableid="cd1da467-8e84-488e-b503-621bd966f7be"
-					variablename="rangeToBeSetInSmartFolder">
-					</var>
-				</databinding>
-				<missingdatabinding>
-					<var
-					dataname="indexFMToCarryOutSeparateCalculation"
-					datasourceid="6246b962-c751-4777-a6b5-f5e452aa499e"
-					variableid="cd1da467-8e84-488e-b503-621bd966f7be"
-					variablename="rangeToBeSetInSmartFolder">
-					</var>
-				</missingdatabinding>
-			</testmodule>
-			<testmodule
 			id="3dbc413a-f7f6-490f-940b-4374717d13a2"
 			name="WaitUntilAllCalculationsHaveBeenCarriedOut"
 			ref="ada8c353-8b24-47e4-b6bf-adfb36229783"
@@ -2690,16 +2634,6 @@
 					</param>
 				</parameters>
 			</smartfoldernode>
-			<smartfoldernode
-			id="a0157b87-e5a5-40ad-8a7a-568786c17fcc"
-			name="SetRangeLoopSeparateCalculationsBeforeChangeClimateScenario">
-				<parameters>
-					<param
-					name="nameSmartFolderToSetRange"
-					value="LoopSeparateCalculationsBeforeChangeClimateScenario">
-					</param>
-				</parameters>
-			</smartfoldernode>
 			<testmodule
 			id="a0ed215f-f4c8-4e88-9640-5a97ee4056ee"
 			name="ValidateCalculationWaterLevelInDocumentViewDA"
@@ -2896,16 +2830,6 @@
 				</missingdatabinding>
 			</testmodule>
 			<smartfoldernode
-			id="aa146835-ce24-4abc-8ff8-15164ca40204"
-			name="DetermineRandomFMToCarryOutSeparateCalculation">
-				<parameters>
-					<param
-					name="nameSmartFolder"
-					value="LoopSeparateCalculationsBeforeChangeClimateScenario">
-					</param>
-				</parameters>
-			</smartfoldernode>
-			<smartfoldernode
 			errorbehavior="ContinueNextIteration"
 			id="ab3b3ff4-f40b-4a05-83f5-d4d6437bbbed"
 			name="ValidateDetailedResultsInSingleCalculation">
@@ -3162,16 +3086,6 @@
 					</var>
 				</missingdatabinding>
 			</testmodule>
-			<smartfoldernode
-			id="b28a236b-613f-40f8-8fca-9fc994c25477"
-			name="SetRangeLoopSeparateCalculationsAfterChangeClimateScenario">
-				<parameters>
-					<param
-					name="nameSmartFolderToSetRange"
-					value="LoopSeparateCalculationsAfterChangeClimateScenario">
-					</param>
-				</parameters>
-			</smartfoldernode>
 			<testmodule
 			id="b668e3f9-cea4-4581-a6b6-03c3f2ab705c"
 			name="CalculateFullPathToSeparateCalculation"
@@ -3333,34 +3247,6 @@
 				</missingdatabinding>
 			</testmodule>
 			<testmodule
-			id="b9c96adf-a1e4-4ddb-bdfc-a4ecc31574a4"
-			name="GenerateRandomIndexInRangeOfSmartFolder"
-			ref="57e8241e-e1ed-4068-a5f9-cf3c3a66e673"
-			type="UserCode">
-				<databinding>
-					<var
-					dataname="nameSmartFolder"
-					datasourceid="aa146835-ce24-4abc-8ff8-15164ca40204"
-					variableid="46e1126b-a8f6-47ec-81ed-ffabf616caff"
-					variablename="nameOfSmartFolder">
-					</var>
-					<var
-					dataname="indexFMToCarryOutSeparateCalculation"
-					datasourceid="394ebd4a-a478-4652-a62c-20fa2acf9739"
-					variableid="fc28675a-0851-49ee-90d4-85279ce6fa30"
-					variablename="generatedRandomIndex">
-					</var>
-				</databinding>
-				<missingdatabinding>
-					<var
-					dataname="indexFMToCarryOutSeparateCalculation"
-					datasourceid="6246b962-c751-4777-a6b5-f5e452aa499e"
-					variableid="fc28675a-0851-49ee-90d4-85279ce6fa30"
-					variablename="generatedRandomIndex">
-					</var>
-				</missingdatabinding>
-			</testmodule>
-			<testmodule
 			id="ba4be00c-08dd-42e0-bd62-6632db339a84"
 			name="ValidateDoubleValueparameterInPropertiesPanelGivenPath"
 			ref="3314c841-2400-467a-8ba2-57b55ddfeec2"
@@ -5832,14 +5718,6 @@
 						id="394ebd4a-a478-4652-a62c-20fa2acf9739"
 						name="d)CalculationHydraulicBoundaryConditionsForClimateScenario">
 							<smartfoldernode
-							id="aa146835-ce24-4abc-8ff8-15164ca40204"
-							name="DetermineRandomFMToCarryOutSeparateCalculation">
-								<testmodule
-								id="b9c96adf-a1e4-4ddb-bdfc-a4ecc31574a4"
-								name="GenerateRandomIndexInRangeOfSmartFolder">
-								</testmodule>
-							</smartfoldernode>
-							<smartfoldernode
 							id="6246b962-c751-4777-a6b5-f5e452aa499e"
 							name="MainLoop">
 								<smartfoldernode
@@ -5934,14 +5812,6 @@
 								id="726e5e40-ae1d-4931-a411-e1608c4fdaa2"
 								name="CalculateSingleFM">
 									<smartfoldernode
-									id="a0157b87-e5a5-40ad-8a7a-568786c17fcc"
-									name="SetRangeLoopSeparateCalculationsBeforeChangeClimateScenario">
-										<testmodule
-										id="3d017260-2390-4393-a3b9-2f5585e1233e"
-										name="SetRangeInSmartFolder">
-										</testmodule>
-									</smartfoldernode>
-									<smartfoldernode
 									id="9a74e862-8b16-46ab-871d-ce2180d4ed61"
 									name="LoopSeparateCalculationsBeforeChangeClimateScenario">
 										<testmodule
@@ -6058,14 +5928,6 @@
 								id="c7ecb4e3-186b-42cf-89c7-7840e90561cf"
 								name="CalculateSingleFM">
 									<smartfoldernode
-									id="b28a236b-613f-40f8-8fca-9fc994c25477"
-									name="SetRangeLoopSeparateCalculationsAfterChangeClimateScenario">
-										<testmodule
-										id="0ae51d80-9408-4dbf-85f1-a51b661f36c9"
-										name="SetRangeInSmartFolder">
-										</testmodule>
-									</smartfoldernode>
-									<smartfoldernode
 									id="838a2c5c-1949-4773-b347-7e461a2c4bbd"
 									name="LoopSeparateCalculationsAfterChangeClimateScenario">
 										<testmodule
@@ -7316,7 +7178,7 @@
 						12-2&gt;@HB
 					</td>
 					<td>
-						Traject&gt;@HB&gt;bij vaste doelkans&gt;1/3000
+						Traject&gt;@HB&gt;bij vaste doelkans&gt;1/1000
 					</td>
 					<td>
 						12-2
@@ -7339,7 +7201,7 @@
 						14-4&gt;@HB
 					</td>
 					<td>
-						Traject&gt;@HB&gt;bij vaste doelkans&gt;1/10000
+						Traject&gt;@HB&gt;bij vaste doelkans&gt;1/3000
 					</td>
 					<td>
 						14-4
@@ -7671,9 +7533,6 @@
 			id="9fcca8dc-ff4e-4ed6-ab57-3dc86164f379">
 			</testcontainer>
 			<testcontainer
-			id="a0157b87-e5a5-40ad-8a7a-568786c17fcc">
-			</testcontainer>
-			<testcontainer
 			id="a37b0061-3a37-479a-99c4-d58f6d25dbf0">
 			</testcontainer>
 			<testcontainer
@@ -7683,9 +7542,6 @@
 			id="a663e2cc-feee-43a8-b58e-1d87f4596239">
 			</testcontainer>
 			<testcontainer
-			id="aa146835-ce24-4abc-8ff8-15164ca40204">
-			</testcontainer>
-			<testcontainer
 			id="ab3b3ff4-f40b-4a05-83f5-d4d6437bbbed">
 			</testcontainer>
 			<testcontainer
@@ -7701,9 +7557,6 @@
 			id="af08c04f-f40c-44f2-b830-918b3ed7479c">
 			</testcontainer>
 			<testcontainer
-			id="b28a236b-613f-40f8-8fca-9fc994c25477">
-			</testcontainer>
-			<testcontainer
 			id="b77e5876-576e-4d86-b05d-baa2430224bd">
 			</testcontainer>
 			<testcontainer
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst
===================================================================
diff -u -rb53b470d1daeb340c29c0cac1cd769c54cec28d7 -rd846516c699d41b875656e96aed27f1ca86534c4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst	(.../Script29.rxtst)	(revision b53b470d1daeb340c29c0cac1cd769c54cec28d7)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst	(.../Script29.rxtst)	(revision d846516c699d41b875656e96aed27f1ca86534c4)
@@ -5438,7 +5438,7 @@
 				</tr>
 				<tr>
 					<td>
-						Assemblagekaart&gt;Duiding bijdrage per deelvak
+						Assemblagekaart&gt;Overzicht duiding
 					</td>
 				</tr>
 				<tr>