124 files changed, 107 insertions, 107 deletions
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/readme.md
index 40ad85b700..7540bc56bf 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/readme.md
@@ -4,13 +4,13 @@
 
 - Compile:
 
-  `qmk compile -kb bm40hsrgb -km gabustoledo`
+  `qmk compile -kb kprepublic/bm40hsrgb -km gabustoledo`
 
 ### Flash
 
 - Flash:
 
-  `qmk flash -kb bm40hsrgb -km gabustoledo`
+  `qmk flash -kb kprepublic/bm40hsrgb -km gabustoledo`
 
 # Layout
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/readme.md
index 938803c268..97c09be255 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/readme.md
@@ -30,11 +30,11 @@ Sigma Squared modifies on **Miryoku** in the following ways:
 
 - to directly flash to board:
 
-  `qmk flash -kb bm40hsrgb -km signynt`
+  `qmk flash -kb kprepublic/bm40hsrgb -km signynt`
 
 - to only compile:
 
-  `qmk compile -kb bm40hsrgb -km signynt`
+  `qmk compile -kb kprepublic/bm40hsrgb -km signynt`
 
 
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/readme.md
index 938803c268..97c09be255 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_loud/readme.md
@@ -30,11 +30,11 @@ Sigma Squared modifies on **Miryoku** in the following ways:
 
 - to directly flash to board:
 
-  `qmk flash -kb bm40hsrgb -km signynt`
+  `qmk flash -kb kprepublic/bm40hsrgb -km signynt`
 
 - to only compile:
 
-  `qmk compile -kb bm40hsrgb -km signynt`
+  `qmk compile -kb kprepublic/bm40hsrgb -km signynt`
 
 
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/readme.md
index 938803c268..97c09be255 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/readme.md
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt_2_quiet/readme.md
@@ -30,11 +30,11 @@ Sigma Squared modifies on **Miryoku** in the following ways:
 
 - to directly flash to board:
 
-  `qmk flash -kb bm40hsrgb -km signynt`
+  `qmk flash -kb kprepublic/bm40hsrgb -km signynt`
 
 - to only compile:
 
-  `qmk compile -kb bm40hsrgb -km signynt`
+  `qmk compile -kb kprepublic/bm40hsrgb -km signynt`
 
 
 
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md b/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
index 56d0823d19..1cb87d6ec2 100644
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
+++ b/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
@@ -19,7 +19,7 @@ And a view on the actual build:
 
 ![layout](https://raw.githubusercontent.com/stevexyz/qmk_firmware/master/keyboards/bm43a/keymaps/stevexyz/actualbuild.jpeg)
 
-In order to compile the module from qmk root directory use the command 'make bm43a:stevexyz'
+In order to compile the module from qmk root directory use the command 'make kprepublic/bm43a:stevexyz'
 
-And in order to upload the new firmware use the command: 'qmk flash -kb bm43a -km stevexyz' (you can initiate programming with keyboard RESET key, that in this keymap has been moved on the backspace button in the "lights" layer)
+And in order to upload the new firmware use the command: 'qmk flash -kb kprepublic/bm43a -km stevexyz' (you can initiate programming with keyboard RESET key, that in this keymap has been moved on the backspace button in the "lights" layer)
 
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/keymaps/default/keymap.c
index e8be1cccf6..e8be1cccf6 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/default/readme.md b/keyboards/kprepublic/bm60hsrgb/keymaps/default/readme.md
index d45609f3d7..d45609f3d7 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/default/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/keymap.c
index c43365356e..c43365356e 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/keymap.c
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/readme.md b/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/readme.md
index aa2009e1e8..aa2009e1e8 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/jbradforddillon/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/readme.md
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb/keymaps/via/keymap.c
index da2f6e8ced..da2f6e8ced 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/via/readme.md b/keyboards/kprepublic/bm60hsrgb/keymaps/via/readme.md
index 9335f2cab0..9335f2cab0 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/via/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm60rgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/kprepublic/bm60rgb/keymaps/via/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm60rgb/readme.md b/keyboards/kprepublic/bm60hsrgb/readme.md
index 2a41d7eaaf..bbb6ba45a1 100644
--- a/keyboards/kprepublic/bm60rgb/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb/readme.md
@@ -1,13 +1,13 @@
-# BM60 RGB
+# BM60HSRGB
 
 A 60% hotswap inswitch RGB keyboard from KP Republic. 
 
 * Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
-* Hardware Supported: BM60 RGB
+* Hardware Supported: BM60HSRGB
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-60-gh60-hot-swappable-pcb-programmed-qmk-firmware-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm60rgb/rev1:default
+    make kprepublic/bm60hsrgb/rev1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kprepublic/bm60rgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index fd1001e514..b8f002dca6 100644
--- a/keyboards/kprepublic/bm60rgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0xEF8C
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KP Republic
-#define PRODUCT         BM60 RGB
+#define PRODUCT         BM60HSRGB
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/kprepublic/bm60rgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index 264286334a..a5fb20a008 100644
--- a/keyboards/kprepublic/bm60rgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "BM60 RGB",
+    "keyboard_name": "BM60HSRGB",
     "url": "",
     "maintainer": "qmk",
     "layout_aliases": {
diff --git a/keyboards/kprepublic/bm60rgb/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb/rev1/rev1.c
index 352118c1b1..352118c1b1 100644
--- a/keyboards/kprepublic/bm60rgb/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/rev1.c
diff --git a/keyboards/kprepublic/bm60rgb/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb/rev1/rev1.h
index b648660d25..b648660d25 100644
--- a/keyboards/kprepublic/bm60rgb/rev1/rev1.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm60rgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
index 7202056f31..7202056f31 100644
--- a/keyboards/kprepublic/bm60rgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
diff --git a/keyboards/kprepublic/bm60rgb_iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/keymap.c
index 9eca076df9..9eca076df9 100644
--- a/keyboards/kprepublic/bm60rgb_iso/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm60rgb_iso/keymaps/default/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/readme.md
index 1fd0185d42..1fd0185d42 100644
--- a/keyboards/kprepublic/bm60rgb_iso/keymaps/default/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/config.h
index a1bb75eb4a..a1bb75eb4a 100644
--- a/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/config.h
diff --git a/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
index 4e874b26df..4e874b26df 100644
--- a/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
diff --git a/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/readme.md
index af5b29da19..af5b29da19 100644
--- a/keyboards/kprepublic/bm60rgb_iso/keymaps/iso_nordic_sleepmode/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/readme.md
diff --git a/keyboards/kprepublic/bm60rgb_iso/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/readme.md
index a39a0b3743..5cef32cbeb 100644
--- a/keyboards/kprepublic/bm60rgb_iso/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_iso/readme.md
@@ -1,6 +1,6 @@
-# BM60 RGB ISO
+# BM60HSRGB_ISO
 
-![BM60 RGB ISO](https://i.imgur.com/i3gk2vql.jpg)
+![BM60HSRGB_ISO](https://i.imgur.com/i3gk2vql.jpg)
 
 A 60% ISO hotswap inswitch RGB keyboard.
 
@@ -10,10 +10,10 @@ A 60% ISO hotswap inswitch RGB keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm60rgb_iso/rev1:default
+    make kprepublic/bm60hsrgb_iso/rev1:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm60rgb_iso:default:flash
+    make kprepublic/bm60hsrgb_iso:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index a9545cab90..42b9d2afb1 100644
--- a/keyboards/kprepublic/bm60rgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0xEF8C
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KPRepublic
-#define PRODUCT         bm60hsrgb-iso
+#define PRODUCT         BM60HSRGB_ISO
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 39da4b5460..b53600e44d 100644
--- a/keyboards/kprepublic/bm60rgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "BM60 RGB ISO",
+    "keyboard_name": "BM60HSRGB_ISO",
     "url": "",
     "maintainer": "qmk",
     "layouts": {
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c
index f708e74c27..f708e74c27 100644
--- a/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h
index fce8925a7a..fce8925a7a 100644
--- a/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
index bf88ac85a6..bf88ac85a6 100644
--- a/keyboards/kprepublic/bm60rgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
diff --git a/keyboards/kprepublic/bm60poker/keymaps/david/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/david/keymap.c
index 5050b25a90..5050b25a90 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/david/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/david/keymap.c
diff --git a/keyboards/kprepublic/bm60poker/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/default/keymap.c
index efd74ad134..efd74ad134 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm60poker/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/keymap.c
index e59660242e..e59660242e 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/ipetepete/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/keymap.c
diff --git a/keyboards/kprepublic/bm60poker/keymaps/ipetepete/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/readme.md
index 7d381ff125..7d381ff125 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/ipetepete/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/readme.md
diff --git a/keyboards/kprepublic/bm60poker/keymaps/ipetepete/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/rules.mk
index 3a025ba3a3..3a025ba3a3 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/ipetepete/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/rules.mk
diff --git a/keyboards/kprepublic/bm60poker/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/keymap.c
index 8f577b4593..8f577b4593 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm60poker/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/kprepublic/bm60poker/keymaps/via/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm60poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md
index 6b60853885..ef29166df8 100644
--- a/keyboards/kprepublic/bm60poker/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md
@@ -1,13 +1,13 @@
-# BM60 Poker 60% Mechanical Keyboard RGB PCB
+# BM60HSRGB_Poker 60% Mechanical Keyboard RGB PCB
 
 A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. 
 
 * Keyboard Maintainer: [ipetepete](https://github.com/ipetepete)
-* Hardware Supported: BM60 POKER RGB
+* Hardware Supported: BM60HSRGB_Poker
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm60poker/rev1:default
+    make kprepublic/bm60hsrgb_poker/rev1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kprepublic/bm60poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index 06bd889053..a3aab0e65e 100644
--- a/keyboards/kprepublic/bm60poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0xEF8D
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KP Republic
-#define PRODUCT         BM60 RGB POKER
+#define PRODUCT         BM60HSRGB_POKER
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/kprepublic/bm60poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index fa461ab83f..09abf6e353 100644
--- a/keyboards/kprepublic/bm60poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "BM60 POKER RGB",
+    "keyboard_name": "BM60HSRGB_POKER",
     "url": "",
     "maintainer": "qmk",
     "layouts": {
diff --git a/keyboards/kprepublic/bm60poker/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.c
index 4029a5466c..4029a5466c 100644
--- a/keyboards/kprepublic/bm60poker/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.c
diff --git a/keyboards/kprepublic/bm60poker/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.h
index 02a28377e6..02a28377e6 100644
--- a/keyboards/kprepublic/bm60poker/rev1/rev1.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm60poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
index 4fb38c5a70..4fb38c5a70 100644
--- a/keyboards/kprepublic/bm60poker/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
diff --git a/keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm65hsrgb/keymaps/default/keymap.c
index dadeb9c149..dadeb9c149 100644
--- a/keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm65rgb/keymaps/default/readme.md b/keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md
index 72171ee89a..72171ee89a 100644
--- a/keyboards/kprepublic/bm65rgb/keymaps/default/readme.md
+++ b/keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm65rgb/rev1/readme.md b/keyboards/kprepublic/bm65hsrgb/readme.md
index 119d05d20e..d660861296 100644
--- a/keyboards/kprepublic/bm65rgb/rev1/readme.md
+++ b/keyboards/kprepublic/bm65hsrgb/readme.md
@@ -1,20 +1,20 @@
-# bm65rgb
+# BM65HSRGB
 
-![bm65rgb](https://i.imgur.com/DskSCve.jpeg)
+![BM65HSRGB](https://i.imgur.com/DskSCve.jpeg)
 
 A 65% hotswap in switch RGB keyboard from KPRepublic.
 
 * Keyboard Maintainer: [bytesapart](https://github.com/bytesapart)
-* Hardware Supported: BM65 RGB
+* Hardware Supported: BM65HSRGB
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm65rgb-bm65-rgb-65-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-full-rgb-switch-underglow-type-c?_pos=1&_sid=5b9a6a5d0&_ss=r)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm65rgb/rev1:default
+    make kprepublic/bm65hsrgb/rev1:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm65rgb/rev1:default:flash
+    make kprepublic/bm65hsrgb/rev1:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/kprepublic/bm65rgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index 21624b9f16..1fbfab9368 100644
--- a/keyboards/kprepublic/bm65rgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID   0xEF6E
 #define DEVICE_VER   0x0001
 #define MANUFACTURER KPRepublic
-#define PRODUCT      BM65 RGB
+#define PRODUCT      BM65HSRGB
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/kprepublic/bm65rgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index d69fb8e5cf..788f8be23e 100644
--- a/keyboards/kprepublic/bm65rgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "bm65rgb",
+    "keyboard_name": "BM65HSRGB",
     "url": "",
     "maintainer": "bytesapart",
     "layouts": {
diff --git a/keyboards/kprepublic/bm65rgb/readme.md b/keyboards/kprepublic/bm65hsrgb/rev1/readme.md
index 119d05d20e..119d05d20e 100644
--- a/keyboards/kprepublic/bm65rgb/readme.md
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/readme.md
diff --git a/keyboards/kprepublic/bm65rgb/rev1/rev1.c b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.c
index 6f85f256e1..6f85f256e1 100644
--- a/keyboards/kprepublic/bm65rgb/rev1/rev1.c
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.c
diff --git a/keyboards/kprepublic/bm65rgb/rev1/rev1.h b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.h
index 4bafcf1943..4bafcf1943 100644
--- a/keyboards/kprepublic/bm65rgb/rev1/rev1.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm65rgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
index a0e7019715..a0e7019715 100644
--- a/keyboards/kprepublic/bm65rgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
diff --git a/keyboards/kprepublic/bm65iso/bm65iso.c b/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
index de2aba21c3..134c271824 100644
--- a/keyboards/kprepublic/bm65iso/bm65iso.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm65iso.h"
+#include "bm65hsrgb_iso.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm65iso/bm65iso.h b/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.h
index 7f39c6f61b..7f39c6f61b 100644
--- a/keyboards/kprepublic/bm65iso/bm65iso.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.h
diff --git a/keyboards/kprepublic/bm65iso/config.h b/keyboards/kprepublic/bm65hsrgb_iso/config.h
index c6508b0817..30b27dc26e 100644
--- a/keyboards/kprepublic/bm65iso/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x0653
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KP Republic
-#define PRODUCT         BM65ISO
+#define PRODUCT         BM65HSRGB_ISO
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/kprepublic/bm65iso/info.json b/keyboards/kprepublic/bm65hsrgb_iso/info.json
index c987415fb4..9212c43339 100644
--- a/keyboards/kprepublic/bm65iso/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "bm65iso",
+    "keyboard_name": "BM65HSRGB_ISO",
     "url": "",
     "maintainer": "qmk",
     "layouts": {
diff --git a/keyboards/kprepublic/bm65iso/keymaps/deadolus/config.h b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/config.h
index 1dc1414fa5..1dc1414fa5 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/deadolus/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/config.h
diff --git a/keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.c
index 46de987a68..46de987a68 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.c
diff --git a/keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.h b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.h
index 1459e2c5bb..1459e2c5bb 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/deadolus/keymap.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.h
diff --git a/keyboards/kprepublic/bm65iso/keymaps/deadolus/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/readme.md
index 6080e5b9ab..095550b01a 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/deadolus/readme.md
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/readme.md
@@ -11,10 +11,10 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bm65iso:deadolus
+    make kprepublic/bm65hsrgb_iso:deadolus
 
 Flashing example for this keyboard:
 
-    make bm65iso:deadolus:flash
+    make kprepublic/bm65hsrgb_iso:deadolus:flash
 
 Keyboard Maintainer: **[deadolus](https://github.com/deadolus)**
diff --git a/keyboards/kprepublic/bm65iso/keymaps/deadolus/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/rules.mk
index c8354ea256..c8354ea256 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/deadolus/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/rules.mk
diff --git a/keyboards/kprepublic/bm65iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/default/keymap.c
index bed12e0f72..bed12e0f72 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm65iso/keymaps/via/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/keymap.c
index ae36e6b1f5..ae36e6b1f5 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm65iso/keymaps/via/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/readme.md
index 87c7542756..87c7542756 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/via/readme.md
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm65iso/keymaps/via/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/kprepublic/bm65iso/keymaps/via/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm65iso/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/readme.md
index 466a0341a2..752362e29a 100644
--- a/keyboards/kprepublic/bm65iso/readme.md
+++ b/keyboards/kprepublic/bm65hsrgb_iso/readme.md
@@ -1,20 +1,20 @@
-# bm65iso
+# BM65HSRGB_ISO
 
-![bm65iso](https://ae01.alicdn.com/kf/He2fd118856c7490292bc3c299049fdbcp.jpg)
+![BM65HSRGB_ISO](https://ae01.alicdn.com/kf/He2fd118856c7490292bc3c299049fdbcp.jpg)
 
 A 65% hotswap in switch RGB keyboard from KPRepublic.
 
 * Keyboard Maintainer: [deadolus](https://github.com/deadolus)
-* Hardware Supported: BM65 ISO
+* Hardware Supported: BM65HSRGB_ISO
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm65rgb-bm65-iso-rgb-65-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-rgb-switch-underglow-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm65iso:default
+    make kprepublic/bm65hsrgb_iso:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm65iso:default:flash
+    make kprepublic/bm65hsrgb_iso:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/kprepublic/bm65iso/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rules.mk
index 929b2f939f..929b2f939f 100644
--- a/keyboards/kprepublic/bm65iso/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rules.mk
diff --git a/keyboards/kprepublic/bm68rgb/bm68rgb.c b/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.c
index f3d2cc7b4f..b405a9f204 100644
--- a/keyboards/kprepublic/bm68rgb/bm68rgb.c
+++ b/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bm68rgb.h"
+#include "bm68hsrgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm68rgb/bm68rgb.h b/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.h
index 3e18b914cc..3e18b914cc 100644
--- a/keyboards/kprepublic/bm68rgb/bm68rgb.h
+++ b/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.h
diff --git a/keyboards/kprepublic/bm68rgb/config.h b/keyboards/kprepublic/bm68hsrgb/config.h
index 580af57cf5..a779c97b7b 100644
--- a/keyboards/kprepublic/bm68rgb/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID   0xEF6F
 #define DEVICE_VER   0x0001
 #define MANUFACTURER KPRepublic
-#define PRODUCT      BM68 RGB
+#define PRODUCT      BM68HSRGB
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/kprepublic/bm68rgb/info.json b/keyboards/kprepublic/bm68hsrgb/info.json
index aa71c895ec..0a72da6e98 100644
--- a/keyboards/kprepublic/bm68rgb/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "bm68rgb",
+    "keyboard_name": "BM68HSRGB",
     "url": "",
     "maintainer": "peepeetee",
     "layouts": {
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/keymaps/default/keymap.c
index b4bc5cb59d..b4bc5cb59d 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/default/readme.md b/keyboards/kprepublic/bm68hsrgb/keymaps/default/readme.md
index 0408ee9e98..0408ee9e98 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/default/readme.md
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/config.h
index 0748f83cdc..0748f83cdc 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/config.h
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.c
index 934463b11f..934463b11f 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.c
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.h b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.h
index e8d0170d4d..e8d0170d4d 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/keymap.h
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.h
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/readme.md b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/readme.md
index 47899c27e1..47899c27e1 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/peepeetee/readme.md
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/readme.md
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/keymaps/via/keymap.c
index 46381c561c..46381c561c 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/via/readme.md b/keyboards/kprepublic/bm68hsrgb/keymaps/via/readme.md
index c013ae25e2..c013ae25e2 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/via/readme.md
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm68rgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm68hsrgb/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/kprepublic/bm68rgb/keymaps/via/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm68rgb/readme.md b/keyboards/kprepublic/bm68hsrgb/readme.md
index f09efb1ab6..54d71cab2c 100644
--- a/keyboards/kprepublic/bm68rgb/readme.md
+++ b/keyboards/kprepublic/bm68hsrgb/readme.md
@@ -1,20 +1,20 @@
-# bm68rgb
+# BM68HSRGB
 
-![bm68rgb](https://i.imgur.com/uuYP8OIl.jpeg)
+![BM68HSRGB](https://i.imgur.com/uuYP8OIl.jpeg)
 
 A 65% hotswap in switch RGB keyboard from KPRepublic.
 
 * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
-* Hardware Supported: BM68 RGB
+* Hardware Supported: BM68HSRGB
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm68rgb-bm68-rgb-65-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-full-rgb-switch-underglow-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm68rgb:default
+    make kprepublic/bm68hsrgb:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm68rgb:default:flash
+    make kprepublic/bm68hsrgb:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/kprepublic/bm68rgb/rules.mk b/keyboards/kprepublic/bm68hsrgb/rules.mk
index 910923efd1..910923efd1 100644
--- a/keyboards/kprepublic/bm68rgb/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rules.mk
diff --git a/keyboards/kprepublic/bm80/bm80.c b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c
index 8a0d26e87d..3455efd84c 100644
--- a/keyboards/kprepublic/bm80/bm80.c
+++ b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bm80.h"
+#include "bm80hsrgb.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
@@ -27,12 +27,12 @@ led_config_t g_led_config = { {
 	{ 63,     64,     65,     66,     67,     68,     69,     70,     71,     72,     73, NO_LED,     74, NO_LED, NO_LED,     75, NO_LED },
 	{ 76,     77,     78,     NO_LED, NO_LED, 79, NO_LED, NO_LED, NO_LED,     80,     81,     82,     83,     84, NO_LED,     85,     86 }
 
-//     K0_0,       K0_2, K0_3, K0_4, K0_5,   K0_7, K0_8, K0_9, K0_A,   K0_B, K0_C, K3_C, K0_D,   K0_E, K0_F, K0_10, 
-//     K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9, K1_A, K1_B, K1_C,    K1_D,    K1_E, K1_F, K1_10, 
-//      K2_0,   K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9, K2_A, K2_B, K2_C,   K2_D,  K2_E, K2_F, K2_10, 
-//      K3_0,    K3_1, K3_2, K3_3, K3_4, K3_5, K3_6, K3_7, K3_8, K3_9, K3_A, K3_B,       K3_D,                      
-//       K4_0,     K4_1, K4_2, K4_3, K4_4, K4_5, K4_6, K4_7, K4_8, K4_9, K4_A,     K4_C,               K4_F,        
-//     K5_0,  K5_1,  K5_2,             K5_5,                       K5_9, K5_A, K5_B, K5_C,       K5_D, K5_F, K5_10  
+//     K0_0,       K0_2, K0_3, K0_4, K0_5,   K0_7, K0_8, K0_9, K0_A,   K0_B, K0_C, K3_C, K0_D,   K0_E, K0_F, K0_10,
+//     K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9, K1_A, K1_B, K1_C,    K1_D,    K1_E, K1_F, K1_10,
+//      K2_0,   K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9, K2_A, K2_B, K2_C,   K2_D,  K2_E, K2_F, K2_10,
+//      K3_0,    K3_1, K3_2, K3_3, K3_4, K3_5, K3_6, K3_7, K3_8, K3_9, K3_A, K3_B,       K3_D,
+//       K4_0,     K4_1, K4_2, K4_3, K4_4, K4_5, K4_6, K4_7, K4_8, K4_9, K4_A,     K4_C,               K4_F,
+//     K5_0,  K5_1,  K5_2,             K5_5,                       K5_9, K5_A, K5_B, K5_C,       K5_D, K5_F, K5_10
 
 
 // 	   K0_0,  KC_NO, K0_2,  K0_3,  K0_4,  K0_5,  KC_NO, K0_7,  K0_8,  K0_9,  K0_A,  K0_B,  K0_C,  K0_D,  K0_E,  K0_F,  K0_10
@@ -130,7 +130,7 @@ led_config_t g_led_config = { {
      * │ 63     │ 64│ 65│ 66│ 67│ 68│ 69│ 70│ 71│ 72│ 73│    74    │     │ 75│
      * └────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────────┘     └───┘
      */
-     1, 1, 1, 4, 1, 1, 1, 1,                    1, 1, 1 
+     1, 1, 1, 4, 1, 1, 1, 1,                    1, 1, 1
     /*
      * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐ ┌───┬───┬───┐
      * │ 76 │ 77 │ 78 │           79           │ 80 │ 81 │ 82 │ 83 │ │ 84│ 85│ 86│
diff --git a/keyboards/kprepublic/bm80/bm80.h b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h
index 450befe882..450befe882 100644
--- a/keyboards/kprepublic/bm80/bm80.h
+++ b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h
diff --git a/keyboards/kprepublic/bm80/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index b1a2ad23a1..b1a2ad23a1 100644
--- a/keyboards/kprepublic/bm80/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
diff --git a/keyboards/kprepublic/bm80/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 8c7a0056b3..f46024a93f 100644
--- a/keyboards/kprepublic/bm80/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "bm80",
+    "keyboard_name": "BM80HSRGB",
     "url": "",
     "maintainer": "peepeetee",
     "layouts": {
@@ -95,4 +95,4 @@
             ]
         }
     }
-}
-\ No newline at end of file
+}
diff --git a/keyboards/kprepublic/bm80/keymaps/default/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
index d86c6f9ec8..d86c6f9ec8 100644
--- a/keyboards/kprepublic/bm80/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm80/keymaps/default/readme.md b/keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md
index 8ad360ebda..8ad360ebda 100644
--- a/keyboards/kprepublic/bm80/keymaps/default/readme.md
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm80/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index b322afae9b..b322afae9b 100644
--- a/keyboards/kprepublic/bm80/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
diff --git a/keyboards/kprepublic/bm80/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
index d4a188089b..d4a188089b 100644
--- a/keyboards/kprepublic/bm80/keymaps/peepeetee/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
diff --git a/keyboards/kprepublic/bm80/keymaps/via/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
index 53b2981c5e..53b2981c5e 100644
--- a/keyboards/kprepublic/bm80/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm80/keymaps/via/readme.md b/keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md
index 9fb42c24d8..9fb42c24d8 100644
--- a/keyboards/kprepublic/bm80/keymaps/via/readme.md
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm80/keymaps/via/rules.mk b/keyboards/kprepublic/bm80hsrgb/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/kprepublic/bm80/keymaps/via/rules.mk
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm80/readme.md b/keyboards/kprepublic/bm80hsrgb/readme.md
index a0d8e8cf9a..f48af7390c 100644
--- a/keyboards/kprepublic/bm80/readme.md
+++ b/keyboards/kprepublic/bm80hsrgb/readme.md
@@ -1,20 +1,20 @@
-# bm80
+# BM80HSRGB
 
-![bm80](https://i.imgur.com/AqjEjOi.jpeg)
+![BM80HSRGB](https://i.imgur.com/AqjEjOi.jpeg)
 
 A tkl, hotswap, in switch RGB keyboard from KPRepublic.
 
 * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
-* Hardware Supported: BM80
+* Hardware Supported: BM80HSRGB
 * Hardware Availability: [KP Republic](https://kprepublic.com/collections/new-arrival/products/bm80rgb-bm80-rgb-80-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-full-rgb-switch-underglow-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm80:default
+    make kprepublic/bm80hsrgb:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm80:default:flash
+    make kprepublic/bm80hsrgb:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/kprepublic/bm80/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk
index 0db2759897..0db2759897 100644
--- a/keyboards/kprepublic/bm80/rules.mk
+++ b/keyboards/kprepublic/bm80hsrgb/rules.mk
diff --git a/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md b/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
index 766a3c93b2..340c6924ee 100644
--- a/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
+++ b/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
@@ -48,8 +48,8 @@
 
 ```bash
 cd qmk_firmware
-make jj40:cockpit
-bootloadHID .build/jj40_cockpit.hex
+make kprepublic/jj40:cockpit
+bootloadHID .build/kprepublic_jj40_cockpit.hex
 ```
 
 _if you're getting permission errors use sudo_
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/readme.md b/keyboards/kprepublic/jj40/keymaps/waples/readme.md
index 91b1094e57..e9382d89f8 100644
--- a/keyboards/kprepublic/jj40/keymaps/waples/readme.md
+++ b/keyboards/kprepublic/jj40/keymaps/waples/readme.md
@@ -11,7 +11,7 @@ I currently have the following layers in my keymap:
 * Dual		(adjust)
 
 ### Note to self:
-YOU NEED TO USE [bootloadHID -r jj40_waples.hex](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jj40)
+YOU NEED TO USE [bootloadHID -r kprepublic_jj40_waples.hex](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jj40)
 
 ## the stuff below is out of date and I think about removing them from this readme
 
diff --git a/keyboards/ktec/ergodone/readme.md b/keyboards/ktec/ergodone/readme.md
index 7998a274f0..c06222b286 100644
--- a/keyboards/ktec/ergodone/readme.md
+++ b/keyboards/ktec/ergodone/readme.md
@@ -25,4 +25,4 @@ The ErgoDone uses a customized HID bootloader rather than the Teensy one. It doe
 ![Ergodone Flash Mode](https://i.imgur.com/sNivAnr.jpg)
 2. To flash the .hex file, use the `hid_bootloader_cli` utlity from the [TKG Toolkit](https://github.com/kairyu/tkg-toolkit) (as of 2017-10-03, only [this old version](https://github.com/kairyu/tkg-toolkit/blob/b14c67ca8bc84c07e5fc6b2e01ae4002b808243a/windows/bin/hid_bootloader_cli.exe) works under Windows):
 
-       hid_bootloader_cli -mmcu=atmega32u4 ergodone_default.hex
+       hid_bootloader_cli -mmcu=atmega32u4 ktec_ergodone_default.hex
diff --git a/keyboards/xiudi/xd002/readme.md b/keyboards/xiudi/xd002/readme.md
index 65522fda2c..395a540709 100644
--- a/keyboards/xiudi/xd002/readme.md
+++ b/keyboards/xiudi/xd002/readme.md
@@ -37,7 +37,7 @@ sudo udevadm trigger
 **Reset Key**: Hold down key nearest to the USB socket while plugging in the keyboard.
 
 ```bash
-make xd002:default:flash
+make xiudi/xd002:default:flash
 
 # or directly with...
 micronucleus --run <firmware.hex>
diff --git a/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md b/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
index d684d463c6..3e5533b036 100644
--- a/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
+++ b/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
@@ -6,4 +6,4 @@ It also has a 'Super Alt-F4' key for Windows that, when tapped does Alt-F4, unle
 
 ## Build
 
-To build the keymap, simply run `make xd004:system_and_media`.
+To build the keymap, simply run `make xiudi/xd004:system_and_media`.
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/README.md b/keyboards/xiudi/xd60/keymaps/Jos/README.md
index b4382acfeb..c93ea25bfd 100644
--- a/keyboards/xiudi/xd60/keymaps/Jos/README.md
+++ b/keyboards/xiudi/xd60/keymaps/Jos/README.md
@@ -19,4 +19,4 @@ There are a few `#define` lines at the beginning of the keymap file that enable
 
 
 # Build
-To build, simply run `make xd60:Jos`
+To build, simply run `make xiudi/xd60:Jos`
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/readme.md b/keyboards/xiudi/xd60/keymaps/birkir/readme.md
index 670b6bb314..47a1523f6c 100644
--- a/keyboards/xiudi/xd60/keymaps/birkir/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/birkir/readme.md
@@ -42,4 +42,4 @@ RGB settings are persisted for layer 0 when done.
 - More dynamic keyboard configuration on Layer 2
 
 ## Build
-To build the default keymap, simply run `make xd60:birkir`.
+To build the default keymap, simply run `make xiudi/xd60:birkir`.
diff --git a/keyboards/xiudi/xd60/keymaps/default/readme.md b/keyboards/xiudi/xd60/keymaps/default/readme.md
index 7d6bc75365..517dfef633 100644
--- a/keyboards/xiudi/xd60/keymaps/default/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/default/readme.md
@@ -9,5 +9,5 @@ Default Keymap for XD60 as indicated on the original sale page.
 
 To build the default keymap, simply run:
 
-    make xd60/rev2:default  # XD60 rev2
-    make xd60/rev3:default  # XD60 rev3
+    make xiudi/xd60/rev2:default  # XD60 rev2
+    make xiudi/xd60/rev3:default  # XD60 rev3
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn/readme.md b/keyboards/xiudi/xd60/keymaps/edulpn/readme.md
index 14f7da063d..ba37eb6d7e 100644
--- a/keyboards/xiudi/xd60/keymaps/edulpn/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/edulpn/readme.md
@@ -6,4 +6,4 @@
 ![Edulpn Keymap for the XD60 PCB](https://i.imgur.com/PoL5qcr.png)
 
 ## Build
-To build the default keymap, simply run `make xd60:edulpn`.
+To build the default keymap, simply run `make xiudi/xd60:edulpn`.
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md b/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
index a3208564a0..0fd6e82752 100644
--- a/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
@@ -6,4 +6,4 @@
 This keymap uses the Default XD60 base layer, but follows the GK64 function layer (one of my XD60 boards use GK64 keycaps).
 
 ## Build
-To build the default keymap, simply run `make xd60:edulpn64`.
+To build the default keymap, simply run `make xiudi/xd60:edulpn64`.
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md b/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
index 753c6bbb2d..63e507935d 100755
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
@@ -27,7 +27,7 @@ via has been enabled
 
 To build the keymap, simply run:
 
-    make xd60/rev3:fvolpe83  # XD60 rev3
+    make xiudi/xd60/rev3:fvolpe83  # XD60 rev3
 	
 	
 ![Keyboard Layout (Physical appearence)](https://i.imgur.com/CSRPjbX.png "physical layout")
diff --git a/keyboards/xiudi/xd60/keymaps/iso/readme.md b/keyboards/xiudi/xd60/keymaps/iso/readme.md
index 84374fa185..40f24c5c40 100644
--- a/keyboards/xiudi/xd60/keymaps/iso/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/iso/readme.md
@@ -16,5 +16,5 @@ iso Keymap for XD60.
 
 To build the default keymap, simply run:
 
-    make xd60/rev2:iso  # XD60 rev2
-    make xd60/rev3:iso  # XD60 rev3
+    make xiudi/xd60/rev2:iso  # XD60 rev2
+    make xiudi/xd60/rev3:iso  # XD60 rev3
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md b/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
index a23f6a8bec..fcbf2099c8 100644
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
@@ -15,4 +15,4 @@ This layout is  WIP for me as I use my shiny new keyboard more and more. I will
 * I use emacs, which could account for some of the oddities in my layout and macros
 
 ## Build
-To build the default keymap, simply run `make xd60:kmontag42`.
+To build the default keymap, simply run `make xiudi/xd60:kmontag42`.
diff --git a/keyboards/xiudi/xd60/keymaps/krusli/readme.md b/keyboards/xiudi/xd60/keymaps/krusli/readme.md
index 34f46e026c..c6d6834e6a 100644
--- a/keyboards/xiudi/xd60/keymaps/krusli/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/krusli/readme.md
@@ -4,4 +4,4 @@
 Keymap for the XD60 (ANSI) with 2.25u left shift, split right shift. HHKB-like function layer.
 
 ## Build
-To build this keymap, simply run `make xd60:krusli` on the top-level directory for QMK.
+To build this keymap, simply run `make xiudi/xd60:krusli` on the top-level directory for QMK.
diff --git a/keyboards/xiudi/xd60/keymaps/melka/readme.md b/keyboards/xiudi/xd60/keymaps/melka/readme.md
index b9d9065da7..23e7ab0b09 100644
--- a/keyboards/xiudi/xd60/keymaps/melka/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/melka/readme.md
@@ -18,4 +18,4 @@ To define your password, rename passwd_template.h file to passwd.h and edit the
 
 To build this keymap, simply run:
 
-    make xd60/rev3:melka  # XD60 rev3
+    make xiudi/xd60/rev3:melka  # XD60 rev3
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/README.md b/keyboards/xiudi/xd60/keymaps/petesmom/README.md
index dceb402d72..075928205c 100644
--- a/keyboards/xiudi/xd60/keymaps/petesmom/README.md
+++ b/keyboards/xiudi/xd60/keymaps/petesmom/README.md
@@ -4,10 +4,10 @@ Customized xd60 keymap based on yuuki's but a step sideways with Mac support. Fo
 
 ## Programming Instructions
 
-Change the layout in `keymap.c` then run `make xd60-petesmom`. The compiled file will be located in `.build/xd60_petesmom.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
+Change the layout in `keymap.c` then run `make xiudi/xd60:petesmom`. The compiled file will be located in `.build/xiudi_xd60_petesmom.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
 
 * `sudo dfu-programmer atmega32u4 erase`
-* `sudo dfu-programmer atmega32u4 flash .build/xd60-petesmom.hex`
+* `sudo dfu-programmer atmega32u4 flash .build/xiudi_xd60-petesmom.hex`
 * `sudo dfu-programmer atmega32u4 start`
 
 ## Layout
diff --git a/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md b/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
index b8a3ac4fff..7e74f753ff 100644
--- a/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
@@ -9,5 +9,5 @@ Custom Keymap for XD60 - uses a META key and lots of shortcut keys that are late
 
 To build the default keymap, simply run:
 
-    make xd60/rev2:default  # XD60 rev2
-    make xd60/rev3:default  # XD60 rev3
-\ No newline at end of file
+    make xiudi/xd60/rev2:default  # XD60 rev2
+    make xiudi/xd60/rev3:default  # XD60 rev3
+\ No newline at end of file
diff --git a/keyboards/xiudi/xd60/keymaps/styr/readme.md b/keyboards/xiudi/xd60/keymaps/styr/readme.md
index 8d9edf7c48..1c5d160cfa 100644
--- a/keyboards/xiudi/xd60/keymaps/styr/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/styr/readme.md
@@ -4,4 +4,4 @@
 Default Keymap for XD60 as indicated on the original sale page.
 
 ## Build
-To build the default keymap, simply run `make xd60/rev3:styr`.
+To build the default keymap, simply run `make xiudi/xd60/rev3:styr`.
diff --git a/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md b/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
index ccfdca8b25..111f34e720 100644
--- a/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
+++ b/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
@@ -6,4 +6,4 @@
 60% Keymap for XD60 with GH60 ANSI layout. Arrow keys mapped to WASD in function layer.
 
 ## Build
-To build the default keymap, simply run `make xd60:supercoffee`.
+To build the default keymap, simply run `make xiudi/xd60:supercoffee`.
diff --git a/keyboards/xiudi/xd60/keymaps/yuuki/README.md b/keyboards/xiudi/xd60/keymaps/yuuki/README.md
index ebb2f8c1c9..ba0de049ee 100644
--- a/keyboards/xiudi/xd60/keymaps/yuuki/README.md
+++ b/keyboards/xiudi/xd60/keymaps/yuuki/README.md
@@ -4,11 +4,11 @@ Customized xd60 keymap with inspirations from HHKB and the layout I used on my V
 
 ## Programming Instructions
 
-Change the layout in `keymap.c` then run `make xd60:yuuki`. The compiled file will be located in `.build/xd60_yuuki.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
+Change the layout in `keymap.c` then run `make xiudi/xd60:yuuki`. The compiled file will be located in `.build/xiudi_xd60_yuuki.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
 
 * reset keyboard by pressing the reset button on the back of the PCB
 * `sudo dfu-programmer atmega32u4 erase`
-* `sudo dfu-programmer atmega32u4 flash .build/xd60_yuuki.hex`
+* `sudo dfu-programmer atmega32u4 flash .build/xiudi_xd60_yuuki.hex`
 * `sudo dfu-programmer atmega32u4 start`
 
 ## Layout
diff --git a/keyboards/xiudi/xd68/keymaps/default/readme.md b/keyboards/xiudi/xd68/keymaps/default/readme.md
index f26e1bd63f..7f5c5c39ea 100644
--- a/keyboards/xiudi/xd68/keymaps/default/readme.md
+++ b/keyboards/xiudi/xd68/keymaps/default/readme.md
@@ -1,5 +1,5 @@
 # XD68 layout for Default ANSI
 
 ```
-make xd68:default
+make xiudi/xd68:default
 ```
diff --git a/keyboards/xiudi/xd68/keymaps/default_iso/readme.md b/keyboards/xiudi/xd68/keymaps/default_iso/readme.md
index d61877e77e..a91aff3992 100644
--- a/keyboards/xiudi/xd68/keymaps/default_iso/readme.md
+++ b/keyboards/xiudi/xd68/keymaps/default_iso/readme.md
@@ -1,5 +1,5 @@
 # XD68 layout for Default ISO
 
 ```
-make xd68:default_iso
+make xiudi/xd68:default_iso
 ```
diff --git a/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md b/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
index f96c8ea976..a0ade691aa 100644
--- a/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
@@ -9,6 +9,6 @@
 
 Take the board into reset mode, then
 ```
-make xd75:bbaserdem:dfu
+make xiudi/xd75:bbaserdem:dfu
 ```
 Either sudo it or set permissions in udev.
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md b/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
index 947acca101..17232175e3 100644
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
@@ -50,5 +50,5 @@ $ cd qmk_firmware
 
 build
 ```
-$ make xd75:buzzlighter1
+$ make xiudi/xd75:buzzlighter1
 ```
 \ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/clanghans/readme.md b/keyboards/xiudi/xd75/keymaps/clanghans/readme.md
index bce20f6133..eed6369ada 100755
--- a/keyboards/xiudi/xd75/keymaps/clanghans/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/clanghans/readme.md
@@ -5,7 +5,7 @@
 
 * Build/Flash
   qmk setup
-  qmk compile -kb xd75 -km clanghans
-  qmk flash -kb xd75 -km clanghans
+  qmk compile -kb xiudi/xd75 -km clanghans
+  qmk flash -kb xiudi/xd75 -km clanghans
   
   Hit 'Raise'+'PgUp' for entering bootloader mode
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/readme.md b/keyboards/xiudi/xd75/keymaps/colinta/readme.md
index e3f59d681f..e4e8049015 100644
--- a/keyboards/xiudi/xd75/keymaps/colinta/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/colinta/readme.md
@@ -1,7 +1,7 @@
 # colinta's keymap for XD75
 
 ```
-make xd75:colinta:dfu
+make xiudi/xd75:colinta:dfu
 ```
 
 The default layout is a Colemak keyboard with "one-shot" keys assigned to the modifier keys.
@@ -41,13 +41,13 @@ If you would *also* like to take advantage of this feature, you'll first want to
 # exclude patterns (uncomment them if you want to use them):
 # *.[oa]
 # *~
-/keyboards/xd75/keymaps/colinta/secrets.h
+/keyboards/xiudi/xd75/keymaps/colinta/secrets.h
 ```
 
 Then you can create this file and add your macro strings to it:
 
 ```
-$EDITOR keyboards/xd75/keymaps/colinta/secrets.h
+$EDITOR keyboards/xiudi/xd75/keymaps/colinta/secrets.h
 ```
 
 ###### secrets.h
@@ -60,5 +60,5 @@ $EDITOR keyboards/xd75/keymaps/colinta/secrets.h
 To include the feature at compile time, include the flag `IS_COLINTA` like so:
 
 ```
-make xd75:colinta:dfu EXTRAFLAGS=-DIS_COLINTA
+make xiudi/xd75:colinta:dfu EXTRAFLAGS=-DIS_COLINTA
 ```
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md b/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
index 7954a683a0..82172ff981 100644
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
@@ -10,4 +10,4 @@ Keyboard maintainer: [Quentin Lebastard](https://github.com/lebastaq)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make xd75:developper_bepo
+    make xiudi/xd75:developper_bepo
diff --git a/keyboards/xiudi/xd75/keymaps/french/readme.md b/keyboards/xiudi/xd75/keymaps/french/readme.md
index 8c5330290e..a45bf248da 100644
--- a/keyboards/xiudi/xd75/keymaps/french/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/french/readme.md
@@ -16,5 +16,5 @@ La touche de fonction permet elle d'avoir accès aux différentes touches multim
 # Compilation 
 
 ```
-make xd75:french:dfu
+make xiudi/xd75:french:dfu
 ```
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/readme.md b/keyboards/xiudi/xd75/keymaps/scheiklp/readme.md
index 58c65f0884..c8c2dc9a2c 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/readme.md
@@ -1,9 +1,9 @@
 # KOY Layout for the xd75 pcb board
 Compile the layout
 ```bash
-qmk compile -kb xd75 -km scheiklp
+qmk compile -kb xiudi/xd75 -km scheiklp
 ```
 and flash it to the board
 ```bash
-qmk flash -kb xd75 -km scheiklp
+qmk flash -kb xiudi/xd75 -km scheiklp
 ```
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md b/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
index 835ef09fb2..a430be0a27 100644
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
@@ -3,7 +3,7 @@
 
 Keyboard Layout Editor: [Link](http://www.keyboard-layout-editor.com/#/gists/b2b23097ef70fd9170e266e4cbc06c02)
 
-Make Command: make xd75:tdl-jturner
+Make Command: make xiudi/xd75:tdl-jturner
 
 Notes:
 * Based on Qwerty