Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs
===================================================================
diff -u -r4411e045d184c24dac4e3676ac415333f0a01636 -r229496b2ea07577172bf80c034775dfbcf61bfe7
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs	(.../ProbabilisticPipingInputContextPropertiesTest.cs)	(revision 4411e045d184c24dac4e3676ac415333f0a01636)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs	(.../ProbabilisticPipingInputContextPropertiesTest.cs)	(revision 229496b2ea07577172bf80c034775dfbcf61bfe7)
@@ -102,11 +102,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var probabilisticPipingCalculation = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(probabilisticPipingCalculation.InputParameters,
-                                                              probabilisticPipingCalculation,
+            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
+                                                              calculationItem,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -129,11 +129,11 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var probabilisticPipingCalculation = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(probabilisticPipingCalculation.InputParameters,
-                                                              probabilisticPipingCalculation,
+            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
+                                                              calculationItem,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -197,17 +197,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var probabilisticPipingCalculation = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(probabilisticPipingCalculation.InputParameters,
-                                                              probabilisticPipingCalculation,
+            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
+                                                              calculationItem,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
                                                               assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(probabilisticPipingCalculation, probabilisticPipingCalculation.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
             var properties = new ProbabilisticPipingInputContextProperties(context, handler);
@@ -368,7 +368,7 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             if (withSurfaceLine)
@@ -445,7 +445,7 @@
 
             HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -530,7 +530,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
@@ -606,7 +606,7 @@
         {
             // Setup
             PipingSurfaceLine newSurfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(p => p.SurfaceLine = newSurfaceLine, calculation);
@@ -617,7 +617,7 @@
         {
             // Setup
             PipingStochasticSoilModel newSoilModel = ValidStochasticSoilModel(0.0, 4.0);
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.StochasticSoilModel = newSoilModel, calculation);
@@ -628,7 +628,7 @@
         {
             // Setup
             PipingStochasticSoilProfile newSoilProfile = ValidStochasticSoilModel(0.0, 4.0).StochasticSoilProfiles.First();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.StochasticSoilProfile = newSoilProfile, calculation);
@@ -639,7 +639,7 @@
         {
             // Setup
             var mean = new RoundedDouble(2, 2);
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.DampingFactorExit.Mean = mean, calculation);
@@ -650,7 +650,7 @@
         {
             // Setup
             var standardDeviation = new RoundedDouble(2, 2);
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.DampingFactorExit.StandardDeviation = standardDeviation, calculation);
@@ -661,7 +661,7 @@
         {
             // Setup
             var mean = new RoundedDouble(2, 2);
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.PhreaticLevelExit.Mean = mean, calculation);
@@ -672,7 +672,7 @@
         {
             // Setup
             var standardDeviation = new RoundedDouble(2, 2);
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.PhreaticLevelExit.StandardDeviation = standardDeviation, calculation);
@@ -683,7 +683,7 @@
         {
             // Setup
             RoundedDouble newEntryPointL = new Random(21).NextRoundedDouble();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.EntryPointL = newEntryPointL, calculation);
@@ -694,7 +694,7 @@
         {
             // Setup
             RoundedDouble newExitPointL = new Random(21).NextRoundedDouble();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.ExitPointL = newExitPointL, calculation);
@@ -704,7 +704,7 @@
         public void SelectedHydraulicBoundaryLocation_SetValidValue_SetsValueAndUpdatesObservers()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call & Assert
             SetPropertyAndVerifyNotificationsForCalculation(properties => properties.SelectedHydraulicBoundaryLocation = new SelectableHydraulicBoundaryLocation(new TestHydraulicBoundaryLocation(), null),
@@ -726,7 +726,7 @@
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
             var inputContext = new ProbabilisticPipingInputContext(calculation.InputParameters,
                                                                    calculation,
@@ -763,7 +763,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
@@ -805,7 +805,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculation();
+            var calculationItem = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
@@ -847,7 +847,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -895,7 +895,7 @@
             var entryPoint = (RoundedDouble) newEntryPoint;
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -940,7 +940,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -985,7 +985,7 @@
             var observable = mocks.StrictMock<IObservable>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1028,7 +1028,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1079,7 +1079,7 @@
                 stochasticSoilProfile
             });
 
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1126,7 +1126,7 @@
             {
                 stochasticSoilProfile
             });
-            var calculationItem = new ProbabilisticPipingCalculation
+            var calculationItem = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1174,7 +1174,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var context = new ProbabilisticPipingInputContext(calculation.InputParameters, calculation,
                                                               failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                               failureMechanism, assessmentSection);
@@ -1198,7 +1198,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var context = new ProbabilisticPipingInputContext(calculation.InputParameters, calculation,
                                                               failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                               failureMechanism, assessmentSection);
@@ -1259,7 +1259,7 @@
                 })
             };
             failureMechanism.StochasticSoilModels.AddRange(soilModels, "path");
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1296,7 +1296,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var context = new ProbabilisticPipingInputContext(calculation.InputParameters, calculation,
                                                               failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                               failureMechanism, assessmentSection);
@@ -1328,7 +1328,7 @@
                 new PipingStochasticSoilProfile(1.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile())
             });
 
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1361,7 +1361,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var context = new ProbabilisticPipingInputContext(calculation.InputParameters, calculation,
                                                               failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                               failureMechanism, assessmentSection);
@@ -1401,7 +1401,7 @@
 
             PipingStochasticSoilModel soilModel = ValidStochasticSoilModel(0.0, 4.0);
             PipingStochasticSoilProfile soilProfile = soilModel.StochasticSoilProfiles.First();
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1453,7 +1453,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var context = new ProbabilisticPipingInputContext(calculation.InputParameters, calculation,
                                                               failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                               failureMechanism, assessmentSection);
@@ -1499,7 +1499,7 @@
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
             surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0);
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1554,7 +1554,7 @@
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
             surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0, 0);
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1609,7 +1609,7 @@
 
             var failureMechanism = new PipingFailureMechanism();
 
-            var calculation = new ProbabilisticPipingCalculation();
+            var calculation = new ProbabilisticPipingCalculationScenario();
 
             var context = new ProbabilisticPipingInputContext(calculation.InputParameters, calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
@@ -1628,7 +1628,7 @@
 
         private static void SetPropertyAndVerifyNotificationsForCalculation(
             Action<ProbabilisticPipingInputContextProperties> setProperty,
-            ProbabilisticPipingCalculation calculation)
+            ProbabilisticPipingCalculationScenario calculation)
         {
             // Setup
             var mocks = new MockRepository();