diff --git a/src/mod_antispam.erl b/src/mod_antispam.erl
index 0e3a1b8a7..4a3ffb177 100644
--- a/src/mod_antispam.erl
+++ b/src/mod_antispam.erl
@@ -686,14 +686,14 @@ drop_from_cache(LJID, #state{jid_cache = Cache} = State) ->
 -spec get_commands_spec() -> [ejabberd_commands()].
 get_commands_spec() ->
     [#ejabberd_commands{name = reload_spam_filter_files,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Reload spam JID/URL files",
                         module = ?MODULE,
                         function = reload_spam_filter_files,
                         args = [{host, binary}],
                         result = {res, rescode}},
      #ejabberd_commands{name = get_spam_filter_cache,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Show spam filter cache contents",
                         module = ?MODULE,
                         function = get_spam_filter_cache,
@@ -702,42 +702,42 @@ get_commands_spec() ->
                             {spammers,
                              {list, {spammer, {tuple, [{jid, string}, {timestamp, integer}]}}}}},
      #ejabberd_commands{name = expire_spam_filter_cache,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Remove old/unused spam JIDs from cache",
                         module = ?MODULE,
                         function = expire_spam_filter_cache,
                         args = [{host, binary}, {seconds, integer}],
                         result = {res, restuple}},
      #ejabberd_commands{name = add_to_spam_filter_cache,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Add JID to spam filter cache",
                         module = ?MODULE,
                         function = add_to_spam_filter_cache,
                         args = [{host, binary}, {jid, binary}],
                         result = {res, restuple}},
      #ejabberd_commands{name = drop_from_spam_filter_cache,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Drop JID from spam filter cache",
                         module = ?MODULE,
                         function = drop_from_spam_filter_cache,
                         args = [{host, binary}, {jid, binary}],
                         result = {res, restuple}},
      #ejabberd_commands{name = get_blocked_domains,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Get list of domains being blocked",
                         module = ?MODULE,
                         function = get_blocked_domains,
                         args = [{host, binary}],
                         result = {blocked_domains, {list, {jid, string}}}},
      #ejabberd_commands{name = add_blocked_domain,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Add domain to list of blocked domains",
                         module = ?MODULE,
                         function = add_blocked_domain,
                         args = [{host, binary}, {domain, binary}],
                         result = {res, restuple}},
      #ejabberd_commands{name = remove_blocked_domain,
-                        tags = [filter],
+                        tags = [spam],
                         desc = "Remove domain from list of blocked domains",
                         module = ?MODULE,
                         function = remove_blocked_domain,