Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs
===================================================================
diff -u -rdc381b4bef2de717bfa3ad01b38f5fed7ae98891 -re9961fad25fe961bf28281b004686b8d1bef593f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision dc381b4bef2de717bfa3ad01b38f5fed7ae98891)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision e9961fad25fe961bf28281b004686b8d1bef593f)
@@ -33,8 +33,8 @@
 namespace Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase
 {
     /// <summary>
-    /// This class reads a SqLite database file and constructs a <see cref="ReadHydraulicBoundaryDatabase"/>
-    /// instance from this database.
+    /// This class reads a hydraulic boundary database file and constructs a
+    /// <see cref="ReadHydraulicBoundaryDatabase"/> instance from this database.
     /// </summary>
     public class HydraulicBoundaryDatabaseReader : SqLiteDatabaseReaderBase
     {
@@ -56,19 +56,18 @@
         /// </summary>
         /// <returns>A read hydraulic boundary database.</returns>
         /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
-        /// <exception cref="CriticalFileReadException">Thrown when a query could not be executed on the database schema.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when the data cannot be read.</exception>
         public ReadHydraulicBoundaryDatabase Read()
         {
             return new ReadHydraulicBoundaryDatabase(ReadTrackId(), ReadVersion(), ReadLocations().ToArray());
         }
 
         /// <summary>
-        /// Reads the track id from the hydraulic boundary database.
+        /// Reads the track Id from the hydraulic boundary database.
         /// </summary>
-        /// <returns>The track id found in the database.</returns>
+        /// <returns>The track Id found in the database.</returns>
         /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
-        /// <exception cref="CriticalFileReadException">Thrown when a query could not be executed on the database schema
-        /// or the track id cannot be found.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when the track Id cannot be read.</exception>
         private long ReadTrackId()
         {
             try
@@ -104,7 +103,7 @@
         /// Gets the version of the hydraulic boundary database.
         /// </summary>
         /// <returns>The version found in the database, or <see cref="string.Empty"/> if the version cannot be found.</returns>
-        /// <exception cref="CriticalFileReadException">Thrown when a query could not be executed on the database schema.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when the version cannot be read..</exception>
         public string ReadVersion()
         {
             try
@@ -134,7 +133,7 @@
         }
 
         /// <summary>
-        /// 
+        /// Reads the locations from the database.
         /// </summary>
         /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
         private IEnumerable<ReadHydraulicBoundaryLocation> ReadLocations()
@@ -149,10 +148,9 @@
         }
 
         /// <summary>
-        /// Reads the next location from the database.
+        /// Reads a location from the database.
         /// </summary>
-        /// <returns>A new instance of <see cref="ReadHydraulicBoundaryLocation"/> based on the data read from
-        /// the database or <c>null</c> if no data is available.</returns>
+        /// <returns>A <see cref="ReadHydraulicBoundaryLocation"/> based on the data read from the database.</returns>
         /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
         private ReadHydraulicBoundaryLocation ReadLocation(IDataReader reader)
         {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/ReadHydraulicBoundaryDatabase.cs
===================================================================
diff -u -r9f8630eed6ba63a3cac3fe42b6600605d289fac8 -re9961fad25fe961bf28281b004686b8d1bef593f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/ReadHydraulicBoundaryDatabase.cs	(.../ReadHydraulicBoundaryDatabase.cs)	(revision 9f8630eed6ba63a3cac3fe42b6600605d289fac8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/ReadHydraulicBoundaryDatabase.cs	(.../ReadHydraulicBoundaryDatabase.cs)	(revision e9961fad25fe961bf28281b004686b8d1bef593f)
@@ -31,7 +31,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="ReadHydraulicBoundaryDatabase"/>.
         /// </summary>
-        /// <param name="trackId">The track ID of the read hydraulic boundary database.</param>
+        /// <param name="trackId">The track Id of the read hydraulic boundary database.</param>
         /// <param name="version">The version of the read hydraulic boundary database.</param>
         /// <param name="locations">The read hydraulic boundary locations.</param>
         internal ReadHydraulicBoundaryDatabase(long trackId, string version, IEnumerable<ReadHydraulicBoundaryLocation> locations)
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs
===================================================================
diff -u -rdc381b4bef2de717bfa3ad01b38f5fed7ae98891 -re9961fad25fe961bf28281b004686b8d1bef593f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs	(.../HydraulicBoundaryDatabaseReaderTest.cs)	(revision dc381b4bef2de717bfa3ad01b38f5fed7ae98891)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs	(.../HydraulicBoundaryDatabaseReaderTest.cs)	(revision e9961fad25fe961bf28281b004686b8d1bef593f)
@@ -73,16 +73,16 @@
         [Test]
         [TestCase(null)]
         [TestCase("")]
-        public void Constructor_FileNullOrEmpty_ThrowsCriticalFileReadException(string hydraulicBoundaryDatabaseFile)
+        public void Constructor_FilePathNullOrEmpty_ThrowsCriticalFileReadException(string hydraulicBoundaryDatabaseFilePath)
         {
             // Call
             TestDelegate test = () =>
             {
-                using (new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile)) {}
+                using (new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFilePath)) {}
             };
 
             // Assert
-            string expectedMessage = $"Fout bij het lezen van bestand '{hydraulicBoundaryDatabaseFile}': bestandspad mag niet leeg of ongedefinieerd zijn.";
+            string expectedMessage = $"Fout bij het lezen van bestand '{hydraulicBoundaryDatabaseFilePath}': bestandspad mag niet leeg of ongedefinieerd zijn.";
             var exception = Assert.Throws<CriticalFileReadException>(test);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
@@ -175,7 +175,7 @@
 
                 // Assert
                 Assert.AreEqual("Dutch coast South19-11-2015 12:0013", readDatabase.Version);
-                Assert.AreEqual((long) 13, readDatabase.TrackId);
+                Assert.AreEqual(13, readDatabase.TrackId);
                 Assert.AreEqual(18, readDatabase.Locations.Count());
                 ReadHydraulicBoundaryLocation location = readDatabase.Locations.First();
                 Assert.AreEqual(1, location.Id);