diff --git a/Makefile.am b/Makefile.am
index 62719c95..79a442cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,8 +138,8 @@ if HAVE_SYSTEMD_LOGIN
 libsession_helper_la_SOURCES +=			\
 	src/dbus.h				\
 	src/dbus.c				\
-	src/logind-util.h			\
-	src/logind-util.c
+	src/launcher-logind.h			\
+	src/launcher-logind.c
 libsession_helper_la_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) $(DBUS_CFLAGS)
 libsession_helper_la_LIBADD += $(SYSTEMD_LOGIN_LIBS) $(DBUS_LIBS)
 endif
diff --git a/src/logind-util.c b/src/launcher-logind.c
similarity index 99%
rename from src/logind-util.c
rename to src/launcher-logind.c
index 006a1aef..4fab9a47 100644
--- a/src/logind-util.c
+++ b/src/launcher-logind.c
@@ -44,7 +44,7 @@
 
 #include "compositor.h"
 #include "dbus.h"
-#include "logind-util.h"
+#include "launcher-logind.h"
 
 #define DRM_MAJOR 226
 
diff --git a/src/logind-util.h b/src/launcher-logind.h
similarity index 100%
rename from src/logind-util.h
rename to src/launcher-logind.h
diff --git a/src/launcher-util.c b/src/launcher-util.c
index 6205e5f4..dc02dff4 100644
--- a/src/launcher-util.c
+++ b/src/launcher-util.c
@@ -45,7 +45,7 @@
 
 #include "compositor.h"
 #include "launcher-util.h"
-#include "logind-util.h"
+#include "launcher-logind.h"
 #include "weston-launch.h"
 
 #define DRM_MAJOR 226