Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs
===================================================================
diff -u -r8611667bb3db61470828f71f5bb80a0fd892278e -r40e087900a4895c7d1f9e7b49868b8a14b8e21fa
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(.../AssessmentSectionMergeHandler.cs)	(revision 8611667bb3db61470828f71f5bb80a0fd892278e)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(.../AssessmentSectionMergeHandler.cs)	(revision 40e087900a4895c7d1f9e7b49868b8a14b8e21fa)
@@ -290,7 +290,7 @@
             if (mergeData.MergeHeightStructures)
             {
                 targetAssessmentSection.HeightStructures = sourceAssessmentSection.HeightStructures;
-                UpdateCalculationHydraulicBoundaryLocationReferences<HeightStructuresFailureMechanism, StructuresCalculation<HeightStructuresInput>, HeightStructuresInput>(
+                UpdateCalculationHydraulicBoundaryLocationReferences<HeightStructuresFailureMechanism, StructuresCalculationScenario<HeightStructuresInput>, HeightStructuresInput>(
                     targetAssessmentSection.HeightStructures, hydraulicBoundaryLocations);
                 LogMergeMessage(targetAssessmentSection.HeightStructures);
             }
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -r8611667bb3db61470828f71f5bb80a0fd892278e -r40e087900a4895c7d1f9e7b49868b8a14b8e21fa
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 8611667bb3db61470828f71f5bb80a0fd892278e)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 40e087900a4895c7d1f9e7b49868b8a14b8e21fa)
@@ -404,7 +404,7 @@
                     HydraulicBoundaryLocation = sourceLocations[0]
                 }
             });
-            sourceAssessmentSection.HeightStructures.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>
+            sourceAssessmentSection.HeightStructures.CalculationsGroup.Children.Add(new StructuresCalculationScenario<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -863,13 +863,12 @@
             var handler = new AssessmentSectionMergeHandler(viewCommands);
 
             // Call
-            Action call = () => handler.PerformMerge(targetAssessmentSection,
-                                                     new AssessmentSectionMergeData(
-                                                         sourceAssessmentSection,
-                                                         new AssessmentSectionMergeData.ConstructionProperties()));
+            void Call() => handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData(
+                                                    sourceAssessmentSection,
+                                                    new AssessmentSectionMergeData.ConstructionProperties()));
 
             // Assert
-            TestHelper.AssertLogMessageWithLevelIsGenerated(call, new Tuple<string, LogLevelConstant>("Hydraulische belastingen zijn samengevoegd.", LogLevelConstant.Info));
+            TestHelper.AssertLogMessageWithLevelIsGenerated(Call, new Tuple<string, LogLevelConstant>("Hydraulische belastingen zijn samengevoegd.", LogLevelConstant.Info));
             mocks.VerifyAll();
         }
 
@@ -904,13 +903,12 @@
             var handler = new AssessmentSectionMergeHandler(viewCommands);
 
             // Call
-            Action call = () => handler.PerformMerge(targetAssessmentSection,
-                                                     new AssessmentSectionMergeData(
-                                                         sourceAssessmentSection,
-                                                         new AssessmentSectionMergeData.ConstructionProperties()));
+            void Call() => handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData(
+                                                    sourceAssessmentSection,
+                                                    new AssessmentSectionMergeData.ConstructionProperties()));
 
             // Assert
-            TestHelper.AssertLogMessageWithLevelIsGenerated(call, new Tuple<string, LogLevelConstant>("Hydraulische belastingen zijn niet samengevoegd omdat het huidige traject meer gegevens bevat.", LogLevelConstant.Info));
+            TestHelper.AssertLogMessageWithLevelIsGenerated(Call, new Tuple<string, LogLevelConstant>("Hydraulische belastingen zijn niet samengevoegd omdat het huidige traject meer gegevens bevat.", LogLevelConstant.Info));
             mocks.VerifyAll();
         }