diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 57b848a1..12f8c244 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -175,7 +175,7 @@ function start_sahara {
         service_protocol="http"
     fi
 
-    run_process sahara "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"
+    run_process sahara-all "$SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"
     run_process sahara-api "$SAHARA_BIN_DIR/sahara-api --config-file $SAHARA_CONF_FILE"
     run_process sahara-eng "$SAHARA_BIN_DIR/sahara-engine --config-file $SAHARA_CONF_FILE"
 
@@ -193,7 +193,7 @@ function start_sahara {
 # stop_sahara() - Stop running processes
 function stop_sahara {
     # Kill the Sahara screen windows
-    stop_process sahara
+    stop_process sahara-all
     stop_process sahara-api
     stop_process sahara-eng
 }
@@ -201,7 +201,7 @@ function stop_sahara {
 # is_sahara_enabled. This allows is_service_enabled sahara work
 # correctly throughout devstack.
 function is_sahara_enabled {
-    if is_service_enabled sahara-api || is_service_enabled sahara-eng; then
+    if is_service_enabled sahara-api || is_service_enabled sahara-eng || is_service_enabled sahara-all; then
         return 0
     else
         return 1
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 01315f0a..a6daa569 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -12,7 +12,7 @@ source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 
 source $BASE_DEVSTACK_DIR/lib/tls
-source $(dirname $(dirname $BASH_SOURCE))/plugin.sh
+source ${GITDIR[sahara]}/devstack/plugin.sh
 
 set -o xtrace