Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationDatabaseQueryBuilder.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationDatabaseQueryBuilder.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilder.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationDatabaseQueryBuilder.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilder.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -27,26 +27,26 @@
     public static class HydraulicLocationConfigurationDatabaseQueryBuilder
     {
         /// <summary>
-        /// Gets the query to get the LocationIds from the database.
+        /// Gets the query to get location ids from the database.
         /// </summary>
-        /// <returns>The query to get the locationIds from the database.</returns>
-        public static string GetLocationsIdByTrackIdQuery()
+        /// <returns>The query to get location ids from the database.</returns>
+        public static string GetLocationIdsByTrackIdQuery()
         {
             return $"SELECT {LocationsTableDefinitions.LocationId}, {LocationsTableDefinitions.HrdLocationId} " +
                    $"FROM {LocationsTableDefinitions.TableName} " +
-                   $"WHERE {TracksTableDefinitions.TrackId} = @{TracksTableDefinitions.TrackId} " +
+                   $"WHERE {LocationsTableDefinitions.TrackId} = @{LocationsTableDefinitions.TrackId} " +
                    $"ORDER BY {LocationsTableDefinitions.HrdLocationId};";
         }
 
         /// <summary>
-        /// Gets the query to get the UsePreprocessor indicator from the database.
+        /// Gets the query to get region information from the database.
         /// </summary>
-        /// <returns>The query to get the UsePreprocessor indicator from the database.</returns>
-        public static string GetUsePreprocessorByTrackIdQuery()
+        /// <returns>The query to get region information from the database.</returns>
+        public static string GetRegionByTrackIdQuery()
         {
             return $"SELECT * FROM {RegionsTableDefinitions.TableName} " +
                    $"LEFT JOIN {TracksTableDefinitions.TableName} " +
-                   $"ON {RegionsTableDefinitions.TableName}.{RegionsTableDefinitions.RegionId} = {TracksTableDefinitions.TableName}.{RegionsTableDefinitions.RegionId} " +
+                   $"ON {RegionsTableDefinitions.TableName}.{RegionsTableDefinitions.RegionId} = {TracksTableDefinitions.TableName}.{TracksTableDefinitions.RegionId} " +
                    $"WHERE {TracksTableDefinitions.TableName}.{TracksTableDefinitions.TrackId} = @{TracksTableDefinitions.TrackId}";
         }
     }
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReader.cs
===================================================================
diff -u -r3147d2f42ddbf18f08e0015f71aeeec2de60dd89 -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReader.cs	(.../HydraulicLocationConfigurationSqLiteDatabaseReader.cs)	(revision 3147d2f42ddbf18f08e0015f71aeeec2de60dd89)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReader.cs	(.../HydraulicLocationConfigurationSqLiteDatabaseReader.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -66,7 +66,7 @@
             var trackParameter = new SQLiteParameter
             {
                 DbType = DbType.String,
-                ParameterName = TracksTableDefinitions.TrackId,
+                ParameterName = LocationsTableDefinitions.TrackId,
                 Value = trackId
             };
 
@@ -131,8 +131,8 @@
         private Dictionary<long, long> GetLocationIdsFromDatabase(SQLiteParameter trackParameter)
         {
             var dictionary = new Dictionary<long, long>();
-            string locationIdQuery = HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationsIdByTrackIdQuery();
-            using (IDataReader dataReader = CreateDataReader(locationIdQuery, trackParameter))
+            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationIdsByTrackIdQuery();
+            using (IDataReader dataReader = CreateDataReader(query, trackParameter))
             {
                 while (MoveNext(dataReader))
                 {
@@ -165,7 +165,7 @@
         /// <exception cref="CriticalFileReadException">Thrown when no results could be found.</exception>
         private bool GetCanUsePreprocessorFromDatabase(SQLiteParameter trackParameter)
         {
-            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetUsePreprocessorByTrackIdQuery();
+            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetRegionByTrackIdQuery();
             using (IDataReader dataReader = CreateDataReader(query, trackParameter))
             {
                 DataTable schemaTable = dataReader.GetSchemaTable();
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/LocationsTableDefinitions.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/LocationsTableDefinitions.cs	(.../LocationsTableDefinitions.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/LocationsTableDefinitions.cs	(.../LocationsTableDefinitions.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -30,5 +30,6 @@
         public const string TableName = "Locations";
         public const string LocationId = "LocationId";
         public const string HrdLocationId = "HRDLocationId";
+        public const string TrackId = "TrackId";
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/TracksTableDefinitions.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/TracksTableDefinitions.cs	(.../TracksTableDefinitions.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabaseContext/TracksTableDefinitions.cs	(.../TracksTableDefinitions.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -29,5 +29,6 @@
     {
         public const string TableName = "Tracks";
         public const string TrackId = "TrackId";
+        public const string RegionId = "RegionId";
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -28,21 +28,21 @@
     public class HydraulicLocationConfigurationDatabaseQueryBuilderTest
     {
         [Test]
-        public void GetLocationsIdByTrackIdQuery_Always_ReturnsExpectedValues()
+        public void GetLocationIdsByTrackIdQuery_Always_ReturnsExpectedValues()
         {
             // Call
-            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationsIdByTrackIdQuery();
+            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationIdsByTrackIdQuery();
 
             // Assert
             const string expectedQuery = "SELECT LocationId, HRDLocationId FROM Locations WHERE TrackId = @TrackId ORDER BY HRDLocationId;";
             Assert.AreEqual(expectedQuery, query);
         }
 
         [Test]
-        public void GetUsePreprocessorByTrackIdQuery_Always_ReturnsExpectedValues()
+        public void GetRegionByTrackIdQuery_Always_ReturnsExpectedValues()
         {
             // Call
-            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetUsePreprocessorByTrackIdQuery();
+            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetRegionByTrackIdQuery();
 
             // Assert
             const string expectedQuery = "SELECT * FROM Regions LEFT JOIN Tracks ON Regions.RegionId = Tracks.RegionId WHERE Tracks.TrackId = @TrackId";
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/LocationsTableDefinitionsTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/LocationsTableDefinitionsTest.cs	(.../LocationsTableDefinitionsTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/LocationsTableDefinitionsTest.cs	(.../LocationsTableDefinitionsTest.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -33,6 +33,7 @@
             Assert.AreEqual("Locations", LocationsTableDefinitions.TableName);
             Assert.AreEqual("HRDLocationId", LocationsTableDefinitions.HrdLocationId);
             Assert.AreEqual("LocationId", LocationsTableDefinitions.LocationId);
+            Assert.AreEqual("TrackId", LocationsTableDefinitions.TrackId);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/TracksTableDefinitionsTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r151670c88ac704d2aca406894fefe8785c3d9c76
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/TracksTableDefinitionsTest.cs	(.../TracksTableDefinitionsTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/TracksTableDefinitionsTest.cs	(.../TracksTableDefinitionsTest.cs)	(revision 151670c88ac704d2aca406894fefe8785c3d9c76)
@@ -32,6 +32,7 @@
         {
             Assert.AreEqual("Tracks", TracksTableDefinitions.TableName);
             Assert.AreEqual("TrackId", TracksTableDefinitions.TrackId);
+            Assert.AreEqual("RegionId", TracksTableDefinitions.RegionId);
         }
     }
 }
\ No newline at end of file