Index: Ringtoets/Common/src/Ringtoets.Common.Util/HydraulicBoundaryLocationMapDataFeaturesFactory.cs
===================================================================
diff -u -r0aa1b425595bb9a6a945f56673bc907790766528 -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/src/Ringtoets.Common.Util/HydraulicBoundaryLocationMapDataFeaturesFactory.cs	(.../HydraulicBoundaryLocationMapDataFeaturesFactory.cs)	(revision 0aa1b425595bb9a6a945f56673bc907790766528)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/HydraulicBoundaryLocationMapDataFeaturesFactory.cs	(.../HydraulicBoundaryLocationMapDataFeaturesFactory.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -36,7 +36,7 @@
         /// </summary>
         /// <param name="location">The location to create the feature for.</param>
         /// <returns>A feature based on the given <paramref name="location"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when all parameters are <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/> is <c>null</c>.</exception>
         public static MapFeature CreateHydraulicBoundaryLocationFeature(AggregatedHydraulicBoundaryLocation location)
         {
             if (location == null)
@@ -49,12 +49,12 @@
             feature.MetaData[Resources.MetaData_Name] = location.Name;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedSignalingNorm] = location.WaterLevelCalculationForFactorizedSignalingNorm.Value;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForSignalingNorm] = location.WaterLevelCalculationForSignalingNorm.Value;
-            feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimit] = location.WaterLevelCalculationForLowerLimitNorm.Value;
-            feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimit] = location.WaterLevelCalculationForFactorizedLowerLimitNorm.Value;
+            feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimitNorm] = location.WaterLevelCalculationForLowerLimitNorm.Value;
+            feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm] = location.WaterLevelCalculationForFactorizedLowerLimitNorm.Value;
             feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedSignalingNorm] = location.WaveHeightCalculationForFactorizedSignalingNorm.Value;
             feature.MetaData[Resources.MetaData_WaveHeightCalculationForSignalingNorm] = location.WaveHeightCalculationForSignalingNorm.Value;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimit] = location.WaveHeightCalculationForLowerLimitNorm.Value;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimit] = location.WaveHeightCalculationForFactorizedLowerLimitNorm.Value;
+            feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimitNorm] = location.WaveHeightCalculationForLowerLimitNorm.Value;
+            feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm] = location.WaveHeightCalculationForFactorizedLowerLimitNorm.Value;
             return feature;
         }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -rdb3e4d1c3334e8f0dbeb31b65dc255ce41e6d4c4 -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision db3e4d1c3334e8f0dbeb31b65dc255ce41e6d4c4)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -102,9 +102,9 @@
         /// <summary>
         ///   Looks up a localized string similar to h(C-&gt;D).
         /// </summary>
-        public static string MetaData_WaterLevelCalculationForFactorizedLowerLimit {
+        public static string MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm {
             get {
-                return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedLowerLimit", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm", resourceCulture);
             }
         }
         
@@ -120,9 +120,9 @@
         /// <summary>
         ///   Looks up a localized string similar to h(B-&gt;C).
         /// </summary>
-        public static string MetaData_WaterLevelCalculationForLowerLimit {
+        public static string MetaData_WaterLevelCalculationForLowerLimitNorm {
             get {
-                return ResourceManager.GetString("MetaData_WaterLevelCalculationForLowerLimit", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaterLevelCalculationForLowerLimitNorm", resourceCulture);
             }
         }
         
@@ -138,9 +138,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Hs(C-&gt;D).
         /// </summary>
-        public static string MetaData_WaveHeightCalculationForFactorizedLowerLimit {
+        public static string MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm {
             get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedLowerLimit", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm", resourceCulture);
             }
         }
         
@@ -156,9 +156,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Hs(B-&gt;C).
         /// </summary>
-        public static string MetaData_WaveHeightCalculationForLowerLimit {
+        public static string MetaData_WaveHeightCalculationForLowerLimitNorm {
             get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculationForLowerLimit", resourceCulture);
+                return ResourceManager.GetString("MetaData_WaveHeightCalculationForLowerLimitNorm", resourceCulture);
             }
         }
         
Index: Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx
===================================================================
diff -u -rdb3e4d1c3334e8f0dbeb31b65dc255ce41e6d4c4 -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision db3e4d1c3334e8f0dbeb31b65dc255ce41e6d4c4)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -123,25 +123,25 @@
   <data name="MetaData_Name" xml:space="preserve">
     <value>Naam</value>
   </data>
-  <data name="MetaData_WaterLevelCalculationForFactorizedLowerLimit" xml:space="preserve">
+  <data name="MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm" xml:space="preserve">
     <value>h(C-&gt;D)</value>
   </data>
   <data name="MetaData_WaterLevelCalculationForFactorizedSignalingNorm" xml:space="preserve">
     <value>h(A+-&gt;A)</value>
   </data>
-  <data name="MetaData_WaterLevelCalculationForLowerLimit" xml:space="preserve">
+  <data name="MetaData_WaterLevelCalculationForLowerLimitNorm" xml:space="preserve">
     <value>h(B-&gt;C)</value>
   </data>
   <data name="MetaData_WaterLevelCalculationForSignalingNorm" xml:space="preserve">
     <value>h(A-&gt;B)</value>
   </data>
-  <data name="MetaData_WaveHeightCalculationForFactorizedLowerLimit" xml:space="preserve">
+  <data name="MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm" xml:space="preserve">
     <value>Hs(C-&gt;D)</value>
   </data>
   <data name="MetaData_WaveHeightCalculationForFactorizedSignalingNorm" xml:space="preserve">
     <value>Hs(A+-&gt;A)</value>
   </data>
-  <data name="MetaData_WaveHeightCalculationForLowerLimit" xml:space="preserve">
+  <data name="MetaData_WaveHeightCalculationForLowerLimitNorm" xml:space="preserve">
     <value>Hs(B-&gt;C)</value>
   </data>
   <data name="MetaData_WaveHeightCalculationForSignalingNorm" xml:space="preserve">
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs	(.../RingtoetsMapDataFeaturesFactoryTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs	(.../RingtoetsMapDataFeaturesFactoryTest.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -158,8 +158,7 @@
             Point2D[] expectedPoints = assessmentSection.HydraulicBoundaryDatabase.Locations
                                                         .Select(location => location.Location)
                                                         .ToArray();
-            AssertEqualFeatureCollections(
-                expectedPoints, features);
+            AssertEqualFeatureCollections(expectedPoints, features);
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs
===================================================================
diff -u -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53 -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -77,16 +77,15 @@
         /// <summary>
         /// Gets the expected result of a hydraulic boundary location calculation.
         /// </summary>
-        /// <param name="calculationList">The list to get the calculation from.</param>
+        /// <param name="calculations">The enumeration to get the calculation from.</param>
         /// <param name="hydraulicBoundaryLocation">The location to get the calculation for.</param>
         /// <returns>The result when there is output; <see cref="RoundedDouble.NaN"/> otherwise.</returns>
-        public static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculationList,
+        public static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
                                                       HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            return calculationList
-                   .Where(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
-                   .Select(calculation => calculation.Output?.Result ?? RoundedDouble.NaN)
-                   .Single();
+            return calculations
+                   .Single(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
+                   .Output?.Result ?? RoundedDouble.NaN;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Util.Test/AggregatedHydraulicBoundaryLocationFactoryTest.cs
===================================================================
diff -u -r549482554a4a0e4b135073fb54a75dcd3ef927bc -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/test/Ringtoets.Common.Util.Test/AggregatedHydraulicBoundaryLocationFactoryTest.cs	(.../AggregatedHydraulicBoundaryLocationFactoryTest.cs)	(revision 549482554a4a0e4b135073fb54a75dcd3ef927bc)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.Test/AggregatedHydraulicBoundaryLocationFactoryTest.cs	(.../AggregatedHydraulicBoundaryLocationFactoryTest.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -127,9 +127,8 @@
                                                        HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             return calculations
-                   .Where(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
-                   .Select(calculation => calculation.Output.Result)
-                   .Single();
+                   .Single(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
+                   .Output.Result;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs
===================================================================
diff -u -r21fcf8400284f5279ac15a7a18dcffc88e2b7a53 -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs	(.../MapFeaturesMetaDataTestHelper.cs)	(revision 21fcf8400284f5279ac15a7a18dcffc88e2b7a53)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs	(.../MapFeaturesMetaDataTestHelper.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -32,14 +32,14 @@
         /// Asserts whether the meta data for <paramref name="key"/> in <paramref name="feature"/>
         /// contains the correct output data.
         /// </summary>
-        /// <param name="expectedValue">The value  to assert against.</param>
+        /// <param name="expectedValue">The value to assert against.</param>
         /// <param name="feature">The <see cref="MapFeature"/> to be asserted.</param>
         /// <param name="key">The name of the meta data element to retrieve the data from.</param>
         /// <exception cref="KeyNotFoundException">Thrown when the meta data of <paramref name="feature"/> does not 
         /// contain a <see cref="KeyValuePair{TKey,TValue}"/> with <paramref name="key"/> as key.</exception>
         /// <exception cref="AssertionException">Thrown when the wave height or the design water level of a 
-        /// hydraulic boundary location and the  respective meta data value associated with <paramref name="key"/>
-        ///  are not the same.
+        /// hydraulic boundary location and the respective meta data value associated with <paramref name="key"/>
+        /// are not the same.
         /// </exception>
         public static void AssertHydraulicBoundaryLocationOutputMetaData(RoundedDouble expectedValue,
                                                                          MapFeature feature,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -203,13 +203,12 @@
             }
         }
 
-        private static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculationList,
-                                                       HydraulicBoundaryLocation hydraulicBoundaryLocation1)
+        private static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
+                                                       HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            return calculationList
-                   .Where(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation1))
-                   .Select(calculation => calculation.Output?.Result ?? RoundedDouble.NaN)
-                   .Single();
+            return calculations
+                   .Single(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
+                   .Output?.Result ?? RoundedDouble.NaN;
         }
 
         private static void AssertEqualPointCollections(IEnumerable<Point2D> points, MapGeometry geometry)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
@@ -156,13 +156,12 @@
             }
         }
 
-        private static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculationList,
+        private static RoundedDouble GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
                                                        HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            return calculationList
-                   .Where(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
-                   .Select(calculation => calculation.Output.Result)
-                   .Single();
+            return calculations
+                   .Single(calculation => calculation.HydraulicBoundaryLocation.Equals(hydraulicBoundaryLocation))
+                   .Output.Result;
         }
     }
 }
\ No newline at end of file