Index: Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs
===================================================================
diff -u -r444796880375992cac66719b2e542a26cbb5edfe -rdddf5078ebf7731869d1842818a5034f3013abff
--- Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(.../IStoreProject.cs)	(revision 444796880375992cac66719b2e542a26cbb5edfe)
+++ Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(.../IStoreProject.cs)	(revision dddf5078ebf7731869d1842818a5034f3013abff)
@@ -49,10 +49,10 @@
         /// Converts the staged project to a new storage entry. Upon return, the staged project is released and
         /// <see cref="HasStagedProject"/> will be <c>false</c>.
         /// </summary>
-        /// <param name="connectionArguments">Arguments required to connect to the storage.</param>
+        /// <param name="databaseFilePath">The path to the database required to connect to the storage.</param>
         /// <exception cref="InvalidOperationException">Thrown when no project has been staged
         /// before calling this method.</exception>
-        /// <exception cref="ArgumentException"><paramref name="connectionArguments"/> is invalid.</exception>
+        /// <exception cref="ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
         /// <exception cref="CouldNotConnectException">Thrown when no new storage was created.</exception>
         /// <exception cref="StorageException">Thrown when
         /// <list type="bullet">
@@ -62,24 +62,24 @@
         /// <item>The connection to the storage failed.</item>
         /// </list>
         /// </exception>
-        void SaveProjectAs(string connectionArguments);
+        void SaveProjectAs(string databaseFilePath);
 
         /// <summary>
         /// Attempts to load the <see cref="IProject"/> from the storage.
         /// </summary>
-        /// <param name="connectionArguments">Arguments required to connect to the storage.</param>
+        /// <param name="databaseFilePath">The path to the database required to connect to the storage.</param>
         /// <returns>Returns a new instance of <see cref="IProject"/> with the data from the storage or <c>null</c> when not found.</returns>
-        /// <exception cref="ArgumentException"><paramref name="connectionArguments"/> is invalid.</exception>
+        /// <exception cref="ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
         /// <exception cref="StorageException">Thrown when
         /// <list type="bullet">
-        /// <item><paramref name="connectionArguments"/> is invalid.</item>
+        /// <item><paramref name="databaseFilePath"/> is invalid.</item>
         /// <item>The storage does not contain all requested tables.</item>
         /// <item>The connection to the storage failed.</item>
         /// <item>The related entity was not found in the storage.</item>
         /// <item>The storage's version is incompatible.</item>
         /// </list>
         /// </exception>
-        IProject LoadProject(string connectionArguments);
+        IProject LoadProject(string databaseFilePath);
 
         /// <summary>
         /// Stages the project (does some prep-work and validity checking) to be saved.
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingStochasticSoilModelUpdateDataStrategy.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rdddf5078ebf7731869d1842818a5034f3013abff
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingStochasticSoilModelUpdateDataStrategy.cs	(.../PipingStochasticSoilModelUpdateDataStrategy.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingStochasticSoilModelUpdateDataStrategy.cs	(.../PipingStochasticSoilModelUpdateDataStrategy.cs)	(revision dddf5078ebf7731869d1842818a5034f3013abff)
@@ -54,9 +54,9 @@
 
         #region Remove Data Functions
 
-        protected override IEnumerable<IObservable> RemoveObjectAndDependentData(PipingStochasticSoilModel removedModel)
+        protected override IEnumerable<IObservable> RemoveObjectAndDependentData(PipingStochasticSoilModel removedObject)
         {
-            return PipingDataSynchronizationService.RemoveStochasticSoilModel(FailureMechanism, removedModel);
+            return PipingDataSynchronizationService.RemoveStochasticSoilModel(FailureMechanism, removedObject);
         }
 
         #endregion
@@ -79,10 +79,10 @@
 
         #region Update Data Functions
 
-        protected override IEnumerable<IObservable> UpdateObjectAndDependentData(PipingStochasticSoilModel soilModelToUpdate,
-                                                                                 PipingStochasticSoilModel soilModelToUpdateFrom)
+        protected override IEnumerable<IObservable> UpdateObjectAndDependentData(PipingStochasticSoilModel objectToUpdate,
+                                                                                 PipingStochasticSoilModel objectToUpdateFrom)
         {
-            return UpdateStochasticSoilModel(soilModelToUpdate, soilModelToUpdateFrom);
+            return UpdateStochasticSoilModel(objectToUpdate, objectToUpdateFrom);
         }
 
         private IEnumerable<IObservable> UpdateStochasticSoilModel(PipingStochasticSoilModel modelToUpdate, PipingStochasticSoilModel modelToUpdateFrom)
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs
===================================================================
diff -u -rae6913dc9e65387cd005077a2f056b5cd2fd159f -rdddf5078ebf7731869d1842818a5034f3013abff
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs	(.../PipingSurfaceLineUpdateDataStrategy.cs)	(revision ae6913dc9e65387cd005077a2f056b5cd2fd159f)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/FileImporter/PipingSurfaceLineUpdateDataStrategy.cs	(.../PipingSurfaceLineUpdateDataStrategy.cs)	(revision dddf5078ebf7731869d1842818a5034f3013abff)
@@ -54,9 +54,9 @@
             return UpdateTargetCollectionData(surfaceLines, sourceFilePath);
         }
 
-        protected override IEnumerable<IObservable> RemoveObjectAndDependentData(PipingSurfaceLine removedSurfaceLine)
+        protected override IEnumerable<IObservable> RemoveObjectAndDependentData(PipingSurfaceLine removedObject)
         {
-            return PipingDataSynchronizationService.RemoveSurfaceLine(FailureMechanism, removedSurfaceLine);
+            return PipingDataSynchronizationService.RemoveSurfaceLine(FailureMechanism, removedObject);
         }
 
         /// <summary>
@@ -77,17 +77,17 @@
 
         #region Updating Data Functions
 
-        protected override IEnumerable<IObservable> UpdateObjectAndDependentData(PipingSurfaceLine surfaceLineToUpdate,
-                                                                                 PipingSurfaceLine matchingSurfaceLine)
+        protected override IEnumerable<IObservable> UpdateObjectAndDependentData(PipingSurfaceLine objectToUpdate,
+                                                                                 PipingSurfaceLine objectToUpdateFrom)
         {
-            surfaceLineToUpdate.CopyProperties(matchingSurfaceLine);
+            objectToUpdate.CopyProperties(objectToUpdateFrom);
 
             var affectedObjects = new List<IObservable>();
 
-            affectedObjects.AddRange(UpdateSurfaceLineDependentData(surfaceLineToUpdate));
-            affectedObjects.AddRange(UpdateStochasticSoilModel(surfaceLineToUpdate));
+            affectedObjects.AddRange(UpdateSurfaceLineDependentData(objectToUpdate));
+            affectedObjects.AddRange(UpdateStochasticSoilModel(objectToUpdate));
 
-            ValidateEntryAndExitPoints(surfaceLineToUpdate);
+            ValidateEntryAndExitPoints(objectToUpdate);
 
             return affectedObjects;
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Serializers/Point2DCollectionXmlSerializer.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rdddf5078ebf7731869d1842818a5034f3013abff
--- Riskeer/Storage/src/Riskeer.Storage.Core/Serializers/Point2DCollectionXmlSerializer.cs	(.../Point2DCollectionXmlSerializer.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Serializers/Point2DCollectionXmlSerializer.cs	(.../Point2DCollectionXmlSerializer.cs)	(revision dddf5078ebf7731869d1842818a5034f3013abff)
@@ -33,14 +33,14 @@
     /// </summary>
     internal class Point2DCollectionXmlSerializer : DataCollectionSerializer<Point2D, Point2DCollectionXmlSerializer.SerializablePoint2D>
     {
-        protected override SerializablePoint2D[] ToSerializableData(IEnumerable<Point2D> points)
+        protected override SerializablePoint2D[] ToSerializableData(IEnumerable<Point2D> elements)
         {
-            return points.Select(p => new SerializablePoint2D(p)).ToArray();
+            return elements.Select(p => new SerializablePoint2D(p)).ToArray();
         }
 
-        protected override Point2D[] FromSerializableData(IEnumerable<SerializablePoint2D> pointData)
+        protected override Point2D[] FromSerializableData(IEnumerable<SerializablePoint2D> serializedElements)
         {
-            return pointData.Select(pd => pd.ToPoint2D()).ToArray();
+            return serializedElements.Select(pd => pd.ToPoint2D()).ToArray();
         }
 
         [Serializable]