Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs
===================================================================
diff -u -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 -r2a8b578a0005b6e0a4258c90101f3f9d0accfbb6
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 2a8b578a0005b6e0a4258c90101f3f9d0accfbb6)
@@ -58,11 +58,11 @@
 
         /// <summary>
         /// Create a valid instance of <see cref="ReadHydraulicLocationConfigurationDatabase"/> with hydraulic location
-        /// configuration database settings.
+        /// configuration settings.
         /// </summary>
         /// <param name="trackId">The id of the track that should be part of the read tracks.</param>
         /// <returns>The created <see cref="ReadHydraulicLocationConfigurationDatabase"/> with hydraulic location configuration
-        /// database settings.</returns>
+        /// settings.</returns>
         public static ReadHydraulicLocationConfigurationDatabase CreateWithConfigurationSettings(long trackId)
         {
             ReadHydraulicLocationConfigurationSettings[] settings =
@@ -75,12 +75,12 @@
 
         /// <summary>
         /// Create a valid instance of <see cref="ReadHydraulicLocationConfigurationDatabase"/> with hydraulic location
-        /// configuration database settings.
+        /// configuration settings.
         /// </summary>
         /// <param name="settings">The <see cref="ReadHydraulicLocationConfigurationSettings"/> to set.</param>
         /// <param name="trackId">The id of the track that should be part of the read tracks.</param>
         /// <returns>The created <see cref="ReadHydraulicLocationConfigurationDatabase"/> with hydraulic location configuration
-        /// database settings.</returns>
+        /// settings.</returns>
         public static ReadHydraulicLocationConfigurationDatabase CreateWithConfigurationSettings(IEnumerable<ReadHydraulicLocationConfigurationSettings> settings,
                                                                                                  long trackId)
         {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs
===================================================================
diff -u -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 -r2a8b578a0005b6e0a4258c90101f3f9d0accfbb6
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs	(.../HydraulicBoundaryDataUpdateHandler.cs)	(revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs	(.../HydraulicBoundaryDataUpdateHandler.cs)	(revision 2a8b578a0005b6e0a4258c90101f3f9d0accfbb6)
@@ -129,7 +129,7 @@
             if (!IsValidReadHydraulicLocationConfigurationDatabase(readHydraulicLocationConfigurationDatabase))
             {
                 string errorMessage = $"{nameof(readHydraulicLocationConfigurationDatabase)} must be null or contain exactly one item for " +
-                                      "the collection of hydraulic location configuration database settings.";
+                                      "the collection of read hydraulic location configuration settings.";
                 throw new ArgumentException(errorMessage);
             }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs
===================================================================
diff -u -r0ba409a3723946a63032778295c2f8feaecc7f51 -r2a8b578a0005b6e0a4258c90101f3f9d0accfbb6
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 0ba409a3723946a63032778295c2f8feaecc7f51)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 2a8b578a0005b6e0a4258c90101f3f9d0accfbb6)
@@ -400,7 +400,7 @@
 
             // Assert
             const string expectedMessage = "readHydraulicLocationConfigurationDatabase must be null or contain " +
-                                           "exactly one item for the collection of hydraulic location configuration database settings.";
+                                           "exactly one item for the collection of read hydraulic location configuration settings.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(Call, expectedMessage);
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8b578a0005b6e0a4258c90101f3f9d0accfbb6
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision ecbba2f636e82f8d94ee7deea09730e39190d2bb)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 2a8b578a0005b6e0a4258c90101f3f9d0accfbb6)
@@ -314,7 +314,7 @@
         }
 
         [Test]
-        public void Read_WithHydraulicBoundaryData_ReturnsNewAssessmentSectionWithHydraulicLocationConfigurationSettingsSet()
+        public void Read_WithHydraulicBoundaryData_ReturnsNewAssessmentSectionWithHydraulicLocationConfigurationDatabaseSet()
         {
             // Setup
             var random = new Random(21);