diff --git a/package/osx/package b/package/osx/package
index 6733870c4..2731b540c 100755
--- a/package/osx/package
+++ b/package/osx/package
@@ -6,7 +6,7 @@
 # more variables
 APP_PATH="${BUILD_DIR}/ground/openpilotgcs/bin/OpenPilot GCS.app"
 TEMP_FILE="${PACKAGE_DIR}/OpenPilot-temp.dmg"
-OUT_FILE="${PACKAGE_DIR}/${PACKAGE_NAME}${PACKAGE_SEP}${PACKAGE_LBL}.dmg"
+OUT_FILE="${PACKAGE_DIR}/../${PACKAGE_NAME}${PACKAGE_SEP}${PACKAGE_LBL}${PACKAGE_SEP}osx.dmg"
 VOL_NAME="OpenPilot"
 
 # prepare the stage
diff --git a/package/winx86/openpilotgcs.tpl b/package/winx86/openpilotgcs.tpl
index 4627bcaf1..f30158b4e 100644
--- a/package/winx86/openpilotgcs.tpl
+++ b/package/winx86/openpilotgcs.tpl
@@ -17,7 +17,7 @@
 !define PACKAGE_SEP "${PACKAGE_SEP}"
 !define PACKAGE_DIR "..\..\build\package-$${PACKAGE_LBL}"
 !define FIRMWARE_DIR "firmware-$${PACKAGE_LBL}"
-!define OUT_FILE "$${PACKAGE_NAME}$${PACKAGE_SEP}$${PACKAGE_LBL}$${PACKAGE_SEP}install.exe"
+!define OUT_FILE "$${PACKAGE_NAME}$${PACKAGE_SEP}$${PACKAGE_LBL}$${PACKAGE_SEP}win32.exe"
 
 ; Installer version info
 !define PRODUCT_VERSION "0.0.0.0"