diff --git a/package/confd/sysrepo.conf b/package/confd/confd.conf
similarity index 72%
rename from package/confd/sysrepo.conf
rename to package/confd/confd.conf
index e820a22f..9d795bae 100644
--- a/package/confd/sysrepo.conf
+++ b/package/confd/confd.conf
@@ -7,24 +7,24 @@ run name:bootstrap log:prio:user.notice norestart <pid/syslogd> \
 run name:error :1 log:console norestart if:<run/bootstrap/failure> \
 	[S] /usr/libexec/confd/error --
 
-service name:sysrepo log <pid/syslogd> \
-	[S12345789] sysrepo-plugind -f -p /run/sysrepo.pid -n -v3 -- Configuration daemon
+service name:confd log <run/bootstrap/success> \
+	[S12345789] sysrepo-plugind -f -p /run/confd.pid -n -v3 -- Configuration daemon
 
 # Bootstrap system with startup-config
 run name:startup log:prio:user.notice norestart \
-	[S] <pid/sysrepo> /usr/libexec/confd/load -b startup-config \
+	[S] <pid/confd> /usr/libexec/confd/load -b startup-config \
 	-- Loading startup-config
 
 # Run if loading startup-config fails for some reason
 run name:failure log:prio:user.critical norestart if:<run/startup/failure> \
-	[S] <pid/sysrepo> /usr/libexec/confd/load failure-config \
+	[S] <pid/confd> /usr/libexec/confd/load failure-config \
 	-- Loading failure-config
 
 run name:error :2 log:console norestart if:<run/startup/failure> \
 	[S] /usr/libexec/confd/error --
 
 service name:netopeer log \
-	[12345789] <pid/sysrepo> netopeer2-server -F -t 60 \
+	[12345789] <pid/confd> netopeer2-server -F -t 60 \
 	-- NETCONF server
 
 # XXX: This is a hack, talk to Joachim
diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index 577b9ae3..24e1e0cf 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -14,8 +14,8 @@ CONFD_DEPENDENCIES = augeas jansson libite sysrepo libsrx
 CONFD_AUTORECONF = YES
 
 define CONFD_INSTALL_EXTRA
-	cp $(CONFD_PKGDIR)/sysrepo.conf  $(FINIT_D)/available/
-	ln -sf ../available/sysrepo.conf $(FINIT_D)/enabled/sysrepo.conf
+	cp $(CONFD_PKGDIR)/confd.conf  $(FINIT_D)/available/
+	ln -sf ../available/confd.conf $(FINIT_D)/enabled/confd.conf
 	cp $(CONFD_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/confd.conf
 endef
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
diff --git a/package/statd/statd.conf b/package/statd/statd.conf
index 41436a49..e27ae03a 100644
--- a/package/statd/statd.conf
+++ b/package/statd/statd.conf
@@ -1 +1 @@
-service name:statd log [S12345789] <pid/sysrepo> statd -f -p /run/statd.pid -n -- Status daemon
+service name:statd log [S12345789] <pid/confd> statd -f -p /run/statd.pid -n -- Status daemon