Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs
===================================================================
diff -u -rd4d9b6a1083bbc998bc5c66c4bf80f33f9941cc3 -rf10409b92592e40644ff1ccdddd7703640341f1c
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDataEntityReadExtensionsTest.cs)	(revision d4d9b6a1083bbc998bc5c66c4bf80f33f9941cc3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDataEntityReadExtensionsTest.cs)	(revision f10409b92592e40644ff1ccdddd7703640341f1c)
@@ -88,18 +88,18 @@
             Assert.AreEqual(entity.FilePath, hydraulicBoundaryData.FilePath);
             Assert.AreEqual(entity.Version, hydraulicBoundaryData.Version);
 
-            HydraulicLocationConfigurationSettings settings = hydraulicBoundaryData.HydraulicLocationConfigurationSettings;
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsFilePath, settings.FilePath);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsScenarioName, settings.ScenarioName);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsYear, settings.Year);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsScope, settings.Scope);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsSeaLevel, settings.SeaLevel);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsRiverDischarge, settings.RiverDischarge);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsLakeLevel, settings.LakeLevel);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsWindDirection, settings.WindDirection);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsWindSpeed, settings.WindSpeed);
-            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsComment, settings.Comment);
-            Assert.AreEqual(usePreprocessorClosure, settings.UsePreprocessorClosure);
+            HydraulicLocationConfigurationDatabase database = hydraulicBoundaryData.HydraulicLocationConfigurationSettings;
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsFilePath, database.FilePath);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsScenarioName, database.ScenarioName);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsYear, database.Year);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsScope, database.Scope);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsSeaLevel, database.SeaLevel);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsRiverDischarge, database.RiverDischarge);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsLakeLevel, database.LakeLevel);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsWindDirection, database.WindDirection);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsWindSpeed, database.WindSpeed);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsComment, database.Comment);
+            Assert.AreEqual(usePreprocessorClosure, database.UsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r69b7d831391bae9ff3c6c0ceb4cc8863b90ed126 -rf10409b92592e40644ff1ccdddd7703640341f1c
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 69b7d831391bae9ff3c6c0ceb4cc8863b90ed126)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision f10409b92592e40644ff1ccdddd7703640341f1c)
@@ -97,7 +97,7 @@
                 }
             };
 
-            SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings);
+            ConfigureHydraulicLocationConfigurationDatabase(assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings);
 
             assessmentSection.ReferenceLine.SetGeometry(new[]
             {
@@ -236,19 +236,19 @@
             failureMechanism.GeneralInput.N = random.NextRoundedDouble(1, 20);
         }
 
-        private static void SetHydraulicLocationConfigurationSettings(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings)
+        private static void ConfigureHydraulicLocationConfigurationDatabase(HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase)
         {
-            hydraulicLocationConfigurationSettings.FilePath = "some\\Path\\ToHlcd";
-            hydraulicLocationConfigurationSettings.ScenarioName = "ScenarioName";
-            hydraulicLocationConfigurationSettings.Year = 1337;
-            hydraulicLocationConfigurationSettings.Scope = "Scope";
-            hydraulicLocationConfigurationSettings.SeaLevel = "SeaLevel";
-            hydraulicLocationConfigurationSettings.RiverDischarge = "RiverDischarge";
-            hydraulicLocationConfigurationSettings.LakeLevel = "LakeLevel";
-            hydraulicLocationConfigurationSettings.WindDirection = "WindDirection";
-            hydraulicLocationConfigurationSettings.WindSpeed = "WindSpeed";
-            hydraulicLocationConfigurationSettings.Comment = "Comment";
-            hydraulicLocationConfigurationSettings.UsePreprocessorClosure = false;
+            hydraulicLocationConfigurationDatabase.FilePath = "some\\Path\\ToHlcd";
+            hydraulicLocationConfigurationDatabase.ScenarioName = "ScenarioName";
+            hydraulicLocationConfigurationDatabase.Year = 1337;
+            hydraulicLocationConfigurationDatabase.Scope = "Scope";
+            hydraulicLocationConfigurationDatabase.SeaLevel = "SeaLevel";
+            hydraulicLocationConfigurationDatabase.RiverDischarge = "RiverDischarge";
+            hydraulicLocationConfigurationDatabase.LakeLevel = "LakeLevel";
+            hydraulicLocationConfigurationDatabase.WindDirection = "WindDirection";
+            hydraulicLocationConfigurationDatabase.WindSpeed = "WindSpeed";
+            hydraulicLocationConfigurationDatabase.Comment = "Comment";
+            hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = false;
         }
 
         private static void SetSections(IFailureMechanism failureMechanism)