Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rb2e674342e62c30bb8f78c89ca5cd450c8c6cc2e -r94c8f70cb372425358ed05367bb82d03a1e21644
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision b2e674342e62c30bb8f78c89ca5cd450c8c6cc2e)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 94c8f70cb372425358ed05367bb82d03a1e21644)
@@ -637,7 +637,7 @@
         {
             foreach (StabilityPointStructure structure in structures)
             {
-                var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+                var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
                 {
                     Name = NamingHelper.GetUniqueName(calculations, structure.Name, c => c.Name),
                     InputParameters =
@@ -653,7 +653,7 @@
 
         private static void AddCalculation(StabilityPointStructuresCalculationGroupContext context)
         {
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RiskeerCommonDataResources.Calculation_DefaultName, c => c.Name)
             };
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -r94c8f70cb372425358ed05367bb82d03a1e21644
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 94c8f70cb372425358ed05367bb82d03a1e21644)
@@ -144,7 +144,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
-            var childCalculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var childCalculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
 
             group.Children.Add(childGroup);
             group.Children.Add(childCalculation);
@@ -342,12 +342,12 @@
             {
                 Children =
                 {
-                    new StructuresCalculation<StabilityPointStructuresInput>()
+                    new StructuresCalculationScenario<StabilityPointStructuresInput>()
                 }
             };
 
             var failureMechanism = new TestStabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
 
@@ -392,12 +392,12 @@
             {
                 Children =
                 {
-                    new StructuresCalculation<StabilityPointStructuresInput>()
+                    new StructuresCalculationScenario<StabilityPointStructuresInput>()
                 }
             };
 
             var failureMechanism = new TestStabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath");
 
@@ -444,14 +444,14 @@
             {
                 Children =
                 {
-                    new StructuresCalculation<StabilityPointStructuresInput>()
+                    new StructuresCalculationScenario<StabilityPointStructuresInput>()
                 }
             };
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
             var failureMechanism = new TestStabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -664,7 +664,7 @@
         public void ContextMenuStrip_CalculationGroupWithCalculationsWithoutStructure_ContextMenuItemUpdateStructuresDisabledAndToolTipSet()
         {
             // Setup
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
             var group = new CalculationGroup
             {
                 Children =
@@ -792,7 +792,7 @@
             calculation1InputObserver.Expect(obs => obs.UpdateObserver());
             calculation2InputObserver.Expect(obs => obs.UpdateObserver());
 
-            var calculation1 = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation1 = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -802,7 +802,7 @@
             calculation1.Attach(calculation1Observer);
             calculation1.InputParameters.Attach(calculation1InputObserver);
 
-            var calculation2 = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation2 = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -871,7 +871,7 @@
             var calculation2Observer = mocks.StrictMock<IObserver>();
             var calculation2InputObserver = mocks.StrictMock<IObserver>();
 
-            var calculation1 = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation1 = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -882,7 +882,7 @@
             calculation1.Attach(calculation1Observer);
             calculation1.InputParameters.Attach(calculation1InputObserver);
 
-            var calculation2 = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation2 = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -964,7 +964,7 @@
             calculation2Observer.Expect(obs => obs.UpdateObserver());
             calculation2InputObserver.Expect(obs => obs.UpdateObserver());
 
-            var calculation1 = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation1 = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -975,7 +975,7 @@
             calculation1.Attach(calculation1Observer);
             calculation1.InputParameters.Attach(calculation1InputObserver);
 
-            var calculation2 = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation2 = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -1046,7 +1046,7 @@
             // Setup
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -1100,7 +1100,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 InputParameters =
                 {
@@ -1425,7 +1425,7 @@
                                                                                null,
                                                                                failureMechanism,
                                                                                assessmentSection);
-            var calculationItem = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculationItem = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 Name = "Nieuwe berekening"
             };
@@ -1453,7 +1453,7 @@
                     // Assert
                     Assert.AreEqual(2, group.Children.Count);
                     ICalculationBase newlyAddedItem = group.Children.Last();
-                    Assert.IsInstanceOf<StructuresCalculation<StabilityPointStructuresInput>>(newlyAddedItem);
+                    Assert.IsInstanceOf<StructuresCalculationScenario<StabilityPointStructuresInput>>(newlyAddedItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
                 }
@@ -1646,7 +1646,7 @@
                 StabilityPointStructure structure2 = new TestStabilityPointStructure("id structure2");
 
                 var existingCalculationGroup = new CalculationGroup();
-                var existingCalculation = new StructuresCalculation<StabilityPointStructuresInput>();
+                var existingCalculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
                 var failureMechanism = new StabilityPointStructuresFailureMechanism
                 {
                     CalculationsGroup =
@@ -1699,7 +1699,7 @@
                     Assert.AreEqual(3, failureMechanism.CalculationsGroup.Children.Count);
                     Assert.AreSame(existingCalculationGroup, failureMechanism.CalculationsGroup.Children[0]);
                     Assert.AreSame(existingCalculation, failureMechanism.CalculationsGroup.Children[1]);
-                    var generatedCalculation = failureMechanism.CalculationsGroup.Children[2] as StructuresCalculation<StabilityPointStructuresInput>;
+                    var generatedCalculation = failureMechanism.CalculationsGroup.Children[2] as StructuresCalculationScenario<StabilityPointStructuresInput>;
                     Assert.IsNotNull(generatedCalculation);
                     Assert.AreSame(structure1, generatedCalculation.InputParameters.Structure);
                 }
@@ -1756,7 +1756,7 @@
                     contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick();
 
                     // Then
-                    Assert.AreEqual(0, failureMechanism.Calculations.OfType<StructuresCalculation<StabilityPointStructuresInput>>().Count());
+                    Assert.AreEqual(0, failureMechanism.Calculations.OfType<StructuresCalculationScenario<StabilityPointStructuresInput>>().Count());
                 }
             }
         }
@@ -1778,7 +1778,7 @@
                     {
                         Children =
                         {
-                            new StructuresCalculation<StabilityPointStructuresInput>
+                            new StructuresCalculationScenario<StabilityPointStructuresInput>
                             {
                                 Name = existingCalculationName
                             }
@@ -1824,7 +1824,7 @@
                     contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick();
 
                     // Then
-                    StructuresCalculation<StabilityPointStructuresInput>[] stabilityPointStructuresCalculations = failureMechanism.Calculations.OfType<StructuresCalculation<StabilityPointStructuresInput>>().ToArray();
+                    StructuresCalculationScenario<StabilityPointStructuresInput>[] stabilityPointStructuresCalculations = failureMechanism.Calculations.OfType<StructuresCalculationScenario<StabilityPointStructuresInput>>().ToArray();
                     Assert.AreEqual(2, stabilityPointStructuresCalculations.Length);
                     Assert.AreEqual(expectedNewName, stabilityPointStructuresCalculations[1].Name);
                 }
@@ -1891,7 +1891,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             });
 
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
             group.Children.Add(calculation);
 
             StabilityPointStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
@@ -1921,7 +1921,7 @@
                                                                                      null,
                                                                                      failureMechanism,
                                                                                      assessmentSection);
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
 
             observer.Expect(o => o.UpdateObserver());