Index: Application/Riskeer/src/Application.Riskeer.Migration.Console/RiskeerMigrationConsole.cs
===================================================================
diff -u -r118e48039447bf16cc83a2adba517c20da8e06c8 -r5510a4be6813a41be00191a152b9ecd64b2207c1
--- Application/Riskeer/src/Application.Riskeer.Migration.Console/RiskeerMigrationConsole.cs	(.../RiskeerMigrationConsole.cs)	(revision 118e48039447bf16cc83a2adba517c20da8e06c8)
+++ Application/Riskeer/src/Application.Riskeer.Migration.Console/RiskeerMigrationConsole.cs	(.../RiskeerMigrationConsole.cs)	(revision 5510a4be6813a41be00191a152b9ecd64b2207c1)
@@ -82,8 +82,8 @@
         {
             ValidateIsVersionSupportedArgument(location);
 
-            var versionedFile = new RingtoetsVersionedFile(location);
-            var migrator = new RingtoetsSqLiteDatabaseFileMigrator();
+            var versionedFile = new ProjectVersionedFile(location);
+            var migrator = new ProjectFileMigrator();
             string version = versionedFile.GetVersion();
 
             bool isSupported = migrator.IsVersionSupported(version);
@@ -116,8 +116,8 @@
         private static void MigrateCommand(string filePath, string toFilePath)
         {
             ValidateMigrationArguments(filePath, toFilePath);
-            var migrator = new RingtoetsSqLiteDatabaseFileMigrator();
-            var sourceFile = new RingtoetsVersionedFile(filePath);
+            var migrator = new ProjectFileMigrator();
+            var sourceFile = new ProjectVersionedFile(filePath);
 
             migrator.Migrate(sourceFile, currentDatabaseVersion, toFilePath);
             System.Console.WriteLine(Resources.CommandMigrate_Successful_Migration_From_Location_0_To_Location_1_Version_2,
Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -r118e48039447bf16cc83a2adba517c20da8e06c8 -r5510a4be6813a41be00191a152b9ecd64b2207c1
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 118e48039447bf16cc83a2adba517c20da8e06c8)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 5510a4be6813a41be00191a152b9ecd64b2207c1)
@@ -154,7 +154,7 @@
                 ManualFilePath = "..\\Gebruikershandleiding Ringtoets 18.1.1.pdf"
             };
             var mainWindow = new MainWindow();
-            var projectMigrator = new RingtoetsProjectMigrator(new DialogBasedInquiryHelper(mainWindow));
+            var projectMigrator = new ProjectMigrator(new DialogBasedInquiryHelper(mainWindow));
             gui = new GuiCore(mainWindow, new StorageSqLite(), projectMigrator, new RingtoetsProjectFactory(), settings)
             {
                 Plugins =
Index: Application/Riskeer/test/Application.Riskeer.Migration.Console.Test/RiskeerMigrationConsoleTest.cs
===================================================================
diff -u -r118e48039447bf16cc83a2adba517c20da8e06c8 -r5510a4be6813a41be00191a152b9ecd64b2207c1
--- Application/Riskeer/test/Application.Riskeer.Migration.Console.Test/RiskeerMigrationConsoleTest.cs	(.../RiskeerMigrationConsoleTest.cs)	(revision 118e48039447bf16cc83a2adba517c20da8e06c8)
+++ Application/Riskeer/test/Application.Riskeer.Migration.Console.Test/RiskeerMigrationConsoleTest.cs	(.../RiskeerMigrationConsoleTest.cs)	(revision 5510a4be6813a41be00191a152b9ecd64b2207c1)
@@ -165,7 +165,7 @@
         public void GivenConsole_WhenMigrateCalledWithArguments_MigratesToNewVersion()
         {
             // Given
-            string sourceFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
+            string sourceFilePath = ProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
             string targetFilePath = TestHelper.GetScratchPadPath($"{nameof(RiskeerMigrationConsoleTest)}.{nameof(GivenConsole_WhenMigrateCalledWithArguments_MigratesToNewVersion)}");
             var console = new RiskeerMigrationConsole();
             string expectedVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
@@ -188,7 +188,7 @@
                     string consoleText = consoleOutput.GetConsoleOutput();
                     Assert.AreEqual(expected, consoleText);
 
-                    var toVersionedFile = new RingtoetsVersionedFile(targetFilePath);
+                    var toVersionedFile = new ProjectVersionedFile(targetFilePath);
                     Assert.AreEqual(expectedVersion, toVersionedFile.GetVersion());
                 }
             }
@@ -200,7 +200,7 @@
         public void GivenConsole_WhenMigrateCalledUnableToSaveTarget_ThenExitWithErrorCode()
         {
             // Given
-            string sourceFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
+            string sourceFilePath = ProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
             string targetFilePath = TestHelper.GetScratchPadPath($"{nameof(RiskeerMigrationConsoleTest)}.{nameof(GivenConsole_WhenMigrateCalledUnableToSaveTarget_ThenExitWithErrorCode)}");
 
             var console = new RiskeerMigrationConsole();
@@ -257,12 +257,12 @@
 
         private static IEnumerable<TestCaseData> RingtoetsFilesToMigrate()
         {
-            string unsupportedProjectFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedUnSupportedProjectFilePath();
-            var unsupportedVersionedFile = new RingtoetsVersionedFile(unsupportedProjectFilePath);
+            string unsupportedProjectFilePath = ProjectMigrationTestHelper.GetOutdatedUnSupportedProjectFilePath();
+            var unsupportedVersionedFile = new ProjectVersionedFile(unsupportedProjectFilePath);
             string unsupportedVersion = unsupportedVersionedFile.GetVersion();
 
-            string supportedProjectFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
-            var supportedVersionedFile = new RingtoetsVersionedFile(supportedProjectFilePath);
+            string supportedProjectFilePath = ProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
+            var supportedVersionedFile = new ProjectVersionedFile(supportedProjectFilePath);
             string supportedVersion = supportedVersionedFile.GetVersion();
 
             yield return new TestCaseData(unsupportedProjectFilePath, unsupportedVersion, false).SetName("UnsupportedRingtoetsVersion");
Index: Application/Riskeer/test/Application.Riskeer.Migration.Console.Test/RiskeerMigrationToolTest.cs
===================================================================
diff -u -r118e48039447bf16cc83a2adba517c20da8e06c8 -r5510a4be6813a41be00191a152b9ecd64b2207c1
--- Application/Riskeer/test/Application.Riskeer.Migration.Console.Test/RiskeerMigrationToolTest.cs	(.../RiskeerMigrationToolTest.cs)	(revision 118e48039447bf16cc83a2adba517c20da8e06c8)
+++ Application/Riskeer/test/Application.Riskeer.Migration.Console.Test/RiskeerMigrationToolTest.cs	(.../RiskeerMigrationToolTest.cs)	(revision 5510a4be6813a41be00191a152b9ecd64b2207c1)
@@ -125,7 +125,7 @@
         public void GivenConsole_WhenMigrateCalledWithArguments_MigratesToNewVersion()
         {
             // Given
-            string sourceFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
+            string sourceFilePath = ProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
             string targetFilePath = TestHelper.GetScratchPadPath($"{nameof(RiskeerMigrationToolTest)}.{nameof(GivenConsole_WhenMigrateCalledWithArguments_MigratesToNewVersion)}");
             string expectedVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
 
@@ -147,7 +147,7 @@
                                       + $"'{targetFilePath}' (versie {expectedVersion})."
                                       + Environment.NewLine;
                     Assert.AreEqual(expected, consoleText);
-                    var toVersionedFile = new RingtoetsVersionedFile(targetFilePath);
+                    var toVersionedFile = new ProjectVersionedFile(targetFilePath);
                     Assert.AreEqual(expectedVersion, toVersionedFile.GetVersion());
                 }
             }
@@ -159,7 +159,7 @@
         public void GivenConsole_WhenMigrateCalledUnableToSaveTarget_ThenExitWithErrorCode()
         {
             // Given
-            string sourceFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
+            string sourceFilePath = ProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
             string targetFilePath = TestHelper.GetScratchPadPath($"{nameof(RiskeerMigrationToolTest)}.{nameof(GivenConsole_WhenMigrateCalledUnableToSaveTarget_ThenExitWithErrorCode)}");
 
             using (var fileDisposeHelper = new FileDisposeHelper(targetFilePath))
@@ -216,12 +216,12 @@
 
         private static IEnumerable<TestCaseData> RingtoetsFilesToMigrate()
         {
-            string unsupportedProjectFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedUnSupportedProjectFilePath();
-            var unsupportedVersionedFile = new RingtoetsVersionedFile(unsupportedProjectFilePath);
+            string unsupportedProjectFilePath = ProjectMigrationTestHelper.GetOutdatedUnSupportedProjectFilePath();
+            var unsupportedVersionedFile = new ProjectVersionedFile(unsupportedProjectFilePath);
             string unsupportedVersion = unsupportedVersionedFile.GetVersion();
 
-            string supportedProjectFilePath = RingtoetsProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
-            var supportedVersionedFile = new RingtoetsVersionedFile(supportedProjectFilePath);
+            string supportedProjectFilePath = ProjectMigrationTestHelper.GetOutdatedSupportedProjectFilePath();
+            var supportedVersionedFile = new ProjectVersionedFile(supportedProjectFilePath);
             string supportedVersion = supportedVersionedFile.GetVersion();
 
             yield return new TestCaseData(unsupportedProjectFilePath, unsupportedVersion, false).SetName("UnsupportedRingtoetsVersion");