Index: Riskeer/Integration/src/Riskeer.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69
--- Riskeer/Integration/src/Riskeer.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs	(.../AssessmentSectionMergeComparer.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Integration/src/Riskeer.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs	(.../AssessmentSectionMergeComparer.cs)	(revision 5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69)
@@ -80,11 +80,11 @@
                                                                         HydraulicBoundaryData otherHydraulicBoundaryData)
         {
             return hydraulicBoundaryData.Version == otherHydraulicBoundaryData.Version
-                   && AreHydraulicBoundaryLocationConfigurationSettingsEquivalent(hydraulicBoundaryData.HydraulicLocationConfigurationSettings,
+                   && AreHydraulicLocationConfigurationSettingsEquivalent(hydraulicBoundaryData.HydraulicLocationConfigurationSettings,
                                                                                   otherHydraulicBoundaryData.HydraulicLocationConfigurationSettings);
         }
 
-        private static bool AreHydraulicBoundaryLocationConfigurationSettingsEquivalent(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings,
+        private static bool AreHydraulicLocationConfigurationSettingsEquivalent(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings,
                                                                                         HydraulicLocationConfigurationSettings otherHydraulicLocationConfigurationSettings)
         {
             return hydraulicLocationConfigurationSettings.ScenarioName == otherHydraulicLocationConfigurationSettings.ScenarioName
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs	(.../AssessmentSectionMergeComparerTest.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs	(.../AssessmentSectionMergeComparerTest.cs)	(revision 5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69)
@@ -113,7 +113,7 @@
         }
 
         [Test]
-        public void Compare_AssessmentSectionWithEquivalentHydraulicBoundaryLocationConfigurationSettings_ReturnsTrue()
+        public void Compare_AssessmentSectionWithEquivalentHydraulicLocationConfigurationSettings_ReturnsTrue()
         {
             // Setup
             AssessmentSection assessmentSection = CreateAssessmentSection();
@@ -135,7 +135,7 @@
 
         [Test]
         [TestCaseSource(nameof(GetAssessmentSectionWithNotEquivalentHydraulicLocationConfigurationSettingsTestCases))]
-        public void Compare_AssessmentSectionWithNotEquivalentHydraulicBoundaryLocationConfigurationSettings_ReturnsFalse(AssessmentSection otherAssessmentSection)
+        public void Compare_AssessmentSectionWithNotEquivalentHydraulicLocationConfigurationSettings_ReturnsFalse(AssessmentSection otherAssessmentSection)
         {
             // Setup
             AssessmentSection assessmentSection = CreateAssessmentSection();
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69)
@@ -96,7 +96,7 @@
                     NormativeProbabilityType = NormativeProbabilityType.SignalFloodingProbability
                 }
             };
-            SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
 
             assessmentSection.ReferenceLine.SetGeometry(new[]
             {
@@ -235,7 +235,7 @@
             failureMechanism.GeneralInput.N = random.NextRoundedDouble(1, 20);
         }
 
-        private static void SetHydraulicBoundaryLocationConfigurationSettings(HydraulicBoundaryData hydraulicBoundaryData)
+        private static void SetHydraulicLocationConfigurationSettings(HydraulicBoundaryData hydraulicBoundaryData)
         {
             hydraulicBoundaryData.HydraulicLocationConfigurationSettings.SetValues("some\\Path\\ToHlcd",
                                                                                    "ScenarioName",