diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
index c21578e707..50685bea4b 100644
--- a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
+++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
@@ -126,7 +126,7 @@ redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-missedmessage_reminders.log         ; stdout log path, NONE for none; default AUTO
 directory=/home/zulip/deployments/current/
 
-[program:humbug-events-slowqueries]
+[program:zulip-events-slowqueries]
 command=python /home/zulip/deployments/current/manage.py process_queue slow_queries
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
diff --git a/tools/restart-server b/tools/restart-server
index 99b910ebad..d8bf07d652 100755
--- a/tools/restart-server
+++ b/tools/restart-server
@@ -27,9 +27,9 @@ subprocess.check_call(["python", "./manage.py", "fill_memcached_caches"])
 
 # Restart the FastCGI and related processes via supervisorctl.
 logging.info("Killing daemons")
-subprocess.check_call(["supervisorctl", "stop", "humbug-workers:* humbug-django humbug-tornado"])
+subprocess.check_call(["supervisorctl", "stop", "zulip-workers:* zulip-django zulip-tornado"])
 subprocess.check_call(["ln", '-nsf', deploy_path, os.path.join(DEPLOYMENTS_DIR, "current")])
-subprocess.check_call(["supervisorctl", "start", "humbug-tornado humbug-django humbug-workers:*"])
+subprocess.check_call(["supervisorctl", "start", "zulip-tornado zulip-django zulip-workers:*"])
 
 logging.info("Done!")
 print OKGREEN + "Application restarted successfully!" + ENDC