diff --git a/build/templates/UmbracoProject/.template.config/template.json b/build/templates/UmbracoProject/.template.config/template.json
index 3b34f77130..9fa69b6df4 100644
--- a/build/templates/UmbracoProject/.template.config/template.json
+++ b/build/templates/UmbracoProject/.template.config/template.json
@@ -35,7 +35,7 @@
             "type": "generated",
             "generator": "regex",
             "dataType": "string",
-            "replaces": "Umbraco.Cms.Web.UI.NetCore",
+            "replaces": "Umbraco.Cms.Web.UI",
             "parameters": {
                 "source": "name",
                 "steps": [
diff --git a/build/templates/UmbracoProject/Properties/launchSettings.json b/build/templates/UmbracoProject/Properties/launchSettings.json
index f40916f4d1..97fdc9f7f5 100644
--- a/build/templates/UmbracoProject/Properties/launchSettings.json
+++ b/build/templates/UmbracoProject/Properties/launchSettings.json
@@ -16,7 +16,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "Umbraco.Web.UI.NetCore": {
+    "Umbraco.Web.UI": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
diff --git a/build/templates/UmbracoProject/UmbracoProject.csproj b/build/templates/UmbracoProject/UmbracoProject.csproj
index 2310f789e2..5ed4d927ef 100644
--- a/build/templates/UmbracoProject/UmbracoProject.csproj
+++ b/build/templates/UmbracoProject/UmbracoProject.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Umbraco.Cms.Web.UI.NetCore</RootNamespace>
+        <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Umbraco.Cms.Web.UI</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/build/templates/UmbracoProject/Views/_ViewImports.cshtml b/build/templates/UmbracoProject/Views/_ViewImports.cshtml
index ec320f2af5..cb9a0b658e 100644
--- a/build/templates/UmbracoProject/Views/_ViewImports.cshtml
+++ b/build/templates/UmbracoProject/Views/_ViewImports.cshtml
@@ -1,8 +1,8 @@
-@using Umbraco.Web.UI.NetCore
+@using Umbraco.Web.UI
 @using Umbraco.Extensions
 @using Umbraco.Web.PublishedModels
 @using Umbraco.Cms.Core.Models.PublishedContent
 @using Microsoft.AspNetCore.Html
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Smidge
-@inject Smidge.SmidgeHelper SmidgeHelper
\ No newline at end of file
+@inject Smidge.SmidgeHelper SmidgeHelper