Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -rb35f3918dba57bcc05bf62e492079789ed9dd64a -r05ccb12347fe3b2591de1b328c20d566de34ab2a
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision b35f3918dba57bcc05bf62e492079789ed9dd64a)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 05ccb12347fe3b2591de1b328c20d566de34ab2a)
@@ -175,10 +175,10 @@
                                                             .Select(c => c.InputParameters)
                                                             .Where(i => i.HydraulicBoundaryLocation != null));
             expectedAffectedItems.AddRange(assessmentSection.Piping.Calculations
-                                                            .Cast<PipingCalculation<PipingInput, PipingOutput>>()
+                                                            .Cast<IPipingCalculation<PipingInput, PipingOutput>>()
                                                             .Where(c => c.HasOutput));
             expectedAffectedItems.AddRange(assessmentSection.Piping.Calculations
-                                                            .Cast<PipingCalculation<PipingInput, PipingOutput>>()
+                                                            .Cast<IPipingCalculation<PipingInput, PipingOutput>>()
                                                             .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<PipingCalculation<PipingInput, PipingOutput>>()
+            Assert.IsTrue(assessmentSection.Piping.Calculations.Cast<IPipingCalculation<PipingInput, PipingOutput>>()
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));
             Assert.IsTrue(assessmentSection.StabilityPointStructures.Calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>()
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs
===================================================================
diff -u -rf990699959bb0d146317eba670f7855746e7be72 -r05ccb12347fe3b2591de1b328c20d566de34ab2a
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs	(.../PipingSurfaceLineUpdateDataStrategy.cs)	(revision f990699959bb0d146317eba670f7855746e7be72)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs	(.../PipingSurfaceLineUpdateDataStrategy.cs)	(revision 05ccb12347fe3b2591de1b328c20d566de34ab2a)
@@ -94,10 +94,10 @@
 
         private IEnumerable<IObservable> UpdateSurfaceLineDependentData(PipingSurfaceLine surfaceLine)
         {
-            IEnumerable<PipingCalculation<PipingInput, PipingOutput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
+            IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
 
             var affectedObjects = new List<IObservable>();
-            foreach (PipingCalculation<PipingInput, PipingOutput> affectedCalculation in affectedCalculations)
+            foreach (IPipingCalculation<PipingInput, PipingOutput> affectedCalculation in affectedCalculations)
             {
                 affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(affectedCalculation));
             }
@@ -107,10 +107,10 @@
 
         private IEnumerable<IObservable> UpdateStochasticSoilModel(PipingSurfaceLine updatedSurfaceLine)
         {
-            IEnumerable<PipingCalculation<PipingInput, PipingOutput>> calculationsToUpdate = GetAffectedCalculationWithSurfaceLine(updatedSurfaceLine);
+            IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> calculationsToUpdate = GetAffectedCalculationWithSurfaceLine(updatedSurfaceLine);
 
             var affectedObjects = new List<IObservable>();
-            foreach (PipingCalculation<PipingInput, PipingOutput> calculation in calculationsToUpdate)
+            foreach (IPipingCalculation<PipingInput, PipingOutput> calculation in calculationsToUpdate)
             {
                 IEnumerable<PipingStochasticSoilModel> matchingSoilModels = GetAvailableStochasticSoilModels(updatedSurfaceLine);
 
@@ -122,11 +122,11 @@
             return affectedObjects;
         }
 
-        private IEnumerable<PipingCalculation<PipingInput, PipingOutput>> GetAffectedCalculationWithSurfaceLine(PipingSurfaceLine surfaceLine)
+        private IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> GetAffectedCalculationWithSurfaceLine(PipingSurfaceLine surfaceLine)
         {
-            IEnumerable<PipingCalculation<PipingInput, PipingOutput>> affectedCalculations =
+            IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> affectedCalculations =
                 FailureMechanism.Calculations
-                                .Cast<PipingCalculation<PipingInput, PipingOutput>>()
+                                .Cast<IPipingCalculation<PipingInput, PipingOutput>>()
                                 .Where(calc => ReferenceEquals(calc.InputParameters.SurfaceLine, surfaceLine));
             return affectedCalculations;
         }
@@ -139,8 +139,8 @@
 
         private void ValidateEntryAndExitPoints(PipingSurfaceLine surfaceLine)
         {
-            IEnumerable<PipingCalculation<PipingInput, PipingOutput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
-            foreach (PipingCalculation<PipingInput, PipingOutput> affectedCalculation in affectedCalculations)
+            IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
+            foreach (IPipingCalculation<PipingInput, PipingOutput> affectedCalculation in affectedCalculations)
             {
                 PipingInput inputParameters = affectedCalculation.InputParameters;
                 if (!ValidateLocalCoordinateOnSurfaceLine(surfaceLine, inputParameters.EntryPointL))
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3a17278b768b9fad2ea946607126a15b8854f02a -r05ccb12347fe3b2591de1b328c20d566de34ab2a
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3a17278b768b9fad2ea946607126a15b8854f02a)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 05ccb12347fe3b2591de1b328c20d566de34ab2a)
@@ -911,7 +911,7 @@
                     // Assert
                     Assert.AreEqual(2, group.Children.Count);
                     ICalculationBase newlyAddedItem = group.Children.Last();
-                    Assert.IsInstanceOf<PipingCalculation<PipingInput, PipingOutput>>(newlyAddedItem);
+                    Assert.IsInstanceOf<IPipingCalculation<PipingInput, PipingOutput>>(newlyAddedItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
                 }