diff --git a/src/Umbraco.Web/Routing/DocumentNotFoundHandler.cs b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
similarity index 92%
rename from src/Umbraco.Web/Routing/DocumentNotFoundHandler.cs
rename to src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
index 2e86960946..cda85667a2 100644
--- a/src/Umbraco.Web/Routing/DocumentNotFoundHandler.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Web.Routing
 	/// <summary>
 	/// Gets executed when no document can be found in Umbraco
 	/// </summary>
-	internal class DocumentNotFoundHandler : IHttpHandler
+	internal class PublishedContentNotFoundHandler : IHttpHandler
 	{
 		public void ProcessRequest(HttpContext context)
 		{
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3e831fe4c5..1c6acc0197 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -323,7 +323,7 @@
     <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
     <Compile Include="DefaultPublishedContentStore.cs" />
     <Compile Include="PublishedContentStoreResolver.cs" />
-    <Compile Include="Routing\DocumentNotFoundHandler.cs" />
+    <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
     <Compile Include="IPublishedContentStore.cs" />
     <Compile Include="Models\XmlPublishedContent.cs" />
     <Compile Include="Models\XmlDocumentProperty.cs" />
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index ade88545ec..5f84c387f6 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -141,7 +141,7 @@ namespace Umbraco.Web
 
 				if (!docreq.HasNode)
 				{
-					httpContext.RemapHandler(new DocumentNotFoundHandler());
+					httpContext.RemapHandler(new PublishedContentNotFoundHandler());
 					return;
 				}