Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rccf8af99feaae2f7ef153eef6a07623eca01e34a -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision ccf8af99feaae2f7ef153eef6a07623eca01e34a)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -146,7 +146,7 @@
                 ProbabilityOpenStructureBeforeFlooding = calculationElement.GetDoubleValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.ProbabilityOpenStructureBeforeFlooding),
                 IdenticalApertures = calculationElement.GetIntegerValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.IdenticalApertures),
                 ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew),
+                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 StructureId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
                 WaveReduction = calculationElement.GetWaveReductionParameters(),
                 AreaFlowApertures = calculationElement.GetStochastConfiguration(ClosingStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName),
Index: Riskeer/Common/src/Riskeer.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -ra63f06e392d898e27cb9c1b60911a00fa66afc1b -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Common/src/Riskeer.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs	(.../ConfigurationSchemaIdentifiers.cs)	(revision a63f06e392d898e27cb9c1b60911a00fa66afc1b)
+++ Riskeer/Common/src/Riskeer.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs	(.../ConfigurationSchemaIdentifiers.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -52,10 +52,9 @@
         public const string NameAttribute = "naam";
 
         /// <summary>
-        /// The new identifier for hydraulic boundary location elements.
+        /// The identifier for hydraulic boundary location elements.
         /// </summary>
-        /// <remarks>This property represents the element name after the rename.</remarks>
-        public const string HydraulicBoundaryLocationElementNew = "hblocatie";
+        public const string HydraulicBoundaryLocationElement = "hblocatie";
 
         /// <summary>
         /// The tag of elements containing the orientation of the profile.
Index: Riskeer/Common/src/Riskeer.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs
===================================================================
diff -u -r84523cbdf7a083f411e6b67174cea1c792d6b270 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Common/src/Riskeer.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs	(.../StructureCalculationConfigurationWriter.cs)	(revision 84523cbdf7a083f411e6b67174cea1c792d6b270)
+++ Riskeer/Common/src/Riskeer.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs	(.../StructureCalculationConfigurationWriter.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -102,7 +102,7 @@
         private void WriteParameters(T configuration, XmlWriter writer)
         {
             WriteElementWhenContentAvailable(writer,
-                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew,
+                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
                                              configuration.HydraulicBoundaryLocationName);
             WriteElementWhenContentAvailable(writer,
                                              ConfigurationSchemaIdentifiers.StructureElement,
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/ConfigurationSchemaIdentifiersTest.cs
===================================================================
diff -u -ra63f06e392d898e27cb9c1b60911a00fa66afc1b -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/ConfigurationSchemaIdentifiersTest.cs	(.../ConfigurationSchemaIdentifiersTest.cs)	(revision a63f06e392d898e27cb9c1b60911a00fa66afc1b)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/ConfigurationSchemaIdentifiersTest.cs	(.../ConfigurationSchemaIdentifiersTest.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -35,7 +35,7 @@
             Assert.AreEqual("berekening", ConfigurationSchemaIdentifiers.CalculationElement);
             Assert.AreEqual("map", ConfigurationSchemaIdentifiers.FolderElement);
             Assert.AreEqual("naam", ConfigurationSchemaIdentifiers.NameAttribute);
-            Assert.AreEqual("hblocatie", ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew);
+            Assert.AreEqual("hblocatie", ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement);
             Assert.AreEqual("orientatie", ConfigurationSchemaIdentifiers.Orientation);
             Assert.AreEqual("illustratiepunteninlezen", ConfigurationSchemaIdentifiers.ShouldIllustrationPointsBeCalculatedElement);
 
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -r758c20624b1508a60a93e4b40be00f31c84a35e7 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 758c20624b1508a60a93e4b40be00f31c84a35e7)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -116,7 +116,7 @@
         {
             var configuration = new GrassCoverErosionInwardsCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
             {
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew),
+                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 DikeProfileId = calculationElement.GetStringValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeProfileElement),
                 Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
                 DikeHeight = calculationElement.GetDoubleValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightElement),
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs	(.../GrassCoverErosionInwardsCalculationConfigurationWriter.cs)	(revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs	(.../GrassCoverErosionInwardsCalculationConfigurationWriter.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -65,7 +65,7 @@
         {
             WriteElementWhenContentAvailable(
                 writer,
-                ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew,
+                ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
                 configuration.HydraulicBoundaryLocationName);
 
             WriteElementWhenContentAvailable(
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -137,7 +137,7 @@
                 FailureProbabilityStructureWithErosion = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.FailureProbabilityStructureWithErosionElement),
                 StructureNormalOrientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
                 ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew),
+                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 StructureId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
                 WaveReduction = calculationElement.GetWaveReductionParameters(),
                 LevelCrestStructure = calculationElement.GetStochastConfiguration(HeightStructuresConfigurationSchemaIdentifiers.LevelCrestStructureStochastName),
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -r5d7f25d2920b77d2ee59822504d1891061b03a86 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs	(.../MacroStabilityInwardsCalculationConfigurationReader.cs)	(revision 5d7f25d2920b77d2ee59822504d1891061b03a86)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs	(.../MacroStabilityInwardsCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -103,7 +103,7 @@
                 calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
             {
                 AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelElement),
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew),
+                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 SurfaceLineName = calculationElement.GetStringValueFromDescendantElement(
                     MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SurfaceLineElement),
                 StochasticSoilModelName = calculationElement.GetStringValueFromDescendantElement(
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs	(.../MacroStabilityInwardsCalculationConfigurationWriter.cs)	(revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs	(.../MacroStabilityInwardsCalculationConfigurationWriter.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -76,7 +76,7 @@
                                              MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelElement,
                                              configuration.AssessmentLevel);
             WriteElementWhenContentAvailable(writer,
-                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew,
+                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
                                              configuration.HydraulicBoundaryLocationName);
 
             WriteElementWhenContentAvailable(writer,
Index: Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -93,7 +93,7 @@
             return new PipingCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
             {
                 AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.WaterLevelElement),
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew),
+                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 SurfaceLineName = calculationElement.GetStringValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.SurfaceLineElement),
                 EntryPointL = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.EntryPointLElement),
                 ExitPointL = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.ExitPointLElement),
Index: Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs	(.../PipingCalculationConfigurationWriter.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -73,7 +73,7 @@
                                              PipingCalculationConfigurationSchemaIdentifiers.WaterLevelElement,
                                              configuration.AssessmentLevel);
             WriteElementWhenContentAvailable(writer,
-                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew,
+                                             ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
                                              configuration.HydraulicBoundaryLocationName);
 
             WriteElementWhenContentAvailable(writer,
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -rf905ebfb70394f428ce86bc9d153681a3c37a234 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision f905ebfb70394f428ce86bc9d153681a3c37a234)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -112,7 +112,7 @@
 
         protected void ParseCalculationElementData(XElement calculationElement, T configuration)
         {
-            configuration.HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew);
+            configuration.HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement);
             configuration.UpperBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryRevetment);
             configuration.LowerBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryRevetment);
             configuration.UpperBoundaryWaterLevels = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryWaterLevels);
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationWriter.cs
===================================================================
diff -u -r459a28726e1afac77043a810cdf1aa3144c7140b -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationWriter.cs	(.../WaveConditionsCalculationConfigurationWriter.cs)	(revision 459a28726e1afac77043a810cdf1aa3144c7140b)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationWriter.cs	(.../WaveConditionsCalculationConfigurationWriter.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -58,7 +58,7 @@
 
             WriteElementWhenContentAvailable(
                 writer,
-                ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew,
+                ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement,
                 configuration.HydraulicBoundaryLocationName);
 
             WriteWaveConditionsSpecificParameters(writer, configuration);
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 -r5d8ffd1f0445f320e08b0ca7d715249c5fe35618
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision 5d8ffd1f0445f320e08b0ca7d715249c5fe35618)
@@ -150,7 +150,7 @@
                 FlowVelocityStructureClosable = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName),
                 FlowWidthAtBottomProtection = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName),
                 ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew),
+                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 InflowModelType = (ConfigurationStabilityPointStructuresInflowModelType?)
                     calculationElement.GetConvertedValueFromDescendantStringElement<ConfigurationStabilityPointStructuresInflowModelTypeConverter>(
                         StabilityPointStructuresConfigurationSchemaIdentifiers.InflowModelTypeElement),