Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rec5eeafbbd987b02a9d9c07b7e920c03d567f3f7
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision c5f90c4f9b42d985f16f99ad8732576b9217267a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision ec5eeafbbd987b02a9d9c07b7e920c03d567f3f7)
@@ -89,7 +89,7 @@
             inputParameters.StochasticSoilModel = stochasticSoilModel;
             inputParameters.StochasticSoilProfile = (stochasticSoilProfile);
 
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var properties = new PipingInputContextProperties
@@ -139,7 +139,7 @@
             projectObserver.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput());
@@ -283,7 +283,7 @@
             mocks.ReplayAll();
 
             var surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput())
@@ -324,7 +324,7 @@
             mocks.ReplayAll();
 
             var surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput());
@@ -362,7 +362,7 @@
             mocks.ReplayAll();
 
             var surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput())
@@ -405,7 +405,7 @@
             mocks.ReplayAll();
 
             var surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput());
@@ -446,7 +446,7 @@
             mocks.ReplayAll();
 
             double assessmentLevel = new Random(21).NextDouble();
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput())
@@ -493,7 +493,7 @@
             projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(1);
             mocks.ReplayAll();
 
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput());
@@ -580,7 +580,7 @@
             var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName");
             stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile);
 
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput())
@@ -687,7 +687,7 @@
                 StochasticSoilModel = stochasticSoilModel1,
                 StochasticSoilProfile = stochasticSoilProfile1
             };
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var properties = new PipingInputContextProperties
@@ -717,7 +717,7 @@
             var typeDescriptorContextMock = mocks.StrictMock<ITypeDescriptorContext>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
-            var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var inputParameters = new PipingInput(new GeneralPipingInput());