diff --git a/cmd-queue.c b/cmd-queue.c
index bbc9971f..7feb25ef 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -143,7 +143,7 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...)
 		evbuffer_add(c->stderr_data, "\n", 1);
 
 		server_push_stderr(c);
-		c->retcode = 1;
+		c->retval = 1;
 	} else {
 		*msg = toupper((u_char) *msg);
 		status_message_set(c, "%s", msg);
diff --git a/server-client.c b/server-client.c
index 7a9f9115..41d1bb22 100644
--- a/server-client.c
+++ b/server-client.c
@@ -707,7 +707,7 @@ server_client_check_exit(struct client *c)
 	if (EVBUFFER_LENGTH(c->stderr_data) != 0)
 		return;
 
-	exitdata.retcode = c->retcode;
+	exitdata.retcode = c->retval;
 	server_write_client(c, MSG_EXIT, &exitdata, sizeof exitdata);
 
 	c->flags &= ~CLIENT_EXIT;
diff --git a/tmux.h b/tmux.h
index 3b4f8150..7d082796 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1295,8 +1295,9 @@ RB_HEAD(status_out_tree, status_out);
 /* Client connection. */
 struct client {
 	struct imsgbuf	 ibuf;
+
 	struct event	 event;
-	int		 retcode;
+	int		 retval;
 
 	struct timeval	 creation_time;
 	struct timeval	 activity_time;