Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs
===================================================================
diff -u -rbd9857561de05958b06f90ef92f317415d568d9d -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs	(.../HydraulicLocationConfigurationDatabaseProperties.cs)	(revision bd9857561de05958b06f90ef92f317415d568d9d)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs	(.../HydraulicLocationConfigurationDatabaseProperties.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
@@ -30,11 +30,11 @@
 namespace Riskeer.Integration.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of <see cref="HydraulicBoundaryData"/> for properties panel.
+    /// ViewModel of <see cref="HydraulicLocationConfigurationDatabase"/> for properties panel.
     /// </summary>
-    public class HydraulicLocationConfigurationDatabaseProperties : ObjectProperties<HydraulicBoundaryData>
+    public class HydraulicLocationConfigurationDatabaseProperties : ObjectProperties<HydraulicLocationConfigurationDatabase>
     {
-        private const int hlcdFilePathPropertyIndex = 0;
+        private const int filePathPropertyIndex = 0;
         private const int scenarioNamePropertyIndex = 1;
         private const int yearPropertyIndex = 2;
         private const int scopePropertyIndex = 3;
@@ -48,27 +48,27 @@
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicLocationConfigurationDatabaseProperties"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryData">The hydraulic boundary data to show the properties for.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryData"/> is <c>null</c>.</exception>
-        public HydraulicLocationConfigurationDatabaseProperties(HydraulicBoundaryData hydraulicBoundaryData)
+        /// <param name="hydraulicLocationConfigurationDatabase">The hydraulic location configuration database to show the properties for.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicLocationConfigurationDatabase"/> is <c>null</c>.</exception>
+        public HydraulicLocationConfigurationDatabaseProperties(HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase)
         {
-            if (hydraulicBoundaryData == null)
+            if (hydraulicLocationConfigurationDatabase == null)
             {
-                throw new ArgumentNullException(nameof(hydraulicBoundaryData));
+                throw new ArgumentNullException(nameof(hydraulicLocationConfigurationDatabase));
             }
 
-            Data = hydraulicBoundaryData;
+            Data = hydraulicLocationConfigurationDatabase;
         }
 
-        [PropertyOrder(hlcdFilePathPropertyIndex)]
+        [PropertyOrder(filePathPropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_FilePath_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_FilePath_Description))]
-        public string HlcdFilePath
+        public string FilePath
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.FilePath ?? string.Empty;
+                return data.FilePath ?? string.Empty;
             }
         }
 
@@ -80,7 +80,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.ScenarioName ?? string.Empty;
+                return data.ScenarioName ?? string.Empty;
             }
         }
 
@@ -92,7 +92,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.Year.ToString();
+                return data.Year.ToString();
             }
         }
 
@@ -104,7 +104,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.Scope ?? string.Empty;
+                return data.Scope ?? string.Empty;
             }
         }
 
@@ -116,7 +116,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.SeaLevel ?? string.Empty;
+                return data.SeaLevel ?? string.Empty;
             }
         }
 
@@ -128,7 +128,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.RiverDischarge ?? string.Empty;
+                return data.RiverDischarge ?? string.Empty;
             }
         }
 
@@ -140,7 +140,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.LakeLevel ?? string.Empty;
+                return data.LakeLevel ?? string.Empty;
             }
         }
 
@@ -152,7 +152,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.WindDirection ?? string.Empty;
+                return data.WindDirection ?? string.Empty;
             }
         }
 
@@ -164,7 +164,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.WindSpeed ?? string.Empty;
+                return data.WindSpeed ?? string.Empty;
             }
         }
 
@@ -176,7 +176,7 @@
         {
             get
             {
-                return data.HydraulicLocationConfigurationDatabase.Comment ?? string.Empty;
+                return data.Comment ?? string.Empty;
             }
         }
     }
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rbd9857561de05958b06f90ef92f317415d568d9d -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision bd9857561de05958b06f90ef92f317415d568d9d)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
@@ -240,7 +240,7 @@
             };
             yield return new PropertyInfo<HydraulicLocationConfigurationDatabaseContext, HydraulicLocationConfigurationDatabaseProperties>
             {
-                CreateInstance = context => new HydraulicLocationConfigurationDatabaseProperties(context.WrappedData)
+                CreateInstance = context => new HydraulicLocationConfigurationDatabaseProperties(context.WrappedData.HydraulicLocationConfigurationDatabase)
             };
             yield return new PropertyInfo<HydraulicBoundaryDatabaseContext, HydraulicBoundaryDatabaseProperties>
             {
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs
===================================================================
diff -u -rbd9857561de05958b06f90ef92f317415d568d9d -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs	(.../HydraulicLocationConfigurationDatabasePropertiesTest.cs)	(revision bd9857561de05958b06f90ef92f317415d568d9d)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs	(.../HydraulicLocationConfigurationDatabasePropertiesTest.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
@@ -32,7 +32,7 @@
     [TestFixture]
     public class HydraulicLocationConfigurationDatabasePropertiesTest
     {
-        private const int hlcdFilePathPropertyIndex = 0;
+        private const int filePathPropertyIndex = 0;
         private const int scenarioNamePropertyIndex = 1;
         private const int yearPropertyIndex = 2;
         private const int scopePropertyIndex = 3;
@@ -44,41 +44,41 @@
         private const int commentPropertyIndex = 9;
 
         [Test]
-        public void Constructor_HydraulicBoundaryDataNull_ThrowsArgumentNullException()
+        public void Constructor_HydraulicLocationConfigurationDatabaseNull_ThrowsArgumentNullException()
         {
             // Call
             void Call() => new HydraulicLocationConfigurationDatabaseProperties(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("hydraulicBoundaryData", exception.ParamName);
+            Assert.AreEqual("hydraulicLocationConfigurationDatabase", exception.ParamName);
         }
 
         [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryData = new HydraulicBoundaryData();
+            var hydraulicLocationConfigurationDatabase = new HydraulicLocationConfigurationDatabase();
 
             // Call
-            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicBoundaryData);
+            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicLocationConfigurationDatabase);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<HydraulicBoundaryData>>(properties);
-            Assert.AreSame(hydraulicBoundaryData, properties.Data);
+            Assert.IsInstanceOf<ObjectProperties<HydraulicLocationConfigurationDatabase>>(properties);
+            Assert.AreSame(hydraulicLocationConfigurationDatabase, properties.Data);
         }
 
         [Test]
-        public void GetProperties_WithUnlinkedHydraulicBoundaryData_ReturnsExpectedValues()
+        public void GetProperties_WithUnlinkedHydraulicLocationConfigurationDatabase_ReturnsExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryData = new HydraulicBoundaryData();
+            var hydraulicLocationConfigurationDatabase = new HydraulicLocationConfigurationDatabase();
 
             // Call
-            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicBoundaryData);
+            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicLocationConfigurationDatabase);
 
             // Assert
-            Assert.IsEmpty(properties.HlcdFilePath);
+            Assert.IsEmpty(properties.FilePath);
             Assert.IsEmpty(properties.ScenarioName);
             Assert.AreEqual(0, properties.Year);
             Assert.IsEmpty(properties.Scope);
@@ -91,20 +91,16 @@
         }
 
         [Test]
-        public void GetProperties_WithLinkedHydraulicBoundaryData_ReturnsExpectedValues()
+        public void GetProperties_WithLinkedHydraulicLocationConfigurationDatabase_ReturnsExpectedValues()
         {
             // Setup
-            HydraulicBoundaryData hydraulicBoundaryData = CreateLinkedHydraulicBoundaryData();
+            HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = CreateLinkedHydraulicLocationConfigurationDatabase();
 
-            // Precondition
-            Assert.IsTrue(hydraulicBoundaryData.IsLinked());
-
             // Call
-            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicBoundaryData);
+            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicLocationConfigurationDatabase);
 
             // Assert
-            HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
-            Assert.AreEqual(hydraulicLocationConfigurationDatabase.FilePath, properties.HlcdFilePath);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.FilePath, properties.FilePath);
             Assert.AreEqual(hydraulicLocationConfigurationDatabase.ScenarioName, properties.ScenarioName);
             Assert.AreEqual(hydraulicLocationConfigurationDatabase.Year.ToString(), properties.Year);
             Assert.AreEqual(hydraulicLocationConfigurationDatabase.Scope, properties.Scope);
@@ -119,23 +115,23 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Constructor_WithHydraulicBoundaryData_PropertiesHaveExpectedAttributesValues(bool useLinkedHydraulicBoundaryData)
+        public void Constructor_WithHydraulicLocationConfigurationDatabase_PropertiesHaveExpectedAttributesValues(bool useLinkedHydraulicLocationConfigurationDatabase)
         {
             // Setup
-            HydraulicBoundaryData hydraulicBoundaryData = useLinkedHydraulicBoundaryData
-                                                              ? CreateLinkedHydraulicBoundaryData()
-                                                              : new HydraulicBoundaryData();
+            HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = useLinkedHydraulicLocationConfigurationDatabase
+                                                                                                ? CreateLinkedHydraulicLocationConfigurationDatabase()
+                                                                                                : new HydraulicLocationConfigurationDatabase();
 
             // Call
-            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicBoundaryData);
+            var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicLocationConfigurationDatabase);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(10, dynamicProperties.Count);
 
             const string expectedCategory = "Algemeen";
-            PropertyDescriptor hlcdFilePathProperty = dynamicProperties[hlcdFilePathPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(hlcdFilePathProperty,
+            PropertyDescriptor filePathProperty = dynamicProperties[filePathPropertyIndex];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(filePathProperty,
                                                                             expectedCategory,
                                                                             "HLCD bestandslocatie",
                                                                             "Locatie van het HLCD bestand.",
@@ -205,24 +201,21 @@
                                                                             true);
         }
 
-        private static HydraulicBoundaryData CreateLinkedHydraulicBoundaryData()
+        private static HydraulicLocationConfigurationDatabase CreateLinkedHydraulicLocationConfigurationDatabase()
         {
-            return new HydraulicBoundaryData
+            return new HydraulicLocationConfigurationDatabase
             {
-                HydraulicLocationConfigurationDatabase =
-                {
-                    FilePath = "hlcd.sqlite",
-                    ScenarioName = "ScenarioName",
-                    Year = 1337,
-                    Scope = "Scope",
-                    SeaLevel = "SeaLevel",
-                    RiverDischarge = "RiverDischarge",
-                    LakeLevel = "LakeLevel",
-                    WindDirection = "WindDirection",
-                    WindSpeed = "WindSpeed",
-                    Comment = "Comment",
-                    UsePreprocessorClosure = true
-                }
+                FilePath = "hlcd.sqlite",
+                ScenarioName = "ScenarioName",
+                Year = 1337,
+                Scope = "Scope",
+                SeaLevel = "SeaLevel",
+                RiverDischarge = "RiverDischarge",
+                LakeLevel = "LakeLevel",
+                WindDirection = "WindDirection",
+                WindSpeed = "WindSpeed",
+                Comment = "Comment",
+                UsePreprocessorClosure = true
             };
         }
     }
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/HydraulicLocationConfigurationDatabasePropertyInfoTest.cs
===================================================================
diff -u -rbd9857561de05958b06f90ef92f317415d568d9d -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/HydraulicLocationConfigurationDatabasePropertyInfoTest.cs	(.../HydraulicLocationConfigurationDatabasePropertyInfoTest.cs)	(revision bd9857561de05958b06f90ef92f317415d568d9d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/HydraulicLocationConfigurationDatabasePropertyInfoTest.cs	(.../HydraulicLocationConfigurationDatabasePropertyInfoTest.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
@@ -80,7 +80,7 @@
 
             // Assert
             Assert.IsInstanceOf<HydraulicLocationConfigurationDatabaseProperties>(objectProperties);
-            Assert.AreSame(context.WrappedData, objectProperties.Data);
+            Assert.AreSame(context.WrappedData.HydraulicLocationConfigurationDatabase, objectProperties.Data);
         }
     }
 }
\ No newline at end of file