diff --git a/src/Orchard.Startup/Orchard.WarmupStarter.csproj b/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj
similarity index 100%
rename from src/Orchard.Startup/Orchard.WarmupStarter.csproj
rename to src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj
diff --git a/src/Orchard.Startup/Properties/AssemblyInfo.cs b/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
similarity index 94%
rename from src/Orchard.Startup/Properties/AssemblyInfo.cs
rename to src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
index 3e920316c..d681844eb 100644
--- a/src/Orchard.Startup/Properties/AssemblyInfo.cs
+++ b/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Security;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Orchard.Starter")]
+[assembly: AssemblyTitle("Orchard.WarmupStarter")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
diff --git a/src/Orchard.Startup/Starter.cs b/src/Orchard.WarmupStarter/Starter.cs
similarity index 100%
rename from src/Orchard.Startup/Starter.cs
rename to src/Orchard.WarmupStarter/Starter.cs
diff --git a/src/Orchard.Startup/WarmupHttpModule.cs b/src/Orchard.WarmupStarter/WarmupHttpModule.cs
similarity index 100%
rename from src/Orchard.Startup/WarmupHttpModule.cs
rename to src/Orchard.WarmupStarter/WarmupHttpModule.cs
diff --git a/src/Orchard.Startup/WarmupUtility.cs b/src/Orchard.WarmupStarter/WarmupUtility.cs
similarity index 100%
rename from src/Orchard.Startup/WarmupUtility.cs
rename to src/Orchard.WarmupStarter/WarmupUtility.cs
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 068116a72..37ae386a1 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -144,7 +144,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Orchard.Startup\Orchard.WarmupStarter.csproj">
+    <ProjectReference Include="..\Orchard.WarmupStarter\Orchard.WarmupStarter.csproj">
       <Project>{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}</Project>
       <Name>Orchard.WarmupStarter</Name>
     </ProjectReference>
diff --git a/src/Orchard.sln b/src/Orchard.sln
index c520a6393..12fe2eb3b 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -112,7 +112,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ImportExport", "Orc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Warmup", "Orchard.Web\Modules\Orchard.WarmUp\Orchard.Warmup.csproj", "{9CD5C81F-5828-4384-8474-2E2BE71D5EDD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.WarmupStarter", "Orchard.Startup\Orchard.WarmupStarter.csproj", "{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.WarmupStarter", "Orchard.WarmupStarter\Orchard.WarmupStarter.csproj", "{5C0D5249-AEF5-4BB6-8F5F-057B91AC2D7A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Tokens", "Orchard.Web\Modules\Orchard.Tokens\Orchard.Tokens.csproj", "{6F759635-13D7-4E94-BCC9-80445D63F117}"
 EndProject