diff --git a/src/journal/journald-manager.c b/src/journal/journald-manager.c
index be3532f1ed..a0fc0d8c9b 100644
--- a/src/journal/journald-manager.c
+++ b/src/journal/journald-manager.c
@@ -1873,7 +1873,7 @@ static int manager_schedule_sync(Manager *m, int priority) {
         }
 
         if (!m->event || sd_event_get_state(m->event) == SD_EVENT_FINISHED) {
-                /* Shutting down the server? Let's sync immediately. */
+                /* Shutting down the manager? Let's sync immediately. */
                 manager_sync(m, /* wait= */ false);
                 return 0;
         }
@@ -2133,7 +2133,7 @@ int manager_unlink_seqnum_file(Manager *m, const char *fname) {
 static bool manager_is_idle(Manager *m) {
         assert(m);
 
-        /* The server for the main namespace is never idle */
+        /* The manager for the main namespace is never idle */
         if (!m->namespace)
                 return false;
 
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index ee903755cf..8a93b2ef79 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -687,7 +687,7 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
 
         if (revents != EPOLLIN)
                 return log_error_errno(SYNTHETIC_ERRNO(EIO),
-                                       "Got invalid event from epoll for stdout server fd: %" PRIx32,
+                                       "Got invalid event from epoll for stdout fd: %" PRIx32,
                                        revents);
 
         fd = accept4(m->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
@@ -926,11 +926,11 @@ int manager_open_stdout_socket(Manager *m, const char *stdout_socket) {
 
         r = sd_event_add_io(m->event, &m->stdout_event_source, m->stdout_fd, EPOLLIN, stdout_stream_new, m);
         if (r < 0)
-                return log_error_errno(r, "Failed to add stdout server fd to event source: %m");
+                return log_error_errno(r, "Failed to add stdout fd to event source: %m");
 
         r = sd_event_source_set_priority(m->stdout_event_source, SD_EVENT_PRIORITY_NORMAL+5);
         if (r < 0)
-                return log_error_errno(r, "Failed to adjust priority of stdout server event source: %m");
+                return log_error_errno(r, "Failed to adjust priority of stdout event source: %m");
 
         return 0;
 }
diff --git a/src/journal/journald-varlink.c b/src/journal/journald-varlink.c
index 674f2524eb..fb0d463c4f 100644
--- a/src/journal/journald-varlink.c
+++ b/src/journal/journald-varlink.c
@@ -168,10 +168,11 @@ static void vl_disconnect(sd_varlink_server *server, sd_varlink *link, void *use
 
         void *u = sd_varlink_get_userdata(link);
         if (u != m) {
-                /* If this is a Varlink connection that does not have the Server object as userdata, then it has a SyncReq object instead. Let's finish it. */
+                /* If this is a Varlink connection that does not have the Manager object as userdata, then
+                 * it has a SyncReq object instead. Let's finish it. */
 
                 SyncReq *req = u;
-                sd_varlink_set_userdata(link, m); /* reinstall server object */
+                sd_varlink_set_userdata(link, m); /* reinstall the manager object */
                 sync_req_free(req);
         }