diff --git a/scripts/build-linux-deb.sh b/scripts/build-linux-deb.sh
index 7d5a665f..b24c5f3e 100755
--- a/scripts/build-linux-deb.sh
+++ b/scripts/build-linux-deb.sh
@@ -43,7 +43,7 @@ jpackage \
 # There doesn't appear to be a mechanism to set the output name without
 # changing the application name as well. So we just 'mv' it.
 SRC=$(find . -name "applecommander*.deb")
-DST="AppleCommander-${VERSION}-${ARCH}.deb"
+DST="AppleCommander-${version}-linux-${ARCH}.deb"
 mv -v ${SRC} ${DST}
 
 echo "Done!"
diff --git a/scripts/build-macos-dmg.sh b/scripts/build-macos-dmg.sh
index b9ed1af1..2f9bdddd 100755
--- a/scripts/build-macos-dmg.sh
+++ b/scripts/build-macos-dmg.sh
@@ -42,7 +42,7 @@ jpackage \
 # There doesn't appear to be a mechanism to set the output name without
 # changing the application name as well. So we just 'mv' it.
 SRC="AppleCommander-${VERSION}.dmg"
-DST="AppleCommander-${VERSION}-${ARCH}.dmg"
+DST="AppleCommander-${version}-mac-${ARCH}.dmg"
 mv -v ${SRC} ${DST}
 
 echo "Done!"
diff --git a/scripts/build-windows-msi.ps1 b/scripts/build-windows-msi.ps1
index ca47f6a3..1cb296a0 100755
--- a/scripts/build-windows-msi.ps1
+++ b/scripts/build-windows-msi.ps1
@@ -46,9 +46,9 @@ jpackage `
   --win-shortcut `
   --win-upgrade-uuid 4ea8ae7d-f155-4c10-af96-467cda0b343f
 
-if ($version -ne $props['version']) {
-  Write-Host "Renaming AppleCommander-${version}.msi to be AppleCommander-$($props['version']).msi to keep versions consistent."
-  Rename-Item -Path "AppleCommander-${version}.msi" -NewName "AppleCommander-$($props['version']).msi"
-}
+$src="AppleCommander-${version}.msi"
+$dst="AppleCommander-$($props['version'])-windows-${arch}.msi"
+Write-Host "Renaming ${src} to be ${dst} to keep versions consistent."
+Rename-Item -Path "${src}" -NewName "${dst}"
 
 Write-Host "Done!"