diff --git a/src/Orchard.Profile/Readme.txt b/src/Orchard.Profile/Readme.txt
index 69663946b..b9c1b967e 100644
--- a/src/Orchard.Profile/Readme.txt
+++ b/src/Orchard.Profile/Readme.txt
@@ -6,7 +6,7 @@ From the base of the checkout, execute
 
 * the ./orchard.proj creates an orchard web site at ./build/Profiling
 * the ./src/Orchard.Profile/profiling-setup-commands.txt holds the additional orchard.exe steps used to initialize
-* the ./src/Orchard.DevTools/Commands/ProfilingCommands.cs holds an additional handful of steps to populate items
+* the ./src/Orchard.Experimental/Commands/ProfilingCommands.cs holds an additional handful of steps to populate items
 
 The localhost:80 web server should be pointed to the ./build/Profiling folder at this point
 The "admin" password is "profiling-secret" without quotes
diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt
index e92196cf8..20adbea21 100644
--- a/src/Orchard.Profile/profiling-setup-commands.txt
+++ b/src/Orchard.Profile/profiling-setup-commands.txt
@@ -1,3 +1,3 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
 add profiling data
-feature disable Orchard.DevTools
+feature disable Orchard.Experimental
diff --git a/src/Orchard.Tests/DataMigration/SchemaCommandGeneratorTests.cs b/src/Orchard.Tests/DataMigration/SchemaCommandGeneratorTests.cs
index 880e00e28..15ac31daf 100644
--- a/src/Orchard.Tests/DataMigration/SchemaCommandGeneratorTests.cs
+++ b/src/Orchard.Tests/DataMigration/SchemaCommandGeneratorTests.cs
@@ -1,5 +1,5 @@
 #if REFACTORING
-#error This must move to the Modules tests to accomodateOrchard.DevTools assembly reference
+#error This must move to the Modules tests to accomodateOrchard.Experimental assembly reference
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -114,7 +114,7 @@ features:
         }
 
         public class StubLoaders : IExtensionLoader {
-            #region Implementation of IExtensionLoader
+#region Implementation of IExtensionLoader
 
             public int Order {
                 get { return 1; }
diff --git a/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po b/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
index a1e053307..6292d7d71 100644
--- a/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
+++ b/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
@@ -498,77 +498,77 @@ msgstr "Allow new comments"
 msgid "Enable to show the comment form. Disabling still allows the existing comments to be shown but does not allow the conversation to continue."
 msgstr "Enable to show the comment form. Disabling still allows the existing comments to be shown but does not allow the conversation to continue."
 
-#: ~/Modules/Orchard.DevTools/Controllers/HomeController.cs
+#: ~/Modules/Orchard.Experimental/Controllers/HomeController.cs
 #| msgid : "Notifier works without BaseViewModel"
 msgid "Notifier works without BaseViewModel"
 msgstr "Notifier works without BaseViewModel"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
 #| msgid : "{0} Content Type"
 msgid "{0} Content Type"
 msgstr "{0} Content Type"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
 #| msgid : "Content"
 msgid "Content"
 msgstr "Content"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
 #| msgid : "view"
 msgid "view"
 msgstr "view"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
 #| msgid : "edit"
 msgid "edit"
 msgstr "edit"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Details.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Details.aspx
 #| msgid : "{0} #{1} v{2}"
 msgid "{0} #{1} v{2}"
 msgstr "{0} #{1} v{2}"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
 #| msgid : "Content"
 msgid "Content"
 msgstr "Content"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
 #| msgid : "{0}: {1}"
 msgid "{0}: {1}"
 msgstr "{0}: {1}"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
 #| msgid : "view"
 msgid "view"
 msgstr "view"
 
-#: ~/Modules/Orchard.DevTools/Views/Content/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Content/Index.aspx
 #| msgid : "edit"
 msgid "edit"
 msgstr "edit"
 
-#: ~/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx
+#: ~/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx
 #| msgid : "{0} #{1} v{2}"
 msgid "{0} #{1} v{2}"
 msgstr "{0} #{1} v{2}"
 
-#: ~/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx
+#: ~/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx
 #| msgid : "{0} #{1} v{2}"
 msgid "{0} #{1} v{2}"
 msgstr "{0} #{1} v{2}"
 
-#: ~/Modules/Orchard.DevTools/Views/Home/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Home/Index.aspx
 #| msgid : "Dev Tools"
 msgid "Dev Tools"
 msgstr "Dev Tools"
 
-#: ~/Modules/Orchard.DevTools/Views/Home/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Home/Index.aspx
 #| msgid : "Contents"
 msgid "Contents"
 msgstr "Contents"
 
-#: ~/Modules/Orchard.DevTools/Views/Home/Index.aspx
+#: ~/Modules/Orchard.Experimental/Views/Home/Index.aspx
 #| msgid : "Test Unauthorized Request"
 msgid "Test Unauthorized Request"
 msgstr "Test Unauthorized Request"
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs
similarity index 76%
rename from src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs
rename to src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs
index 42cf367c3..0a5391ed0 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ShapeTableController.cs
@@ -5,10 +5,10 @@ using Orchard.UI.Admin;
 
 namespace Orchard.Experimental.Controllers {
     [Themed, Admin]
-    public class InventoryController : Controller {
+    public class ShapeTableController : Controller {
         private readonly IShapeTableManager _shapeTableManager;
 
-        public InventoryController(IShapeTableManager shapeTableManager) {
+        public ShapeTableController(IShapeTableManager shapeTableManager) {
             _shapeTableManager = shapeTableManager;
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs
index a180d47af..98f2faf37 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs
@@ -11,8 +11,8 @@ namespace Orchard.Experimental.Handlers {
                 context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
         }
         protected override void BuildEditorShape(BuildEditorModelContext context) {
-            var devToolsSettings = context.ContentItem.TypeDefinition.Settings.GetModel<Settings.ExperimentalSettings>();
-            if (devToolsSettings.ShowDebugLinks)
+            var experimentalSettings = context.ContentItem.TypeDefinition.Settings.GetModel<Settings.ExperimentalSettings>();
+            if (experimentalSettings.ShowDebugLinks)
                 context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
         }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
index 0aaf24c66..bad44aea0 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
@@ -76,7 +76,7 @@
     <Compile Include="Controllers\CommandsController.cs" />
     <Compile Include="Controllers\ContentController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\InventoryController.cs" />
+    <Compile Include="Controllers\ShapeTableController.cs" />
     <Compile Include="Controllers\MetadataController.cs" />
     <Compile Include="DebugFilter.cs" />
     <Compile Include="Handlers\DebugLinkHandler.cs" />
@@ -131,7 +131,7 @@
     <Content Include="Views\Home\UsingShapes.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Inventory\ShapeTable.cshtml" />
+    <Content Include="Views\ShapeTable\ShapeTable.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx
index a1ef8d545..f433051b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ShowDebugLink>" %>
 <%@ Import Namespace="Orchard.Experimental.Models" %>
 <div class="debug message"><%=T(
-    "DevTools: displaying {0}",
+    "Experimental: displaying {0}",
     Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.Experimental", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
     ) %></div>
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx
index e5d979e70..9c76cb12e 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx
@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Experimental.Models" %>
 <% if (Model.ContentItem.Id > 0) { %>
 <div class="debug message"><%=T(
-    "DevTools: editing {0}",
+    "Experimental: editing {0}",
     Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.Experimental", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
     ) %></div>
 <% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Inventory/ShapeTable.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ShapeTable/ShapeTable.cshtml
similarity index 91%
rename from src/Orchard.Web/Modules/Orchard.Experimental/Views/Inventory/ShapeTable.cshtml
rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/ShapeTable/ShapeTable.cshtml
index 9a39f3d15..b02fcb6c5 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Inventory/ShapeTable.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ShapeTable/ShapeTable.cshtml
@@ -9,4 +9,4 @@
 			</li>
 		}
 	</ul>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index cfb379e2f..00cde67c7 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -92,7 +92,6 @@ namespace Orchard.Setup.Services {
                     "Orchard.Tags",
                     "Orchard.Media",
                     "Orchard.Widgets",
-                    "Orchard.DevTools",
                     "Orchard.jQuery"
                 };
 
diff --git a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
index 525799594..66643bded 100644
--- a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
+++ b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
@@ -107,9 +107,9 @@
       <Project>{14C049FD-B35B-415A-A824-87F26B26E7FD}</Project>
       <Name>Orchard.Comments</Name>
     </ProjectReference>
-    <ProjectReference Include="Modules\Orchard.DevTools\Orchard.DevTools.csproj">
+    <ProjectReference Include="Modules\Orchard.Experimetnal\Orchard.Experimental.csproj">
       <Project>{67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890}</Project>
-      <Name>Orchard.DevTools</Name>
+      <Name>Orchard.Experimental</Name>
     </ProjectReference>
     <ProjectReference Include="Modules\Orchard.Media\Orchard.Media.csproj">
       <Project>{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}</Project>