diff --git a/src/Umbraco.Core/IO/ViewHelper.cs b/src/Umbraco.Core/IO/ViewHelper.cs
index 569d8cdfc9..954bdded00 100644
--- a/src/Umbraco.Core/IO/ViewHelper.cs
+++ b/src/Umbraco.Core/IO/ViewHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -70,7 +70,7 @@ namespace Umbraco.Core.IO
             // @inherits Umbraco.Web.Mvc.UmbracoViewPage
             // @inherits Umbraco.Web.Mvc.UmbracoViewPage<ModelClass>
             content.AppendLine("@using Umbraco.Web.PublishedModels;");
-            content.Append("@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage");
+            content.Append("@inherits Umbraco.Web.Common.Views.UmbracoViewPage");
             if (modelClassName.IsNullOrWhiteSpace() == false)
             {
                 content.Append("<");
diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs
index e1f4a017b3..c893af6892 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Services.Implement
         private readonly GlobalSettings _globalSettings;
         private readonly IHostingEnvironment _hostingEnvironment;
 
-        private const string PartialViewHeader = "@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage";
+        private const string PartialViewHeader = "@inherits Umbraco.Web.Common.Views.UmbracoViewPage";
         private const string PartialViewMacroHeader = "@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage";
 
         public FileService(IScopeProvider uowProvider, ILoggerFactory loggerFactory, IEventMessagesFactory eventMessagesFactory,
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
index 9780b53997..0f8f15e9f4 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -122,7 +122,7 @@ namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositor
                 Assert.That(repository.Get("test2"), Is.Not.Null);
                 Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test2.cshtml"), Is.True);
                 Assert.AreEqual(
-                    "@usingUmbraco.Web.PublishedModels;@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage @{ Layout = \"test.cshtml\";}".StripWhitespace(),
+                    "@usingUmbraco.Web.PublishedModels;@inherits Umbraco.Web.Common.Views.UmbracoViewPage @{ Layout = \"test.cshtml\";}".StripWhitespace(),
                     template2.Content.StripWhitespace());
             }
         }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
index 85c96cf5be..73eae0d51c 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
@@ -15,7 +15,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent();
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage
 @{
     Layout = null;
 }"), FixView(view));
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent(layoutPageAlias: "Dharznoik");
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage
 @{
     Layout = ""Dharznoik.cshtml"";
 }"), FixView(view));
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent(modelClassName: "ClassName");
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<ClassName>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<ClassName>
 @{
     Layout = null;
 }"), FixView(view));
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent(modelNamespace: "Models");
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage
 @{
     Layout = null;
 }"), FixView(view));
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models");
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<ContentModels.ClassName>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<ContentModels.ClassName>
 @using ContentModels = My.Models;
 @{
     Layout = null;
@@ -76,7 +76,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models", modelNamespaceAlias: "MyModels");
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<MyModels.ClassName>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<MyModels.ClassName>
 @using MyModels = My.Models;
 @{
     Layout = null;
@@ -89,7 +89,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates
             var view = ViewHelper.GetDefaultFileContent(layoutPageAlias: "Dharznoik", modelClassName: "ClassName", modelNamespace: "My.Models", modelNamespaceAlias: "MyModels");
             Assert.AreEqual(
                 FixView(@"@using Umbraco.Web.PublishedModels;
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<MyModels.ClassName>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<MyModels.ClassName>
 @using MyModels = My.Models;
 @{
     Layout = ""Dharznoik.cshtml"";
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
index b227d8a903..ed26d5d75f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
@@ -10,8 +10,8 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.ModelBinders;
+using Umbraco.Web.Common.Views;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Views
diff --git a/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs b/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
index ee80c40a53..22c90e8ac2 100644
--- a/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
+++ b/src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
@@ -1,4 +1,4 @@
-using Umbraco.Web.Common.AspNetCore;
+using Umbraco.Web.Common.Views;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Common.Macros
diff --git a/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs b/src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
similarity index 99%
rename from src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs
rename to src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
index 23ae7d7f32..aea63e762e 100644
--- a/src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs
+++ b/src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
@@ -19,10 +19,8 @@ using Umbraco.Web.Common.ModelBinders;
 using Umbraco.Web.Models;
 using Umbraco.Web.Website;
 
-namespace Umbraco.Web.Common.AspNetCore
+namespace Umbraco.Web.Common.Views
 {
-    // TODO: Should be in Views namespace?
-
     public abstract class UmbracoViewPage : UmbracoViewPage<IPublishedContent>
     {
 
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
index 0ad9fd83c3..c80a5f5400 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
@@ -1,4 +1,4 @@
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<Umbraco.Core.Models.Blocks.BlockListModel>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<Umbraco.Core.Models.Blocks.BlockListModel>
 @{
     if (!Model.Any()) { return; }
 }
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
index 30f55f2058..d2e1f76eee 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
@@ -1,7 +1,7 @@
-@using System.Web
+@using System.Web
 @using Microsoft.AspNetCore.Html
 @using Newtonsoft.Json.Linq
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<dynamic>
 
 @*
     Razor helpers located at the bottom of this file
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
index 68ded16619..7d0c17becb 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
@@ -1,7 +1,7 @@
-@using System.Web
+@using System.Web
 @using Microsoft.AspNetCore.Html
 @using Newtonsoft.Json.Linq
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<dynamic>
 
 @if (Model != null && Model.sections != null)
 {
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
index 1cb413ef06..dfb7399ef9 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
@@ -1,5 +1,5 @@
-@using Umbraco.Core
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
+@    using Umbraco.Core
+@inherits             UmbracoViewPage<dynamic>
 
 @{
     string embedValue = Convert.ToString(Model.value);
diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
index 87f6ec04af..ee24207e5d 100644
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
@@ -1,4 +1,4 @@
-@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
+@inherits             UmbracoViewPage<dynamic>
 
 @if (Model.value != null)
 {