diff --git a/tachyon-master.service b/tachyon-master.service
index 02d61f9..6bd4b0c 100644
--- a/tachyon-master.service
+++ b/tachyon-master.service
@@ -7,7 +7,7 @@ Wants=network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/tachyon-start.sh master
-ExecStop=/usr/bin/tachyon-killall.sh tachyon.Master
+ExecStop=/usr/bin/tachyon.sh killAll tachyon.master.TachyonMaster
 User=hdfs
 Group=hadoop
 LimitNOFILE=16384
diff --git a/tachyon-slave.service b/tachyon-slave.service
index 583f6e0..3dd2da6 100644
--- a/tachyon-slave.service
+++ b/tachyon-slave.service
@@ -7,7 +7,7 @@ Wants=network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/tachyon-start.sh worker NoMount
-ExecStop=/usr/bin/tachyon-killall.sh tachyon.Worker
+ExecStop=/usr/bin/tachyon.sh killAll tachyon.worker.TachyonWorker
 ExecReload=/bin/kill -HUP $MAINPID
 User=hdfs
 Group=hadoop