diff --git bin/prey bin/prey
index 5b5203ca..915abd76 100755
--- bin/prey
+++ bin/prey
@@ -4,11 +4,11 @@ PATH="$PATH:/usr/local/bin"
 dir="$(dirname $0)"
 [ -x "$dir/node" ] && node="$dir/node" || node="$(command -v node || command -v nodejs)"

-# if current file is a symlink (e.g. installed via npm) we'll append
+# if current file is a symlink (e.g. installed via pacman) we'll append
 # the relative path to where the package is actually installed.
 if [ -n "$(readlink $0 2> /dev/null)" ]; then
   rel="$(dirname $(readlink $0))"
-  dir="$dir/$rel"
+  dir="$rel"
 fi

 script="lib/agent/cli.js"
diff --git lib/conf/gui/linux/prey-config.py lib/conf/gui/linux/prey-config.py
index 51b4fc18..859b0191 100755
--- lib/conf/gui/linux/prey-config.py
+++ lib/conf/gui/linux/prey-config.py
@@ -44,7 +44,7 @@ OUT = STDOUT # None

 SCRIPT_PATH = os.sys.path[0]
 PACKAGE_PATH = SCRIPT_PATH + '/../../../..'
-PREY_BIN = PACKAGE_PATH + '/bin/prey'
+PREY_BIN = PACKAGE_PATH + '/bin/prey-tracker'
 PREY_CONFIG = PREY_BIN + ' config'

 PACKAGE_JSON = open(PACKAGE_PATH + '/package.json', 'r')
diff --git lib/conf/gui/linux/prey-config3.py lib/conf/gui/linux/prey-config3.py
index eec738f6..9815c90a 100755
--- lib/conf/gui/linux/prey-config3.py
+++ lib/conf/gui/linux/prey-config3.py
@@ -44,7 +44,7 @@ OUT = STDOUT  # None

 SCRIPT_PATH = os.sys.path[0]
 PACKAGE_PATH = SCRIPT_PATH + "/../../../.."
-PREY_BIN = PACKAGE_PATH + "/bin/prey"
+PREY_BIN = PACKAGE_PATH + "/bin/prey-tracker"
 PREY_CONFIG = PREY_BIN + " config"

 PACKAGE_JSON = open(PACKAGE_PATH + "/package.json", "r")
diff --git package.json package.json
index 895f44ec..c502916f 100644
--- package.json
+++ package.json
@@ -84,7 +84,7 @@
   },
   "main": "./lib/common",
   "bin": {
-    "prey": "./bin/prey"
+    "prey": "./bin/prey-tracker"
   },
   "directories": {
     "bin": "./bin",
@@ -93,12 +93,12 @@
     "test": "./test"
   },
   "scripts": {
-    "start": "./bin/prey",
-    "test": "./bin/prey test lib/agent/plugins test --recursive --reporter dot",
+    "start": "./bin/prey-tracker",
+    "test": "./bin/prey-tracker test lib/agent/plugins test --recursive --reporter dot",
     "coverage": "istanbul cover _mocha -- lib/agent/plugins test --recursive",
-    "postinstall": "./bin/prey config hooks post_install",
-    "postupdate": "./bin/prey config hooks post_install",
-    "preuninstall": "./bin/prey config hooks pre_uninstall"
+    "postinstall": "./bin/prey-tracker config hooks post_install",
+    "postupdate": "./bin/prey-tracker config hooks post_install",
+    "preuninstall": "./bin/prey-tracker config hooks pre_uninstall"
   },
   "bugs": {
     "url": "http://github.com/prey/prey-node-client/issues"