diff --git a/daemons/execd/Makefile.am b/daemons/execd/Makefile.am
index 44458dbf3a..9c3e8e1837 100644
--- a/daemons/execd/Makefile.am
+++ b/daemons/execd/Makefile.am
@@ -1,48 +1,50 @@
 #
 # Copyright 2012-2018 David Vossel <davidvossel@gmail.com>
 #
 # This source code is licensed under the GNU Lesser General Public License
 # version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/Makefile.common
 
 halibdir		= $(CRM_DAEMON_DIR)
 halib_PROGRAMS		= pacemaker-execd cts-exec-helper
 
 initdir			= $(INITDIR)
 init_SCRIPTS		= pacemaker_remote
 sbin_PROGRAMS		= pacemaker_remoted
 
 if BUILD_SYSTEMD
 systemdunit_DATA	= pacemaker_remote.service
 endif
 
 pacemaker_execd_CFLAGS		= $(CFLAGS_HARDENED_EXE)
 pacemaker_execd_LDFLAGS		= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_execd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la \
 				  $(top_builddir)/lib/services/libcrmservice.la	\
 				  $(top_builddir)/lib/fencing/libstonithd.la ${COMPAT_LIBS}
-pacemaker_execd_SOURCES		= main.c lrmd.c lrmd_alert_api.c
+pacemaker_execd_SOURCES		= pacemaker-execd.c execd_commands.c \
+				  execd_alerts.c
 
 pacemaker_remoted_CPPFLAGS	= -DSUPPORT_REMOTE $(AM_CPPFLAGS)
 
 pacemaker_remoted_CFLAGS	= $(CFLAGS_HARDENED_EXE)
 pacemaker_remoted_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_remoted_LDADD		= $(pacemaker_execd_LDADD) \
 				  $(top_builddir)/lib/lrmd/liblrmd.la
-pacemaker_remoted_SOURCES	= $(pacemaker_execd_SOURCES) tls_backend.c ipc_proxy.c
+pacemaker_remoted_SOURCES	= $(pacemaker_execd_SOURCES) \
+				  remoted_tls.c remoted_proxy.c
 
 cts_exec_helper_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			  $(top_builddir)/lib/lrmd/liblrmd.la		\
 			  $(top_builddir)/lib/cib/libcib.la		\
 			  $(top_builddir)/lib/services/libcrmservice.la	\
 			  $(top_builddir)/lib/pengine/libpe_status.la	\
 			  $(top_builddir)/pengine/libpengine.la
 cts_exec_helper_SOURCES	= cts-exec-helper.c
 
 noinst_HEADERS  = lrmd_private.h
 
 CLEANFILES = $(man8_MANS)
diff --git a/daemons/execd/lrmd_alert_api.c b/daemons/execd/execd_alerts.c
similarity index 100%
rename from daemons/execd/lrmd_alert_api.c
rename to daemons/execd/execd_alerts.c
diff --git a/daemons/execd/lrmd.c b/daemons/execd/execd_commands.c
similarity index 100%
rename from daemons/execd/lrmd.c
rename to daemons/execd/execd_commands.c
diff --git a/daemons/execd/main.c b/daemons/execd/pacemaker-execd.c
similarity index 100%
rename from daemons/execd/main.c
rename to daemons/execd/pacemaker-execd.c
diff --git a/daemons/execd/ipc_proxy.c b/daemons/execd/remoted_proxy.c
similarity index 100%
rename from daemons/execd/ipc_proxy.c
rename to daemons/execd/remoted_proxy.c
diff --git a/daemons/execd/tls_backend.c b/daemons/execd/remoted_tls.c
similarity index 100%
rename from daemons/execd/tls_backend.c
rename to daemons/execd/remoted_tls.c