Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r95ebee00d81b5da3fd34d1a148331bc93a6ae80c -re9959dc562506516c3ae2d91c0201cdf50f20e28
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision 95ebee00d81b5da3fd34d1a148331bc93a6ae80c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision e9959dc562506516c3ae2d91c0201cdf50f20e28)
@@ -58,7 +58,7 @@
                     .SetName("invalidCalculationHydraulicBoundaryLocationEmptyOld");
                 yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationEmptyNew.xml",
                                               "The 'hblocatie' element is invalid - The value '' is invalid according to its datatype 'String'")
-                    .SetName("invalidCalculationHydraulicBoundaryLocationEmptynew");
+                    .SetName("invalidCalculationHydraulicBoundaryLocationEmptyNew");
                 yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationOldAndNew.xml",
                                               "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationHydraulicBoundaryLocationOldAndNew");
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -r2539713cb27674daed011f260add32abcaddb958 -re9959dc562506516c3ae2d91c0201cdf50f20e28
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs	(.../ConfigurationSchemaIdentifiers.cs)	(revision 2539713cb27674daed011f260add32abcaddb958)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs	(.../ConfigurationSchemaIdentifiers.cs)	(revision e9959dc562506516c3ae2d91c0201cdf50f20e28)
@@ -47,15 +47,15 @@
         public const string NameAttribute = "naam";
 
         /// <summary>
-        /// The identifier for hydraulic boundary location elements.
+        /// The old identifier for hydraulic boundary location elements.
         /// </summary>
-        /// <remarks>This represents the element before the rename.</remarks>
+        /// <remarks>This property represents the element name before the rename.</remarks>
         public const string HydraulicBoundaryLocationElementOld = "hrlocatie";
 
         /// <summary>
-        /// The identifier for hydraulic boundary location elements.
+        /// The new identifier for hydraulic boundary location elements.
         /// </summary>
-        /// <remarks>This represents the element after the rename.</remarks>
+        /// <remarks>This property represents the element name after the rename.</remarks>
         public const string HydraulicBoundaryLocationElementNew = "hblocatie";
 
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/XElementExtensions.cs
===================================================================
diff -u -rdd18dca1346bd551789e19700faef78e48091771 -re9959dc562506516c3ae2d91c0201cdf50f20e28
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/XElementExtensions.cs	(.../XElementExtensions.cs)	(revision dd18dca1346bd551789e19700faef78e48091771)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/XElementExtensions.cs	(.../XElementExtensions.cs)	(revision e9959dc562506516c3ae2d91c0201cdf50f20e28)
@@ -249,7 +249,7 @@
         /// </summary>
         /// <param name="calculationElement">The element containing values for wave reduction parameters.</param>
         /// <returns>The configuration, or <c>null</c> when the <paramref name="calculationElement"/> does not
-        /// have wave reduction elements. </returns>
+        /// have wave reduction elements.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculationElement"/> is <c>null</c>.</exception>
         /// <exception cref="NotSupportedException">Thrown when the value for break water type isn't valid.</exception>
         /// <exception cref="FormatException">Thrown when the value for break water height, use foreshore profile or
@@ -307,7 +307,7 @@
         /// <summary>
         /// Gets a hydraulic boundary location name based on the values found in the <paramref name="calculationElement"/>.
         /// </summary>
-        /// <param name="calculationElement">The element containing values for scenario parameters.</param>
+        /// <param name="calculationElement">The element containing values for hydraulic boundary location parameters.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculationElement"/> is <c>null</c>.</exception>
         /// <returns>The hydraulic boundary location name, or <c>null</c> when the <paramref name="calculationElement"/> does not
         /// have hydraulic boundary location elements.</returns>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/HbLocatieSchema.xsd
===================================================================
diff -u -r962dc63dc4aa118b92967d4775bfb55c36e02e52 -re9959dc562506516c3ae2d91c0201cdf50f20e28
--- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/HbLocatieSchema.xsd	(.../HbLocatieSchema.xsd)	(revision 962dc63dc4aa118b92967d4775bfb55c36e02e52)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/HbLocatieSchema.xsd	(.../HbLocatieSchema.xsd)	(revision e9959dc562506516c3ae2d91c0201cdf50f20e28)
@@ -22,10 +22,9 @@
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-  <!--Generiek element voor het specificeren van de keuse van een 
-  geselecteerde HB of HR locatie. 
-  In dit element moet de naam van de HB locatie zoals ook zichtbaar in 
-  Ringtoets worden opgenomen.-->
+  <!--Generiek element voor het specificeren van de keuze van een geselecteerde
+  HB of HR locatie. In dit element moet de naam van de hydraulische belastingenlocatie
+  zoals ook zichtbaar in Ringtoets worden opgenomen.-->
   <xs:element name="hblocatie-of-hrlocatie" abstract="true" />
 
   <!--Specificeert de HB locatie. Indien dit element is opgenomen, mag geen 
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XElementExtensionsTest.cs
===================================================================
diff -u -rdd18dca1346bd551789e19700faef78e48091771 -re9959dc562506516c3ae2d91c0201cdf50f20e28
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XElementExtensionsTest.cs	(.../XElementExtensionsTest.cs)	(revision dd18dca1346bd551789e19700faef78e48091771)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XElementExtensionsTest.cs	(.../XElementExtensionsTest.cs)	(revision e9959dc562506516c3ae2d91c0201cdf50f20e28)
@@ -1219,27 +1219,46 @@
             const string locationName = "Location1";
 
             var locationElement = new XElement(tagName, locationName);
-            var configurationElement = new XElement("scenario", locationElement);
+            var configurationElement = new XElement("configuratie", locationElement);
             var xElement = new XElement("root", configurationElement);
 
             // Call
-            string configuration = xElement.GetHydraulicBoundaryLocationName();
+            string hydraulicBoundaryLocationName = xElement.GetHydraulicBoundaryLocationName();
 
             // Assert
-            Assert.AreEqual(locationName, configuration);
+            Assert.AreEqual(locationName, hydraulicBoundaryLocationName);
         }
 
         [Test]
+        public void GetHydraulicBoundaryLocationName_WithBothHrLocationAndHbLocationElement_ReturnHbLocationName()
+        {
+            // Setup
+            const string hrLocationName = "HRlocatie";
+            const string hbLocationName = "HBlocatie";
+
+            var hrLocationElement = new XElement("hrlocatie", hrLocationName);
+            var hbLocationElement = new XElement("hblocatie", hbLocationName);
+            var configurationElement = new XElement("configuratie", hrLocationElement, hbLocationElement);
+            var xElement = new XElement("root", configurationElement);
+
+            // Call
+            string hydraulicBoundaryLocationName = xElement.GetHydraulicBoundaryLocationName();
+
+            // Assert
+            Assert.AreEqual(hbLocationName, hydraulicBoundaryLocationName);
+        }
+
+        [Test]
         public void GetHydraulicBoundaryLocationName_OtherDescendantElement_ReturnsNull()
         {
             // Setup
             var xElement = new XElement("root", new XElement("OtherDescendantElement"));
 
             // Call
-            string configuration = xElement.GetHydraulicBoundaryLocationName();
+            string hydraulicBoundaryLocationName = xElement.GetHydraulicBoundaryLocationName();
 
             // Assert
-            Assert.IsNull(configuration);
+            Assert.IsNull(hydraulicBoundaryLocationName);
         }
 
         private class DoubleToBooleanConverter : TypeConverter