Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs
===================================================================
diff -u -rb5604f731537f9bf062e6e6bf4cdb60325a52f9e -ra0505747b7576fbd3624366ffb5a2532d9fe47d8
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision b5604f731537f9bf062e6e6bf4cdb60325a52f9e)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision a0505747b7576fbd3624366ffb5a2532d9fe47d8)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Riskeer.Common.Data.Hydraulics;
@@ -58,12 +59,12 @@
 
         public bool InquireConfirmation()
         {
-            if (!assessmentSection.HydraulicBoundaryData.IsLinked())
+            if (!assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Any())
             {
                 return true;
             }
 
-            DialogResult result = MessageBox.Show(Resources.HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulicLocationConfigurationDatabase_dependent_data,
+            DialogResult result = MessageBox.Show(Resources.HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulic_location_configuration_database_dependent_data,
                                                   CoreCommonBaseResources.Confirm,
                                                   MessageBoxButtons.OKCancel);
 
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -rd6ac2267675f76d64690777647886f2d52e0ef85 -ra0505747b7576fbd3624366ffb5a2532d9fe47d8
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d6ac2267675f76d64690777647886f2d52e0ef85)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a0505747b7576fbd3624366ffb5a2532d9fe47d8)
@@ -464,10 +464,10 @@
         ///
         ///Wilt u doorgaan?.
         /// </summary>
-        public static string HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulicLocationConfigurationDatabase_dependent_data {
+        public static string HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulic_location_configuration_database_dependent_data {
             get {
-                return ResourceManager.GetString("HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulicLocati" +
-                        "onConfigurationDatabase_dependent_data", resourceCulture);
+                return ResourceManager.GetString("HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulic_locat" +
+                        "ion_configuration_database_dependent_data", resourceCulture);
             }
         }
         
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -rd6ac2267675f76d64690777647886f2d52e0ef85 -ra0505747b7576fbd3624366ffb5a2532d9fe47d8
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision d6ac2267675f76d64690777647886f2d52e0ef85)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision a0505747b7576fbd3624366ffb5a2532d9fe47d8)
@@ -239,7 +239,7 @@
     <data name="HydraulicLocationConfigurationDatabase_file_filter_Description" xml:space="preserve">
     <value>HLCD bestand</value>
   </data>
-    <data name="HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulicLocationConfigurationDatabase_dependent_data"
+    <data name="HydraulicLocationConfigurationDatabaseUpdateHandler_Confirm_clear_hydraulic_location_configuration_database_dependent_data"
           xml:space="preserve">
     <value>Als u het gekoppelde HLCD bestand wijzigt, zal de uitvoer van alle ervan afhankelijke berekeningen verwijderd worden.
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -rb5604f731537f9bf062e6e6bf4cdb60325a52f9e -ra0505747b7576fbd3624366ffb5a2532d9fe47d8
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision b5604f731537f9bf062e6e6bf4cdb60325a52f9e)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision a0505747b7576fbd3624366ffb5a2532d9fe47d8)
@@ -61,14 +61,14 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
 
             // Assert
             Assert.IsInstanceOf<IHydraulicLocationConfigurationDatabaseUpdateHandler>(handler);
         }
 
         [Test]
-        public void InquireConfirmation_HydraulicBoundaryDataNotLinked_ReturnsTrue()
+        public void InquireConfirmation_WithoutHydraulicBoundaryDatabases_ReturnsTrue()
         {
             // Setup
             var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(new AssessmentSection(AssessmentSectionComposition.Dike));
@@ -83,7 +83,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void InquireConfirmation_HydraulicBoundaryDataLinkedAndClickDialog_ReturnsExpectedResult(bool clickOk)
+        public void InquireConfirmation_WithHydraulicBoundaryDatabasesAndClickDialog_ReturnsExpectedResult(bool clickOk)
         {
             // Setup
             string dialogTitle = null, dialogMessage = null;
@@ -102,7 +102,7 @@
                 }
             };
 
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
 
             // Call
             bool result = handler.InquireConfirmation();
@@ -122,7 +122,7 @@
         public void Update_HydraulicBoundaryDataNull_ThrowsArgumentNullException()
         {
             // Setup
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
 
             // Call
             void Call() => handler.Update(null, ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, "");
@@ -136,7 +136,7 @@
         public void Update_HlcdFilePathNull_ThrowsArgumentNullException()
         {
             // Setup
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
 
             // Call
             void Call() => handler.Update(new HydraulicBoundaryData(), ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, null);
@@ -151,7 +151,7 @@
         {
             // Setup
             const string hlcdFilePath = "some/file/path";
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
             var hydraulicBoundaryData = new HydraulicBoundaryData();
             bool usePreprocessorClosure = new Random(21).NextBoolean();
 
@@ -182,7 +182,7 @@
         {
             // Setup
             const string hlcdFilePath = "some/file/path";
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
             var hydraulicBoundaryData = new HydraulicBoundaryData();
             ReadHydraulicLocationConfigurationDatabaseSettings readSettings = ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create();
             bool usePreprocessorClosure = new Random(21).NextBoolean();
@@ -211,7 +211,7 @@
         public void Update_DataUpdated_ReturnsChangedObjects()
         {
             // Setup
-            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithLinkedHydraulicBoundaryData());
+            var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases());
             var hydraulicBoundaryData = new HydraulicBoundaryData();
 
             // Call
@@ -266,23 +266,18 @@
             CollectionAssert.AreEquivalent(expectedChangedObjects, changedObjects);
         }
 
-        private static AssessmentSection CreateAssessmentSectionWithLinkedHydraulicBoundaryData()
+        private static AssessmentSection CreateAssessmentSectionWithHydraulicBoundaryDatabases()
         {
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-
-            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.SetValues("FilePath",
-                                                                                                     "ScenarioName",
-                                                                                                     10,
-                                                                                                     "Scope",
-                                                                                                     true,
-                                                                                                     "SeaLevel",
-                                                                                                     "RiverDischarge",
-                                                                                                     "LakeLevel",
-                                                                                                     "WindDirection",
-                                                                                                     "WindSpeed",
-                                                                                                     "Comment");
-            
-            return assessmentSection;
+            return new AssessmentSection(AssessmentSectionComposition.Dike)
+            {
+                HydraulicBoundaryData =
+                {
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase()
+                    }
+                }
+            };
         }
 
         private static IEnumerable<HydraulicBoundaryLocationCalculation> GetLocationCalculations(AssessmentSection assessmentSection)