diff --git a/Directory.Build.props b/Directory.Build.props
index e80b26e3..6f062f3b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
         <Product>XAML Map Control</Product>
         <Authors>Clemens Fischer</Authors>
         <Copyright>Copyright © 2024 Clemens Fischer</Copyright>
-        <Version>10.5.0</Version>
+        <Version>11.0.0</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <SignAssembly>true</SignAssembly>
diff --git a/MBTiles/Avalonia/MBTiles.Avalonia.csproj b/MBTiles/Avalonia/MBTiles.Avalonia.csproj
index 3a725b19..a4a84c11 100644
--- a/MBTiles/Avalonia/MBTiles.Avalonia.csproj
+++ b/MBTiles/Avalonia/MBTiles.Avalonia.csproj
@@ -5,7 +5,7 @@
         <RootNamespace>MapControl.MBTiles</RootNamespace>
         <AssemblyTitle>XAML Map Control MBTiles Library for Avalonia UI</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl.MBTiles</PackageId>
+        <PackageId>XAML.MapControl.MBTiles.Avalonia</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>MBTiles library for XAML Map Control</Description>
     </PropertyGroup>
diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj
index 88bea573..f0950046 100644
--- a/MBTiles/WPF/MBTiles.WPF.csproj
+++ b/MBTiles/WPF/MBTiles.WPF.csproj
@@ -6,7 +6,7 @@
         <RootNamespace>MapControl.MBTiles</RootNamespace>
         <AssemblyTitle>XAML Map Control MBTiles Library for WPF</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl.MBTiles</PackageId>
+        <PackageId>XAML.MapControl.MBTiles.WPF</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>MBTiles library for XAML Map Control</Description>
     </PropertyGroup>
diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj
index 3c30f0b2..6633dc04 100644
--- a/MBTiles/WinUI/MBTiles.WinUI.csproj
+++ b/MBTiles/WinUI/MBTiles.WinUI.csproj
@@ -8,7 +8,7 @@
         <RootNamespace>MapControl.MBTiles</RootNamespace>
         <AssemblyTitle>XAML Map Control MBTiles Library for WinUI</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl.MBTiles</PackageId>
+        <PackageId>XAML.MapControl.MBTiles.WinUI</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>MBTiles library for XAML Map Control</Description>
     </PropertyGroup>
diff --git a/MapControl/Avalonia/MapControl.Avalonia.csproj b/MapControl/Avalonia/MapControl.Avalonia.csproj
index cc123a41..782afc30 100644
--- a/MapControl/Avalonia/MapControl.Avalonia.csproj
+++ b/MapControl/Avalonia/MapControl.Avalonia.csproj
@@ -6,7 +6,8 @@
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for Avalonia UI</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl</PackageId>
+        <PackageId>XAML.MapControl.Avalonia</PackageId>
+        <Title>$(AssemblyTitle)</Title>
         <Description>A set of Avalonia UI controls for rendering raster maps from different providers (like OpenStreetMap and Bing Maps) and various types of map overlays</Description>
     </PropertyGroup>
 
diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj
index 59656025..b207049c 100644
--- a/MapControl/WPF/MapControl.WPF.csproj
+++ b/MapControl/WPF/MapControl.WPF.csproj
@@ -6,7 +6,7 @@
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for WPF</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl</PackageId>
+        <PackageId>XAML.MapControl.WPF</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>A set of WPF controls for rendering raster maps from different providers (like OpenStreetMap and Bing Maps) and various types of map overlays</Description>
     </PropertyGroup>
diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj
index c4153771..56a85dc9 100644
--- a/MapControl/WinUI/MapControl.WinUI.csproj
+++ b/MapControl/WinUI/MapControl.WinUI.csproj
@@ -7,7 +7,8 @@
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for WinUI</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl</PackageId>
+        <PackageId>XAML.MapControl.WinUI</PackageId>
+        <Title>$(AssemblyTitle)</Title>
         <Description>A set of WinUI controls for rendering raster maps from different providers (like OpenStreetMap and Bing Maps) and various types of map overlays</Description>
     </PropertyGroup>
 
diff --git a/MapProjections/Avalonia/MapProjections.Avalonia.csproj b/MapProjections/Avalonia/MapProjections.Avalonia.csproj
index 9c471e32..b4ab08b2 100644
--- a/MapProjections/Avalonia/MapProjections.Avalonia.csproj
+++ b/MapProjections/Avalonia/MapProjections.Avalonia.csproj
@@ -5,7 +5,7 @@
         <RootNamespace>MapControl.Projections</RootNamespace>
         <AssemblyTitle>XAML Map Control Projections Library for Avalonia UI</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl.MapProjections</PackageId>
+        <PackageId>XAML.MapControl.MapProjections.Avalonia</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>Map projections library for XAML Map Control, based on ProjNET4GeoAPI</Description>
     </PropertyGroup>
diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj
index 4a10b2d1..bc5df138 100644
--- a/MapProjections/WPF/MapProjections.WPF.csproj
+++ b/MapProjections/WPF/MapProjections.WPF.csproj
@@ -6,7 +6,7 @@
         <RootNamespace>MapControl.Projections</RootNamespace>
         <AssemblyTitle>XAML Map Control Projections Library for WPF</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl.MapProjections</PackageId>
+        <PackageId>XAML.MapControl.MapProjections.WPF</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>Map projections library for XAML Map Control, based on ProjNET4GeoAPI</Description>
     </PropertyGroup>
diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj
index 3d41cafc..2940621f 100644
--- a/MapProjections/WinUI/MapProjections.WinUI.csproj
+++ b/MapProjections/WinUI/MapProjections.WinUI.csproj
@@ -8,7 +8,7 @@
         <RootNamespace>MapControl.Projections</RootNamespace>
         <AssemblyTitle>XAML Map Control Projections Library for WinUI</AssemblyTitle>
         <GeneratePackageOnBuild>$(GeneratePackage)</GeneratePackageOnBuild>
-        <PackageId>XAML.MapControl.MapProjections</PackageId>
+        <PackageId>XAML.MapControl.MapProjections.WinUI</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>Map projections library for XAML Map Control, based on ProjNET4GeoAPI</Description>
     </PropertyGroup>