Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs
===================================================================
diff -u -rb35a35ad7d9bafea2a840fa822901f062b75eeb4 -r798d15f3f7b02d24605f9eb4879c767b0c7bfdb5
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision b35a35ad7d9bafea2a840fa822901f062b75eeb4)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision 798d15f3f7b02d24605f9eb4879c767b0c7bfdb5)
@@ -84,7 +84,7 @@
                 ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(trackId);
 
                 // Assert
-                long actualLocationId = readHydraulicLocationConfigurationDatabase.LocationIdMappings.Where(m => m.HrdLocationId == hrdLocationId)
+                long actualLocationId = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Where(m => m.HrdLocationId == hrdLocationId)
                                                                                   .Select(m => m.HlcdLocationId)
                                                                                   .SingleOrDefault();
                 Assert.AreEqual(expectedLocationId, actualLocationId);
@@ -107,7 +107,7 @@
                 ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(trackId);
 
                 // Assert
-                long actualLocationId = readHydraulicLocationConfigurationDatabase.LocationIdMappings.Where(m => m.HrdLocationId == hrdLocationId)
+                long actualLocationId = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Where(m => m.HrdLocationId == hrdLocationId)
                                                                                   .Select(m => m.HlcdLocationId)
                                                                                   .SingleOrDefault();
                 Assert.AreEqual(expectedLocationId, actualLocationId);
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs
===================================================================
diff -u -rb0c204e3925b8ab26a91c96631c168f264e76a7e -r798d15f3f7b02d24605f9eb4879c767b0c7bfdb5
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs	(.../HydraulicLocationConfigurationDatabaseImporter.cs)	(revision b0c204e3925b8ab26a91c96631c168f264e76a7e)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs	(.../HydraulicLocationConfigurationDatabaseImporter.cs)	(revision 798d15f3f7b02d24605f9eb4879c767b0c7bfdb5)
@@ -124,7 +124,7 @@
             }
 
             IEnumerable<long> locationIds = hydraulicBoundaryData.Locations.Select(l => l.Id);
-            long[] intersect = locationIds.Intersect(readHydraulicLocationConfigurationDatabase.LocationIdMappings.Select(l => l.HlcdLocationId))
+            long[] intersect = locationIds.Intersect(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Select(l => l.HlcdLocationId))
                                           .ToArray();
 
             if (intersect.Length != locationIds.Count())
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs
===================================================================
diff -u -rf1e78ec7366fe317388b76be7f1a467e4ce3a137 -r798d15f3f7b02d24605f9eb4879c767b0c7bfdb5
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs	(.../HydraulicBoundaryDataUpdateHandler.cs)	(revision f1e78ec7366fe317388b76be7f1a467e4ce3a137)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs	(.../HydraulicBoundaryDataUpdateHandler.cs)	(revision 798d15f3f7b02d24605f9eb4879c767b0c7bfdb5)
@@ -143,8 +143,7 @@
                 hydraulicBoundaryData.Version = readHydraulicBoundaryDatabase.Version;
 
                 SetLocations(hydraulicBoundaryData, readHydraulicBoundaryDatabase.Locations,
-                             readHydraulicLocationConfigurationDatabase.LocationIdMappings,
-                             excludedLocationIds.ToArray());
+                             readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations, excludedLocationIds.ToArray());
 
                 assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryData.Locations);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs
===================================================================
diff -u -rafcd1d495f8a4b82fcf437eb324dba553a4cb56a -r798d15f3f7b02d24605f9eb4879c767b0c7bfdb5
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs	(.../HydraulicBoundaryDataImporterTest.cs)	(revision afcd1d495f8a4b82fcf437eb324dba553a4cb56a)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs	(.../HydraulicBoundaryDataImporterTest.cs)	(revision 798d15f3f7b02d24605f9eb4879c767b0c7bfdb5)
@@ -400,7 +400,7 @@
                        AssertReadHydraulicBoundaryDatabase(readHydraulicBoundaryDatabase);
 
                        var readHydraulicLocationConfigurationDatabase = (ReadHydraulicLocationConfigurationDatabase) invocation.Arguments[2];
-                       Assert.AreEqual(18, readHydraulicLocationConfigurationDatabase.LocationIdMappings.Count());
+                       Assert.AreEqual(18, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Count());
                        Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings);
                        Assert.AreEqual(usePreprocessorClosure, readHydraulicLocationConfigurationDatabase.ReadTracks.First(rt => rt.TrackId == readHydraulicBoundaryDatabase.TrackId).UsePreprocessorClosure);
 
@@ -447,7 +447,7 @@
                        AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[1]);
 
                        var readHydraulicLocationConfigurationDatabase = (ReadHydraulicLocationConfigurationDatabase) invocation.Arguments[2];
-                       Assert.AreEqual(18, readHydraulicLocationConfigurationDatabase.LocationIdMappings.Count());
+                       Assert.AreEqual(18, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Count());
                        Assert.AreEqual(1, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count());
 
                        var excludedLocationIds = (IEnumerable<long>) invocation.Arguments[3];
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs
===================================================================
diff -u -rb537243cd675f922b6c86d3f537134b923683119 -r798d15f3f7b02d24605f9eb4879c767b0c7bfdb5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision b537243cd675f922b6c86d3f537134b923683119)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 798d15f3f7b02d24605f9eb4879c767b0c7bfdb5)
@@ -1017,7 +1017,7 @@
                 ReadHydraulicBoundaryLocation readLocation = readLocations.ElementAt(i);
                 HydraulicBoundaryLocation actualLocation = actualLocations.ElementAt(i);
 
-                Assert.AreEqual(readHydraulicLocationConfigurationDatabase.LocationIdMappings
+                Assert.AreEqual(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations
                                                                           .Single(l => l.HrdLocationId == readLocation.Id)
                                                                           .HlcdLocationId, actualLocation.Id);
                 Assert.AreEqual(readLocation.Name, actualLocation.Name);