Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -racb8e032cacf8d2e31a1e735913660b7b5fb5556 -r7078c1459eebb49869d5751eeda9cfa12c3559c5
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision acb8e032cacf8d2e31a1e735913660b7b5fb5556)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 7078c1459eebb49869d5751eeda9cfa12c3559c5)
@@ -644,7 +644,7 @@
 
         private static void ValidateAllInFailureMechanism(PipingFailureMechanismContext context)
         {
-            ValidateAll(context.WrappedData.Calculations.OfType<PipingCalculation<PipingInput, PipingOutput>>(), context.Parent);
+            ValidateAll(context.WrappedData.Calculations.OfType<IPipingCalculation<PipingInput, PipingOutput>>(), context.Parent);
         }
 
         private void CalculateAllInFailureMechanism(PipingFailureMechanismContext failureMechanismContext)
@@ -869,7 +869,7 @@
 
         private static void ValidateAllInCalculationGroup(PipingCalculationGroupContext context)
         {
-            ValidateAll(context.WrappedData.GetCalculations().OfType<PipingCalculation<PipingInput, PipingOutput>>(), context.AssessmentSection);
+            ValidateAll(context.WrappedData.GetCalculations().OfType<IPipingCalculation<PipingInput, PipingOutput>>(), context.AssessmentSection);
         }
 
         private void CalculateAllInCalculationGroup(CalculationGroup group, PipingCalculationGroupContext context)
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs
===================================================================
diff -u -rb4f6e4fe36ac0c03415db646e5a3714c2f771e61 -r7078c1459eebb49869d5751eeda9cfa12c3559c5
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs	(.../PipingTestDataGeneratorTest.cs)	(revision b4f6e4fe36ac0c03415db646e5a3714c2f771e61)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs	(.../PipingTestDataGeneratorTest.cs)	(revision 7078c1459eebb49869d5751eeda9cfa12c3559c5)
@@ -260,12 +260,12 @@
         private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup,
                                                                                HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            IEnumerable<PipingCalculation<PipingInput, PipingOutput>> calculationsWithHydraulicBoundaryLocation =
+            IEnumerable<IPipingCalculation<PipingInput, PipingOutput>> calculationsWithHydraulicBoundaryLocation =
                 calculationGroup.Children
-                                .OfType<PipingCalculation<PipingInput, PipingOutput>>()
+                                .OfType<IPipingCalculation<PipingInput, PipingOutput>>()
                                 .Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null);
 
-            foreach (PipingCalculation<PipingInput, PipingOutput> calculation in calculationsWithHydraulicBoundaryLocation)
+            foreach (IPipingCalculation<PipingInput, PipingOutput> calculation in calculationsWithHydraulicBoundaryLocation)
             {
                 Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation);
             }
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs
===================================================================
diff -u -r5592d157be0bb64ab16660411dadc652df2daed1 -r7078c1459eebb49869d5751eeda9cfa12c3559c5
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 5592d157be0bb64ab16660411dadc652df2daed1)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 7078c1459eebb49869d5751eeda9cfa12c3559c5)
@@ -605,7 +605,7 @@
             // Assert
             CollectionAssert.AreEquivalent(expectedAffectedObjects, affected);
             CollectionAssert.IsEmpty(affected.OfType<PipingInput>().Where(a => a.StochasticSoilProfile != null));
-            CollectionAssert.IsEmpty(affected.OfType<PipingCalculation<PipingInput, PipingOutput>>().Where(a => a.HasOutput));
+            CollectionAssert.IsEmpty(affected.OfType<IPipingCalculation<PipingInput, PipingOutput>>().Where(a => a.HasOutput));
         }
 
         [Test]
@@ -740,7 +740,7 @@
             // Assert
             CollectionAssert.AreEquivalent(expectedAffectedObjects, affected);
             CollectionAssert.IsEmpty(affected.OfType<PipingInput>().Where(a => a.StochasticSoilProfile == null));
-            CollectionAssert.IsEmpty(affected.OfType<PipingCalculation<PipingInput, PipingOutput>>().Where(a => a.HasOutput));
+            CollectionAssert.IsEmpty(affected.OfType<IPipingCalculation<PipingInput, PipingOutput>>().Where(a => a.HasOutput));
         }
     }
 }
\ No newline at end of file