diff --git a/src/Tribufu.Native/Tribufu.Native.csproj b/src/Tribufu.Native/Tribufu.Native.csproj
index 9026066..feb26aa 100644
--- a/src/Tribufu.Native/Tribufu.Native.csproj
+++ b/src/Tribufu.Native/Tribufu.Native.csproj
@@ -18,9 +18,9 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
     <ItemGroup>
-        <None Include="..\..\vendor\windows-aarch64\tribufu_sdk.dll" Pack="true" PackagePath="runtimes\win-arm64\native\" />
-        <None Include="..\..\vendor\windows-i686\tribufu_sdk.dll" Pack="true" PackagePath="runtimes\win-x86\native\" />
-        <None Include="..\..\vendor\windows-x86_64\tribufu_sdk.dll" Pack="true" PackagePath="runtimes\win-x64\native\" />
+        <None Include="..\..\vendor\win-arm64\tribufu_sdk.dll" Pack="true" PackagePath="runtimes\win-arm64\native\" />
+        <None Include="..\..\vendor\win-x64\tribufu_sdk.dll" Pack="true" PackagePath="runtimes\win-x64\native\" />
+        <None Include="..\..\vendor\win-x86\tribufu_sdk.dll" Pack="true" PackagePath="runtimes\win-x86\native\" />
     </ItemGroup>
     <ItemGroup>
         <None Include="README.md" Pack="true" PackagePath="\" />
diff --git a/src/Tribufu.Utils/TribufuAppContext.cs b/src/Tribufu.Utils/TribufuAppContext.cs
index c8a9ac4..1939059 100644
--- a/src/Tribufu.Utils/TribufuAppContext.cs
+++ b/src/Tribufu.Utils/TribufuAppContext.cs
@@ -32,20 +32,13 @@ namespace Tribufu.Utils
         {
             var binDirectory = Path.Combine(GetBaseDirectory(), "bin");
 
-            switch (RuntimeInformation.RuntimeIdentifier)
+            if (!string.IsNullOrEmpty(RuntimeInformation.RuntimeIdentifier))
             {
-                case "win-x64":
-                    binDirectory = Path.Combine(binDirectory, "windows-x86_64");
-                    break;
-                case "osx-x64":
-                    binDirectory = Path.Combine(binDirectory, "mac-x86_64");
-                    break;
-                case "linux-x64":
-                    binDirectory = Path.Combine(binDirectory, "linux-x86_64");
-                    break;
-                default:
-                    binDirectory = Path.Combine(binDirectory, "dotnet");
-                    break;
+                binDirectory = Path.Combine(binDirectory, RuntimeInformation.RuntimeIdentifier);
+            }
+            else
+            {
+                binDirectory = Path.Combine(binDirectory, "dotnet");
             }
 
             return binDirectory;
diff --git a/vendor/windows-aarch64/tribufu_sdk.dll b/vendor/win-arm64/tribufu_sdk.dll
similarity index 100%
rename from vendor/windows-aarch64/tribufu_sdk.dll
rename to vendor/win-arm64/tribufu_sdk.dll
diff --git a/vendor/windows-x86_64/tribufu_sdk.dll b/vendor/win-x64/tribufu_sdk.dll
similarity index 100%
rename from vendor/windows-x86_64/tribufu_sdk.dll
rename to vendor/win-x64/tribufu_sdk.dll
diff --git a/vendor/windows-i686/tribufu_sdk.dll b/vendor/win-x86/tribufu_sdk.dll
similarity index 100%
rename from vendor/windows-i686/tribufu_sdk.dll
rename to vendor/win-x86/tribufu_sdk.dll