diff --git a/eng/Versions.props b/eng/Versions.props
index 28d8e0c693..7af521d08d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -166,7 +166,7 @@
     <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha.1.19602.5</MicrosoftEntityFrameworkCorePackageVersion>
-    <!-- Packages from aspnet/AspNetCore-Tooling -->
+    <!-- Packages from dotnet/aspnetcore-tooling -->
     <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-alpha.1.20056.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
     <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-alpha.1.20056.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
     <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-alpha.1.20056.3</MicrosoftCodeAnalysisRazorPackageVersion>
diff --git a/src/Components/Components/src/Rendering/RenderTreeBuilder.cs b/src/Components/Components/src/Rendering/RenderTreeBuilder.cs
index eaf0539876..3cc4aed9bf 100644
--- a/src/Components/Components/src/Rendering/RenderTreeBuilder.cs
+++ b/src/Components/Components/src/Rendering/RenderTreeBuilder.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
     // IMPORTANT
     //
     // Many of these names are used in code generation. Keep these in sync with the code generation code
-    // See: aspnet/AspNetCore-Tooling
+    // See: dotnet/aspnetcore-tooling
 
     /// <summary>
     /// Provides methods for building a collection of <see cref="RenderTreeFrame"/> entries.
diff --git a/src/Middleware/Diagnostics/src/README.md b/src/Middleware/Diagnostics/src/README.md
index b3e72bdd68..07e6ca9a57 100644
--- a/src/Middleware/Diagnostics/src/README.md
+++ b/src/Middleware/Diagnostics/src/README.md
@@ -3,7 +3,7 @@ ASP.NET Core Diagnostics
 
 ## Development
 
-Diagnostics middleware like `DeveloperExceptionPage` uses compiled Razor views. After updating the `*.cshtml` file you must run the [RazorPageGenerator](https://github.com/aspnet/AspNetCore-Tooling/tree/master/src/Razor/src/RazorPageGenerator) tool to generate an updated compiled Razor view.
+Diagnostics middleware like `DeveloperExceptionPage` uses compiled Razor views. After updating the `*.cshtml` file you must run the [RazorPageGenerator](https://github.com/dotnet/aspnetcore-tooling/tree/master/src/Razor/src/RazorPageGenerator) tool to generate an updated compiled Razor view.
 
 Run the following command in `AspNetCore-Tooling\src\Razor\src\RazorPageGenerator`:
 
diff --git a/src/Shared/ErrorPage/README.md b/src/Shared/ErrorPage/README.md
index 1f74a4e33a..cc0dbc377c 100644
--- a/src/Shared/ErrorPage/README.md
+++ b/src/Shared/ErrorPage/README.md
@@ -1,13 +1,13 @@
 # Error Page
 
-This folder is shared among multiple projects. The `ErrorPage.Designer.cs` and `ErrorPageModel.cs` files are used to render this view. The `ErrorPage.Designer.cs` file is generated by rendering `src/Views/ErrorPage.cshtml` using the [RazorPageGenerator](https://github.com/aspnet/AspNetCore-Tooling/tree/master/src/Razor/src/RazorPageGenerator) tool.
+This folder is shared among multiple projects. The `ErrorPage.Designer.cs` and `ErrorPageModel.cs` files are used to render this view. The `ErrorPage.Designer.cs` file is generated by rendering `src/Views/ErrorPage.cshtml` using the [RazorPageGenerator](https://github.com/dotnet/aspnetcore-tooling/tree/master/src/Razor/src/RazorPageGenerator) tool.
 
 ## Making changes to ErrorPage.cshtml
 
-1. Clone aspnet/AspNetCore-Tooling
+1. Clone dotnet/aspnetcore-tooling
 1. Run `./build.cmd` in **that repo**
 1. Edit the file
-1. Run the `GeneratePage` script, passing in the path to the `aspnet/AspNetCore-Tooling` repo root.
+1. Run the `GeneratePage` script, passing in the path to the `dotnet/aspnetcore-tooling` repo root.
 
 ```
 .\GeneratePage -ToolingRepoPath C:\Code\aspnet\AspNetCore-Tooling
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs b/src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
index c7d2d13e49..347c0d82ee 100644
--- a/src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
+++ b/src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
@@ -5,7 +5,7 @@ using System.Globalization;
 using System.Text;
 
 // Copied from
-// https://github.com/aspnet/AspNetCore-Tooling/blob/master/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CSharpIdentifier.cs
+// https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CSharpIdentifier.cs
 namespace Microsoft.Extensions.ApiDescription.Client
 {
     internal static class CSharpIdentifier