diff --git a/app/build.sh b/app/build.sh
index 6f22a389a9..c5c76b27bf 100755
--- a/app/build.sh
+++ b/app/build.sh
@@ -211,7 +211,7 @@ if [ $BUILD_MAC == 1 ]; then
 	cp -Rp "$MAC_RUNTIME_PATH"/Contents/Resources/browser/omni "$app_dir"
 elif [ $BUILD_WIN == 1 ]; then
 	# Non-arch-specific files, so just use 64-bit version
-	cp -Rp "${WIN_RUNTIME_PATH_PREFIX}win64"/browser/omni "$app_dir"
+	cp -Rp "${WIN_RUNTIME_PATH_PREFIX}win-x64"/browser/omni "$app_dir"
 elif [ $BUILD_LINUX == 1 ]; then
 	# Non-arch-specific files, so just use 64-bit version
 	cp -Rp "${LINUX_RUNTIME_PATH_PREFIX}x86_64"/browser/omni "$app_dir"
@@ -654,7 +654,7 @@ if [ $BUILD_WIN == 1 ]; then
 	
 	fi
 	
-	for arch in "win32" "win64"; do
+	for arch in "win32" "win-x64"; do
 		echo "Building Zotero_$arch"
 		
 		runtime_path="${WIN_RUNTIME_PATH_PREFIX}${arch}"
@@ -667,7 +667,7 @@ if [ $BUILD_WIN == 1 ]; then
 		cp -R "$runtime_path"/!(application.ini|browser|defaults|devtools-files|crashreporter*|firefox.exe|maintenanceservice*|precomplete|removed-files|uninstall|update*) "$APPDIR"
 
 		# Copy vcruntime140_1.dll
-		if [ $arch = "win64" ]; then
+		if [ $arch = "win-x64" ]; then
 			cp "$CALLDIR/xulrunner/vc-$arch/vcruntime140_1.dll" "$APPDIR"
 		fi
 		
@@ -724,7 +724,7 @@ if [ $BUILD_WIN == 1 ]; then
 				# Build uninstaller
 				if [ "$arch" = "win32" ]; then
 					"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /V1 "`cygpath -w \"$BUILD_DIR/win_installer/uninstaller.nsi\"`"
-				elif [ "$arch" = "win64" ]; then
+				elif [ "$arch" = "win-x64" ]; then
 					"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /DHAVE_64BIT_OS /V1 "`cygpath -w \"$BUILD_DIR/win_installer/uninstaller.nsi\"`"
 				fi
 
@@ -744,7 +744,7 @@ if [ $BUILD_WIN == 1 ]; then
 				
 				if [ "$arch" = "win32" ]; then
 					INSTALLER_PATH="$DIST_DIR/Zotero-${VERSION}_win32_setup.exe"
-				elif [ "$arch" = "win64" ]; then
+				elif [ "$arch" = "win-x64" ]; then
 					INSTALLER_PATH="$DIST_DIR/Zotero-${VERSION}_x64_setup.exe"
 				fi
 				
@@ -770,7 +770,7 @@ if [ $BUILD_WIN == 1 ]; then
 				# Build and sign setup.exe
 				if [ "$arch" = "win32" ]; then	
 					"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /V1 "`cygpath -w \"$BUILD_DIR/win_installer/installer.nsi\"`"
-				elif [ "$arch" = "win64" ]; then
+				elif [ "$arch" = "win-x64" ]; then
 					"`cygpath -u \"${NSIS_DIR}makensis.exe\"`" /DHAVE_64BIT_OS /V1 "`cygpath -w \"$BUILD_DIR/win_installer/installer.nsi\"`"
 				fi
 
@@ -813,11 +813,7 @@ if [ $BUILD_WIN == 1 ]; then
 				echo 'Not building on Windows; only building zip file'
 			fi
 			cd "$STAGE_DIR"
-			if [ $arch = "win32" ]; then
-				zip -rqX "$DIST_DIR/Zotero-${VERSION}_$arch.zip" Zotero_$arch
-			elif [ $arch = "win64" ]; then
-				zip -rqX "$DIST_DIR/Zotero-${VERSION}_win-x64.zip" Zotero_$arch
-			fi
+			zip -rqX "$DIST_DIR/Zotero-${VERSION}_$arch.zip" Zotero_$arch
 		fi
 	done
 	
diff --git a/app/scripts/build_and_run b/app/scripts/build_and_run
index 97a50f250a..fc32b418c5 100755
--- a/app/scripts/build_and_run
+++ b/app/scripts/build_and_run
@@ -70,7 +70,7 @@ if [ "`uname`" = "Darwin" ]; then
 elif [ "`uname`" = "Linux" ]; then
 	command="Zotero_linux-x86_64/zotero"
 elif [ "`uname -o 2> /dev/null`" = "Cygwin" ]; then
-	command="Zotero_win64/zotero.exe"
+	command="Zotero_win-x64/zotero.exe"
 else
 	echo "Unknown platform" >&2
 	exit 1
diff --git a/app/scripts/check_requirements b/app/scripts/check_requirements
index 3b4f35bf45..a38e7db3a3 100755
--- a/app/scripts/check_requirements
+++ b/app/scripts/check_requirements
@@ -46,7 +46,7 @@ if [ $platform = "w" ]; then
 	which 7z || { $FAIL_CMD; FAILED=1; }
 	
 	echo "Checking for vcruntime140_1.dll: "
-	for arch in win64; do
+	for arch in win-x64; do
 		echo -n "  xulrunner/vc-$arch/vcruntime140_1.dll "
 		[ -f "$ROOT_DIR/xulrunner/vc-$arch/vcruntime140_1.dll" ] || { $FAIL_CMD; FAILED=1; }
 	done
diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner
index 58cda55b9a..2b55a9d610 100755
--- a/app/scripts/fetch_xulrunner
+++ b/app/scripts/fetch_xulrunner
@@ -348,13 +348,17 @@ if [ $BUILD_WIN == 1 ]; then
 	GECKO_VERSION="$GECKO_VERSION_WIN"
 	DOWNLOAD_URL="https://ftp.mozilla.org/pub/firefox/releases/$GECKO_VERSION"
 	
-	for arch in win32 win64; do
+	for arch in win32 win-x64; do
 		xdir=firefox-$arch
 		
 		rm -rf $xdir
 		mkdir $xdir
 		
-		curl -O "$DOWNLOAD_URL/$arch/en-US/Firefox%20Setup%20$GECKO_VERSION.exe"
+		if [ $arch = "win-x64" ]; then
+			curl -O "$DOWNLOAD_URL/win64/en-US/Firefox%20Setup%20$GECKO_VERSION.exe"
+		else
+			curl -O "$DOWNLOAD_URL/$arch/en-US/Firefox%20Setup%20$GECKO_VERSION.exe"
+		fi
 		
 		7z x Firefox%20Setup%20$GECKO_VERSION.exe -o$xdir 'core/*'
 		mv $xdir/core $xdir-core
diff --git a/app/update-packaging/build_autoupdate.sh b/app/update-packaging/build_autoupdate.sh
index 857e33d60a..1b297df3d8 100755
--- a/app/update-packaging/build_autoupdate.sh
+++ b/app/update-packaging/build_autoupdate.sh
@@ -260,14 +260,14 @@ for version in "$FROM" "$TO"; do
 done
 
 CHANGES_MADE=0
-for build in "mac" "win32" "win64" "linux-i686" "linux-x86_64"; do
+for build in "mac" "win32" "win-x64" "linux-i686" "linux-x86_64"; do
 	if [[ $build == "mac" ]]; then
 		if [[ $BUILD_MAC == 0 ]]; then
 			continue
 		fi
 		dir="Zotero.app"
 	else
-		if [[ $build == "win32" ]] || [[ $build == "win64" ]] && [[ $BUILD_WIN == 0 ]]; then
+		if [[ $build == "win32" ]] || [[ $build == "win-x64" ]] && [[ $BUILD_WIN == 0 ]]; then
 			continue
 		fi
 		if [[ $build == "linux-i686" ]] || [[ $build == "linux-x86_64" ]] && [[ $BUILD_LINUX == 0 ]]; then
diff --git a/app/update-packaging/removed-files_win64 b/app/update-packaging/removed-files_win-x64
similarity index 100%
rename from app/update-packaging/removed-files_win64
rename to app/update-packaging/removed-files_win-x64
diff --git a/app/win/update_exe b/app/win/update_exe
index 08c1b01e94..4581c98bd1 100755
--- a/app/win/update_exe
+++ b/app/win/update_exe
@@ -17,8 +17,12 @@ if [[ -z "${1:-}" ]]; then
 fi
 version=$1
 
-for arch in win32 win64; do
-	zip="firefox-$version.en-US.$arch.zip"
+for arch in win32 win-x64; do
+	if [ $arch = "win-x64" ]; then
+		zip="firefox-$version.en-US.win64.zip"
+	else
+		zip="firefox-$version.en-US.$arch.zip"
+	fi
 	if [ ! -f "$zip" ]; then
 		echo "$zip not found" >&2
 		exit 1
@@ -38,6 +42,6 @@ for arch in win32 win64; do
 	rm VersionInfo1.res
 done
 
-tar -Jcv zotero_win32.exe zotero_win64.exe > zotero.exe.tar.xz
+tar -Jcv zotero_win32.exe zotero_win-x64.exe > zotero.exe.tar.xz
 
-rm firefox-win??.exe zotero_win??.exe
+rm firefox-win*.exe zotero_win*.exe
diff --git a/app/win/zotero.exe.tar.xz b/app/win/zotero.exe.tar.xz
index 9071e078d9..73a3e3c0dc 100644
--- a/app/win/zotero.exe.tar.xz
+++ b/app/win/zotero.exe.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b717315893a9a291a62c89e2022a4e4378676444d3ac0e7db0bc38b4cfc0ac9
-size 398524
+oid sha256:82eec5f356baa5de8aab1ba663e8602675970b2c72bd254f8f52f834faf11c4b
+size 398472