diff --git a/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/run b/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/run
index 6d0ffd4..84d1544 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/run
@@ -1,10 +1,10 @@
 #!/command/with-contenv bash
 # shellcheck shell=bash
 
-# unitd-configure main
+# init-unitd-configure main
 main() {
     # This will prepend service name to all output from here
-    exec > >(while read line; do echo "[unitd-configure] ${line}"; done) 2>&1
+    exec > >(while read line; do echo "[init-unitd-configure] ${line}"; done) 2>&1
 
     local unitConfigurationFile="${UNIT_CONFIGURATION_FILE:?}"
     local unitSocket="${UNIT_SOCKET:?}"
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/up b/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/up
index fc376c5..4dbd862 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/up
+++ b/rootfs/etc/s6-overlay/s6-rc.d/init-unitd-configure/up
@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/unitd-configure/run
\ No newline at end of file
+/etc/s6-overlay/s6-rc.d/init-unitd-configure/run
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/run
index 2d5b5be..a0d68da 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/run
@@ -4,7 +4,7 @@
 # svc-unitd main
 main() {
     # This will prepend service name to all output from here
-    exec > >(while read line; do echo "[unitd] ${line}"; done) 2>&1
+    exec > >(while read line; do echo "[svc-unitd] ${line}"; done) 2>&1
 
     local unitSocket="${UNIT_SOCKET:?}"
 
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/up b/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/up
index b75fc5c..4eb4133 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/up
+++ b/rootfs/etc/s6-overlay/s6-rc.d/svc-unitd/up
@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/unitd/run
\ No newline at end of file
+/etc/s6-overlay/s6-rc.d/svc-unitd/run