Index: Core/Gui/src/Core.Gui/OpenProjectActivity.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Core/Gui/src/Core.Gui/OpenProjectActivity.cs	(.../OpenProjectActivity.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Core/Gui/src/Core.Gui/OpenProjectActivity.cs	(.../OpenProjectActivity.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -234,7 +234,7 @@
         {
             if (requiredOpenProjectProperties.FilePath == null)
             {
-                throw new ArgumentException(@"Filepath should be set.", nameof(requiredOpenProjectProperties));
+                throw new ArgumentException(@"File path should be set.", nameof(requiredOpenProjectProperties));
             }
 
             if (requiredOpenProjectProperties.ProjectOwner == null)
@@ -278,7 +278,7 @@
         public class OpenProjectConstructionProperties
         {
             /// <summary>
-            /// Filepath to the project file that should be opened.
+            /// File path of the project that should be opened.
             /// </summary>
             public string FilePath { get; set; }
 
Index: Core/Gui/test/Core.Gui.Test/OpenProjectActivityTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Core/Gui/test/Core.Gui.Test/OpenProjectActivityTest.cs	(.../OpenProjectActivityTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Core/Gui/test/Core.Gui.Test/OpenProjectActivityTest.cs	(.../OpenProjectActivityTest.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -97,7 +97,7 @@
             TestDelegate call = () => new OpenProjectActivity(openProjectProperties);
 
             // Assert
-            const string expectedMessage = "Filepath should be set.";
+            const string expectedMessage = "File path should be set.";
             string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage).ParamName;
             Assert.AreEqual("requiredOpenProjectProperties", paramName);
 
Index: Migration/Scripts/test/Migration.Scripts.Data.Test/UpgradeScriptTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Migration/Scripts/test/Migration.Scripts.Data.Test/UpgradeScriptTest.cs	(.../UpgradeScriptTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Migration/Scripts/test/Migration.Scripts.Data.Test/UpgradeScriptTest.cs	(.../UpgradeScriptTest.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -81,7 +81,7 @@
             var upgradeScript = new TestUpgradeScript(fromVersion, toVersion);
 
             // Call
-            TestDelegate call = () => upgradeScript.Upgrade(sourceFilePath, "Filepath.ext");
+            TestDelegate call = () => upgradeScript.Upgrade(sourceFilePath, "filePath.ext");
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
@@ -100,7 +100,7 @@
             var upgradeScript = new TestUpgradeScript(fromVersion, toVersion);
 
             // Call
-            TestDelegate call = () => upgradeScript.Upgrade("Filepath.ext", targetFilePath);
+            TestDelegate call = () => upgradeScript.Upgrade("filePath.ext", targetFilePath);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
===================================================================
diff -u -r325d757ba81cded989c80385d783e76e5aced50c -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision 325d757ba81cded989c80385d783e76e5aced50c)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs	(.../AssemblyGmlWriterTest.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -65,7 +65,7 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var writer = new AssemblyGmlWriter("filepath");
+            var writer = new AssemblyGmlWriter("filePath");
 
             // Assert
             Assert.IsInstanceOf<IDisposable>(writer);
@@ -75,7 +75,7 @@
         public void Write_AssemblyNull_ThrowsArgumentNullException()
         {
             // Setup
-            using (var writer = new AssemblyGmlWriter("filepath"))
+            using (var writer = new AssemblyGmlWriter("filePath"))
             {
                 // Call
                 void Call() => writer.Write(null);
Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/ProfilesImporter.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/ProfilesImporter.cs	(.../ProfilesImporter.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/ProfilesImporter.cs	(.../ProfilesImporter.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -173,7 +173,7 @@
         /// Validate the consistency of a <see cref="DikeProfileData"/> object.
         /// </summary>
         /// <param name="data">The <see cref="DikeProfileData"/> to validate.</param>
-        /// <param name="prflFilePath">Filepath of the profile data file.</param>
+        /// <param name="prflFilePath">File path of the profile data.</param>
         /// <returns>Value indicating whether the <see cref="DikeProfileData"/> is valid.</returns>
         protected abstract bool DikeProfileDataIsValid(DikeProfileData data, string prflFilePath);
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs	(.../AssessmentSectionMergerTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs	(.../AssessmentSectionMergerTest.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -265,7 +265,7 @@
         public void GivenMatchedAssessmentSection_WhenAllDataValid_ThenMergePerformedAndLogged()
         {
             // Given
-            var filePath = "Filepath";
+            const string filePath = "filePath";
             var originalAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             var assessmentSectionToMerge = new AssessmentSection(AssessmentSectionComposition.Dike);
             var mergeData = new AssessmentSectionMergeData(assessmentSectionToMerge, CreateDefaultConstructionProperties());
Index: Riskeer/Migration/src/Riskeer.Migration/ProjectMigrator.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/Migration/src/Riskeer.Migration/ProjectMigrator.cs	(.../ProjectMigrator.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Migration/src/Riskeer.Migration/ProjectMigrator.cs	(.../ProjectMigrator.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -158,7 +158,7 @@
             {
                 var versionedFile = new ProjectVersionedFile(sourceFilePath);
                 fileMigrator.Migrate(versionedFile, currentDatabaseVersion, targetLocation);
-                string message = string.Format(Resources.ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_updated_to_target_filepath_1_version_2_,
+                string message = string.Format(Resources.ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_updated_to_target_file_path_1_version_2_,
                                                sourceFilePath, targetLocation, currentDatabaseVersion);
                 log.Info(message);
 
@@ -259,7 +259,7 @@
         {
             if (!IOUtils.IsValidFilePath(filePath))
             {
-                string message = string.Format(Resources.ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_filepath_must_be_a_valid_path,
+                string message = string.Format(Resources.ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_file_path_must_be_valid,
                                                pathDescription);
                 throw new ArgumentException(message, argumentName);
             }
Index: Riskeer/Migration/src/Riskeer.Migration/Properties/Resources.Designer.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/Migration/src/Riskeer.Migration/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Migration/src/Riskeer.Migration/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -134,10 +134,10 @@
         /// <summary>
         ///   Looks up a localized string similar to Het projectbestand &apos;{0}&apos; is succesvol gemigreerd naar &apos;{1}&apos; (versie {2})..
         /// </summary>
-        internal static string ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_updated_to_target_filepath_1_version_2_ {
+        internal static string ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_updated_to_target_file_path_1_version_2_ {
             get {
                 return ResourceManager.GetString("ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_update" +
-                        "d_to_target_filepath_1_version_2_", resourceCulture);
+                        "d_to_target_file_path_1_version_2_", resourceCulture);
             }
         }
         
@@ -182,10 +182,9 @@
         /// <summary>
         ///   Looks up a localized string similar to {0}projectpad moet een geldig projectpad zijn..
         /// </summary>
-        internal static string ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_filepath_must_be_a_valid_path {
+        internal static string ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_file_path_must_be_valid {
             get {
-                return ResourceManager.GetString("ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_filepath_must_be_a_valid_pat" +
-                        "h", resourceCulture);
+                return ResourceManager.GetString("ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_file_path_must_be_valid", resourceCulture);
             }
         }
         
Index: Riskeer/Migration/src/Riskeer.Migration/Properties/Resources.resx
===================================================================
diff -u -r1afde6ab67aa8c34134d442243487f0704cad3d0 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/Migration/src/Riskeer.Migration/Properties/Resources.resx	(.../Resources.resx)	(revision 1afde6ab67aa8c34134d442243487f0704cad3d0)
+++ Riskeer/Migration/src/Riskeer.Migration/Properties/Resources.resx	(.../Resources.resx)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -128,7 +128,7 @@
   <data name="Project_TypeDescription" xml:space="preserve">
     <value>Riskeer project</value>
   </data>
-  <data name="ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_updated_to_target_filepath_1_version_2_" xml:space="preserve">
+  <data name="ProjectMigrator_MigrateToTargetLocation_Outdated_projectfile_0_succesfully_updated_to_target_file_path_1_version_2_" xml:space="preserve">
     <value>Het projectbestand '{0}' is succesvol gemigreerd naar '{1}' (versie {2}).</value>
   </data>
   <data name="ProjectMigrator_MigrateToTargetLocation_Updating_outdated_projectfile_0_failed_with_exception_1_" xml:space="preserve">
@@ -137,7 +137,7 @@
   <data name="ProjectMigrator_GenerateMigrationCancelledLogMessage_Updating_projectfile_0_was_cancelled" xml:space="preserve">
     <value>Het migreren van het projectbestand '{0}' is geannuleerd.</value>
   </data>
-  <data name="ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_filepath_must_be_a_valid_path" xml:space="preserve">
+  <data name="ProjectMigrator_ValidateProjectPath_TypeDescriptor_0_file_path_must_be_valid" xml:space="preserve">
     <value>{0}projectpad moet een geldig projectpad zijn.</value>
   </data>
   <data name="ProjectMigrator_Source_Descriptor" xml:space="preserve">
Index: Riskeer/Storage/src/Riskeer.Storage.Core/FingerprintHelper.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfaf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0
--- Riskeer/Storage/src/Riskeer.Storage.Core/FingerprintHelper.cs	(.../FingerprintHelper.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/FingerprintHelper.cs	(.../FingerprintHelper.cs)	(revision faf9540f452b6a8cd9fe8976eb3fb42b05a6f7d0)
@@ -99,7 +99,7 @@
         /// <see cref="ProjectEntity"/>.
         /// </summary>
         /// <param name="entity">The <see cref="ProjectEntity"/> to generate a hashcode for.</param>
-        /// <param name="filePath">The filepath to use as temporary storage.</param>
+        /// <param name="filePath">The file path to use as temporary storage.</param>
         /// <returns>The binary hashcode for <paramref name="entity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="entity"/> is <c>null</c>.</exception>
         /// <exception cref="QuotaExceededException">Thrown when <paramref name="entity"/>