diff --git a/app/boards/arm/corne-ish_zen/CMakeLists.txt b/app/boards/arm/corneish_zen/CMakeLists.txt
similarity index 100%
rename from app/boards/arm/corne-ish_zen/CMakeLists.txt
rename to app/boards/arm/corneish_zen/CMakeLists.txt
diff --git a/app/boards/arm/corne-ish_zen/Kconfig.board b/app/boards/arm/corneish_zen/Kconfig.board
similarity index 76%
rename from app/boards/arm/corne-ish_zen/Kconfig.board
rename to app/boards/arm/corneish_zen/Kconfig.board
index 19aff16b3ff..6aab8825fd8 100644
--- a/app/boards/arm/corne-ish_zen/Kconfig.board
+++ b/app/boards/arm/corneish_zen/Kconfig.board
@@ -4,9 +4,9 @@
 #
 
 config BOARD_CORNEISH_ZEN_V2_LEFT
-	bool "corne-ish zen left v2"
+	bool "corneish zen left v2"
 	depends on SOC_NRF52840_QIAA
 
 config BOARD_CORNEISH_ZEN_V2_RIGHT
-	bool "corne-ish zen right v2"
+	bool "corneish zen right v2"
 	depends on SOC_NRF52840_QIAA
\ No newline at end of file
diff --git a/app/boards/arm/corne-ish_zen/Kconfig.defconfig b/app/boards/arm/corneish_zen/Kconfig.defconfig
similarity index 98%
rename from app/boards/arm/corne-ish_zen/Kconfig.defconfig
rename to app/boards/arm/corneish_zen/Kconfig.defconfig
index 9219e211888..6795b602859 100644
--- a/app/boards/arm/corne-ish_zen/Kconfig.defconfig
+++ b/app/boards/arm/corneish_zen/Kconfig.defconfig
@@ -24,7 +24,7 @@ endif # BOARD_CORNEISH_ZEN_V2_RIGHT
 if BOARD_CORNEISH_ZEN_V2_LEFT || BOARD_CORNEISH_ZEN_V2_RIGHT
 
 config BOARD
-	default "corne-ish_zen"
+	default "corneish_zen"
 
 config ZMK_SPLIT
 	default y
diff --git a/app/boards/arm/corne-ish_zen/board.cmake b/app/boards/arm/corneish_zen/board.cmake
similarity index 100%
rename from app/boards/arm/corne-ish_zen/board.cmake
rename to app/boards/arm/corneish_zen/board.cmake
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen.dtsi b/app/boards/arm/corneish_zen/corneish_zen.dtsi
similarity index 100%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen.dtsi
rename to app/boards/arm/corneish_zen/corneish_zen.dtsi
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen.keymap b/app/boards/arm/corneish_zen/corneish_zen.keymap
similarity index 100%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen.keymap
rename to app/boards/arm/corneish_zen/corneish_zen.keymap
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen.yaml b/app/boards/arm/corneish_zen/corneish_zen.yaml
similarity index 100%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen.yaml
rename to app/boards/arm/corneish_zen/corneish_zen.yaml
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.yaml b/app/boards/arm/corneish_zen/corneish_zen_v2.yaml
similarity index 85%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2.yaml
rename to app/boards/arm/corneish_zen/corneish_zen_v2.yaml
index 9beb48a8161..46a213d9c60 100644
--- a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.yaml
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2.yaml
@@ -1,4 +1,4 @@
-identifier: corne-ish_zen_v2
+identifier: corneish_zen_v2
 name: Corne-ish Zen v2
 type: keyboard
 arch: arm
@@ -17,4 +17,4 @@ supported:
   - can
   - kscan
   - ble
-  - adc
\ No newline at end of file
+  - adc
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.zmk.yml b/app/boards/arm/corneish_zen/corneish_zen_v2.zmk.yml
similarity index 100%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2.zmk.yml
rename to app/boards/arm/corneish_zen/corneish_zen_v2.zmk.yml
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
similarity index 98%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left.dts
rename to app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
index 1f39c4ff05b..808dce66dfe 100644
--- a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
@@ -5,7 +5,7 @@
 *
 */
 
-#include "corne-ish_zen.dtsi"
+#include "corneish_zen.dtsi"
 
 /{
 	chosen {
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.keymap b/app/boards/arm/corneish_zen/corneish_zen_v2_left.keymap
similarity index 71%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.keymap
rename to app/boards/arm/corneish_zen/corneish_zen_v2_left.keymap
index 6b8798c2e84..be675cc025d 100644
--- a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.keymap
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left.keymap
@@ -5,4 +5,4 @@
 *
 */
 
-#include "corne-ish_zen.keymap"
\ No newline at end of file
+#include "corneish_zen.keymap"
\ No newline at end of file
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
similarity index 100%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left_defconfig
rename to app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
similarity index 98%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.dts
rename to app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
index 2aa6f037626..d037cf4e258 100644
--- a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
@@ -5,7 +5,7 @@
 *
 */
 
-#include "corne-ish_zen.dtsi"
+#include "corneish_zen.dtsi"
 
 /{
 	chosen {
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left.keymap b/app/boards/arm/corneish_zen/corneish_zen_v2_right.keymap
similarity index 71%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left.keymap
rename to app/boards/arm/corneish_zen/corneish_zen_v2_right.keymap
index 6b8798c2e84..be675cc025d 100644
--- a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_left.keymap
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right.keymap
@@ -5,4 +5,4 @@
 *
 */
 
-#include "corne-ish_zen.keymap"
\ No newline at end of file
+#include "corneish_zen.keymap"
\ No newline at end of file
diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
similarity index 100%
rename from app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right_defconfig
rename to app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
diff --git a/app/boards/arm/corne-ish_zen/custom_status_screen.c b/app/boards/arm/corneish_zen/custom_status_screen.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/custom_status_screen.c
rename to app/boards/arm/corneish_zen/custom_status_screen.c
diff --git a/app/boards/arm/corne-ish_zen/custom_status_screen.h b/app/boards/arm/corneish_zen/custom_status_screen.h
similarity index 100%
rename from app/boards/arm/corne-ish_zen/custom_status_screen.h
rename to app/boards/arm/corneish_zen/custom_status_screen.h
diff --git a/app/boards/arm/corne-ish_zen/widgets/CMakeLists.txt b/app/boards/arm/corneish_zen/widgets/CMakeLists.txt
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/CMakeLists.txt
rename to app/boards/arm/corneish_zen/widgets/CMakeLists.txt
diff --git a/app/boards/arm/corne-ish_zen/widgets/battery_status.c b/app/boards/arm/corneish_zen/widgets/battery_status.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/battery_status.c
rename to app/boards/arm/corneish_zen/widgets/battery_status.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/battery_status.h b/app/boards/arm/corneish_zen/widgets/battery_status.h
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/battery_status.h
rename to app/boards/arm/corneish_zen/widgets/battery_status.h
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/CMakeLists.txt b/app/boards/arm/corneish_zen/widgets/icons/CMakeLists.txt
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/CMakeLists.txt
rename to app/boards/arm/corneish_zen/widgets/icons/CMakeLists.txt
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/USB_connected.c b/app/boards/arm/corneish_zen/widgets/icons/USB_connected.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/USB_connected.c
rename to app/boards/arm/corneish_zen/widgets/icons/USB_connected.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_0.c b/app/boards/arm/corneish_zen/widgets/icons/batt_0.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_0.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_0.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_0_chg.c b/app/boards/arm/corneish_zen/widgets/icons/batt_0_chg.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_0_chg.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_0_chg.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_100.c b/app/boards/arm/corneish_zen/widgets/icons/batt_100.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_100.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_100.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_100_chg.c b/app/boards/arm/corneish_zen/widgets/icons/batt_100_chg.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_100_chg.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_100_chg.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_25.c b/app/boards/arm/corneish_zen/widgets/icons/batt_25.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_25.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_25.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_25_chg.c b/app/boards/arm/corneish_zen/widgets/icons/batt_25_chg.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_25_chg.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_25_chg.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_5.c b/app/boards/arm/corneish_zen/widgets/icons/batt_5.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_5.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_5.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_50.c b/app/boards/arm/corneish_zen/widgets/icons/batt_50.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_50.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_50.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_50_chg.c b/app/boards/arm/corneish_zen/widgets/icons/batt_50_chg.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_50_chg.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_50_chg.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_5_chg.c b/app/boards/arm/corneish_zen/widgets/icons/batt_5_chg.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_5_chg.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_5_chg.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_75.c b/app/boards/arm/corneish_zen/widgets/icons/batt_75.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_75.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_75.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/batt_75_chg.c b/app/boards/arm/corneish_zen/widgets/icons/batt_75_chg.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/batt_75_chg.c
rename to app/boards/arm/corneish_zen/widgets/icons/batt_75_chg.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_1.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_1.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_1.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_1.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_2.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_2.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_2.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_2.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_3.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_3.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_3.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_3.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_4.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_4.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_4.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_4.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_5.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_5.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_advertising_5.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_advertising_5.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_1.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_1.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_1.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_1.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_2.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_2.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_2.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_2.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_3.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_3.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_3.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_3.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_4.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_4.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_4.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_4.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_5.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_5.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_5.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_5.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_right.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_right.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_connected_right.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_connected_right.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_disconnected_right.c b/app/boards/arm/corneish_zen/widgets/icons/bluetooth_disconnected_right.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/bluetooth_disconnected_right.c
rename to app/boards/arm/corneish_zen/widgets/icons/bluetooth_disconnected_right.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/layers.c b/app/boards/arm/corneish_zen/widgets/icons/layers.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/layers.c
rename to app/boards/arm/corneish_zen/widgets/icons/layers.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/layers2.c b/app/boards/arm/corneish_zen/widgets/icons/layers2.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/layers2.c
rename to app/boards/arm/corneish_zen/widgets/icons/layers2.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/icons/zenlogo.c b/app/boards/arm/corneish_zen/widgets/icons/zenlogo.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/icons/zenlogo.c
rename to app/boards/arm/corneish_zen/widgets/icons/zenlogo.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/layer_status.c b/app/boards/arm/corneish_zen/widgets/layer_status.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/layer_status.c
rename to app/boards/arm/corneish_zen/widgets/layer_status.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/layer_status.h b/app/boards/arm/corneish_zen/widgets/layer_status.h
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/layer_status.h
rename to app/boards/arm/corneish_zen/widgets/layer_status.h
diff --git a/app/boards/arm/corne-ish_zen/widgets/output_status.c b/app/boards/arm/corneish_zen/widgets/output_status.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/output_status.c
rename to app/boards/arm/corneish_zen/widgets/output_status.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/output_status.h b/app/boards/arm/corneish_zen/widgets/output_status.h
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/output_status.h
rename to app/boards/arm/corneish_zen/widgets/output_status.h
diff --git a/app/boards/arm/corne-ish_zen/widgets/peripheral_status.c b/app/boards/arm/corneish_zen/widgets/peripheral_status.c
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/peripheral_status.c
rename to app/boards/arm/corneish_zen/widgets/peripheral_status.c
diff --git a/app/boards/arm/corne-ish_zen/widgets/peripheral_status.h b/app/boards/arm/corneish_zen/widgets/peripheral_status.h
similarity index 100%
rename from app/boards/arm/corne-ish_zen/widgets/peripheral_status.h
rename to app/boards/arm/corneish_zen/widgets/peripheral_status.h