Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingInputViewTest.cs
===================================================================
diff -u -rdf881c15091487bc78a377826ec23379beb441b2 -r0da412bffaa065cadf2df8f8f55cffee69dba970
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision df881c15091487bc78a377826ec23379beb441b2)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 0da412bffaa065cadf2df8f8f55cffee69dba970)
@@ -101,7 +101,7 @@
             // Setup
             using (var view = new PipingInputView())
             {
-                var calculation = new TestPipingCalculation(new TestPipingInput());
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput());
 
                 // Call
                 view.Data = calculation;
@@ -133,7 +133,7 @@
             // Setup
             using (var view = new PipingInputView
             {
-                Data = new TestPipingCalculation(new TestPipingInput())
+                Data = new TestPipingCalculationScenario(new TestPipingInput())
             })
             {
                 // Precondition
@@ -154,7 +154,7 @@
         public void Data_SetToNull_TableDataCleared()
         {
             // Setup
-            var calculation = new TestPipingCalculation(new TestPipingInput())
+            var calculation = new TestPipingCalculationScenario(new TestPipingInput())
             {
                 InputParameters =
                 {
@@ -197,7 +197,7 @@
                 surfaceLine.SetDikeToeAtRiverAt(new Point3D(1.2, 2.3, 4.0));
 
                 PipingStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile();
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     InputParameters =
                     {
@@ -228,7 +228,7 @@
             // Setup
             using (var view = new PipingInputView())
             {
-                var calculation = new TestPipingCalculation(new TestPipingInput());
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput());
 
                 // Call
                 view.Data = calculation;
@@ -245,7 +245,7 @@
             using (var view = new PipingInputView())
             {
                 PipingSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     InputParameters =
                     {
@@ -273,7 +273,7 @@
             // Setup
             using (var view = new PipingInputView())
             {
-                var calculation = new TestPipingCalculation(new TestPipingInput());
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput());
 
                 // Call
                 view.Data = calculation;
@@ -292,7 +292,7 @@
                 const string initialName = "Initial name";
                 const string updatedName = "Updated name";
 
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     Name = initialName
                 };
@@ -321,7 +321,7 @@
                 const string initialName = "Initial name";
                 const string updatedName = "Updated name";
 
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     Name = initialName
                 };
@@ -331,7 +331,7 @@
                 // Precondition
                 Assert.AreEqual(initialName, view.Chart.ChartTitle);
 
-                view.Data = new TestPipingCalculation(new TestPipingInput())
+                view.Data = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     Name = initialName
                 };
@@ -367,7 +367,7 @@
                 surfaceLine.SetDikeToeAtPolderAt(characteristicPoint);
                 surfaceLine.SetDikeToeAtRiverAt(characteristicPoint);
 
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     InputParameters =
                     {
@@ -464,7 +464,7 @@
                         }
                     }, SoilProfileType.SoilProfile1D));
 
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     InputParameters =
                     {
@@ -505,7 +505,7 @@
             const int updatedExitPointIndex = exitPointIndex - 1;
             const int updatedEntryPointIndex = entryPointIndex - 1;
 
-            var calculation = new TestPipingCalculation(new TestPipingInput());
+            var calculation = new TestPipingCalculationScenario(new TestPipingInput());
 
             using (var view = new PipingInputView
             {
@@ -585,7 +585,7 @@
 
             using (var view = new PipingInputView())
             {
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     InputParameters =
                     {
@@ -601,7 +601,7 @@
                     chartData.Attach(observer);
                 }
 
-                view.Data = new TestPipingCalculation(new TestPipingInput());
+                view.Data = new TestPipingCalculationScenario(new TestPipingInput());
 
                 calculation.InputParameters.SurfaceLine = GetSecondSurfaceLineWithGeometry();
 
@@ -622,7 +622,7 @@
             {
                 PipingSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
                 PipingStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile();
-                var calculation = new TestPipingCalculation(new TestPipingInput())
+                var calculation = new TestPipingCalculationScenario(new TestPipingInput())
                 {
                     InputParameters =
                     {
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7 -r0da412bffaa065cadf2df8f8f55cffee69dba970
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision b4727e7f5ebbdec9f8f9937e0e9d7cb33f6404e7)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 0da412bffaa065cadf2df8f8f55cffee69dba970)
@@ -1781,7 +1781,7 @@
                     new Point3D(4, 5, 6)
                 });
 
-                var calculation1 = new TestPipingCalculation(new TestPipingInput
+                var calculation1 = new TestPipingCalculationScenario(new TestPipingInput
                 {
                     SurfaceLine = surfaceLine,
                     EntryPointL = (RoundedDouble) 0,
@@ -1791,7 +1791,7 @@
                 calculation1.Attach(calculation1Observer);
                 calculation1.InputParameters.Attach(calculation1InputObserver);
 
-                var calculation2 = new TestPipingCalculation(new TestPipingInput
+                var calculation2 = new TestPipingCalculationScenario(new TestPipingInput
                 {
                     SurfaceLine = surfaceLine,
                     EntryPointL = (RoundedDouble) 0,
@@ -1871,7 +1871,7 @@
                     new Point3D(4, 5, 6)
                 });
 
-                var calculation1 = new TestPipingCalculation(new TestPipingInput
+                var calculation1 = new TestPipingCalculationScenario(new TestPipingInput
                 {
                     SurfaceLine = surfaceLine,
                     EntryPointL = (RoundedDouble) 0,
@@ -1881,7 +1881,7 @@
                 calculation1.Attach(calculation1Observer);
                 calculation1.InputParameters.Attach(calculation1InputObserver);
 
-                var calculation2 = new TestPipingCalculation(new TestPipingInput
+                var calculation2 = new TestPipingCalculationScenario(new TestPipingInput
                 {
                     SurfaceLine = surfaceLine,
                     EntryPointL = (RoundedDouble) 0,
@@ -1980,7 +1980,7 @@
                     new Point3D(4, 5, 6)
                 });
 
-                var calculation1 = new TestPipingCalculation(new TestPipingInput
+                var calculation1 = new TestPipingCalculationScenario(new TestPipingInput
                 {
                     SurfaceLine = surfaceLine,
                     EntryPointL = (RoundedDouble) 0,
@@ -1990,7 +1990,7 @@
                 calculation1.Attach(calculation1Observer);
                 calculation1.InputParameters.Attach(calculation1InputObserver);
 
-                var calculation2 = new TestPipingCalculation(new TestPipingInput
+                var calculation2 = new TestPipingCalculationScenario(new TestPipingInput
                 {
                     SurfaceLine = surfaceLine,
                     EntryPointL = (RoundedDouble) 0,