Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r81074794fa8e6413b416fa821b41e8e105bc320e -r07f1f57018498819d1e957b7ad15fd28cc533902
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 81074794fa8e6413b416fa821b41e8e105bc320e)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 07f1f57018498819d1e957b7ad15fd28cc533902)
@@ -608,38 +608,38 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Locatie van het HRD bestand..
+        ///   Looks up a localized string similar to Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening..
         /// </summary>
-        public static string HydraulicBoundaryDatabase_FilePath_Description {
+        public static string HydraulicBoundaryDatabase_UsePreprocessorClosure_Description {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_FilePath_Description", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabase_UsePreprocessorClosure_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to HRD bestandslocatie.
+        ///   Looks up a localized string similar to Gebruik preprocessor sluitregime database.
         /// </summary>
-        public static string HydraulicBoundaryDatabase_FilePath_DisplayName {
+        public static string HydraulicBoundaryDatabase_UsePreprocessorClosure_DisplayName {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_FilePath_DisplayName", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryDatabase_UsePreprocessorClosure_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gebruik de preprocessor sluitregime database bij het uitvoeren van een berekening..
+        ///   Looks up a localized string similar to Locatie van het bestand..
         /// </summary>
-        public static string HydraulicBoundaryDatabase_UsePreprocessorClosure_Description {
+        public static string HydraulicDatabase_FilePath_Description {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_UsePreprocessorClosure_Description", resourceCulture);
+                return ResourceManager.GetString("HydraulicDatabase_FilePath_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gebruik preprocessor sluitregime database.
+        ///   Looks up a localized string similar to Bestandslocatie.
         /// </summary>
-        public static string HydraulicBoundaryDatabase_UsePreprocessorClosure_DisplayName {
+        public static string HydraulicDatabase_FilePath_DisplayName {
             get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_UsePreprocessorClosure_DisplayName", resourceCulture);
+                return ResourceManager.GetString("HydraulicDatabase_FilePath_DisplayName", resourceCulture);
             }
         }
         
@@ -662,24 +662,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Locatie van het HLCD bestand..
-        /// </summary>
-        public static string HydraulicLocationConfigurationDatabase_FilePath_Description {
-            get {
-                return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_FilePath_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to HLCD bestandslocatie.
-        /// </summary>
-        public static string HydraulicLocationConfigurationDatabase_FilePath_DisplayName {
-            get {
-                return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_FilePath_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen..
         /// </summary>
         public static string HydraulicLocationConfigurationDatabase_LakeLevel_Description {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r81074794fa8e6413b416fa821b41e8e105bc320e -r07f1f57018498819d1e957b7ad15fd28cc533902
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 81074794fa8e6413b416fa821b41e8e105bc320e)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 07f1f57018498819d1e957b7ad15fd28cc533902)
@@ -149,12 +149,6 @@
     <data name="HydraulicBoundaryData_Connect_To_Hlcd_ToolTip" xml:space="preserve">
     <value>Selecteer een HLCD bestand.</value>
   </data>
-    <data name="HydraulicBoundaryDatabase_FilePath_Description" xml:space="preserve">
-    <value>Locatie van het HRD bestand.</value>
-  </data>
-    <data name="HydraulicBoundaryDatabase_FilePath_DisplayName" xml:space="preserve">
-    <value>HRD bestandslocatie</value>
-  </data>
     <data name="CalculationGroupContextProperties_DisplayName" xml:space="preserve">
     <value>Map met berekeningen</value>
   </data>
@@ -294,11 +288,11 @@
     <data name="HydraulicLocationConfigurationDatabase_Comment_DisplayName" xml:space="preserve">
     <value>Overig</value>
   </data>
-    <data name="HydraulicLocationConfigurationDatabase_FilePath_Description" xml:space="preserve">
-    <value>Locatie van het HLCD bestand.</value>
+    <data name="HydraulicDatabase_FilePath_Description" xml:space="preserve">
+    <value>Locatie van het bestand.</value>
   </data>
-    <data name="HydraulicLocationConfigurationDatabase_FilePath_DisplayName" xml:space="preserve">
-    <value>HLCD bestandslocatie</value>
+    <data name="HydraulicDatabase_FilePath_DisplayName" xml:space="preserve">
+    <value>Bestandslocatie</value>
   </data>
     <data name="HydraulicLocationConfigurationDatabase_LakeLevel_Description" xml:space="preserve">
     <value>Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen.</value>
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs
===================================================================
diff -u -r3abbac9ec8a9e07a8655223a563e29a877b45031 -r07f1f57018498819d1e957b7ad15fd28cc533902
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 3abbac9ec8a9e07a8655223a563e29a877b45031)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 07f1f57018498819d1e957b7ad15fd28cc533902)
@@ -54,8 +54,8 @@
 
         [PropertyOrder(filePathPropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_FilePath_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_FilePath_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicDatabase_FilePath_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicDatabase_FilePath_Description))]
         public string FilePath
         {
             get
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs
===================================================================
diff -u -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a -r07f1f57018498819d1e957b7ad15fd28cc533902
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs	(.../HydraulicLocationConfigurationDatabaseProperties.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs	(.../HydraulicLocationConfigurationDatabaseProperties.cs)	(revision 07f1f57018498819d1e957b7ad15fd28cc533902)
@@ -62,8 +62,8 @@
 
         [PropertyOrder(filePathPropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_FilePath_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_FilePath_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicDatabase_FilePath_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicDatabase_FilePath_Description))]
         public string FilePath
         {
             get
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -r3abbac9ec8a9e07a8655223a563e29a877b45031 -r07f1f57018498819d1e957b7ad15fd28cc533902
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 3abbac9ec8a9e07a8655223a563e29a877b45031)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 07f1f57018498819d1e957b7ad15fd28cc533902)
@@ -94,8 +94,8 @@
             PropertyDescriptor filePathProperty = dynamicProperties[filePathPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(filePathProperty,
                                                                             expectedCategory,
-                                                                            "HRD bestandslocatie",
-                                                                            "Locatie van het HRD bestand.",
+                                                                            "Bestandslocatie",
+                                                                            "Locatie van het bestand.",
                                                                             true);
 
             PropertyDescriptor usePreprocessorClosureProperty = dynamicProperties[usePreprocessorClosurePropertyIndex];
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs
===================================================================
diff -u -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a -r07f1f57018498819d1e957b7ad15fd28cc533902
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs	(.../HydraulicLocationConfigurationDatabasePropertiesTest.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs	(.../HydraulicLocationConfigurationDatabasePropertiesTest.cs)	(revision 07f1f57018498819d1e957b7ad15fd28cc533902)
@@ -133,8 +133,8 @@
             PropertyDescriptor filePathProperty = dynamicProperties[filePathPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(filePathProperty,
                                                                             expectedCategory,
-                                                                            "HLCD bestandslocatie",
-                                                                            "Locatie van het HLCD bestand.",
+                                                                            "Bestandslocatie",
+                                                                            "Locatie van het bestand.",
                                                                             true);
 
             PropertyDescriptor scenarioNameProperty = dynamicProperties[scenarioNamePropertyIndex];