diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 1583087ac7..495ec0d2a3 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -1,9 +1,12 @@
 using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations.Upgrade.TargetVersionEight;
-using Umbraco.Core.Migrations.Upgrade.TargetVersionSevenFiveFive;
-using Umbraco.Core.Migrations.Upgrade.TargetVersionSevenFiveZero;
-using Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero;
-using Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero;
+using Umbraco.Core.Migrations.Upgrade.V_7_5_0;
+using Umbraco.Core.Migrations.Upgrade.V_7_5_5;
+using Umbraco.Core.Migrations.Upgrade.V_7_6_0;
+using Umbraco.Core.Migrations.Upgrade.V_7_7_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
+using AddLockObjects = Umbraco.Core.Migrations.Upgrade.V_8_0_0.AddLockObjects;
+using AddLockTable = Umbraco.Core.Migrations.Upgrade.V_8_0_0.AddLockTable;
+using UpdateUniqueIndexOnPropertyData = Umbraco.Core.Migrations.Upgrade.V_7_5_0.UpdateUniqueIndexOnPropertyData;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -36,7 +39,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             // set to {init-7.x.y} where 7.x.y is the version, detected from the database.
 
             From("{init-7.8.0}")
-                .Chain<TargetVersionEight.AddLockObjects>("{7C447271-CA3F-4A6A-A913-5D77015655CB}") // add more lock objects
+                .Chain<AddLockObjects>("{7C447271-CA3F-4A6A-A913-5D77015655CB}") // add more lock objects
                 .Chain<AddContentNuTable>("{CBFF58A2-7B50-4F75-8E98-249920DB0F37}")
                 .Chain<RefactorXmlColumns>("{3D18920C-E84D-405C-A06A-B7CEE52FE5DD}")
                 .Chain<VariantsMigration>("{6550C7E8-77B7-4DE3-9B58-E31C81CB9504}");
@@ -73,14 +76,14 @@ namespace Umbraco.Core.Migrations.Upgrade
 
             // 8.0.0
             From("{init-origin}");
-            Chain<TargetVersionEight.AddLockTable>("{98347B5E-65BF-4DD7-BB43-A09CB7AF4FCA}");
-            Chain<TargetVersionEight.AddLockObjects>("{1E8165C4-942D-40DC-AC76-C5FF8831E400}");
+            Chain<AddLockTable>("{98347B5E-65BF-4DD7-BB43-A09CB7AF4FCA}");
+            Chain<AddLockObjects>("{1E8165C4-942D-40DC-AC76-C5FF8831E400}");
             Chain<AddContentNuTable>("{39E15568-7AAD-4D54-81D0-758CCFC529F8}");
             Chain<RefactorXmlColumns>("{55C3F97D-BDA7-4FB1-A743-B0456B56EAA3}");
 
             // 7.5.0
             Chain<RemoveStylesheetDataAndTablesAgain>("{287F9E39-F673-42F7-908C-21659AB13B13}");
-            Chain<TargetVersionSevenFiveZero.UpdateUniqueIndexOnPropertyData>("{2D08588A-AD90-479C-9F6E-A99B60BA7226}");
+            Chain<UpdateUniqueIndexOnPropertyData>("{2D08588A-AD90-479C-9F6E-A99B60BA7226}");
             Chain<AddRedirectUrlTable>("{2D917FF8-AC81-4C00-A407-1F4B1DF6089C}");
 
             // 7.5.5
@@ -96,7 +99,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             Chain<AddRelationTypeUniqueIdColumn>("{7C27E310-CF48-4637-A22E-8D87355161C1}");
             Chain<NormalizeTemplateGuids>("{7D2ABA16-EE48-4569-8827-E81370FC4871}");
             Chain<ReduceLoginNameColumnsSize>("{02879EDF-13A8-43AF-87A5-DD85723D0016}");
-            Chain<TargetVersionSevenSixZero.UpdateUniqueIndexOnPropertyData>("{5496C6CC-3AE0-4789-AF49-5BB4E28FA424}");
+            Chain<V_7_6_0.UpdateUniqueIndexOnPropertyData>("{5496C6CC-3AE0-4789-AF49-5BB4E28FA424}");
             Chain<RemoveUmbracoDeployTables>("{8995332B-085E-4C0C-849E-9A77E79F4293}");
 
             // 7.7.0
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/AddRedirectUrlTable.cs
similarity index 96%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/AddRedirectUrlTable.cs
index bd3f5e1b28..7040874a74 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/AddRedirectUrlTable.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenFiveZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_5_0
 {
     public class AddRedirectUrlTable : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/RemoveStylesheetDataAndTablesAgain.cs
similarity index 94%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/RemoveStylesheetDataAndTablesAgain.cs
index 162d27fbaf..77fb24ddbc 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/RemoveStylesheetDataAndTablesAgain.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenFiveZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_5_0
 {
     /// <summary>
     /// This is here to re-remove these tables, we dropped them in 7.3 but new installs created them again so we're going to re-drop them
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/UpdateUniqueIndexOnPropertyData.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs
similarity index 97%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/UpdateUniqueIndexOnPropertyData.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs
index 834d7b45b7..73f03e96c6 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveZero/UpdateUniqueIndexOnPropertyData.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenFiveZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_5_0
 {
     /// <summary>
     /// See: http://issues.umbraco.org/issue/U4-8522
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveFive/UpdateAllowedMediaTypesAtRoot.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_5/UpdateAllowedMediaTypesAtRoot.cs
similarity index 86%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveFive/UpdateAllowedMediaTypesAtRoot.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_5_5/UpdateAllowedMediaTypesAtRoot.cs
index 6d688284b0..362b8e251c 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenFiveFive/UpdateAllowedMediaTypesAtRoot.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_5/UpdateAllowedMediaTypesAtRoot.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenFiveFive
+namespace Umbraco.Core.Migrations.Upgrade.V_7_5_5
 {
     /// <summary>
     /// See: http://issues.umbraco.org/issue/U4-4196
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs
similarity index 95%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs
index 5e4ee164e7..05abc5ec83 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddIndexToCmsMemberLoginName : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToUmbracoNodePath.cs
similarity index 92%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToUmbracoNodePath.cs
index b04996d05c..191f410b47 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToUmbracoNodePath.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddIndexToUmbracoNodePath : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToUser2NodePermission.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToUser2NodePermission.cs
similarity index 92%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToUser2NodePermission.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToUser2NodePermission.cs
index eee7f192e1..87b392b09c 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexToUser2NodePermission.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToUser2NodePermission.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddIndexToUser2NodePermission : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexesToUmbracoRelationTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs
similarity index 98%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexesToUmbracoRelationTables.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs
index fc2cc7612c..17dd060376 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddIndexesToUmbracoRelationTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddIndexesToUmbracoRelationTables : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddLockObjects.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddLockObjects.cs
similarity index 92%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddLockObjects.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddLockObjects.cs
index 1b5c96b9fb..012afa4f11 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddLockObjects.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddLockObjects.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Models.Rdbms;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddLockObjects : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddLockTable.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddLockTable.cs
similarity index 91%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddLockTable.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddLockTable.cs
index 968bff934d..369bda0758 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddLockTable.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddLockTable.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionEight
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddLockTable : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddMacroUniqueIdColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddMacroUniqueIdColumn.cs
similarity index 97%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddMacroUniqueIdColumn.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddMacroUniqueIdColumn.cs
index d4f54f830b..82888ab970 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddMacroUniqueIdColumn.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddMacroUniqueIdColumn.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddMacroUniqueIdColumn : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddRelationTypeUniqueIdColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddRelationTypeUniqueIdColumn.cs
similarity index 96%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddRelationTypeUniqueIdColumn.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddRelationTypeUniqueIdColumn.cs
index e77b7b9e6e..e166a4582d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddRelationTypeUniqueIdColumn.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddRelationTypeUniqueIdColumn.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class AddRelationTypeUniqueIdColumn : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/NormalizeTemplateGuids.cs
similarity index 94%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/NormalizeTemplateGuids.cs
index 7a315d2b32..9e8c739104 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/NormalizeTemplateGuids.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
-using Umbraco.Core.Exceptions;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class NormalizeTemplateGuids : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/ReduceLoginNameColumnsSize.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs
similarity index 96%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/ReduceLoginNameColumnsSize.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs
index 8a4825d7d0..30ee91300d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/ReduceLoginNameColumnsSize.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class ReduceLoginNameColumnsSize : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/RemovePropertyDataIdIndex.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/RemovePropertyDataIdIndex.cs
similarity index 92%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/RemovePropertyDataIdIndex.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/RemovePropertyDataIdIndex.cs
index 7ab6e04b01..804714d1ff 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/RemovePropertyDataIdIndex.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/RemovePropertyDataIdIndex.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     /// <summary>
     /// See: http://issues.umbraco.org/issue/U4-9188
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/RemoveUmbracoDeployTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/RemoveUmbracoDeployTables.cs
similarity index 91%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/RemoveUmbracoDeployTables.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/RemoveUmbracoDeployTables.cs
index 7a8a204807..744b441b32 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/RemoveUmbracoDeployTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/RemoveUmbracoDeployTables.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Linq;
+using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
 {
     public class RemoveUmbracoDeployTables : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddIndexToDictionaryKeyColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs
similarity index 95%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddIndexToDictionaryKeyColumn.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs
index c372f44ead..700702204c 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddIndexToDictionaryKeyColumn.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
 {
     public class AddIndexToDictionaryKeyColumn : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddUserGroupTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs
similarity index 99%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddUserGroupTables.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs
index c08093f9f5..686f5cc66e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddUserGroupTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
 {
     public class AddUserGroupTables : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddUserStartNodeTable.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserStartNodeTable.cs
similarity index 95%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddUserStartNodeTable.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserStartNodeTable.cs
index 452083b33c..4e5fd9fc2e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/AddUserStartNodeTable.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserStartNodeTable.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Models.Rdbms;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
 {
     public class AddUserStartNodeTable : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/EnsureContentTemplatePermissions.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/EnsureContentTemplatePermissions.cs
similarity index 94%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/EnsureContentTemplatePermissions.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/EnsureContentTemplatePermissions.cs
index 7acf720ad6..68b6b1ac58 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/EnsureContentTemplatePermissions.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/EnsureContentTemplatePermissions.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
 {
     /// <summary>
     /// Ensures the built-in user groups have the blueprint permission by default on upgrade
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/ReduceDictionaryKeyColumnsSize.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs
similarity index 95%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/ReduceDictionaryKeyColumnsSize.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs
index 5017b122f9..9f84320620 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/ReduceDictionaryKeyColumnsSize.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
 {
     public class ReduceDictionaryKeyColumnsSize : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/UpdateUserTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs
similarity index 97%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/UpdateUserTables.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs
index 85d96893cc..3714427cd7 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSevenZero/UpdateUserTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs
@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Security;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSevenZero
+namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
 {
     public class UpdateUserTables : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddContentNuTable.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs
similarity index 95%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddContentNuTable.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs
index 49573295b7..efa54a0f59 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddContentNuTable.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionEight
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     class AddContentNuTable : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddLockObjects.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddLockObjects.cs
similarity index 95%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddLockObjects.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddLockObjects.cs
index 4ae7304076..f5f06077e2 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/AddLockObjects.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddLockObjects.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Models.Rdbms;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionEight
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     public class AddLockObjects : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddLockTable.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddLockTable.cs
similarity index 91%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddLockTable.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddLockTable.cs
index e76fe152c8..aa14bc81c8 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionSevenSixZero/AddLockTable.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddLockTable.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionSevenSixZero
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     public class AddLockTable : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/RefactorXmlColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
similarity index 98%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/RefactorXmlColumns.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
index ed4d936e9c..8b85d6992e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/RefactorXmlColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionEight
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     public class RefactorXmlColumns : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/VariantsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs
similarity index 99%
rename from src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/VariantsMigration.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs
index 16dbff645a..8de85db222 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/TargetVersionEight/VariantsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
-namespace Umbraco.Core.Migrations.Upgrade.TargetVersionEight
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     public class VariantsMigration : MigrationBase
     {