diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs b/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
index 07adb25b94..f7735c1637 100644
--- a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// Creates a new <see cref="ActionContext"/>.
         /// </summary>
         /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
-        /// <param name="routeData">The <see cref="AspNet.Routing.RouteData"/> for the current request.</param>
+        /// <param name="routeData">The <see cref="AspNetCore.Routing.RouteData"/> for the current request.</param>
         /// <param name="actionDescriptor">The <see cref="Abstractions.ActionDescriptor"/> for the selected action.</param>
         public ActionContext(
             HttpContext httpContext,
@@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// Creates a new <see cref="ActionContext"/>.
         /// </summary>
         /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
-        /// <param name="routeData">The <see cref="AspNet.Routing.RouteData"/> for the current request.</param>
+        /// <param name="routeData">The <see cref="AspNetCore.Routing.RouteData"/> for the current request.</param>
         /// <param name="actionDescriptor">The <see cref="Abstractions.ActionDescriptor"/> for the selected action.</param>
         /// <param name="modelState">The <see cref="ModelStateDictionary"/>.</param>
         public ActionContext(
@@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Mvc
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="AspNet.Routing.RouteData"/> for the current request.
+        /// Gets or sets the <see cref="AspNetCore.Routing.RouteData"/> for the current request.
         /// </summary>
         /// <remarks>
         /// The property setter is provided for unit test purposes only.
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
index d8163fcc67..89a171d257 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc
         }
 
         /// <summary>
-        /// Gets the <see cref="AspNet.Routing.RouteData"/> for the executing action.
+        /// Gets the <see cref="AspNetCore.Routing.RouteData"/> for the executing action.
         /// </summary>
         public RouteData RouteData
         {
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
index 89cadc5c4d..2696e235ff 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels;
 namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
-    /// Contains the extension methods for <see cref="AspNet.Mvc.MvcOptions.Conventions"/>.
+    /// Contains the extension methods for <see cref="AspNetCore.Mvc.MvcOptions.Conventions"/>.
     /// </summary>
     public static class ApplicationModelConventionExtensions
     {
@@ -16,7 +16,7 @@ namespace Microsoft.Extensions.DependencyInjection
         /// Adds a <see cref="IControllerModelConvention"/> to all the controllers in the application.
         /// </summary>
         /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
-        /// in <see cref="AspNet.Mvc.MvcOptions"/>.</param>
+        /// in <see cref="AspNetCore.Mvc.MvcOptions"/>.</param>
         /// <param name="controllerModelConvention">The <see cref="IControllerModelConvention"/> which needs to be
         /// added.</param>
         public static void Add(
@@ -40,7 +40,7 @@ namespace Microsoft.Extensions.DependencyInjection
         /// Adds a <see cref="IActionModelConvention"/> to all the actions in the application.
         /// </summary>
         /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
-        /// in <see cref="AspNet.Mvc.MvcOptions"/>.</param>
+        /// in <see cref="AspNetCore.Mvc.MvcOptions"/>.</param>
         /// <param name="actionModelConvention">The <see cref="IActionModelConvention"/> which needs to be
         /// added.</param>
         public static void Add(
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Directives/ChunkTreeResult.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Directives/ChunkTreeResult.cs
index 37adacb14b..62a2605afd 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Directives/ChunkTreeResult.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Directives/ChunkTreeResult.cs
@@ -7,14 +7,14 @@ using Microsoft.AspNetCore.Razor.Chunks;
 namespace Microsoft.AspNetCore.Mvc.Razor.Directives
 {
     /// <summary>
-    /// Contains <see cref="AspNet.Razor.Chunks.ChunkTree"/> information.
+    /// Contains <see cref="AspNetCore.Razor.Chunks.ChunkTree"/> information.
     /// </summary>
     public class ChunkTreeResult
     {
         /// <summary>
         /// Initializes a new instance of <see cref="ChunkTreeResult"/>.
         /// </summary>
-        /// <param name="chunkTree">The <see cref="AspNet.Razor.Chunks.ChunkTree"/> generated from the file at the
+        /// <param name="chunkTree">The <see cref="AspNetCore.Razor.Chunks.ChunkTree"/> generated from the file at the
         /// given <paramref name="filePath"/>.</param>
         /// <param name="filePath">The path to the file that generated the given <paramref name="chunkTree"/>.</param>
         public ChunkTreeResult(ChunkTree chunkTree, string filePath)
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Directives
         }
 
         /// <summary>
-        /// The <see cref="AspNet.Razor.Chunks.ChunkTree"/> generated from the file at <see cref="FilePath"/>.
+        /// The <see cref="AspNetCore.Razor.Chunks.ChunkTree"/> generated from the file at <see cref="FilePath"/>.
         /// </summary>
         public ChunkTree ChunkTree { get; }
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/GeneratedTagHelperAttributeContext.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Host/GeneratedTagHelperAttributeContext.cs
index 9977e28708..ccdf885676 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/GeneratedTagHelperAttributeContext.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/GeneratedTagHelperAttributeContext.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
-    /// Contains information for the <see cref="AspNet.Razor.TagHelpers.ITagHelper"/> attribute code
+    /// Contains information for the <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/> attribute code
     /// generation process.
     /// </summary>
     public class GeneratedTagHelperAttributeContext
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Host/MvcRazorHost.cs
index 2f35958796..e113dbcfaa 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/MvcRazorHost.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/MvcRazorHost.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
             },
             new SetBaseTypeChunk
             {
-                // Microsoft.Aspnet.Mvc.Razor.RazorPage<TModel>
+                // Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>
                 TypeName = $"{BaseType}<{ChunkHelper.TModelToken}>",
                 // Set the Start to Undefined to prevent Razor design time code generation from rendering a line mapping
                 // for this chunk.
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
index 5bc5a54fd2..2e362e6ff9 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
@@ -13,7 +13,7 @@ using Microsoft.Extensions.Primitives;
 namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
 {
     /// <summary>
-    /// Utility methods for <see cref="AspNet.Razor.TagHelpers.ITagHelper"/>'s that support
+    /// Utility methods for <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s that support
     /// attributes containing file globbing patterns.
     /// </summary>
     public class GlobbingUrlBuilder
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs
index e33b965675..d5079b7d46 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs
@@ -4,15 +4,15 @@
 namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
 {
     /// <summary>
-    /// A mapping of a <see cref="AspNet.Razor.TagHelpers.ITagHelper"/> mode to its required attributes.
+    /// A mapping of a <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/> mode to its required attributes.
     /// </summary>
-    /// <typeparam name="TMode">The type representing the <see cref="AspNet.Razor.TagHelpers.ITagHelper"/>'s mode.</typeparam>
+    /// <typeparam name="TMode">The type representing the <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s mode.</typeparam>
     public class ModeAttributes<TMode>
     {
         /// <summary>
         /// Initializes a new instance of <see cref="ModeAttributes{TMode}"/>.
         /// </summary>
-        /// <param name="mode">The <see cref="AspNet.Razor.TagHelpers.ITagHelper"/>'s mode.</param>
+        /// <param name="mode">The <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s mode.</param>
         /// <param name="attributes">The names of attributes required for this mode.</param>
         public ModeAttributes(TMode mode, string[] attributes)
         {
@@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
         }
 
         /// <summary>
-        /// Gets the <see cref="AspNet.Razor.TagHelpers.ITagHelper"/>'s mode.
+        /// Gets the <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s mode.
         /// </summary>
         public TMode Mode { get; }
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilationResultTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
index c1668d6195..48bdbd201b 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
                 "test",
                 sourceFileContent: string.Empty,
                 compiledContent: string.Empty,
-                messages: Enumerable.Empty<AspNet.Diagnostics.DiagnosticMessage>());
+                messages: Enumerable.Empty<AspNetCore.Diagnostics.DiagnosticMessage>());
             var failures = new[] { compilationFailure };
             var result = new CompilationResult(failures);
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
index 63d51de48d..2261cb2fc0 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
@@ -492,7 +492,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
             var cache = new CompilerCache(fileProvider);
             var diagnosticMessages = new[]
             {
-                new AspNet.Diagnostics.DiagnosticMessage("message", "message", ViewPath, 1, 1, 1, 1)
+                new AspNetCore.Diagnostics.DiagnosticMessage("message", "message", ViewPath, 1, 1, 1, 1)
             };
             var compilationResult = new CompilationResult(new[]
             {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
index 418d3ef5c5..f676cd75f1 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
@@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
                 .AddSingleton(myService)
                 .AddSingleton(helper)
                 .AddSingleton<HtmlEncoder>(htmlEncoder)
-                .AddSingleton<DiagnosticSource>(new DiagnosticListener("Microsoft.Aspnet.Mvc"))
+                .AddSingleton<DiagnosticSource>(new DiagnosticListener("Microsoft.AspNetCore.Mvc"))
                 .BuildServiceProvider();
             var httpContext = new DefaultHttpContext
             {
@@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
                 .AddSingleton(myService)
                 .AddSingleton(helper)
                 .AddSingleton<HtmlEncoder>(htmlEncoder)
-                .AddSingleton<DiagnosticSource>(new DiagnosticListener("Microsoft.Aspnet.Mvc"))
+                .AddSingleton<DiagnosticSource>(new DiagnosticListener("Microsoft.AspNetCore.Mvc"))
                 .BuildServiceProvider();
             var httpContext = new DefaultHttpContext
             {