diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
index 07e5d8824..c63e93ea3 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
@@ -1,4 +1,4 @@
-Name: ArchiveLater
+Name: Archive Later
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
index 85fa9849a..f3a68792e 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
@@ -5,10 +5,12 @@ Website: http://orchardproject.net
 Version: 1.0
 OrchardVersion: 1.0
 Description: Contains designer tools to ease the Themes development process
-Category: Designer
-FeatureDescription: Displays all currently displayed shapes and some information to customize them
-Dependencies: Orchard.jQuery
 Features:
+    Orchard.DesignerTools:
+        Name: Shape Tracing
+        Category: Designer
+        Description: Displays all currently displayed shapes and some information to customize them
+        Dependencies: Orchard.jQuery
     UrlAlternates:
         Name: Url Alternates
         Category: Designer
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
index b36ef0d8d..5cd5d3f57 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
@@ -1,4 +1,4 @@
-Name: ImportExport
+Name: Import Export
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt b/src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
index 37dd0d319..0173fb297 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
@@ -1,4 +1,4 @@
-Name: MediaPicker
+Name: Media Picker
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
index ac4617346..2bf9c28a2 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
@@ -1,4 +1,4 @@
-Name: PublishLater
+Name: Publish Later
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt b/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt
index 1fe630fc7..33deb26a6 100644
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Module.txt
@@ -1,12 +1,9 @@
-Name: Orchard.Warmup
+Name: Warmup
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
 Version: 1.0
 OrchardVersion: 1.0
 Description: Provides a mecanism to generate a static version of pages for being used during application warm up.
-Features:
-    Orchard.Warmup:
-        Description: Generates the static version of specific pages periodically.
-        Name: Warmup
-        Category: Hosting
\ No newline at end of file
+FeatureDescription: Generates the static version of specific pages periodically.
+Category: Hosting
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt b/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
index 38f903ff1..6e1780aef 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
@@ -1,4 +1,4 @@
-Name: Orchard.jQuery
+Name: jQuery
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net