diff --git a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
index 331b6f354..c3acbdb73 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
@@ -78,7 +78,6 @@ namespace Orchard.ContentManagement.Drivers {
             var fieldName = differentiator ?? String.Empty;
             var partName = part != null ? part.PartDefinition.Name : String.Empty;
             var contentType = part != null ? part.ContentItem.ContentType : String.Empty;
-            var displayType = metadata.DisplayType ?? String.Empty;
             var dynamicType = string.Equals(partName, contentType, StringComparison.Ordinal);
 
             // [ShapeType__FieldName] e.g. Fields/Common.Text-Teaser
@@ -95,11 +94,6 @@ namespace Orchard.ContentManagement.Drivers {
                 metadata.Alternates.Add(shapeType + "__" + contentType + "__" + partName);
             }
 
-            // [ShapeType]_[DisplayType]__[FieldName] e.g. Fields/Common.Text-Teaser.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(fieldName) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + fieldName);
-            }
-
             // [ShapeType]__[PartName]__[FieldName] e.g. Fields/Common.Text-TeaserPart-Teaser
             if ( !string.IsNullOrEmpty(partName) && !string.IsNullOrEmpty(fieldName) ) {
                 metadata.Alternates.Add(shapeType + "__" + partName + "__" + fieldName);
@@ -115,26 +109,6 @@ namespace Orchard.ContentManagement.Drivers {
                 metadata.Alternates.Add(shapeType + "__" + contentType + "__" + partName );
             }
             
-            // [ShapeType]_[DisplayType]__[PartName] e.g. Fields/Common.Text-TeaserPart.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(partName) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + partName);
-            }
-
-            // [ShapeType]_[DisplayType]__[ContentType]__[PartName] e.g. Fields/Common.Text-Blog-TeaserPart.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(contentType) && !string.IsNullOrEmpty(partName) && !dynamicType ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + contentType + "__" + partName);
-            }
-
-            // [ShapeType]_[DisplayType]__[PartName]__[FieldName] e.g. Fields/Common.Text-TeaserPart-Teaser.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(partName) && !string.IsNullOrEmpty(fieldName) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + partName + "__" + fieldName);
-            }
-
-            // [ShapeType]_[DisplayType]__[ContentType]__[PartName]__[FieldName] e.g. Fields/Common.Text-Blog-TeaserPart-Teaser.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(contentType) && !string.IsNullOrEmpty(partName) && !dynamicType && !string.IsNullOrEmpty(fieldName) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + contentType + "__" + partName + "__" + fieldName);
-            }
-
             return shape;
         }
 
diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
index 62657eb85..7ee41c683 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
@@ -57,7 +57,6 @@ namespace Orchard.ContentManagement.Drivers {
             var id = part != null ? part.ContentItem.Id.ToString() : String.Empty;
             var shapeType = metadata.Type;
             var contentType = part != null ? part.ContentItem.ContentType : String.Empty;
-            var displayType = metadata.DisplayType ?? String.Empty;
 
             // [ShapeType]__[Id] e.g. Parts/Common.Metadata-42
             if ( !string.IsNullOrEmpty(id) ) {
@@ -69,21 +68,6 @@ namespace Orchard.ContentManagement.Drivers {
                 metadata.Alternates.Add(shapeType + "__" + contentType);
             }
 
-            // [ShapeType]_[DisplayType] e.g. Parts/Common.Metadata.Summary
-            if ( !string.IsNullOrEmpty(displayType) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType);
-            }
-
-            // [ShapeType]_[DisplayType]__[ContentType] e.g. Parts/Common.Metadata-BlogPost.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(contentType) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + contentType);
-            }
-
-            // [ShapeType]_[DisplayType]__[Id] e.g. Parts/Common.Metadata-42.Summary
-            if ( !string.IsNullOrEmpty(displayType) && !string.IsNullOrEmpty(id) ) {
-                metadata.Alternates.Add(shapeType + "_" + displayType + "__" + id);
-            }
-
             return shape;
         }