diff --git a/bin/tachyon b/bin/tachyon

index e40214b..bdf92c0 100755

--- a/bin/tachyon

+++ b/bin/tachyon

@@ -1,7 +1,7 @@

 #!/usr/bin/env bash

 function printUsage {

-  echo "Usage: tachyon COMMAND "

+  echo "Usage: tachyon.sh COMMAND "

   echo "where COMMAND is one of:"

   echo -e "  format [-s]   \t Format Tachyon (if -s specified, only format if underfs doesn't exist)"

   echo -e "  bootstrap-conf\t Generate a config file if one doesn't exist"

@@ -32,7 +32,7 @@ TACHYON_LIBEXEC_DIR=${TACHYON_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}

 . $TACHYON_LIBEXEC_DIR/tachyon-config.sh

 function runTest {

-  Usage="Usage: tachyon runTest <Basic|BasicRawTable> <MUST_CACHE|TRY_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"

+  Usage="Usage: tachyon.sh runTest <Basic|BasicRawTable> <MUST_CACHE|TRY_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"

   if [ "$#" -ne 2 ]; then

     echo $Usage

@@ -45,15 +45,15 @@ function runTest {

   fi

   if [[ "$1" == "Basic" ]]; then

-    $bin/tachyon tfs rm /BasicFile_$2

+    $bin/tachyon.sh tfs rm /BasicFile_$2

     $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR $TACHYON_JAVA_OPTS tachyon.examples.BasicOperations tachyon://$MASTER_ADDRESS:19998 /BasicFile_$2 $2

     exit 0

   elif [[ "$1" == "BasicRawTable" ]]; then

-    $bin/tachyon tfs rm /BasicRawTable_$2

+    $bin/tachyon.sh tfs rm /BasicRawTable_$2

     $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR $TACHYON_JAVA_OPTS tachyon.examples.BasicRawTableOperations tachyon://$MASTER_ADDRESS:19998 /BasicRawTable_$2 $2

     exit 0

   elif [[ "$1" == "BasicCheckpoint" ]]; then

-    $bin/tachyon tfs rm /BasicCheckpoint

+    $bin/tachyon.sh tfs rm /BasicCheckpoint

     $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR $TACHYON_JAVA_OPTS tachyon.examples.BasicCheckpoint tachyon://$MASTER_ADDRESS:19998 /BasicCheckpoint 10

     exit 0

   fi

@@ -150,7 +150,7 @@ if [ "$COMMAND" == "format" ]; then

     TACHYON_MASTER_ADDRESS=localhost

   fi

-  $bin/tachyon-slaves.sh $bin/tachyon formatWorker

+  $bin/tachyon-slaves.sh $bin/tachyon.sh formatWorker

   echo "Formatting Tachyon Master @ $TACHYON_MASTER_ADDRESS"

   CLASS=tachyon.Format

@@ -174,10 +174,10 @@ elif [ "$COMMAND" == "runTests" ]; then

   for op in ${opArr[@]}

   do

-    echo $bin/tachyon runTest Basic $op

-    $bin/tachyon runTest Basic $op

-    echo $bin/tachyon runTest BasicRawTable $op

-    $bin/tachyon runTest BasicRawTable $op

+    echo $bin/tachyon.sh runTest Basic $op

+    $bin/tachyon.sh runTest Basic $op

+    echo $bin/tachyon.sh runTest BasicRawTable $op

+    $bin/tachyon.sh runTest BasicRawTable $op

   done

   exit 0

diff --git a/bin/tachyon-stop.sh b/bin/tachyon-stop.sh

index d4e5c8f..24878a9 100755

--- a/bin/tachyon-stop.sh

+++ b/bin/tachyon-stop.sh

@@ -26,7 +26,7 @@ fi

 bin=`cd "$( dirname "$0" )"; pwd`

-$bin/tachyon killAll tachyon.master.TachyonMaster

-$bin/tachyon killAll tachyon.worker.TachyonWorker

+$bin/tachyon.sh killAll tachyon.master.TachyonMaster

+$bin/tachyon.sh killAll tachyon.worker.TachyonWorker

-$bin/tachyon-slaves.sh $bin/tachyon killAll tachyon.worker.TachyonWorker

\ No newline at end of file

+$bin/tachyon-slaves.sh $bin/tachyon.sh killAll tachyon.worker.TachyonWorker