diff --git a/lightningd/Makefile b/lightningd/Makefile
index 71414dac8..15769f759 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -39,10 +39,10 @@ LIGHTNINGD_LIB_SRC :=				\
 	lightningd/channel.c			\
 	lightningd/channel_config.c		\
 	lightningd/commit_tx.c			\
-	lightningd/connection.c			\
 	lightningd/cryptomsg.c			\
 	lightningd/crypto_sync.c		\
 	lightningd/debug.c			\
+	lightningd/daemon_conn.c		\
 	lightningd/derive_basepoints.c		\
 	lightningd/funding_tx.c			\
 	lightningd/gossip_msg.c			\
diff --git a/lightningd/channel/channel.c b/lightningd/channel/channel.c
index 143b65b64..66250f151 100644
--- a/lightningd/channel/channel.c
+++ b/lightningd/channel/channel.c
@@ -13,9 +13,9 @@
 #include <lightningd/channel.h>
 #include <lightningd/channel/gen_channel_wire.h>
 #include <lightningd/commit_tx.h>
-#include <lightningd/connection.h>
 #include <lightningd/crypto_sync.h>
 #include <lightningd/cryptomsg.h>
+#include <lightningd/daemon_conn.h>
 #include <lightningd/debug.h>
 #include <lightningd/derive_basepoints.h>
 #include <lightningd/key_derive.h>
diff --git a/lightningd/connection.c b/lightningd/daemon_conn.c
similarity index 98%
rename from lightningd/connection.c
rename to lightningd/daemon_conn.c
index 2f23854a2..54993a03a 100644
--- a/lightningd/connection.c
+++ b/lightningd/daemon_conn.c
@@ -1,7 +1,7 @@
-#include "connection.h"
 #include <ccan/fdpass/fdpass.h>
 #include <ccan/io/fdpass/fdpass.h>
 #include <ccan/take/take.h>
+#include <lightningd/daemon_conn.h>
 #include <wire/wire_io.h>
 #include <wire/wire_sync.h>
 
diff --git a/lightningd/connection.h b/lightningd/daemon_conn.h
similarity index 93%
rename from lightningd/connection.h
rename to lightningd/daemon_conn.h
index 3ebc57529..bcc277bc3 100644
--- a/lightningd/connection.h
+++ b/lightningd/daemon_conn.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_LIGHTNINGD_CONNECTION_H
-#define LIGHTNING_LIGHTNINGD_CONNECTION_H
+#ifndef LIGHTNING_LIGHTNINGD_DAEMON_CONN_H
+#define LIGHTNING_LIGHTNINGD_DAEMON_CONN_H
 
 #include "config.h"
 #include <ccan/io/io.h>
@@ -70,4 +70,4 @@ struct io_plan *daemon_conn_read_next(struct io_conn *conn,
  * daemon_conn_sync_flush - Flush connection by sending all messages now..
  */
 bool daemon_conn_sync_flush(struct daemon_conn *dc);
-#endif /* LIGHTNING_LIGHTNINGD_CONNECTION_H */
+#endif /* LIGHTNING_LIGHTNINGD_DAEMON_CONN_H */
diff --git a/lightningd/gossip/gossip.c b/lightningd/gossip/gossip.c
index ccd26069a..51281d9ce 100644
--- a/lightningd/gossip/gossip.c
+++ b/lightningd/gossip/gossip.c
@@ -16,8 +16,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <lightningd/connection.h>
 #include <lightningd/cryptomsg.h>
+#include <lightningd/daemon_conn.h>
 #include <lightningd/debug.h>
 #include <lightningd/gossip/gen_gossip_wire.h>
 #include <lightningd/gossip_msg.h>
diff --git a/lightningd/hsm/hsm.c b/lightningd/hsm/hsm.c
index ad18d14ab..7d18acc1a 100644
--- a/lightningd/hsm/hsm.c
+++ b/lightningd/hsm/hsm.c
@@ -16,7 +16,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <lightningd/connection.h>
+#include <lightningd/daemon_conn.h>
 #include <lightningd/funding_tx.h>
 #include <lightningd/hsm/client.h>
 #include <lightningd/hsm/gen_hsm_client_wire.h>
diff --git a/lightningd/status.c b/lightningd/status.c
index e7c0967c8..1e034ada5 100644
--- a/lightningd/status.c
+++ b/lightningd/status.c
@@ -9,7 +9,7 @@
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/take/take.h>
 #include <ccan/tal/str/str.h>
-#include <lightningd/connection.h>
+#include <lightningd/daemon_conn.h>
 #include <lightningd/status.h>
 #include <stdarg.h>