Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingInputContextPropertyInfoTest.cs
===================================================================
diff -u -r6c54938a7e5c7db2f879b78dac900a9fa8226d4d -rc30834f4b2e746b2b1a077e50b18d1d10f75b103
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingInputContextPropertyInfoTest.cs	(.../ProbabilisticPipingInputContextPropertyInfoTest.cs)	(revision 6c54938a7e5c7db2f879b78dac900a9fa8226d4d)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/Probabilistic/ProbabilisticPipingInputContextPropertyInfoTest.cs	(.../ProbabilisticPipingInputContextPropertyInfoTest.cs)	(revision c30834f4b2e746b2b1a077e50b18d1d10f75b103)
@@ -64,7 +64,7 @@
         public void CreateInstance_WithContext_ExpectedProperties()
         {
             // Setup
-            var scenario = new ProbabilisticPipingCalculation();
+            var scenario = new ProbabilisticPipingCalculationScenario();
             var context = new ProbabilisticPipingInputContext(
                 scenario.InputParameters,
                 scenario,
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfbbcb30a2f475ee2a8f2055e741e91713f266720 -rc30834f4b2e746b2b1a077e50b18d1d10f75b103
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingInputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingInputContextTreeNodeInfoTest.cs)	(revision fbbcb30a2f475ee2a8f2055e741e91713f266720)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingInputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingInputContextTreeNodeInfoTest.cs)	(revision c30834f4b2e746b2b1a077e50b18d1d10f75b103)
@@ -92,7 +92,7 @@
             // Setup
             var pipingInputContext = new ProbabilisticPipingInputContext(
                 new ProbabilisticPipingInput(),
-                new ProbabilisticPipingCalculation(),
+                new ProbabilisticPipingCalculationScenario(),
                 Enumerable.Empty<PipingSurfaceLine>(),
                 Enumerable.Empty<PipingStochasticSoilModel>(),
                 new PipingFailureMechanism(),
@@ -113,7 +113,7 @@
             // Setup
             var pipingInputContext = new ProbabilisticPipingInputContext(
                 new ProbabilisticPipingInput(),
-                new ProbabilisticPipingCalculation(),
+                new ProbabilisticPipingCalculationScenario(),
                 Enumerable.Empty<PipingSurfaceLine>(),
                 Enumerable.Empty<PipingStochasticSoilModel>(),
                 new PipingFailureMechanism(),
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfbbcb30a2f475ee2a8f2055e741e91713f266720 -rc30834f4b2e746b2b1a077e50b18d1d10f75b103
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingOutputContextTreeNodeInfoTest.cs)	(revision fbbcb30a2f475ee2a8f2055e741e91713f266720)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingOutputContextTreeNodeInfoTest.cs)	(revision c30834f4b2e746b2b1a077e50b18d1d10f75b103)
@@ -88,7 +88,7 @@
         public void ForeColor_HasNoOutput_ReturnGrayText()
         {
             // Setup
-            var context = new ProbabilisticPipingOutputContext(new ProbabilisticPipingCalculation());
+            var context = new ProbabilisticPipingOutputContext(new ProbabilisticPipingCalculationScenario());
 
             // Call
             Color color = info.ForeColor(context);
@@ -101,7 +101,7 @@
         public void ForeColor_HasOutput_ReturnControlText()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutput()
             };
@@ -131,7 +131,7 @@
         public void ChildNodeObjects_Always_ReturnsCollectionWithOutputObjects(bool hasOutput)
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = hasOutput ? PipingTestDataGenerator.GetRandomProbabilisticPipingOutput() : null
             };
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfbbcb30a2f475ee2a8f2055e741e91713f266720 -rc30834f4b2e746b2b1a077e50b18d1d10f75b103
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingProfileSpecificOutputContextTreeNodeInfoTest.cs)	(revision fbbcb30a2f475ee2a8f2055e741e91713f266720)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingProfileSpecificOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingProfileSpecificOutputContextTreeNodeInfoTest.cs)	(revision c30834f4b2e746b2b1a077e50b18d1d10f75b103)
@@ -91,7 +91,7 @@
         public void ForeColor_HasNoOutput_ReturnGrayText()
         {
             // Setup
-            var context = new ProbabilisticPipingProfileSpecificOutputContext(new ProbabilisticPipingCalculation());
+            var context = new ProbabilisticPipingProfileSpecificOutputContext(new ProbabilisticPipingCalculationScenario());
 
             // Call
             Color color = info.ForeColor(context);
@@ -104,7 +104,7 @@
         public void ForeColor_HasOutput_ReturnControlText()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutput()
             };
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingSectionSpecificOutputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfbbcb30a2f475ee2a8f2055e741e91713f266720 -rc30834f4b2e746b2b1a077e50b18d1d10f75b103
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingSectionSpecificOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingSectionSpecificOutputContextTreeNodeInfoTest.cs)	(revision fbbcb30a2f475ee2a8f2055e741e91713f266720)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingSectionSpecificOutputContextTreeNodeInfoTest.cs	(.../ProbabilisticPipingSectionSpecificOutputContextTreeNodeInfoTest.cs)	(revision c30834f4b2e746b2b1a077e50b18d1d10f75b103)
@@ -91,7 +91,7 @@
         public void ForeColor_HasNoOutput_ReturnGrayText()
         {
             // Setup
-            var context = new ProbabilisticPipingSectionSpecificOutputContext(new ProbabilisticPipingCalculation());
+            var context = new ProbabilisticPipingSectionSpecificOutputContext(new ProbabilisticPipingCalculationScenario());
 
             // Call
             Color color = info.ForeColor(context);
@@ -104,7 +104,7 @@
         public void ForeColor_HasOutput_ReturnControlText()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation
+            var calculation = new ProbabilisticPipingCalculationScenario
             {
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutput()
             };