diff --git a/puppet/zulip/templates/supervisor/zulip.conf.template.erb b/puppet/zulip/templates/supervisor/zulip.conf.template.erb
index 1e0500b785..fbbdae4aef 100644
--- a/puppet/zulip/templates/supervisor/zulip.conf.template.erb
+++ b/puppet/zulip/templates/supervisor/zulip.conf.template.erb
@@ -26,7 +26,7 @@ directory=/home/zulip/deployments/current/
 <% if @tornado_multiprocess -%>
 [program:zulip-tornado]
 command=env PYTHONUNBUFFERED=1 /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:98%(process_num)02d
-process_name=port-98%(process_num)02d
+process_name=zulip-tornado-port-98%(process_num)02d
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
diff --git a/scripts/restart-server b/scripts/restart-server
index 7d88811aa5..6b318fa1aa 100755
--- a/scripts/restart-server
+++ b/scripts/restart-server
@@ -66,7 +66,7 @@ if tornado_processes > 1:
         # supervisord group where if any individual process is slow to
         # stop, the whole bundle stays stopped for an extended time.
         logging.info("Restarting Tornado process on port %s", p)
-        subprocess.check_call(["supervisorctl", "restart", f"zulip-tornado:port-{p}"])
+        subprocess.check_call(["supervisorctl", "restart", f"zulip-tornado:zulip-tornado-port-{p}"])
 else:
     logging.info("Restarting Tornado process")
     subprocess.check_call(["supervisorctl", "restart", "zulip-tornado", "zulip-tornado:*"])