diff --git a/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs b/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs
index 11c3e294d..839cf835e 100644
--- a/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs
@@ -9,7 +9,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
             var harvester = new BasicShapeTemplateHarvester();
             var harvestShapeHits = harvester.HarvestShape(new HarvestShapeInfo { SubPath = givenSubPath, FileName = givenFileName });
             Assert.That(harvestShapeHits.Count(), Is.EqualTo(1));
-            Assert.That(harvestShapeHits.Single().ShapeType, Is.EqualTo(expectedShapeType));
+            Assert.That(harvestShapeHits.Single().ShapeType, Is.EqualTo(expectedShapeType).IgnoreCase);
         }
 
         [Test]
diff --git a/src/Orchard.Tests/DisplayManagement/Descriptors/ShapeTemplateBindingStrategyTests.cs b/src/Orchard.Tests/DisplayManagement/Descriptors/ShapeTemplateBindingStrategyTests.cs
index eb35adff9..a7296a601 100644
--- a/src/Orchard.Tests/DisplayManagement/Descriptors/ShapeTemplateBindingStrategyTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/Descriptors/ShapeTemplateBindingStrategyTests.cs
@@ -140,7 +140,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
             strategy.Discover(builder);
             var alterations = alterationBuilders.Select(alterationBuilder=>alterationBuilder.Build());
 
-            Assert.That(alterations.Any(alteration => alteration.ShapeType == "AlphaShape"));
+            Assert.That(alterations.Any(alteration => alteration.ShapeType.Equals("AlphaShape", StringComparison.OrdinalIgnoreCase)));
         }
 
     }
diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs b/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
index 17763f9d8..03f361eb7 100644
--- a/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
+++ b/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
@@ -44,14 +44,14 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy {
             var shapeType = leader + fileName.Replace("--", "__").Replace("-", "__").Replace('.', '_');
 
             if (string.IsNullOrEmpty(displayType)) {
-                return shapeType;
+                return shapeType.ToLowerInvariant();
             }
             var firstBreakingSeparator = shapeType.IndexOf("__");
             if (firstBreakingSeparator <= 0) {
-                return shapeType + "_" + displayType;
+                return (shapeType + "_" + displayType).ToLowerInvariant();
             }
 
-            return shapeType.Substring(0, firstBreakingSeparator) + "_" + displayType + shapeType.Substring(firstBreakingSeparator);
+            return (shapeType.Substring(0, firstBreakingSeparator) + "_" + displayType + shapeType.Substring(firstBreakingSeparator)).ToLowerInvariant();
         }
     }