diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index bc23b2339..28d846393 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -136,9 +136,9 @@
       <Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project>
       <Name>Orchard.Users</Name>
     </ProjectReference>
-    <ProjectReference Include="Packages\Orchard.Wiki\Orchard.Wiki.csproj">
+    <ProjectReference Include="Packages\Orchard.Wiki\Orchard.Wikis.csproj">
       <Project>{17C44253-65A2-4597-98C7-16EE576824B6}</Project>
-      <Name>Orchard.Wiki</Name>
+      <Name>Orchard.Wikis</Name>
     </ProjectReference>
     <ProjectReference Include="Packages\TinyMce\TinyMce.csproj">
       <Project>{954CA994-D204-468B-9D69-51F6AD3E1C29}</Project>
diff --git a/src/Orchard.Web/Packages/Orchard.Wiki/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Wiki/AdminMenu.cs
index f069158ec..948dd74b7 100644
--- a/src/Orchard.Web/Packages/Orchard.Wiki/AdminMenu.cs
+++ b/src/Orchard.Web/Packages/Orchard.Wiki/AdminMenu.cs
@@ -1,6 +1,6 @@
 using Orchard.UI.Navigation;
 
-namespace Orchard.Wiki {
+namespace Orchard.Wikis {
     public class AdminMenu : INavigationProvider {
         public string MenuName { get { return "admin"; } }
 
diff --git a/src/Orchard.Web/Packages/Orchard.Wiki/Controllers/AdminController.cs b/src/Orchard.Web/Packages/Orchard.Wiki/Controllers/AdminController.cs
index fdbc174f8..8ce47c0f8 100644
--- a/src/Orchard.Web/Packages/Orchard.Wiki/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Wiki/Controllers/AdminController.cs
@@ -1,7 +1,7 @@
 using System.Web.Mvc;
 using Orchard.Mvc.ViewModels;
 
-namespace Orchard.Wiki.Controllers
+namespace Orchard.Wikis.Controllers
 {
     public class AdminController : Controller
     {
diff --git a/src/Orchard.Web/Packages/Orchard.Wiki/Orchard.Wiki.csproj b/src/Orchard.Web/Packages/Orchard.Wiki/Orchard.Wikis.csproj
similarity index 94%
rename from src/Orchard.Web/Packages/Orchard.Wiki/Orchard.Wiki.csproj
rename to src/Orchard.Web/Packages/Orchard.Wiki/Orchard.Wikis.csproj
index 5037a3cc2..fd39af43c 100644
--- a/src/Orchard.Web/Packages/Orchard.Wiki/Orchard.Wiki.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Wiki/Orchard.Wikis.csproj
@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Wiki</RootNamespace>
-    <AssemblyName>Orchard.Wiki</AssemblyName>
+    <RootNamespace>Orchard.Wikis</RootNamespace>
+    <AssemblyName>Orchard.Wikis</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
   </PropertyGroup>
@@ -44,7 +44,7 @@
     </Reference>
     <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\\Assemblies\System.Web.Mvc.dll</HintPath>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
diff --git a/src/Orchard.Web/Packages/Orchard.Wiki/Package.txt b/src/Orchard.Web/Packages/Orchard.Wiki/Package.txt
index 225627279..bb2998da1 100644
--- a/src/Orchard.Web/Packages/Orchard.Wiki/Package.txt
+++ b/src/Orchard.Web/Packages/Orchard.Wiki/Package.txt
@@ -1 +1 @@
-name: Wiki
+name: Wikis
diff --git a/src/Orchard.sln b/src/Orchard.sln
index 2d2f0ac0e..290971ec2 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Tests.Packages", "O
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Roles", "Orchard.Web\Packages\Orchard.Roles\Orchard.Roles.csproj", "{D10AD48F-407D-4DB5-A328-173EC7CB010F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Wiki", "Orchard.Web\Packages\Orchard.Wiki\Orchard.Wiki.csproj", "{17C44253-65A2-4597-98C7-16EE576824B6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Wikis", "Orchard.Web\Packages\Orchard.Wiki\Orchard.Wikis.csproj", "{17C44253-65A2-4597-98C7-16EE576824B6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Core", "Orchard.Web\Core\Orchard.Core.csproj", "{9916839C-39FC-4CEB-A5AF-89CA7E87119F}"
 EndProject