Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs
===================================================================
diff -u -r2f131c8393aa1cd11575c038d2fa1992ce5895fa -rf724a298bb90f4b74a7d4cef522991a723ebb3ab
--- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs	(.../HydraulicBoundaryDataHelper.cs)	(revision 2f131c8393aa1cd11575c038d2fa1992ce5895fa)
+++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs	(.../HydraulicBoundaryDataHelper.cs)	(revision f724a298bb90f4b74a7d4cef522991a723ebb3ab)
@@ -43,20 +43,20 @@
         private const string preprocessorClosureFileName = "preprocClosure.sqlite";
 
         /// <summary>
-        /// Attempts to connect to the <paramref name="filePath"/> as if it is a hydraulic boundary database with a hydraulic
-        /// location configuration database and hydraulic boundary database settings file next to it.
+        /// Attempts to connect to the <paramref name="hrdFilePath"/> as if it is a hydraulic boundary database with a hydraulic
+        /// location configuration database and hydraulic boundary settings database next to it.
         /// </summary>
-        /// <param name="filePath">The file path of the hydraulic boundary database.</param>
+        /// <param name="hrdFilePath">The file path of the hydraulic boundary database.</param>
         /// <param name="hlcdFilePath">The file path of the hydraulic location configuration database.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory.</param>
         /// <param name="usePreprocessorClosure">Indicator whether the preprocessor closure is used in a calculation.</param>
-        /// <returns>A <see cref="string"/> describing the problem when trying to connect to the <paramref name="filePath"/> 
+        /// <returns>A <see cref="string"/> describing the problem when trying to connect to the <paramref name="hrdFilePath"/> 
         /// or <c>null</c> if a connection could be correctly made.</returns>
-        public static string ValidateFilesForCalculation(string filePath, string hlcdFilePath, string preprocessorDirectory, bool usePreprocessorClosure)
+        public static string ValidateFilesForCalculation(string hrdFilePath, string hlcdFilePath, string preprocessorDirectory, bool usePreprocessorClosure)
         {
             try
             {
-                IOUtils.ValidateFilePath(filePath);
+                IOUtils.ValidateFilePath(hrdFilePath);
             }
             catch (ArgumentException e)
             {
@@ -65,18 +65,18 @@
 
             try
             {
-                Path.GetDirectoryName(filePath);
+                Path.GetDirectoryName(hrdFilePath);
             }
             catch (PathTooLongException)
             {
                 return string.Format(CultureInfo.CurrentCulture, HydraRingResources.HydraulicBoundaryDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_,
-                                     filePath);
+                                     hrdFilePath);
             }
 
-            string settingsDatabaseFileName = GetHydraulicBoundarySettingsDatabase(filePath);
+            string settingsDatabaseFileName = GetHydraulicBoundarySettingsDatabase(hrdFilePath);
             try
             {
-                using (new HydraulicBoundaryDatabaseReader(filePath))
+                using (new HydraulicBoundaryDatabaseReader(hrdFilePath))
                 {
                     // Used on purpose to check the filePath
                 }
@@ -113,44 +113,43 @@
 
         /// <summary>
         /// Checks whether the version of a <see cref="HydraulicBoundaryData"/> instance matches the version of a hydraulic
-        /// boundary database at the given <see cref="hydraulicBoundaryDatabaseFilePath"/>.
+        /// boundary database at the given <see cref="hrdFilePath"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryData">The hydraulic boundary data to compare the version of.</param>
-        /// <param name="hydraulicBoundaryDatabaseFilePath">The file path to the hydraulic boundary database to compare the
-        /// version of.</param>
+        /// <param name="hrdFilePath">The file path of the hydraulic boundary database to compare the version of.</param>
         /// <returns><c>true</c> if <paramref name="hydraulicBoundaryData"/> equals the version of the hydraulic boundary database
-        /// at <paramref name="hydraulicBoundaryDatabaseFilePath"/>, <c>false</c> otherwise.</returns>
+        /// at <paramref name="hrdFilePath"/>, <c>false</c> otherwise.</returns>
         /// <exception cref="CriticalFileReadException">Thrown when no connection with the hydraulic boundary database could be
-        /// created using <paramref name="hydraulicBoundaryDatabaseFilePath"/>.</exception>
+        /// created using <paramref name="hrdFilePath"/>.</exception>
         /// <exception cref="ArgumentNullException">Thrown when:
         /// <list type="bullet">
         /// <item><paramref name="hydraulicBoundaryData"/> is <c>null</c>;</item>
-        /// <item><paramref name="hydraulicBoundaryDatabaseFilePath"/> is <c>null</c>.</item>
+        /// <item><paramref name="hrdFilePath"/> is <c>null</c>.</item>
         /// </list>
         /// </exception>
-        public static bool HaveEqualVersion(HydraulicBoundaryData hydraulicBoundaryData, string hydraulicBoundaryDatabaseFilePath)
+        public static bool HaveEqualVersion(HydraulicBoundaryData hydraulicBoundaryData, string hrdFilePath)
         {
             if (hydraulicBoundaryData == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryData));
             }
 
-            if (hydraulicBoundaryDatabaseFilePath == null)
+            if (hrdFilePath == null)
             {
-                throw new ArgumentNullException(nameof(hydraulicBoundaryDatabaseFilePath));
+                throw new ArgumentNullException(nameof(hrdFilePath));
             }
 
-            return hydraulicBoundaryData.Version == GetVersion(hydraulicBoundaryDatabaseFilePath);
+            return hydraulicBoundaryData.Version == GetVersion(hrdFilePath);
         }
 
         /// <summary>
         /// Gets the path of the hydraulic boundary database settings file.
         /// </summary>
-        /// <param name="hydraulicBoundaryDatabaseFilePath">The path of the corresponding hydraulic boundary database file.</param>
+        /// <param name="hrdFilePath">The path of the corresponding hydraulic boundary database file.</param>
         /// <returns>The path of the hydraulic boundary settings database file.</returns>
-        public static string GetHydraulicBoundarySettingsDatabase(string hydraulicBoundaryDatabaseFilePath)
+        public static string GetHydraulicBoundarySettingsDatabase(string hrdFilePath)
         {
-            return Path.ChangeExtension(hydraulicBoundaryDatabaseFilePath, hydraRingConfigurationDatabaseExtension);
+            return Path.ChangeExtension(hrdFilePath, hydraRingConfigurationDatabaseExtension);
         }
 
         /// <summary>
@@ -200,15 +199,15 @@
         }
 
         /// <summary>
-        /// Returns the version from the hydraulic boundary database pointed at by the <paramref name="filePath"/>.
+        /// Returns the version from the hydraulic boundary database pointed at by the <paramref name="hrdFilePath"/>.
         /// </summary>
-        /// <param name="filePath">The file path of the hydraulic boundary database.</param>
+        /// <param name="hrdFilePath">The file path of the hydraulic boundary database.</param>
         /// <returns>The version of the hydraulic boundary database as a <see cref="string"/>.</returns>
         /// <exception cref="CriticalFileReadException">Thrown when no connection with the hydraulic boundary database could
         /// be created.</exception>
-        private static string GetVersion(string filePath)
+        private static string GetVersion(string hrdFilePath)
         {
-            using (var db = new HydraulicBoundaryDatabaseReader(filePath))
+            using (var db = new HydraulicBoundaryDatabaseReader(hrdFilePath))
             {
                 return db.ReadVersion();
             }