Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDataImporter.cs
===================================================================
diff -u -r2ce70de3d6d063317e1ae1088281ded8704975cf -r9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDataImporter.cs	(.../HydraulicBoundaryDataImporter.cs)	(revision 2ce70de3d6d063317e1ae1088281ded8704975cf)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDataImporter.cs	(.../HydraulicBoundaryDataImporter.cs)	(revision 9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925)
@@ -98,14 +98,14 @@
                 readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings;
             if (hydraulicLocationConfigurationDatabaseSettings != null && hydraulicLocationConfigurationDatabaseSettings.Count() != 1)
             {
-                Log.Error(BuildErrorMessage(hlcdFilePath, Resources.HydraulicBoundaryDatabaseImporter_HLCD_Invalid_number_of_ScenarioInformation_entries));
+                Log.Error(BuildErrorMessage(hlcdFilePath, Resources.HydraulicBoundaryDataImporter_HLCD_Invalid_number_of_ScenarioInformation_entries));
                 return false;
             }
 
             if (readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure
                 && !File.Exists(HydraulicBoundaryDataHelper.GetPreprocessorClosureFilePath(hlcdFilePath)))
             {
-                Log.Error(BuildErrorMessage(hlcdFilePath, Resources.HydraulicBoundaryDatabaseImporter_PreprocessorClosure_sqlite_Not_Found));
+                Log.Error(BuildErrorMessage(hlcdFilePath, Resources.HydraulicBoundaryDataImporter_PreprocessorClosure_sqlite_Not_Found));
                 return false;
             }
 
@@ -124,7 +124,7 @@
 
         protected override void LogImportCanceledMessage()
         {
-            Log.Info(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed);
+            Log.Info(Resources.HydraulicBoundaryDataImporter_ProgressText_Import_canceled_No_data_changed);
         }
 
         protected override void DoPostImportUpdates()
@@ -150,7 +150,7 @@
 
         private ReadResult<ReadHydraulicBoundaryDatabase> ReadHydraulicBoundaryDatabase()
         {
-            NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file, 1, numberOfSteps);
+            NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_file, 1, numberOfSteps);
             try
             {
                 using (var reader = new HydraulicBoundaryDatabaseReader(FilePath))
@@ -172,7 +172,7 @@
 
         private ReadResult<ReadHydraulicLocationConfigurationDatabase> ReadHydraulicLocationConfigurationDatabase(string hlcdFilePath, long trackId)
         {
-            NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file, 2, numberOfSteps);
+            NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_HLCD_file, 2, numberOfSteps);
             try
             {
                 using (var reader = new HydraulicLocationConfigurationDatabaseReader(hlcdFilePath))
@@ -182,7 +182,7 @@
             }
             catch (CriticalFileReadException)
             {
-                return HandleCriticalFileReadError<ReadHydraulicLocationConfigurationDatabase>(Resources.HydraulicBoundaryDatabaseImporter_HLCD_sqlite_Not_Found);
+                return HandleCriticalFileReadError<ReadHydraulicLocationConfigurationDatabase>(Resources.HydraulicBoundaryDataImporter_HLCD_sqlite_Not_Found);
             }
         }
 
@@ -206,7 +206,7 @@
 
         private ReadResult<IEnumerable<long>> ReadExcludedLocations()
         {
-            NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_settings_file, 3, numberOfSteps);
+            NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_settings_file, 3, numberOfSteps);
             string hbsdFilePath = HydraulicBoundaryDataHelper.GetHydraulicBoundarySettingsDatabaseFilePath(FilePath);
             try
             {
@@ -218,7 +218,7 @@
             catch (CriticalFileReadException e)
             {
                 return HandleCriticalFileReadError<IEnumerable<long>>(
-                    string.Format(Resources.HydraulicBoundaryDatabaseImporter_Cannot_open_hydraulic_calculation_settings_file_0_, e.Message));
+                    string.Format(Resources.HydraulicBoundaryDataImporter_Cannot_open_hydraulic_calculation_settings_file_0_, e.Message));
             }
         }
 
@@ -251,7 +251,7 @@
 
         private ReadResult<T> HandleCriticalFileReadError<T>(Exception e)
         {
-            string errorMessage = string.Format(Resources.HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported,
+            string errorMessage = string.Format(Resources.HydraulicBoundaryDataImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported,
                                                 e.Message);
             Log.Error(errorMessage);
             return new ReadResult<T>(true);
@@ -282,7 +282,7 @@
         private static string BuildErrorMessage(string filePath, string message)
         {
             return new FileReaderErrorMessageBuilder(filePath).Build(
-                string.Format(Resources.HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported,
+                string.Format(Resources.HydraulicBoundaryDataImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported,
                               message));
         }
     }
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs
===================================================================
diff -u -rc03e1120c6c515515347765389d19826b29dfd61 -r9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs	(.../HydraulicLocationConfigurationDatabaseImporter.cs)	(revision c03e1120c6c515515347765389d19826b29dfd61)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs	(.../HydraulicLocationConfigurationDatabaseImporter.cs)	(revision 9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925)
@@ -117,7 +117,7 @@
             if (readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure
                 && !File.Exists(HydraulicBoundaryDataHelper.GetPreprocessorClosureFilePath(FilePath)))
             {
-                Log.Error(BuildErrorMessage(FilePath, Resources.HydraulicBoundaryDatabaseImporter_PreprocessorClosure_sqlite_Not_Found));
+                Log.Error(BuildErrorMessage(FilePath, Resources.HydraulicBoundaryDataImporter_PreprocessorClosure_sqlite_Not_Found));
                 return false;
             }
 
@@ -155,7 +155,7 @@
 
         private ReadResult<long> ReadTrackId()
         {
-            NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file, 1, numberOfSteps);
+            NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_file, 1, numberOfSteps);
             try
             {
                 using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryData.FilePath))
@@ -177,7 +177,7 @@
 
         private ReadResult<ReadHydraulicLocationConfigurationDatabase> ReadHydraulicLocationConfigurationDatabase(long trackId)
         {
-            NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file, 2, numberOfSteps);
+            NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_HLCD_file, 2, numberOfSteps);
             try
             {
                 using (var reader = new HydraulicLocationConfigurationDatabaseReader(FilePath))
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054 -r9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925)
@@ -192,85 +192,83 @@
         /// <summary>
         ///   Looks up a localized string similar to Kon het rekeninstellingen bestand niet openen. {0}.
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_Cannot_open_hydraulic_calculation_settings_file_0_ {
+        public static string HydraulicBoundaryDataImporter_Cannot_open_hydraulic_calculation_settings_file_0_ {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_Cannot_open_hydraulic_calculation_settings_file" +
-                        "_0_", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_Cannot_open_hydraulic_calculation_settings_file_0_", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to {0}
         ///Er is geen hydraulische belastingen database gekoppeld..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported {
+        public static string HydraulicBoundaryDataImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_Hydrauli" +
-                        "cBoundaryDatabase_imported", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBou" +
+                        "ndaryDatabase_imported", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to De tabel &apos;ScenarioInformation&apos; in het HLCD bestand moet exact 1 rij bevatten..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_HLCD_Invalid_number_of_ScenarioInformation_entries {
+        public static string HydraulicBoundaryDataImporter_HLCD_Invalid_number_of_ScenarioInformation_entries {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_HLCD_Invalid_number_of_ScenarioInformation_entr" +
-                        "ies", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_HLCD_Invalid_number_of_ScenarioInformation_entries", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_HLCD_sqlite_Not_Found {
+        public static string HydraulicBoundaryDataImporter_HLCD_sqlite_Not_Found {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_HLCD_sqlite_Not_Found", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_HLCD_sqlite_Not_Found", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Het bijbehorende preprocessor closure bestand is niet gevonden in dezelfde map als het HLCD bestand..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_PreprocessorClosure_sqlite_Not_Found {
+        public static string HydraulicBoundaryDataImporter_PreprocessorClosure_sqlite_Not_Found {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_PreprocessorClosure_sqlite_Not_Found", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_PreprocessorClosure_sqlite_Not_Found", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Hydraulische belastingen database koppelen afgebroken. Geen gegevens gewijzigd..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed {
+        public static string HydraulicBoundaryDataImporter_ProgressText_Import_canceled_No_data_changed {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_ProgressText_Import_canceled_No_data_changed", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Inlezen van het hydraulische locatie configuratie bestand..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file {
+        public static string HydraulicBoundaryDataImporter_ProgressText_Reading_HLCD_file {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_ProgressText_Reading_HLCD_file", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Inlezen van het hydraulische belastingen bestand..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file {
+        public static string HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_file {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_file", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Inlezen van het rekeninstellingen bestand..
         /// </summary>
-        public static string HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_settings_file {
+        public static string HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_settings_file {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_settings_file", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_settings_file", resourceCulture);
             }
         }
         
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx
===================================================================
diff -u -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054 -r9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 9f5097b0cfaaa6bd6f456a28e0c3c6c8b8a2c925)
@@ -138,29 +138,29 @@
   <data name="AssemblyExporter_Specific_failure_mechanisms_must_have_a_unique_name" xml:space="preserve">
     <value>Om assemblageresultaten te kunnen exporteren moeten alle specifieke faalmechanismen die onderdeel zijn van de assemblage een unieke naam hebben.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_file" xml:space="preserve">
     <value>Inlezen van het hydraulische belastingen bestand.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported" xml:space="preserve">
     <value>{0}
 Er is geen hydraulische belastingen database gekoppeld.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_ProgressText_Import_canceled_No_data_changed" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_ProgressText_Import_canceled_No_data_changed" xml:space="preserve">
     <value>Hydraulische belastingen database koppelen afgebroken. Geen gegevens gewijzigd.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_ProgressText_Reading_HLCD_file" xml:space="preserve">
     <value>Inlezen van het hydraulische locatie configuratie bestand.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_HLCD_sqlite_Not_Found" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_HLCD_sqlite_Not_Found" xml:space="preserve">
     <value>Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_settings_file" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_ProgressText_Reading_HRD_settings_file" xml:space="preserve">
     <value>Inlezen van het rekeninstellingen bestand.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_Cannot_open_hydraulic_calculation_settings_file_0_" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_Cannot_open_hydraulic_calculation_settings_file_0_" xml:space="preserve">
     <value>Kon het rekeninstellingen bestand niet openen. {0}</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_HLCD_Invalid_number_of_ScenarioInformation_entries" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_HLCD_Invalid_number_of_ScenarioInformation_entries" xml:space="preserve">
     <value>De tabel 'ScenarioInformation' in het HLCD bestand moet exact 1 rij bevatten.</value>
   </data>
   <data name="HydraulicLocationConfigurationDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicLocationConfigurationDatabase_imported" xml:space="preserve">
@@ -179,7 +179,7 @@
   <data name="HydraulicLocationConfigurationDatabaseImporter_Invalid_locationIds" xml:space="preserve">
     <value>1 of meerdere locaties komen niet voor in de HLCD.</value>
   </data>
-  <data name="HydraulicBoundaryDatabaseImporter_PreprocessorClosure_sqlite_Not_Found" xml:space="preserve">
+  <data name="HydraulicBoundaryDataImporter_PreprocessorClosure_sqlite_Not_Found" xml:space="preserve">
     <value>Het bijbehorende preprocessor closure bestand is niet gevonden in dezelfde map als het HLCD bestand.</value>
   </data>
   <data name="HydraulicBoundaryLocationCalculationsWriter_WaterLevelCalculationType_WaterLevel_DisplayName" xml:space="preserve">