diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_util.erl b/deps/rabbitmq_management/src/rabbit_mgmt_util.erl
index 1c1ed87434..2f3b8e7d2a 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_util.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_util.erl
@@ -49,7 +49,7 @@
 -export([direct_request/6]).
 -export([qs_val/2]).
 -export([get_path_prefix/0]).
--export([catch_no_user_vhost/2]).
+-export([catch_no_such_user_or_vhost/2]).
 
 -import(rabbit_misc, [pget/2]).
 
@@ -1090,8 +1090,8 @@ qs_val(Name, ReqData) ->
     Qs = cowboy_req:parse_qs(ReqData),
     proplists:get_value(Name, Qs, undefined).
 
--spec catch_no_user_vhost(fun(() -> Result), Replacement) -> Result | Replacement.
-catch_no_user_vhost(Fun, Replacement) ->
+-spec catch_no_such_user_or_vhost(fun(() -> Result), Replacement) -> Result | Replacement.
+catch_no_such_user_or_vhost(Fun, Replacement) ->
     try
         Fun()
     catch throw:{error, {E, _}} when E =:= no_such_user; E =:= no_such_vhost ->
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permission.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permission.erl
index 424b4e6b7b..4e09deaec3 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permission.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permission.erl
@@ -88,7 +88,7 @@ perms(ReqData) ->
                 not_found ->
                     not_found;
                 VHost ->
-                    rabbit_mgmt_util:catch_no_user_vhost(
+                    rabbit_mgmt_util:catch_no_such_user_or_vhost(
                         fun() ->
                             Perms =
                                 rabbit_auth_backend_internal:list_user_vhost_permissions(
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl
index 19238a8747..f81250c4db 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl
@@ -42,7 +42,7 @@ resource_exists(ReqData, Context) ->
 
 to_json(ReqData, Context) ->
     User = rabbit_mgmt_util:id(user, ReqData),
-    rabbit_mgmt_util:catch_no_user_vhost(
+    rabbit_mgmt_util:catch_no_such_user_or_vhost(
         fun() ->
             Perms = rabbit_auth_backend_internal:list_user_permissions(User),
             rabbit_mgmt_util:reply_list([[{user, User} | Rest] || Rest <- Perms],
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl
index 37fa8412aa..106663e2d6 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl
@@ -39,7 +39,7 @@ resource_exists(ReqData, Context) ->
 
 to_json(ReqData, Context) ->
     VHost = rabbit_mgmt_util:id(vhost, ReqData),
-    rabbit_mgmt_util:catch_no_user_vhost(
+    rabbit_mgmt_util:catch_no_such_user_or_vhost(
         fun() ->
             Perms = rabbit_auth_backend_internal:list_vhost_permissions(VHost),
             rabbit_mgmt_util:reply_list([[{vhost, VHost} | Rest] || Rest <- Perms],
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permission.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permission.erl
index 060df1675f..84e6fe0b35 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permission.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permission.erl
@@ -94,7 +94,7 @@ topic_perms(ReqData) ->
                 not_found ->
                     not_found;
                 VHost ->
-                    rabbit_mgmt_util:catch_no_user_vhost(
+                    rabbit_mgmt_util:catch_no_such_user_or_vhost(
                         fun() ->
                             Perms =
                                 rabbit_auth_backend_internal:list_user_vhost_topic_permissions(
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl
index d9b9a9f0cb..a2bf360832 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl
@@ -42,7 +42,7 @@ resource_exists(ReqData, Context) ->
 
 to_json(ReqData, Context) ->
     User = rabbit_mgmt_util:id(user, ReqData),
-    rabbit_mgmt_util:catch_no_user_vhost(
+    rabbit_mgmt_util:catch_no_such_user_or_vhost(
         fun() ->
             Perms = rabbit_auth_backend_internal:list_user_topic_permissions(User),
             rabbit_mgmt_util:reply_list([[{user, User} | Rest] || Rest <- Perms],
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl
index 3894471775..3d8bd8774a 100644
--- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl
+++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl
@@ -39,7 +39,7 @@ resource_exists(ReqData, Context) ->
 
 to_json(ReqData, Context) ->
     VHost = rabbit_mgmt_util:id(vhost, ReqData),
-    rabbit_mgmt_util:catch_no_user_vhost(
+    rabbit_mgmt_util:catch_no_such_user_or_vhost(
         fun() ->
             Perms = rabbit_auth_backend_internal:list_vhost_topic_permissions(VHost),
             rabbit_mgmt_util:reply_list([[{vhost, VHost} | Rest] || Rest <- Perms],