diff --git a/bin/tachyon b/bin/tachyon
index 9122bcd..66cb2a2 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        \t Format Tachyon"
   echo -e "  tfs           \t Command line input for generic filesystem user client."
@@ -30,7 +30,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
@@ -43,15 +43,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.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.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.examples.BasicCheckpoint tachyon://$MASTER_ADDRESS:19998 /BasicCheckpoint 10
     exit 0
   fi
@@ -126,10 +126,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/src/main/java/tachyon/conf/CommonConf.java b/src/main/java/tachyon/conf/CommonConf.java
index aad1b53..7359cbb 100644
--- a/src/main/java/tachyon/conf/CommonConf.java
+++ b/src/main/java/tachyon/conf/CommonConf.java
@@ -43,14 +43,7 @@ public class CommonConf extends Utils {
   public final boolean ASYNC_ENABLED;
 
   private CommonConf() {
-    if (System.getProperty("tachyon.home") == null) {
-      LOG.warn("tachyon.home is not set. Using /mnt/tachyon_default_home as the default value.");
-      File file = new File("/mnt/tachyon_default_home");
-      if (!file.exists()) {
-        file.mkdirs();
-      }
-    }
-    TACHYON_HOME = getProperty("tachyon.home", "/mnt/tachyon_default_home");
+    TACHYON_HOME = getProperty("tachyon.home", "/var/lib/tachyon");
     WEB_RESOURCES = getProperty("tachyon.web.resources", TACHYON_HOME + "/src/main/java/tachyon/web/resources");
     UNDERFS_ADDRESS = getProperty("tachyon.underfs.address", TACHYON_HOME + "/underfs");
     UNDERFS_DATA_FOLDER = getProperty("tachyon.data.folder", UNDERFS_ADDRESS + "/tachyon/data");