Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs	(.../ClosingStructuresCalculationEntityReadExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs	(.../ClosingStructuresCalculationEntityReadExtensions.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -37,15 +37,15 @@
     {
         /// <summary>
         /// Reads the <see cref="ClosingStructuresCalculationEntity"/> and use the
-        /// information to update a <see cref="StructuresCalculation{T}"/>.
+        /// information to update a <see cref="StructuresCalculationScenario{T}"/>.
         /// </summary>
         /// <param name="entity">The <see cref="ClosingStructuresCalculationEntity"/>
-        /// to create <see cref="StructuresCalculation{T}"/> for.</param>
+        /// to create <see cref="StructuresCalculationScenario{T}"/> for.</param>
         /// <param name="collector">The object keeping track of read operations.</param>
-        /// <returns>A new <see cref="StructuresCalculation{T}"/>.</returns>
+        /// <returns>A new <see cref="StructuresCalculationScenario{T}"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
-        internal static StructuresCalculation<ClosingStructuresInput> Read(this ClosingStructuresCalculationEntity entity,
-                                                                           ReadConversionCollector collector)
+        internal static StructuresCalculationScenario<ClosingStructuresInput> Read(this ClosingStructuresCalculationEntity entity,
+                                                                                   ReadConversionCollector collector)
         {
             if (collector == null)
             {
@@ -57,7 +57,7 @@
                 return collector.Get(entity);
             }
 
-            var calculation = new StructuresCalculation<ClosingStructuresInput>
+            var calculation = new StructuresCalculationScenario<ClosingStructuresInput>
             {
                 Name = entity.Name,
                 Comments =
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs
===================================================================
diff -u -r48f21c3256c73e5c4cbfed18a190b45223a1567d -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision 48f21c3256c73e5c4cbfed18a190b45223a1567d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -102,8 +102,8 @@
         private readonly Dictionary<HeightStructuresCalculationEntity, StructuresCalculation<HeightStructuresInput>> heightStructuresCalculations =
             CreateDictionary<HeightStructuresCalculationEntity, StructuresCalculation<HeightStructuresInput>>();
 
-        private readonly Dictionary<ClosingStructuresCalculationEntity, StructuresCalculation<ClosingStructuresInput>> closingStructuresCalculations =
-            CreateDictionary<ClosingStructuresCalculationEntity, StructuresCalculation<ClosingStructuresInput>>();
+        private readonly Dictionary<ClosingStructuresCalculationEntity, StructuresCalculationScenario<ClosingStructuresInput>> closingStructuresCalculations =
+            CreateDictionary<ClosingStructuresCalculationEntity, StructuresCalculationScenario<ClosingStructuresInput>>();
 
         private readonly Dictionary<StabilityPointStructuresCalculationEntity, StructuresCalculation<StabilityPointStructuresInput>> stabilityPointStructuresCalculations =
             CreateDictionary<StabilityPointStructuresCalculationEntity, StructuresCalculation<StabilityPointStructuresInput>>();
@@ -1391,15 +1391,15 @@
 
         /// <summary>
         /// Registers a read operation for <see cref="ClosingStructuresCalculationEntity"/>
-        /// and the <see cref="StructuresCalculation{T}"/> that was constructed
+        /// and the <see cref="StructuresCalculationScenario{T}"/> that was constructed
         /// with the information.
         /// </summary>
         /// <param name="entity">The <see cref="ClosingStructuresCalculationEntity"/>
         /// that was read.</param>
         /// <param name="model">The <see cref="StructuresCalculation{T}"/> that
         /// was constructed.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        internal void Read(ClosingStructuresCalculationEntity entity, StructuresCalculation<ClosingStructuresInput> model)
+        internal void Read(ClosingStructuresCalculationEntity entity, StructuresCalculationScenario<ClosingStructuresInput> model)
         {
             if (entity == null)
             {
@@ -1431,18 +1431,18 @@
         }
 
         /// <summary>
-        /// Obtains the <see cref="StructuresCalculation{T}"/> which was read
+        /// Obtains the <see cref="StructuresCalculationScenario{T}"/> which was read
         /// for the given <see cref="ClosingStructuresCalculationEntity"/>.
         /// </summary>
         /// <param name="entity">The <see cref="ClosingStructuresCalculationEntity"/> for which a read
         /// operation has been registered.</param>
-        /// <returns>The constructed <see cref="StructuresCalculation{T}"/>.</returns>
+        /// <returns>The constructed <see cref="StructuresCalculationScenario{T}"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="entity"/> is <c>null</c>.</exception>
         /// <exception cref="InvalidOperationException">Thrown when no read operation has
         /// been registered for <paramref name="entity"/>.</exception>
         /// <remarks>Use <see cref="Contains(ClosingStructuresCalculationEntity)"/>
         /// to find out whether a read operation has been registered for <paramref name="entity"/>.</remarks>
-        internal StructuresCalculation<ClosingStructuresInput> Get(ClosingStructuresCalculationEntity entity)
+        internal StructuresCalculationScenario<ClosingStructuresInput> Get(ClosingStructuresCalculationEntity entity)
         {
             if (entity == null)
             {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r9793bc3048c48b4c25bcde1d0c07d6d02b53b2ff -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 9793bc3048c48b4c25bcde1d0c07d6d02b53b2ff)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -540,9 +540,9 @@
                     AssertStructuresCalculation(expectedHeightStructuresCalculation, (StructuresCalculation<HeightStructuresInput>) actualChild);
                 }
 
-                if (expectedChild is StructuresCalculation<ClosingStructuresInput> expectedClosingStructuresCalculation)
+                if (expectedChild is StructuresCalculationScenario<ClosingStructuresInput> expectedClosingStructuresCalculation)
                 {
-                    AssertStructuresCalculation(expectedClosingStructuresCalculation, (StructuresCalculation<ClosingStructuresInput>) actualChild);
+                    AssertStructuresCalculation(expectedClosingStructuresCalculation, (StructuresCalculationScenario<ClosingStructuresInput>) actualChild);
                 }
 
                 if (expectedChild is StructuresCalculation<StabilityPointStructuresInput> expectedStabilityPointStructuresCalculation)
@@ -918,15 +918,6 @@
                                          Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability, 1e-6);
                                          Assert.AreEqual(expectedItem.UseManualAssembly, actualItem.UseManualAssembly);
                                          Assert.AreEqual(expectedItem.ManualAssemblyProbability, actualItem.ManualAssemblyProbability, 1e-6);
-
-                                         if (expectedItem.Calculation == null)
-                                         {
-                                             Assert.IsNull(actualItem.Calculation);
-                                         }
-                                         else
-                                         {
-                                             AssertStructuresCalculation(expectedItem.Calculation, actualItem.Calculation);
-                                         }
                                      });
         }
 
@@ -963,8 +954,8 @@
             Assert.AreEqual(expectedClosingStructure.InflowModelType, actualClosingStructure.InflowModelType);
         }
 
-        private static void AssertStructuresCalculation(StructuresCalculation<ClosingStructuresInput> expectedCalculation,
-                                                        StructuresCalculation<ClosingStructuresInput> actualCalculation)
+        private static void AssertStructuresCalculation(StructuresCalculationScenario<ClosingStructuresInput> expectedCalculation,
+                                                        StructuresCalculationScenario<ClosingStructuresInput> actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
             AssertComments(expectedCalculation.Comments, actualCalculation.Comments);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs	(.../ClosingStructuresCalculationEntityReadExtensionsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs	(.../ClosingStructuresCalculationEntityReadExtensionsTest.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -43,10 +43,10 @@
             var entity = new ClosingStructuresCalculationEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(null);
+            void Call() => entity.Read(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("collector", paramName);
         }
 
@@ -65,14 +65,14 @@
             Assert.IsFalse(collector.Contains(entity));
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             Assert.IsTrue(collector.Contains(entity));
             Assert.AreSame(calculation, collector.Get(entity));
         }
 
-        [Test]
+        [Test]  
         public void Read_ValidEntity_ReturnClosingStructuresCalculation()
         {
             // Setup
@@ -118,7 +118,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             Assert.AreEqual(entity.Name, calculation.Name);
@@ -202,7 +202,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             ClosingStructuresInput inputParameters = calculation.InputParameters;
@@ -249,7 +249,7 @@
             collector.Read(structureEntity, structure);
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             Assert.AreSame(structure, calculation.InputParameters.Structure);
@@ -271,7 +271,7 @@
             collector.Read(hydraulicLocationEntity, hydraulicBoundaryLocation);
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation);
@@ -293,7 +293,7 @@
             collector.Read(profileEntity, profile);
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             Assert.AreSame(profile, calculation.InputParameters.ForeshoreProfile);
@@ -315,7 +315,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            StructuresCalculation<ClosingStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             StructuresOutput calculationOutput = calculation.Output;
@@ -335,7 +335,7 @@
                 }
             };
 
-            var calculation = new StructuresCalculation<ClosingStructuresInput>();
+            var calculation = new StructuresCalculationScenario<ClosingStructuresInput>();
 
             var collector = new ReadConversionCollector();
             collector.Read(entity, calculation);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs	(.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs	(.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -145,7 +145,7 @@
         public void Read_CalculationEntitySet_ReturnClosingStructuresSectionResultWithCalculation()
         {
             // Setup
-            var calculation = new StructuresCalculation<ClosingStructuresInput>();
+            var calculation = new StructuresCalculationScenario<ClosingStructuresInput>();
 
             var calculationEntity = new ClosingStructuresCalculationEntity();
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -r48f21c3256c73e5c4cbfed18a190b45223a1567d -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision 48f21c3256c73e5c4cbfed18a190b45223a1567d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -406,17 +406,17 @@
         }
 
         [TestFixture]
-        private class ClosingStructureCalculationCollectorTest : CollectorTest<StructuresCalculation<ClosingStructuresInput>,
+        private class ClosingStructureCalculationCollectorTest : CollectorTest<StructuresCalculationScenario<ClosingStructuresInput>,
             ClosingStructuresCalculationEntity>
         {
             public ClosingStructureCalculationCollectorTest() : base(
                 (c, e, m) => c.Read(e, m),
                 (c, e) => c.Contains(e),
                 (c, e) => c.Get(e)) {}
 
-            protected override StructuresCalculation<ClosingStructuresInput> CreateDataModel()
+            protected override StructuresCalculationScenario<ClosingStructuresInput> CreateDataModel()
             {
-                return new StructuresCalculation<ClosingStructuresInput>();
+                return new StructuresCalculationScenario<ClosingStructuresInput>();
             }
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r158e88a0d01e162f96688976523e0e503994e9cc -re57aa3c1ceb99466236e146782608821842dc2b9
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 158e88a0d01e162f96688976523e0e503994e9cc)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision e57aa3c1ceb99466236e146782608821842dc2b9)
@@ -700,7 +700,7 @@
                 Name = "Closing structures A",
                 Children =
                 {
-                    new StructuresCalculation<ClosingStructuresInput>
+                    new StructuresCalculationScenario<ClosingStructuresInput>
                     {
                         InputParameters =
                         {
@@ -733,7 +733,7 @@
                         },
                         Output = new StructuresOutput(0.11, null)
                     },
-                    new StructuresCalculation<ClosingStructuresInput>
+                    new StructuresCalculationScenario<ClosingStructuresInput>
                     {
                         InputParameters =
                         {
@@ -772,7 +772,7 @@
             {
                 Name = "Closing structures B"
             });
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<ClosingStructuresInput>());
         }
 
         private static void SetSectionResults(IEnumerable<ClosingStructuresFailureMechanismSectionResult> sectionResults,