Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r12fd2540db2411bfe473d3f10bfc5f9af453d2f6 -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 12fd2540db2411bfe473d3f10bfc5f9af453d2f6)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -95,13 +95,13 @@
             // Setup
             mockRepository.ReplayAll();
 
-            var calculationItem = new GrassCoverErosionInwardsCalculation();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             var inputParameters = new GrassCoverErosionInwardsInput();
 
             var context = new GrassCoverErosionInwardsInputContext(inputParameters,
-                                                                   calculationItem,
+                                                                   calculation,
                                                                    failureMechanism,
                                                                    assessmentSection);
 
@@ -120,13 +120,13 @@
             // Setup
             mockRepository.ReplayAll();
 
-            var calculationItem = new GrassCoverErosionInwardsCalculation();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             var inputParameters = new GrassCoverErosionInwardsInput();
 
             var context = new GrassCoverErosionInwardsInputContext(inputParameters,
-                                                                   calculationItem,
+                                                                   calculation,
                                                                    failureMechanism,
                                                                    assessmentSection);
 
@@ -769,15 +769,15 @@
             var changeHandler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
-            var calculationItem = new GrassCoverErosionInwardsCalculation();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var input = new GrassCoverErosionInwardsInput
             {
                 DikeHeightCalculationType = dikeHeightCalculationType
             };
 
             var context = new GrassCoverErosionInwardsInputContext(input,
-                                                                   calculationItem,
+                                                                   calculation,
                                                                    failureMechanism,
                                                                    assessmentSection);
 
@@ -799,15 +799,15 @@
             var changeHandler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
-            var calculationItem = new GrassCoverErosionInwardsCalculation();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var input = new GrassCoverErosionInwardsInput
             {
                 OvertoppingRateCalculationType = overtoppingRateCalculationType
             };
 
             var context = new GrassCoverErosionInwardsInputContext(input,
-                                                                   calculationItem,
+                                                                   calculation,
                                                                    failureMechanism,
                                                                    assessmentSection);
 
@@ -828,7 +828,7 @@
             var changeHandler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
-            var calculationItem = new GrassCoverErosionInwardsCalculation();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var input = new GrassCoverErosionInwardsInput
             {
@@ -838,7 +838,7 @@
             };
 
             var context = new GrassCoverErosionInwardsInputContext(input,
-                                                                   calculationItem,
+                                                                   calculation,
                                                                    failureMechanism,
                                                                    assessmentSection);
 
@@ -859,7 +859,7 @@
             var changeHandler = mockRepository.Stub<IObservablePropertyChangeHandler>();
             mockRepository.ReplayAll();
 
-            var calculationItem = new GrassCoverErosionInwardsCalculation();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var input = new GrassCoverErosionInwardsInput
             {
@@ -869,7 +869,7 @@
             };
 
             var context = new GrassCoverErosionInwardsInputContext(input,
-                                                                   calculationItem,
+                                                                   calculation,
                                                                    failureMechanism,
                                                                    assessmentSection);
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs	(.../MacroStabilityInwardsInputContextTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs	(.../MacroStabilityInwardsInputContextTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -69,7 +69,7 @@
         }
 
         [Test]
-        public void ParameteredConstructor_CalculationItemNull_ThrowsArgumentNullException()
+        public void ParameteredConstructor_CalculationNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs	(.../MacroStabilityInwardsDrainagePropertiesTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs	(.../MacroStabilityInwardsDrainagePropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -165,10 +165,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsInput input = calculationItem.InputParameters;
+            var calculation = new MacroStabilityInwardsCalculationScenario();
+            MacroStabilityInwardsInput input = calculation.InputParameters;
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, input);
+            var handler = new ObservablePropertyChangeHandler(calculation, input);
             var properties = new MacroStabilityInwardsDrainageProperties(input, handler);
 
             var random = new Random(21);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs	(.../MacroStabilityInwardsGridPropertiesTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs	(.../MacroStabilityInwardsGridPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -197,11 +197,11 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnGrid()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsInput input = calculationItem.InputParameters;
+            var calculation = new MacroStabilityInwardsCalculationScenario();
+            MacroStabilityInwardsInput input = calculation.InputParameters;
             MacroStabilityInwardsGrid grid = input.LeftGrid;
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, input);
+            var handler = new ObservablePropertyChangeHandler(calculation, input);
             var properties = new MacroStabilityInwardsGridProperties(grid, handler, false);
 
             var random = new Random(21);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs	(.../MacroStabilityInwardsGridSettingsPropertiesTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs	(.../MacroStabilityInwardsGridSettingsPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -227,10 +227,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsInput input = calculationItem.InputParameters;
+            var calculation = new MacroStabilityInwardsCalculationScenario();
+            MacroStabilityInwardsInput input = calculation.InputParameters;
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, input);
+            var handler = new ObservablePropertyChangeHandler(calculation, input);
             var properties = new MacroStabilityInwardsGridSettingsProperties(input, handler);
 
             var random = new Random(21);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -rae1fbf8ec3aba9623ab57d35b1aeea9c509789ce -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision ae1fbf8ec3aba9623ab57d35b1aeea9c509789ce)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -97,11 +97,11 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
-                                                                calculationItem,
+            var context = new MacroStabilityInwardsInputContext(calculation.InputParameters,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
@@ -124,11 +124,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
-                                                                calculationItem,
+            var context = new MacroStabilityInwardsInputContext(calculation.InputParameters,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
@@ -153,11 +153,11 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
-                                                                calculationItem,
+            var context = new MacroStabilityInwardsInputContext(calculation.InputParameters,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
@@ -183,17 +183,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
-                                                                calculationItem,
+            var context = new MacroStabilityInwardsInputContext(calculation.InputParameters,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new MacroStabilityInwardsInputContextProperties(context,
@@ -328,17 +328,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
-                                                                calculationItem,
+            var context = new MacroStabilityInwardsInputContext(calculation.InputParameters,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new MacroStabilityInwardsInputContextProperties(context,
@@ -419,7 +419,7 @@
 
             HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario
+            var calculation = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -431,11 +431,11 @@
                     StochasticSoilProfile = stochasticSoilProfile
                 }
             };
-            MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters;
+            MacroStabilityInwardsInput inputParameters = calculation.InputParameters;
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var context = new MacroStabilityInwardsInputContext(inputParameters,
-                                                                calculationItem,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
@@ -490,19 +490,19 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters;
+            MacroStabilityInwardsInput inputParameters = calculation.InputParameters;
 
             var context = new MacroStabilityInwardsInputContext(inputParameters,
-                                                                calculationItem,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
             var properties = new MacroStabilityInwardsInputContextProperties(context,
                                                                              AssessmentSectionTestHelper.GetTestAssessmentLevel,
                                                                              handler);
@@ -658,7 +658,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario
+            var calculation = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -667,10 +667,10 @@
             };
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters;
+            MacroStabilityInwardsInput inputParameters = calculation.InputParameters;
 
             var context = new MacroStabilityInwardsInputContext(inputParameters,
-                                                                calculationItem,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
@@ -714,7 +714,7 @@
                     stochasticSoilProfile
                 });
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario
+            var calculation = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -724,10 +724,10 @@
                 }
             };
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters;
+            MacroStabilityInwardsInput inputParameters = calculation.InputParameters;
 
             var context = new MacroStabilityInwardsInputContext(inputParameters,
-                                                                calculationItem,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 new[]
                                                                 {
@@ -765,7 +765,7 @@
                                                                                                    {
                                                                                                        stochasticSoilProfile
                                                                                                    });
-            var calculationItem = new MacroStabilityInwardsCalculationScenario
+            var calculation = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -775,11 +775,11 @@
                 }
             };
 
-            MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters;
+            MacroStabilityInwardsInput inputParameters = calculation.InputParameters;
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var context = new MacroStabilityInwardsInputContext(inputParameters,
-                                                                calculationItem,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 new[]
                                                                 {
@@ -834,7 +834,7 @@
                                                                                                        stochasticSoilProfile2
                                                                                                    });
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario
+            var calculation = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
@@ -845,10 +845,10 @@
             };
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters;
+            MacroStabilityInwardsInput inputParameters = calculation.InputParameters;
 
             var context = new MacroStabilityInwardsInputContext(inputParameters,
-                                                                calculationItem,
+                                                                calculation,
                                                                 Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism,
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputBasePropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputBasePropertiesTest.cs	(.../MacroStabilityInwardsLocationInputBasePropertiesTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputBasePropertiesTest.cs	(.../MacroStabilityInwardsLocationInputBasePropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -156,10 +156,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var input = new TestMacroStabilityInwardsLocationInput();
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
             var properties = new TestMacroStabilityInwardsLocationProperties(input, handler);
 
             var random = new Random(21);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputExtremePropertiesTest.cs
===================================================================
diff -u -rb12e930bd5757045914773a2c77f35460725ed59 -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputExtremePropertiesTest.cs	(.../MacroStabilityInwardsLocationInputExtremePropertiesTest.cs)	(revision b12e930bd5757045914773a2c77f35460725ed59)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputExtremePropertiesTest.cs	(.../MacroStabilityInwardsLocationInputExtremePropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -134,10 +134,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsInput input = calculationItem.InputParameters;
+            var calculation = new MacroStabilityInwardsCalculationScenario();
+            MacroStabilityInwardsInput input = calculation.InputParameters;
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
             var properties = new MacroStabilityInwardsLocationInputExtremeProperties(input, handler);
 
             var random = new Random(21);
@@ -171,16 +171,16 @@
             MacroStabilityInwardsDikeSoilScenario dikeSoilScenario, bool expectedReadOnly)
         {
             // Setup
-            var calculationItem = new MacroStabilityInwardsCalculationScenario
+            var calculation = new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
                 {
                     DikeSoilScenario = dikeSoilScenario
                 }
             };
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new MacroStabilityInwardsLocationInputExtremeProperties(calculationItem.InputParameters, handler);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
+            var properties = new MacroStabilityInwardsLocationInputExtremeProperties(calculation.InputParameters, handler);
 
             // Call & Assert
             Assert.AreEqual(expectedReadOnly, properties.DynamicReadOnlyValidationMethod(nameof(MacroStabilityInwardsLocationInputExtremeProperties.PenetrationLength)));
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputOffsetPropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputOffsetPropertiesTest.cs	(.../MacroStabilityInwardsLocationInputOffsetPropertiesTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationInputOffsetPropertiesTest.cs	(.../MacroStabilityInwardsLocationInputOffsetPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -186,10 +186,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var input = new TestMacroStabilityInwardsLocationInput();
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
             var properties = new MacroStabilityInwardsLocationInputOffsetProperties(input, handler);
 
             var random = new Random(21);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs	(.../MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs	(.../MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -187,10 +187,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsInput input = calculationItem.InputParameters;
+            var calculation = new MacroStabilityInwardsCalculationScenario();
+            MacroStabilityInwardsInput input = calculation.InputParameters;
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, input);
+            var handler = new ObservablePropertyChangeHandler(calculation, input);
             var properties = new MacroStabilityInwardsSlipPlaneSettingsProperties(input, handler);
 
             var random = new Random(21);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs
===================================================================
diff -u -rb12e930bd5757045914773a2c77f35460725ed59 -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressesPropertiesTest.cs)	(revision b12e930bd5757045914773a2c77f35460725ed59)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressesPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -309,10 +309,10 @@
         public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput()
         {
             // Given
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsInput input = calculationItem.InputParameters;
+            var calculation = new MacroStabilityInwardsCalculationScenario();
+            MacroStabilityInwardsInput input = calculation.InputParameters;
 
-            var propertyChangeHandler = new ObservablePropertyChangeHandler(calculationItem, input);
+            var propertyChangeHandler = new ObservablePropertyChangeHandler(calculation, input);
             var properties = new MacroStabilityInwardsWaterStressesProperties(input,
                                                                               AssessmentSectionTestHelper.GetTestAssessmentLevel(),
                                                                               propertyChangeHandler);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -55,15 +55,15 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilModel = MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel()
             };
             var inputContext = new MacroStabilityInwardsInputContext(input,
-                                                                     calculationItem,
+                                                                     calculation,
                                                                      Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                      new[]
                                                                      {
@@ -124,7 +124,7 @@
                 new Point3D(2, 3, 0)
             });
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
@@ -134,7 +134,7 @@
                 StochasticSoilProfile = stochasticSoilProfile
             };
             var inputParametersContext = new MacroStabilityInwardsInputContext(input,
-                                                                               calculationItem,
+                                                                               calculation,
                                                                                Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                                new[]
                                                                                {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -55,7 +55,7 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D();
@@ -64,7 +64,7 @@
                 StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, soilProfile)
             };
             var inputContext = new MacroStabilityInwardsInputContext(input,
-                                                                     calculationItem,
+                                                                     calculation,
                                                                      Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                      new[]
                                                                      {
@@ -125,7 +125,7 @@
                 new Point3D(2, 3, 0)
             });
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
@@ -135,7 +135,7 @@
                 StochasticSoilProfile = stochasticSoilProfile
             };
             var inputParametersContext = new MacroStabilityInwardsInputContext(input,
-                                                                               calculationItem,
+                                                                               calculation,
                                                                                Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                                new[]
                                                                                {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -53,15 +53,15 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
 
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = ValidSurfaceLine()
             };
             var inputParametersContext = new MacroStabilityInwardsInputContext(input,
-                                                                               calculationItem,
+                                                                               calculation,
                                                                                new[]
                                                                                {
                                                                                    new MacroStabilityInwardsSurfaceLine(string.Empty)
@@ -110,15 +110,15 @@
                 new Point3D(0.0, 0.0, 0.0),
                 new Point3D(1.0, 0.0, 1.0)
             });
-            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var calculation = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine
             };
             var inputParametersContext = new MacroStabilityInwardsInputContext(input,
-                                                                               calculationItem,
+                                                                               calculation,
                                                                                new[]
                                                                                {
                                                                                    surfaceLine
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingInputContextTest.cs
===================================================================
diff -u -r4e585df705f7695feba0d39c24e4ca04396b754b -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingInputContextTest.cs	(.../ProbabilisticPipingInputContextTest.cs)	(revision 4e585df705f7695feba0d39c24e4ca04396b754b)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/Probabilistic/ProbabilisticPipingInputContextTest.cs	(.../ProbabilisticPipingInputContextTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void ParameteredConstructor_CalculationItemNull_ThrowsArgumentNullException()
+        public void ParameteredConstructor_CalculationNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingInputContextTest.cs
===================================================================
diff -u -rd17e4f4116ee1fdb1325a4642ba160f49b9524f6 -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingInputContextTest.cs	(.../SemiProbabilisticPipingInputContextTest.cs)	(revision d17e4f4116ee1fdb1325a4642ba160f49b9524f6)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingInputContextTest.cs	(.../SemiProbabilisticPipingInputContextTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void ParameteredConstructor_CalculationItemNull_ThrowsArgumentNullException()
+        public void ParameteredConstructor_CalculationNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs
===================================================================
diff -u -re2b60a183f95fefe71686ac319c22bb7ad644bca -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs	(.../ProbabilisticPipingInputContextPropertiesTest.cs)	(revision e2b60a183f95fefe71686ac319c22bb7ad644bca)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs	(.../ProbabilisticPipingInputContextPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -102,11 +102,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -129,11 +129,11 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -197,17 +197,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
                                                               assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new ProbabilisticPipingInputContextProperties(context, handler);
@@ -368,7 +368,7 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             if (withSurfaceLine)
@@ -379,11 +379,11 @@
                     new Point3D(0, 0, 0),
                     new Point3D(2, 0, 2)
                 });
-                calculationItem.InputParameters.SurfaceLine = surfaceLine;
+                calculation.InputParameters.SurfaceLine = surfaceLine;
             }
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -445,7 +445,7 @@
 
             HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -458,10 +458,10 @@
 
             var failureMechanism = new PipingFailureMechanism();
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -531,13 +531,13 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -551,7 +551,7 @@
                 })
             }, "path/to/sections");
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
             var properties = new ProbabilisticPipingInputContextProperties(context, handler);
 
             const double entryPointL = 0.12;
@@ -764,21 +764,21 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
             inputParameters.SurfaceLine = surfaceLine;
             inputParameters.Attach(inputObserver);
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
                                                               assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new ProbabilisticPipingInputContextProperties(context, handler)
@@ -806,21 +806,21 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculationScenario();
+            var calculation = new ProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
             inputParameters.SurfaceLine = surfaceLine;
             inputParameters.Attach(inputObserver);
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
                                                               assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new ProbabilisticPipingInputContextProperties(context, handler)
@@ -848,7 +848,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -858,8 +858,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -896,7 +896,7 @@
             var entryPoint = (RoundedDouble) newEntryPoint;
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -906,8 +906,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -941,7 +941,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -951,8 +951,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -986,7 +986,7 @@
             var observable = mocks.StrictMock<IObservable>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -996,8 +996,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new ProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                              calculationItem,
+            var context = new ProbabilisticPipingInputContext(calculation.InputParameters,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -1029,7 +1029,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1038,10 +1038,10 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               Enumerable.Empty<PipingStochasticSoilModel>(),
                                                               failureMechanism,
@@ -1080,7 +1080,7 @@
                 stochasticSoilProfile
             });
 
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1091,10 +1091,10 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               new[]
                                                               {
@@ -1127,7 +1127,7 @@
             {
                 stochasticSoilProfile
             });
-            var calculationItem = new ProbabilisticPipingCalculationScenario
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1137,11 +1137,11 @@
                 }
             };
 
-            ProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            ProbabilisticPipingInput inputParameters = calculation.InputParameters;
             var failureMechanism = new PipingFailureMechanism();
 
             var context = new ProbabilisticPipingInputContext(inputParameters,
-                                                              calculationItem,
+                                                              calculation,
                                                               Enumerable.Empty<PipingSurfaceLine>(),
                                                               new[]
                                                               {
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertiesTest.cs
===================================================================
diff -u -rb33d7a7a679879519ce2e13341601874fdf529a4 -r27b75de40dd8fe1b38452c132a5304d66bbb8278
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertiesTest.cs	(.../SemiProbabilisticPipingInputContextPropertiesTest.cs)	(revision b33d7a7a679879519ce2e13341601874fdf529a4)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertiesTest.cs	(.../SemiProbabilisticPipingInputContextPropertiesTest.cs)	(revision 27b75de40dd8fe1b38452c132a5304d66bbb8278)
@@ -102,11 +102,11 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -129,11 +129,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -158,11 +158,11 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -228,17 +228,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
                                                                   assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new SemiProbabilisticPipingInputContextProperties(context,
@@ -402,7 +402,7 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
             if (withSurfaceLine)
@@ -413,11 +413,11 @@
                     new Point3D(0, 0, 0),
                     new Point3D(2, 0, 2)
                 });
-                calculationItem.InputParameters.SurfaceLine = surfaceLine;
+                calculation.InputParameters.SurfaceLine = surfaceLine;
             }
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -462,17 +462,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
                                                                   assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new SemiProbabilisticPipingInputContextProperties(context,
@@ -550,7 +550,7 @@
 
             HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -565,10 +565,10 @@
 
             var failureMechanism = new PipingFailureMechanism();
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -643,19 +643,19 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
                                                                   assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
             var properties = new SemiProbabilisticPipingInputContextProperties(context,
                                                                                AssessmentSectionTestHelper.GetTestAssessmentLevel,
                                                                                handler);
@@ -855,21 +855,21 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
             inputParameters.SurfaceLine = surfaceLine;
             inputParameters.Attach(inputObserver);
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
                                                                   assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new SemiProbabilisticPipingInputContextProperties(context,
@@ -899,21 +899,21 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario();
+            var calculation = new SemiProbabilisticPipingCalculationScenario();
             var failureMechanism = new PipingFailureMechanism();
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
             inputParameters.SurfaceLine = surfaceLine;
             inputParameters.Attach(inputObserver);
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
                                                                   assessmentSection);
 
-            var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
+            var handler = new ObservablePropertyChangeHandler(calculation, calculation.InputParameters);
 
             // Call
             var properties = new SemiProbabilisticPipingInputContextProperties(context,
@@ -943,7 +943,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -953,8 +953,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -993,7 +993,7 @@
             var entryPoint = (RoundedDouble) newEntryPoint;
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1003,8 +1003,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -1040,7 +1040,7 @@
             mocks.ReplayAll();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1050,8 +1050,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -1087,7 +1087,7 @@
             var observable = mocks.StrictMock<IObservable>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1097,8 +1097,8 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            var context = new SemiProbabilisticPipingInputContext(calculationItem.InputParameters,
-                                                                  calculationItem,
+            var context = new SemiProbabilisticPipingInputContext(calculation.InputParameters,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -1132,7 +1132,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1141,10 +1141,10 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   Enumerable.Empty<PipingStochasticSoilModel>(),
                                                                   failureMechanism,
@@ -1185,7 +1185,7 @@
                 stochasticSoilProfile
             });
 
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1196,10 +1196,10 @@
             };
             var failureMechanism = new PipingFailureMechanism();
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   new[]
                                                                   {
@@ -1234,7 +1234,7 @@
             {
                 stochasticSoilProfile
             });
-            var calculationItem = new SemiProbabilisticPipingCalculationScenario
+            var calculation = new SemiProbabilisticPipingCalculationScenario
             {
                 InputParameters =
                 {
@@ -1244,11 +1244,11 @@
                 }
             };
 
-            SemiProbabilisticPipingInput inputParameters = calculationItem.InputParameters;
+            SemiProbabilisticPipingInput inputParameters = calculation.InputParameters;
             var failureMechanism = new PipingFailureMechanism();
 
             var context = new SemiProbabilisticPipingInputContext(inputParameters,
-                                                                  calculationItem,
+                                                                  calculation,
                                                                   Enumerable.Empty<PipingSurfaceLine>(),
                                                                   new[]
                                                                   {