Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs
===================================================================
diff -u -rd0cc97885ac7ea81d24d9890c493772c28bf773c -rdf31c1c6acfd3c4703500d4c20c16e7b566b3ba5
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs	(.../HydraulicLocationConfigurationDatabaseImporter.cs)	(revision d0cc97885ac7ea81d24d9890c493772c28bf773c)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs	(.../HydraulicLocationConfigurationDatabaseImporter.cs)	(revision df31c1c6acfd3c4703500d4c20c16e7b566b3ba5)
@@ -40,7 +40,7 @@
     /// <summary>
     /// Importer for hydraulic location configuration database files.
     /// </summary>
-    public class HydraulicLocationConfigurationDatabaseImporter : FileImporterBase<HydraulicLocationConfigurationSettings>
+    public class HydraulicLocationConfigurationDatabaseImporter : FileImporterBase<HydraulicLocationConfigurationDatabase>
     {
         private const int numberOfSteps = 2;
         private readonly List<IObservable> changedObservables = new List<IObservable>();
@@ -50,12 +50,12 @@
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicLocationConfigurationDatabaseImporter"/>.
         /// </summary>
-        /// <param name="importTarget">The hydraulic location configuration settings to import to.</param>
-        /// <param name="updateHandler">The handler responsible for updating the <see cref="HydraulicLocationConfigurationSettings"/>.</param>
-        /// <param name="hydraulicBoundaryData">The hydraulic boundary data the settings belong to.</param>
+        /// <param name="importTarget">The hydraulic location configuration database to import to.</param>
+        /// <param name="updateHandler">The handler responsible for updating the <see cref="HydraulicLocationConfigurationDatabase"/>.</param>
+        /// <param name="hydraulicBoundaryData">The hydraulic boundary data the hydraulic location configuration database belongs to.</param>
         /// <param name="filePath">The file path of the hydraulic location configuration database to import from.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public HydraulicLocationConfigurationDatabaseImporter(HydraulicLocationConfigurationSettings importTarget,
+        public HydraulicLocationConfigurationDatabaseImporter(HydraulicLocationConfigurationDatabase importTarget,
                                                               IHydraulicLocationConfigurationDatabaseUpdateHandler updateHandler,
                                                               HydraulicBoundaryData hydraulicBoundaryData,
                                                               string filePath)
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDataPropertiesTest.cs
===================================================================
diff -u -r2f20a33bf15702778cd4b95d5af841047924f5ee -rdf31c1c6acfd3c4703500d4c20c16e7b566b3ba5
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDataPropertiesTest.cs	(.../HydraulicBoundaryDataPropertiesTest.cs)	(revision 2f20a33bf15702778cd4b95d5af841047924f5ee)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDataPropertiesTest.cs	(.../HydraulicBoundaryDataPropertiesTest.cs)	(revision df31c1c6acfd3c4703500d4c20c16e7b566b3ba5)
@@ -106,17 +106,17 @@
             var properties = new HydraulicBoundaryDataProperties(hydraulicBoundaryData);
 
             // Assert
-            HydraulicLocationConfigurationSettings configurationSettings = hydraulicBoundaryData.HydraulicLocationConfigurationSettings;
-            Assert.AreEqual(configurationSettings.FilePath, properties.HlcdFilePath);
-            Assert.AreEqual(configurationSettings.ScenarioName, properties.ScenarioName);
-            Assert.AreEqual(configurationSettings.Year.ToString(), properties.Year);
-            Assert.AreEqual(configurationSettings.Scope, properties.Scope);
-            Assert.AreEqual(configurationSettings.SeaLevel, properties.SeaLevel);
-            Assert.AreEqual(configurationSettings.RiverDischarge, properties.RiverDischarge);
-            Assert.AreEqual(configurationSettings.LakeLevel, properties.LakeLevel);
-            Assert.AreEqual(configurationSettings.WindDirection, properties.WindDirection);
-            Assert.AreEqual(configurationSettings.WindSpeed, properties.WindSpeed);
-            Assert.AreEqual(configurationSettings.Comment, properties.Comment);
+            HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationSettings;
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.FilePath, properties.HlcdFilePath);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.ScenarioName, properties.ScenarioName);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.Year.ToString(), properties.Year);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.Scope, properties.Scope);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.SeaLevel, properties.SeaLevel);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.RiverDischarge, properties.RiverDischarge);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.LakeLevel, properties.LakeLevel);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.WindDirection, properties.WindDirection);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.WindSpeed, properties.WindSpeed);
+            Assert.AreEqual(hydraulicLocationConfigurationDatabase.Comment, properties.Comment);
         }
 
         [Test]
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs
===================================================================
diff -u -rc26a28b459da88e92bf7d10a4322d15b3fb73c8d -rdf31c1c6acfd3c4703500d4c20c16e7b566b3ba5
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs	(.../HydraulicLocationConfigurationDatabaseImporterTest.cs)	(revision c26a28b459da88e92bf7d10a4322d15b3fb73c8d)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs	(.../HydraulicLocationConfigurationDatabaseImporterTest.cs)	(revision df31c1c6acfd3c4703500d4c20c16e7b566b3ba5)
@@ -55,7 +55,7 @@
         public void Constructor_UpdateHandlerNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(),
+            void Call() => new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(),
                                                                               null, new HydraulicBoundaryData(),
                                                                               validHlcdFilePath);
 
@@ -73,7 +73,7 @@
             mocks.ReplayAll();
 
             // Call
-            void Call() => new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(),
+            void Call() => new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(),
                                                                               handler, null, validHlcdFilePath);
 
             // Assert
@@ -90,11 +90,11 @@
             mocks.ReplayAll();
 
             // Call
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               new HydraulicBoundaryData(), validHlcdFilePath);
 
             // Assert
-            Assert.IsInstanceOf<FileImporterBase<HydraulicLocationConfigurationSettings>>(importer);
+            Assert.IsInstanceOf<FileImporterBase<HydraulicLocationConfigurationDatabase>>(importer);
             mocks.VerifyAll();
         }
 
@@ -112,7 +112,7 @@
             string pathToHlcdInDifferentDirectory = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.IO,
                                                                                             nameof(HydraulicBoundaryDataImporter)), "HLCD.sqlite");
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, pathToHlcdInDifferentDirectory);
 
             // Call
@@ -138,7 +138,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, path);
 
             // Call
@@ -164,7 +164,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, path);
 
             // Call
@@ -192,7 +192,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, path);
 
             // Call
@@ -273,7 +273,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, validHlcdFilePath);
             importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
 
@@ -302,7 +302,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, validHlcdFilePath);
             importer.SetProgressChanged((description, currentStep, steps) =>
             {
@@ -332,7 +332,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, validHlcdFilePath);
             importer.SetProgressChanged((description, step, steps) =>
             {
@@ -366,7 +366,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateHydraulicBoundaryData(validHrdFilePath);
 
-            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationSettings(), handler,
+            var importer = new HydraulicLocationConfigurationDatabaseImporter(new HydraulicLocationConfigurationDatabase(), handler,
                                                                               hydraulicBoundaryData, validHlcdFilePath);
 
             var importResult = true;