diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index a5f56ff79..22d771abd 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Intern
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,10 @@ Global
 		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.Build.0 = Release|Any CPU
+		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -66,6 +72,7 @@ Global
 		{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}
diff --git a/NuGet.config b/NuGet.config
index 8547e3c17..4a06f0f7a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -14,6 +14,7 @@
     <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-247f60e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-247f60e9/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8eb61d4b2..c4a7a4bee 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -67,9 +67,9 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>e65408a36c2fdbcf1b82eda0afc18828396c2426</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.19570.1">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.20126.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>5117d3d9d7dfd3583f0c42a639efaf092f957b7b</Sha>
+      <Sha>91cbc040733600df96d8a3b86af4d0044bb51a8d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-preview.2.20127.1">
       <Uri>https://github.com/dotnet/templating</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index cd2ee639c..c858e0083 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
-    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.19570.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.20126.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
@@ -92,32 +92,34 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
   </PropertyGroup>
   <PropertyGroup>
+    <!-- 5.0 Template versions -->
+    <MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
+    <MicrosoftDotNetWpfProjectTemplates50PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates50PackageVersion>
+    <NUnit3Templates50PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates50PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates50PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates50PackageVersion>
+    <AspNetCorePackageVersionFor50Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor50Templates>
     <!-- 3.1 Template versions -->
-    <MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
-    <MicrosoftDotNetWpfProjectTemplates31PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
-    <NUnit3Templates31PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates31PackageVersion>
-    <MicrosoftDotNetCommonItemTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates31PackageVersion>
-    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>3.1.0-preview1.19475.1</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
-    <AspNetCorePackageVersionFor31Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor31Templates>
+    <MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
+    <MicrosoftDotNetWpfProjectTemplates31PackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
+    <NUnit3Templates31PackageVersion>1.7.1</NUnit3Templates31PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates31PackageVersion>3.1.2</MicrosoftDotNetCommonItemTemplates31PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.20126.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
+    <AspNetCorePackageVersionFor31Templates>3.1.2</AspNetCorePackageVersionFor31Templates>
     <!-- 3.0 Template versions -->
     <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
     <MicrosoftDotNetWpfProjectTemplates30PackageVersion>3.0.0</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
     <NUnit3Templates30PackageVersion>1.6.5</NUnit3Templates30PackageVersion>
     <MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
     <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.20126.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
     <AspNetCorePackageVersionFor30Templates>3.0.1</AspNetCorePackageVersionFor30Templates>
-    <!-- 2.2 Template versions -->
-    <NUnit3Templates22PackageVersion>1.6.0</NUnit3Templates22PackageVersion>
-    <MicrosoftDotNetCommonItemTemplates22PackageVersion>1.0.2-beta4</MicrosoftDotNetCommonItemTemplates22PackageVersion>
-    <MicrosoftDotNetCommonProjectTemplates22PackageVersion>$(MicrosoftDotNetCommonItemTemplates22PackageVersion)</MicrosoftDotNetCommonProjectTemplates22PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates22PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates22PackageVersion>
-    <AspNetCorePackageVersionFor22Templates>2.2.8</AspNetCorePackageVersionFor22Templates>
     <!-- 2.1 Template versions -->
     <NUnit3Templates21PackageVersion>1.5.3</NUnit3Templates21PackageVersion>
     <MicrosoftDotNetCommonItemTemplates21PackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplates21PackageVersion>
     <MicrosoftDotNetCommonProjectTemplates21PackageVersion>$(MicrosoftDotNetCommonItemTemplates21PackageVersion)</MicrosoftDotNetCommonProjectTemplates21PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.19511.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.20126.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
     <AspNetCorePackageVersionFor21Templates>2.1.14</AspNetCorePackageVersionFor21Templates>
   </PropertyGroup>
   <!-- infrastructure and test only dependencies -->
diff --git a/global.json b/global.json
index 7fde922c5..312a8e821 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,11 @@
 {
   "tools": {
-    "dotnet": "5.0.100-alpha1-015949"
+    "dotnet": "5.0.100-preview.1.20119.7",
+    "runtimes": {
+      "dotnet": [
+        "$(MicrosoftNETCoreAppRuntimePackageVersion)"
+      ]
+    }
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20127.9"
diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs
new file mode 100644
index 000000000..b133ea29c
--- /dev/null
+++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs
@@ -0,0 +1,79 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using NuGet.Versioning;
+
+namespace Microsoft.DotNet.Cli.Build
+{
+    public class CalculateTemplateVersions : Task
+    {
+        [Required]
+        public string AspNetCorePackageVersionTemplate { get; set; }
+
+        [Required]
+        public string VersionSuffix { get; set; }
+
+        [Output]
+        public string BundledTemplateInstallPath { get; set; }
+
+        [Output]
+        public string BundledTemplateMajorMinorVersion { get; set; }
+
+        [Output]
+        public string BundledTemplateMajorMinorPatchVersion { get; set; }
+
+        private const int _patchVersionResetOffset = 1;
+
+        public override bool Execute()
+        {
+            var result = Calculate(AspNetCorePackageVersionTemplate, VersionSuffix);
+            BundledTemplateInstallPath = result.BundledTemplateInstallPath;
+            BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion;
+            BundledTemplateMajorMinorPatchVersion = result.BundledTemplateMajorMinorPatchVersion;
+
+            return true;
+        }
+
+        public static
+            (string BundledTemplateInstallPath,
+            string BundledTemplateMajorMinorVersion,
+			string BundledTemplateMajorMinorPatchVersion) 
+            Calculate(
+                string aspNetCorePackageVersionTemplate,
+                string versionSuffix)
+        {
+            var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate);
+
+            NuGetVersion baseMajorMinorPatch = GetBaseMajorMinorPatch(aspNetCoreTemplate);
+
+            string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease
+                ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}"
+                : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}";
+
+            return (
+                bundledTemplateInstallPath,
+                $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}", 
+                $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}");
+        }
+
+        private static NuGetVersion GetBaseMajorMinorPatch(NuGetVersion aspNetCoreTemplate)
+        {
+            // due to historical bug https://github.com/dotnet/core-sdk/issues/6243
+            // we need to increase patch version by one in order to "reset" existing install ComponentId
+            // more in the above bug's detail.
+            // There is no non-deterministic existing ComponentId under Major version 5.
+            // so only apply the patch bump when below 5
+
+            int basePatch =
+                aspNetCoreTemplate.Major < 5
+                ? aspNetCoreTemplate.Patch + _patchVersionResetOffset
+                : aspNetCoreTemplate.Patch;
+
+            var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor,
+                basePatch);
+            return baseMajorMinorPatch;
+        }
+    }
+}
diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets
index d7fbc6051..bfcdaaf34 100644
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@@ -2,20 +2,20 @@
   <Target Name="SetSdkBrandingInfo">
     <PropertyGroup>
       <BuildName>cli</BuildName>
-      <SdkBrandName>Microsoft .NET Core SDK $(Version)</SdkBrandName>
-      <ToolsetBrandName>Microsoft .NET Core Toolset $(Version)</ToolsetBrandName>
+      <SdkBrandName>Microsoft .NET SDK $(Version)</SdkBrandName>
+      <ToolsetBrandName>Microsoft .NET Toolset $(Version)</ToolsetBrandName>
       <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
-      <SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
-      <NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
+      <SharedFrameworkBrandName>Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
+      <NetCoreAppTargetingPackBrandName>Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
       <NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
       <NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
-      <SharedHostBrandName>Microsoft .NET Core Host $(SharedHostVersion)</SharedHostBrandName>
-      <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
+      <SharedHostBrandName>Microsoft .NET Host $(SharedHostVersion)</SharedHostBrandName>
+      <HostFxrBrandName>Microsoft .NET Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
       <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
       <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
+      <BundledTemplates50BrandName>Microsoft .NET Core 5.0 Templates $(Version)</BundledTemplates50BrandName>
       <BundledTemplates31BrandName>Microsoft .NET Core 3.1 Templates $(Version)</BundledTemplates31BrandName>
       <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates $(Version)</BundledTemplates30BrandName>
-      <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates $(Version)</BundledTemplates22BrandName>
       <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates $(Version)</BundledTemplates21BrandName>
     </PropertyGroup>
   </Target>
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
index ba697f3fd..ed6fc9352 100644
--- a/src/redist/targets/BuildCoreSdkTasks.targets
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -19,6 +19,7 @@
              Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/>
   </Target>
 
+  <UsingTask TaskName="CalculateTemplateVersions" AssemblyFile="$(CoreSdkTaskDll)" />
   <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CoreSdkTaskDll)" />
   <UsingTask TaskName="DownloadFile" AssemblyFile="$(CoreSdkTaskDll)" />
   <UsingTask TaskName="ExtractArchiveToDirectory" AssemblyFile="$(CoreSdkTaskDll)" />
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 6c1301348..bdc8462e9 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -1,64 +1,66 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="CalculateTemplatesVersions" DependsOnTargets="SetupWixProperties">
-    <PropertyGroup>
-      <AspNetCore31VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor31Templates.IndexOf('-'))</AspNetCore31VersionPreReleaseSeparator>
-      <AspNetCore31VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor31Templates)</AspNetCore31VersionMajorMinorPatchVersion>
-      <AspNetCore31VersionMajorMinorPatchVersion Condition=" '$(AspNetCore31VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator)))</AspNetCore31VersionMajorMinorPatchVersion>
-      <BundledTemplates31InstallPath>$(AspNetCore31VersionMajorMinorPatchVersion)</BundledTemplates31InstallPath>
-      <BundledTemplates31InstallPath Condition=" '$(AspNetCore31VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates31InstallPath)-$(VersionSuffix)</BundledTemplates31InstallPath>
-      <Templates31VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates31VersionPatchSeparatorIndex>
-      <Templates31VersionPatchSeparatorIndex>$(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.', $(Templates31VersionPatchSeparatorIndex)))</Templates31VersionPatchSeparatorIndex>
-      <BundledTemplates31MajorMinorVersion>$(AspNetCore31VersionMajorMinorPatchVersion.Substring(0, $(Templates31VersionPatchSeparatorIndex)))</BundledTemplates31MajorMinorVersion>
 
-      <AspNetCore30VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor30Templates.IndexOf('-'))</AspNetCore30VersionPreReleaseSeparator>
-      <AspNetCore30VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor30Templates)</AspNetCore30VersionMajorMinorPatchVersion>
-      <AspNetCore30VersionMajorMinorPatchVersion Condition=" '$(AspNetCore30VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator)))</AspNetCore30VersionMajorMinorPatchVersion>
-      <BundledTemplates30InstallPath>$(AspNetCore30VersionMajorMinorPatchVersion)</BundledTemplates30InstallPath>
-      <BundledTemplates30InstallPath Condition=" '$(AspNetCore30VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates30InstallPath)-$(VersionSuffix)</BundledTemplates30InstallPath>
-      <Templates30VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates30VersionPatchSeparatorIndex>
-      <Templates30VersionPatchSeparatorIndex>$(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex)))</Templates30VersionPatchSeparatorIndex>
-      <BundledTemplates30MajorMinorVersion>$(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex)))</BundledTemplates30MajorMinorVersion>
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor50Templates)"
+                               VersionSuffix="$(VersionSuffix)">
+      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates50InstallPath" />
+      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates50MajorMinorVersion" />
+      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates50MajorMinorPatchVersion" />
+    </CalculateTemplateVersions>
 
-      <AspNetCore22VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor22Templates.IndexOf('-'))</AspNetCore22VersionPreReleaseSeparator>
-      <AspNetCore22VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor22Templates)</AspNetCore22VersionMajorMinorPatchVersion>
-      <AspNetCore22VersionMajorMinorPatchVersion Condition=" '$(AspNetCore22VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator)))</AspNetCore22VersionMajorMinorPatchVersion>
-      <BundledTemplates22InstallPath>$(AspNetCore22VersionMajorMinorPatchVersion)</BundledTemplates22InstallPath>
-      <BundledTemplates22InstallPath Condition=" '$(AspNetCore22VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates22InstallPath)-$(VersionSuffix)</BundledTemplates22InstallPath>
-      <Templates22VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates22VersionPatchSeparatorIndex>
-      <Templates22VersionPatchSeparatorIndex>$(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.', $(Templates22VersionPatchSeparatorIndex)))</Templates22VersionPatchSeparatorIndex>
-      <BundledTemplates22MajorMinorVersion>$(AspNetCore22VersionMajorMinorPatchVersion.Substring(0, $(Templates22VersionPatchSeparatorIndex)))</BundledTemplates22MajorMinorVersion>
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor31Templates)"
+                               VersionSuffix="$(VersionSuffix)">
+      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates31InstallPath" />
+      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates31MajorMinorVersion" />
+      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates31MajorMinorPatchVersion" />
+    </CalculateTemplateVersions>
 
-      <AspNetCore21VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor21Templates.IndexOf('-'))</AspNetCore21VersionPreReleaseSeparator>
-      <AspNetCore21VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor21Templates)</AspNetCore21VersionMajorMinorPatchVersion>
-      <AspNetCore21VersionMajorMinorPatchVersion Condition=" '$(AspNetCore21VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator)))</AspNetCore21VersionMajorMinorPatchVersion>
-      <BundledTemplates21InstallPath>$(AspNetCore21VersionMajorMinorPatchVersion)</BundledTemplates21InstallPath>
-      <BundledTemplates21InstallPath Condition=" '$(AspNetCore21VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates21InstallPath)-$(VersionSuffix)</BundledTemplates21InstallPath>
-      <Templates21VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates21VersionPatchSeparatorIndex>
-      <Templates21VersionPatchSeparatorIndex>$(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.', $(Templates21VersionPatchSeparatorIndex)))</Templates21VersionPatchSeparatorIndex>
-      <BundledTemplates21MajorMinorVersion>$(AspNetCore21VersionMajorMinorPatchVersion.Substring(0, $(Templates21VersionPatchSeparatorIndex)))</BundledTemplates21MajorMinorVersion>
-    </PropertyGroup>
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor30Templates)"
+                               VersionSuffix="$(VersionSuffix)">
+      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates30InstallPath" />
+      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates30MajorMinorVersion" />
+      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates30MajorMinorPatchVersion" />
+    </CalculateTemplateVersions>
+
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor21Templates)"
+                               VersionSuffix="$(VersionSuffix)">
+      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates21InstallPath" />
+      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates21MajorMinorVersion" />
+      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates21MajorMinorPatchVersion" />
+    </CalculateTemplateVersions>
 
     <GenerateMsiVersionFromFullVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
-                                       VersionMajorMinorPatch="$(AspNetCore31VersionMajorMinorPatchVersion)">
+                                       VersionMajorMinorPatch="$(BundledTemplates50MajorMinorPatchVersion)">
+      <Output TaskParameter="MsiVersion" PropertyName="BundledTemplates50MSIVersion" />
+    </GenerateMsiVersionFromFullVersion>
+
+    <GenerateMsiVersionFromFullVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
+                                       VersionMajorMinorPatch="$(BundledTemplates31MajorMinorPatchVersion)">
       <Output TaskParameter="MsiVersion" PropertyName="BundledTemplates31MSIVersion" />
     </GenerateMsiVersionFromFullVersion>
 
     <GenerateMsiVersionFromFullVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
-                                       VersionMajorMinorPatch="$(AspNetCore30VersionMajorMinorPatchVersion)">
+                                       VersionMajorMinorPatch="$(BundledTemplates30MajorMinorPatchVersion)">
       <Output TaskParameter="MsiVersion" PropertyName="BundledTemplates30MSIVersion" />
     </GenerateMsiVersionFromFullVersion>
 
     <GenerateMsiVersionFromFullVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
-                                       VersionMajorMinorPatch="$(AspNetCore22VersionMajorMinorPatchVersion)">
-      <Output TaskParameter="MsiVersion" PropertyName="BundledTemplates22MSIVersion" />
-    </GenerateMsiVersionFromFullVersion>
-
-    <GenerateMsiVersionFromFullVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
-                                       VersionMajorMinorPatch="$(AspNetCore21VersionMajorMinorPatchVersion)">
+                                       VersionMajorMinorPatch="$(BundledTemplates21MajorMinorPatchVersion)">
       <Output TaskParameter="MsiVersion" PropertyName="BundledTemplates21MSIVersion" />
     </GenerateMsiVersionFromFullVersion>
   </Target>
 
+  <ItemGroup>
+    <Bundled50Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates50PackageVersion)" />
+    <Bundled50Templates Include="Microsoft.DotNet.Common.ProjectTemplates.5.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates50PackageVersion)" />
+    <Bundled50Templates Include="Microsoft.DotNet.Test.ProjectTemplates.5.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates50PackageVersion)" />
+    <Bundled50Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates50PackageVersion)" />
+    <Bundled50Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates50PackageVersion)" />
+    <Bundled50Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor50Templates)" />
+    <Bundled50Templates Include="Microsoft.DotNet.Web.ProjectTemplates.5.0" PackageVersion="$(AspNetCorePackageVersionFor50Templates)" />
+    <Bundled50Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" PackageVersion="$(AspNetCorePackageVersionFor50Templates)" />
+    <Bundled50Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates50PackageVersion)" />
+  </ItemGroup>
   <ItemGroup>
     <Bundled31Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates31PackageVersion)" />
     <Bundled31Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.1" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates31PackageVersion)" />
@@ -66,8 +68,8 @@
     <Bundled31Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates31PackageVersion)" />
     <Bundled31Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates31PackageVersion)" />
     <Bundled31Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
-    <Bundled31Templates Include="Microsoft.DotNet.Web.ProjectTemplates.5.0" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
-    <Bundled31Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
     <Bundled31Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates31PackageVersion)" />
   </ItemGroup>
   <ItemGroup>
@@ -81,15 +83,6 @@
     <Bundled30Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" PackageVersion="$(AspNetCorePackageVersionFor30Templates)" />
     <Bundled30Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates30PackageVersion)" />
   </ItemGroup>
-  <ItemGroup>
-    <Bundled22Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates22PackageVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Common.ProjectTemplates.2.2" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates22PackageVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Test.ProjectTemplates.2.2" PackageVersion="$(MicrosoftDotNetTestProjectTemplates22PackageVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor22Templates)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Web.ProjectTemplates.2.2" PackageVersion="$(AspNetCorePackageVersionFor22Templates)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2" PackageVersion="$(AspNetCorePackageVersionFor22Templates)" />
-    <Bundled22Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates22PackageVersion)" />
-  </ItemGroup>
   <ItemGroup>
     <Bundled21Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates21PackageVersion)" />
     <Bundled21Templates Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates21PackageVersion)" />
@@ -100,6 +93,13 @@
     <Bundled21Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates21PackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Bundled50Templates Update="@(Bundled50Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled50Templates>
+  </ItemGroup>
   <ItemGroup>
     <Bundled31Templates Update="@(Bundled31Templates)">
       <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
@@ -114,13 +114,6 @@
       <Version>[%(PackageVersion)]</Version>
     </Bundled30Templates>
   </ItemGroup>
-  <ItemGroup>
-    <Bundled22Templates Update="@(Bundled22Templates)">
-      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
-      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
-      <Version>[%(PackageVersion)]</Version>
-    </Bundled22Templates>
-  </ItemGroup>
   <ItemGroup>
     <Bundled21Templates Update="@(Bundled21Templates)">
       <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
@@ -133,49 +126,50 @@
     <!-- PackageDownload items must not have duplicate itemspecs, handle packages with multiple versions specially below -->
 
     <PackageDownload Include="@(Bundled21Templates)" Exclude="@(PackageDownload)" />
-    <PackageDownload Include="@(Bundled22Templates)" Exclude="@(PackageDownload)" />
     <PackageDownload Include="@(Bundled30Templates)" Exclude="@(PackageDownload)" />
     <PackageDownload Include="@(Bundled31Templates)" Exclude="@(PackageDownload)" />
+    <PackageDownload Include="@(Bundled50Templates)" Exclude="@(PackageDownload)" />
 
     <PackageDownload Update="Microsoft.DotNet.Common.ItemTemplates"
                      Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)];
-                              [$(MicrosoftDotNetCommonItemTemplates22PackageVersion)];
                               [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
                               [$(MicrosoftDotNetCommonItemTemplates31PackageVersion)];
+                              [$(MicrosoftDotNetCommonItemTemplates50PackageVersion)];
                               " />
 
     <PackageDownload Update="Microsoft.DotNet.Web.Spa.ProjectTemplates"
                      Version="[$(AspNetCorePackageVersionFor21Templates)];
-                              [$(AspNetCorePackageVersionFor22Templates)];
                               " />
 
     <PackageDownload Update="Microsoft.DotNet.Web.ItemTemplates"
                      Version="[$(AspNetCorePackageVersionFor21Templates)];
-                              [$(AspNetCorePackageVersionFor22Templates)];
                               [$(AspNetCorePackageVersionFor30Templates)];
                               [$(AspNetCorePackageVersionFor31Templates)];
+                              [$(AspNetCorePackageVersionFor50Templates)];
                               " />
 
     <PackageDownload Update="NUnit3.DotNetNew.Template"
                      Version="[$(NUnit3Templates21PackageVersion)];
-                              [$(NUnit3Templates22PackageVersion)];
                               [$(NUnit3Templates30PackageVersion)];
                               [$(NUnit3Templates31PackageVersion)];
+                              [$(NUnit3Templates50PackageVersion)];
                               " />
 
    <PackageDownload Update="Microsoft.Dotnet.Wpf.ProjectTemplates"
                     Version="[$(MicrosoftDotnetWpfProjectTemplates30PackageVersion)];
                              [$(MicrosoftDotnetWpfProjectTemplates31PackageVersion)];
+                             [$(MicrosoftDotnetWpfProjectTemplates50PackageVersion)];
                              " />
 
     <PackageDownload Update="Microsoft.Dotnet.Winforms.ProjectTemplates"
                      Version="[$(MicrosoftDotnetWinFormsProjectTemplates30PackageVersion)];
                               [$(MicrosoftDotnetWinFormsProjectTemplates31PackageVersion)];
+                              [$(MicrosoftDotnetWinFormsProjectTemplates50PackageVersion)];
                              " />
   </ItemGroup>
 
   <Target Name="LayoutTemplates"
-        DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
+        DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor50MSI;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor21MSI" />
 
   <Target Name="LayoutTemplatesForSDK"
           DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
@@ -183,10 +177,16 @@
       <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
       <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
     </ItemGroup>
-    <Copy SourceFiles="%(Bundled31Templates.RestoredNupkgPath)"
-          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates31InstallPath)"/>
+    <Copy SourceFiles="%(Bundled50Templates.RestoredNupkgPath)"
+          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates50InstallPath)"/>
   </Target>
 
+  <Target Name="LayoutTemplatesFor50MSI"
+          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled50Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates50LayoutPath)templates/$(BundledTemplates50InstallPath)"/>
+  </Target>
   <Target Name="LayoutTemplatesFor31MSI"
           DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
           Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
@@ -201,13 +201,6 @@
           DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30InstallPath)"/>
   </Target>
 
-  <Target Name="LayoutTemplatesFor22MSI"
-          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
-          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
-    <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
-          DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/>
-  </Target>
-
   <Target Name="LayoutTemplatesFor21MSI"
           DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
           Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index f9560416e..d0db8d20c 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -4,7 +4,6 @@
     <SdkInternalLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet-internal\</SdkInternalLayoutPath>
     <Templates31LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.1\</Templates31LayoutPath>
     <Templates30LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.0\</Templates30LayoutPath>
-    <Templates22LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.2\</Templates22LayoutPath>
     <Templates21LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.1\</Templates21LayoutPath>
     <DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
   </PropertyGroup>
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 92fe716ee..41a28054d 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -41,7 +41,6 @@
       <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
       <Templates31MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates31MSIInstallerFile>
       <Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile>
-      <Templates22MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates22MSIInstallerFile>
       <Templates21MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates21MSIInstallerFile>
       <SdkPlaceholderMSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-sdkplaceholder-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkPlaceholderMSIInstallerFile>
       <SdkPlaceholderDependencyKeyName>NetCore_SdkPlaceholder</SdkPlaceholderDependencyKeyName>
@@ -83,7 +82,7 @@
           DependsOnTargets="GenerateLayout;SetupWixProperties">
     <!-- Consumed By Publish -->
     <ItemGroup>
-      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates31MSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates22MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates31MSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
     </ItemGroup>
 
     <GenerateMsiVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
@@ -108,11 +107,6 @@
           PropertyName="Templates30InstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <GenerateGuidFromName Name="$(Templates22MSIInstallerFile)">
-      <Output TaskParameter="OutputGuid"
-          PropertyName="Templates22InstallerUpgradeCode" />
-    </GenerateGuidFromName>
-
     <GenerateGuidFromName Name="$(Templates21MSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="Templates21InstallerUpgradeCode" />
@@ -237,14 +231,6 @@
         <UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode>
         <DependencyKeyName>NetCore_Templates_3.0</DependencyKeyName>
       </TemplatesMsiComponent>
-      <TemplatesMsiComponent Include="NetCore22TemplatesMsi">
-        <LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
-        <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
-        <BrandName>$(BundledTemplates22BrandName)</BrandName>
-        <MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
-        <UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode>
-        <DependencyKeyName>NetCore_Templates_2.2</DependencyKeyName>
-      </TemplatesMsiComponent>
       <TemplatesMsiComponent Include="NetCore21TemplatesMsi">
         <LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
         <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
@@ -368,11 +354,6 @@
         <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>
         <MajorMinorVersion>$(BundledTemplates30MajorMinorVersion)</MajorMinorVersion>
       </TemplatesNupkgComponent>
-      <TemplatesNupkgComponent Include="NetCore22TemplatesNupkg">
-        <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
-        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>
-        <MajorMinorVersion>$(BundledTemplates22MajorMinorVersion)</MajorMinorVersion>
-      </TemplatesNupkgComponent>
       <TemplatesNupkgComponent Include="NetCore21TemplatesNupkg">
         <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
         <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>
diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
index c6f771010..0d5eb9596 100644
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@@ -177,7 +177,6 @@
     <ItemGroup>
       <TemplatesMsiFilesToSign Include="$(Templates31MSIInstallerFile)" />
       <TemplatesMsiFilesToSign Include="$(Templates30MSIInstallerFile)" />
-      <TemplatesMsiFilesToSign Include="$(Templates22MSIInstallerFile)" />
       <TemplatesMsiFilesToSign Include="$(Templates21MSIInstallerFile)" />
       
       <TemplatesMsiFileSignInfo Include="@(TemplatesMsiFilesToSign->'%(Filename)%(Extension)')">
diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json
index bb4432fe8..077fcd95f 100644
--- a/src/redist/targets/packaging/deb/dotnet-debian_config.json
+++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json
@@ -6,7 +6,7 @@
     "install_root": "/usr/share/dotnet",
 
     "short_description": "%CLI_SDK_BRAND_NAME%",
-    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", 
+    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", 
     "homepage": "https://dotnet.github.io/core",                        
 
     "release":{
diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst
index 4ac4d35e4..4356a52e6 100644
--- a/src/redist/targets/packaging/deb/postinst
+++ b/src/redist/targets/packaging/deb/postinst
@@ -3,16 +3,16 @@ echo "This software may collect information about you and your use of the softwa
 echo "Please visit http://aka.ms/dotnet-cli-eula for more information."
 
 # Run 'dotnet new' to trigger the first time experience to initialize the cache
-echo "Welcome to .NET Core!
+echo "Welcome to .NET!
 ---------------------
-Learn more about .NET Core: https://aka.ms/dotnet-docs
+Learn more about .NET: https://aka.ms/dotnet-docs
 Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli-docs
 
 Telemetry
 ---------
-The .NET Core tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
+The .NET tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
 
-Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry
+Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry
 
 Configuring...
 --------------
diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
index 036710240..38d890a00 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
@@ -19,7 +19,7 @@
         <line choice="{SharedHostComponentId}.pkg" />
         <line choice="{CLISdkComponentId}.pkg"/>
     </choices-outline>
-    <choice id="{NetCoreAppTargetingPackComponentId}.pkg" visible="true" title="{NetCoreAppTargetingPackBrandName} (x64)" description="The .NET Core Targeting Pack">
+    <choice id="{NetCoreAppTargetingPackComponentId}.pkg" visible="true" title="{NetCoreAppTargetingPackBrandName} (x64)" description="The .NET Targeting Pack">
         <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
     </choice>
     <choice id="{NetStandardTargetingPackComponentId}.pkg" visible="true" title="{NetStandardTargetingPackBrandName} (x64)" description="The .NET Standard 2.1 Targeting Pack">
@@ -28,16 +28,16 @@
     <choice id="{NetCoreAppHostPackComponentId}.pkg" visible="true" title="{NetCoreAppHostPackBrandName} (x64)" description="The .NET App Host Pack">
         <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
     </choice>
-    <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
+    <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Shared Framework">
         <pkg-ref id="{SharedFxComponentId}.pkg" />
     </choice>
-    <choice id="{HostFxrComponentId}.pkg" visible="true" title="{HostFxrBrandName} (x64)" description="The .NET Core Host FX Resolver">
+    <choice id="{HostFxrComponentId}.pkg" visible="true" title="{HostFxrBrandName} (x64)" description="The .NET Host FX Resolver">
         <pkg-ref id="{HostFxrComponentId}.pkg" />
     </choice>
-    <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host.">
+    <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Shared Host.">
         <pkg-ref id="{SharedHostComponentId}.pkg" />
     </choice>
-    <choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
+    <choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET SDK">
         <pkg-ref id="{CLISdkComponentId}.pkg"/>
     </choice>
     <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
index ca05aa063..3aa06fcd9 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
index d87963bff..e9d205a1b 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
+                    <li>.NET SDK {DOTNETSDKVERSION}</li>
+                    <li>.NET Runtime {DOTNETRUNTIMEVERSION}</li>
                     <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
@@ -23,7 +23,7 @@
         <div align="left" style="font-family: Helvetica">
             <h2 style="padding-left:10px"> Resources </h2>
             <ul>
-                <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+                <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
                 <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
                 <li><a href="https://aka.ms/netcore3releasenotes">Release Notes</a></li>
                 <li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
index ca05aa063..d870f0949 100644
--- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
+++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -6,13 +6,13 @@
 <body>
     <br>
     <div align="left" style="font-family: Helvetica;padding-left:10px">
-        <h2>.NET Core SDK</h2>
-        <p>.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
+        <h2>.NET SDK</h2>
+        <p>.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</p>
     </div>
     <div align="left" style="font-family: Helvetica">
-        <h2 style="padding-left:10px">Learn more about .NET Core</h2>
+        <h2 style="padding-left:10px">Learn more about .NET</h2>
         <ul>
-            <li><a href="https://aka.ms/dotnet-docs">Core Documentation</a></li>
+            <li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
             <li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
             <li><a href="https://aka.ms/dev-privacy">Privacy Statement</a></li>
             <li><a href="https://aka.ms/dotnet-license">MIT License</a></li>
diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json
index c7fb4d267..e1ba8e1ee 100644
--- a/src/redist/targets/packaging/rpm/dotnet-config.json
+++ b/src/redist/targets/packaging/rpm/dotnet-config.json
@@ -6,7 +6,7 @@
     "install_root": "/usr/share/dotnet",
     "install_doc": "/usr/share/doc/%SDK_RPM_PACKAGE_NAME%/",
     "short_description": "%CLI_SDK_BRAND_NAME% %SDK_NUGET_VERSION%",
-    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
+    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
     "homepage": "https://github.com/dotnet/core",
     "release": {
         "package_version": "1.0.0.0",
diff --git a/src/redist/targets/packaging/rpm/scripts/after_install_host.sh b/src/redist/targets/packaging/rpm/scripts/after_install_host.sh
index 21999daaf..dbc0dabbe 100644
--- a/src/redist/targets/packaging/rpm/scripts/after_install_host.sh
+++ b/src/redist/targets/packaging/rpm/scripts/after_install_host.sh
@@ -7,16 +7,16 @@ echo "This software may collect information about you and your use of the softwa
 echo "Please visit http://aka.ms/dotnet-cli-eula for more information."
 
 # Run 'dotnet new' as the user to trigger the first time experience to initialize the cache
-echo "Welcome to .NET Core!
+echo "Welcome to .NET!
 ---------------------
-Learn more about .NET Core: https://aka.ms/dotnet-docs
+Learn more about .NET: https://aka.ms/dotnet-docs
 Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli-docs
 
 Telemetry
 ---------
-The .NET Core tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
+The .NET tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
 
-Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry
+Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry
 
 Configuring...
 --------------
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
index 2f466d46f..f65703c11 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">安裝成功。
 
 下列項目已安裝在: '[DOTNETHOME]'
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core Runtime [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
 
 此產品會收集使用方式資料
     • 如需詳細資訊或退出，請前往 https://aka.ms/dotnet-cli-telemetry
 
 資源
-    • 如需 .NET Core 文件，請前往 https://aka.ms/dotnet-docs
+    • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs
     • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs
     • 如需版本資訊，請前往 https://aka.ms/netcore3releasenotes
     • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core 是 Microsoft 支援的跨平台開放原始碼。您可以用它以 C#、F# 或 VB 建置下一個應用程式。希望您會喜歡!</String>
-  <String Id="LearnMoreTitle">深入了解 .NET Core</String>
+    .NET 是 Microsoft 支援的跨平台開放原始碼。您可以用它以 C#、F# 或 VB 建置下一個應用程式。希望您會喜歡!</String>
+  <String Id="LearnMoreTitle">深入了解 .NET</String>
   <String Id="ResourcesHeader">資源</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;核心文件&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK 文件&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
index 01ccfcc03..4820321d8 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">Instalace proběhla úspěšně.
 
 Do [DOTNETHOME] byly nainstalovány tyto součásti:
-    • Sada .NET Core SDK [DOTNETSDKVERSION]
-    • Modul runtime .NET Core [DOTNETRUNTIMEVERSION]
+    • Sada .NET SDK [DOTNETSDKVERSION]
+    • Modul runtime .NET [DOTNETRUNTIMEVERSION]
     • Modul runtime ASP.NET Core [ASPNETCOREVERSION]
-    • Modul runtime .NET Core Windows Desktop [WINFORMSANDWPFVERSION]
+    • Modul runtime .NET Windows Desktop [WINFORMSANDWPFVERSION]
 
 Tento produkt shromažďuje data o využití.
     • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry
 
 Zdroje informací
-    • Dokumentace k .NET Core: https://aka.ms/dotnet-docs
+    • Dokumentace k .NET: https://aka.ms/dotnet-docs
     • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs
     • Zpráva k vydání verze: https://aka.ms/netcore3releasenotes
     • Kurzy: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Sada .NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">Sada .NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core je opensourcová, víceplatformová architektura podporovaná společností Microsoft. Můžete ji použít k vytvoření své další aplikace v jazyce C#, F # nebo VB. Věříme, že s ní budete spokojeni.</String>
-  <String Id="LearnMoreTitle">Další informace o .NET Core</String>
+    .NET je opensourcová, víceplatformová architektura podporovaná společností Microsoft. Můžete ji použít k vytvoření své další aplikace v jazyce C#, F # nebo VB. Věříme, že s ní budete spokojeni.</String>
+  <String Id="LearnMoreTitle">Další informace o .NET</String>
   <String Id="ResourcesHeader">Prostředky</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Dokumentace k platformě Core&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Dokumentace k sadě SDK&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
index 7eafdc223..c96bed8ea 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">Die Installation war erfolgreich.
 
 Folgendes wurde unter [DOTNETHOME] installiert:
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core-Runtime [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core-Runtime [ASPNETCOREVERSION]
-    • .NET Core Windows Desktop-Runtime [WINFORMSANDWPFVERSION]
+    • .NET Windows Desktop-Runtime [WINFORMSANDWPFVERSION]
 
 Dieses Produkt erfasst Nutzungsdaten.
     • Weitere Informationen und Abbestellen: https://aka.ms/dotnet-cli-telemetry
 
 Ressourcen
-    • .NET Core-Dokumentation: https://aka.ms/dotnet-docs
+    • .NET-Dokumentation: https://aka.ms/dotnet-docs
     • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs
     • Versionshinweise: https://aka.ms/netcore3releasenotes
     • Tutorials: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    .Net Core ist eine plattformübergreifende Open-Source-Software, die von Microsoft unterstützt wird. Verwenden Sie sie zur Erstellung Ihrer nächsten App mit C#, F# oder VB. Wir wünschen Ihnen viel Spaß!</String>
-  <String Id="LearnMoreTitle">Weitere Informationen zu .NET Core</String>
+    .Net ist eine plattformübergreifende Open-Source-Software, die von Microsoft unterstützt wird. Verwenden Sie sie zur Erstellung Ihrer nächsten App mit C#, F# oder VB. Wir wünschen Ihnen viel Spaß!</String>
+  <String Id="LearnMoreTitle">Weitere Informationen zu .NET</String>
   <String Id="ResourcesHeader">Ressourcen</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Core-Dokumentation&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK-Dokumentation&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
index 00ec2114b..caf7b745c 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
@@ -50,31 +50,31 @@
   <String Id="FirstTimeWelcomeMessage">The installation was successful.
 
 The following were installed at: '[DOTNETHOME]'
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core Runtime [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
 
 This product collects usage data
     • More information and opt-out https://aka.ms/dotnet-cli-telemetry
 
 Resources
-    • .NET Core Documentation https://aka.ms/dotnet-docs
+    • .NET Documentation https://aka.ms/dotnet-docs
     • SDK Documentation https://aka.ms/dotnet-sdk-docs
     • Release Notes https://aka.ms/netcore3releasenotes
     • Tutorials https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core is open source, cross-platform and supported by Microsoft. You can use it to build your next app, with C#, F# or VB. We hope you enjoy it!</String>
-  <String Id="LearnMoreTitle">Learn more about .NET Core</String>
+    .NET is open source, cross-platform and supported by Microsoft. You can use it to build your next app, with C#, F# or VB. We hope you enjoy it!</String>
+  <String Id="LearnMoreTitle">Learn more about .NET</String>
   <String Id="ResourcesHeader">Resources</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF=&quot;https://aka.ms/dotnet-docs&quot;&gt;Core Documentation&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF=&quot;https://aka.ms/dotnet-docs&quot;&gt;.NET Documentation&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF=&quot;https://aka.ms/dotnet-cli-docs&quot;&gt;SDK Documentation&lt;/A&gt;</String>
   <String Id="PrivacyStatementLink">&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Privacy Statement&lt;/A&gt;</String>
   <String Id="DotNetEulaLink">&lt;A HREF=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;.NET Library EULA&lt;/A&gt;</String>
   <String Id="InstallationNoteTitle">Installation note</String>
   <String Id="InstallationNote">A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.
   </String>
-  <String Id="VisualStudioWarning">If you plan to use .NET Core 3.1 with Visual Studio, Visual Studio 2019 16.4 or newer is required. &lt;A HREF=&quot;https://go.microsoft.com/fwlink/?linkid=866799&quot;&gt;Learn More&lt;/A&gt;.
+  <String Id="VisualStudioWarning">If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.6 or newer is required. &lt;A HREF=&quot;https://go.microsoft.com/fwlink/?linkid=866799&quot;&gt;Learn More&lt;/A&gt;.
   </String>
 </WixLocalization>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
index e86cda317..4ae70620f 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">L'installation a réussi.
 
 Les éléments suivants ont été installés sur : '[DOTNETHOME]'
-    • SDK .NET Core [DOTNETSDKVERSION]
-    • Runtime .NET Core [DOTNETRUNTIMEVERSION]
+    • SDK .NET [DOTNETSDKVERSION]
+    • Runtime .NET [DOTNETRUNTIMEVERSION]
     • Runtime ASP.NET Core [ASPNETCOREVERSION]
-    • Runtime .NET Core Windows Desktop [WINFORMSANDWPFVERSION]
+    • Runtime .NET Windows Desktop [WINFORMSANDWPFVERSION]
 
 Ce produit collecte des données d'utilisation
     • Pour plus d'informations ou pour vous y opposer, consultez https://aka.ms/dotnet-cli-telemetry
 
 Ressources
-    • Documentation .NET Core sur https://aka.ms/dotnet-docs
+    • Documentation .NET sur https://aka.ms/dotnet-docs
     • Documentation du kit SDK sur https://aka.ms/dotnet-sdk-docs
     • Notes de publication sur https://aka.ms/netcore3releasenotes
     • Tutoriels sur https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Kit SDK .NET Core</String>
+  <String Id="WelcomeHeaderMessage">Kit SDK .NET</String>
   <String Id="WelcomeDescription">
-    .NET Core est open source, multiplatforme et pris en charge par Microsoft. Vous pouvez l'utiliser pour créer votre prochaine application avec C#, F# ou VB. Nous espérons qu'il vous plaira !</String>
-  <String Id="LearnMoreTitle">En savoir plus sur .NET Core</String>
+    .NET est open source, multiplatforme et pris en charge par Microsoft. Vous pouvez l'utiliser pour créer votre prochaine application avec C#, F# ou VB. Nous espérons qu'il vous plaira !</String>
+  <String Id="LearnMoreTitle">En savoir plus sur .NET</String>
   <String Id="ResourcesHeader">Ressources</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentation Core&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentation du kit SDK&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
index bf1011a45..10ef2f2b5 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
@@ -50,25 +50,25 @@
   <String Id="FirstTimeWelcomeMessage">L'installazione è riuscita.
 
 I componenti seguenti sono stati installati in '[DOTNETHOME]'
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • Runtime di .NET Core [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • Runtime di .NET [DOTNETRUNTIMEVERSION]
     • Runtime di ASP.NET Core [ASPNETCOREVERSION]
-    • Runtime di .NET Core Windows Desktop [WINFORMSANDWPFVERSION]
+    • Runtime di .NET Windows Desktop [WINFORMSANDWPFVERSION]
 
 Questo prodotto consente di raccogliere i dati sull'utilizzo
     • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry
 
 Resources
-    • Documentazione di .NET Core https://aka.ms/dotnet-docs
+    • Documentazione di .NET https://aka.ms/dotnet-docs
     • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs
     • Note sulla versione https://aka.ms/netcore3releasenotes
     • Esercitazioni https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core è open source, multipiattaforma e supportata da Microsoft. È possibile usarla per compilare la prossima app con C#, F# o VB.</String>
-  <String Id="LearnMoreTitle">Altre informazioni su .NET Core</String>
+    .NET è open source, multipiattaforma e supportata da Microsoft. È possibile usarla per compilare la prossima app con C#, F# o VB.</String>
+  <String Id="LearnMoreTitle">Altre informazioni su .NET</String>
   <String Id="ResourcesHeader">Risorse</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentazione di .NET Core&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentazione di .NET&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentazione dell'SDK&lt;/A&gt;</String>
   <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Informativa sulla privacy&lt;/A&gt;</String>
   <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Condizioni di licenza della libreria .NET&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
index dbb089d4d..40d75f8cb 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">インストールが成功しました。
 
 '[DOTNETHOME]' に以下がインストールされました
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core Runtime [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
 
 この製品は使用データを収集します
     • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry
 
 リソース
-    • .NET Core ドキュメント https://aka.ms/dotnet-docs
+    • .NET ドキュメント https://aka.ms/dotnet-docs
     • SDK ドキュメント https://aka.ms/dotnet-sdk-docs
     • リリース ノート https://aka.ms/netcore3releasenotes
     • チュートリアル https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core は、オープンソースまたはクロスプラットフォームで、Microsoft によってサポートされています。これを使用して、C#、F # または VB で次のアプリをビルドできます。お楽しみいただければ幸いです。</String>
-  <String Id="LearnMoreTitle">.Net Core の詳細</String>
+    .NET は、オープンソースまたはクロスプラットフォームで、Microsoft によってサポートされています。これを使用して、C#、F # または VB で次のアプリをビルドできます。お楽しみいただければ幸いです。</String>
+  <String Id="LearnMoreTitle">.Net の詳細</String>
   <String Id="ResourcesHeader">リソース</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;コア ドキュメント&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK ドキュメント&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
index 77733390d..fc4e2273a 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">설치가 완료되었습니다.
 
 다음이 '[DOTNETHOME]'에 설치되었습니다.
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core 런타임 [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET 런타임 [DOTNETRUNTIMEVERSION]
     • ASP.NET Core 런타임 [ASPNETCOREVERSION]
-    • .NET Core Windows 데스크톱 런타임 [WINFORMSANDWPFVERSION]
+    • .NET Windows 데스크톱 런타임 [WINFORMSANDWPFVERSION]
 
 이 제품은 사용량 데이터를 수집합니다.
     • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry
 
 리소스
-    • .NET Core 설명서 https://aka.ms/dotnet-docs
+    • .NET 설명서 https://aka.ms/dotnet-docs
     • SDK 설명서 https://aka.ms/dotnet-sdk-docs
     • 릴리스 정보 https://aka.ms/netcore3releasenotes
     • 자습서 https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    Microsoft가 지원하는 플랫폼 간 오픈 소스인 .NET Core를 사용하여 C#, F# 또는 VB로 다음 앱을 빌드할 수 있습니다. .NET Core를 유용하게 사용하시길 바랍니다.</String>
-  <String Id="LearnMoreTitle">.NET Core에 대한 자세한 정보</String>
+    Microsoft가 지원하는 플랫폼 간 오픈 소스인 .NET를 사용하여 C#, F# 또는 VB로 다음 앱을 빌드할 수 있습니다. .NET를 유용하게 사용하시길 바랍니다.</String>
+  <String Id="LearnMoreTitle">.NET 에 대한 자세한 정보</String>
   <String Id="ResourcesHeader">리소스</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Core 설명서&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK 설명서&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
index bca5c6a30..a0344ed83 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">Instalacja zakończyła się pomyślnie.
 
 Następujące elementy zostały zainstalowane w: „[DOTNETHOME]”
-    • Zestaw .NET Core SDK [DOTNETSDKVERSION]
-    • Środowisko uruchomieniowe platformy .NET Core [DOTNETRUNTIMEVERSION]
+    • Zestaw .NET SDK [DOTNETSDKVERSION]
+    • Środowisko uruchomieniowe platformy .NET [DOTNETRUNTIMEVERSION]
     • Środowisko uruchomieniowe platformy ASP.NET Core [ASPNETCOREVERSION]
-    • Środowisko uruchomieniowe platformy .NET Core systemu Windows Desktop [WINFORMSANDWPFVERSION]
+    • Środowisko uruchomieniowe platformy .NET systemu Windows Desktop [WINFORMSANDWPFVERSION]
 
 Ten produkt gromadzi dane dotyczące użycia
     • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry
 
 Zasoby
-    • Dokumentacja platformy .NET Core: https://aka.ms/dotnet-docs
+    • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs
     • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs
     • Informacje o wersji: https://aka.ms/netcore3releasenotes
     • Samouczki: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Zestaw .NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">Zestaw .NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core to przeznaczone na wiele platform rozwiązanie typu open source obsługiwane przez firmę Microsoft. Za jego pomocą możesz utworzyć swoją następną aplikację, korzystając z języka C#, F# lub VB. Mamy nadzieję, że Ci się spodoba.</String>
-  <String Id="LearnMoreTitle">Dowiedz się więcej o platformie .NET Core</String>
+    .NET to przeznaczone na wiele platform rozwiązanie typu open source obsługiwane przez firmę Microsoft. Za jego pomocą możesz utworzyć swoją następną aplikację, korzystając z języka C#, F# lub VB. Mamy nadzieję, że Ci się spodoba.</String>
+  <String Id="LearnMoreTitle">Dowiedz się więcej o platformie .NET</String>
   <String Id="ResourcesHeader">Zasoby</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Dokumentacja programu Core&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Dokumentacja zestawu SDK&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
index 64fc19ce7..f494508f5 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">A instalação foi bem-sucedida.
 
 O seguinte foi instalado em: '[DOTNETHOME]'
-    • SDK do .NET Core [DOTNETSDKVERSION]
-    • Runtime do .NET Core [DOTNETRUNTIMEVERSION]
+    • SDK do .NET [DOTNETSDKVERSION]
+    • Runtime do .NET [DOTNETRUNTIMEVERSION]
     • Runtime do ASP.NET Core [ASPNETCOREVERSION]
-    • Runtime da Área de Trabalho do Windows do .NET Core [WINFORMSANDWPFVERSION]
+    • Runtime da Área de Trabalho do Windows do .NET [WINFORMSANDWPFVERSION]
 
 Este produto coleta dados de uso
     • Para obter mais informações e recusar, acesse https://aka.ms/dotnet-cli-telemetry
 
 Recursos
-    • Documentação do .NET Core: https://aka.ms/dotnet-docs
+    • Documentação do .NET: https://aka.ms/dotnet-docs
     • Documentação do SDK: https://aka.ms/dotnet-sdk-docs
     • Notas sobre a Versão: https://aka.ms/netcore3releasenotes
     • Tutoriais: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">SDK do .NET Core</String>
+  <String Id="WelcomeHeaderMessage">SDK do .NET</String>
   <String Id="WelcomeDescription">
-    O .NET Core é um software livre, multiplataforma e com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste!</String>
-  <String Id="LearnMoreTitle">Saiba mais sobre o .NET Core</String>
+    O .NET é um software livre, multiplataforma e com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste!</String>
+  <String Id="LearnMoreTitle">Saiba mais sobre o .NET</String>
   <String Id="ResourcesHeader">Recursos</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentação Principal&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentação do SDK&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
index 24b39c71e..9ca119ea0 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
@@ -63,10 +63,10 @@
     • Документация по SDK: https://aka.ms/dotnet-sdk-docs
     • Заметки о выпуске: https://aka.ms/netcore3releasenotes
     • Учебники: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Пакет SDK для .NET Core</String>
+  <String Id="WelcomeHeaderMessage">Пакет SDK для .NET</String>
   <String Id="WelcomeDescription">
     .NET Core — это кроссплатформенное решение с открытым кодом, поддерживаемое корпорацией Майкрософт. Создавайте с его помощью приложения на C#, F# и Visual Basic. Надеемся, оно вам понравится!</String>
-  <String Id="LearnMoreTitle">Дополнительные сведения о .NET Core</String>
+  <String Id="LearnMoreTitle">Дополнительные сведения о .NET</String>
   <String Id="ResourcesHeader">Ресурсы</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Документация по продукту Core&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Документация по пакету SDK&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
index 3901f8edf..836150aca 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">Yükleme başarılı oldu.
 
 Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]'
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core Çalışma Zamanı [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET Çalışma Zamanı [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Çalışma Zamanı [ASPNETCOREVERSION]
-    • .NET Core Windows Masaüstü Çalışma Zamanı [WINFORMSANDWPFVERSION]
+    • .NET Windows Masaüstü Çalışma Zamanı [WINFORMSANDWPFVERSION]
 
 Bu ürün, kullanım verilerini toplar
     • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry
 
 Kaynaklar
-    • .NET Core Belgeleri https://aka.ms/dotnet-docs
+    • .NET Belgeleri https://aka.ms/dotnet-docs
     • SDK Belgeleri https://aka.ms/dotnet-sdk-docs
     • Sürüm Notları https://aka.ms/netcore3releasenotes
     • Öğreticiler https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK'sı</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK'sı</String>
   <String Id="WelcomeDescription">
-    .NET Core açık kaynaktır, platformlar arası çalışır ve Microsoft tarafından desteklenir. C#, F# veya VB kullanarak sonraki uygulamanızı geliştirmek için .NET Core'u kullanabilirsiniz. Keyifle kullanmanızı dileriz!</String>
-  <String Id="LearnMoreTitle">.NET Core hakkında daha fazla bilgi edinin</String>
+    .NET açık kaynaktır, platformlar arası çalışır ve Microsoft tarafından desteklenir. C#, F# veya VB kullanarak sonraki uygulamanızı geliştirmek için .NET'u kullanabilirsiniz. Keyifle kullanmanızı dileriz!</String>
+  <String Id="LearnMoreTitle">.NET hakkında daha fazla bilgi edinin</String>
   <String Id="ResourcesHeader">Kaynaklar</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Çekirdek Belgeler&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK Belgeleri&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
index bd5239579..8b5f2100b 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">已成功安装。
 
 下列项安装于: “[DOTNETHOME]”
-    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core Runtime [DOTNETRUNTIMEVERSION]
+    • .NET SDK [DOTNETSDKVERSION]
+    • .NET Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
 
 此产品会收集用法数据
     • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry
 
 资源
-    • .NET Core 文档: https://aka.ms/dotnet-docs
+    • .NET 文档: https://aka.ms/dotnet-docs
     • SDK 文档: https://aka.ms/dotnet-sdk-docs
     • 发行说明: https://aka.ms/netcore3releasenotes
     • 教程: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">.NET Core SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
   <String Id="WelcomeDescription">
-    .NET Core 是开源、跨平台的，且由 Microsoft 提供支持。通过它，可使用 C#、F# 或 VB 构建你的下一个应用。希望你喜欢它!</String>
-  <String Id="LearnMoreTitle">了解有关 .NET Core 的详细信息</String>
+    .NET 是开源、跨平台的，且由 Microsoft 提供支持。通过它，可使用 C#、F# 或 VB 构建你的下一个应用。希望你喜欢它!</String>
+  <String Id="LearnMoreTitle">了解有关 .NET 的详细信息</String>
   <String Id="ResourcesHeader">资源</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Core 文档&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK 文档&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
index 13e785c46..a2000af4d 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
@@ -50,23 +50,23 @@
   <String Id="FirstTimeWelcomeMessage">La instalación se realizó correctamente.
 
 Se instaló lo siguiente en: "[DOTNETHOME]"
-    • SDK de .NET Core [DOTNETSDKVERSION]
-    • .NET Core Runtime [DOTNETRUNTIMEVERSION]
+    • SDK de .NET [DOTNETSDKVERSION]
+    • .NET Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
 
 Este producto recopila datos de uso
     • Para más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry
 
 Recursos
-    • Documentación de .NET Core https://aka.ms/dotnet-docs
+    • Documentación de .NET https://aka.ms/dotnet-docs
     • Documentación del SDK https://aka.ms/dotnet-sdk-docs
     • Notas de la versión https://aka.ms/netcore3releasenotes
     • Tutoriales https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">SDK de .NET Core</String>
+  <String Id="WelcomeHeaderMessage">SDK de .NET</String>
   <String Id="WelcomeDescription">
-    .NET Core es una multiplataforma de código abierto admitida por Microsoft. Puede usarla para compilar su próxima aplicación con C#, F# o VB. Esperamos que la disfrute.</String>
-  <String Id="LearnMoreTitle">Más información sobre .NET Core</String>
+    .NET es una multiplataforma de código abierto admitida por Microsoft. Puede usarla para compilar su próxima aplicación con C#, F# o VB. Esperamos que la disfrute.</String>
+  <String Id="LearnMoreTitle">Más información sobre .NET</String>
   <String Id="ResourcesHeader">Recursos</String>
   <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentación principal&lt;/A&gt;</String>
   <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentación del SDK&lt;/A&gt;</String>
diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
index d19137f5c..3920119b3 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
@@ -31,7 +31,7 @@ function RunHeat
     # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
 
     $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment  `
-        -sreg -gg  `
+        -sreg -ag `
         -var var.DotnetSrc  `
         -cg InstallFiles  `
         -srd  `
diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
index a987c584c..7947d20a4 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
@@ -25,7 +25,7 @@ function RunHeat
     Write-Information "Running heat.."
 
     $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment  `
-        -sreg -gg  `
+        -sreg -ag `
         -var var.DotnetSrc  `
         -cg InstallFiles  `
         -srd  `
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index e0080792f..8a88bbc08 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -36,9 +36,7 @@ namespace EndToEnd.Tests
             var runCommand = new RunCommand()
                 .WithWorkingDirectory(projectDirectory)
                 .ExecuteWithCapturedOutput()
-                // Templates are still at 3.1 and will not run on 5.0, revert to commented out assertion when 5.0 templates land
-                //.Should().Pass().And.HaveStdOutContaining("Hello World!");
-                .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-core-applaunch");
+                .Should().Pass().And.HaveStdOutContaining("Hello World!");
 
             var binDirectory = new DirectoryInfo(projectDirectory).Sub("bin");
             binDirectory.Should().HaveFilesMatching("*.dll", SearchOption.AllDirectories);
@@ -80,10 +78,7 @@ namespace EndToEnd.Tests
             var runCommand = new RunCommand()
                 .WithWorkingDirectory(projectDirectory)
                 .ExecuteWithCapturedOutput()
-                // Templates are still at 3.1 and will not run on 5.0, revert to commented out assertion when 5.0 templates land
-                //.Should().Pass().And.HaveStdOutContaining("Hello World!");
-                .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-core-applaunch");
-
+                .Should().Pass().And.HaveStdOutContaining("Hello World!");
         }
 
         [Theory]
diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs
new file mode 100644
index 000000000..3d5082f32
--- /dev/null
+++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs
@@ -0,0 +1,49 @@
+using FluentAssertions;
+using Xunit;
+using Microsoft.DotNet.Cli.Build;
+
+namespace EndToEnd
+{
+    public class CalculateTemplateVersionsTests
+    {
+        [Fact]
+        public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds()
+        {
+            var result = CalculateTemplateVersions.Calculate("3.1.0", "dev");
+
+            result.Should()
+                .Be(("3.1.1", "3.1", "3.1.1"),
+                    "the patch is 1 higher than aspnetTemplateVersion " +
+                    "due to https://github.com/dotnet/core-sdk/issues/6243");
+        }
+
+        [Fact]
+        public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds()
+        {
+            var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "dev");
+
+            result.Should()
+                .Be(("3.0.1-dev", "3.0", "3.0.1"));
+        }
+
+        [Fact]
+        public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds()
+        {
+            var result = CalculateTemplateVersions.Calculate("5.1.0", "dev");
+
+            result.Should()
+                .Be(("5.1.0", "5.1", "5.1.0"),
+                     "the patch align with AspNetCoreTemplateMajorVersion again, " +
+                     "since there is no non-deterministic existing ComponentId under Major version 5.");
+        }
+
+        [Fact]
+        public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds()
+        {
+            var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "dev");
+
+            result.Should()
+                .Be(("5.0.0-dev", "5.0", "5.0.0"));
+        }
+    }
+}
diff --git a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
new file mode 100644
index 000000000..47b6ce517
--- /dev/null
+++ b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup>
+    <TargetFrameworks>$(CoreSdkTargetFramework);net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">$(CoreSdkTargetFramework)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="4.18.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\core-sdk-tasks\core-sdk-tasks.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file