diff --git a/raspi-config b/raspi-config
index 51d7a46..b712ee1 100755
--- a/raspi-config
+++ b/raspi-config
@@ -922,11 +922,11 @@ do_gpiosec() {
   if [ $? -eq 0 ]; then
     case "$RET" in
       Private)
-        rm -f /etc/systemd/system/pigpio.service.d/public.conf
+        rm -f /etc/systemd/system/pigpiod.service.d/public.conf
         ;;
       Public)
-        mkdir -p /etc/systemd/system/pigpio.service.d/
-        cat > /etc/systemd/system/pigpio.service.d/public.conf << EOF
+        mkdir -p /etc/systemd/system/pigpiod.service.d/
+        cat > /etc/systemd/system/pigpiod.service.d/public.conf << EOF
 [Service]
 ExecStart=
 ExecStart=/usr/bin/pigpiod
@@ -938,7 +938,7 @@ EOF
         ;;
     esac
     systemctl daemon-reload
-    systemctl restart pigpio
+    systemctl restart pigpiod
   fi
 }