diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index e52074bcf5..916bb19759 100644
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -32,7 +32,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ac-power");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 38c17606d7..d48413b795 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -203,7 +203,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-analyze");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 /* When updating this list, including descriptions, apply changes to
  * shell-completion/bash/systemd-analyze and shell-completion/zsh/_systemd-analyze too. */
@@ -336,7 +336,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-analyze");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 725e72ba44..6b04e6e902 100644
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -55,7 +55,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ask-password");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 42b7936abe..dbfd2a3038 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -625,7 +625,7 @@ static int verb_save(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-backlight");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -638,7 +638,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-backlight");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/battery-check/battery-check.c b/src/battery-check/battery-check.c
index 1ad4bbf584..589cfab1fe 100644
--- a/src/battery-check/battery-check.c
+++ b/src/battery-check/battery-check.c
@@ -66,7 +66,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-battery-check");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 1566bd025f..900d583f47 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -126,7 +126,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-binfmt");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/bless-boot/bless-boot.c b/src/bless-boot/bless-boot.c
index 3457655b51..8e6abdfc91 100644
--- a/src/bless-boot/bless-boot.c
+++ b/src/bless-boot/bless-boot.c
@@ -39,7 +39,7 @@ typedef enum Status {
         STATUS_INDETERMINATE,
 } Status;
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-bless-boot");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int check_support(void) {
         if (detect_container() > 0)
@@ -65,7 +65,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-bless-boot");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/bless-boot/boot-check-no-failures.c b/src/bless-boot/boot-check-no-failures.c
index a54bd62096..ad7d02e5f6 100644
--- a/src/bless-boot/boot-check-no-failures.c
+++ b/src/bless-boot/boot-check-no-failures.c
@@ -25,7 +25,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-boot-check-no-failures");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/bootctl/bootctl.c b/src/bootctl/bootctl.c
index e397b2aab1..d3cd61d4cb 100644
--- a/src/bootctl/bootctl.c
+++ b/src/bootctl/bootctl.c
@@ -295,7 +295,7 @@ GracefulMode arg_graceful(void) {
         return _arg_graceful;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("bootctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 VERB_GROUP("Generic EFI Firmware/Boot Loader Commands");
 
@@ -413,7 +413,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("bootctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index a369edb399..ccffaec8e2 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2081,7 +2081,7 @@ static int verb_set_property(int argc, char *argv[], uintptr_t _data, void *user
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("busctl");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -2095,7 +2095,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("busctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index ec452789bb..f41953be01 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -56,7 +56,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cgls");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index f77b26d65b..9ab6c7bf7b 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -703,7 +703,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cgtop");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/clonesetup/clonesetup.c b/src/clonesetup/clonesetup.c
index 569aa4f245..85ca03f97c 100644
--- a/src/clonesetup/clonesetup.c
+++ b/src/clonesetup/clonesetup.c
@@ -150,7 +150,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-clonesetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index c0f4b9cd03..350479e8df 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -183,7 +183,7 @@ static int acquire_journal(sd_journal **ret, char **matches) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("coredumpctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -198,7 +198,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("coredumpctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/creds/creds.c b/src/creds/creds.c
index c0908d89ec..50d8ec8a30 100644
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -779,7 +779,7 @@ static int verb_has_tpm2(int argc, char *argv[], uintptr_t _data, void *userdata
         return verb_has_tpm2_generic(arg_quiet);
 }
 
-VERB_COMMON_HELP_AUTO("systemd-creds");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -792,7 +792,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-creds");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index 1d087a9b74..b64c6d5da3 100644
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -365,7 +365,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cryptenroll");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 598bfd5b31..5c711010be 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -2379,7 +2379,7 @@ static int attach_luks_or_plain_or_bitlk(
         return attach_luks_or_plain_or_bitlk_by_passphrase(cd, name, passwords, flags, pass_volume_key);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-cryptsetup");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -2392,7 +2392,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cryptsetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 2a5143e0bb..ed4fee237d 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -513,7 +513,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-delta");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index 56be6d8477..36fc4f63b0 100644
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -36,7 +36,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-detect-virt");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 55f36b1d86..2d117c726d 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -404,7 +404,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-dissect");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/escape/escape-tool.c b/src/escape/escape-tool.c
index 8446528d11..79d79d740d 100644
--- a/src/escape/escape-tool.c
+++ b/src/escape/escape-tool.c
@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-escape");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/factory-reset/factory-reset-tool.c b/src/factory-reset/factory-reset-tool.c
index c055f26e40..7c86b1619c 100644
--- a/src/factory-reset/factory-reset-tool.c
+++ b/src/factory-reset/factory-reset-tool.c
@@ -39,7 +39,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-factory-reset");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 504fc23ebd..b7d30baf3c 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -1394,7 +1394,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-firstboot");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/growfs/growfs.c b/src/growfs/growfs.c
index 15077f1bd7..9f750a9d5f 100644
--- a/src/growfs/growfs.c
+++ b/src/growfs/growfs.c
@@ -145,7 +145,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-growfs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index fa7f9bdbaa..b70c0b2255 100644
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -42,7 +42,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-hibernate-resume");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/home/homectl.c b/src/home/homectl.c
index e5c2857134..9d33af696d 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -4009,7 +4009,7 @@ static int parse_fido2_device_field(const char *arg) {
         return 1;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("homectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         _cleanup_strv_free_ char **arg_languages = NULL;
@@ -4038,7 +4038,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("homectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index e15d121f6a..5ede1cb1bf 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -853,7 +853,7 @@ static int verb_get_or_set_tags(int argc, char *argv[], uintptr_t _data, void *u
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("hostnamectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -866,7 +866,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("hostnamectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 5b16679452..4f1049865a 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -35,7 +35,7 @@ static int verb_update(int argc, char *argv[], uintptr_t _data, void *userdata)
         return hwdb_update(arg_root, arg_hwdb_bin_dir, arg_strict, false);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-hwdb");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -48,7 +48,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-hwdb");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/id128/id128.c b/src/id128/id128.c
index 54d41b24c9..39bffd3156 100644
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -234,7 +234,7 @@ static int verb_show(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("systemd-id128");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -247,7 +247,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-id128");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/imds/imds-tool.c b/src/imds/imds-tool.c
index 5791e41c6e..44315f3391 100644
--- a/src/imds/imds-tool.c
+++ b/src/imds/imds-tool.c
@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-imds");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/imds/imdsd.c b/src/imds/imdsd.c
index 4324864aa5..7e510f9c50 100644
--- a/src/imds/imdsd.c
+++ b/src/imds/imdsd.c
@@ -2213,7 +2213,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-imdsd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/import/export.c b/src/import/export.c
index 9ad625e8b3..41d3d247e1 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -197,7 +197,7 @@ static int verb_export_raw(int argc, char *argv[], uintptr_t _data, void *userda
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-export");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -210,7 +210,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-export");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index a4ea7e6b1a..b1b9b637aa 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -272,7 +272,7 @@ static int verb_import_fs(int argc, char *argv[], uintptr_t _data, void *userdat
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-import-fs");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -286,7 +286,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-import-fs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/import/import.c b/src/import/import.c
index 2b4aad9b05..37eda8711f 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -275,7 +275,7 @@ static int verb_raw(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-import");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -289,7 +289,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-import");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/import/importctl.c b/src/import/importctl.c
index ad64b8ffcb..3d15cb67e6 100644
--- a/src/import/importctl.c
+++ b/src/import/importctl.c
@@ -1066,7 +1066,7 @@ static int verb_list_images(int argc, char *argv[], uintptr_t _data, void *userd
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("importctl");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -1080,7 +1080,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("importctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/import/pull.c b/src/import/pull.c
index 30b87c6d88..3960a6e683 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -320,7 +320,7 @@ static int verb_oci(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-pull");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -335,7 +335,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pull");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index e135bf1c9b..3023b134a8 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -1112,7 +1112,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-gatewayd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 09f010728d..a689e9bb92 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -889,7 +889,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-remote");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 2516d3fa6c..0fb4e5ac61 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -703,7 +703,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-upload");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/journal/bsod.c b/src/journal/bsod.c
index 5e63a7dd52..756f70f051 100644
--- a/src/journal/bsod.c
+++ b/src/journal/bsod.c
@@ -231,7 +231,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-bsod");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 67591d7e83..5452c4abf4 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -43,7 +43,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cat");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index e37ee113fd..58728f508c 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -793,7 +793,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("journalctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/keyutil/keyutil.c b/src/keyutil/keyutil.c
index c442cf30e9..76c2654f94 100644
--- a/src/keyutil/keyutil.c
+++ b/src/keyutil/keyutil.c
@@ -42,7 +42,7 @@ COMMAND(
         .man_pages = "systemd-keyutil.1\0",
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-keyutil");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -56,7 +56,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-keyutil");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 3a172b22b0..e746fd5722 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -426,7 +426,7 @@ static int verb_list_x11_keymaps(int argc, char *argv[], uintptr_t _data, void *
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("localectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -440,7 +440,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("localectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 600f98c4ef..2157f1561e 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -190,7 +190,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-inhibit");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index f7e1b88e10..555034069e 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1499,7 +1499,7 @@ static int verb_terminate_seat(int argc, char *argv[], uintptr_t _data, void *us
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("loginctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -1514,7 +1514,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("loginctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index d932d00b0d..fbbbb5115e 100644
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -47,7 +47,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-machine-id-setup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 8275eb6a03..93722baa1c 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -2376,7 +2376,7 @@ static int chainload_importctl(char **args) {
         return log_error_errno(r, "Failed to invoke 'importctl': %m");
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("machinectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -2409,7 +2409,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("machinectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/measure/measure-tool.c b/src/measure/measure-tool.c
index 02bba3866c..b6ec21df35 100644
--- a/src/measure/measure-tool.c
+++ b/src/measure/measure-tool.c
@@ -72,7 +72,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-measure");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static char *normalize_phase(const char *s) {
         _cleanup_strv_free_ char **l = NULL;
@@ -101,7 +101,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-measure");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 9ae6531472..3997447463 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -350,7 +350,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-modules-load");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/mstack/mstack-tool.c b/src/mstack/mstack-tool.c
index ea2aa404c3..2b3b5496b9 100644
--- a/src/mstack/mstack-tool.c
+++ b/src/mstack/mstack-tool.c
@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-mstack");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/mute-console/mute-console.c b/src/mute-console/mute-console.c
index 0a5ef85ec2..a3bf83fef7 100644
--- a/src/mute-console/mute-console.c
+++ b/src/mute-console/mute-console.c
@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-mute-console");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/network/generator/network-generator-main.c b/src/network/generator/network-generator-main.c
index fb5c54bd13..c667200aa4 100644
--- a/src/network/generator/network-generator-main.c
+++ b/src/network/generator/network-generator-main.c
@@ -169,7 +169,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-network-generator");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index e307d78c9c..d6b0f3bad4 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -80,7 +80,7 @@ VERB_SCOPE(, verb_unmask,                     "unmask",             "FILES...",
 VERB_SCOPE(, verb_persistent_storage,         "persistent-storage", "BOOL",          2,        2,        0,
            "Notify systemd-networkd if persistent storage is ready");
 
-VERB_COMMON_HELP_AUTO_HIDDEN("networkctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -95,7 +95,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("networkctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index 7f6b315bf2..a531213665 100644
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -92,7 +92,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-networkd-wait-online");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/notify/notify.c b/src/notify/notify.c
index 46acaec6f1..7f6e45636a 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -146,7 +146,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-notify");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 82b366eb43..76560392f2 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -559,7 +559,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-nspawn");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index 7238a0554b..e8eb5900a3 100644
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -21,7 +21,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("oomctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 VERB_DEFAULT_NOARG(verb_dump_state, "dump", "Output the current state of systemd-oomd");
 static int verb_dump_state(int argc, char *argv[], uintptr_t _data, void *userdata) {
@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("oomctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 4bf29e7af6..df53879582 100644
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -37,7 +37,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-oomd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/path/path-tool.c b/src/path/path-tool.c
index 1ca79b6238..7840a7e36d 100644
--- a/src/path/path-tool.c
+++ b/src/path/path-tool.c
@@ -192,7 +192,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-path");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/pcrextend/pcrextend.c b/src/pcrextend/pcrextend.c
index 0ec2943042..2356936753 100644
--- a/src/pcrextend/pcrextend.c
+++ b/src/pcrextend/pcrextend.c
@@ -68,7 +68,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pcrextend");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index f0c92ba197..5bb1db429c 100644
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -5325,7 +5325,7 @@ static int verb_lock_raw(int argc, char *argv[], uintptr_t _data, void *userdata
 VERB_NOARG(verb_unlock_simple, "unlock-raw",
            "Remove .pcrlock file for raw data");
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-pcrlock");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -5340,7 +5340,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pcrlock");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index dd4c435691..18e23a137e 100644
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -1537,7 +1537,7 @@ static int dump_profiles(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("portablectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -1551,7 +1551,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("portablectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/ptyfwd/ptyfwd-tool.c b/src/ptyfwd/ptyfwd-tool.c
index 243d84e92d..ff94ba0448 100644
--- a/src/ptyfwd/ptyfwd-tool.c
+++ b/src/ptyfwd/ptyfwd-tool.c
@@ -46,7 +46,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pty-forward");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/random-seed/random-seed-tool.c b/src/random-seed/random-seed-tool.c
index dd8281f041..b15c1e882e 100644
--- a/src/random-seed/random-seed-tool.c
+++ b/src/random-seed/random-seed-tool.c
@@ -322,7 +322,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-random-seed");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/repart/repart.c b/src/repart/repart.c
index cb48e457dd..821c8393e7 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -10189,7 +10189,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-repart");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/report/report-basic-server.c b/src/report/report-basic-server.c
index 4db1552a55..32dca32ba9 100644
--- a/src/report/report-basic-server.c
+++ b/src/report/report-basic-server.c
@@ -53,7 +53,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-basic");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/report/report-cgroup-server.c b/src/report/report-cgroup-server.c
index c6a851ce6a..47c289e3fc 100644
--- a/src/report/report-cgroup-server.c
+++ b/src/report/report-cgroup-server.c
@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-cgroup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/report/report-files-server.c b/src/report/report-files-server.c
index 70604d5214..423c8dd3f5 100644
--- a/src/report/report-files-server.c
+++ b/src/report/report-files-server.c
@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-files");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/report/report-sign-plain.c b/src/report/report-sign-plain.c
index 1f7c760f8c..7923ce523f 100644
--- a/src/report/report-sign-plain.c
+++ b/src/report/report-sign-plain.c
@@ -354,7 +354,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-sign-plain");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/report/report-sign-tsm.c b/src/report/report-sign-tsm.c
index 2e9f2b2f40..d276a1e031 100644
--- a/src/report/report-sign-tsm.c
+++ b/src/report/report-sign-tsm.c
@@ -117,7 +117,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-sign-tsm");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/report/report.c b/src/report/report.c
index 86bf9c77d7..df79ac6e38 100644
--- a/src/report/report.c
+++ b/src/report/report.c
@@ -924,7 +924,7 @@ static int vl_server(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-report");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -937,7 +937,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index b85fc9ada7..cacd92c664 100644
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -181,7 +181,7 @@ int resolvconf_parse_argv(int argc, char *argv[]) {
                 OPTION_NAMESPACE("resolvconf"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("resolvconf");
+                        return command_print_help_full("resolvconf");
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 58ff70c9a3..48b4e19a60 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -3229,7 +3229,7 @@ static void help_dns_classes(void) {
         DUMP_STRING_TABLE(dns_class, int, _DNS_CLASS_MAX);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("resolvectl");
+VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN("resolvectl");
 
 COMMAND(
         "systemd-resolve\0",
@@ -3498,7 +3498,7 @@ static int native_parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("resolvectl"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("resolvectl");
+                        return command_print_help_full("resolvectl");
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/run/run.c b/src/run/run.c
index 63994775a8..9b14048d56 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -208,7 +208,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_NAMESPACE("systemd-run"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-run");
+                        return command_print_help_full("systemd-run");
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -784,7 +784,7 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
                 OPTION_NAMESPACE("run0"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("run0");
+                        return command_print_help_full("run0");
 
                 OPTION('V', "version", NULL, "Show package version"):
                         return version();
diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c
index dd50afb63f..5a0bf94daa 100644
--- a/src/sbsign/sbsign.c
+++ b/src/sbsign/sbsign.c
@@ -52,7 +52,7 @@ COMMAND(
         .man_pages = "systemd-sbsign.1\0",
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-sbsign");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -66,7 +66,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sbsign");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/shared/verbs.c b/src/shared/verbs.c
index 0508272544..f84612ceb3 100644
--- a/src/shared/verbs.c
+++ b/src/shared/verbs.c
@@ -229,14 +229,13 @@ static const Verb* verbs_get_command(const Verb verbs[], const Verb verbs_end[],
         assert(verbs_end > verbs);
         assert((uintptr_t) verbs % sizeof(void*) == 0);
         assert(FLAGS_SET(verbs[0].flags, VERB_COMMAND_MARKER) || verbs[0].verb);
-        assert(name);
 
         for (const Verb *verb = verbs; verb < verbs_end; verb++) {
                 if (!FLAGS_SET(verb->flags, VERB_COMMAND_MARKER))
                         continue;
 
                 const CommandDescription *cmd = (const CommandDescription*) ASSERT_PTR(verb->data);
-                if (nulstr_contains(cmd->names, name))
+                if (!name || nulstr_contains(cmd->names, name))
                         return verb;
         }
 
@@ -469,7 +468,7 @@ static int print_wrapped(const char *text, bool abstract) {
         return 0;
 }
 
-int _command_print_help(
+int _command_print_help_full(
                 const Verb verbs[],
                 const Verb verbs_end[],
                 const Option options[],
diff --git a/src/shared/verbs.h b/src/shared/verbs.h
index cbe5b4e9cb..5a5e31e23b 100644
--- a/src/shared/verbs.h
+++ b/src/shared/verbs.h
@@ -131,26 +131,28 @@ int _verbs_get_help_table(
         VERB(verb_help, "help", NULL, VERB_ANY, VERB_ANY, 0, NULL);     \
         _VERB_COMMON_HELP_IMPL(impl)
 
-#define VERB_COMMON_HELP_AUTO(program)                                  \
-        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, (uintptr_t) program, "Show this help")
+#define VERB_COMMON_HELP_AUTO_FULL(program, help)                       \
+        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, /* dat= */ (uintptr_t) program, /* help= */ help)
+#define VERB_COMMON_HELP_AUTO_PROGRAM(program) VERB_COMMON_HELP_AUTO_FULL(program, "Show this help")
+#define VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN(program) VERB_COMMON_HELP_AUTO_FULL(program, /* help= */ NULL)
+#define VERB_COMMON_HELP_AUTO() VERB_COMMON_HELP_AUTO_PROGRAM(/* program= */ NULL)
+#define VERB_COMMON_HELP_AUTO_HIDDEN() VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN(/* program= */ NULL)
 
-#define VERB_COMMON_HELP_AUTO_HIDDEN(program)                           \
-        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, (uintptr_t) program, NULL)
-
-int _command_print_help(
+int _command_print_help_full(
                 const Verb verbs[],
                 const Verb verbs_end[],
                 const Option options[],
                 const Option options_end[],
                 const char *name);
-#define command_print_help(name)                                        \
-        _command_print_help(                                            \
+#define command_print_help_full(name)                                   \
+        _command_print_help_full(                                       \
                 __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS,            \
                 __start_SYSTEMD_OPTIONS, __stop_SYSTEMD_OPTIONS,        \
                 name)
+#define command_print_help() command_print_help_full(/* name= */ NULL)
 
 static inline int verb_help_auto(int argc, char **argv, uintptr_t data, void *userdata) {
-        return command_print_help((const char*) ASSERT_PTR(data));
+        return command_print_help_full((const char*) data);
 }
 
 /* Print a machine-readable description of the program's commands, verbs, and options in the format
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index d56d1ffc26..cc169c2383 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -699,7 +699,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sleep");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index 8b4ea230b5..c363954528 100644
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -339,7 +339,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-socket-activate");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index aa101e9f65..58c282be0c 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -506,7 +506,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-socket-proxyd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/ssh-generator/ssh-issue.c b/src/ssh-generator/ssh-issue.c
index 1d87624aae..9039047346 100644
--- a/src/ssh-generator/ssh-issue.c
+++ b/src/ssh-generator/ssh-issue.c
@@ -130,7 +130,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ssh-issue");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 25e6f49a35..903b11b094 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -40,7 +40,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-stdio-bridge");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/storage/storage-block.c b/src/storage/storage-block.c
index 363fad66da..bf620fa13d 100644
--- a/src/storage/storage-block.c
+++ b/src/storage/storage-block.c
@@ -395,7 +395,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storage-block");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/storage/storage-fs.c b/src/storage/storage-fs.c
index ef0cc7b66c..b77222f766 100644
--- a/src/storage/storage-fs.c
+++ b/src/storage/storage-fs.c
@@ -755,7 +755,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storage-fs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/storage/storagectl.c b/src/storage/storagectl.c
index 51292fc66a..cca94a63ba 100644
--- a/src/storage/storagectl.c
+++ b/src/storage/storagectl.c
@@ -53,7 +53,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("storagectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static const char *ro_color(int ro) {
         if (ro > 0)
@@ -391,7 +391,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("storagectl"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("storagectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
index 91a4763307..9c2038b52c 100644
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@@ -67,7 +67,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storagetm");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index fa95932985..f18ced3418 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -338,7 +338,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/sysinstall/sysinstall.c b/src/sysinstall/sysinstall.c
index d981be03d0..9ed3419ced 100644
--- a/src/sysinstall/sysinstall.c
+++ b/src/sysinstall/sysinstall.c
@@ -174,7 +174,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysinstall");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 49a0f1b37a..0792d91eb1 100644
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -3306,7 +3306,7 @@ static int verb_enable_component(int argc, char *argv[], uintptr_t _data, void *
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-sysupdate");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -3320,7 +3320,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysupdate");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c
index 70902697cf..8fc2f55111 100644
--- a/src/sysupdate/updatectl.c
+++ b/src/sysupdate/updatectl.c
@@ -1641,7 +1641,7 @@ static int verb_enable(int argc, char *argv[], uintptr_t _data, void *userdata)
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("updatectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -1653,7 +1653,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("updatectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 489a2697e9..b1e1fd7e7d 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -2124,7 +2124,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysusers");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 9926748cbc..f5fe36c9ef 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -899,7 +899,7 @@ static int verb_revert(int argc, char *argv[], uintptr_t _data, void *userdata)
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("timedatectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -912,7 +912,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("timedatectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index e567bd63f2..8dc09c47e0 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -4963,7 +4963,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tmpfiles");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/tpm2-setup/tpm2-clear.c b/src/tpm2-setup/tpm2-clear.c
index de0959572b..917a74531a 100644
--- a/src/tpm2-setup/tpm2-clear.c
+++ b/src/tpm2-setup/tpm2-clear.c
@@ -31,7 +31,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tpm2-clear");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/tpm2-setup/tpm2-setup.c b/src/tpm2-setup/tpm2-setup.c
index 9435147778..9309613037 100644
--- a/src/tpm2-setup/tpm2-setup.c
+++ b/src/tpm2-setup/tpm2-setup.c
@@ -64,7 +64,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tpm2-setup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 343fffaef1..34ddd5a07c 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -459,7 +459,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tty-ask-password-agent");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 78c403c08b..a88f4cdcbb 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -375,7 +375,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("ata_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 22a723d119..c030be28db 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -916,7 +916,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("cdrom_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c
index b39981dbf9..3a7b22941e 100644
--- a/src/udev/dmi_memory_id/dmi_memory_id.c
+++ b/src/udev/dmi_memory_id/dmi_memory_id.c
@@ -659,7 +659,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("dmi_memory_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION_WITH_HIDDEN_V:
                         return version();
diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c
index 96bdcbd6c1..774c398f73 100644
--- a/src/udev/fido_id/fido_id.c
+++ b/src/udev/fido_id/fido_id.c
@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("fido_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c
index 9da7e1e9a8..376e5d8209 100644
--- a/src/udev/iocost/iocost.c
+++ b/src/udev/iocost/iocost.c
@@ -55,7 +55,7 @@ static int parse_config(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("iocost");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -68,7 +68,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("iocost");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c
index cc14475743..e929fa501f 100644
--- a/src/udev/mtd_probe/mtd_probe.c
+++ b/src/udev/mtd_probe/mtd_probe.c
@@ -51,7 +51,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("mtd_probe");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index bee527962b..7f1267d09d 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -223,7 +223,7 @@ static int set_options(int argc, char **argv, char *maj_min_dev) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("scsi_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION_WITH_HIDDEN_V:
                         return version();
diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index 45a1f52bd2..6843a50b75 100644
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -38,7 +38,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("v4l_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index c3545e1b57..44718b4414 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -79,7 +79,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-update-done");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index cf185d924f..81048c7352 100644
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -1558,7 +1558,7 @@ static int verb_load_credentials(int argc, char *argv[], uintptr_t _data, void *
         return r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("userdbctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_from_file(const char *arg, sd_json_variant **ret) {
         sd_json_variant *v = NULL;
@@ -1612,7 +1612,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("userdbctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/validatefs/validatefs.c b/src/validatefs/validatefs.c
index 179274b43d..616ebd5d90 100644
--- a/src/validatefs/validatefs.c
+++ b/src/validatefs/validatefs.c
@@ -49,7 +49,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-validatefs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index 2a1c9a1ce2..e1e86da289 100644
--- a/src/varlinkctl/varlinkctl.c
+++ b/src/varlinkctl/varlinkctl.c
@@ -92,7 +92,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("varlinkctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -1458,7 +1458,7 @@ static int verb_serve(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("varlinkctl");
+VERB_COMMON_HELP_AUTO();
 
 static int run(int argc, char *argv[]) {
         int r;
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index afce00bbe7..d1aefb7aa6 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -471,7 +471,7 @@ static int verb_detach(int argc, char *argv[], uintptr_t _data, void *userdata)
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-veritysetup");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -484,7 +484,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-veritysetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index b274fe69b5..a6bfdf7889 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -311,7 +311,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-vmspawn");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();
diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c
index fb1c4d0329..2a0dd1a575 100644
--- a/src/vpick/vpick-tool.c
+++ b/src/vpick/vpick-tool.c
@@ -143,7 +143,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 OPTION_GROUP("Output"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-vpick");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();