diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
index ff010f8b1..5522b5d66 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/DataMigrations/ArchiveLaterDataMigration.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using ArchiveLater.Models;
+using Orchard.ArchiveLater.Models;
 using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
index b018df3c8..844fc9236 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
@@ -1,8 +1,8 @@
 using System;
-using ArchiveLater.Models;
-using ArchiveLater.Services;
-using ArchiveLater.ViewModels;
 using Orchard;
+using Orchard.ArchiveLater.Models;
+using Orchard.ArchiveLater.Services;
+using Orchard.ArchiveLater.ViewModels;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Services;
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
index ceef9424c..45cf29cca 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
@@ -1,9 +1,9 @@
-using ArchiveLater.Models;
-using ArchiveLater.Services;
+using Orchard.ArchiveLater.Models;
+using Orchard.ArchiveLater.Services;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 
-namespace ArchiveLater.Handlers {
+namespace Orchard.ArchiveLater.Handlers {
     public class ArchiveLaterPartHandler : ContentHandler {
         private readonly IArchiveLaterService _archiveLaterService;
 
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs
index b1ef43db2..48c2dfd45 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs
@@ -3,7 +3,7 @@ using Orchard.ContentManagement;
 using Orchard.Logging;
 using Orchard.Tasks.Scheduling;
 
-namespace ArchiveLater.Handlers {
+namespace Orchard.ArchiveLater.Handlers {
     [UsedImplicitly]
     public class UnpublishingTaskHandler : IScheduledTaskHandler {
         private readonly IContentManager _contentManager;
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Models/ArchiveLaterPart.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Models/ArchiveLaterPart.cs
index 504d5e221..b495df2d2 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Models/ArchiveLaterPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Models/ArchiveLaterPart.cs
@@ -2,7 +2,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Utilities;
 
-namespace ArchiveLater.Models {
+namespace Orchard.ArchiveLater.Models {
     public class ArchiveLaterPart : ContentPart<ArchiveLaterPart> {
         private readonly LazyField<DateTime?> _scheduledArchiveUtc = new LazyField<DateTime?>();
         public LazyField<DateTime?> ScheduledArchiveUtc { get { return _scheduledArchiveUtc; } }
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
index b2b393141..db3d9e299 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
-using ArchiveLater.Models;
+using Orchard.ArchiveLater.Models;
 using Orchard.ContentManagement;
 using Orchard.Tasks.Scheduling;
 
-namespace ArchiveLater.Services {
+namespace Orchard.ArchiveLater.Services {
     public class ArchiveLaterService : IArchiveLaterService {
         private const string UnpublishTaskType = "Unpublish";
 
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/IArchiveLaterService.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/IArchiveLaterService.cs
index c7a1199ce..0309cfdf8 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/IArchiveLaterService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/IArchiveLaterService.cs
@@ -1,9 +1,8 @@
 using System;
-using ArchiveLater.Models;
-using Orchard;
+using Orchard.ArchiveLater.Models;
 using Orchard.ContentManagement;
 
-namespace ArchiveLater.Services {
+namespace Orchard.ArchiveLater.Services {
     public interface IArchiveLaterService : IDependency {
         DateTime? GetScheduledArchiveUtc(ArchiveLaterPart archiveLaterPart);
         void ArchiveLater(ContentItem contentItem, DateTime scheduledArchiveUtc);
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ArchiveLaterViewModel.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ArchiveLaterViewModel.cs
index f08455e13..86c3580ae 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ArchiveLaterViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ViewModels/ArchiveLaterViewModel.cs
@@ -1,8 +1,8 @@
 using System;
-using ArchiveLater.Models;
+using Orchard.ArchiveLater.Models;
 using Orchard.ContentManagement;
 
-namespace ArchiveLater.ViewModels {
+namespace Orchard.ArchiveLater.ViewModels {
     public class ArchiveLaterViewModel {
         private readonly ArchiveLaterPart _archiveLaterPart;
 
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx
index 03804e6cb..614b2431a 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ArchiveLater.ViewModels.ArchiveLaterViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel>" %>
     <%
     if ((Model.IsPublished && Model.ScheduledArchiveUtc.HasValue && Model.ScheduledArchiveUtc.Value > DateTime.UtcNow)) {%>
     <ul class="pageStatus">
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx
index 7873c0024..164cdb0ce 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.ascx
@@ -1 +1 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ArchiveLater.ViewModels.ArchiveLaterViewModel>" %>
\ No newline at end of file
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orhard.ArchiveLater.ViewModels.ArchiveLaterViewModel>" %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx
index 6e35b7e23..0c74fdb03 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ArchiveLater.ViewModels.ArchiveLaterViewModel>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel>" %>
 <% Html.RegisterStyle("datetime.css"); %>
 <% Html.RegisterStyle("jquery-ui-1.7.2.custom.css"); %>
 <% Html.RegisterStyle("ui.datepicker.css"); %>
diff --git a/src/Orchard.sln b/src/Orchard.sln
index 386f96c76..23e4179eb 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -75,7 +75,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Packaging", "Orchar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Tests", "Tools\Orchard.Tests\Orchard.Tests.csproj", "{0DFA2E10-96C8-4E05-BC10-B710B97ECCDE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ArchiveLater", "Orchard.Web\Modules\ArchiveLater\Orchard.ArchiveLater.csproj", "{1C981BB3-26F7-494C-9005-CC27A5144233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ArchiveLater", "Orchard.Web\Modules\Orchard.ArchiveLater\Orchard.ArchiveLater.csproj", "{1C981BB3-26F7-494C-9005-CC27A5144233}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution