diff --git a/CommunityToolkit.Common/CommunityToolkit.Common.csproj b/CommunityToolkit.Common/CommunityToolkit.Common.csproj
index 287fab518..5cb1d5c07 100644
--- a/CommunityToolkit.Common/CommunityToolkit.Common.csproj
+++ b/CommunityToolkit.Common/CommunityToolkit.Common.csproj
@@ -15,11 +15,6 @@
     </Description>
     <PackageTags>Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers</PackageTags>
   </PropertyGroup>
-	
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
-    <PackageId>Uno.Microsoft.Toolkit</PackageId>
-  </PropertyGroup>
 
   <!-- .NET Standard 2.1 and .NET 5 already have [NotNullIfNotNull] and [NotNullWhen] -->
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net5.0'">
@@ -31,5 +26,14 @@
     <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
+  
+  <!-- BEGIN UNO SPECIFIC -->
+  
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
+    <PackageId>Uno.CommunityToolkit.Common</PackageId>
+  </PropertyGroup>
+
+  <!-- END UNO SPECIFIC -->
 
 </Project>
\ No newline at end of file
diff --git a/CommunityToolkit.WinUI.UI.Controls/CommunityToolkit.WinUI.UI.Controls.csproj b/CommunityToolkit.WinUI.UI.Controls/CommunityToolkit.WinUI.UI.Controls.csproj
index b6c8ca06f..cca437669 100644
--- a/CommunityToolkit.WinUI.UI.Controls/CommunityToolkit.WinUI.UI.Controls.csproj
+++ b/CommunityToolkit.WinUI.UI.Controls/CommunityToolkit.WinUI.UI.Controls.csproj
@@ -32,6 +32,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
     <NoWarn>$(NoWarn);Uno0001;NU1701;CS0436</NoWarn>
+    <PackageId>Uno.CommunityToolkit.WinUI.UI.Controls</PackageId>
   </PropertyGroup>
   <!-- END UNO SPECIFIC -->