Index: Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs
===================================================================
diff -u -rf95b399487ec2837211c2a52e281f53a67901a0b -rab34c28279ff7bde77ae3fba48c6d1e8eb4f9add
--- Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs	(.../IHydraulicBoundaryDatabaseUpdateHandler.cs)	(revision f95b399487ec2837211c2a52e281f53a67901a0b)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs	(.../IHydraulicBoundaryDatabaseUpdateHandler.cs)	(revision ab34c28279ff7bde77ae3fba48c6d1e8eb4f9add)
@@ -29,7 +29,7 @@
 namespace Riskeer.Integration.IO.Handlers
 {
     /// <summary>
-    /// Interface for an object that can properly update a <see cref="HydraulicBoundaryData"/> instance.
+    /// Interface for an object that can properly update <see cref="HydraulicBoundaryData"/>.
     /// </summary>
     public interface IHydraulicBoundaryDatabaseUpdateHandler
     {
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicLocationConfigurationDatabaseUpdateHandler.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rab34c28279ff7bde77ae3fba48c6d1e8eb4f9add
--- Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../IHydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../IHydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision ab34c28279ff7bde77ae3fba48c6d1e8eb4f9add)
@@ -39,18 +39,18 @@
         bool InquireConfirmation();
 
         /// <summary>
-        /// Updates the <see cref="HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings"/> and its dependent data with the
+        /// Updates the <see cref="HydraulicBoundaryData.HydraulicLocationConfigurationSettings"/> and its dependent data with the
         /// <paramref name="readHydraulicLocationConfigurationDatabaseSettings"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryDatabase">The hydraulic boundary database to update the settings for.</param>
-        /// <param name="readHydraulicLocationConfigurationDatabaseSettings">The read hydraulic location
-        /// configuration database settings to update with.</param>
+        /// <param name="hydraulicBoundaryData">The hydraulic boundary data to update the settings for.</param>
+        /// <param name="readHydraulicLocationConfigurationDatabaseSettings">The read hydraulic location configuration database
+        /// settings to update with.</param>
         /// <param name="usePreprocessorClosure">Indicator whether to use the preprocessor closure.</param>
         /// <param name="hlcdFilePath">The file path of the hlcd.</param>
         /// <returns>All objects that have been affected by the update.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryDatabase"/>
-        /// or <paramref name="hlcdFilePath"/> is <c>null</c>.</exception>
-        IEnumerable<IObservable> Update(HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryData"/> or
+        /// <paramref name="hlcdFilePath"/> is <c>null</c>.</exception>
+        IEnumerable<IObservable> Update(HydraulicBoundaryData hydraulicBoundaryData,
                                         ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings,
                                         bool usePreprocessorClosure,
                                         string hlcdFilePath);
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs
===================================================================
diff -u -r5c5d013a90dee68cc642516d4f577b31efa41ded -rab34c28279ff7bde77ae3fba48c6d1e8eb4f9add
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision 5c5d013a90dee68cc642516d4f577b31efa41ded)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision ab34c28279ff7bde77ae3fba48c6d1e8eb4f9add)
@@ -38,7 +38,7 @@
 namespace Riskeer.Integration.Plugin.Handlers
 {
     /// <summary>
-    /// Class that can properly update a <see cref="HydraulicBoundaryData"/> instance.
+    /// Class that can properly update <see cref="HydraulicBoundaryData"/>.
     /// </summary>
     public class HydraulicBoundaryDatabaseUpdateHandler : IHydraulicBoundaryDatabaseUpdateHandler
     {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rab34c28279ff7bde77ae3fba48c6d1e8eb4f9add
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision ab34c28279ff7bde77ae3fba48c6d1e8eb4f9add)
@@ -35,7 +35,7 @@
 namespace Riskeer.Integration.Plugin.Handlers
 {
     /// <summary>
-    /// Class that can properly update a <see cref="HydraulicLocationConfigurationSettings"/>.
+    /// Class that can properly update <see cref="HydraulicLocationConfigurationSettings"/>.
     /// </summary>
     public class HydraulicLocationConfigurationDatabaseUpdateHandler : IHydraulicLocationConfigurationDatabaseUpdateHandler
     {
@@ -65,14 +65,14 @@
             return result == DialogResult.OK;
         }
 
-        public IEnumerable<IObservable> Update(HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
+        public IEnumerable<IObservable> Update(HydraulicBoundaryDatabase hydraulicBoundaryData,
                                                ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings,
                                                bool usePreprocessorClosure,
                                                string hlcdFilePath)
         {
-            if (hydraulicBoundaryDatabase == null)
+            if (hydraulicBoundaryData == null)
             {
-                throw new ArgumentNullException(nameof(hydraulicBoundaryDatabase));
+                throw new ArgumentNullException(nameof(hydraulicBoundaryData));
             }
 
             if (hlcdFilePath == null)
@@ -81,12 +81,12 @@
             }
 
             HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
-                hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings,
+                hydraulicBoundaryData.HydraulicLocationConfigurationSettings,
                 readHydraulicLocationConfigurationDatabaseSettings, usePreprocessorClosure, hlcdFilePath);
 
             var changedObjects = new List<IObservable>
             {
-                hydraulicBoundaryDatabase
+                hydraulicBoundaryData
             };
 
             changedObjects.AddRange(RiskeerDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(assessmentSection));