Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs
===================================================================
diff -u -red11c91a52b5418784ec7327ee15abb6ddda69a2 -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -105,8 +105,8 @@
         private readonly Dictionary<ClosingStructuresCalculationEntity, StructuresCalculationScenario<ClosingStructuresInput>> closingStructuresCalculations =
             CreateDictionary<ClosingStructuresCalculationEntity, StructuresCalculationScenario<ClosingStructuresInput>>();
 
-        private readonly Dictionary<StabilityPointStructuresCalculationEntity, StructuresCalculation<StabilityPointStructuresInput>> stabilityPointStructuresCalculations =
-            CreateDictionary<StabilityPointStructuresCalculationEntity, StructuresCalculation<StabilityPointStructuresInput>>();
+        private readonly Dictionary<StabilityPointStructuresCalculationEntity, StructuresCalculationScenario<StabilityPointStructuresInput>> stabilityPointStructuresCalculations =
+            CreateDictionary<StabilityPointStructuresCalculationEntity, StructuresCalculationScenario<StabilityPointStructuresInput>>();
 
         private static Dictionary<TEntity, TModel> CreateDictionary<TEntity, TModel>()
         {
@@ -1536,15 +1536,15 @@
 
         /// <summary>
         /// Registers a read operation for <see cref="StabilityPointStructuresCalculationEntity"/>
-        /// 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="StabilityPointStructuresCalculationEntity"/>
         /// that was read.</param>
-        /// <param name="model">The <see cref="StructuresCalculation{T}"/> that
+        /// <param name="model">The <see cref="StructuresCalculationScenario{T}"/> that
         /// was constructed.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        internal void Read(StabilityPointStructuresCalculationEntity entity, StructuresCalculation<StabilityPointStructuresInput> model)
+        internal void Read(StabilityPointStructuresCalculationEntity entity, StructuresCalculationScenario<StabilityPointStructuresInput> model)
         {
             if (entity == null)
             {
@@ -1576,18 +1576,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="StabilityPointStructuresCalculationEntity"/>.
         /// </summary>
         /// <param name="entity">The <see cref="StabilityPointStructuresCalculationEntity"/> 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(StabilityPointStructuresCalculationEntity)"/>
         /// to find out whether a read operation has been registered for <paramref name="entity"/>.</remarks>
-        internal StructuresCalculation<StabilityPointStructuresInput> Get(StabilityPointStructuresCalculationEntity entity)
+        internal StructuresCalculationScenario<StabilityPointStructuresInput> Get(StabilityPointStructuresCalculationEntity entity)
         {
             if (entity == null)
             {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs	(.../StabilityPointStructuresCalculationEntityReadExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs	(.../StabilityPointStructuresCalculationEntityReadExtensions.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -44,8 +44,8 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="StructuresCalculation{T}"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
-        internal static StructuresCalculation<StabilityPointStructuresInput> Read(this StabilityPointStructuresCalculationEntity entity,
-                                                                                  ReadConversionCollector collector)
+        internal static StructuresCalculationScenario<StabilityPointStructuresInput> Read(this StabilityPointStructuresCalculationEntity entity,
+                                                                                          ReadConversionCollector collector)
         {
             if (collector == null)
             {
@@ -57,7 +57,7 @@
                 return collector.Get(entity);
             }
 
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
                 Name = entity.Name,
                 Comments =
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -red11c91a52b5418784ec7327ee15abb6ddda69a2 -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -545,9 +545,9 @@
                     AssertStructuresCalculation(expectedClosingStructuresCalculation, (StructuresCalculationScenario<ClosingStructuresInput>) actualChild);
                 }
 
-                if (expectedChild is StructuresCalculation<StabilityPointStructuresInput> expectedStabilityPointStructuresCalculation)
+                if (expectedChild is StructuresCalculationScenario<StabilityPointStructuresInput> expectedStabilityPointStructuresCalculation)
                 {
-                    AssertStructuresCalculation(expectedStabilityPointStructuresCalculation, (StructuresCalculation<StabilityPointStructuresInput>) actualChild);
+                    AssertStructuresCalculation(expectedStabilityPointStructuresCalculation, (StructuresCalculationScenario<StabilityPointStructuresInput>) actualChild);
                 }
 
                 if (expectedChild is StabilityStoneCoverWaveConditionsCalculation expectedStabilityStoneCoverWaveConditionsCalculation)
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -red11c91a52b5418784ec7327ee15abb6ddda69a2 -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -440,17 +440,17 @@
         }
 
         [TestFixture]
-        private class StabilityPointStructureCalculationCollectorTest : CollectorTest<StructuresCalculation<StabilityPointStructuresInput>,
+        private class StabilityPointStructureCalculationCollectorTest : CollectorTest<StructuresCalculationScenario<StabilityPointStructuresInput>,
             StabilityPointStructuresCalculationEntity>
         {
             public StabilityPointStructureCalculationCollectorTest() : base(
                 (c, e, m) => c.Read(e, m),
                 (c, e) => c.Contains(e),
                 (c, e) => c.Get(e)) {}
 
-            protected override StructuresCalculation<StabilityPointStructuresInput> CreateDataModel()
+            protected override StructuresCalculationScenario<StabilityPointStructuresInput> CreateDataModel()
             {
-                return new StructuresCalculation<StabilityPointStructuresInput>();
+                return new StructuresCalculationScenario<StabilityPointStructuresInput>();
             }
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs	(.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs	(.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -43,11 +43,11 @@
             var entity = new StabilityPointStructuresCalculationEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(null);
+            void Call() => entity.Read(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("collector", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("collector", exception.ParamName);
         }
 
         [Test]
@@ -407,13 +407,13 @@
                 }
             };
 
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
 
             var collector = new ReadConversionCollector();
             collector.Read(entity, calculation);
 
             // Call
-            StructuresCalculation<StabilityPointStructuresInput> returnedCalculation = entity.Read(collector);
+            StructuresCalculationScenario<StabilityPointStructuresInput> returnedCalculation = entity.Read(collector);
 
             // Assert
             Assert.AreSame(calculation, returnedCalculation);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -39,12 +39,12 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => ((StabilityPointStructuresSectionResultEntity) null).Read(
-                new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()),
-                new ReadConversionCollector());
+            void Call() => ((StabilityPointStructuresSectionResultEntity) null).Read(new StabilityPointStructuresFailureMechanismSectionResult(
+                                                                                         FailureMechanismSectionTestFactory.CreateFailureMechanismSection()),
+                                                                                     new ReadConversionCollector());
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("entity", exception.ParamName);
         }
 
@@ -55,11 +55,11 @@
             var entity = new StabilityPointStructuresSectionResultEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+            void Call() => entity.Read(null, new ReadConversionCollector());
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("sectionResult", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("sectionResult", exception.ParamName);
         }
 
         [Test]
@@ -69,12 +69,12 @@
             var entity = new StabilityPointStructuresSectionResultEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(new StabilityPointStructuresFailureMechanismSectionResult(
-                                                      FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null);
+            void Call() => entity.Read(new StabilityPointStructuresFailureMechanismSectionResult(
+                                           FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("collector", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("collector", exception.ParamName);
         }
 
         [Test]
@@ -145,7 +145,7 @@
         public void Read_CalculationEntitySet_ReturnStabilityPointStructuresSectionResultWithCalculation()
         {
             // Setup
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
+            var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>();
             var calculationEntity = new StabilityPointStructuresCalculationEntity();
 
             var collector = new ReadConversionCollector();
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -red11c91a52b5418784ec7327ee15abb6ddda69a2 -r76b0a3aadce3810c6c6d917957466f439464212d
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision ed11c91a52b5418784ec7327ee15abb6ddda69a2)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 76b0a3aadce3810c6c6d917957466f439464212d)
@@ -576,7 +576,7 @@
                 Name = "StabilityPoint structures A",
                 Children =
                 {
-                    new StructuresCalculation<StabilityPointStructuresInput>
+                    new StructuresCalculationScenario<StabilityPointStructuresInput>
                     {
                         Name = "Calculation 1",
                         Comments =
@@ -611,7 +611,7 @@
                         },
                         Output = new StructuresOutput(0.11, null)
                     },
-                    new StructuresCalculation<StabilityPointStructuresInput>
+                    new StructuresCalculationScenario<StabilityPointStructuresInput>
                     {
                         Name = "Calculation 2",
                         Comments =
@@ -652,7 +652,7 @@
             {
                 Name = "StabilityPoint structures B"
             });
-            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<StabilityPointStructuresInput>());
         }
 
         private static void SetSectionResults(IEnumerable<StabilityPointStructuresFailureMechanismSectionResult> sectionResults,