diff --git a/dist-build/Makefile.am b/dist-build/Makefile.am
index 3486f7c2..f48c6efd 100644
--- a/dist-build/Makefile.am
+++ b/dist-build/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = \
 	android-mips32.sh \
 	android-mips64.sh \
 	android-x86.sh \
-	android-x86-64.sh \
+	android-x86_64.sh \
 	emscripten.sh \
 	ios.sh \
 	msys2-win32.sh \
diff --git a/dist-build/android-x86-64.sh b/dist-build/android-x86_64.sh
similarity index 83%
rename from dist-build/android-x86-64.sh
rename to dist-build/android-x86_64.sh
index 78fdb49b..b4b168e8 100755
--- a/dist-build/android-x86-64.sh
+++ b/dist-build/android-x86_64.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-export TARGET_ARCH=x86-64
+export TARGET_ARCH=x86_64
 export CFLAGS="-Os -march=${TARGET_ARCH}"
 ARCH=x86_64 HOST_COMPILER=x86_64-linux-android "$(dirname "$0")/android-build.sh"
diff --git a/dist-build/nativeclient-x86-64.sh b/dist-build/nativeclient-x86_64.sh
similarity index 90%
rename from dist-build/nativeclient-x86-64.sh
rename to dist-build/nativeclient-x86_64.sh
index 1da163c1..dbf7bc4a 100755
--- a/dist-build/nativeclient-x86-64.sh
+++ b/dist-build/nativeclient-x86_64.sh
@@ -3,7 +3,7 @@
 export NACL_SDK_ROOT=${NACL_SDK_ROOT-"/opt/nacl_sdk/pepper_49"}
 export NACL_TOOLCHAIN=${NACL_TOOLCHAIN-"${NACL_SDK_ROOT}/toolchain/mac_x86_glibc"}
 export NACL_BIN=${NACL_BIN-"${NACL_TOOLCHAIN}/bin"}
-export PREFIX="$(pwd)/libsodium-nativeclient-x86-64"
+export PREFIX="$(pwd)/libsodium-nativeclient-x86_64"
 export PATH="${NACL_BIN}:$PATH"
 export CFLAGS="-O3 -fomit-frame-pointer -fforce-addr"