diff --git a/NuGet/AvaloniaNative/buildTransitive/StaticLink.Avalonia.Native.targets b/NuGet/AvaloniaNative/buildTransitive/StaticLink.Avalonia.Native.targets
index 59a705b..cab1d51 100644
--- a/NuGet/AvaloniaNative/buildTransitive/StaticLink.Avalonia.Native.targets
+++ b/NuGet/AvaloniaNative/buildTransitive/StaticLink.Avalonia.Native.targets
@@ -1,17 +1,17 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <_StaticLinkAvaloniaNativeRid Condition="'$(RuntimeIdentifier)' == 'osx-x64'">osx-x64</_StaticLinkAvaloniaNativeRid>
-        <_StaticLinkAvaloniaNativeRid Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">osx-arm64</_StaticLinkAvaloniaNativeRid>
-        <_StaticLinkAvaloniaNativeRoot Condition="'$(_StaticLinkAvaloniaNativeRid)' != ''">$(StaticLinkAvaloniaNativeRoot)$(_StaticLinkAvaloniaNativeRid)/native</_StaticLinkAvaloniaNativeRoot>
+        <_StaticLinkAvaloniaNativePackageRid Condition="'$(RuntimeIdentifier)' == 'osx-x64'">osx-x64</_StaticLinkAvaloniaNativePackageRid>
+        <_StaticLinkAvaloniaNativePackageRid Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">osx-arm64</_StaticLinkAvaloniaNativePackageRid>
+        <_StaticLinkAvaloniaNativePackageRoot Condition="'$(_StaticLinkAvaloniaNativePackageRid)' != ''">$(StaticLinkAvaloniaNativeRoot)$(_StaticLinkAvaloniaNativePackageRid)/native</_StaticLinkAvaloniaNativePackageRoot>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(PublishAot)' == 'true' and '$(_StaticLinkAvaloniaNativeRoot)' != ''">
+    <ItemGroup Condition="'$(PublishAot)' == 'true' and '$(_StaticLinkAvaloniaNativePackageRoot)' != ''">
         <Compile Include="$(MSBuildThisFileDirectory)StaticLink.Avalonia.Native.MacOSFontWarmup.cs" Link="StaticLink.Avalonia.Native.MacOSFontWarmup.cs" Condition="Exists('$(MSBuildThisFileDirectory)StaticLink.Avalonia.Native.MacOSFontWarmup.cs')" />
         <DirectPInvoke Include="libAvaloniaNative" />
         <DirectPInvoke Include="libAvaloniaNative.dylib" />
         <DirectPInvoke Include="AvaloniaNative" />
-        <NativeLibrary Include="$(_StaticLinkAvaloniaNativeRoot)/macos_font_preinit.o" />
-        <NativeLibrary Include="$(_StaticLinkAvaloniaNativeRoot)/libAvaloniaNative.a" />
+        <NativeLibrary Include="$(_StaticLinkAvaloniaNativePackageRoot)/macos_font_preinit.o" />
+        <NativeLibrary Include="$(_StaticLinkAvaloniaNativePackageRoot)/libAvaloniaNative.a" />
         <NativeSystemLibrary Include="c++" />
         <LinkerArg Include="-framework AppKit" />
         <LinkerArg Include="-framework Carbon" />
@@ -25,7 +25,7 @@
 
     <Target Name="StaticLinkAvaloniaNativeAddMacOSDirectPInvokes"
             BeforeTargets="WriteIlcRspFileForCompilation"
-            Condition="'$(PublishAot)' == 'true' and '$(_StaticLinkAvaloniaNativeRoot)' != ''">
+            Condition="'$(PublishAot)' == 'true' and '$(_StaticLinkAvaloniaNativePackageRoot)' != ''">
         <PropertyGroup>
             <_StaticLinkAvaloniaNativeDirectPInvokeList>$(NativeIntermediateOutputPath)staticlink-avalonia-native.directpinvokes.txt</_StaticLinkAvaloniaNativeDirectPInvokeList>
         </PropertyGroup>
@@ -42,9 +42,9 @@
             <DirectPInvoke Include="AvaloniaNative" />
             <DirectPInvokeList Include="$(_StaticLinkAvaloniaNativeDirectPInvokeList)" />
         </ItemGroup>
-        <Error Condition="!Exists('$(_StaticLinkAvaloniaNativeRoot)/libAvaloniaNative.a')" Text="StaticLink.Avalonia.Native could not find $(_StaticLinkAvaloniaNativeRoot)/libAvaloniaNative.a. Check the package version and restore cache." />
-        <Error Condition="!Exists('$(_StaticLinkAvaloniaNativeRoot)/macos_font_preinit.o')" Text="StaticLink.Avalonia.Native could not find $(_StaticLinkAvaloniaNativeRoot)/macos_font_preinit.o. Check the package version and restore cache." />
-        <Message Importance="high" Text="StaticLink.Avalonia.Native Root: $(_StaticLinkAvaloniaNativeRoot)" />
+        <Error Condition="!Exists('$(_StaticLinkAvaloniaNativePackageRoot)/libAvaloniaNative.a')" Text="StaticLink.Avalonia.Native could not find $(_StaticLinkAvaloniaNativePackageRoot)/libAvaloniaNative.a. Check the package version and restore cache." />
+        <Error Condition="!Exists('$(_StaticLinkAvaloniaNativePackageRoot)/macos_font_preinit.o')" Text="StaticLink.Avalonia.Native could not find $(_StaticLinkAvaloniaNativePackageRoot)/macos_font_preinit.o. Check the package version and restore cache." />
+        <Message Importance="high" Text="StaticLink.Avalonia.Native Root: $(_StaticLinkAvaloniaNativePackageRoot)" />
         <Message Importance="high" Text="StaticLink.Avalonia.Native DirectPInvoke: @(DirectPInvoke)" />
         <Message Importance="high" Text="StaticLink.Avalonia.Native DirectPInvokeList: @(DirectPInvokeList)" />
         <Message Importance="high" Text="StaticLink.Avalonia.Native NativeLibrary: @(NativeLibrary)" />
@@ -52,7 +52,7 @@
 
     <Target Name="StaticLinkAvaloniaNativeCleanDynamicAssets"
             AfterTargets="Publish"
-            Condition="'$(PublishAot)' == 'true' and '$(_StaticLinkAvaloniaNativeRoot)' != ''">
+            Condition="'$(PublishAot)' == 'true' and '$(_StaticLinkAvaloniaNativePackageRoot)' != ''">
         <ItemGroup>
             <_StaticLinkAvaloniaNativeFilesToDelete Include="$(PublishDir)libAvaloniaNative.dylib" />
         </ItemGroup>