Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r7ee92af2c21e581237e68838baa20fa56a3f5f1c
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 7ee92af2c21e581237e68838baa20fa56a3f5f1c)
@@ -117,11 +117,11 @@
 
         private static void ReadHydraulicBoundaryData(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector)
         {
-            HydraulicBoundaryDatabaseEntity hydraulicBoundaryDatabaseEntity = entity.HydraulicBoundaryDatabaseEntities.SingleOrDefault();
-            if (hydraulicBoundaryDatabaseEntity != null)
+            HydraulicBoundaryDataEntity hydraulicBoundaryDataEntity = entity.HydraulicBoundaryDataEntities.SingleOrDefault();
+            if (hydraulicBoundaryDataEntity != null)
             {
                 HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData;
-                hydraulicBoundaryDatabaseEntity.Read(hydraulicBoundaryData);
+                hydraulicBoundaryDataEntity.Read(hydraulicBoundaryData);
 
                 HydraulicBoundaryLocation[] readHydraulicBoundaryLocations = entity.HydraulicLocationEntities
                                                                                    .OrderBy(hl => hl.Order)
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDataEntityReadExtensions.cs
===================================================================
diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r7ee92af2c21e581237e68838baa20fa56a3f5f1c
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDataEntityReadExtensions.cs	(.../HydraulicBoundaryDataEntityReadExtensions.cs)	(revision ecbba2f636e82f8d94ee7deea09730e39190d2bb)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDataEntityReadExtensions.cs	(.../HydraulicBoundaryDataEntityReadExtensions.cs)	(revision 7ee92af2c21e581237e68838baa20fa56a3f5f1c)
@@ -26,19 +26,19 @@
 namespace Riskeer.Storage.Core.Read
 {
     /// <summary>
-    /// This class defines extension methods for read operations for a <see cref="HydraulicBoundaryDatabaseEntity"/>.
+    /// This class defines extension methods for read operations for a <see cref="HydraulicBoundaryDataEntity"/>.
     /// </summary>
     internal static class HydraulicBoundaryDataEntityReadExtensions
     {
         /// <summary>
-        /// Reads the <see cref="HydraulicBoundaryDatabaseEntity"/> and uses the information to update a
+        /// Reads the <see cref="HydraulicBoundaryDataEntity"/> and uses the information to update a
         /// <see cref="HydraulicBoundaryData"/> instance.
         /// </summary>
-        /// <param name="entity">The <see cref="HydraulicBoundaryDatabaseEntity"/> to update the
+        /// <param name="entity">The <see cref="HydraulicBoundaryDataEntity"/> to update the
         /// <see cref="HydraulicBoundaryData"/>.</param>
         /// <param name="hydraulicBoundaryData">The <see cref="HydraulicBoundaryData"/> to update.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        internal static void Read(this HydraulicBoundaryDatabaseEntity entity, HydraulicBoundaryData hydraulicBoundaryData)
+        public static void Read(this HydraulicBoundaryDataEntity entity, HydraulicBoundaryData hydraulicBoundaryData)
         {
             if (entity == null)
             {
@@ -50,22 +50,18 @@
                 throw new ArgumentNullException(nameof(hydraulicBoundaryData));
             }
 
-            hydraulicBoundaryData.FilePath = entity.FilePath;
-            hydraulicBoundaryData.Version = entity.Version;
-
             HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
 
-            hydraulicLocationConfigurationDatabase.FilePath = entity.HydraulicLocationConfigurationSettingsFilePath;
-            hydraulicLocationConfigurationDatabase.ScenarioName = entity.HydraulicLocationConfigurationSettingsScenarioName;
-            hydraulicLocationConfigurationDatabase.Year = entity.HydraulicLocationConfigurationSettingsYear;
-            hydraulicLocationConfigurationDatabase.Scope = entity.HydraulicLocationConfigurationSettingsScope;
-            hydraulicLocationConfigurationDatabase.SeaLevel = entity.HydraulicLocationConfigurationSettingsSeaLevel;
-            hydraulicLocationConfigurationDatabase.RiverDischarge = entity.HydraulicLocationConfigurationSettingsRiverDischarge;
-            hydraulicLocationConfigurationDatabase.LakeLevel = entity.HydraulicLocationConfigurationSettingsLakeLevel;
-            hydraulicLocationConfigurationDatabase.WindDirection = entity.HydraulicLocationConfigurationSettingsWindDirection;
-            hydraulicLocationConfigurationDatabase.WindSpeed = entity.HydraulicLocationConfigurationSettingsWindSpeed;
-            hydraulicLocationConfigurationDatabase.Comment = entity.HydraulicLocationConfigurationSettingsComment;
-            hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = Convert.ToBoolean(entity.HydraulicLocationConfigurationSettingsUsePreprocessorClosure);
+            hydraulicLocationConfigurationDatabase.FilePath = entity.HydraulicLocationConfigurationDatabaseFilePath;
+            hydraulicLocationConfigurationDatabase.ScenarioName = entity.HydraulicLocationConfigurationDatabaseScenarioName;
+            hydraulicLocationConfigurationDatabase.Year = entity.HydraulicLocationConfigurationDatabaseYear;
+            hydraulicLocationConfigurationDatabase.Scope = entity.HydraulicLocationConfigurationDatabaseScope;
+            hydraulicLocationConfigurationDatabase.SeaLevel = entity.HydraulicLocationConfigurationDatabaseSeaLevel;
+            hydraulicLocationConfigurationDatabase.RiverDischarge = entity.HydraulicLocationConfigurationDatabaseRiverDischarge;
+            hydraulicLocationConfigurationDatabase.LakeLevel = entity.HydraulicLocationConfigurationDatabaseLakeLevel;
+            hydraulicLocationConfigurationDatabase.WindDirection = entity.HydraulicLocationConfigurationDatabaseWindDirection;
+            hydraulicLocationConfigurationDatabase.WindSpeed = entity.HydraulicLocationConfigurationDatabaseWindSpeed;
+            hydraulicLocationConfigurationDatabase.Comment = entity.HydraulicLocationConfigurationDatabaseComment;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs
===================================================================
diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r7ee92af2c21e581237e68838baa20fa56a3f5f1c
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDataEntityReadExtensionsTest.cs)	(revision ecbba2f636e82f8d94ee7deea09730e39190d2bb)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDataEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDataEntityReadExtensionsTest.cs)	(revision 7ee92af2c21e581237e68838baa20fa56a3f5f1c)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Storage.Core.DbContext;
@@ -35,7 +34,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => ((HydraulicBoundaryDatabaseEntity) null).Read(new HydraulicBoundaryData());
+            void Call() => ((HydraulicBoundaryDataEntity) null).Read(new HydraulicBoundaryData());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -46,7 +45,7 @@
         public void Read_HydraulicBoundaryDataNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new HydraulicBoundaryDatabaseEntity();
+            var entity = new HydraulicBoundaryDataEntity();
 
             // Call
             void Call() => entity.Read(null);
@@ -57,26 +56,22 @@
         }
 
         [Test]
-        public void Read_WithValidEntity_UpdatesHydraulicBoundaryDatabase()
+        public void Read_WithValidEntity_UpdatesHydraulicBoundaryData()
         {
             // Setup
             var random = new Random(21);
-            bool usePreprocessorClosure = random.NextBoolean();
-            var entity = new HydraulicBoundaryDatabaseEntity
+            var entity = new HydraulicBoundaryDataEntity
             {
-                FilePath = "hrdFilePath",
-                Version = "1.0",
-                HydraulicLocationConfigurationSettingsFilePath = "hlcdFilePath",
-                HydraulicLocationConfigurationSettingsUsePreprocessorClosure = Convert.ToByte(usePreprocessorClosure),
-                HydraulicLocationConfigurationSettingsScenarioName = "ScenarioName",
-                HydraulicLocationConfigurationSettingsYear = random.Next(),
-                HydraulicLocationConfigurationSettingsScope = "Scope",
-                HydraulicLocationConfigurationSettingsSeaLevel = "SeaLevel",
-                HydraulicLocationConfigurationSettingsRiverDischarge = "RiverDischarge",
-                HydraulicLocationConfigurationSettingsLakeLevel = "LakeLevel",
-                HydraulicLocationConfigurationSettingsWindDirection = "WindDirection",
-                HydraulicLocationConfigurationSettingsWindSpeed = "WindSpeed",
-                HydraulicLocationConfigurationSettingsComment = "Comment"
+                HydraulicLocationConfigurationDatabaseFilePath = "hlcdFilePath",
+                HydraulicLocationConfigurationDatabaseScenarioName = "ScenarioName",
+                HydraulicLocationConfigurationDatabaseYear = random.Next(),
+                HydraulicLocationConfigurationDatabaseScope = "Scope",
+                HydraulicLocationConfigurationDatabaseSeaLevel = "SeaLevel",
+                HydraulicLocationConfigurationDatabaseRiverDischarge = "RiverDischarge",
+                HydraulicLocationConfigurationDatabaseLakeLevel = "LakeLevel",
+                HydraulicLocationConfigurationDatabaseWindDirection = "WindDirection",
+                HydraulicLocationConfigurationDatabaseWindSpeed = "WindSpeed",
+                HydraulicLocationConfigurationDatabaseComment = "Comment"
             };
 
             var hydraulicBoundaryData = new HydraulicBoundaryData();
@@ -85,21 +80,17 @@
             entity.Read(hydraulicBoundaryData);
 
             // Assert
-            Assert.AreEqual(entity.FilePath, hydraulicBoundaryData.FilePath);
-            Assert.AreEqual(entity.Version, hydraulicBoundaryData.Version);
-
             HydraulicLocationConfigurationDatabase database = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
-            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);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseFilePath, database.FilePath);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseScenarioName, database.ScenarioName);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseYear, database.Year);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseScope, database.Scope);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseSeaLevel, database.SeaLevel);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseRiverDischarge, database.RiverDischarge);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseLakeLevel, database.LakeLevel);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseWindDirection, database.WindDirection);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseWindSpeed, database.WindSpeed);
+            Assert.AreEqual(entity.HydraulicLocationConfigurationDatabaseComment, database.Comment);
         }
     }
 }
\ No newline at end of file