diff --git a/lightningd/daemon_conn.c b/lightningd/daemon_conn.c
index 54993a03a..8ab81ed49 100644
--- a/lightningd/daemon_conn.c
+++ b/lightningd/daemon_conn.c
@@ -18,7 +18,7 @@ struct io_plan *daemon_conn_write_next(struct io_conn *conn,
 {
 	const u8 *msg = msg_dequeue(&dc->out);
 	if (msg) {
-		int fd = msg_is_fd(msg);
+		int fd = msg_extract_fd(msg);
 		if (fd >= 0)
 			return io_send_fd(conn, fd, true,
 					  daemon_conn_write_next, dc);
@@ -42,7 +42,7 @@ bool daemon_conn_sync_flush(struct daemon_conn *dc)
 
 	/* Flush existing messages. */
 	while ((msg = msg_dequeue(&dc->out)) != NULL) {
-		int fd = msg_is_fd(msg);
+		int fd = msg_extract_fd(msg);
 		if (fd >= 0) {
 			if (!fdpass_send(io_conn_fd(dc->conn), fd))
 				return false;
diff --git a/lightningd/msg_queue.c b/lightningd/msg_queue.c
index 6e7052f81..9e7553e53 100644
--- a/lightningd/msg_queue.c
+++ b/lightningd/msg_queue.c
@@ -47,7 +47,7 @@ const u8 *msg_dequeue(struct msg_queue *q)
 	return msg;
 }
 
-int msg_is_fd(const u8 *msg)
+int msg_extract_fd(const u8 *msg)
 {
 	const u8 *p = msg + sizeof(u16);
 	size_t len = tal_count(msg) - sizeof(u16);
diff --git a/lightningd/msg_queue.h b/lightningd/msg_queue.h
index 3d998e03f..46e010a3e 100644
--- a/lightningd/msg_queue.h
+++ b/lightningd/msg_queue.h
@@ -25,7 +25,7 @@ void msg_enqueue_fd(struct msg_queue *q, int fd);
 const u8 *msg_dequeue(struct msg_queue *q);
 
 /* Returns -1 if not an fd: close after sending. */
-int msg_is_fd(const u8 *msg);
+int msg_extract_fd(const u8 *msg);
 
 #define msg_queue_wait(conn, q, next, arg) \
 	io_out_wait((conn), (q), (next), (arg))
diff --git a/lightningd/subd.c b/lightningd/subd.c
index 820a73600..75b4fb4f1 100644
--- a/lightningd/subd.c
+++ b/lightningd/subd.c
@@ -309,7 +309,7 @@ static struct io_plan *msg_send_next(struct io_conn *conn, struct subd *sd)
 	if (!msg)
 		return msg_queue_wait(conn, &sd->outq, msg_send_next, sd);
 
-	fd = msg_is_fd(msg);
+	fd = msg_extract_fd(msg);
 	if (fd >= 0) {
 		tal_free(msg);
 		return io_send_fd(conn, fd, true, msg_send_next, sd);