diff --git a/servers/puppet/modules/zulip/files/nagios3/commands.cfg b/servers/puppet/modules/zulip/files/nagios3/commands.cfg
index a78b73f194..13345abf67 100644
--- a/servers/puppet/modules/zulip/files/nagios3/commands.cfg
+++ b/servers/puppet/modules/zulip/files/nagios3/commands.cfg
@@ -127,23 +127,8 @@ define command{
 }
 
 define command{
-        command_name    check_rabbitmq_tornado_consumers
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers tornado'
-}
-
-define command{
-        command_name    check_rabbitmq_useractivity_consumers
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers useractivity'
-}
-
-define command{
-        command_name    check_rabbitmq_signups_consumers
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers signups'
-}
-
-define command{
-        command_name    check_rabbitmq_invites_consumers
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers invites'
+        command_name    check_rabbitmq_consumers
+        command_line    /usr/lib/nagios/plugins/check_by_ssh -p 22 -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers $ARG1$'
 }
 
 define command{
diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg b/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg
index 9a809fa68c..89351423db 100644
--- a/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg
+++ b/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg
@@ -266,7 +266,7 @@ define service {
 define service {
         use                             generic-service
         service_description             Check rabbitmq notify_tornado consumers
-        check_command                   check_rabbitmq_tornado_consumers!22
+        check_command                   check_rabbitmq_consumers!notify_tornado
         # Workaround weird checks 40s after first error causing alerts
         # from a single failure because cron hasn't run again yet
         max_check_attempts              3
@@ -276,8 +276,8 @@ define service {
 
 define service {
         use                             generic-service
-        service_description             Check rabbitmq useractivity consumers
-        check_command                   check_rabbitmq_useractivity_consumers!22
+        service_description             Check rabbitmq user_activity consumers
+        check_command                   check_rabbitmq_consumers!user_activity
         # Workaround weird checks 40s after first error causing alerts
         # from a single failure because cron hasn't run again yet
         max_check_attempts              3
@@ -288,7 +288,7 @@ define service {
 define service {
         use                             generic-service
         service_description             Check rabbitmq invites consumers
-        check_command                   check_rabbitmq_invites_consumers!22
+        check_command                   check_rabbitmq_consumers!invites
         # Workaround weird checks 40s after first error causing alerts
         # from a single failure because cron hasn't run again yet
         max_check_attempts              3
@@ -299,7 +299,7 @@ define service {
 define service {
         use                             generic-service
         service_description             Check rabbitmq signups consumers
-        check_command                   check_rabbitmq_signups_consumers!22
+        check_command                   check_rabbitmq_consumers!signups
         # Workaround weird checks 40s after first error causing alerts
         # from a single failure because cron hasn't run again yet
         max_check_attempts              3