Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs
===================================================================
diff -u -r2539713cb27674daed011f260add32abcaddb958 -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision 2539713cb27674daed011f260add32abcaddb958)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -65,10 +65,10 @@
         private static void WriteCalculationElements(XmlWriter writer, PipingCalculationConfiguration configuration)
         {
             WriteElementWhenContentAvailable(writer,
-                                             PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement,
+                                             PipingCalculationConfigurationSchemaIdentifiers.WaterLevelElement,
                                              configuration.AssessmentLevel);
             WriteElementWhenContentAvailable(writer,
-                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld,
+                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew,
                                              configuration.HydraulicBoundaryLocationName);
 
             WriteElementWhenContentAvailable(writer,
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml
===================================================================
diff -u -r775a5c80cac9b66fbfd3cd4c05a54df37632ad7e -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml	(.../calculationIrrelevant.xml)	(revision 775a5c80cac9b66fbfd3cd4c05a54df37632ad7e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml	(.../calculationIrrelevant.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <hrlocatie>PUNT_KAT_18</hrlocatie>
+    <hblocatie>PUNT_KAT_18</hblocatie>
     <profielschematisatie>PK001_0001</profielschematisatie>
     <intredepunt>0</intredepunt>
     <uittredepunt>10</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml
===================================================================
diff -u -r61023d4655650fe5bf79f1ff5186094c94327c1b -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml	(.../calculationWithAssessmentLevel.xml)	(revision 61023d4655650fe5bf79f1ff5186094c94327c1b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml	(.../calculationWithAssessmentLevel.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <toetspeil>3</toetspeil>
+    <waterstand>3</waterstand>
     <profielschematisatie>PK001_0001</profielschematisatie>
     <intredepunt>0</intredepunt>
     <uittredepunt>10</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml
===================================================================
diff -u -r9a84eac646ba120e685a58839a3d3ad71d077c2e -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml	(.../calculationWithInfinities.xml)	(revision 9a84eac646ba120e685a58839a3d3ad71d077c2e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml	(.../calculationWithInfinities.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <toetspeil>-INF</toetspeil>
+    <waterstand>-INF</waterstand>
     <profielschematisatie>PK001_0001</profielschematisatie>
     <intredepunt>-INF</intredepunt>
     <uittredepunt>INF</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml
===================================================================
diff -u -r9a84eac646ba120e685a58839a3d3ad71d077c2e -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml	(.../calculationWithNaNs.xml)	(revision 9a84eac646ba120e685a58839a3d3ad71d077c2e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml	(.../calculationWithNaNs.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <toetspeil>NaN</toetspeil>
+    <waterstand>NaN</waterstand>
     <profielschematisatie>PK001_0001</profielschematisatie>
     <intredepunt>NaN</intredepunt>
     <uittredepunt>NaN</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml
===================================================================
diff -u -r61023d4655650fe5bf79f1ff5186094c94327c1b -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml	(.../calculationWithoutSoilProfile.xml)	(revision 61023d4655650fe5bf79f1ff5186094c94327c1b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml	(.../calculationWithoutSoilProfile.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <hrlocatie>PUNT_KAT_18</hrlocatie>
+    <hblocatie>PUNT_KAT_18</hblocatie>
     <profielschematisatie>PK001_0001</profielschematisatie>
     <intredepunt>0</intredepunt>
     <uittredepunt>10</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml
===================================================================
diff -u -r61023d4655650fe5bf79f1ff5186094c94327c1b -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml	(.../calculationWithoutSoilmodel.xml)	(revision 61023d4655650fe5bf79f1ff5186094c94327c1b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml	(.../calculationWithoutSoilmodel.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <hrlocatie>PUNT_KAT_18</hrlocatie>
+    <hblocatie>PUNT_KAT_18</hblocatie>
     <profielschematisatie>PK001_0001</profielschematisatie>
     <intredepunt>0</intredepunt>
     <uittredepunt>10</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml
===================================================================
diff -u -r61023d4655650fe5bf79f1ff5186094c94327c1b -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml	(.../calculationWithoutSurfaceline.xml)	(revision 61023d4655650fe5bf79f1ff5186094c94327c1b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml	(.../calculationWithoutSurfaceline.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuratie>
   <berekening naam="PK001_0001 W1-6_0_1D1">
-    <hrlocatie>PUNT_KAT_18</hrlocatie>
+    <hblocatie>PUNT_KAT_18</hblocatie>
     <ondergrondmodel>PK001_0001_Piping</ondergrondmodel>
     <ondergrondschematisatie>W1-6_0_1D1</ondergrondschematisatie>
     <stochasten>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r4ddc97c611cbba2e7a3445838c3b8df6ebf60bd2 -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml	(.../folderWithSubfolderAndCalculation.xml)	(revision 4ddc97c611cbba2e7a3445838c3b8df6ebf60bd2)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml	(.../folderWithSubfolderAndCalculation.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -2,7 +2,7 @@
 <configuratie>
   <map naam="PK001_0001">
     <berekening naam="PK001_0001 W1-6_0_1D1">
-      <hrlocatie>PUNT_KAT_18</hrlocatie>
+      <hblocatie>PUNT_KAT_18</hblocatie>
       <profielschematisatie>PK001_0001</profielschematisatie>
       <intredepunt>0</intredepunt>
       <uittredepunt>10</uittredepunt>
@@ -25,7 +25,7 @@
     </berekening>
     <map naam="PK001_0002">
       <berekening naam="PK001_0001 W1-6_0_1D1">
-        <hrlocatie>PUNT_KAT_18</hrlocatie>
+        <hblocatie>PUNT_KAT_18</hblocatie>
         <profielschematisatie>PK001_0001</profielschematisatie>
         <intredepunt>0</intredepunt>
         <uittredepunt>10</uittredepunt>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -recfd63f4e61526846bd84fd041c3337e67d88322 -rc68ff1f40aa67f1b7d1302455ae9e9943487978d
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml	(.../folderWithSubfolderAndCalculation.xml)	(revision ecfd63f4e61526846bd84fd041c3337e67d88322)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml	(.../folderWithSubfolderAndCalculation.xml)	(revision c68ff1f40aa67f1b7d1302455ae9e9943487978d)
@@ -2,8 +2,8 @@
 <configuratie>
   <map naam="PK001_0001">
     <berekening naam="PK001_0001 W1-6_0_1D1">
-      <toetspeil>10</toetspeil>
-      <hrlocatie>PUNT_KAT_18</hrlocatie>
+      <waterstand>10</waterstand>
+      <hblocatie>PUNT_KAT_18</hblocatie>
       <profielschematisatie>PK001_0001</profielschematisatie>
       <intredepunt>0.1</intredepunt>
       <uittredepunt>0.2</uittredepunt>