diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index c890801ee4..3fa3b4b57d 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -76,10 +76,10 @@ libgdk_broadway_la_SOURCES =		\
 	gdkbroadway-server-client.c
 
 broadwayd_SOURCES = \
+	gdkbroadway-server.h		\
 	broadway-protocol.h		\
 	broadwayd.c 			\
-	gdkbroadway-server.h		\
-	gdkbroadway-server.c		\
+	broadway-server.c		\
 	broadway-output.h		\
 	broadway-output.c
 
diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/broadway-server.c
similarity index 100%
rename from gdk/broadway/gdkbroadway-server.c
rename to gdk/broadway/broadway-server.c