diff --git a/Makefile b/Makefile
index 15cc6dfc..a5b048a5 100644
--- a/Makefile
+++ b/Makefile
@@ -56,20 +56,20 @@ KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/build-tools/makefiles/
 # they reside outside of SKETCHBOOK_DIR, we fall back to assuming that 
 # the hardware directory can be determined in relation to the position of 
 # this Makefile.
-ifeq ("$(wildcard $(BOARD_HARDWARE_PATH)/keyboardio/build-tools/makefiles/rules.mk)","")
+ifeq ("$(wildcard $(BOARD_HARDWARE_PATH)/keyboardio/build-tools/makefiles/sketch-arduino-cli.mk)","")
    # Determine the path of this Makefile
    MKFILE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
    BOARD_HARDWARE_PATH = $(MKFILE_DIR)/../../../..
 endif
 
-ifeq ("$(wildcard $(BOARD_HARDWARE_PATH)/keyboardio/build-tools/makefiles/rules.mk)","")
+ifeq ("$(wildcard $(BOARD_HARDWARE_PATH)/keyboardio/build-tools/makefiles/sketch-arduino-cli.mk)","")
 $(info ***************************************************************************)
 $(info Unable to autodetect a proper BOARD_HARDWARE_PATH. Please define it manually.)
 $(info ***************************************************************************)
 $(info )
 endif
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
 
 # Set up an argument for passing to the simulator tests in docker
 # but if the var isn't set, don't even pass the definition
diff --git a/examples/Devices/EZ/ErgoDox/Makefile b/examples/Devices/EZ/ErgoDox/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Devices/EZ/ErgoDox/Makefile
+++ b/examples/Devices/EZ/ErgoDox/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/KBDFans/KBD4x/Makefile b/examples/Devices/KBDFans/KBD4x/Makefile
index c408b29b..81a29443 100644
--- a/examples/Devices/KBDFans/KBD4x/Makefile
+++ b/examples/Devices/KBDFans/KBD4x/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/Keyboardio/Atreus/Makefile b/examples/Devices/Keyboardio/Atreus/Makefile
index 79f017a0..51da5a83 100644
--- a/examples/Devices/Keyboardio/Atreus/Makefile
+++ b/examples/Devices/Keyboardio/Atreus/Makefile
@@ -53,4 +53,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/Keyboardio/Imago/Makefile b/examples/Devices/Keyboardio/Imago/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Devices/Keyboardio/Imago/Makefile
+++ b/examples/Devices/Keyboardio/Imago/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/Keyboardio/Model01/Makefile b/examples/Devices/Keyboardio/Model01/Makefile
index dc5e9463..6edab0aa 100644
--- a/examples/Devices/Keyboardio/Model01/Makefile
+++ b/examples/Devices/Keyboardio/Model01/Makefile
@@ -49,9 +49,9 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-ifneq ("$(wildcard $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk)","") 
+ifneq ("$(wildcard $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk)","") 
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
 
 else
 
diff --git a/examples/Devices/OLKB/Planck/Makefile b/examples/Devices/OLKB/Planck/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Devices/OLKB/Planck/Makefile
+++ b/examples/Devices/OLKB/Planck/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/SOFTHRUF/Splitography/Makefile b/examples/Devices/SOFTHRUF/Splitography/Makefile
index 5d721383..b2a84731 100644
--- a/examples/Devices/SOFTHRUF/Splitography/Makefile
+++ b/examples/Devices/SOFTHRUF/Splitography/Makefile
@@ -49,4 +49,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/Technomancy/Atreus/Makefile b/examples/Devices/Technomancy/Atreus/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Devices/Technomancy/Atreus/Makefile
+++ b/examples/Devices/Technomancy/Atreus/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/gHeavy/ButterStick/Makefile b/examples/Devices/gHeavy/ButterStick/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Devices/gHeavy/ButterStick/Makefile
+++ b/examples/Devices/gHeavy/ButterStick/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Devices/gHeavy/FaunchPad/Makefile b/examples/Devices/gHeavy/FaunchPad/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Devices/gHeavy/FaunchPad/Makefile
+++ b/examples/Devices/gHeavy/FaunchPad/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk
diff --git a/examples/Internal/Sketch_Exploration/Makefile b/examples/Internal/Sketch_Exploration/Makefile
index 996bde98..5d1b814e 100644
--- a/examples/Internal/Sketch_Exploration/Makefile
+++ b/examples/Internal/Sketch_Exploration/Makefile
@@ -52,4 +52,4 @@ endif
 BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
 KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/sketch-arduino-cli.mk