diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 9b3bc62cbf..67669fd607 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,8 +25,8 @@ namespace Umbraco.Web.Macros
         /// </summary>
         /// <param name="frequest">The <see cref="PublishedRequest"/> pointing to the document.</param>
         /// <remarks>
-        /// The difference between creating the page with PublishedContentRequest vs an IPublishedContent item is
-        /// that the PublishedContentRequest takes into account how a template is assigned during the routing process whereas
+        /// The difference between creating the page with PublishedRequest vs an IPublishedContent item is
+        /// that the PublishedRequest takes into account how a template is assigned during the routing process whereas
         /// with an IPublishedContent item, the template id is assigned purely based on the default.
         /// </remarks>
         internal PublishedContentHashtableConverter(PublishedRequest frequest)
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index 77fa0692e7..168da455e3 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Web.Mvc;
 using Umbraco.Web.Routing;
 using Umbraco.Core;
@@ -38,7 +38,7 @@ namespace Umbraco.Web.Mvc
         }
 
         /// <summary>
-        /// A constructor used to set an explicit content Id to the PublishedContentRequest that will be created
+        /// A constructor used to set an explicit content Id to the PublishedRequest that will be created
         /// </summary>
         /// <param name="contentId"></param>
         public EnsurePublishedContentRequestAttribute(int contentId)
@@ -121,7 +121,7 @@ namespace Umbraco.Web.Mvc
                 {
                     throw new InvalidOperationException("The data token resolved with name " + _dataTokenName + " was not an instance of " + typeof(IPublishedContent));
                 }
-                request.PublishedContent = (IPublishedContent) result;
+                request.PublishedContent = (IPublishedContent)result;
             }
 
             PublishedRouter.PrepareRequest(request);
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index 6c82f2c01c..c2aa3bd8ed 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Web.Mvc;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Mvc
                     return _publishedRequest;
                 if (RouteData.DataTokens.ContainsKey(Core.Constants.Web.PublishedDocumentRequestDataToken) == false)
                 {
-                    throw new InvalidOperationException("DataTokens must contain an 'umbraco-doc-request' key with a PublishedContentRequest object");
+                    throw new InvalidOperationException("DataTokens must contain an 'umbraco-doc-request' key with a PublishedRequest object");
                 }
                 _publishedRequest = (PublishedRequest)RouteData.DataTokens[Core.Constants.Web.PublishedDocumentRequestDataToken];
                 return _publishedRequest;
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 2c550effc4..54215c2e8c 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Web;
 using System.Web.Compilation;
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Mvc
             var request = UmbracoContext.PublishedRequest;
             if (request == null)
             {
-                throw new NullReferenceException("There is no current PublishedContentRequest, it must be initialized before the RenderRouteHandler executes");
+                throw new NullReferenceException("There is no current PublishedRequest, it must be initialized before the RenderRouteHandler executes");
             }
 
             SetupRouteDataForRequest(
diff --git a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
index e3cad25c6f..75af1fed84 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -25,9 +25,9 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         public bool TryFindContent(PublishedRequest frequest)
         {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
index 8360ad7e38..b3c060fe35 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -25,9 +25,9 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         public bool TryFindContent(PublishedRequest frequest)
         {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
index f20aa95c0d..254dedf979 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -25,9 +25,9 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         /// <remarks>Optionally, can also assign the template or anything else on the document request, although that is not required.</remarks>
         public bool TryFindContent(PublishedRequest frequest)
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
index 94b2b9dbf2..11f2717455 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 
@@ -20,9 +20,9 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         public virtual bool TryFindContent(PublishedRequest frequest)
         {
@@ -37,7 +37,7 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find an Umbraco document for a <c>PublishedContentRequest</c> and a route.
+        /// Tries to find an Umbraco document for a <c>PublishedRequest</c> and a route.
         /// </summary>
         /// <param name="docreq">The document request.</param>
         /// <param name="route">The route.</param>
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index 60124a96a2..a98dbf8a80 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Linq;
 using Umbraco.Core.Logging;
@@ -26,9 +26,9 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         public bool TryFindContent(PublishedRequest frequest)
         {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
index 1e86b40a79..00cd5566de 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -27,9 +27,9 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         /// <remarks>If successful, also assigns the template.</remarks>
         public override bool TryFindContent(PublishedRequest frequest)
diff --git a/src/Umbraco.Web/Routing/IContentFinder.cs b/src/Umbraco.Web/Routing/IContentFinder.cs
index c742cc1817..fe5699ac7b 100644
--- a/src/Umbraco.Web/Routing/IContentFinder.cs
+++ b/src/Umbraco.Web/Routing/IContentFinder.cs
@@ -1,14 +1,14 @@
-namespace Umbraco.Web.Routing
+namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides a method to try to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+    /// Provides a method to try to find and assign an Umbraco document to a <c>PublishedRequest</c>.
     /// </summary>
     public interface IContentFinder
     {
         /// <summary>
-        /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
+        /// Tries to find and assign an Umbraco document to a <c>PublishedRequest</c>.
         /// </summary>
-        /// <param name="frequest">The <c>PublishedContentRequest</c>.</param>
+        /// <param name="frequest">The <c>PublishedRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         /// <remarks>Optionally, can also assign the template or anything else on the document request, although that is not required.</remarks>
         bool TryFindContent(PublishedRequest frequest);
diff --git a/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs b/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs
index 259c6b5d41..b1ff47bddb 100644
--- a/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs
+++ b/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs
@@ -1,7 +1,7 @@
-namespace Umbraco.Web.Routing
+namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides a method to try to find and assign an Umbraco document to a <c>PublishedContentRequest</c>
+    /// Provides a method to try to find and assign an Umbraco document to a <c>PublishedRequest</c>
     /// when everything else has failed.
     /// </summary>
     /// <remarks>Identical to <see cref="IContentFinder"/> but required in order to differentiate them in ioc.</remarks>
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index d2a930fa96..aee7ba4de8 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
@@ -66,7 +66,7 @@ namespace Umbraco.Web.Routing
         private void EnsureWriteable()
         {
             if (_readonly)
-                throw new InvalidOperationException("Cannot modify a PublishedContentRequest once it is read-only.");
+                throw new InvalidOperationException("Cannot modify a PublishedRequest once it is read-only.");
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index c93b7c06b2..b362b21a0c 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -141,7 +141,7 @@ namespace Umbraco.Web.Routing
             // trigger the Prepared event - at that point it is still possible to change about anything
             // even though the request might be flagged for redirection - we'll redirect _after_ the event
             //
-            // also, OnPrepared() will make the PublishedContentRequest readonly, so nothing can change
+            // also, OnPrepared() will make the PublishedRequest readonly, so nothing can change
             //
             request.OnPrepared();
 
@@ -244,7 +244,7 @@ namespace Umbraco.Web.Routing
         #region Domain
 
         /// <summary>
-        /// Finds the site root (if any) matching the http request, and updates the PublishedContentRequest accordingly.
+        /// Finds the site root (if any) matching the http request, and updates the PublishedRequest accordingly.
         /// </summary>
         /// <returns>A value indicating whether a domain was found.</returns>
         internal bool FindDomain(PublishedRequest request)
@@ -375,7 +375,7 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Finds the Umbraco document (if any) matching the request, and updates the PublishedContentRequest accordingly.
+        /// Finds the Umbraco document (if any) matching the request, and updates the PublishedRequest accordingly.
         /// </summary>
         /// <returns>A value indicating whether a document and template were found.</returns>
         private void FindPublishedContentAndTemplate(PublishedRequest request)
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index df711a084e..5123eb49ac 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Globalization;
 using System.IO;
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Templates
                 return;
             }
 
-            //in some cases the UmbracoContext will not have a PublishedContentRequest assigned to it if we are not in the
+            //in some cases the UmbracoContext will not have a PublishedRequest assigned to it if we are not in the
             //execution of a front-end rendered page. In this case set the culture to the default.
             //set the culture to the same as is currently rendering
             if (_umbracoContextAccessor.UmbracoContext.PublishedRequest == null)
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 9ae9a5cb16..e68e6e2c77 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Web;
 using Umbraco.Core;
@@ -133,7 +133,7 @@ namespace Umbraco.Web
         public UrlProvider UrlProvider { get; }
 
         /// <summary>
-        /// Gets/sets the PublishedContentRequest object
+        /// Gets/sets the PublishedRequest object
         /// </summary>
         public PublishedRequest PublishedRequest { get; set; }