Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs
===================================================================
diff -u -rf04205ffb20784bfa07e35b80f7c4d194a298dba -rac508c6da20d310790bc7809d1fcc3d8c95d38de
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -76,7 +76,7 @@
             return new PipingCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
             {
                 AssessmentLevel = GetWaterLevel(calculationElement),
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld),
+                HydraulicBoundaryLocationName = calculationElement.GetHydraulicBoundaryLocationName(),
                 SurfaceLineName = calculationElement.GetStringValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.SurfaceLineElement),
                 EntryPointL = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.EntryPointLElement),
                 ExitPointL = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.ExitPointLElement),
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rf04205ffb20784bfa07e35b80f7c4d194a298dba -rac508c6da20d310790bc7809d1fcc3d8c95d38de
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision f04205ffb20784bfa07e35b80f7c4d194a298dba)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -315,14 +315,14 @@
         }
 
         [Test]
-        [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml",
-            TestName = "Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnPipingCalculation(HydraulicBoundaryLocation)")]
-        [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml",
-            TestName = "Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnPipingCalculation(HydraulicBoundaryLocation_differentOrder)")]
+        [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld")]
+        [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew")]
+        [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old")]
+        [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new")]
         public void Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnExpectedReadPipingCalculation(string fileName)
         {
             // Setup
-            string filePath = Path.Combine(testDirectoryPath, fileName);
+            string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml");
             var reader = new PipingCalculationConfigurationReader(filePath);
 
             // Call
@@ -333,7 +333,7 @@
 
             Assert.AreEqual("Calculation", calculation.Name);
             Assert.IsNull(calculation.AssessmentLevel);
-            Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocationName);
+            Assert.AreEqual("HBlocatie", calculation.HydraulicBoundaryLocationName);
             Assert.AreEqual("Profielschematisatie", calculation.SurfaceLineName);
             Assert.AreEqual(2.2, calculation.EntryPointL);
             Assert.AreEqual(3.3, calculation.ExitPointL);
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml
===================================================================
diff -u -r19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f -rac508c6da20d310790bc7809d1fcc3d8c95d38de
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(.../invalidCalculationMultipleHydraulicBoundaryLocationNew.xml)	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationNew.xml	(.../invalidCalculationMultipleHydraulicBoundaryLocationNew.xml)	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="Calculation">
-    <hblocatie>HRlocatie 1</hblocatie>
-    <hblocatie>HRlocatie 2</hblocatie>
+    <hblocatie>HBlocatie 1</hblocatie>
+    <hblocatie>HBlocatie 2</hblocatie>
   </berekening>
 </configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml
===================================================================
diff -u -r19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f -rac508c6da20d310790bc7809d1fcc3d8c95d38de
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(.../invalidCalculationMultipleHydraulicBoundaryLocationOld.xml)	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationMultipleHydraulicBoundaryLocationOld.xml	(.../invalidCalculationMultipleHydraulicBoundaryLocationOld.xml)	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="Calculation">
-    <hrlocatie>HRlocatie 1</hrlocatie>
-    <hrlocatie>HRlocatie 2</hrlocatie>
+    <hrlocatie>HBlocatie 1</hrlocatie>
+    <hrlocatie>HBlocatie 2</hrlocatie>
   </berekening>
 </configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml
===================================================================
diff -u -r19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f -rac508c6da20d310790bc7809d1fcc3d8c95d38de
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml	(.../invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml)	(revision 19dcfd6dfaf519518fb063cdd0c2b1754bd4ce4f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml	(.../invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocationOld.xml)	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -2,6 +2,6 @@
 <configuratie>
   <berekening naam="Calculation">
     <toetspeil>1.1</toetspeil>
-    <hrlocatie>HRlocatie</hrlocatie>
+    <hrlocatie>HBlocatie</hrlocatie>
   </berekening>
 </configuratie>
\ No newline at end of file
Fisheye: Tag ac508c6da20d310790bc7809d1fcc3d8c95d38de refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationNew.xml	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hblocatie>HBlocatie</hblocatie>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <intredepunt>2.2</intredepunt>
+    <uittredepunt>3.3</uittredepunt>
+    <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
+    <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>4.4</verwachtingswaarde>
+        <standaardafwijking>5.5</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>6.6</verwachtingswaarde>
+        <standaardafwijking>7.7</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <gebruik>false</gebruik>
+      <bijdrage>8.8</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocationOld.xml	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie>HBlocatie</hrlocatie>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <intredepunt>2.2</intredepunt>
+    <uittredepunt>3.3</uittredepunt>
+    <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
+    <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
+    <stochasten>
+      <stochast naam="polderpeil">
+        <verwachtingswaarde>4.4</verwachtingswaarde>
+        <standaardafwijking>5.5</standaardafwijking>
+      </stochast>
+      <stochast naam="dempingsfactor">
+        <verwachtingswaarde>6.6</verwachtingswaarde>
+        <standaardafwijking>7.7</standaardafwijking>
+      </stochast>
+    </stochasten>
+    <scenario>
+      <gebruik>false</gebruik>
+      <bijdrage>8.8</bijdrage>
+    </scenario>
+  </berekening>
+</configuratie>
\ No newline at end of file
Fisheye: Tag ac508c6da20d310790bc7809d1fcc3d8c95d38de refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_new.xml	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <stochasten>
+      <stochast naam="dempingsfactor">
+        <standaardafwijking>7.7</standaardafwijking>
+        <verwachtingswaarde>6.6</verwachtingswaarde>
+      </stochast>
+      <stochast naam="polderpeil">
+        <standaardafwijking>5.5</standaardafwijking>
+        <verwachtingswaarde>4.4</verwachtingswaarde>
+      </stochast>
+    </stochasten>
+    <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
+    <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
+    <uittredepunt>3.3</uittredepunt>
+    <intredepunt>2.2</intredepunt>
+    <scenario>
+      <gebruik>false</gebruik>
+      <bijdrage>8.8</bijdrage>
+    </scenario>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <hblocatie>HBlocatie</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder_old.xml	(revision ac508c6da20d310790bc7809d1fcc3d8c95d38de)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <stochasten>
+      <stochast naam="dempingsfactor">
+        <standaardafwijking>7.7</standaardafwijking>
+        <verwachtingswaarde>6.6</verwachtingswaarde>
+      </stochast>
+      <stochast naam="polderpeil">
+        <standaardafwijking>5.5</standaardafwijking>
+        <verwachtingswaarde>4.4</verwachtingswaarde>
+      </stochast>
+    </stochasten>
+    <ondergrondschematisatie>Ondergrondschematisatie</ondergrondschematisatie>
+    <ondergrondmodel>Ondergrondmodel</ondergrondmodel>
+    <uittredepunt>3.3</uittredepunt>
+    <intredepunt>2.2</intredepunt>
+    <scenario>
+      <gebruik>false</gebruik>
+      <bijdrage>8.8</bijdrage>
+    </scenario>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <hrlocatie>HBlocatie</hrlocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file