Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r69639fc35bcf53bd63059bed6c4040485e4188c0 -ref77d962a838f51883d6fda3c83fb148760260f1
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs)	(revision 69639fc35bcf53bd63059bed6c4040485e4188c0)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs)	(revision ef77d962a838f51883d6fda3c83fb148760260f1)
@@ -170,7 +170,7 @@
             collector.Read(dikeProfileEntity, dikeProfile);
 
             // Call
-            GrassCoverErosionInwardsCalculation calculation = entity.Read(collector);
+            GrassCoverErosionInwardsCalculationScenario calculation = entity.Read(collector);
 
             // Assert
             Assert.AreSame(dikeProfile, calculation.InputParameters.DikeProfile);
@@ -194,7 +194,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            GrassCoverErosionInwardsCalculation calculation = entity.Read(collector);
+            GrassCoverErosionInwardsCalculationScenario calculation = entity.Read(collector);
 
             // Assert
             Assert.IsNotNull(calculation.InputParameters.DikeProfile);
@@ -216,7 +216,7 @@
             collector.Read(hydraulicLocationEntity, hydraulicBoundaryLocation);
 
             // Call
-            GrassCoverErosionInwardsCalculation calculation = entity.Read(collector);
+            GrassCoverErosionInwardsCalculationScenario calculation = entity.Read(collector);
 
             // Assert
             Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation);
@@ -235,7 +235,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            GrassCoverErosionInwardsCalculation calculation = entity.Read(collector);
+            GrassCoverErosionInwardsCalculationScenario calculation = entity.Read(collector);
 
             // Assert
             Assert.IsNotNull(calculation.InputParameters.HydraulicBoundaryLocation);
@@ -257,7 +257,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            GrassCoverErosionInwardsCalculation calculation = entity.Read(collector);
+            GrassCoverErosionInwardsCalculationScenario calculation = entity.Read(collector);
 
             // Assert
             Assert.IsTrue(calculation.HasOutput);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r69639fc35bcf53bd63059bed6c4040485e4188c0 -ref77d962a838f51883d6fda3c83fb148760260f1
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs	(.../HeightStructuresCalculationEntityReadExtensionsTest.cs)	(revision 69639fc35bcf53bd63059bed6c4040485e4188c0)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs	(.../HeightStructuresCalculationEntityReadExtensionsTest.cs)	(revision ef77d962a838f51883d6fda3c83fb148760260f1)
@@ -246,7 +246,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            StructuresCalculation<HeightStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<HeightStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             HeightStructuresInput input = calculation.InputParameters;
@@ -273,7 +273,7 @@
             var collector = new ReadConversionCollector();
 
             // Call
-            StructuresCalculation<HeightStructuresInput> calculation = entity.Read(collector);
+            StructuresCalculationScenario<HeightStructuresInput> calculation = entity.Read(collector);
 
             // Assert
             StructuresOutput calculationOutput = calculation.Output;
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -rc360f49cedb42a350189ba43209c70dfac395c9c -ref77d962a838f51883d6fda3c83fb148760260f1
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision c360f49cedb42a350189ba43209c70dfac395c9c)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision ef77d962a838f51883d6fda3c83fb148760260f1)
@@ -361,8 +361,7 @@
             public ClosingStructureCollectorTest() : base(
                 (c, e, m) => c.Read(e, m),
                 (c, e) => c.Contains(e),
-                (c, e) => c.Get(e))
-            { }
+                (c, e) => c.Get(e)) {}
 
             protected override ClosingStructure CreateDataModel()
             {