Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rcc718f8fc3bd637f4b43f092a3954be525888a5a -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision cc718f8fc3bd637f4b43f092a3954be525888a5a)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -404,10 +404,10 @@
                                                                          object parentData,
                                                                          TreeViewControl treeViewControl)
         {
-            StructuresCalculation<ClosingStructuresInput>[] calculations = context.WrappedData
-                                                                                  .Calculations
-                                                                                  .Cast<StructuresCalculation<ClosingStructuresInput>>()
-                                                                                  .ToArray();
+            StructuresCalculationScenario<ClosingStructuresInput>[] calculations = context.WrappedData
+                                                                                          .Calculations
+                                                                                          .Cast<StructuresCalculationScenario<ClosingStructuresInput>>()
+                                                                                          .ToArray();
             IInquiryHelper inquiryHelper = GetInquiryHelper();
             IViewCommands viewCommands = Gui.ViewCommands;
 
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc35a4308c9093dde0e6847d7c89aa08b73c71d60 -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c35a4308c9093dde0e6847d7c89aa08b73c71d60)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -448,7 +448,7 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<ClosingStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository);
 
@@ -489,7 +489,7 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<ClosingStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath");
 
@@ -532,7 +532,7 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<ClosingStructuresInput>());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearCalculationOutputChangeHandlerBase.cs
===================================================================
diff -u -r77c905218e8c214fd59e3f38576f62ef9296aff0 -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearCalculationOutputChangeHandlerBase.cs	(.../ClearCalculationOutputChangeHandlerBase.cs)	(revision 77c905218e8c214fd59e3f38576f62ef9296aff0)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearCalculationOutputChangeHandlerBase.cs	(.../ClearCalculationOutputChangeHandlerBase.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -32,9 +32,9 @@
     /// <summary>
     /// Base class for handling clearing calculation output.
     /// </summary>
-    /// <typeparam name="TCalculation">The type of the calculation.</typeparam>
-    public abstract class ClearCalculationOutputChangeHandlerBase<TCalculation> : IClearCalculationOutputChangeHandler
-        where TCalculation : ICalculation
+    /// <typeparam name="TCalculationScenario">The type of calculation scenarios.</typeparam>
+    public abstract class ClearCalculationOutputChangeHandlerBase<TCalculationScenario> : IClearCalculationOutputChangeHandler
+        where TCalculationScenario : ICalculationScenario
     {
         private readonly IInquiryHelper inquiryHelper;
 
@@ -43,9 +43,11 @@
         /// </summary>
         /// <param name="calculations">The calculations to clear the output for.</param>
         /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
-        /// <param name="viewCommands"></param>
+        /// <param name="viewCommands">The view commands used to close views for the calculation output.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        protected ClearCalculationOutputChangeHandlerBase(IEnumerable<TCalculation> calculations, IInquiryHelper inquiryHelper, IViewCommands viewCommands)
+        protected ClearCalculationOutputChangeHandlerBase(IEnumerable<TCalculationScenario> calculations,
+                                                          IInquiryHelper inquiryHelper,
+                                                          IViewCommands viewCommands)
         {
             if (calculations == null)
             {
@@ -78,7 +80,7 @@
 
             var affectedCalculations = new List<ICalculation>();
 
-            foreach (TCalculation calculation in Calculations)
+            foreach (TCalculationScenario calculation in Calculations)
             {
                 calculation.ClearOutput();
                 affectedCalculations.Add(calculation);
@@ -90,7 +92,7 @@
         /// <summary>
         /// Gets the calculations.
         /// </summary>
-        protected IEnumerable<TCalculation> Calculations { get; }
+        protected IEnumerable<TCalculationScenario> Calculations { get; }
 
         /// <summary>
         /// Gets the <see cref="IViewCommands"/>.
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearStructuresCalculationOutputChangeHandler.cs
===================================================================
diff -u -rcc718f8fc3bd637f4b43f092a3954be525888a5a -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearStructuresCalculationOutputChangeHandler.cs	(.../ClearStructuresCalculationOutputChangeHandler.cs)	(revision cc718f8fc3bd637f4b43f092a3954be525888a5a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearStructuresCalculationOutputChangeHandler.cs	(.../ClearStructuresCalculationOutputChangeHandler.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -28,14 +28,14 @@
 namespace Riskeer.Common.Forms.ChangeHandlers
 {
     /// <summary>
-    /// Class for handling clearing the output of <see cref="StructuresCalculation{T}"/> 
+    /// Class for handling clearing the output of <see cref="StructuresCalculationScenario{T}"/> 
     /// </summary>
     /// <typeparam name="TStructuresInput">The type of structures input.</typeparam>
-    public class ClearStructuresCalculationOutputChangeHandler<TStructuresInput> : ClearCalculationOutputChangeHandlerBase<StructuresCalculation<TStructuresInput>>
+    public class ClearStructuresCalculationOutputChangeHandler<TStructuresInput> : ClearCalculationOutputChangeHandlerBase<StructuresCalculationScenario<TStructuresInput>>
         where TStructuresInput : IStructuresCalculationInput, new()
     {
         public ClearStructuresCalculationOutputChangeHandler(
-            IEnumerable<StructuresCalculation<TStructuresInput>> calculations,
+            IEnumerable<StructuresCalculationScenario<TStructuresInput>> calculations,
             IInquiryHelper inquiryHelper, IViewCommands viewCommands)
             : base(calculations, inquiryHelper, viewCommands) {}
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearCalculationOutputChangeHandlerBaseTest.cs
===================================================================
diff -u -raad9f6c1881b26d0833fef4f9bb5882f4dc385ed -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearCalculationOutputChangeHandlerBaseTest.cs	(.../ClearCalculationOutputChangeHandlerBaseTest.cs)	(revision aad9f6c1881b26d0833fef4f9bb5882f4dc385ed)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearCalculationOutputChangeHandlerBaseTest.cs	(.../ClearCalculationOutputChangeHandlerBaseTest.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -62,7 +62,7 @@
             mocks.ReplayAll();
 
             // Call
-            void Call() => new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculation>(), null, viewCommands);
+            void Call() => new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculationScenario>(), null, viewCommands);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -79,7 +79,7 @@
             mocks.ReplayAll();
 
             // Call
-            void Call() => new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculation>(), inquiryHelper, null);
+            void Call() => new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculationScenario>(), inquiryHelper, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -97,7 +97,7 @@
             mocks.ReplayAll();
 
             // Call
-            var changeHandler = new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculation>(), inquiryHelper, viewCommands);
+            var changeHandler = new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculationScenario>(), inquiryHelper, viewCommands);
 
             // Assert
             Assert.IsInstanceOf<IClearCalculationOutputChangeHandler>(changeHandler);
@@ -118,7 +118,7 @@
             var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
-            var changeHandler = new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculation>(), inquiryHelper, viewCommands);
+            var changeHandler = new TestClearCalculationOutputChangeHandler(Enumerable.Empty<ICalculationScenario>(), inquiryHelper, viewCommands);
 
             // Call
             bool confirmation = changeHandler.InquireConfirmation();
@@ -135,13 +135,13 @@
             var mocks = new MockRepository();
             var inquiryHelper = mocks.Stub<IInquiryHelper>();
             var viewCommands = mocks.Stub<IViewCommands>();
-            var calculation1 = mocks.StrictMock<ICalculation>();
+            var calculation1 = mocks.StrictMock<ICalculationScenario>();
             calculation1.Expect(c => c.ClearOutput());
-            var calculation2 = mocks.StrictMock<ICalculation>();
+            var calculation2 = mocks.StrictMock<ICalculationScenario>();
             calculation2.Expect(c => c.ClearOutput());
             mocks.ReplayAll();
 
-            ICalculation[] calculations =
+            ICalculationScenario[] calculations =
             {
                 calculation1,
                 calculation2
@@ -161,9 +161,11 @@
             mocks.VerifyAll();
         }
 
-        private class TestClearCalculationOutputChangeHandler : ClearCalculationOutputChangeHandlerBase<ICalculation>
+        private class TestClearCalculationOutputChangeHandler : ClearCalculationOutputChangeHandlerBase<ICalculationScenario>
         {
-            public TestClearCalculationOutputChangeHandler(IEnumerable<ICalculation> calculations, IInquiryHelper inquiryHelper, IViewCommands viewCommands)
+            public TestClearCalculationOutputChangeHandler(IEnumerable<ICalculationScenario> calculations,
+                                                           IInquiryHelper inquiryHelper,
+                                                           IViewCommands viewCommands)
                 : base(calculations, inquiryHelper, viewCommands) {}
 
             public bool DoPreUpdateActionsExecuted { get; private set; }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearStructuresCalculationOutputChangeHandlerTest.cs
===================================================================
diff -u -rcc718f8fc3bd637f4b43f092a3954be525888a5a -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearStructuresCalculationOutputChangeHandlerTest.cs	(.../ClearStructuresCalculationOutputChangeHandlerTest.cs)	(revision cc718f8fc3bd637f4b43f092a3954be525888a5a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearStructuresCalculationOutputChangeHandlerTest.cs	(.../ClearStructuresCalculationOutputChangeHandlerTest.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -44,10 +44,10 @@
 
             // Call
             var changeHandler = new ClearStructuresCalculationOutputChangeHandler<TestStructuresInput>(
-                Enumerable.Empty<StructuresCalculation<TestStructuresInput>>(), inquiryHelper, viewCommands);
+                Enumerable.Empty<StructuresCalculationScenario<TestStructuresInput>>(), inquiryHelper, viewCommands);
 
             // Assert
-            Assert.IsInstanceOf<ClearCalculationOutputChangeHandlerBase<StructuresCalculation<TestStructuresInput>>>(changeHandler);
+            Assert.IsInstanceOf<ClearCalculationOutputChangeHandlerBase<StructuresCalculationScenario<TestStructuresInput>>>(changeHandler);
             mocks.VerifyAll();
         }
 
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rcc718f8fc3bd637f4b43f092a3954be525888a5a -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision cc718f8fc3bd637f4b43f092a3954be525888a5a)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -407,10 +407,10 @@
                                                                          object parentData,
                                                                          TreeViewControl treeViewControl)
         {
-            StructuresCalculation<HeightStructuresInput>[] calculations = context.WrappedData
-                                                                                 .Calculations
-                                                                                 .Cast<StructuresCalculation<HeightStructuresInput>>()
-                                                                                 .ToArray();
+            StructuresCalculationScenario<HeightStructuresInput>[] calculations = context.WrappedData
+                                                                                         .Calculations
+                                                                                         .Cast<StructuresCalculationScenario<HeightStructuresInput>>()
+                                                                                         .ToArray();
 
             IInquiryHelper inquiryHelper = GetInquiryHelper();
             IViewCommands viewCommands = Gui.ViewCommands;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc35a4308c9093dde0e6847d7c89aa08b73c71d60 -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c35a4308c9093dde0e6847d7c89aa08b73c71d60)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -448,7 +448,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<HeightStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository);
 
@@ -489,7 +489,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<HeightStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath");
 
@@ -532,7 +532,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<HeightStructuresInput>());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rcc718f8fc3bd637f4b43f092a3954be525888a5a -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision cc718f8fc3bd637f4b43f092a3954be525888a5a)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -411,10 +411,10 @@
                                                                          object parentData,
                                                                          TreeViewControl treeViewControl)
         {
-            StructuresCalculation<StabilityPointStructuresInput>[] calculations = context.WrappedData
-                                                                                         .Calculations
-                                                                                         .Cast<StructuresCalculation<StabilityPointStructuresInput>>()
-                                                                                         .ToArray();
+            StructuresCalculationScenario<StabilityPointStructuresInput>[] calculations = context.WrappedData
+                                                                                                 .Calculations
+                                                                                                 .Cast<StructuresCalculationScenario<StabilityPointStructuresInput>>()
+                                                                                                 .ToArray();
             IInquiryHelper inquiryHelper = GetInquiryHelper();
             IViewCommands viewCommands = Gui.ViewCommands;
 
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbd58395dc91037106a3c2136b918eeb7012507ab -r8a21e60e9474fe20f665b1a41cc14c778d99d572
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision bd58395dc91037106a3c2136b918eeb7012507ab)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8a21e60e9474fe20f665b1a41cc14c778d99d572)
@@ -448,7 +448,7 @@
         {
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository);
 
@@ -489,7 +489,7 @@
         {
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath");
 
@@ -532,7 +532,7 @@
         {
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");