diff --git a/Makefile b/Makefile
index c6030ee..3c72d0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Usage example: make flash blackpill=f411-8mhz half=left
+# Usage example: make flash blackpill=f411_8mhz half=left
 
 # Current half: 'left' or 'right'
 half ?= left
@@ -6,7 +6,7 @@ half ?= left
 blackpill ?= f401
 
 qmk_dir := vial-qmk
-keyboard := custom-cantor-${blackpill}
+keyboard := custom_cantor_${blackpill}
 keymap := vial
 target := dfu-util-split-$(half)
 
diff --git a/README.md b/README.md
index 0b50bf3..bfe4196 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Configuration for the 8MHz version of Blackpill_f411 provided by the [Xecut hack
 3. Start the flashing process (Docker required):
     - For **8MHz Blackpill_f411** controllers:
       ```
-      make flash blackpill=f411-8mhz half=left
+      make flash blackpill=f411_8mhz half=left
       ```
     - Otherwise:
       ```
diff --git a/keyboards/custom-cantor-f401/config.h b/keyboards/custom_cantor_f401/config.h
similarity index 100%
rename from keyboards/custom-cantor-f401/config.h
rename to keyboards/custom_cantor_f401/config.h
diff --git a/keyboards/custom-cantor-f401/halconf.h b/keyboards/custom_cantor_f401/halconf.h
similarity index 100%
rename from keyboards/custom-cantor-f401/halconf.h
rename to keyboards/custom_cantor_f401/halconf.h
diff --git a/keyboards/custom-cantor-f401/keyboard.json b/keyboards/custom_cantor_f401/keyboard.json
similarity index 100%
rename from keyboards/custom-cantor-f401/keyboard.json
rename to keyboards/custom_cantor_f401/keyboard.json
diff --git a/keyboards/custom-cantor-f401/keymaps/default/keymap.c b/keyboards/custom_cantor_f401/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/custom-cantor-f401/keymaps/default/keymap.c
rename to keyboards/custom_cantor_f401/keymaps/default/keymap.c
diff --git a/keyboards/custom-cantor-f401/keymaps/vial/config.h b/keyboards/custom_cantor_f401/keymaps/vial/config.h
similarity index 100%
rename from keyboards/custom-cantor-f401/keymaps/vial/config.h
rename to keyboards/custom_cantor_f401/keymaps/vial/config.h
diff --git a/keyboards/custom-cantor-f401/keymaps/vial/keymap.c b/keyboards/custom_cantor_f401/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/custom-cantor-f401/keymaps/vial/keymap.c
rename to keyboards/custom_cantor_f401/keymaps/vial/keymap.c
diff --git a/keyboards/custom-cantor-f401/keymaps/vial/rules.mk b/keyboards/custom_cantor_f401/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/custom-cantor-f401/keymaps/vial/rules.mk
rename to keyboards/custom_cantor_f401/keymaps/vial/rules.mk
diff --git a/keyboards/custom-cantor-f401/keymaps/vial/vial.json b/keyboards/custom_cantor_f401/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/custom-cantor-f401/keymaps/vial/vial.json
rename to keyboards/custom_cantor_f401/keymaps/vial/vial.json
diff --git a/keyboards/custom-cantor-f401/mcuconf.h b/keyboards/custom_cantor_f401/mcuconf.h
similarity index 100%
rename from keyboards/custom-cantor-f401/mcuconf.h
rename to keyboards/custom_cantor_f401/mcuconf.h
diff --git a/keyboards/custom-cantor-f411-8mhz/config.h b/keyboards/custom_cantor_f411_8mhz/config.h
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/config.h
rename to keyboards/custom_cantor_f411_8mhz/config.h
diff --git a/keyboards/custom-cantor-f411-8mhz/halconf.h b/keyboards/custom_cantor_f411_8mhz/halconf.h
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/halconf.h
rename to keyboards/custom_cantor_f411_8mhz/halconf.h
diff --git a/keyboards/custom-cantor-f411-8mhz/keyboard.json b/keyboards/custom_cantor_f411_8mhz/keyboard.json
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/keyboard.json
rename to keyboards/custom_cantor_f411_8mhz/keyboard.json
diff --git a/keyboards/custom-cantor-f411-8mhz/keymaps/vial/config.h b/keyboards/custom_cantor_f411_8mhz/keymaps/vial/config.h
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/keymaps/vial/config.h
rename to keyboards/custom_cantor_f411_8mhz/keymaps/vial/config.h
diff --git a/keyboards/custom-cantor-f411-8mhz/keymaps/vial/keymap.c b/keyboards/custom_cantor_f411_8mhz/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/keymaps/vial/keymap.c
rename to keyboards/custom_cantor_f411_8mhz/keymaps/vial/keymap.c
diff --git a/keyboards/custom-cantor-f411-8mhz/keymaps/vial/rules.mk b/keyboards/custom_cantor_f411_8mhz/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/keymaps/vial/rules.mk
rename to keyboards/custom_cantor_f411_8mhz/keymaps/vial/rules.mk
diff --git a/keyboards/custom-cantor-f411-8mhz/keymaps/vial/vial.json b/keyboards/custom_cantor_f411_8mhz/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/keymaps/vial/vial.json
rename to keyboards/custom_cantor_f411_8mhz/keymaps/vial/vial.json
diff --git a/keyboards/custom-cantor-f411-8mhz/mcuconf.h b/keyboards/custom_cantor_f411_8mhz/mcuconf.h
similarity index 100%
rename from keyboards/custom-cantor-f411-8mhz/mcuconf.h
rename to keyboards/custom_cantor_f411_8mhz/mcuconf.h