Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r2539713cb27674daed011f260add32abcaddb958 -r57ef881a6cda7c218d06759e0ac7d92f6d6bfab7
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 2539713cb27674daed011f260add32abcaddb958)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -86,7 +86,7 @@
 
         protected void ParseCalculationElementData(XElement calculationElement, T configuration)
         {
-            configuration.HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld);
+            configuration.HydraulicBoundaryLocationName = GetHydraulicBoundaryLocationName(calculationElement);
             configuration.UpperBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryRevetment);
             configuration.LowerBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryRevetment);
             configuration.UpperBoundaryWaterLevels = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryWaterLevels);
@@ -96,5 +96,11 @@
             configuration.Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation);
             configuration.WaveReduction = calculationElement.GetWaveReductionParameters();
         }
+
+        private static string GetHydraulicBoundaryLocationName(XElement calculationElement)
+        {
+            return calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew)
+                   ?? calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r3ef1c0655a8f3df1f24ce4ca904a077a47e9e2e4 -r57ef881a6cda7c218d06759e0ac7d92f6d6bfab7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision 3ef1c0655a8f3df1f24ce4ca904a077a47e9e2e4)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -45,9 +45,12 @@
         {
             get
             {
-                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocation.xml",
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationOld.xml",
                                               "Element 'hrlocatie' cannot appear more than once if content model type is \"all\".")
-                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocation");
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidCalculationMultipleHydraulicBoundaryLocationNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationMultipleHydraulicBoundaryLocationNew");
                 yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationOldAndNew.xml",
                                               "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationHydraulicBoundaryLocationOldAndNew");
@@ -87,9 +90,12 @@
                 yield return new TestCaseData("invalidCalculationMultipleForeshoreUsage.xml",
                                               "Element 'voorlandgebruiken' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleForeshoreUsage");
-                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml",
+                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_old.xml",
                                               "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
-                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation");
+                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationOld");
+                yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_new.xml",
+                                              "The 'hblocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
+                    .SetName("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocationNew");
                 yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyForeshoreProfile.xml",
                                               "The 'voorlandprofiel' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.")
                     .SetName("invalidConfigurationCalculationContainingEmptyForeshoreProfile");
@@ -292,8 +298,10 @@
         }
 
         [Test]
-        [TestCase("validConfigurationFullCalculation.xml")]
-        [TestCase("validConfigurationFullCalculation_differentOrder.xml")]
+        [TestCase("validConfigurationFullCalculation_old.xml")]
+        [TestCase("validConfigurationFullCalculation_differentOrder_old.xml")]
+        [TestCase("validConfigurationFullCalculation_new.xml")]
+        [TestCase("validConfigurationFullCalculation_differentOrder_new.xml")]
         public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadWaveConditionsCalculation(string fileName)
         {
             // Setup
@@ -307,7 +315,7 @@
             var calculation = (WaveConditionsCalculationConfiguration) readItems.Single();
 
             Assert.IsNotNull(calculation);
-            Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocationName);
+            Assert.AreEqual("HBlocatie", calculation.HydraulicBoundaryLocationName);
             Assert.AreEqual(1.1, calculation.UpperBoundaryRevetment);
             Assert.AreEqual(2.2, calculation.LowerBoundaryRevetment);
             Assert.AreEqual(3.3, calculation.UpperBoundaryWaterLevels);
Fisheye: Tag 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie>HBlocatie 1</hblocatie>
+    <hblocatie>HBlocatie 2</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie>HRlocatie 1</hrlocatie>
+    <hrlocatie>HRlocatie 2</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_new.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_new.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_new.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie></hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_old.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_old.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation_old.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie></hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder_new.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder_new.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder_new.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+	<golfreductie>
+	  <voorlandgebruiken>false</voorlandgebruiken>
+	  <damhoogte>6.6</damhoogte>
+	  <damgebruiken>true</damgebruiken>
+	  <damtype>caisson</damtype>
+	</golfreductie>
+	<orientatie>5.5</orientatie>
+	<voorlandprofiel>Voorlandprofiel</voorlandprofiel>
+	<stapgrootte>0.5</stapgrootte>
+	<ondergrenswaterstanden>4.4</ondergrenswaterstanden>
+	<bovengrenswaterstanden>3.3</bovengrenswaterstanden>
+	<ondergrensbekleding>2.2</ondergrensbekleding>
+	<bovengrensbekleding>1.1</bovengrensbekleding>
+    <hblocatie>HBlocatie</hblocatie>
+  </berekening>
+</configuratie>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder_old.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder_old.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder_old.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+	<golfreductie>
+	  <voorlandgebruiken>false</voorlandgebruiken>
+	  <damhoogte>6.6</damhoogte>
+	  <damgebruiken>true</damgebruiken>
+	  <damtype>caisson</damtype>
+	</golfreductie>
+	<orientatie>5.5</orientatie>
+	<voorlandprofiel>Voorlandprofiel</voorlandprofiel>
+	<stapgrootte>0.5</stapgrootte>
+	<ondergrenswaterstanden>4.4</ondergrenswaterstanden>
+	<bovengrenswaterstanden>3.3</bovengrenswaterstanden>
+	<ondergrensbekleding>2.2</ondergrensbekleding>
+	<bovengrensbekleding>1.1</bovengrensbekleding>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_new.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_new.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_new.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <hblocatie>HBlocatie</hblocatie>
+	<bovengrensbekleding>1.1</bovengrensbekleding>
+	<ondergrensbekleding>2.2</ondergrensbekleding>
+	<bovengrenswaterstanden>3.3</bovengrenswaterstanden>
+	<ondergrenswaterstanden>4.4</ondergrenswaterstanden>
+	<stapgrootte>0.5</stapgrootte>
+	<voorlandprofiel>Voorlandprofiel</voorlandprofiel>
+	<orientatie>5.5</orientatie>
+	<golfreductie>
+	  <damgebruiken>true</damgebruiken>
+	  <damtype>caisson</damtype>
+	  <damhoogte>6.6</damhoogte>
+	  <voorlandgebruiken>false</voorlandgebruiken>
+	</golfreductie>
+  </berekening>
+</configuratie>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_old.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_old.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_old.xml	(revision 57ef881a6cda7c218d06759e0ac7d92f6d6bfab7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <hrlocatie>HBlocatie</hrlocatie>
+	<bovengrensbekleding>1.1</bovengrensbekleding>
+	<ondergrensbekleding>2.2</ondergrensbekleding>
+	<bovengrenswaterstanden>3.3</bovengrenswaterstanden>
+	<ondergrenswaterstanden>4.4</ondergrenswaterstanden>
+	<stapgrootte>0.5</stapgrootte>
+	<voorlandprofiel>Voorlandprofiel</voorlandprofiel>
+	<orientatie>5.5</orientatie>
+	<golfreductie>
+	  <damgebruiken>true</damgebruiken>
+	  <damtype>caisson</damtype>
+	  <damhoogte>6.6</damhoogte>
+	  <voorlandgebruiken>false</voorlandgebruiken>
+	</golfreductie>
+  </berekening>
+</configuratie>