diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
index 17a63f183..f25375e3c 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
@@ -7,10 +7,12 @@ OrchardVersion: 0.8.0
 Description: The Orchard Blogs module is implementing basic blogging features. 
 Features:
     Orchard.Blogs:
+        Name: Blogs
         Description: A simple web log.
         Dependencies: Feeds
         Category: Content
-    Remote Blog Publishing:
+    Orchard.Blogs.RemotePublishing:
+        Name: Remote Blog Publishing
         Description: Blog easier using a dedicated MetaWeblogAPI-compatible publishing tool.
         Dependencies: XmlRpc
         Category: Content Publishing
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
index 59807fd95..c9c94b934 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
@@ -220,8 +220,9 @@ namespace Orchard.Modules.Services {
                     Category = TryLocalize(f.Name + " Category", f.Category, localizer),
                     Dependencies = f.Dependencies,
                     Description = TryLocalize(f.Description + " Description", f.Description, localizer),
+                    DisplayName = string.IsNullOrEmpty(f.DisplayName) ? "" : TryLocalize(f.DisplayName + " Name", f.Description, localizer),
                     Extension = f.Extension,
-                    Name = f.Name
+                    Name = f.Name,
                 })
             };
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
index 06f6d07cb..673f34b24 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
@@ -32,6 +32,7 @@
             foreach (var feature in features) {
                 //hmmm...I feel like I've done this before...
                 var featureId = feature.Descriptor.Name.AsFeatureId(n => T(n));
+                var featureName = string.IsNullOrEmpty(feature.Descriptor.DisplayName) ? feature.Descriptor.Name : feature.Descriptor.DisplayName;
                 var featureState = feature.IsEnabled ? "enabled" : "disabled";
                 var featureClassName = string.Format("feature {0}", featureState + (Model.FeaturesThatNeedUpdate.Contains(feature.Descriptor.Name) ? " update" : String.Empty));
                 if (feature == features.First()) {
@@ -40,10 +41,10 @@
                 if (feature == features.Last()) {
                     featureClassName += " last";
                 }
-            <li class="@featureClassName" id="@featureId" title="@T("{0} is {1}", Html.AttributeEncode(feature.Descriptor.Name), featureState)">
+            <li class="@featureClassName" id="@featureId" title="@T("{0} is {1}", Html.AttributeEncode(featureName), featureState)">
                 <div class="summary">
                     <div class="properties">
-                        <h3>@feature.Descriptor.Name</h3>
+                        <h3>@featureName</h3>
                         <p class="description">@feature.Descriptor.Description</p>@if (feature.Descriptor.Dependencies != null && feature.Descriptor.Dependencies.Any()) {
                         <div class="dependencies">
                             <h4>@T("Depends on:")</h4>
diff --git a/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs b/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
index 8ddc803cb..73d08e7ef 100644
--- a/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
+++ b/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
@@ -143,6 +143,11 @@ namespace Orchard.Environment.Extensions.Folders {
                         Extension = extensionDescriptor,
                         Name = entity.Key.ToString(),
                     };
+
+                    if (featureDescriptor.Name == extensionDescriptor.Name) {
+                        featureDescriptor.DisplayName = extensionDescriptor.DisplayName;
+                    }
+
                     var featureMapping = (Mapping)entity.Value;
                     foreach (var featureEntity in featureMapping.Entities) {
                         if (featureEntity.Key.ToString() == "Description") {
@@ -151,6 +156,9 @@ namespace Orchard.Environment.Extensions.Folders {
                         else if (featureEntity.Key.ToString() == "Category") {
                             featureDescriptor.Category = featureEntity.Value.ToString();
                         }
+                        else if (featureEntity.Key.ToString() == "Name") {
+                            featureDescriptor.DisplayName = featureEntity.Value.ToString();
+                        }
                         else if (featureEntity.Key.ToString() == "Dependencies") {
                             featureDescriptor.Dependencies = ParseFeatureDependenciesEntry(featureEntity.Value.ToString());
                         }
@@ -161,6 +169,7 @@ namespace Orchard.Environment.Extensions.Folders {
             if (!featureDescriptors.Any(fd => fd.Name == extensionDescriptor.Name)) {
                 featureDescriptors.Add(new FeatureDescriptor {
                     Name = extensionDescriptor.Name,
+                    DisplayName = extensionDescriptor.DisplayName,
                     Dependencies = new string[0],
                     Extension = extensionDescriptor
                 });
diff --git a/src/Orchard/Environment/Extensions/Models/FeatureDescriptor.cs b/src/Orchard/Environment/Extensions/Models/FeatureDescriptor.cs
index 57ea77af1..6f25ea09d 100644
--- a/src/Orchard/Environment/Extensions/Models/FeatureDescriptor.cs
+++ b/src/Orchard/Environment/Extensions/Models/FeatureDescriptor.cs
@@ -10,6 +10,7 @@ namespace Orchard.Environment.Extensions.Models {
         public ExtensionDescriptor Extension { get; set; }
 
         public string Name { get; set; }
+        public string DisplayName { get; set; }
         public string Description { get; set; }
         public string Category { get; set; }
         public IEnumerable<string> Dependencies { get; set; }