Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs
===================================================================
diff -u -raf3a45afddc78175220ee97da11e78a9d0350dc2 -r1e1ac779faeabe200a47c7fd3cc2ca0182bd5ca1
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(.../AssessmentSectionMergeHandler.cs)	(revision af3a45afddc78175220ee97da11e78a9d0350dc2)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(.../AssessmentSectionMergeHandler.cs)	(revision 1e1ac779faeabe200a47c7fd3cc2ca0182bd5ca1)
@@ -211,7 +211,7 @@
             if (mergeData.MergePiping)
             {
                 targetAssessmentSection.Piping = sourceAssessmentSection.Piping;
-                UpdateCalculationHydraulicBoundaryLocationReferences<PipingFailureMechanism, IPipingCalculation<PipingInput>, PipingInput>(
+                UpdateCalculationHydraulicBoundaryLocationReferences<PipingFailureMechanism, IPipingCalculationScenario<PipingInput>, PipingInput>(
                     targetAssessmentSection.Piping, hydraulicBoundaryLocations);
                 LogMergeMessage(targetAssessmentSection.Piping);
             }
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -r946680305d226cafe7971e3b26da70dec440a61f -r1e1ac779faeabe200a47c7fd3cc2ca0182bd5ca1
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 946680305d226cafe7971e3b26da70dec440a61f)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 1e1ac779faeabe200a47c7fd3cc2ca0182bd5ca1)
@@ -175,10 +175,10 @@
                                                             .Select(c => c.InputParameters)
                                                             .Where(i => i.HydraulicBoundaryLocation != null));
             expectedAffectedItems.AddRange(assessmentSection.Piping.Calculations
-                                                            .Cast<IPipingCalculation<PipingInput>>()
+                                                            .Cast<IPipingCalculationScenario<PipingInput>>()
                                                             .Where(c => c.HasOutput));
             expectedAffectedItems.AddRange(assessmentSection.Piping.Calculations
-                                                            .Cast<IPipingCalculation<PipingInput>>()
+                                                            .Cast<IPipingCalculationScenario<PipingInput>>()
                                                             .Select(c => c.InputParameters)
                                                             .Where(i => i.HydraulicBoundaryLocation != null));
             expectedAffectedItems.AddRange(assessmentSection.StabilityPointStructures.Calculations
@@ -224,7 +224,7 @@
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));
             Assert.IsTrue(assessmentSection.HeightStructures.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>()
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));
-            Assert.IsTrue(assessmentSection.Piping.Calculations.Cast<IPipingCalculation<PipingInput>>()
+            Assert.IsTrue(assessmentSection.Piping.Calculations.Cast<IPipingCalculationScenario<PipingInput>>()
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));
             Assert.IsTrue(assessmentSection.StabilityPointStructures.Calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>()
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));