Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -rbdbfeb4e99abdae28e52b8184847ef25208cb970 -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision bdbfeb4e99abdae28e52b8184847ef25208cb970)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -151,7 +151,7 @@
                                                                                   registry);
 
             AddHydraulicLocationCalculationForTargetProbabilityCollectionEntities(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities,
-                                                                                  HydraulicBoundaryLocationCalculationType.Waveheight,
+                                                                                  HydraulicBoundaryLocationCalculationType.WaveHeight,
                                                                                   entity,
                                                                                   registry);
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensions.cs
===================================================================
diff -u -rbdbfeb4e99abdae28e52b8184847ef25208cb970 -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensions.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensions.cs)	(revision bdbfeb4e99abdae28e52b8184847ef25208cb970)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensions.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensions.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -41,7 +41,7 @@
         /// <param name="order">Index at which this instance resides inside its parent container.</param>
         /// <param name="registry">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="HydraulicLocationCalculationForTargetProbabilityCollectionEntity"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any <paramref name="calculations"/> or <paramref name="registry"/> is <c>null</c>.</exception>
         internal static HydraulicLocationCalculationForTargetProbabilityCollectionEntity Create(this HydraulicBoundaryLocationCalculationsForTargetProbability calculations,
                                                                                                 HydraulicBoundaryLocationCalculationType calculationType,
                                                                                                 int order,
@@ -63,6 +63,7 @@
                 TargetProbability = calculations.TargetProbability,
                 Order = order
             };
+
             foreach (HydraulicBoundaryLocationCalculation calculation in calculations.HydraulicBoundaryLocationCalculations)
             {
                 collectionEntity.HydraulicLocationCalculationEntities.Add(calculation.Create(registry));
Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/HydraulicBoundaryLocationCalculationType.cs
===================================================================
diff -u -rab025c9a24225f2277abf79132e7e5c8d42af931 -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/HydraulicBoundaryLocationCalculationType.cs	(.../HydraulicBoundaryLocationCalculationType.cs)	(revision ab025c9a24225f2277abf79132e7e5c8d42af931)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/HydraulicBoundaryLocationCalculationType.cs	(.../HydraulicBoundaryLocationCalculationType.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -22,7 +22,7 @@
 namespace Riskeer.Storage.Core.DbContext
 {
     /// <summary>
-    /// The type of hydraulic boundary location calculations available within the application.
+    /// The hydraulic boundary location calculation type that are available within the application.
     /// </summary>
     public enum HydraulicBoundaryLocationCalculationType
     {
@@ -34,6 +34,6 @@
         /// <summary>
         /// Corresponds with a wave height calculation.
         /// </summary>
-        Waveheight = 2
+        WaveHeight = 2
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r111df70947316d3b2d23b4287228064a05933d40 -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 111df70947316d3b2d23b4287228064a05933d40)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -140,20 +140,20 @@
                                                                                     IAssessmentSection assessmentSection,
                                                                                     ReadConversionCollector collector)
         {
-            IEnumerable<HydraulicLocationCalculationForTargetProbabilityCollectionEntity> waveHeightHydraulicLocationCalculationForTargetProbabilityCollectionEntities =
+            IEnumerable<HydraulicLocationCalculationForTargetProbabilityCollectionEntity> waterLevelHydraulicLocationCalculationForTargetProbabilityCollectionEntities =
                 entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities
-                      .Where(e => e.HydraulicBoundaryLocationCalculationType == (int) HydraulicBoundaryLocationCalculationType.Waveheight)
+                      .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.WaterLevel)
                       .OrderBy(e => e.Order);
 
-            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.AddRange(waveHeightHydraulicLocationCalculationForTargetProbabilityCollectionEntities.Select(e => e.Read(collector))
+            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(waterLevelHydraulicLocationCalculationForTargetProbabilityCollectionEntities.Select(e => e.Read(collector))
                                                                                                                                                                            .ToArray());
-
-            IEnumerable<HydraulicLocationCalculationForTargetProbabilityCollectionEntity> waterLevelHydraulicLocationCalculationForTargetProbabilityCollectionEntities =
+            
+            IEnumerable<HydraulicLocationCalculationForTargetProbabilityCollectionEntity> waveHeightHydraulicLocationCalculationForTargetProbabilityCollectionEntities =
                 entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities
-                      .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.WaterLevel)
+                      .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.WaveHeight)
                       .OrderBy(e => e.Order);
 
-            assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(waterLevelHydraulicLocationCalculationForTargetProbabilityCollectionEntities.Select(e => e.Read(collector))
+            assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.AddRange(waveHeightHydraulicLocationCalculationForTargetProbabilityCollectionEntities.Select(e => e.Read(collector))
                                                                                                                                                                            .ToArray());
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -rd23d5aa4c80617a0a9fe16c21b43c9932f5cb79a -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision d23d5aa4c80617a0a9fe16c21b43c9932f5cb79a)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -296,7 +296,7 @@
 
             AssertHydraulicLocationCalculationForTargetProbabilityCollectionEntity(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities,
                                                                                    entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities
-                                                                                         .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.Waveheight));
+                                                                                         .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.WaveHeight));
 
             AssertHydraulicLocationCalculationForTargetProbabilityCollectionEntity(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities,
                                                                                    entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs
===================================================================
diff -u -rbdbfeb4e99abdae28e52b8184847ef25208cb970 -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs)	(revision bdbfeb4e99abdae28e52b8184847ef25208cb970)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -41,13 +41,12 @@
             var calculationType = random.NextEnumValue<HydraulicBoundaryLocationCalculationType>();
 
             // Call
-            TestDelegate call = () =>
-                ((HydraulicBoundaryLocationCalculationsForTargetProbability) null).Create(calculationType,
-                                                                                          random.Next(),
-                                                                                          new PersistenceRegistry());
+            void Call() => ((HydraulicBoundaryLocationCalculationsForTargetProbability) null).Create(calculationType, 
+                                                                                                     random.Next(),
+                                                                                                     new PersistenceRegistry());
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("calculations", exception.ParamName);
         }
 
@@ -60,10 +59,10 @@
             var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(random.NextDouble(0, 0.1));
 
             // Call
-            TestDelegate call = () => calculations.Create(calculationType, random.Next(), null);
+            void Call() => calculations.Create(calculationType, random.Next(), null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("registry", exception.ParamName);
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r111df70947316d3b2d23b4287228064a05933d40 -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 111df70947316d3b2d23b4287228064a05933d40)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -227,7 +227,6 @@
             HydraulicBoundaryLocation hydraulicBoundaryLocation = section.HydraulicBoundaryDatabase.Locations.Single();
 
             HydraulicBoundaryLocationCalculation calculation = section.WaterLevelCalculationsForSignalingNorm.Single();
-            calculation = section.WaterLevelCalculationsForSignalingNorm.Single();
             HydraulicLocationCalculationEntity hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity1
                                                                                           .HydraulicLocationCalculationEntities
                                                                                           .Single();
@@ -249,14 +248,14 @@
                                                                     hydraulicBoundaryLocation,
                                                                     section.WaterLevelCalculationsForUserDefinedTargetProbabilities);
             AssertHydraulicLocationCalculationsForTargetProbability(entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities
-                                                                          .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.Waveheight)
+                                                                          .Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.WaveHeight)
                                                                           .OrderBy(e => e.Order),
                                                                     hydraulicBoundaryLocation,
                                                                     section.WaveHeightCalculationsForUserDefinedTargetProbabilities);
         }
 
         [Test]
-        public void Read_WithoutHydraulicBoundaryLocationDatabase_ReturnsNewAssessementSectionWithoutHydraulicBoundaryLocationAndCalculations()
+        public void Read_WithoutHydraulicBoundaryLocationDatabase_ReturnsNewAssessmentSectionWithoutHydraulicBoundaryLocationAndCalculations()
         {
             // Setup
             AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
@@ -276,8 +275,8 @@
             CollectionAssert.IsEmpty(section.WaterLevelCalculationsForSignalingNorm);
             CollectionAssert.IsEmpty(section.WaterLevelCalculationsForLowerLimitNorm);
 
-            CollectionAssert.IsEmpty(section.WaveHeightCalculationsForUserDefinedTargetProbabilities);
             CollectionAssert.IsEmpty(section.WaterLevelCalculationsForUserDefinedTargetProbabilities);
+            CollectionAssert.IsEmpty(section.WaveHeightCalculationsForUserDefinedTargetProbabilities);
         }
 
         [Test]
@@ -1029,21 +1028,15 @@
             HydraulicBoundaryLocation expectedHydraulicBoundaryLocation,
             IEnumerable<HydraulicBoundaryLocationCalculationsForTargetProbability> actualCalculationCollections)
         {
-            Assert.AreEqual(expectedCalculationCollectionEntities.Count(), actualCalculationCollections.Count());
+            int expectedNrOfEntities = expectedCalculationCollectionEntities.Count();
+            Assert.AreEqual(expectedNrOfEntities, actualCalculationCollections.Count());
 
-            var i = 0;
-            for (int j = 0; j < expectedCalculationCollectionEntities.Count(); j++)
+            for (var j = 0; j < expectedNrOfEntities; j++)
             {
-                HydraulicBoundaryLocationCalculationsForTargetProbability actualCalculationCollectionEntity = actualCalculationCollections.ElementAt(j);
-                AssertHydraulicLocationCalculationsForTargetProbability(expectedCalculationCollectionEntities.ElementAt(j), expectedHydraulicBoundaryLocation, actualCalculationCollectionEntity);
+                AssertHydraulicLocationCalculationsForTargetProbability(expectedCalculationCollectionEntities.ElementAt(j), 
+                                                                        expectedHydraulicBoundaryLocation, 
+                                                                        actualCalculationCollections.ElementAt(j));
             }
-
-            foreach (HydraulicLocationCalculationForTargetProbabilityCollectionEntity expectedCalculationCollectionEntity in expectedCalculationCollectionEntities)
-            {
-                HydraulicBoundaryLocationCalculationsForTargetProbability actualCalculationCollectionEntity = actualCalculationCollections.ElementAt(i);
-                AssertHydraulicLocationCalculationsForTargetProbability(expectedCalculationCollectionEntity, expectedHydraulicBoundaryLocation, actualCalculationCollectionEntity);
-                i++;
-            }
         }
 
         private static void AssertHydraulicLocationCalculationsForTargetProbability(HydraulicLocationCalculationForTargetProbabilityCollectionEntity expectedCalculationCollectionEntity,
@@ -1052,14 +1045,15 @@
         {
             Assert.AreEqual(expectedCalculationCollectionEntity.TargetProbability, actualCalculations.TargetProbability);
             ICollection<HydraulicLocationCalculationEntity> expectedCalculations = expectedCalculationCollectionEntity.HydraulicLocationCalculationEntities;
-            Assert.AreEqual(expectedCalculations.Count, actualCalculations.HydraulicBoundaryLocationCalculations.Count);
+            int expectedNrOfCalculations = expectedCalculations.Count;
+            Assert.AreEqual(expectedNrOfCalculations, actualCalculations.HydraulicBoundaryLocationCalculations.Count);
 
-            var i = 0;
-            foreach (HydraulicLocationCalculationEntity expectedCalculationEntity in expectedCalculations)
+            for (var i = 0; i < expectedNrOfCalculations; i++)
             {
                 HydraulicBoundaryLocationCalculation actualCalculation = actualCalculations.HydraulicBoundaryLocationCalculations[i];
-                AssertHydraulicBoundaryLocationCalculation(expectedCalculationEntity, expectedHydraulicBoundaryLocation, actualCalculation);
-                i++;
+                AssertHydraulicBoundaryLocationCalculation(expectedCalculations.ElementAt(i),
+                                                           expectedHydraulicBoundaryLocation,
+                                                           actualCalculation);
             }
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -1597,23 +1597,6 @@
             Assert.AreEqual("Child2", child2.Name);
         }
 
-        private static HydraulicLocationCalculationCollectionEntity CreateHydraulicLocationCollectionCalculationEntity(HydraulicLocationEntity hydraulicLocationEntity,
-                                                                                                                       int seed)
-        {
-            var random = new Random(seed);
-            return new HydraulicLocationCalculationCollectionEntity
-            {
-                HydraulicLocationCalculationEntities =
-                {
-                    new HydraulicLocationCalculationEntity
-                    {
-                        HydraulicLocationEntity = hydraulicLocationEntity,
-                        ShouldIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean())
-                    }
-                }
-            };
-        }
-
         #endregion
 
         #region Stability Stone Cover
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f -r9774bd882073573a9e30294b0afa4cdb22a45adc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs)	(revision 9774bd882073573a9e30294b0afa4cdb22a45adc)
@@ -39,11 +39,10 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () =>
-                ((HydraulicLocationCalculationForTargetProbabilityCollectionEntity) null).Read(new ReadConversionCollector());
+            void Call() => ((HydraulicLocationCalculationForTargetProbabilityCollectionEntity) null).Read(new ReadConversionCollector());
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("entity", exception.ParamName);
         }
 
@@ -54,10 +53,10 @@
             var entity = new HydraulicLocationCalculationForTargetProbabilityCollectionEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(null);
+            void Call() => entity.Read(null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("collector", exception.ParamName);
         }