diff --git a/scripts/klipper.sh b/scripts/klipper.sh
index 5edb442..95a757c 100644
--- a/scripts/klipper.sh
+++ b/scripts/klipper.sh
@@ -295,7 +295,7 @@ function configure_klipper_service() {
     cfg_dir="${printer_data}/config"
     cfg="${cfg_dir}/printer.cfg"
     log="${printer_data}/logs/klippy.log"
-    printer="${printer_data}/comms/printer"
+    printer="${printer_data}/comms/klippy.serial"
     uds="${printer_data}/comms/klippy.sock"
     service="${SYSTEMD}/klipper.service"
     env_file="${printer_data}/systemd/klipper.env"
@@ -322,7 +322,7 @@ function configure_klipper_service() {
       cfg_dir="${printer_data}/config"
       cfg="${cfg_dir}/printer.cfg"
       log="${printer_data}/logs/klippy.log"
-      printer="${printer_data}/comms/printer"
+      printer="${printer_data}/comms/klippy.serial"
       uds="${printer_data}/comms/klippy.sock"
       service="${SYSTEMD}/klipper-${names[${j}]}.service"
       env_file="${printer_data}/systemd/klipper.env"
@@ -450,7 +450,7 @@ function remove_klipper_uds() {
 function remove_klipper_printer() {
   local files
 
-  files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/printer(-[0-9a-zA-Z]+)?" | sort)
+  files=$(find /tmp -maxdepth 1 -regextype posix-extended -regex "/tmp/klippy.serial(-[0-9a-zA-Z]+)?" | sort)
   if [[ -n ${files} ]]; then
     for file in ${files}; do
       status_msg "Removing ${file} ..."