diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt
index 7af1a8a9..22bf0094 100644
--- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt
+++ b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt
@@ -266,7 +266,7 @@ GenerateTextForItems(EnumerableTypes, item =>
     // in 2-complement to perform the bounds check with a single compare operation.
     // This is the same trick used throughout CoreCLR as well.
     // For more info and code sample, see the original conversation here:
-    // https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/3131#discussion_r390682835
+    // https://github.com/CommunityToolkit/WindowsCommunityToolkit/pull/3131#discussion_r390682835
 #>
             if ((uint)index < (uint)<#=item.Name#>.<#=item.Size#>)
             {
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs
index b6dace09..15b98adb 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs
@@ -803,7 +803,7 @@ namespace UnitTests.HighPerformance
             Assert.AreEqual(span.Length, 0);
         }
 
-        // See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3947
+        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3947
         [TestCategory("Span2DT")]
         [TestMethod]
         public void Test_Span2DT_TryGetSpan_From1DArray_4()
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs
index 73aa9470..71047797 100644
--- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs
+++ b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs
@@ -78,7 +78,7 @@ namespace UnitTests.HighPerformance.Streams
             Assert.AreEqual(stream.Position, 32);
         }
 
-        // See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3536
+        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3536
         [TestCategory("MemoryStream")]
         [TestMethod]
         public void Test_MemoryStream_WriteToEndAndRefreshPosition()
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
index 1ccc27af..9d10fee3 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
@@ -511,7 +511,7 @@ namespace UnitTests.Mvvm
             messenger.Cleanup();
         }
 
-        // See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/4081
+        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4081
         [TestCategory("Mvvm")]
         [TestMethod]
         [DataRow(typeof(StrongReferenceMessenger))]
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
index 913581e2..b550ee3e 100644
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
+++ b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
@@ -468,7 +468,7 @@ namespace UnitTests.Mvvm
 
         /// <summary>
         /// Test model for linked properties, to test <see cref="ObservableValidator.ValidateProperty(object?, string?)"/> instance.
-        /// See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3665 for the original request for this feature.
+        /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3665 for the original request for this feature.
         /// </summary>
         public class ComparableModel : ObservableValidator
         {
@@ -522,7 +522,7 @@ namespace UnitTests.Mvvm
 
         /// <summary>
         /// Test model for custom validation properties.
-        /// See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3729 for the original request for this feature.
+        /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3729 for the original request for this feature.
         /// </summary>
         public class CustomValidationModel : ObservableValidator
         {
@@ -568,7 +568,7 @@ namespace UnitTests.Mvvm
 
         /// <summary>
         /// Test model for custom validation with an injected service.
-        /// See https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3750 for the original request for this feature.
+        /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3750 for the original request for this feature.
         /// </summary>
         public class ValidationWithServiceModel : ObservableValidator
         {
@@ -604,7 +604,7 @@ namespace UnitTests.Mvvm
 
         /// <summary>
         /// Test model for validation with a formatted display name string on each property.
-        /// This is issue #1 from https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3763.
+        /// This is issue #1 from https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3763.
         /// </summary>
         public class ValidationWithDisplayName : ObservableValidator
         {