Rename everything significant to Kutter except for docs

19 files changed, 114 insertions, 114 deletions

diff --git a/scripts/buildcommands.py b/scripts/buildcommands.py
index a9043394..f5a8da82 100644
--- a/scripts/buildcommands.py
+++ b/scripts/buildcommands.py
@@ -612,7 +612,7 @@ class HandleVersions:
     def update_data_dictionary(self, data):
         data["version"] = self.version
         data["build_versions"] = self.toolstr
-        data["app"] = "Klipper"
+        data["app"] = "Kutter"
         data["license"] = "GNU GPLv3"
 
     def generate_code(self, options):
diff --git a/scripts/canbus_query.py b/scripts/canbus_query.py
index 12032ee7..9620be84 100644
--- a/scripts/canbus_query.py
+++ b/scripts/canbus_query.py
@@ -10,7 +10,7 @@ import can
 CANBUS_ID_ADMIN = 0x3F0
 CMD_QUERY_UNASSIGNED = 0x00
 RESP_NEED_NODEID = 0x20
-CMD_SET_KLIPPER_NODEID = 0x01
+CMD_SET_KUTTER_NODEID = 0x01
 CMD_SET_CANBOOT_NODEID = 0x11
 
 
@@ -48,10 +48,10 @@ def query_unassigned(canbus_iface):
             continue
         found_ids[uuid] = 1
         AppNames = {
-            CMD_SET_KLIPPER_NODEID: "Klipper",
+            CMD_SET_KUTTER_NODEID: "Kutter",
             CMD_SET_CANBOOT_NODEID: "CanBoot",
         }
-        app_id = CMD_SET_KLIPPER_NODEID
+        app_id = CMD_SET_KUTTER_NODEID
         if msg.dlc > 7:
             app_id = msg.data[7]
         app_name = AppNames.get(app_id, "Unknown")
diff --git a/scripts/check-gcc.sh b/scripts/check-gcc.sh
index 2d89d98f..8c363221 100755
--- a/scripts/check-gcc.sh
+++ b/scripts/check-gcc.sh
@@ -9,7 +9,7 @@ s2=`readelf -A "$f2" | grep "Tag_ARM_ISA_use"`
 
 if [ "$s1" != "$s2" ]; then
     echo ""
-    echo "ERROR: The compiler failed to correctly compile Klipper"
+    echo "ERROR: The compiler failed to correctly compile Kutter"
     echo "It will be necessary to upgrade the compiler"
     echo "See: https://bugs.launchpad.net/ubuntu/+source/newlib/+bug/1767223"
     echo ""
diff --git a/scripts/check_whitespace.sh b/scripts/check_whitespace.sh
index 4fe2146e..9cf592b4 100755
--- a/scripts/check_whitespace.sh
+++ b/scripts/check_whitespace.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Script to check whitespace in Klipper source code.
+# Script to check whitespace in source code.
 
 # Find SRCDIR from the pathname of this script
 SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
diff --git a/scripts/checkstack.py b/scripts/checkstack.py
index 6ae9c473..a562c2bd 100755
--- a/scripts/checkstack.py
+++ b/scripts/checkstack.py
@@ -7,7 +7,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 
 # Usage:
-#   avr-objdump -d out/klipper.elf | scripts/checkstack.py
+#   avr-objdump -d out/kutter.elf | scripts/checkstack.py
 
 import sys
 import re
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 49675bd4..6e9bb86e 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -58,7 +58,7 @@ for TARGET in test/configs/*.config ; do
     size out/*.elf
     ./scripts/check-software-div.sh .config out/*.elf
     finish_test mcu_compile "$TARGET"
-    cp out/klipper.dict ${DICTDIR}/$(basename ${TARGET} .config).dict
+    cp out/kutter.dict ${DICTDIR}/$(basename ${TARGET} .config).dict
 done
 
 
diff --git a/scripts/dump_mcu.py b/scripts/dump_mcu.py
index 153962e5..5b6c6d49 100755
--- a/scripts/dump_mcu.py
+++ b/scripts/dump_mcu.py
@@ -11,8 +11,8 @@ import os
 import traceback
 import logging
 
-KLIPPER_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../"))
-sys.path.append(os.path.join(KLIPPER_DIR, "klippy"))
+KUTTER_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../"))
+sys.path.append(os.path.join(KUTTER_DIR, "klippy"))
 import reactor
 import serialhdl
 import clocksync
diff --git a/scripts/filter_workbench.ipynb b/scripts/filter_workbench.ipynb
index 1e1adfe7..4310d73d 100644
--- a/scripts/filter_workbench.ipynb
+++ b/scripts/filter_workbench.ipynb
@@ -135,7 +135,7 @@
     "# such as powerline noise at 60Hz\n",
     "if notch_filter_frequencies:\n",
     "    if len(notch_filter_frequencies) > 2:\n",
-    "        raise \"Klipper supports a max of 2 notch frequencies\"\n",
+    "        raise \"Kutter supports a max of 2 notch frequencies\"\n",
     "    for freq in notch_filter_frequencies:\n",
     "        b, a = signal.iirnotch(freq, notch_quality, fs=sensor_frequency)\n",
     "        # convert notch from b,a format to sos\n",
diff --git a/scripts/flash-pru.sh b/scripts/flash-pru.sh
index c508606c..dba92d7e 100755
--- a/scripts/flash-pru.sh
+++ b/scripts/flash-pru.sh
@@ -14,7 +14,7 @@ cp out/pru1.elf /lib/firmware/am335x-pru1-fw
 sync
 
 # Restart (if system install script present)
-if [ -f /etc/init.d/klipper_pru ]; then
+if [ -f /etc/init.d/kutter_pru ]; then
     echo "Attempting PRU restart..."
-    service klipper_pru restart
+    service kutter_pru restart
 fi
diff --git a/scripts/flash-sdcard.sh b/scripts/flash-sdcard.sh
index 6a08eab1..2e85fd35 100755
--- a/scripts/flash-sdcard.sh
+++ b/scripts/flash-sdcard.sh
@@ -5,9 +5,9 @@
 # Non-standard installations may need to change this location
 KLIPPY_ENV="${HOME}/klippy-env/bin/python"
 SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-KLIPPER_BIN="${SRCDIR}/out/klipper.bin"
-KLIPPER_BIN_DEFAULT=$KLIPPER_BIN
-KLIPPER_DICT_DEFAULT="${SRCDIR}/out/klipper.dict"
+KUTTER_BIN="${SRCDIR}/out/kutter.bin"
+KUTTER_BIN_DEFAULT=$KUTTER_BIN
+KUTTER_DICT_DEFAULT="${SRCDIR}/out/kutter.dict"
 SPI_FLASH="${SRCDIR}/scripts/spi_flash/spi_flash.py"
 BAUD_ARG=""
 CHECK_ARG=""
@@ -16,7 +16,7 @@ set -e
 
 print_help_message()
 {
-    echo "SD Card upload utility for Klipper"
+    echo "SD Card upload utility for Kutter"
     echo
     echo "usage: flash_sdcard.sh [-h] [-l] [-c] [-b <baud>] [-f <firmware>] [-d <dictionary>]"
     echo "                       <device> <board>"
@@ -30,8 +30,8 @@ print_help_message()
     echo "  -l                list available boards"
     echo "  -c                run flash check/verify only (skip upload)"
     echo "  -b <baud>         serial baud rate (default is 250000)"
-    echo "  -f <firmware>     path to klipper.bin"
-    echo "  -d <dictionary>   path to klipper.dict for firmware validation"
+    echo "  -f <firmware>     path to kutter.bin"
+    echo "  -d <dictionary>   path to kutter.dict for firmware validation"
 }
 
 # Parse command line "optional args"
@@ -47,8 +47,8 @@ while getopts "hlcb:f:d:" arg; do
             ;;
         c) CHECK_ARG="-c";;
         b) BAUD_ARG="-b ${OPTARG}";;
-        f) KLIPPER_BIN=$OPTARG;;
-        d) KLIPPER_DICT=$OPTARG;;
+        f) KUTTER_BIN=$OPTARG;;
+        d) KUTTER_DICT=$OPTARG;;
     esac
 done
 
@@ -61,8 +61,8 @@ fi
 DEVICE=${@:$OPTIND:1}
 BOARD=${@:$OPTIND+1:1}
 
-if [ ! -f $KLIPPER_BIN ]; then
-    echo "No file found at '${KLIPPER_BIN}'"
+if [ ! -f $KUTTER_BIN ]; then
+    echo "No file found at '${KUTTER_BIN}'"
     exit -1
 fi
 
@@ -71,18 +71,18 @@ if [ ! -e $DEVICE ]; then
     exit -1
 fi
 
-if [ ! $KLIPPER_DICT ] && [ $KLIPPER_BIN == $KLIPPER_BIN_DEFAULT ] ; then
-    KLIPPER_DICT=$KLIPPER_DICT_DEFAULT
+if [ ! $KUTTER_DICT ] && [ $KUTTER_BIN == $KUTTER_BIN_DEFAULT ] ; then
+    KUTTER_DICT=$KUTTER_DICT_DEFAULT
 fi
 
-if [ $KLIPPER_DICT ]; then
-    if [ ! -f $KLIPPER_DICT ]; then
-        echo "No file found at '${KLIPPER_BIN}'"
+if [ $KUTTER_DICT ]; then
+    if [ ! -f $KUTTER_DICT ]; then
+        echo "No file found at '${KUTTER_BIN}'"
         exit -1
     fi
-    KLIPPER_DICT="-d ${KLIPPER_DICT}"
+    KUTTER_DICT="-d ${KUTTER_DICT}"
 fi
 
 # Run Script
-echo "Flashing ${KLIPPER_BIN} to ${DEVICE}"
-${KLIPPY_ENV} ${SPI_FLASH} ${CHECK_ARG} ${BAUD_ARG} ${KLIPPER_DICT} ${DEVICE} ${BOARD} ${KLIPPER_BIN}
+echo "Flashing ${KUTTER_BIN} to ${DEVICE}"
+${KLIPPY_ENV} ${SPI_FLASH} ${CHECK_ARG} ${BAUD_ARG} ${KUTTER_DICT} ${DEVICE} ${BOARD} ${KUTTER_BIN}
diff --git a/scripts/flash_usb.py b/scripts/flash_usb.py
index 99e291fc..2d3b4a4d 100755
--- a/scripts/flash_usb.py
+++ b/scripts/flash_usb.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Tool to enter a USB bootloader and flash Klipper
+# Tool to enter a USB bootloader and flash Kutter
 #
 # Copyright (C) 2019  Kevin O'Connor <kevin@koconnor.net>
 #
@@ -192,7 +192,7 @@ def flash_hidflash(device, binfile, sudo=True):
         call_hidflash(binfile, sudo)
 
 
-# Call Klipper modified "picoboot"
+# Call Kutter modified "picoboot"
 def call_picoboot(bus, addr, binfile, sudo):
     args = ["lib/rp2040_flash/rp2040_flash", binfile]
     if bus is not None:
@@ -205,7 +205,7 @@ def call_picoboot(bus, addr, binfile, sudo):
         raise error("Error running rp2040_flash")
 
 
-# Flash via Klipper modified "picoboot"
+# Flash via Kutter modified "picoboot"
 def flash_picoboot(device, binfile, sudo):
     ttyname, serbypath = translate_serial_to_tty(device)
     buspath, devpath = translate_serial_to_usb_path(device)
@@ -256,7 +256,7 @@ def flash_atsamd(options, binfile):
 SMOOTHIE_HELP = """
 Failed to flash to %s: %s
 
-If flashing Klipper to a Smoothieboard for the first time it may be
+If flashing Kutter to a Smoothieboard for the first time it may be
 necessary to manually place the board into "bootloader mode" - press
 and hold the "Play button" and then press and release the "Reset
 button".
@@ -266,7 +266,7 @@ following command:
   make flash FLASH_DEVICE=1d50:6015
 
 Alternatively, one can flash a Smoothieboard via SD card - copy the
-"out/klipper.bin" file to a file named "firmware.bin" on an SD card
+"out/kutter.bin" file to a file named "firmware.bin" on an SD card
 and then restart the Smoothieboard with that SD card.
 
 """
@@ -344,7 +344,7 @@ following command:
 
 Alternatively, one can flash rp2040 boards like the Pico by manually
 entering bootloader mode(hold bootsel button during powerup), mount the
-device as a usb drive, and copy klipper.uf2 to the device.
+device as a usb drive, and copy kutter.uf2 to the device.
 
 """
 
@@ -390,7 +390,7 @@ MCUTYPES = {
 
 
 def main():
-    usage = "%prog [options] -t <type> -d <device> <klipper.bin>"
+    usage = "%prog [options] -t <type> -d <device> <kutter.bin>"
     opts = optparse.OptionParser(usage)
     opts.add_option(
         "-t", "--type", type="string", dest="mcutype", help="micro-controller type"
diff --git a/scripts/graph_mesh.py b/scripts/graph_mesh.py
index a62f9df2..af1a809e 100755
--- a/scripts/graph_mesh.py
+++ b/scripts/graph_mesh.py
@@ -496,7 +496,7 @@ def dump_request(cmd_args):
     outfile = cmd_args.output
     if outfile is None:
         postfix = time.strftime("%Y%m%d_%H%M%S")
-        outfile = "klipper-bedmesh-%s.json" % (postfix,)
+        outfile = "kutter-bedmesh-%s.json" % (postfix,)
     outfile = os.path.abspath(os.path.expanduser(outfile))
     print("Saving Mesh Output to '%s'" % (outfile))
     with open(outfile, "w") as f:
@@ -520,7 +520,7 @@ def main():
         "-s",
         "--scale-plot",
         action="store_true",
-        help="Use axis limits reported by Klipper to scale plot X/Y",
+        help="Use axis limits reported by Kutter to scale plot X/Y",
     )
     plot_parser.add_argument(
         "-p",
@@ -542,20 +542,20 @@ def main():
     plot_parser.add_argument(
         "input",
         metavar="<input>",
-        help="Path/url to Klipper Socket or path to json file",
+        help="Path/url to Kutter Socket or path to json file",
     )
     plot_parser.set_defaults(func=plot_mesh_data)
     analyze_parser.add_argument(
         "input",
         metavar="<input>",
-        help="Path/url to Klipper Socket or path to json file",
+        help="Path/url to Kutter Socket or path to json file",
     )
     analyze_parser.set_defaults(func=analyze)
     dump_parser.add_argument(
         "-o", "--output", type=str, default=None, help="Json output file path"
     )
     dump_parser.add_argument(
-        "input", metavar="<input>", help="Path or url to Klipper Socket"
+        "input", metavar="<input>", help="Path or url to Kutter Socket"
     )
     dump_parser.set_defaults(func=dump_request)
     cmd_args = parser.parse_args()
diff --git a/scripts/klipper-mcu.service b/scripts/klipper-mcu.service
deleted file mode 100644
index ca15c86b..00000000
--- a/scripts/klipper-mcu.service
+++ /dev/null
@@ -1,21 +0,0 @@
-#Systemd klipper linux mcu Service
-
-[Unit]
-Description=Starts the MCU Linux firmware for klipper on startup
-Documentation=https://www.klipper3d.org/RPi_microcontroller.html
-Before=klipper.service
-ConditionFileIsExecutable=/usr/local/bin/klipper_mcu
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-Type=simple
-Environment=KLIPPER_HOST_MCU_SERIAL=/tmp/klipper_host_mcu
-RemainAfterExit=yes
-ExecStart=/usr/local/bin/klipper_mcu -r -I ${KLIPPER_HOST_MCU_SERIAL}
-ExecStop=sh -c 'echo "FORCE_SHUTDOWN" > ${KLIPPER_HOST_MCU_SERIAL}'
-ExecStop=sleep 1
-TimeoutStopSec=2
-Restart=always
-RestartSec=5
diff --git a/scripts/klippy-requirements.txt b/scripts/klippy-requirements.txt
index 849aac0e..1b812cb2 100644
--- a/scripts/klippy-requirements.txt
+++ b/scripts/klippy-requirements.txt
@@ -1,5 +1,5 @@
 # This file describes the Python virtualenv package requirements for
-# the Klipper host software (Klippy).  These package requirements are
+# the Kutter host software (Klippy).  These package requirements are
 # typically installed via the command:
 #   pip install -r klippy-requirements.txt
 
diff --git a/scripts/kutter-mcu.service b/scripts/kutter-mcu.service
new file mode 100644
index 00000000..99895a37
--- /dev/null
+++ b/scripts/kutter-mcu.service
@@ -0,0 +1,21 @@
+#Systemd kutter linux mcu Service
+
+[Unit]
+Description=Starts the MCU Linux firmware for kutter on startup
+Documentation=https://the-tk.com/cgit/kutter/tree/docs/RPi_microcontroller.md
+Before=kutter.service
+ConditionFileIsExecutable=/usr/local/bin/kutter_mcu
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+Environment=KUTTER_HOST_MCU_SERIAL=/tmp/kutter_host_mcu
+RemainAfterExit=yes
+ExecStart=/usr/local/bin/kutter_mcu -r -I ${KUTTER_HOST_MCU_SERIAL}
+ExecStop=sh -c 'echo "FORCE_SHUTDOWN" > ${KUTTER_HOST_MCU_SERIAL}'
+ExecStop=sleep 1
+TimeoutStopSec=2
+Restart=always
+RestartSec=5
diff --git a/scripts/klipper-pru-start.sh b/scripts/kutter-pru-start.sh
index 5d9af529..5ddc657c 100755
--- a/scripts/klipper-pru-start.sh
+++ b/scripts/kutter-pru-start.sh
@@ -2,21 +2,21 @@
 # System startup script to start the PRU firmware
 
 ### BEGIN INIT INFO
-# Provides:          klipper_pru
+# Provides:          kutter_pru
 # Required-Start:    $local_fs
 # Required-Stop:
 # Default-Start:     3 4 5
 # Default-Stop:      0 1 2 6
-# Short-Description: Klipper_PRU daemon
-# Description:       Starts the PRU for Klipper.
+# Short-Description: Kutter_PRU daemon
+# Description:       Starts the PRU for Kutter.
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-DESC="klipper_pru startup"
-NAME="klipper_pru"
-KLIPPER_HOST_MCU=/usr/local/bin/klipper_mcu
-KLIPPER_HOST_ARGS="-w -r"
-PIDFILE=/var/run/klipper_mcu.pid
+DESC="kutter_pru startup"
+NAME="kutter_pru"
+KUTTER_HOST_MCU=/usr/local/bin/kutter_mcu
+KUTTER_HOST_ARGS="-w -r"
+PIDFILE=/var/run/kutter_mcu.pid
 RPROC0=/sys/class/remoteproc/remoteproc1
 RPROC1=/sys/class/remoteproc/remoteproc2
 
@@ -24,14 +24,14 @@ RPROC1=/sys/class/remoteproc/remoteproc2
 
 pru_stop()
 {
-    # Shutdown existing Klipper instance (if applicable). The goal is to
+    # Shutdown existing Kutter instance (if applicable). The goal is to
     # put the GPIO pins in a safe state.
     if [ -c /dev/rpmsg_pru30 ]; then
         log_daemon_msg "Attempting to shutdown PRU..."
         set -e
-        ( echo "FORCE_SHUTDOWN" > /dev/rpmsg_pru30 ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Klipper and then retry." && exit 1 )
+        ( echo "FORCE_SHUTDOWN" > /dev/rpmsg_pru30 ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Kutter and then retry." && exit 1 )
         sleep 1
-        ( echo "FORCE_SHUTDOWN" > /dev/rpmsg_pru30 ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Klipper and then retry." && exit 1 )
+        ( echo "FORCE_SHUTDOWN" > /dev/rpmsg_pru30 ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Kutter and then retry." && exit 1 )
         sleep 1
         set +e
     fi
@@ -61,34 +61,34 @@ pru_start()
 
 mcu_host_stop()
 {
-    # Shutdown existing Klipper instance (if applicable). The goal is to
+    # Shutdown existing Kutter instance (if applicable). The goal is to
     # put the GPIO pins in a safe state.
-    if [ -c /tmp/klipper_host_mcu ]; then
+    if [ -c /tmp/kutter_host_mcu ]; then
         log_daemon_msg "Attempting to shutdown host mcu..."
         set -e
-        ( echo "FORCE_SHUTDOWN" > /tmp/klipper_host_mcu ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Klipper and then retry." && exit 1 )
+        ( echo "FORCE_SHUTDOWN" > /tmp/kutter_host_mcu ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Kutter and then retry." && exit 1 )
         sleep 1
-        ( echo "FORCE_SHUTDOWN" > /tmp/klipper_host_mcu ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Klipper and then retry." && exit 1 )
+        ( echo "FORCE_SHUTDOWN" > /tmp/kutter_host_mcu ) 2> /dev/null || ( log_action_msg "Firmware busy! Please shutdown Kutter and then retry." && exit 1 )
         sleep 1
         set +e
     fi
 
-    log_daemon_msg "Stopping klipper host mcu" $NAME
-    killproc -p $PIDFILE $KLIPPER_HOST_MCU
+    log_daemon_msg "Stopping kutter host mcu" $NAME
+    killproc -p $PIDFILE $KUTTER_HOST_MCU
 }
 
 mcu_host_start()
 {
-    [ -x $KLIPPER_HOST_MCU ] || return
+    [ -x $KUTTER_HOST_MCU ] || return
 
-    if [ -c /tmp/klipper_host_mcu ]; then
+    if [ -c /tmp/kutter_host_mcu ]; then
         mcu_host_stop
     fi
 
-    log_daemon_msg "Starting klipper MCU" $NAME
-    start-stop-daemon --start --quiet --exec $KLIPPER_HOST_MCU \
+    log_daemon_msg "Starting kutter MCU" $NAME
+    start-stop-daemon --start --quiet --exec $KUTTER_HOST_MCU \
                       --background --pidfile $PIDFILE --make-pidfile \
-                      -- $KLIPPER_HOST_ARGS
+                      -- $KUTTER_HOST_ARGS
     log_end_msg $?
 }
 
@@ -110,9 +110,9 @@ reload|force-reload)
     log_end_msg 1
     ;;
 status)
-    status_of_proc -p $PIDFILE $KLIPPER_HOST_MCU $NAME && exit 0 || exit $?
+    status_of_proc -p $PIDFILE $KUTTER_HOST_MCU $NAME && exit 0 || exit $?
     ;;
-*)  log_action_msg "Usage: /etc/init.d/klipper {start|stop|status|restart|reload|force-reload}"
+*)  log_action_msg "Usage: /etc/init.d/kutter {start|stop|status|restart|reload|force-reload}"
     exit 2
     ;;
 esac
diff --git a/scripts/motan/data_logger.py b/scripts/motan/data_logger.py
index 00023c2f..8a525747 100755
--- a/scripts/motan/data_logger.py
+++ b/scripts/motan/data_logger.py
@@ -144,7 +144,7 @@ class DataLogger:
 
     def handle_info(self, msg, raw_msg):
         if msg["result"]["state"] != "ready":
-            self.finish("Klipper not in ready state")
+            self.finish("Kutter not in ready state")
         self.send_query("list", "objects/list", {}, self.handle_list)
 
     def handle_list(self, msg, raw_msg):
diff --git a/scripts/spi_flash/fatfs_lib.py b/scripts/spi_flash/fatfs_lib.py
index 6ad37e66..993ce17c 100644
--- a/scripts/spi_flash/fatfs_lib.py
+++ b/scripts/spi_flash/fatfs_lib.py
@@ -6,12 +6,12 @@
 import os
 import sys
 
-KLIPPER_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../"))
-sys.path.append(os.path.join(KLIPPER_DIR, "klippy"))
+KUTTER_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../"))
+sys.path.append(os.path.join(KUTTER_DIR, "klippy"))
 import chelper
 
 DEST_LIB = "fatfs.so"
-FATFS_DIR = os.path.join(KLIPPER_DIR, "lib/fatfs")
+FATFS_DIR = os.path.join(KUTTER_DIR, "lib/fatfs")
 FATFS_SRC = ["ff.c", "ffsystem.c", "ffunicode.c"]
 SPI_FLASH_SRC = ["fatfs_api.c"]
 FATFS_HEADERS = ["diskio.h", "ff.h", "ffconf.h"]
diff --git a/scripts/spi_flash/spi_flash.py b/scripts/spi_flash/spi_flash.py
index f784f0a4..b4141cd4 100644
--- a/scripts/spi_flash/spi_flash.py
+++ b/scripts/spi_flash/spi_flash.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Module supporting uploads Klipper firmware to an SD Card via SPI and SDIO
+# Module supporting uploads firmware to an SD Card via SPI and SDIO
 #
 # Copyright (C) 2021 Eric Callahan <arksine.code@gmail.com>
 # Copyright (C) 2022 H. Gregor Molter <gregor.molter@secretlab.de>
@@ -68,7 +68,7 @@ def calc_crc16(data):
 
 # Translate a serial device name to a stable serial name in
 # /dev/serial/by-path/
-# Borrowed from  klipper/scripts/flash_usb.py
+# Borrowed from  kutter/scripts/flash_usb.py
 def translate_serial_to_tty(device):
     ttyname = os.path.realpath(device)
     if os.path.exists("/dev/serial/by-path/"):
@@ -83,16 +83,16 @@ def check_need_convert(board_name, config):
     conv_script = config.get("conversion_script")
     if conv_script is None:
         return
-    conv_util = os.path.join(fatfs_lib.KLIPPER_DIR, conv_script)
-    klipper_bin = config["klipper_bin_path"]
+    conv_util = os.path.join(fatfs_lib.KUTTER_DIR, conv_script)
+    kutter_bin = config["kutter_bin_path"]
     dest_bin = os.path.join(
-        os.path.dirname(klipper_bin), os.path.basename(config["firmware_path"])
+        os.path.dirname(kutter_bin), os.path.basename(config["firmware_path"])
     )
-    cmd = "%s %s %s %s" % (sys.executable, conv_util, klipper_bin, dest_bin)
-    output("Converting Klipper binary to custom format...")
+    cmd = "%s %s %s %s" % (sys.executable, conv_util, kutter_bin, dest_bin)
+    output("Converting Kutter binary to custom format...")
     os.system(cmd)
     output_line("Done")
-    config["klipper_bin_path"] = dest_bin
+    config["kutter_bin_path"] = dest_bin
 
 
 ###########################################################
@@ -1469,13 +1469,13 @@ class MCUConnection:
             raise SPIFlashError("Unknown bus defined in board_defs.py.")
 
     def sdcard_upload(self):
-        output("Uploading Klipper Firmware to SD Card...")
+        output("Uploading Kutter Firmware to SD Card...")
         input_sha = hashlib.sha1()
         sd_sha = hashlib.sha1()
-        klipper_bin_path = self.board_config["klipper_bin_path"]
+        kutter_bin_path = self.board_config["kutter_bin_path"]
         fw_path = self.board_config.get("firmware_path", "firmware.bin")
         try:
-            with open(klipper_bin_path, "rb") as local_f:
+            with open(kutter_bin_path, "rb") as local_f:
                 with self.fatfs.open_file(fw_path, "wb") as sd_f:
                     while True:
                         buf = local_f.read(4096)
@@ -1586,9 +1586,9 @@ class SPIFlash:
         self.board_config = args
         if not os.path.exists(args["device"]):
             raise SPIFlashError("No device found at '%s'" % (args["device"],))
-        if not os.path.isfile(args["klipper_bin_path"]):
+        if not os.path.isfile(args["kutter_bin_path"]):
             raise SPIFlashError(
-                "Unable to locate klipper binary at '%s'" % (args["klipper_bin_path"],)
+                "Unable to locate Kutter binary at '%s'" % (args["kutter_bin_path"],)
             )
         tty_name, dev_by_path = translate_serial_to_tty(args["device"])
         self.device_path = dev_by_path
@@ -1600,14 +1600,14 @@ class SPIFlash:
         self.need_verify = True
         self.old_dictionary = None
         self.new_dictionary = None
-        if args["klipper_dict_path"] is not None:
+        if args["kutter_dict_path"] is not None:
             try:
-                with open(args["klipper_dict_path"], "rb") as dict_f:
+                with open(args["kutter_dict_path"], "rb") as dict_f:
                     self.new_dictionary = dict_f.read(32 * 1024)
             except Exception:
                 raise SPIFlashError(
                     "Missing or invalid dictionary at '%s'"
-                    % (args["klipper_dict_path"],)
+                    % (args["kutter_dict_path"],)
                 )
 
     def _wait_for_reconnect(self):
@@ -1738,10 +1738,10 @@ def main():
     parser.add_argument(
         "-d",
         "--dict_path",
-        metavar="<klipper.dict>",
+        metavar="<kutter.dict>",
         type=str,
         default=None,
-        help="Klipper firmware dictionary",
+        help="Kutter firmware dictionary",
     )
     parser.add_argument(
         "-c", "--check", action="store_true", help="Perform flash check/verify only"
@@ -1749,7 +1749,7 @@ def main():
     parser.add_argument("device", metavar="<device>", help="Device Serial Port")
     parser.add_argument("board", metavar="<board>", help="Board Type")
     parser.add_argument(
-        "klipper_bin_path", metavar="<klipper.bin>", help="Klipper firmware binary"
+        "kutter_bin_path", metavar="<kutter.bin>", help="Kutter firmware binary"
     )
     args = parser.parse_args()
     log_level = logging.DEBUG if args.verbose else logging.CRITICAL
@@ -1760,8 +1760,8 @@ def main():
         sys.exit(-1)
     flash_args["device"] = args.device
     flash_args["baud"] = args.baud
-    flash_args["klipper_bin_path"] = args.klipper_bin_path
-    flash_args["klipper_dict_path"] = args.dict_path
+    flash_args["kutter_bin_path"] = args.kutter_bin_path
+    flash_args["kutter_dict_path"] = args.dict_path
     flash_args["verify_only"] = args.check
     if args.check:
         # override board_defs setting when doing verify-only: