diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentDto.cs
index 32e95fcc78..aae5d0d407 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentDto.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Dtos
     [ExplicitColumns]
     internal class ContentDto
     {
-        private const string TableName = Constants.DatabaseSchema.Tables.Content;
+        public const string TableName = Constants.DatabaseSchema.Tables.Content;
 
         [Column("nodeId")]
         [PrimaryKeyColumn(AutoIncrement = false)]
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
index 0cfc53eead..d930abc54c 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs
@@ -3,11 +3,13 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 
 namespace Umbraco.Core.Persistence.Dtos
 {
-    [TableName(Constants.DatabaseSchema.Tables.ContentType)]
+    [TableName(TableName)]
     [PrimaryKey("pk")]
     [ExplicitColumns]
     internal class ContentTypeDto
     {
+        public const string TableName = Constants.DatabaseSchema.Tables.ContentType;
+
         [Column("pk")]
         [PrimaryKeyColumn(IdentitySeed = 535)]
         public int PrimaryKey { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
index 13b7c30d45..7a6ab94b47 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Dtos
     [ExplicitColumns]
     internal class ContentVersionDto
     {
-        private const string TableName = Constants.DatabaseSchema.Tables.ContentVersion;
+        public const string TableName = Constants.DatabaseSchema.Tables.ContentVersion;
 
         [Column("id")]
         [PrimaryKeyColumn]
diff --git a/src/Umbraco.Core/Persistence/Dtos/DocumentCultureVariationDto.cs b/src/Umbraco.Core/Persistence/Dtos/DocumentCultureVariationDto.cs
index be4cf7c023..78e819e714 100644
--- a/src/Umbraco.Core/Persistence/Dtos/DocumentCultureVariationDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/DocumentCultureVariationDto.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Dtos
     [ExplicitColumns]
     internal class DocumentCultureVariationDto
     {
-        private const string TableName = Constants.DatabaseSchema.Tables.DocumentCultureVariation;
+        public const string TableName = Constants.DatabaseSchema.Tables.DocumentCultureVariation;
 
         [Column("id")]
         [PrimaryKeyColumn]
diff --git a/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs b/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
index 78e5670830..12c9fd0bd4 100644
--- a/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
@@ -3,11 +3,13 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 
 namespace Umbraco.Core.Persistence.Dtos
 {
-    [TableName(Constants.DatabaseSchema.Tables.Language)]
+    [TableName(TableName)]
     [PrimaryKey("id")]
     [ExplicitColumns]
     internal class LanguageDto
     {
+        public const string TableName = Constants.DatabaseSchema.Tables.Language;
+
         [Column("id")]
         [PrimaryKeyColumn(IdentitySeed = 2)]
         public short Id { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Dtos/MediaVersionDto.cs b/src/Umbraco.Core/Persistence/Dtos/MediaVersionDto.cs
index e27a99a2ae..f71b3149cf 100644
--- a/src/Umbraco.Core/Persistence/Dtos/MediaVersionDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/MediaVersionDto.cs
@@ -3,15 +3,17 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 
 namespace Umbraco.Core.Persistence.Dtos
 {
-    [TableName(Constants.DatabaseSchema.Tables.MediaVersion)]
+    [TableName(TableName)]
     [PrimaryKey("id", AutoIncrement = false)]
     [ExplicitColumns]
     internal class MediaVersionDto
     {
+        public const string TableName = Constants.DatabaseSchema.Tables.MediaVersion;
+
         [Column("id")]
         [PrimaryKeyColumn(AutoIncrement = false)]
         [ForeignKey(typeof(ContentVersionDto))]
-        [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + Constants.DatabaseSchema.Tables.MediaVersion, ForColumns = "id, path")]
+        [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName, ForColumns = "id, path")]
         public int Id { get; set; }
 
         [Column("path")]
diff --git a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
index 38e8ed0900..924f7ea301 100644
--- a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Dtos
     [ExplicitColumns]
     internal class NodeDto
     {
-        private const string TableName = Constants.DatabaseSchema.Tables.Node;
+        public const string TableName = Constants.DatabaseSchema.Tables.Node;
         public const int NodeIdSeed = 1060;
 
         [Column("id")]
diff --git a/src/Umbraco.Core/Persistence/Dtos/UserDto.cs b/src/Umbraco.Core/Persistence/Dtos/UserDto.cs
index c6cc889ab0..028b760ba5 100644
--- a/src/Umbraco.Core/Persistence/Dtos/UserDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/UserDto.cs
@@ -6,11 +6,13 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Core.Persistence.Dtos
 {
-    [TableName(Constants.DatabaseSchema.Tables.User)]
+    [TableName(TableName)]
     [PrimaryKey("id", AutoIncrement = true)]
     [ExplicitColumns]
     internal class UserDto
     {
+        public const string TableName = Constants.DatabaseSchema.Tables.User;
+
         public UserDto()
         {
             UserGroupDtos = new List<UserGroupDto>();
diff --git a/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs b/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
index 86d306b06a..e03efa8fe9 100644
--- a/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
@@ -4,17 +4,19 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 
 namespace Umbraco.Core.Persistence.Dtos
 {
-    [TableName(Constants.DatabaseSchema.Tables.UserLogin)]
+    [TableName(TableName)]
     [PrimaryKey("sessionId", AutoIncrement = false)]
     [ExplicitColumns]
     internal class UserLoginDto
     {
+        public const string TableName = Constants.DatabaseSchema.Tables.UserLogin;
+
         [Column("sessionId")]
         [PrimaryKeyColumn(AutoIncrement = false)]
         public Guid SessionId { get; set; }
 
         [Column("userId")]
-        [ForeignKey(typeof(UserDto), Name = "FK_" + Constants.DatabaseSchema.Tables.UserLogin + "_umbracoUser_id")]
+        [ForeignKey(typeof(UserDto), Name = "FK_" + TableName + "_umbracoUser_id")]
         public int UserId { get; set; }
 
         /// <summary>