diff --git a/Makefile b/Makefile
index fe3849cc7..bb132b805 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,6 @@ BITCOIN_HEADERS := bitcoin/address.h		\
 CORE_HEADERS := close_tx.h			\
 	find_p2sh_out.h				\
 	irc.h					\
-	names.h					\
 	opt_bits.h				\
 	overflows.h				\
 	permute_tx.h				\
diff --git a/daemon/Makefile b/daemon/Makefile
index b767ac756..0bca839fe 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -41,7 +41,7 @@ DAEMON_SRC :=					\
 	daemon/timeout.c			\
 	daemon/wallet.c				\
 	daemon/watch.c				\
-	names.c					\
+	daemon/names.c				\
 	irc.c
 
 DAEMON_OBJS := $(DAEMON_SRC:.c=.o)
@@ -79,6 +79,7 @@ DAEMON_HEADERS :=				\
 	daemon/jsonrpc.h			\
 	daemon/lightningd.h			\
 	daemon/log.h				\
+	daemon/names.h				\
 	daemon/netaddr.h			\
 	daemon/opt_time.h			\
 	daemon/output_to_htlc.h			\
diff --git a/names.c b/daemon/names.c
similarity index 100%
rename from names.c
rename to daemon/names.c
diff --git a/names.h b/daemon/names.h
similarity index 100%
rename from names.h
rename to daemon/names.h