diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index 68ae498633..37ff6aa4e4 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -2,7 +2,7 @@
 # OpenRA packaging script for Mac OSX
 
 if [ $# -ne "3" ]; then
-	echo "Usage: `basename $0` version files-dir outputdir"
+	echo "Usage: `basename $0` tag files-dir outputdir"
     exit 1
 fi
 
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 76f3a8abaf..8bba84b737 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -59,7 +59,7 @@ echo "Creating packages..."
     cd windows
     makensis -DSRCDIR="$BUILTDIR" OpenRA.nsi &> package.log
     if [ $? -eq 0 ]; then
-        mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$VERSION.exe
+        mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
     else
         echo "Windows package build failed, refer to windows/package.log."  
     fi
@@ -67,7 +67,7 @@ echo "Creating packages..."
 
 (
     cd osx
-    sh buildpackage.sh "$VERSION" "$BUILTDIR" "$OUTPUTDIR" &> package.log
+    sh buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" &> package.log
     if [ $? -ne 0 ]; then
         echo "OSX package build failed, refer to osx/package.log."
     fi
diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh
index ecae481302..469b4e7de7 100755
--- a/packaging/upload-all.sh
+++ b/packaging/upload-all.sh
@@ -9,10 +9,8 @@ FTPPATHBASE="openra.res0l.net"
 
 FTPPATH="$FTPPATHBASE/assets/downloads"
 
-mv $PKGDIR/OpenRA-$VERSION.exe $PKGDIR/OpenRA-$TYPE$VERSION.exe
-./uploader.sh windows $PKGDIR/OpenRA-$TYPE$VERSION.exe "$FTPSERVER" "$FTPPATH" "$3" "$4"
-mv $PKGDIR/OpenRA-$VERSION.zip $PKGDIR/OpenRA-$TYPE$VERSION.zip
-./uploader.sh mac $PKGDIR/OpenRA-$TYPE$VERSION.zip "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh windows $PKGDIR/OpenRA-$TAG.exe "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh mac $PKGDIR/OpenRA-$TAG.zip "$FTPSERVER" "$FTPPATH" "$3" "$4"
 
 LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`