diff --git a/client-fn.c b/client-fn.c
index b7a9b1f0..8e5e3722 100644
--- a/client-fn.c
+++ b/client-fn.c
@@ -63,7 +63,7 @@ client_fill_session(struct msg_command_data *data)
 
 void
 client_write_server(
-    struct client_ctx *cctx, enum hdrtype type, void *buf, size_t len)
+    struct client_ctx *cctx, enum msgtype type, void *buf, size_t len)
 {
 	struct hdr	hdr;
 
diff --git a/client-msg.c b/client-msg.c
index 845f10b0..f282478b 100644
--- a/client-msg.c
+++ b/client-msg.c
@@ -33,7 +33,7 @@ int	client_msg_fn_exited(struct hdr *, struct client_ctx *);
 int	client_msg_fn_suspend(struct hdr *, struct client_ctx *);
 
 struct client_msg {
-	enum hdrtype   type;
+	enum msgtype   type;
 	int	       (*fn)(struct hdr *, struct client_ctx *);
 };
 struct client_msg client_msg_table[] = {
diff --git a/server-fn.c b/server-fn.c
index 05f4168e..8a4b1f1d 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -58,7 +58,7 @@ server_write_error(struct client *c, const char *msg)
 
 void
 server_write_client(
-    struct client *c, enum hdrtype type, const void *buf, size_t len)
+    struct client *c, enum msgtype type, const void *buf, size_t len)
 {
 	struct hdr	 hdr;
 
@@ -74,7 +74,7 @@ server_write_client(
 
 void
 server_write_session(
-    struct session *s, enum hdrtype type, const void *buf, size_t len)
+    struct session *s, enum msgtype type, const void *buf, size_t len)
 {
 	struct client	*c;
 	u_int		 i;
diff --git a/server-msg.c b/server-msg.c
index 9d1f84f8..14b2d4e4 100644
--- a/server-msg.c
+++ b/server-msg.c
@@ -41,7 +41,7 @@ void printflike2 server_msg_fn_command_info(
     	    struct cmd_ctx *, const char *, ...);
 
 struct server_msg {
-	enum hdrtype	type;
+	enum msgtype	type;
 	void	        (*fn)(struct hdr *, struct client *);
 };
 const struct server_msg server_msg_table[] = {
diff --git a/tmux.c b/tmux.c
index 14ba0538..3845022d 100644
--- a/tmux.c
+++ b/tmux.c
@@ -57,8 +57,8 @@ char		*socket_path;
 
 __dead void	 usage(void);
 char 		*makesockpath(const char *);
-int		 prepare_unlock(enum hdrtype *, void **, size_t *, int);
-int		 prepare_cmd(enum hdrtype *, void **, size_t *, int, char **);
+int		 prepare_unlock(enum msgtype *, void **, size_t *, int);
+int		 prepare_cmd(enum msgtype *, void **, size_t *, int, char **);
 
 __dead void
 usage(void)
@@ -203,7 +203,7 @@ makesockpath(const char *label)
 }
 
 int
-prepare_unlock(enum hdrtype *msg, void **buf, size_t *len, int argc)
+prepare_unlock(enum msgtype *msg, void **buf, size_t *len, int argc)
 {
 	static struct msg_unlock_data	 unlockdata;
 	char				*pass;
@@ -232,7 +232,7 @@ prepare_unlock(enum hdrtype *msg, void **buf, size_t *len, int argc)
 }
 
 int
-prepare_cmd(enum hdrtype *msg, void **buf, size_t *len, int argc, char **argv)
+prepare_cmd(enum msgtype *msg, void **buf, size_t *len, int argc, char **argv)
 {
 	static struct msg_command_data	 cmddata;
 
@@ -258,7 +258,7 @@ main(int argc, char **argv)
 	struct cmd_list		*cmdlist;
  	struct cmd		*cmd;
 	struct pollfd	 	 pfd;
-	enum hdrtype		 msg;
+	enum msgtype		 msg;
 	struct hdr	 	 hdr;
 	struct passwd		*pw;
 	struct msg_print_data	 printdata;
diff --git a/tmux.h b/tmux.h
index 7fc2117c..f16652a7 100644
--- a/tmux.h
+++ b/tmux.h
@@ -287,7 +287,7 @@ struct tty_term_code_entry {
 };
 
 /* Message codes. */
-enum hdrtype {
+enum msgtype {
 	MSG_COMMAND,
 	MSG_DETACH,
 	MSG_ERROR,
@@ -313,7 +313,7 @@ enum hdrtype {
  * the tmux client hang even if the protocol version is bumped.
  */
 struct hdr {
-	enum hdrtype	type;
+	enum msgtype	type;
 	size_t		size;
 };
 
@@ -1351,7 +1351,7 @@ int	 client_main(struct client_ctx *);
 int	 client_msg_dispatch(struct client_ctx *);
 
 /* client-fn.c */
-void	 client_write_server(struct client_ctx *, enum hdrtype, void *, size_t);
+void	 client_write_server(struct client_ctx *, enum msgtype, void *, size_t);
 void	 client_fill_session(struct msg_command_data *);
 
 /* key-bindings.c */
@@ -1385,9 +1385,9 @@ int	 server_msg_dispatch(struct client *);
 const char **server_fill_environ(struct session *);
 void	 server_write_error(struct client *, const char *);
 void	 server_write_client(
-             struct client *, enum hdrtype, const void *, size_t);
+             struct client *, enum msgtype, const void *, size_t);
 void	 server_write_session(
-             struct session *, enum hdrtype, const void *, size_t);
+             struct session *, enum msgtype, const void *, size_t);
 void	 server_redraw_client(struct client *);
 void	 server_status_client(struct client *);
 void	 server_redraw_session(struct session *);