diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index ac5edffbf3..2ba1de3642 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -183,8 +183,8 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var propertySql = new Sql();
             propertySql.Select("*");
-            propertySql.From("cmsTab");
-            propertySql.RightJoin("cmsPropertyType ON [cmsTab].[id] = [cmsPropertyType].[tabId]");
+            propertySql.From("cmsPropertyTypeGroup");
+            propertySql.RightJoin("cmsPropertyType ON [cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]");
             propertySql.InnerJoin("cmsDataType ON [cmsPropertyType].[dataTypeId] = [cmsDataType].[nodeId]");
             propertySql.Where("[cmsPropertyType].[contentTypeId] = @Id", new { Id = id });
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
index d5fcaa095c..b16df2a4a3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
@@ -121,7 +121,7 @@ namespace Umbraco.Core.Persistence.Repositories
                                string.Format("DELETE FROM cmsTagRelationship WHERE nodeId = @Id"),
                                string.Format("DELETE FROM cmsContentTypeAllowedContentType WHERE Id = @Id"),
                                string.Format("DELETE FROM cmsPropertyType WHERE contentTypeId = @Id"),
-                               string.Format("DELETE FROM cmsTab WHERE contenttypeNodeId = @Id"),
+                               string.Format("DELETE FROM cmsPropertyTypeGroup WHERE contenttypeNodeId = @Id"),
                                string.Format("DELETE FROM cmsDocumentType WHERE contentTypeNodeId = @Id"),
                                string.Format("DELETE FROM cmsContentType WHERE NodeId = @Id"),
                                string.Format("DELETE FROM umbracoNode WHERE id = @Id")
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
index 123b9b6fd1..1f4de5dc09 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
@@ -116,7 +116,7 @@ namespace Umbraco.Core.Persistence.Repositories
                                string.Format("DELETE FROM cmsTagRelationship WHERE nodeId = @Id"),
                                string.Format("DELETE FROM cmsContentTypeAllowedContentType WHERE Id = @Id"),
                                string.Format("DELETE FROM cmsPropertyType WHERE contentTypeId = @Id"),
-                               string.Format("DELETE FROM cmsTab WHERE contenttypeNodeId = @Id"),
+                               string.Format("DELETE FROM cmsPropertyTypeGroup WHERE contenttypeNodeId = @Id"),
                                string.Format("DELETE FROM cmsContentType WHERE NodeId = @Id"),
                                string.Format("DELETE FROM umbracoNode WHERE id = @Id")
                            };