diff --git a/.clang-tidy b/.clang-tidy
index b09c099614..55bd0886d3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -3,7 +3,8 @@
 Checks: '
     -*,
     misc-header-include-cycle,
-    readability-duplicate-include
+    readability-duplicate-include,
+    bugprone-argument-comment
 '
 WarningsAsErrors: '*'
 HeaderFileExtensions:
diff --git a/src/home/homectl.c b/src/home/homectl.c
index 089bc2ac00..c933d45f78 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -1706,7 +1706,7 @@ static int verb_unregister_home(int argc, char *argv[], void *userdata) {
                         return bus_log_create_error(r);
 
                 _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-                r = sd_bus_call(bus, m, HOME_SLOW_BUS_CALL_TIMEOUT_USEC, &error, /* ret_reply= */ NULL);
+                r = sd_bus_call(bus, m, HOME_SLOW_BUS_CALL_TIMEOUT_USEC, &error, /* reply= */ NULL);
                 if (r < 0)
                         RET_GATHER(ret, log_error_errno(r, "Failed to unregister home: %s", bus_error_message(&error, r)));
         }
@@ -5116,7 +5116,7 @@ static int fallback_shell(int argc, char *argv[]) {
                                 "org.freedesktop.login1.Session",
                                 "SetClass",
                                 &error,
-                                /* ret_reply= */ NULL,
+                                /* reply= */ NULL,
                                 "s",
                                 "user");
                 if (r < 0)
diff --git a/src/import/importctl.c b/src/import/importctl.c
index bc80bc3290..e555b2f770 100644
--- a/src/import/importctl.c
+++ b/src/import/importctl.c
@@ -204,7 +204,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) {
                         bus,
                         &slot_log_message,
                         "org.freedesktop.import1",
-                        /* object_path= */ NULL,
+                        /* path= */ NULL,
                         "org.freedesktop.import1.Transfer",
                         "LogMessage",
                         match_log_message,
@@ -217,7 +217,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) {
                         bus,
                         &slot_progress_update,
                         "org.freedesktop.import1",
-                        /* object_path= */ NULL,
+                        /* path= */ NULL,
                         "org.freedesktop.import1.Transfer",
                         "ProgressUpdate",
                         match_progress_update,
diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index 11a6df4116..11cce5b1fb 100644
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -155,7 +155,7 @@ static int vl_method_get_user_record(sd_varlink *link, sd_json_variant *paramete
                         return log_oom();
 
                 r = userns_registry_load_by_name(
-                                /* registry_fd= */ -EBADF,
+                                /* dir_fd= */ -EBADF,
                                 n,
                                 &userns_info);
                 if (r == -ENOENT)
@@ -183,7 +183,7 @@ static int vl_method_get_user_record(sd_varlink *link, sd_json_variant *paramete
                 offset = p.uid - start;
 
                 r = userns_registry_load_by_start_uid(
-                                /* registry_fd= */ -EBADF,
+                                /* dir_fd= */ -EBADF,
                                 start,
                                 &userns_info);
                 if (r == -ENOENT)
@@ -282,7 +282,7 @@ static int vl_method_get_group_record(sd_varlink *link, sd_json_variant *paramet
                         return log_oom();
 
                 r = userns_registry_load_by_name(
-                                /* registry_fd= */ -EBADF,
+                                /* dir_fd= */ -EBADF,
                                 n,
                                 &userns_info);
                 if (r == -ENOENT)
@@ -310,7 +310,7 @@ static int vl_method_get_group_record(sd_varlink *link, sd_json_variant *paramet
                 offset = p.gid - start;
 
                 r = userns_registry_load_by_start_gid(
-                                /* registry_fd= */ -EBADF,
+                                /* dir_fd= */ -EBADF,
                                 start,
                                 &userns_info);
                 if (r == -ENOENT)
@@ -1683,7 +1683,7 @@ static int validate_netns(sd_varlink *link, int userns_fd, int netns_fd) {
         if (owner_userns_fd < 0)
                 return -errno;
 
-        r = inode_same_at(owner_userns_fd, /* path_a= */ NULL, userns_fd, /* path_b= */ NULL, AT_EMPTY_PATH);
+        r = inode_same_at(owner_userns_fd, /* filea= */ NULL, userns_fd, /* fileb= */ NULL, AT_EMPTY_PATH);
         if (r < 0)
                 return r;
         if (r == 0)
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index f52adaf22d..d89d1dcbcd 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -325,7 +325,7 @@ static int manager_rtnl_listen(Manager *m) {
         return r;
 }
 
-static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+static int on_network_event(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
         Manager *m = ASSERT_PTR(userdata);
         Link *l;
         int r;
@@ -685,7 +685,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
 
         /* The configuration has changed, so reload the per-interface configuration too in order to take
          * into account any changes (e.g.: enable/disable DNSSEC). */
-        r = on_network_event(/* sd_event_source= */ NULL, -EBADF, /* revents= */ 0, m);
+        r = on_network_event(/* source= */ NULL, -EBADF, /* revents= */ 0, m);
         if (r < 0)
                 log_warning_errno(r, "Failed to update network information: %m");