Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs
===================================================================
diff -u -rb4c551019ac6ac647cecd3e494947e323f5e8e29 -rf0c911a3278aefcaa5422ca8e722b2f24a4bd71d
--- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs	(.../HydraulicBoundaryDataHelper.cs)	(revision b4c551019ac6ac647cecd3e494947e323f5e8e29)
+++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs	(.../HydraulicBoundaryDataHelper.cs)	(revision f0c911a3278aefcaa5422ca8e722b2f24a4bd71d)
@@ -109,29 +109,22 @@
         }
 
         /// <summary>
-        /// Checks whether the version of a <see cref="HydraulicBoundaryData"/> instance matches the version of a hydraulic
-        /// boundary database at the given <see cref="hrdFilePath"/>.
+        /// Validates whether the version of a hydraulic boundary database matches the version of the corresponding database file.
+        /// <param name="hydraulicBoundaryDatabase">The hydraulic boundary database to check the version of.</param>
+        /// <returns><c>true</c> if the provided hydraulic boundary database matches the version of the corresponding database
+        /// file, <c>false</c> otherwise.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when no connection could be created with the hydraulic boundary
+        /// database.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryDatabase"/> is <c>null</c>.</exception>
         /// </summary>
-        /// <param name="hydraulicBoundaryDatabase">The hydraulic boundary data 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="hydraulicBoundaryDatabase"/> equals the version of the hydraulic boundary database
-        /// 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="hrdFilePath"/>.</exception>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static bool HaveEqualVersion(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string hrdFilePath)
+        public static bool ValidateVersion(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             if (hydraulicBoundaryDatabase == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryDatabase));
             }
 
-            if (hrdFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(hrdFilePath));
-            }
-
-            return hydraulicBoundaryDatabase.Version == GetVersion(hrdFilePath);
+            return hydraulicBoundaryDatabase.Version == GetVersion(hydraulicBoundaryDatabase.FilePath);
         }
 
         /// <summary>
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDataHelperTest.cs
===================================================================
diff -u -r5b742f43f5fcc9d2c02762ad3480e582434fbe19 -rf0c911a3278aefcaa5422ca8e722b2f24a4bd71d
--- Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDataHelperTest.cs	(.../HydraulicBoundaryDataHelperTest.cs)	(revision 5b742f43f5fcc9d2c02762ad3480e582434fbe19)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDataHelperTest.cs	(.../HydraulicBoundaryDataHelperTest.cs)	(revision f0c911a3278aefcaa5422ca8e722b2f24a4bd71d)
@@ -159,72 +159,61 @@
         }
 
         [Test]
-        public void HaveEqualVersion_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException()
+        public void ValidateVersion_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException()
         {
-            // Setup
-            string hrdFilePath = Path.Combine(testDataPath, "complete.sqlite");
-
             // Call
-            void Call() => HydraulicBoundaryDataHelper.HaveEqualVersion(null, hrdFilePath);
+            void Call() => HydraulicBoundaryDataHelper.ValidateVersion(null);
 
             // Assert
             string parameter = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("hydraulicBoundaryDatabase", parameter);
         }
 
         [Test]
-        public void HaveEqualVersion_HrdFilePathNull_ThrowsArgumentNullException()
+        public void ValidateVersion_HrdFileWithInvalidPathChars_ThrowsCriticalFileReadException()
         {
-            // Call
-            void Call() => HydraulicBoundaryDataHelper.HaveEqualVersion(new HydraulicBoundaryDatabase(), null);
-
-            // Assert
-            string parameter = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("hrdFilePath", parameter);
-        }
-
-        [Test]
-        public void HaveEqualVersion_HrdFileWithInvalidPathChars_ThrowsCriticalFileReadException()
-        {
             // Setup
             string hrdFilePath = Path.Combine(testDataPath, "complete.sqlite").Replace('c', Path.GetInvalidPathChars()[0]);
 
             // Call
-            void Test() => HydraulicBoundaryDataHelper.HaveEqualVersion(new HydraulicBoundaryDatabase(), hrdFilePath);
+            void Test() => HydraulicBoundaryDataHelper.ValidateVersion(new HydraulicBoundaryDatabase
+            {
+                FilePath = hrdFilePath
+            });
 
             // Assert
             Assert.Throws<CriticalFileReadException>(Test);
         }
 
         [Test]
-        public void HaveEqualVersion_EqualVersion_ReturnsTrue()
+        public void ValidateVersion_EqualVersion_ReturnsTrue()
         {
             // Setup
-            string hrdFilePath = Path.Combine(testDataPath, "complete.sqlite");
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
+                FilePath = Path.Combine(testDataPath, "complete.sqlite"),
                 Version = "Dutch coast South19-11-2015 12:0013"
             };
 
             // Call
-            bool isEqual = HydraulicBoundaryDataHelper.HaveEqualVersion(hydraulicBoundaryDatabase, hrdFilePath);
+            bool isEqual = HydraulicBoundaryDataHelper.ValidateVersion(hydraulicBoundaryDatabase);
 
             // Assert
             Assert.IsTrue(isEqual);
         }
 
         [Test]
-        public void HaveEqualVersion_DifferentVersions_ReturnsFalse()
+        public void ValidateVersion_DifferentVersions_ReturnsFalse()
         {
             // Setup
-            string hrdFilePath = Path.Combine(testDataPath, "complete.sqlite");
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
+                FilePath = Path.Combine(testDataPath, "complete.sqlite"),
                 Version = "Dutch coast South19-11-2015 12:0113"
             };
 
             // Call
-            bool isEqual = HydraulicBoundaryDataHelper.HaveEqualVersion(hydraulicBoundaryDatabase, hrdFilePath);
+            bool isEqual = HydraulicBoundaryDataHelper.ValidateVersion(hydraulicBoundaryDatabase);
 
             // Assert
             Assert.IsFalse(isEqual);