107 files changed, 156 insertions, 158 deletions
diff --git a/bootloader.mk b/bootloader.mk
index abdfd20fd..2bcca6bb8 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -21,19 +21,19 @@
 # Current options:
 #
 # AVR:
-#     halfkay     PJRC Teensy
+#     halfkay      PJRC Teensy
-#     caterina    Pro Micro (Sparkfun/generic)
+#     caterina     Pro Micro (Sparkfun/generic)
-#     atmel-dfu   Atmel factory DFU
+#     atmel-dfu    Atmel factory DFU
-#     lufa-dfu    LUFA DFU
+#     lufa-dfu     LUFA DFU
-#     qmk-dfu     QMK DFU (LUFA + blinkenlight)
+#     qmk-dfu      QMK DFU (LUFA + blinkenlight)
-#     qmk-hid     QMK HID (LUFA + blinkenlight)
+#     qmk-hid      QMK HID (LUFA + blinkenlight)
-#     bootloadHID HIDBootFlash compatible (ATmega32A)
+#     bootloadhid  HIDBootFlash compatible (ATmega32A)
-#     USBasp      USBaspLoader (ATmega328P)
+#     usbasploader USBaspLoader (ATmega328P)
 # ARM:
-#     kiibohd     Input:Club Kiibohd bootloader (only used on their boards)
+#     kiibohd      Input:Club Kiibohd bootloader (only used on their boards)
-#     stm32duino  STM32Duino (STM32F103x8)
+#     stm32duino   STM32Duino (STM32F103x8)
-#     stm32-dfu   STM32 USB DFU in ROM
+#     stm32-dfu    STM32 USB DFU in ROM
-#     apm32-dfu   APM32 USB DFU in ROM
+#     apm32-dfu    APM32 USB DFU in ROM
 #
 # BOOTLOADER_SIZE can still be defined manually, but it's recommended
 # you add any possible configuration to this list
@@ -86,11 +86,11 @@ ifeq ($(strip $(BOOTLOADER)), caterina)
    OPT_DEFS += -DBOOTLOADER_CATERINA
    BOOTLOADER_SIZE = 4096
 endif
-ifeq ($(strip $(BOOTLOADER)), bootloadHID)
+ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
    OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
    BOOTLOADER_SIZE = 4096
 endif
-ifeq ($(strip $(BOOTLOADER)), USBasp)
+ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
    OPT_DEFS += -DBOOTLOADER_USBASP
    BOOTLOADER_SIZE = 4096
 endif
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 78c9a8d36..d3e664d61 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -56,7 +56,7 @@
        },
        "bootloader": {
            "type": "string",
-            "enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "unknown", "USBasp", "tinyuf2"],
+            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "unknown", "usbasploader", "USBasp", "tinyuf2"],
        },
        "bootloader_instructions": {
            "type": "string",
diff --git a/data/templates/ps2avrgb/rules.mk b/data/templates/ps2avrgb/rules.mk
index 6c0b7cc23..b374eca33 100644
--- a/data/templates/ps2avrgb/rules.mk
+++ b/data/templates/ps2avrgb/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/docs/config_options.md b/docs/config_options.md
index 94f99e74c..7584d3584 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -397,8 +397,8 @@ However, this will automatically disable the legacy TMK Macros and Functions fea
  * `qmk-dfu`
  * `halfkay`
  * `caterina`
-  * `bootloadHID`
+  * `bootloadhid`
-  * `USBasp`
+  * `usbasploader`
 ## Feature Options :id=feature-options
diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md
index 137ec8ad6..9155e56e3 100644
--- a/docs/driver_installation_zadig.md
+++ b/docs/driver_installation_zadig.md
@@ -68,31 +68,31 @@ This is a list of known bootloader devices and their USB vendor and product IDs,
 The device name here is the name that appears in Zadig, and may not be what the Device Manager or QMK Toolbox displays.
-|Bootloader   |Device Name                   |VID/PID       |Driver |
+|Bootloader    |Device Name                   |VID/PID       |Driver |
-|-------------|------------------------------|--------------|-------|
+|--------------|------------------------------|--------------|-------|
-|`atmel-dfu`  |ATmega16u2 DFU                |`03EB:2FEF`   |libusb0|
+|`atmel-dfu`   |ATmega16u2 DFU                |`03EB:2FEF`   |libusb0|
-|`atmel-dfu`  |ATmega32U2 DFU                |`03EB:2FF0`   |libusb0|
+|`atmel-dfu`   |ATmega32U2 DFU                |`03EB:2FF0`   |libusb0|
-|`atmel-dfu`  |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |libusb0|
+|`atmel-dfu`   |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |libusb0|
-|`atmel-dfu`  |ATm32U4DFU                    |`03EB:2FF4`   |libusb0|
+|`atmel-dfu`   |ATm32U4DFU                    |`03EB:2FF4`   |libusb0|
-|`atmel-dfu`  |*none* (AT90USB64)            |`03EB:2FF9`   |libusb0|
+|`atmel-dfu`   |*none* (AT90USB64)            |`03EB:2FF9`   |libusb0|
-|`atmel-dfu`  |AT90USB128 DFU                |`03EB:2FFB`   |libusb0|
+|`atmel-dfu`   |AT90USB128 DFU                |`03EB:2FFB`   |libusb0|
-|`qmk-dfu`    |(keyboard name) Bootloader    |As `atmel-dfu`|libusb0|
+|`qmk-dfu`     |(keyboard name) Bootloader    |As `atmel-dfu`|libusb0|
-|`halfkay`    |*none*                        |`16C0:0478`   |HidUsb |
+|`halfkay`     |*none*                        |`16C0:0478`   |HidUsb |
-|`caterina`   |Pro Micro 3.3V                |`1B4F:9203`   |usbser |
+|`caterina`    |Pro Micro 3.3V                |`1B4F:9203`   |usbser |
-|`caterina`   |Pro Micro 5V                  |`1B4F:9205`   |usbser |
+|`caterina`    |Pro Micro 5V                  |`1B4F:9205`   |usbser |
-|`caterina`   |LilyPadUSB                    |`1B4F:9207`   |usbser |
+|`caterina`    |LilyPadUSB                    |`1B4F:9207`   |usbser |
-|`caterina`   |Pololu A-Star 32U4 Bootloader |`1FFB:0101`   |usbser |
+|`caterina`    |Pololu A-Star 32U4 Bootloader |`1FFB:0101`   |usbser |
-|`caterina`   |Arduino Leonardo              |`2341:0036`   |usbser |
+|`caterina`    |Arduino Leonardo              |`2341:0036`   |usbser |
-|`caterina`   |Arduino Micro                 |`2341:0037`   |usbser |
+|`caterina`    |Arduino Micro                 |`2341:0037`   |usbser |
-|`caterina`   |Adafruit Feather 32u4         |`239A:000C`   |usbser |
+|`caterina`    |Adafruit Feather 32u4         |`239A:000C`   |usbser |
-|`caterina`   |Adafruit ItsyBitsy 32u4 3V    |`239A:000D`   |usbser |
+|`caterina`    |Adafruit ItsyBitsy 32u4 3V    |`239A:000D`   |usbser |
-|`caterina`   |Adafruit ItsyBitsy 32u4 5V    |`239A:000E`   |usbser |
+|`caterina`    |Adafruit ItsyBitsy 32u4 5V    |`239A:000E`   |usbser |
-|`caterina`   |Arduino Leonardo              |`2A03:0036`   |usbser |
+|`caterina`    |Arduino Leonardo              |`2A03:0036`   |usbser |
-|`caterina`   |Arduino Micro                 |`2A03:0037`   |usbser |
+|`caterina`    |Arduino Micro                 |`2A03:0037`   |usbser |
-|`bootloadHID`|HIDBoot                       |`16C0:05DF`   |HidUsb |
+|`bootloadhid` |HIDBoot                       |`16C0:05DF`   |HidUsb |
-|`USBasp`     |USBasp                        |`16C0:05DC`   |libusbK|
+|`usbasploader`|USBasp                        |`16C0:05DC`   |libusbK|
-|`apm32-dfu`  |APM32 DFU ISP Mode            |`314B:0106`   |WinUSB |
+|`apm32-dfu`   |APM32 DFU ISP Mode            |`314B:0106`   |WinUSB |
-|`stm32-dfu`  |STM32 BOOTLOADER              |`0483:DF11`   |WinUSB |
+|`stm32-dfu`   |STM32 BOOTLOADER              |`0483:DF11`   |WinUSB |
-|`kiibohd`    |Kiibohd DFU Bootloader        |`1C11:B007`   |WinUSB |
+|`kiibohd`     |Kiibohd DFU Bootloader        |`1C11:B007`   |WinUSB |
-|`stm32duino` |Maple 003                     |`1EAF:0003`   |WinUSB |
+|`stm32duino`  |Maple 003                     |`1EAF:0003`   |WinUSB |
-|`qmk-hid`    |(keyboard name) Bootloader    |`03EB:2067`   |HidUsb |
+|`qmk-hid`     |(keyboard name) Bootloader    |`03EB:2067`   |HidUsb |
diff --git a/docs/flashing.md b/docs/flashing.md
index 7b7fe956f..2e69f246a 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -127,7 +127,7 @@ To ensure compatibility with the USBasploader bootloader, make sure this block i
 ```make
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 ```
 Compatible flashers:
@@ -153,13 +153,13 @@ To ensure compatibility with the bootloadHID bootloader, make sure this block is
 ```make
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 ```
 Compatible flashers:
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
-* [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadHID` target in QMK (recommended command line)
+* [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadhid` target in QMK (recommended command line)
 * [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash)
 Flashing sequence:
diff --git a/docs/flashing_bootloadhid.md b/docs/flashing_bootloadhid.md
index 731d92772..9879ec999 100644
--- a/docs/flashing_bootloadhid.md
+++ b/docs/flashing_bootloadhid.md
@@ -15,9 +15,9 @@ General flashing sequence:
 ?> Using the QMK installation script, detailed [here](newbs_getting_started.md), the required bootloadHID tools should be automatically installed.
-To flash via the command line, use the target `:bootloadHID` by executing the following command:
+To flash via the command line, use the target `:bootloadhid` by executing the following command:
-    make <keyboard>:<keymap>:bootloadHID
+    make <keyboard>:<keymap>:bootloadhid
 ## GUI Flashing
diff --git a/docs/getting_started_make_guide.md b/docs/getting_started_make_guide.md
index 02216875c..70390a510 100644
--- a/docs/getting_started_make_guide.md
+++ b/docs/getting_started_make_guide.md
@@ -14,7 +14,7 @@ The full syntax of the `make` command is `<keyboard_folder>:<keymap>:<target>`,
 The `<target>` means the following
 * If no target is given, then it's the same as `all` below
 * `all` compiles as many keyboard/revision/keymap combinations as specified. For example, `make planck/rev4:default` will generate a single .hex, while `make planck/rev4:all` will generate a hex for every keymap available to the planck.
-* `flash`, `dfu`, `teensy`, `avrdude`, `dfu-util`, or `bootloadHID` compile and upload the firmware to the keyboard. If the compilation fails, then nothing will be uploaded. The programmer to use depends on the keyboard. For most keyboards it's `dfu`, but for ChibiOS keyboards you should use `dfu-util`, and `teensy` for standard Teensys. To find out which command you should use for your keyboard, check the keyboard specific readme. 
+* `flash`, `dfu`, `teensy`, `avrdude`, `dfu-util`, or `bootloadhid` compile and upload the firmware to the keyboard. If the compilation fails, then nothing will be uploaded. The programmer to use depends on the keyboard. For most keyboards it's `dfu`, but for ChibiOS keyboards you should use `dfu-util`, and `teensy` for standard Teensys. To find out which command you should use for your keyboard, check the keyboard specific readme. 
  Visit the [Flashing Firmware](flashing.md) guide for more details of the available bootloaders.
  * **Note**: some operating systems need privileged access for these commands to work. This means that you may need to setup [`udev rules`](faq_build.md#linux-udev-rules) to access these without root access, or to run the command with root access (`sudo make planck/rev4:default:flash`).
 * `clean`, cleans the build output folders to make sure that everything is built from scratch. Run this before normal compilation if you have some unexplainable problems.
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk
index c50970a43..e2beed441 100644
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk
index 2785c0a81..7e5082064 100644
--- a/keyboards/7c8/framework/rules.mk
+++ b/keyboards/7c8/framework/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no
 FAUXCLICKY_ENABLE = no
 LAYOUTS_HAS_RGB = no
 ENCODER_ENABLE = yes
-LEADER_ENABLE = yes
-\ No newline at end of file
+LEADER_ENABLE = yes
diff --git a/keyboards/amag23/rules.mk b/keyboards/amag23/rules.mk
index e577250aa..5fab15c39 100644
--- a/keyboards/amag23/rules.mk
+++ b/keyboards/amag23/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk
index e9aa75f14..d726cc5ec 100644
--- a/keyboards/ares/rules.mk
+++ b/keyboards/ares/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/axolstudio/helpo/rules.mk b/keyboards/axolstudio/helpo/rules.mk
index bbf233bd4..393121685 100644
--- a/keyboards/axolstudio/helpo/rules.mk
+++ b/keyboards/axolstudio/helpo/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/barleycorn/rules.mk b/keyboards/barleycorn/rules.mk
index 82a406da1..e85055a70 100644
--- a/keyboards/barleycorn/rules.mk
+++ b/keyboards/barleycorn/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk
index 49e925ef0..ddc50713c 100644
--- a/keyboards/basketweave/rules.mk
+++ b/keyboards/basketweave/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk
index e2d035abb..6f95a118f 100644
--- a/keyboards/bfake/rules.mk
+++ b/keyboards/bfake/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/chidori/rules.mk b/keyboards/chidori/rules.mk
index 63227aafa..7f3a54d48 100644
--- a/keyboards/chidori/rules.mk
+++ b/keyboards/chidori/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/coseyfannitutti/discipad/rules.mk b/keyboards/coseyfannitutti/discipad/rules.mk
index d2998c290..014751c68 100644
--- a/keyboards/coseyfannitutti/discipad/rules.mk
+++ b/keyboards/coseyfannitutti/discipad/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk
index dedd2c841..8244ff54c 100644
--- a/keyboards/coseyfannitutti/discipline/rules.mk
+++ b/keyboards/coseyfannitutti/discipline/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk
index c60044be3..b27ac8237 100644
--- a/keyboards/coseyfannitutti/mysterium/rules.mk
+++ b/keyboards/coseyfannitutti/mysterium/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/coseyfannitutti/romeo/rules.mk b/keyboards/coseyfannitutti/romeo/rules.mk
index a338ecb23..c653f0c02 100644
--- a/keyboards/coseyfannitutti/romeo/rules.mk
+++ b/keyboards/coseyfannitutti/romeo/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/db/db63/rules.mk b/keyboards/db/db63/rules.mk
index fa79d9e81..3bff3ee31 100644
--- a/keyboards/db/db63/rules.mk
+++ b/keyboards/db/db63/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk
index 5488a2229..61347df8a 100644
--- a/keyboards/dm9records/plaid/rules.mk
+++ b/keyboards/dm9records/plaid/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk
index b6ad05565..abf77e30f 100644
--- a/keyboards/dm9records/tartan/rules.mk
+++ b/keyboards/dm9records/tartan/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk
index fa79d9e81..3bff3ee31 100644
--- a/keyboards/donutcables/budget96/rules.mk
+++ b/keyboards/donutcables/budget96/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/draytronics/daisy/rules.mk b/keyboards/draytronics/daisy/rules.mk
index d26c9754e..e41c9da6c 100644
--- a/keyboards/draytronics/daisy/rules.mk
+++ b/keyboards/draytronics/daisy/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk
index e7f155ff8..979ac444e 100644
--- a/keyboards/draytronics/scarlet/rules.mk
+++ b/keyboards/draytronics/scarlet/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ericrlau/numdiscipline/rev1/rules.mk b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
index e3eb4ee6a..b8c7171cb 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk
+++ b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/eve/meteor/rules.mk b/keyboards/eve/meteor/rules.mk
index a6b468d7c..4c4a33355 100644
--- a/keyboards/eve/meteor/rules.mk
+++ b/keyboards/eve/meteor/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/exclusive/e6v2/le_bmc/rules.mk b/keyboards/exclusive/e6v2/le_bmc/rules.mk
index 15895d289..f1518048e 100644
--- a/keyboards/exclusive/e6v2/le_bmc/rules.mk
+++ b/keyboards/exclusive/e6v2/le_bmc/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/exclusive/e6v2/oe_bmc/rules.mk b/keyboards/exclusive/e6v2/oe_bmc/rules.mk
index 15895d289..f1518048e 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/rules.mk
+++ b/keyboards/exclusive/e6v2/oe_bmc/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/exent/rules.mk b/keyboards/exent/rules.mk
index bbf711ef6..69a80b563 100644
--- a/keyboards/exent/rules.mk
+++ b/keyboards/exent/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/facew/rules.mk b/keyboards/facew/rules.mk
index 45b2004c5..96f4fd3d7 100644
--- a/keyboards/facew/rules.mk
+++ b/keyboards/facew/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/foxlab/time80/rules.mk b/keyboards/foxlab/time80/rules.mk
index e39c2ea1e..f0fbba59f 100644
--- a/keyboards/foxlab/time80/rules.mk
+++ b/keyboards/foxlab/time80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk
index db49c58df..3faff68b1 100644
--- a/keyboards/ft/mars80/rules.mk
+++ b/keyboards/ft/mars80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/gingham/rules.mk b/keyboards/gingham/rules.mk
index 412ad3283..b9302d703 100644
--- a/keyboards/gingham/rules.mk
+++ b/keyboards/gingham/rules.mk
@@ -5,7 +5,7 @@ SRC = matrix.c \
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/gray_studio/hb85/rules.mk b/keyboards/gray_studio/hb85/rules.mk
index adc0c7c1b..2dba9c3eb 100644
--- a/keyboards/gray_studio/hb85/rules.mk
+++ b/keyboards/gray_studio/hb85/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/handwired/axon/rules.mk b/keyboards/handwired/axon/rules.mk
index 8742e3017..0411adeb6 100644
--- a/keyboards/handwired/axon/rules.mk
+++ b/keyboards/handwired/axon/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/handwired/hnah40/rules.mk b/keyboards/handwired/hnah40/rules.mk
index 41d3c0adb..d813756d8 100644
--- a/keyboards/handwired/hnah40/rules.mk
+++ b/keyboards/handwired/hnah40/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/j80/rules.mk b/keyboards/j80/rules.mk
index 44b5a51ee..75443bf09 100644
--- a/keyboards/j80/rules.mk
+++ b/keyboards/j80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/jc65/v32a/rules.mk b/keyboards/jc65/v32a/rules.mk
index c256d5766..af36151cc 100644
--- a/keyboards/jc65/v32a/rules.mk
+++ b/keyboards/jc65/v32a/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/kb_elmo/aek2_usb/rules.mk b/keyboards/kb_elmo/aek2_usb/rules.mk
index a6e50e417..1b26c2a5e 100644
--- a/keyboards/kb_elmo/aek2_usb/rules.mk
+++ b/keyboards/kb_elmo/aek2_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kb_elmo/elmopad/rules.mk b/keyboards/kb_elmo/elmopad/rules.mk
index d67199de8..38b1fbd86 100644
--- a/keyboards/kb_elmo/elmopad/rules.mk
+++ b/keyboards/kb_elmo/elmopad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega328p
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kb_elmo/m0110a_usb/rules.mk b/keyboards/kb_elmo/m0110a_usb/rules.mk
index a6e50e417..1b26c2a5e 100644
--- a/keyboards/kb_elmo/m0110a_usb/rules.mk
+++ b/keyboards/kb_elmo/m0110a_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kb_elmo/m0116_usb/rules.mk b/keyboards/kb_elmo/m0116_usb/rules.mk
index a6e50e417..1b26c2a5e 100644
--- a/keyboards/kb_elmo/m0116_usb/rules.mk
+++ b/keyboards/kb_elmo/m0116_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kb_elmo/sesame/rules.mk b/keyboards/kb_elmo/sesame/rules.mk
index 5b9861d70..abac18ac3 100644
--- a/keyboards/kb_elmo/sesame/rules.mk
+++ b/keyboards/kb_elmo/sesame/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kb_elmo/twelvekey/rules.mk b/keyboards/kb_elmo/twelvekey/rules.mk
index 17212e0d6..371b50876 100644
--- a/keyboards/kb_elmo/twelvekey/rules.mk
+++ b/keyboards/kb_elmo/twelvekey/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega328p
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk
index 9046d3714..9912abbe9 100644
--- a/keyboards/kbdfans/kbdpad/mk1/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/keycapsss/plaid_pad/rules.mk b/keyboards/keycapsss/plaid_pad/rules.mk
index 0a8ba1c45..719c72914 100644
--- a/keyboards/keycapsss/plaid_pad/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kira80/rules.mk b/keyboards/kira80/rules.mk
index a790b0a94..c1207e4b7 100644
--- a/keyboards/kira80/rules.mk
+++ b/keyboards/kira80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk
index 70fbf9b1a..15a0d5061 100644
--- a/keyboards/kprepublic/jj40/rules.mk
+++ b/keyboards/kprepublic/jj40/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kprepublic/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk
index df113b951..803ea608d 100644
--- a/keyboards/kprepublic/jj4x4/rules.mk
+++ b/keyboards/kprepublic/jj4x4/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
index 2b39216ed..69dcae078 100644
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/lattice60/rules.mk b/keyboards/lattice60/rules.mk
index cca470ceb..6965f9ada 100644
--- a/keyboards/lattice60/rules.mk
+++ b/keyboards/lattice60/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Processor frequency
 F_CPU = 12000000
diff --git a/keyboards/lck75/rules.mk b/keyboards/lck75/rules.mk
index 8d990e00e..29eb4be84 100644
--- a/keyboards/lck75/rules.mk
+++ b/keyboards/lck75/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
@@ -30,4 +30,3 @@ ENCODER_ENABLE = yes
 WPM_ENABLE = yes
 LTO_ENABLE = no
 AUTO_SHIFT_ENABLE = no
diff --git a/keyboards/leeku/finger65/rules.mk b/keyboards/leeku/finger65/rules.mk
index 20dbb7530..42c1fb52f 100644
--- a/keyboards/leeku/finger65/rules.mk
+++ b/keyboards/leeku/finger65/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mechlovin/hex4b/rules.mk b/keyboards/mechlovin/hex4b/rules.mk
index e646f085b..03ebafa10 100644
--- a/keyboards/mechlovin/hex4b/rules.mk
+++ b/keyboards/mechlovin/hex4b/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Processor frequency
 F_CPU = 16000000
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index 367e0bc82..3b1541336 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mechlovin/mechlovin9/rev2/rules.mk b/keyboards/mechlovin/mechlovin9/rev2/rules.mk
index 77a26616f..afbfc0d85 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rev2/rules.mk
@@ -5,5 +5,4 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk
index bbf233bd4..393121685 100644
--- a/keyboards/mechlovin/th1800/rules.mk
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk
index 672d13c85..7d2bb2c75 100644
--- a/keyboards/mechwild/mercutio/rules.mk
+++ b/keyboards/mechwild/mercutio/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mehkee96/rules.mk b/keyboards/mehkee96/rules.mk
index 75b25b87f..00ae8043e 100644
--- a/keyboards/mehkee96/rules.mk
+++ b/keyboards/mehkee96/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   comment out to disable the options.
diff --git a/keyboards/mt40/rules.mk b/keyboards/mt40/rules.mk
index bb092970f..d3ecc2029 100644
--- a/keyboards/mt40/rules.mk
+++ b/keyboards/mt40/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/nullbitsco/scramble/rules.mk b/keyboards/nullbitsco/scramble/rules.mk
index 05840d9c0..470146424 100644
--- a/keyboards/nullbitsco/scramble/rules.mk
+++ b/keyboards/nullbitsco/scramble/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/oddforge/vea/rules.mk b/keyboards/oddforge/vea/rules.mk
index 1773d2a3f..e466f73ea 100644
--- a/keyboards/oddforge/vea/rules.mk
+++ b/keyboards/oddforge/vea/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/ortho5by12/rules.mk b/keyboards/ortho5by12/rules.mk
index a7bdb8702..dc33772a6 100644
--- a/keyboards/ortho5by12/rules.mk
+++ b/keyboards/ortho5by12/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/orthocode/rules.mk b/keyboards/orthocode/rules.mk
index f099d6f09..b798a3836 100644
--- a/keyboards/orthocode/rules.mk
+++ b/keyboards/orthocode/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/panc60/rules.mk b/keyboards/panc60/rules.mk
index 1d0118a78..1c8a2d105 100644
--- a/keyboards/panc60/rules.mk
+++ b/keyboards/panc60/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/pearl/rules.mk b/keyboards/pearl/rules.mk
index adc0c7c1b..2dba9c3eb 100644
--- a/keyboards/pearl/rules.mk
+++ b/keyboards/pearl/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/peej/lumberjack/rules.mk b/keyboards/peej/lumberjack/rules.mk
index 6e50d7ac0..62ce0932c 100644
--- a/keyboards/peej/lumberjack/rules.mk
+++ b/keyboards/peej/lumberjack/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/percent/canoe/rules.mk b/keyboards/percent/canoe/rules.mk
index ce66972be..39602cba7 100644
--- a/keyboards/percent/canoe/rules.mk
+++ b/keyboards/percent/canoe/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/percent/skog/rules.mk b/keyboards/percent/skog/rules.mk
index 1f74c8667..7c8b7f8b2 100644
--- a/keyboards/percent/skog/rules.mk
+++ b/keyboards/percent/skog/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/percent/skog_lite/rules.mk b/keyboards/percent/skog_lite/rules.mk
index b4bbd4a53..dcb50e893 100644
--- a/keyboards/percent/skog_lite/rules.mk
+++ b/keyboards/percent/skog_lite/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk
index 04ca579c1..3d474957a 100644
--- a/keyboards/planck/thk/rules.mk
+++ b/keyboards/planck/thk/rules.mk
@@ -20,7 +20,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/punk75/rules.mk b/keyboards/punk75/rules.mk
index dd29f64bc..d23e3711a 100644
--- a/keyboards/punk75/rules.mk
+++ b/keyboards/punk75/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ramonimbao/aelith/rules.mk b/keyboards/ramonimbao/aelith/rules.mk
index 342210d20..e98d0e69c 100644
--- a/keyboards/ramonimbao/aelith/rules.mk
+++ b/keyboards/ramonimbao/aelith/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ramonimbao/chevron/rules.mk b/keyboards/ramonimbao/chevron/rules.mk
index 9873bc51c..3408296b4 100644
--- a/keyboards/ramonimbao/chevron/rules.mk
+++ b/keyboards/ramonimbao/chevron/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ramonimbao/herringbone/pro/rules.mk b/keyboards/ramonimbao/herringbone/pro/rules.mk
index b55b2c246..0a8eb612e 100644
--- a/keyboards/ramonimbao/herringbone/pro/rules.mk
+++ b/keyboards/ramonimbao/herringbone/pro/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ramonimbao/herringbone/v1/rules.mk b/keyboards/ramonimbao/herringbone/v1/rules.mk
index 2774d56c7..c91387121 100644
--- a/keyboards/ramonimbao/herringbone/v1/rules.mk
+++ b/keyboards/ramonimbao/herringbone/v1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/rart/rart45/rules.mk b/keyboards/rart/rart45/rules.mk
index 8742e3017..0411adeb6 100644
--- a/keyboards/rart/rart45/rules.mk
+++ b/keyboards/rart/rart45/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk
index 47e285ceb..800fb50b5 100644
--- a/keyboards/rart/rartand/rules.mk
+++ b/keyboards/rart/rartand/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk
index 3e5261ec4..8e860e2dc 100644
--- a/keyboards/rart/rartland/rules.mk
+++ b/keyboards/rart/rartland/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/rgbkb/pan/rev1/32a/rules.mk b/keyboards/rgbkb/pan/rev1/32a/rules.mk
index 321ecc5c1..b69598073 100644
--- a/keyboards/rgbkb/pan/rev1/32a/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/32a/rules.mk
@@ -5,4 +5,4 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
diff --git a/keyboards/seigaiha/rules.mk b/keyboards/seigaiha/rules.mk
index 8ff99a00d..48f3613af 100644
--- a/keyboards/seigaiha/rules.mk
+++ b/keyboards/seigaiha/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/singa/rules.mk b/keyboards/singa/rules.mk
index fa79d9e81..3bff3ee31 100644
--- a/keyboards/singa/rules.mk
+++ b/keyboards/singa/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk
index bbf233bd4..393121685 100644
--- a/keyboards/skergo/rules.mk
+++ b/keyboards/skergo/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk
index 943428f32..ba4001497 100644
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/tgr/910/rules.mk b/keyboards/tgr/910/rules.mk
index adc0c7c1b..2dba9c3eb 100644
--- a/keyboards/tgr/910/rules.mk
+++ b/keyboards/tgr/910/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/tgr/910ce/rules.mk b/keyboards/tgr/910ce/rules.mk
index 37f5c06fa..998da7498 100644
--- a/keyboards/tgr/910ce/rules.mk
+++ b/keyboards/tgr/910ce/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
@@ -16,4 +16,4 @@ BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 WS2812_DRIVER = i2c
-LAYOUTS = 65_ansi_blocker 65_iso_blocker
-\ No newline at end of file
+LAYOUTS = 65_ansi_blocker 65_iso_blocker
diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk
index aef9817da..b3194d532 100644
--- a/keyboards/tgr/alice/rules.mk
+++ b/keyboards/tgr/alice/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/tgr/jane/rules.mk b/keyboards/tgr/jane/rules.mk
index fc297eb60..9d035a031 100644
--- a/keyboards/tgr/jane/rules.mk
+++ b/keyboards/tgr/jane/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/tgr/tris/rules.mk b/keyboards/tgr/tris/rules.mk
index 62943717d..27c5fcfa0 100644
--- a/keyboards/tgr/tris/rules.mk
+++ b/keyboards/tgr/tris/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk
index bf4d8916c..041ec1e41 100644
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk
index 8801760ee..044d404fe 100644
--- a/keyboards/torn/rules.mk
+++ b/keyboards/torn/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/unikorn/rules.mk b/keyboards/unikorn/rules.mk
index a6b468d7c..4c4a33355 100644
--- a/keyboards/unikorn/rules.mk
+++ b/keyboards/unikorn/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/wheatfield/split75/rules.mk b/keyboards/wheatfield/split75/rules.mk
index 47f7fc86b..4aed5ab58 100644
--- a/keyboards/wheatfield/split75/rules.mk
+++ b/keyboards/wheatfield/split75/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/winkeyless/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk
index fa79d9e81..3bff3ee31 100644
--- a/keyboards/winkeyless/bface/rules.mk
+++ b/keyboards/winkeyless/bface/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/winkeyless/bmini/rules.mk b/keyboards/winkeyless/bmini/rules.mk
index c256d5766..af36151cc 100644
--- a/keyboards/winkeyless/bmini/rules.mk
+++ b/keyboards/winkeyless/bmini/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk
index d1fe3f8f4..3ca89a0b9 100644
--- a/keyboards/winkeyless/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/ymd75/rev1/rules.mk b/keyboards/ymd75/rev1/rules.mk
index 2408fc60d..130203f63 100644
--- a/keyboards/ymd75/rev1/rules.mk
+++ b/keyboards/ymd75/rev1/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/ymd75/rev2/rules.mk b/keyboards/ymd75/rev2/rules.mk
index 2408fc60d..130203f63 100644
--- a/keyboards/ymd75/rev2/rules.mk
+++ b/keyboards/ymd75/rev2/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
diff --git a/keyboards/ymd96/rules.mk b/keyboards/ymd96/rules.mk
index 6a482ad6c..73e7ccc3d 100644
--- a/keyboards/ymd96/rules.mk
+++ b/keyboards/ymd96/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/ymdk/bface/rules.mk b/keyboards/ymdk/bface/rules.mk
index fa79d9e81..3bff3ee31 100644
--- a/keyboards/ymdk/bface/rules.mk
+++ b/keyboards/ymdk/bface/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk
index d642cf1b3..77ec305d5 100644
--- a/keyboards/ymdk/sp64/rules.mk
+++ b/keyboards/ymdk/sp64/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ymdk_np21/rules.mk b/keyboards/ymdk_np21/rules.mk
index c2436a40a..54b2cbb15 100644
--- a/keyboards/ymdk_np21/rules.mk
+++ b/keyboards/ymdk_np21/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 # Build Options
 #   change yes to no to disable
diff --git a/lib/python/qmk/cli/console.py b/lib/python/qmk/cli/console.py
index 3c508160e..98c6bc0dc 100644
--- a/lib/python/qmk/cli/console.py
+++ b/lib/python/qmk/cli/console.py
@@ -34,8 +34,8 @@ KNOWN_BOOTLOADERS = {
    ('03EB', '2FFB'): 'atmel-dfu: AT90USB128',
    ('03EB', '6124'): 'Microchip SAM-BA',
    ('0483', 'DF11'): 'stm32-dfu: STM32 BOOTLOADER',
-    ('16C0', '05DC'): 'USBasp: USBaspLoader',
+    ('16C0', '05DC'): 'usbasploader: USBaspLoader',
-    ('16C0', '05DF'): 'bootloadHID: HIDBoot',
+    ('16C0', '05DF'): 'bootloadhid: HIDBoot',
    ('16C0', '0478'): 'halfkay: Teensy Halfkay',
    ('1B4F', '9203'): 'caterina: Pro Micro 3.3V',
    ('1B4F', '9205'): 'caterina: Pro Micro 5V',
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk
index 0af1ebb1c..985cb60e5 100644
--- a/platforms/avr/flash.mk
+++ b/platforms/avr/flash.mk
@@ -147,7 +147,7 @@ define EXEC_BOOTLOADHID
        done
 endef
-bootloadHID: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
+bootloadhid: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
        $(call EXEC_BOOTLOADHID)
 HID_BOOTLOADER_CLI ?= hid_bootloader_cli
@@ -168,9 +168,9 @@ else ifeq ($(strip $(BOOTLOADER)), halfkay)
        $(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY)
 else ifeq (dfu,$(findstring dfu,$(BOOTLOADER)))
        $(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU)
-else ifeq ($(strip $(BOOTLOADER)), USBasp)
+else ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
        $(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP)
-else ifeq ($(strip $(BOOTLOADER)), bootloadHID)
+else ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
        $(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID)
 else ifeq ($(strip $(BOOTLOADER)), qmk-hid)
        $(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA)