Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rd907ed695ba2fb1bdf239919d9e475b51e7d812c -r59a903e74ff01fe98c16a66278b159f0bdb31fc6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs	(.../PipingCalculationConfigurationImporterTest.cs)	(revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs	(.../PipingCalculationConfigurationImporterTest.cs)	(revision 59a903e74ff01fe98c16a66278b159f0bdb31fc6)
@@ -42,7 +42,6 @@
     [TestFixture]
     public class PipingCalculationConfigurationImporterTest
     {
-        private readonly string readerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, nameof(PipingCalculationConfigurationReader));
         private readonly string importerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, nameof(PipingCalculationConfigurationImporter));
 
         private static IEnumerable<TestCaseData> ValidConfigurationInvalidData
@@ -165,7 +164,7 @@
             Action call = () => successful = importer.Import();
 
             // Assert
-            const string expectedMessage = "De hydraulische belastingenlocatie 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
+            const string expectedMessage = "De hydraulische belastingenlocatie 'HBlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
             TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
             Assert.IsTrue(successful);
             CollectionAssert.IsEmpty(calculationGroup.Children);
@@ -572,11 +571,11 @@
 
         [Test]
         [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml", false)]
-        [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", true)]
+        [TestCase("validConfigurationFullCalculationContainingWaterLevel.xml", true)]
         public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(string file, bool manualAssessmentLevel)
         {
             // Setup
-            string filePath = Path.Combine(readerPath, file);
+            string filePath = Path.Combine(importerPath, file);
 
             var calculationGroup = new CalculationGroup();
             var surfaceLine = new PipingSurfaceLine("Profielschematisatie");
@@ -610,7 +609,7 @@
                 stochasticSoilModel
             }, "readerPath");
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20);
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HBlocatie", 10, 20);
             var importer = new PipingCalculationConfigurationImporter(filePath,
                                                                       calculationGroup,
                                                                       new[]
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationCalculationContainingNaNs.xml
===================================================================
diff -u -r5e2bd16d7268e107ea6d4a1070778a0323044748 -r59a903e74ff01fe98c16a66278b159f0bdb31fc6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationCalculationContainingNaNs.xml	(.../validConfigurationCalculationContainingNaNs.xml)	(revision 5e2bd16d7268e107ea6d4a1070778a0323044748)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationCalculationContainingNaNs.xml	(.../validConfigurationCalculationContainingNaNs.xml)	(revision 59a903e74ff01fe98c16a66278b159f0bdb31fc6)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="Calculation">
-    <toetspeil>NaN</toetspeil>
+    <waterstand>NaN</waterstand>
     <intredepunt>NaN</intredepunt>
     <uittredepunt>NaN</uittredepunt>
     <stochasten>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml
===================================================================
diff -u -r5e2bd16d7268e107ea6d4a1070778a0323044748 -r59a903e74ff01fe98c16a66278b159f0bdb31fc6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml	(.../validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml)	(revision 5e2bd16d7268e107ea6d4a1070778a0323044748)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml	(.../validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml)	(revision 59a903e74ff01fe98c16a66278b159f0bdb31fc6)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="Calculation">
-    <hrlocatie>HRlocatie</hrlocatie>
+    <hblocatie>HBlocatie</hblocatie>
   </berekening>
 </configuratie>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml	(revision 59a903e74ff01fe98c16a66278b159f0bdb31fc6)
@@ -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/PipingCalculationConfigurationImporter/validConfigurationFullCalculationContainingWaterLevel.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationFullCalculationContainingWaterLevel.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationImporter/validConfigurationFullCalculationContainingWaterLevel.xml	(revision 59a903e74ff01fe98c16a66278b159f0bdb31fc6)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <waterstand>1.1</waterstand>
+    <profielschematisatie>Profielschematisatie</profielschematisatie>
+    <uittredepunt>3.3</uittredepunt>
+    <intredepunt>2.2</intredepunt>
+    <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