diff --git a/.gitignore b/.gitignore
index 453635638..9ba0758a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-systemd-tempfiles
+systemd-tmpfiles
 systemd-readahead-collect
 systemd-readahead-replay
 systemd-reply-password
diff --git a/Makefile.am b/Makefile.am
index 980cb8f17..44a2779f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,7 @@ rootlibexec_PROGRAMS = \
 	systemd-reply-password \
 	systemd-readahead-collect \
 	systemd-readahead-replay \
-	systemd-tempfiles
+	systemd-tmpfiles
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -627,13 +627,13 @@ systemd_modules_load_SOURCES = \
 systemd_modules_load_CFLAGS = \
 	$(AM_CFLAGS)
 
-systemd_tempfiles_LDADD = \
+systemd_tmpfiles_LDADD = \
 	libsystemd-basic.la
 
-systemd_tempfiles_SOURCES = \
-	src/tempfiles.c
+systemd_tmpfiles_SOURCES = \
+	src/tmpfiles.c
 
-systemd_tempfiles_CFLAGS = \
+systemd_tmpfiles_CFLAGS = \
 	$(AM_CFLAGS)
 
 systemd_modules_load_LDADD = \
diff --git a/src/tempfiles.c b/src/tmpfiles.c
similarity index 100%
rename from src/tempfiles.c
rename to src/tmpfiles.c