diff --git a/channeld/Makefile b/channeld/Makefile
index 9c281d005..1c15d2ef8 100644
--- a/channeld/Makefile
+++ b/channeld/Makefile
@@ -20,7 +20,7 @@ LIGHTNINGD_CHANNEL_HEADERS_NOGEN :=			\
 
 LIGHTNINGD_CHANNEL_HEADERS := $(LIGHTNINGD_CHANNEL_HEADERS_GEN) $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN)
 
-LIGHTNINGD_CHANNEL_SRC := channeld/channel.c	\
+LIGHTNINGD_CHANNEL_SRC := channeld/channeld.c	\
 	channeld/commit_tx.c			\
 	channeld/full_channel.c		\
 	channeld/gen_channel_wire.c
diff --git a/channeld/channel.c b/channeld/channeld.c
similarity index 100%
rename from channeld/channel.c
rename to channeld/channeld.c
diff --git a/closingd/Makefile b/closingd/Makefile
index 64cc6a16a..0eedf7af8 100644
--- a/closingd/Makefile
+++ b/closingd/Makefile
@@ -16,7 +16,7 @@ LIGHTNINGD_CLOSING_HEADERS_NOGEN :=
 
 LIGHTNINGD_CLOSING_HEADERS := $(LIGHTNINGD_CLOSING_HEADERS_GEN) $(LIGHTNINGD_CLOSING_HEADERS_NOGEN)
 
-LIGHTNINGD_CLOSING_SRC := closingd/closing.c	\
+LIGHTNINGD_CLOSING_SRC := closingd/closingd.c	\
 	$(LIGHTNINGD_CLOSING_HEADERS:.h=.c)
 LIGHTNINGD_CLOSING_OBJS := $(LIGHTNINGD_CLOSING_SRC:.c=.o)
 
diff --git a/closingd/closing.c b/closingd/closingd.c
similarity index 100%
rename from closingd/closing.c
rename to closingd/closingd.c
diff --git a/connectd/Makefile b/connectd/Makefile
index c12719d3d..f32dc7bce 100644
--- a/connectd/Makefile
+++ b/connectd/Makefile
@@ -14,7 +14,7 @@ LIGHTNINGD_CONNECT_CONTROL_OBJS := $(LIGHTNINGD_CONNECT_CONTROL_SRC:.c=.o)
 # connectd needs these:
 LIGHTNINGD_CONNECT_HEADERS := connectd/gen_connect_wire.h \
 	connectd/gen_connect_gossip_wire.h		\
-	connectd/connect.h				\
+	connectd/connectd.h				\
 	connectd/handshake.h				\
 	connectd/netaddress.h				\
 	connectd/tor_autoservice.h			\
diff --git a/connectd/connect.c b/connectd/connectd.c
similarity index 99%
rename from connectd/connect.c
rename to connectd/connectd.c
index b78e2ecf2..192dae73a 100644
--- a/connectd/connect.c
+++ b/connectd/connectd.c
@@ -30,7 +30,7 @@
 #include <common/version.h>
 #include <common/wire_error.h>
 #include <common/wireaddr.h>
-#include <connectd/connect.h>
+#include <connectd/connectd.h>
 #include <connectd/gen_connect_gossip_wire.h>
 #include <connectd/gen_connect_wire.h>
 #include <connectd/handshake.h>
diff --git a/connectd/connect.h b/connectd/connectd.h
similarity index 52%
rename from connectd/connect.h
rename to connectd/connectd.h
index 6664c89be..2fd6feae3 100644
--- a/connectd/connect.h
+++ b/connectd/connectd.h
@@ -1,5 +1,5 @@
-#ifndef LIGHTNING_CONNECTD_CONNECT_H
-#define LIGHTNING_CONNECTD_CONNECT_H
+#ifndef LIGHTNING_CONNECTD_CONNECTD_H
+#define LIGHTNING_CONNECTD_CONNECTD_H
 #include "config.h"
 
 struct io_conn;
@@ -7,4 +7,4 @@ struct reaching;
 
 struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach);
 
-#endif /* LIGHTNING_CONNECTD_CONNECT_H */
+#endif /* LIGHTNING_CONNECTD_CONNECTD_H */
diff --git a/connectd/tor.c b/connectd/tor.c
index 88611298a..a2a175765 100644
--- a/connectd/tor.c
+++ b/connectd/tor.c
@@ -4,7 +4,7 @@
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/wireaddr.h>
-#include <connectd/connect.h>
+#include <connectd/connectd.h>
 #include <connectd/tor.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/gossipd/Makefile b/gossipd/Makefile
index 57f5c38be..264fe33ae 100644
--- a/gossipd/Makefile
+++ b/gossipd/Makefile
@@ -13,12 +13,11 @@ LIGHTNINGD_GOSSIP_CONTROL_OBJS := $(LIGHTNINGD_GOSSIP_CONTROL_SRC:.c=.o)
 
 # gossipd needs these:
 LIGHTNINGD_GOSSIP_HEADERS := gossipd/gen_gossip_wire.h \
-	gossipd/gossip.h				\
 	gossipd/gen_gossip_store.h			\
 	gossipd/gossip_store.h				\
 	gossipd/routing.h				\
 	gossipd/broadcast.h
-LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c)
+LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c) gossipd/gossipd.c
 LIGHTNINGD_GOSSIP_OBJS := $(LIGHTNINGD_GOSSIP_SRC:.c=.o)
 
 # Make sure these depend on everything.
diff --git a/gossipd/gossip.h b/gossipd/gossip.h
deleted file mode 100644
index 70c8377bf..000000000
--- a/gossipd/gossip.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef LIGHTNING_GOSSIPD_GOSSIP_H
-#define LIGHTNING_GOSSIPD_GOSSIP_H
-#include "config.h"
-
-struct io_conn;
-struct reaching;
-
-struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach);
-
-#endif /* LIGHTNING_GOSSIPD_GOSSIP_H */
diff --git a/gossipd/gossip.c b/gossipd/gossipd.c
similarity index 99%
rename from gossipd/gossip.c
rename to gossipd/gossipd.c
index 993f4acb0..e2dcfcad0 100644
--- a/gossipd/gossip.c
+++ b/gossipd/gossipd.c
@@ -35,7 +35,6 @@
 #include <fcntl.h>
 #include <gossipd/broadcast.h>
 #include <gossipd/gen_gossip_wire.h>
-#include <gossipd/gossip.h>
 #include <gossipd/routing.h>
 #include <hsmd/client.h>
 #include <hsmd/gen_hsm_client_wire.h>
diff --git a/hsmd/Makefile b/hsmd/Makefile
index 6eb03aa77..5147f21f3 100644
--- a/hsmd/Makefile
+++ b/hsmd/Makefile
@@ -14,7 +14,7 @@ LIGHTNINGD_HSM_CLIENT_OBJS := $(LIGHTNINGD_HSM_CLIENT_SRC:.c=.o)
 # lightningd/hsm needs these:
 LIGHTNINGD_HSM_HEADERS := hsmd/gen_hsm_client_wire.h
 
-LIGHTNINGD_HSM_SRC := hsmd/hsm.c	\
+LIGHTNINGD_HSM_SRC := hsmd/hsmd.c	\
 	$(LIGHTNINGD_HSM_HEADERS:.h=.c)
 LIGHTNINGD_HSM_OBJS := $(LIGHTNINGD_HSM_SRC:.c=.o)
 
diff --git a/hsmd/hsm.c b/hsmd/hsmd.c
similarity index 100%
rename from hsmd/hsm.c
rename to hsmd/hsmd.c
diff --git a/onchaind/Makefile b/onchaind/Makefile
index 7a663e479..1ea8b7bbc 100644
--- a/onchaind/Makefile
+++ b/onchaind/Makefile
@@ -22,7 +22,7 @@ LIGHTNINGD_ONCHAIN_HEADERS_NOGEN :=			\
 
 LIGHTNINGD_ONCHAIN_HEADERS := $(LIGHTNINGD_ONCHAIN_HEADERS_GEN) $(LIGHTNINGD_ONCHAIN_HEADERS_NOGEN)
 
-LIGHTNINGD_ONCHAIN_SRC := onchaind/onchain.c	\
+LIGHTNINGD_ONCHAIN_SRC := onchaind/onchaind.c	\
 	onchaind/gen_onchain_wire.c		\
 	onchaind/onchain_wire.c
 
diff --git a/onchaind/onchain.c b/onchaind/onchaind.c
similarity index 100%
rename from onchaind/onchain.c
rename to onchaind/onchaind.c
diff --git a/onchaind/test/run-grind_feerate.c b/onchaind/test/run-grind_feerate.c
index 49072ffd8..988d9801e 100644
--- a/onchaind/test/run-grind_feerate.c
+++ b/onchaind/test/run-grind_feerate.c
@@ -7,7 +7,7 @@
 
 #define main unused_main
 int main(int argc, char *argv[]);
-#include "../onchain.c"
+#include "../onchaind.c"
 #undef main
 
 /* AUTOGENERATED MOCKS START */
diff --git a/openingd/Makefile b/openingd/Makefile
index c834cea41..92fb90a0a 100644
--- a/openingd/Makefile
+++ b/openingd/Makefile
@@ -16,7 +16,7 @@ LIGHTNINGD_OPENING_HEADERS_NOGEN :=
 
 LIGHTNINGD_OPENING_HEADERS := $(LIGHTNINGD_OPENING_HEADERS_GEN) $(LIGHTNINGD_OPENING_HEADERS_NOGEN)
 
-LIGHTNINGD_OPENING_SRC := openingd/opening.c	\
+LIGHTNINGD_OPENING_SRC := openingd/openingd.c	\
 	$(LIGHTNINGD_OPENING_HEADERS:.h=.c)
 LIGHTNINGD_OPENING_OBJS := $(LIGHTNINGD_OPENING_SRC:.c=.o)
 
diff --git a/openingd/opening.c b/openingd/openingd.c
similarity index 100%
rename from openingd/opening.c
rename to openingd/openingd.c