Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs
===================================================================
diff -u -rfac5473d828c594e27622745ea002a16ed670c90 -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision fac5473d828c594e27622745ea002a16ed670c90)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -84,17 +84,17 @@
                     }
 
                     throw new CriticalFileReadException(new FileReaderErrorMessageBuilder(Path)
-                                                            .Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column));
+                                                            .Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column));
                 }
             }
             catch (InvalidCastException exception)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                 throw new LineParseException(message, exception);
             }
             catch (SQLiteException exception)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unknown_database_structure);
                 throw new CriticalFileReadException(message, exception);
             }
         }
@@ -120,13 +120,13 @@
                         }
                     }
 
-                    string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                    string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                     throw new CriticalFileReadException(message);
                 }
             }
             catch (SQLiteException e)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unknown_database_structure);
                 throw new CriticalFileReadException(message, e);
             }
         }
@@ -164,7 +164,7 @@
             }
             catch (ConversionException e)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                 throw new LineParseException(message, e);
             }
         }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/LocationsFileReader.cs
===================================================================
diff -u -rfac5473d828c594e27622745ea002a16ed670c90 -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/LocationsFileReader.cs	(.../LocationsFileReader.cs)	(revision fac5473d828c594e27622745ea002a16ed670c90)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/LocationsFileReader.cs	(.../LocationsFileReader.cs)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -74,7 +74,7 @@
             catch (SQLiteException e)
             {
                 throw new CriticalFileReadException(
-                    new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database),
+                    new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unknown_database_structure),
                     e);
             }
         }
@@ -95,7 +95,7 @@
             catch (ConversionException e)
             {
                 throw new LineParseException(
-                    new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column),
+                    new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column),
                     e);
             }
         }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs
===================================================================
diff -u -ra145485179b2c0aadb58dfe24ea4cd969cec1e2b -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs	(.../HydraulicLocationConfigurationDatabaseReader.cs)	(revision a145485179b2c0aadb58dfe24ea4cd969cec1e2b)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs	(.../HydraulicLocationConfigurationDatabaseReader.cs)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -101,7 +101,7 @@
             }
             catch (InvalidCastException exception)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                 throw new LineParseException(message, exception);
             }
         }
@@ -179,7 +179,7 @@
                         return Convert.ToBoolean(dataReader[ScenarioInformationTableDefinitions.IsScenarioInformationPresent]);
                     }
 
-                    string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                    string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                     throw new CriticalFileReadException(message);
                 }
             }
@@ -239,7 +239,7 @@
             }
             catch (ConversionException e)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                 throw new LineParseException(message, e);
             }
         }
@@ -273,7 +273,7 @@
             }
             catch (InvalidCastException e)
             {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabase_Unexpected_value_on_column);
                 throw new LineParseException(message, e);
             }
         }
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -82,29 +82,29 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kon geen locaties verkrijgen van de database..
+        ///   Looks up a localized string similar to Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database..
         /// </summary>
-        public static string Error_HydraulicBoundaryLocation_read_from_database {
+        public static string HydraulicBoundaryDatabase_Unexpected_value_on_column {
             get {
-                return ResourceManager.GetString("Error_HydraulicBoundaryLocation_read_from_database", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabase_Unexpected_value_on_column", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het opgegeven bestandspad ({0}) is niet geldig..
+        ///   Looks up a localized string similar to Kritieke fout opgetreden bij het uitlezen van de structuur van de database..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_ {
+        public static string HydraulicBoundaryDatabase_Unknown_database_structure {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabase_Unknown_database_structure", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database..
+        ///   Looks up a localized string similar to Het opgegeven bestandspad ({0}) is niet geldig..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column {
+        public static string HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_ {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_", resourceCulture);
             }
         }
         
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.resx
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -117,10 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Error_HydraulicBoundaryLocation_read_from_database" xml:space="preserve">
-    <value>Kon geen locaties verkrijgen van de database.</value>
+  <data name="HydraulicBoundaryDatabase_Unknown_database_structure" xml:space="preserve">
+    <value>Kritieke fout opgetreden bij het uitlezen van de structuur van de database.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column" xml:space="preserve">
+  <data name="HydraulicBoundaryDatabase_Unexpected_value_on_column" xml:space="preserve">
     <value>Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.</value>
   </data>
   <data name="HydraulicLocationConfigurationDatabaseReader_GetLocationIdFromDatabase_Ambiguous_Row_Found_Take_First" xml:space="preserve">
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Riskeer.HydraRing.IO.csproj
===================================================================
diff -u -r42ca5fa567ea7172e3ecd027038501909d4dbbe1 -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Riskeer.HydraRing.IO.csproj	(.../Riskeer.HydraRing.IO.csproj)	(revision 42ca5fa567ea7172e3ecd027038501909d4dbbe1)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/Riskeer.HydraRing.IO.csproj	(.../Riskeer.HydraRing.IO.csproj)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -30,7 +30,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/LocationsFileReaderTest.cs
===================================================================
diff -u -r4127e35689c6ebc7dc068f0c54917e8b0b569281 -r4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/LocationsFileReaderTest.cs	(.../LocationsFileReaderTest.cs)	(revision 4127e35689c6ebc7dc068f0c54917e8b0b569281)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/LocationsFileReaderTest.cs	(.../LocationsFileReaderTest.cs)	(revision 4e420b92f4f3579ca3ca0530a50c6fed1bfd2d1e)
@@ -74,7 +74,7 @@
         public void Constructor_ValidFile_ExpectedValues()
         {
             // Setup
-            string locationsFilePath = Path.Combine(testDataPath, "Locations.sqlite");
+            string locationsFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
             // Call
             using (var reader = new LocationsFileReader(locationsFilePath))
@@ -89,7 +89,7 @@
         public void ReadLocations_ValidFile_ReturnsExpectedLocations()
         {
             // Setup
-            string locationsFilePath = Path.Combine(testDataPath, "Locations.sqlite");
+            string locationsFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
             using (var reader = new LocationsFileReader(locationsFilePath))
             {