diff --git a/raspi0w.yaml b/raspi0w.yaml
index 90be261..82de1c5 100644
--- a/raspi0w.yaml
+++ b/raspi0w.yaml
@@ -96,11 +96,11 @@ steps:
 
       install -m 644 -o root -g root eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
 
-      install -m 755 -o root -g root set-sysconf "${ROOT?}/usr/local/sbin/set-sysconf"
-      install -m 644 -o root -g root set-sysconf.service "${ROOT?}/etc/systemd/system"
+      install -m 755 -o root -g root rpi-set-sysconf "${ROOT?}/usr/local/sbin/rpi-set-sysconf"
+      install -m 644 -o root -g root rpi-set-sysconf.service "${ROOT?}/etc/systemd/system"
       install -m 644 -o root -g root sysconf.txt "${ROOT?}/boot/firmware/sysconf.txt"
       mkdir -p "${ROOT?}/etc/systemd/system/basic.target.requires/"
-      ln -s /etc/systemd/system/set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/set-sysconf.service"
+      ln -s /etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/rpi-set-sysconf.service"
 
       install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs"
       install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system"
diff --git a/raspi2.yaml b/raspi2.yaml
index e82d30d..1f48650 100644
--- a/raspi2.yaml
+++ b/raspi2.yaml
@@ -94,11 +94,11 @@ steps:
 
       install -m 644 -o root -g root eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
 
-      install -m 755 -o root -g root set-sysconf "${ROOT?}/usr/local/sbin/set-sysconf"
-      install -m 644 -o root -g root set-sysconf.service "${ROOT?}/etc/systemd/system"
+      install -m 755 -o root -g root rpi-set-sysconf "${ROOT?}/usr/local/sbin/rpi-set-sysconf"
+      install -m 644 -o root -g root rpi-set-sysconf.service "${ROOT?}/etc/systemd/system"
       install -m 644 -o root -g root sysconf.txt "${ROOT?}/boot/firmware/sysconf.txt"
       mkdir -p "${ROOT?}/etc/systemd/system/basic.target.requires/"
-      ln -s /etc/systemd/system/set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/set-sysconf.service"
+      ln -s /etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/rpi-set-sysconf.service"
 
       install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs"
       install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system"
diff --git a/raspi3.yaml b/raspi3.yaml
index 64c8f96..e0cfa63 100644
--- a/raspi3.yaml
+++ b/raspi3.yaml
@@ -96,11 +96,11 @@ steps:
 
       install -m 644 -o root -g root eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
 
-      install -m 755 -o root -g root set-sysconf "${ROOT?}/usr/local/sbin/set-sysconf"
-      install -m 644 -o root -g root set-sysconf.service "${ROOT?}/etc/systemd/system"
+      install -m 755 -o root -g root rpi-set-sysconf "${ROOT?}/usr/local/sbin/rpi-set-sysconf"
+      install -m 644 -o root -g root rpi-set-sysconf.service "${ROOT?}/etc/systemd/system"
       install -m 644 -o root -g root sysconf.txt "${ROOT?}/boot/firmware/sysconf.txt"
       mkdir -p "${ROOT?}/etc/systemd/system/basic.target.requires/"
-      ln -s /etc/systemd/system/set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/set-sysconf.service"
+      ln -s /etc/systemd/system/rpi-set-sysconf.service "${ROOT?}/etc/systemd/system/basic.target.requires/rpi-set-sysconf.service"
 
       install -m 755 -o root -g root rpi-resizerootfs "${ROOT?}/usr/sbin/rpi-resizerootfs"
       install -m 644 -o root -g root rpi-resizerootfs.service "${ROOT?}/etc/systemd/system"
diff --git a/rpi-set-sysconf b/rpi-set-sysconf
index 132d7b3..bead307 100644
--- a/rpi-set-sysconf
+++ b/rpi-set-sysconf
@@ -45,5 +45,5 @@ exit 0;
 sub logger {
     my ($prio, $msg) = @_;
     system('/bin/logger', '-p', "daemon.$prio",
-	   '-t', 'set-sysconf', $msg);
+	   '-t', 'rpi-set-sysconf', $msg);
 }
diff --git a/rpi-set-sysconf.service b/rpi-set-sysconf.service
index e8c5df8..94adcef 100644
--- a/rpi-set-sysconf.service
+++ b/rpi-set-sysconf.service
@@ -3,7 +3,7 @@ Description=Set up system configuration
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/sbin/set-sysconf
+ExecStart=/usr/local/sbin/rpi-set-sysconf
 ExecStart=/bin/systemctl --no-reload disable %n
 
 [Install]