diff --git a/src/master/dgram_server.c b/src/master/dgram_server.c
index 426fc7cd9..7400a7e5f 100644
--- a/src/master/dgram_server.c
+++ b/src/master/dgram_server.c
@@ -448,5 +448,5 @@ NORETURN dgram_server_main(int argc, char **argv, DGRAM_SERVER_FN service,...)
     }
-    /* Read-only parameters must not be changed with '-o name=value'.
+    /* Read-only parameters must not be changed with '-o name=value'. */
     set_mail_conf_str(VAR_PROCNAME, var_procname);
-    var_servname = mystrdup(servname);
+    var_servname = mystrdup(service_name);
     set_mail_conf_str(VAR_SERVNAME, var_servname);
diff --git a/src/master/event_server.c b/src/master/event_server.c
index f70f124a4..8893430e9 100644
--- a/src/master/event_server.c
+++ b/src/master/event_server.c
@@ -727,5 +727,5 @@ NORETURN event_server_main(int argc, char **argv, MULTI_SERVER_FN service,...)
     }
-    /* Read-only parameters must not be changed with '-o name=value'.
+    /* Read-only parameters must not be changed with '-o name=value'. */
     set_mail_conf_str(VAR_PROCNAME, var_procname);
-    var_servname = mystrdup(servname);
+    var_servname = mystrdup(service_name);
     set_mail_conf_str(VAR_SERVNAME, var_servname);
diff --git a/src/master/multi_server.c b/src/master/multi_server.c
index 33f0012e0..55255e125 100644
--- a/src/master/multi_server.c
+++ b/src/master/multi_server.c
@@ -705,5 +705,5 @@ NORETURN multi_server_main(int argc, char **argv, MULTI_SERVER_FN service,...)
     }
-    /* Read-only parameters must not be changed with '-o name=value'.
+    /* Read-only parameters must not be changed with '-o name=value'. */
     set_mail_conf_str(VAR_PROCNAME, var_procname);
-    var_servname = mystrdup(servname);
+    var_servname = mystrdup(service_name);
     set_mail_conf_str(VAR_SERVNAME, var_servname);
diff --git a/src/master/single_server.c b/src/master/single_server.c
index 4c4559f60..de859f6e4 100644
--- a/src/master/single_server.c
+++ b/src/master/single_server.c
@@ -579,5 +579,5 @@ NORETURN single_server_main(int argc, char **argv, SINGLE_SERVER_FN service,...)
     }
-    /* Read-only parameters must not be changed with '-o name=value'.
+    /* Read-only parameters must not be changed with '-o name=value'. */
     set_mail_conf_str(VAR_PROCNAME, var_procname);
-    var_servname = mystrdup(servname);
+    var_servname = mystrdup(service_name);
     set_mail_conf_str(VAR_SERVNAME, var_servname);
diff --git a/src/master/trigger_server.c b/src/master/trigger_server.c
index 4aca681f4..88f084ee1 100644
--- a/src/master/trigger_server.c
+++ b/src/master/trigger_server.c
@@ -561,5 +561,5 @@ NORETURN trigger_server_main(int argc, char **argv, TRIGGER_SERVER_FN service,..
     }
-    /* Read-only parameters must not be changed with '-o name=value'.
+    /* Read-only parameters must not be changed with '-o name=value'. */
     set_mail_conf_str(VAR_PROCNAME, var_procname);
-    var_servname = mystrdup(servname);
+    var_servname = mystrdup(service_name);
     set_mail_conf_str(VAR_SERVNAME, var_servname);