Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingInputView.cs
===================================================================
diff -u -rb4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6 -r5ead43fb4e60d778eb835f92581f1fc3f0d96bf1
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision b4611cca8aeb98f81b6c8eebf125ad0f2a2c95d6)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 5ead43fb4e60d778eb835f92581f1fc3f0d96bf1)
@@ -56,7 +56,7 @@
 
         private readonly List<ChartMultipleAreaData> soilLayerChartDataLookup;
 
-        private IPipingCalculation<PipingInput> data;
+        private IPipingCalculationScenario<PipingInput> data;
 
         private PipingSoilProfile currentSoilProfile;
 
@@ -104,7 +104,7 @@
             }
             set
             {
-                data = value as IPipingCalculation<PipingInput>;
+                data = value as IPipingCalculationScenario<PipingInput>;
 
                 calculationObserver.Observable = data;
                 calculationInputObserver.Observable = data?.InputParameters;
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs
===================================================================
diff -u -r6b9ff26d94d7b6862f4c0a0e141263e0bb7dfade -r5ead43fb4e60d778eb835f92581f1fc3f0d96bf1
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs	(.../PipingSurfaceLineUpdateDataStrategy.cs)	(revision 6b9ff26d94d7b6862f4c0a0e141263e0bb7dfade)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs	(.../PipingSurfaceLineUpdateDataStrategy.cs)	(revision 5ead43fb4e60d778eb835f92581f1fc3f0d96bf1)
@@ -94,10 +94,10 @@
 
         private IEnumerable<IObservable> UpdateSurfaceLineDependentData(PipingSurfaceLine surfaceLine)
         {
-            IEnumerable<IPipingCalculation<PipingInput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
+            IEnumerable<IPipingCalculationScenario<PipingInput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
 
             var affectedObjects = new List<IObservable>();
-            foreach (IPipingCalculation<PipingInput> affectedCalculation in affectedCalculations)
+            foreach (IPipingCalculationScenario<PipingInput> affectedCalculation in affectedCalculations)
             {
                 affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(affectedCalculation));
             }
@@ -107,10 +107,10 @@
 
         private IEnumerable<IObservable> UpdateStochasticSoilModel(PipingSurfaceLine updatedSurfaceLine)
         {
-            IEnumerable<IPipingCalculation<PipingInput>> calculationsToUpdate = GetAffectedCalculationWithSurfaceLine(updatedSurfaceLine);
+            IEnumerable<IPipingCalculationScenario<PipingInput>> calculationsToUpdate = GetAffectedCalculationWithSurfaceLine(updatedSurfaceLine);
 
             var affectedObjects = new List<IObservable>();
-            foreach (IPipingCalculation<PipingInput> calculation in calculationsToUpdate)
+            foreach (IPipingCalculationScenario<PipingInput> calculation in calculationsToUpdate)
             {
                 IEnumerable<PipingStochasticSoilModel> matchingSoilModels = GetAvailableStochasticSoilModels(updatedSurfaceLine);
 
@@ -122,13 +122,11 @@
             return affectedObjects;
         }
 
-        private IEnumerable<IPipingCalculation<PipingInput>> GetAffectedCalculationWithSurfaceLine(PipingSurfaceLine surfaceLine)
+        private IEnumerable<IPipingCalculationScenario<PipingInput>> GetAffectedCalculationWithSurfaceLine(PipingSurfaceLine surfaceLine)
         {
-            IEnumerable<IPipingCalculation<PipingInput>> affectedCalculations =
-                FailureMechanism.Calculations
-                                .Cast<IPipingCalculation<PipingInput>>()
-                                .Where(calc => ReferenceEquals(calc.InputParameters.SurfaceLine, surfaceLine));
-            return affectedCalculations;
+            return FailureMechanism.Calculations
+                                   .Cast<IPipingCalculationScenario<PipingInput>>()
+                                   .Where(calc => ReferenceEquals(calc.InputParameters.SurfaceLine, surfaceLine));
         }
 
         private IEnumerable<PipingStochasticSoilModel> GetAvailableStochasticSoilModels(PipingSurfaceLine surfaceLine)
@@ -139,8 +137,8 @@
 
         private void ValidateEntryAndExitPoints(PipingSurfaceLine surfaceLine)
         {
-            IEnumerable<IPipingCalculation<PipingInput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
-            foreach (IPipingCalculation<PipingInput> affectedCalculation in affectedCalculations)
+            IEnumerable<IPipingCalculationScenario<PipingInput>> affectedCalculations = GetAffectedCalculationWithSurfaceLine(surfaceLine);
+            foreach (IPipingCalculationScenario<PipingInput> affectedCalculation in affectedCalculations)
             {
                 PipingInput inputParameters = affectedCalculation.InputParameters;
                 if (!ValidateLocalCoordinateOnSurfaceLine(surfaceLine, inputParameters.EntryPointL))