diff --git a/source/build_native.sh b/source/build_native.sh
index 3b41057..89ac879 100755
--- a/source/build_native.sh
+++ b/source/build_native.sh
@@ -39,7 +39,7 @@ function build_native() {
     ninja -j"$JOBS"
 
     #upx ${BUILDDIR}/dropshell
-    cp "${BUILDDIR}/dropshell" "${OUTPUT_DIR}/dropshell.native"
+    cp "${BUILDDIR}/dropshell" "${OUTPUT_DIR}/dropshell.${ARCH}"
 
     cd "${PREVDIR}" || exit 1
 }
@@ -48,6 +48,6 @@ build_native
 
 echo "Auto-installing dropshell locally..."
 mkdir -p "${INSTALL_DIR}"
-cp "${OUTPUT_DIR}/dropshell.native" "${INSTALL_DIR}/dropshell"
+cp "${OUTPUT_DIR}/dropshell.${ARCH}" "${INSTALL_DIR}/dropshell"
 ds version
 echo "Build process completed!" 
diff --git a/source/build_production.sh b/source/build_production.sh
index 367a03f..2d7948c 100755
--- a/source/build_production.sh
+++ b/source/build_production.sh
@@ -4,9 +4,9 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 # Create output directory
 mkdir -p "${SCRIPT_DIR}/output"
-
+PREV_DIR=$(pwd)
 cd "${SCRIPT_DIR}"
-trap 'cd "${PREVDIR}"' EXIT
+trap 'cd "${PREV_DIR}"' EXIT
 
 function build_arch() {
     local arch=$1
diff --git a/source/test.sh b/source/test.sh
old mode 100644
new mode 100755
index b1de7d2..cac19ba
--- a/source/test.sh
+++ b/source/test.sh
@@ -7,6 +7,6 @@ ARCH=$(uname -m)
 PREV_DIR=$(pwd)
 trap 'cd "$PREV_DIR"' EXIT
 
-"$SCRIPT_DIR/output/dropshell_${ARCH}" list
-"$SCRIPT_DIR/output/dropshell_${ARCH}" help
+"$SCRIPT_DIR/output/dropshell.${ARCH}" hash "${SCRIPT_DIR}/test.sh"
+"$SCRIPT_DIR/output/dropshell.${ARCH}" help