Index: Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs
===================================================================
diff -u -r0a471fe7dc7ab650097ee062f19961e8801d253c -r221038aecd766a8610314913c16ea09698678cd4
--- Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision 221038aecd766a8610314913c16ea09698678cd4)
@@ -54,18 +54,18 @@
             }
 
             return failureMechanism.Calculations
-                                   .Cast<IPipingCalculation<PipingInput>>()
+                                   .Cast<IPipingCalculationScenario<PipingInput>>()
                                    .SelectMany(ClearCalculationOutput)
                                    .ToArray();
         }
 
         /// <summary>
-        /// Clears the output of the given <see cref="IPipingCalculation{TPipingInput}"/>.
+        /// Clears the output of the given <see cref="IPipingCalculationScenario{TPipingInput}"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="IPipingCalculation{TPipingInput}"/> to clear the output for.</param>
+        /// <param name="calculation">The <see cref="IPipingCalculationScenario{TPipingInput}"/> to clear the output for.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
         /// <returns>All objects that have been changed.</returns>
-        public static IEnumerable<IObservable> ClearCalculationOutput(IPipingCalculation<PipingInput> calculation)
+        public static IEnumerable<IObservable> ClearCalculationOutput(IPipingCalculationScenario<PipingInput> calculation)
         {
             if (calculation == null)
             {
@@ -98,7 +98,7 @@
             }
 
             var affectedItems = new List<IObservable>();
-            foreach (IPipingCalculation<PipingInput> calculation in failureMechanism.Calculations.Cast<IPipingCalculation<PipingInput>>())
+            foreach (IPipingCalculationScenario<PipingInput> calculation in failureMechanism.Calculations.Cast<IPipingCalculationScenario<PipingInput>>())
             {
                 affectedItems.AddRange(ClearCalculationOutput(calculation)
                                            .Concat(ClearHydraulicBoundaryLocation(calculation.InputParameters)));
@@ -167,9 +167,9 @@
                 throw new ArgumentNullException(nameof(surfaceLine));
             }
 
-            IEnumerable<IPipingCalculation<PipingInput>> pipingCalculations =
+            IEnumerable<IPipingCalculationScenario<PipingInput>> pipingCalculations =
                 failureMechanism.Calculations
-                                .Cast<IPipingCalculation<PipingInput>>()
+                                .Cast<IPipingCalculationScenario<PipingInput>>()
                                 .Where(pcs => ReferenceEquals(pcs.InputParameters.SurfaceLine, surfaceLine));
 
             List<IObservable> changedObservables = RemoveSurfaceLineDependentData(pipingCalculations).ToList();
@@ -195,9 +195,9 @@
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            IEnumerable<IPipingCalculation<PipingInput>> affectedCalculations =
+            IEnumerable<IPipingCalculationScenario<PipingInput>> affectedCalculations =
                 failureMechanism.Calculations
-                                .Cast<IPipingCalculation<PipingInput>>()
+                                .Cast<IPipingCalculationScenario<PipingInput>>()
                                 .Where(calc => calc.InputParameters.SurfaceLine != null).ToArray();
 
             List<IObservable> affectedObjects = RemoveSurfaceLineDependentData(affectedCalculations).ToList();
@@ -232,12 +232,12 @@
 
             var changedObservables = new List<IObservable>();
 
-            IEnumerable<IPipingCalculation<PipingInput>> pipingCalculations =
+            IEnumerable<IPipingCalculationScenario<PipingInput>> pipingCalculations =
                 failureMechanism.Calculations
-                                .Cast<IPipingCalculation<PipingInput>>()
+                                .Cast<IPipingCalculationScenario<PipingInput>>()
                                 .Where(pcs => ReferenceEquals(pcs.InputParameters.StochasticSoilModel, soilModel));
 
-            foreach (IPipingCalculation<PipingInput> pipingCalculation in pipingCalculations)
+            foreach (IPipingCalculationScenario<PipingInput> pipingCalculation in pipingCalculations)
             {
                 changedObservables.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(pipingCalculation));
                 changedObservables.AddRange(ClearStochasticSoilModel(pipingCalculation.InputParameters));
@@ -264,13 +264,13 @@
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            IEnumerable<IPipingCalculation<PipingInput>> affectedCalculations =
+            IEnumerable<IPipingCalculationScenario<PipingInput>> affectedCalculations =
                 failureMechanism.Calculations
-                                .Cast<IPipingCalculation<PipingInput>>()
+                                .Cast<IPipingCalculationScenario<PipingInput>>()
                                 .Where(calc => calc.InputParameters.StochasticSoilModel != null).ToArray();
 
             var affectedObjects = new List<IObservable>();
-            foreach (IPipingCalculation<PipingInput> calculation in affectedCalculations)
+            foreach (IPipingCalculationScenario<PipingInput> calculation in affectedCalculations)
             {
                 affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(calculation));
                 affectedObjects.AddRange(ClearStochasticSoilModel(calculation.InputParameters));
@@ -306,7 +306,7 @@
 
             var changedObservables = new List<IObservable>();
 
-            foreach (IPipingCalculation<PipingInput> pipingCalculation in GetCalculationsWithSoilProfileAssigned(failureMechanism, soilProfile))
+            foreach (IPipingCalculationScenario<PipingInput> pipingCalculation in GetCalculationsWithSoilProfileAssigned(failureMechanism, soilProfile))
             {
                 changedObservables.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(pipingCalculation));
                 changedObservables.AddRange(ClearStochasticSoilProfile(pipingCalculation.InputParameters));
@@ -340,7 +340,7 @@
 
             var changedObservables = new List<IObservable>();
 
-            foreach (IPipingCalculation<PipingInput> calculation in GetCalculationsWithSoilProfileAssigned(failureMechanism, soilProfile))
+            foreach (IPipingCalculationScenario<PipingInput> calculation in GetCalculationsWithSoilProfileAssigned(failureMechanism, soilProfile))
             {
                 changedObservables.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(calculation));
                 changedObservables.Add(calculation.InputParameters);
@@ -349,10 +349,10 @@
             return changedObservables;
         }
 
-        private static IEnumerable<IObservable> RemoveSurfaceLineDependentData(IEnumerable<IPipingCalculation<PipingInput>> pipingCalculations)
+        private static IEnumerable<IObservable> RemoveSurfaceLineDependentData(IEnumerable<IPipingCalculationScenario<PipingInput>> pipingCalculations)
         {
             var changedObservables = new List<IObservable>();
-            foreach (IPipingCalculation<PipingInput> pipingCalculation in pipingCalculations)
+            foreach (IPipingCalculationScenario<PipingInput> pipingCalculation in pipingCalculations)
             {
                 changedObservables.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(pipingCalculation));
                 changedObservables.AddRange(ClearSurfaceLine(pipingCalculation.InputParameters));
@@ -361,11 +361,11 @@
             return changedObservables;
         }
 
-        private static IEnumerable<IPipingCalculation<PipingInput>> GetCalculationsWithSoilProfileAssigned(IFailureMechanism failureMechanism,
+        private static IEnumerable<IPipingCalculationScenario<PipingInput>> GetCalculationsWithSoilProfileAssigned(IFailureMechanism failureMechanism,
                                                                                                            PipingStochasticSoilProfile soilProfile)
         {
             return failureMechanism.Calculations
-                                   .Cast<IPipingCalculation<PipingInput>>()
+                                   .Cast<IPipingCalculationScenario<PipingInput>>()
                                    .Where(pcs => ReferenceEquals(pcs.InputParameters.StochasticSoilProfile, soilProfile));
         }
 
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs
===================================================================
diff -u -r9e65fe138b2cda6c6fe4b014b3fd1e80210c1ee6 -r221038aecd766a8610314913c16ea09698678cd4
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs	(.../PipingTestDataGeneratorHelper.cs)	(revision 9e65fe138b2cda6c6fe4b014b3fd1e80210c1ee6)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs	(.../PipingTestDataGeneratorHelper.cs)	(revision 221038aecd766a8610314913c16ea09698678cd4)
@@ -44,10 +44,10 @@
         public static void AssertHasAllPossibleCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
-            AssertPipingCalculationGroupWithOutput(calculationRoot.OfType<IPipingCalculation<PipingInput>>());
+            AssertPipingCalculationGroupWithOutput(calculationRoot.OfType<IPipingCalculationScenario<PipingInput>>());
 
             CalculationGroup nestedCalculations = calculationRoot.OfType<CalculationGroup>().First();
-            AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType<IPipingCalculation<PipingInput>>());
+            AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType<IPipingCalculationScenario<PipingInput>>());
         }
 
         /// <summary>
@@ -60,10 +60,10 @@
         public static void AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(PipingFailureMechanism failureMechanism)
         {
             IEnumerable<ICalculationBase> calculationRoot = failureMechanism.CalculationsGroup.Children;
-            AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType<IPipingCalculation<PipingInput>>());
+            AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType<IPipingCalculationScenario<PipingInput>>());
 
             CalculationGroup nestedCalculations = calculationRoot.OfType<CalculationGroup>().First();
-            AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType<IPipingCalculation<PipingInput>>());
+            AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType<IPipingCalculationScenario<PipingInput>>());
         }
 
         /// <summary>
@@ -104,18 +104,18 @@
             Assert.AreEqual("path/to/sections", failureMechanism.FailureMechanismSectionSourcePath);
         }
 
-        private static void AssertPipingCalculationGroupWithOutput(IEnumerable<IPipingCalculation<PipingInput>> children)
+        private static void AssertPipingCalculationGroupWithOutput(IEnumerable<IPipingCalculationScenario<PipingInput>> children)
         {
             AssertCalculationConfig(children, true, true);
         }
 
-        private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable<IPipingCalculation<PipingInput>> children)
+        private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable<IPipingCalculationScenario<PipingInput>> children)
         {
             AssertCalculationConfig(children, false, false);
             AssertCalculationConfig(children, true, false);
         }
 
-        private static void AssertCalculationConfig(IEnumerable<IPipingCalculation<PipingInput>> children,
+        private static void AssertCalculationConfig(IEnumerable<IPipingCalculationScenario<PipingInput>> children,
                                                     bool hasHydraulicBoundaryLocation, bool hasOutput)
         {
             Assert.NotNull(children.FirstOrDefault(calc => calc.InputParameters.HydraulicBoundaryLocation != null == hasHydraulicBoundaryLocation
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs
===================================================================
diff -u -raf3a45afddc78175220ee97da11e78a9d0350dc2 -r221038aecd766a8610314913c16ea09698678cd4
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision af3a45afddc78175220ee97da11e78a9d0350dc2)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 221038aecd766a8610314913c16ea09698678cd4)
@@ -52,7 +52,7 @@
         public void ClearCalculationOutput_WithCalculation_ClearsOutputAndReturnAffectedCalculations()
         {
             // Setup
-            var calculation = new TestPipingCalculation(true);
+            var calculation = new TestPipingCalculationScenario(true);
 
             // Call
             IEnumerable<IObservable> changedObjects = PipingDataSynchronizationService.ClearCalculationOutput(calculation);
@@ -72,7 +72,7 @@
         public void ClearCalculationOutput_CalculationWithoutOutput_DoNothing()
         {
             // Setup
-            var calculation = new TestPipingCalculation();
+            var calculation = new TestPipingCalculationScenario();
 
             // Call
             IEnumerable<IObservable> changedObjects = PipingDataSynchronizationService.ClearCalculationOutput(calculation);