diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
index 85c4ca56c..1e2755d89 100644
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
@@ -7,7 +7,7 @@
 /dts-v1/;
 #include <st/f3/stm32f303Xc.dtsi>
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	model = "DZ60RGB, Rev 1";
diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay
index bbb23b652..2c1ed79d0 100644
--- a/app/boards/native_posix.overlay
+++ b/app/boards/native_posix.overlay
@@ -1,6 +1,6 @@
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/boardsource3x4/boardsource3x4.overlay b/app/boards/shields/boardsource3x4/boardsource3x4.overlay
index ad5179404..0b8f84988 100644
--- a/app/boards/shields/boardsource3x4/boardsource3x4.overlay
+++ b/app/boards/shields/boardsource3x4/boardsource3x4.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
     chosen {
diff --git a/app/boards/shields/corne/corne.dtsi b/app/boards/shields/corne/corne.dtsi
index 4360aea74..bb37d67ab 100644
--- a/app/boards/shields/corne/corne.dtsi
+++ b/app/boards/shields/corne/corne.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/cradio/cradio.dtsi b/app/boards/shields/cradio/cradio.dtsi
index 43f90493c..a99a8e58f 100644
--- a/app/boards/shields/cradio/cradio.dtsi
+++ b/app/boards/shields/cradio/cradio.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
  
- #include <dt-bindings/zmk/matrix-transform.h>
+ #include <dt-bindings/zmk/matrix_transform.h>
  
 / {
 	chosen {
diff --git a/app/boards/shields/crbn/crbn.overlay b/app/boards/shields/crbn/crbn.overlay
index 137e685e5..0f7cd45b6 100644
--- a/app/boards/shields/crbn/crbn.overlay
+++ b/app/boards/shields/crbn/crbn.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/iris/iris.dtsi b/app/boards/shields/iris/iris.dtsi
index 9ea1dd68c..eb065736f 100644
--- a/app/boards/shields/iris/iris.dtsi
+++ b/app/boards/shields/iris/iris.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/jian/jian.dtsi b/app/boards/shields/jian/jian.dtsi
index 331624ead..88bac8312 100644
--- a/app/boards/shields/jian/jian.dtsi
+++ b/app/boards/shields/jian/jian.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/jorne/jorne.dtsi b/app/boards/shields/jorne/jorne.dtsi
index 7e6cfd8b3..67ea9d1c9 100644
--- a/app/boards/shields/jorne/jorne.dtsi
+++ b/app/boards/shields/jorne/jorne.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/kyria/kyria.dtsi b/app/boards/shields/kyria/kyria.dtsi
index bbead846b..c0bec79b0 100644
--- a/app/boards/shields/kyria/kyria.dtsi
+++ b/app/boards/shields/kyria/kyria.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/lily58/lily58.dtsi b/app/boards/shields/lily58/lily58.dtsi
index eb69fa751..db54cf4de 100644
--- a/app/boards/shields/lily58/lily58.dtsi
+++ b/app/boards/shields/lily58/lily58.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay
index 0824f1c6a..18d06511d 100644
--- a/app/boards/shields/m60/m60.overlay
+++ b/app/boards/shields/m60/m60.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi
index 55c67dd3c..ee2114d74 100644
--- a/app/boards/shields/microdox/microdox.dtsi
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/nibble/nibble.overlay b/app/boards/shields/nibble/nibble.overlay
index 7975c3cd2..fd1b2f610 100644
--- a/app/boards/shields/nibble/nibble.overlay
+++ b/app/boards/shields/nibble/nibble.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/qaz/qaz.overlay b/app/boards/shields/qaz/qaz.overlay
index 4e733707b..205f7c26d 100644
--- a/app/boards/shields/qaz/qaz.overlay
+++ b/app/boards/shields/qaz/qaz.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
     chosen {
diff --git a/app/boards/shields/quefrency/quefrency.dtsi b/app/boards/shields/quefrency/quefrency.dtsi
index 5f1e90864..411d3658a 100644
--- a/app/boards/shields/quefrency/quefrency.dtsi
+++ b/app/boards/shields/quefrency/quefrency.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/reviung41/reviung41.overlay b/app/boards/shields/reviung41/reviung41.overlay
index 06270ca15..5336853bc 100644
--- a/app/boards/shields/reviung41/reviung41.overlay
+++ b/app/boards/shields/reviung41/reviung41.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
     chosen {
diff --git a/app/boards/shields/romac/romac.overlay b/app/boards/shields/romac/romac.overlay
index f6b0f726a..e0880d3fa 100644
--- a/app/boards/shields/romac/romac.overlay
+++ b/app/boards/shields/romac/romac.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/romac_plus/romac_plus.dtsi b/app/boards/shields/romac_plus/romac_plus.dtsi
index 9b148ca0e..48f73412d 100644
--- a/app/boards/shields/romac_plus/romac_plus.dtsi
+++ b/app/boards/shields/romac_plus/romac_plus.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/settings_reset/settings_reset.overlay b/app/boards/shields/settings_reset/settings_reset.overlay
index a2b5799b5..7a6629f88 100644
--- a/app/boards/shields/settings_reset/settings_reset.overlay
+++ b/app/boards/shields/settings_reset/settings_reset.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi
index b4edb5f69..9c55fc3c5 100644
--- a/app/boards/shields/sofle/sofle.dtsi
+++ b/app/boards/shields/sofle/sofle.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
     chosen {
diff --git a/app/boards/shields/splitreus62/splitreus62.dtsi b/app/boards/shields/splitreus62/splitreus62.dtsi
index c2bfbc403..d88d06cb3 100644
--- a/app/boards/shields/splitreus62/splitreus62.dtsi
+++ b/app/boards/shields/splitreus62/splitreus62.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/tg4x/tg4x.overlay b/app/boards/shields/tg4x/tg4x.overlay
index 10ce524a9..4b9d4f5bb 100644
--- a/app/boards/shields/tg4x/tg4x.overlay
+++ b/app/boards/shields/tg4x/tg4x.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
diff --git a/app/boards/shields/tidbit/tidbit.dtsi b/app/boards/shields/tidbit/tidbit.dtsi
index 7a2b3de06..004de3105 100644
--- a/app/boards/shields/tidbit/tidbit.dtsi
+++ b/app/boards/shields/tidbit/tidbit.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	kscan0: kscan {
diff --git a/app/drivers/kscan/kscan_mock.c b/app/drivers/kscan/kscan_mock.c
index 8b40ab447..fc0c9c5f5 100644
--- a/app/drivers/kscan/kscan_mock.c
+++ b/app/drivers/kscan/kscan_mock.c
@@ -13,7 +13,7 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 struct kscan_mock_data {
     kscan_callback_t callback;
diff --git a/app/include/dt-bindings/zmk/kscan-mock.h b/app/include/dt-bindings/zmk/kscan-mock.h
index eff218b2f..4ed666c61 100644
--- a/app/include/dt-bindings/zmk/kscan-mock.h
+++ b/app/include/dt-bindings/zmk/kscan-mock.h
@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#pragma once
+#warning "kscan-mock.h has been deprecated and superseded by kscan_mock.h"
 
-#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)
-#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31))
-#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16))
-#define ZMK_MOCK_ROW(v) (v & 0xFF)
-#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF)
-#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16)
+#include "kscan_mock.h"
\ No newline at end of file
diff --git a/app/include/dt-bindings/zmk/kscan_mock.h b/app/include/dt-bindings/zmk/kscan_mock.h
new file mode 100644
index 000000000..eff218b2f
--- /dev/null
+++ b/app/include/dt-bindings/zmk/kscan_mock.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#pragma once
+
+#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)
+#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31))
+#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16))
+#define ZMK_MOCK_ROW(v) (v & 0xFF)
+#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF)
+#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16)
diff --git a/app/include/dt-bindings/zmk/matrix-transform.h b/app/include/dt-bindings/zmk/matrix-transform.h
index 2989cb607..223b1429c 100644
--- a/app/include/dt-bindings/zmk/matrix-transform.h
+++ b/app/include/dt-bindings/zmk/matrix-transform.h
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#define KT_ROW(item) (item >> 8)
-#define KT_COL(item) (item & 0xFF)
+#warning "matrix-transform.h has been deprecated and superseded by matrix_transform.h"
 
-#define RC(row, col) (((row) << 8) + (col))
\ No newline at end of file
+#include "matrix_transform.h"
\ No newline at end of file
diff --git a/app/include/dt-bindings/zmk/matrix_transform.h b/app/include/dt-bindings/zmk/matrix_transform.h
new file mode 100644
index 000000000..2989cb607
--- /dev/null
+++ b/app/include/dt-bindings/zmk/matrix_transform.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define KT_ROW(item) (item >> 8)
+#define KT_COL(item) (item & 0xFF)
+
+#define RC(row, col) (((row) << 8) + (col))
\ No newline at end of file
diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event_manager.h
similarity index 100%
rename from app/include/zmk/event-manager.h
rename to app/include/zmk/event_manager.h
diff --git a/app/include/zmk/events/activity-state-changed.h b/app/include/zmk/events/activity_state_changed.h
similarity index 94%
rename from app/include/zmk/events/activity-state-changed.h
rename to app/include/zmk/events/activity_state_changed.h
index cd4c618cf..511fbad65 100644
--- a/app/include/zmk/events/activity-state-changed.h
+++ b/app/include/zmk/events/activity_state_changed.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 #include <zmk/activity.h>
 
 struct activity_state_changed {
diff --git a/app/include/zmk/events/battery-state-changed.h b/app/include/zmk/events/battery_state_changed.h
similarity index 90%
rename from app/include/zmk/events/battery-state-changed.h
rename to app/include/zmk/events/battery_state_changed.h
index a983820b9..47e44ba12 100644
--- a/app/include/zmk/events/battery-state-changed.h
+++ b/app/include/zmk/events/battery_state_changed.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 
 struct battery_state_changed {
     struct zmk_event_header header;
diff --git a/app/include/zmk/events/ble-active-profile-changed.h b/app/include/zmk/events/ble_active_profile_changed.h
similarity index 91%
rename from app/include/zmk/events/ble-active-profile-changed.h
rename to app/include/zmk/events/ble_active_profile_changed.h
index 4491dfc57..fa1612668 100644
--- a/app/include/zmk/events/ble-active-profile-changed.h
+++ b/app/include/zmk/events/ble_active_profile_changed.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 #include <device.h>
 
 #include <zmk/ble/profile.h>
diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode_state_changed.h
similarity index 97%
rename from app/include/zmk/events/keycode-state-changed.h
rename to app/include/zmk/events/keycode_state_changed.h
index 7dc87e218..28282b6bd 100644
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode_state_changed.h
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <dt-bindings/zmk/modifiers.h>
 #include <dt-bindings/zmk/hid_usage_pages.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 #include <zmk/keys.h>
 
 struct keycode_state_changed {
diff --git a/app/include/zmk/events/layer-state-changed.h b/app/include/zmk/events/layer_state_changed.h
similarity index 94%
rename from app/include/zmk/events/layer-state-changed.h
rename to app/include/zmk/events/layer_state_changed.h
index 352c60254..cf2400252 100644
--- a/app/include/zmk/events/layer-state-changed.h
+++ b/app/include/zmk/events/layer_state_changed.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 
 struct layer_state_changed {
     struct zmk_event_header header;
diff --git a/app/include/zmk/events/modifiers-state-changed.h b/app/include/zmk/events/modifiers_state_changed.h
similarity index 95%
rename from app/include/zmk/events/modifiers-state-changed.h
rename to app/include/zmk/events/modifiers_state_changed.h
index d2e02f823..c4daede07 100644
--- a/app/include/zmk/events/modifiers-state-changed.h
+++ b/app/include/zmk/events/modifiers_state_changed.h
@@ -8,7 +8,7 @@
 
 #include <zephyr.h>
 #include <zmk/keys.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 
 struct modifiers_state_changed {
     struct zmk_event_header header;
diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position_state_changed.h
similarity index 90%
rename from app/include/zmk/events/position-state-changed.h
rename to app/include/zmk/events/position_state_changed.h
index 7058276e0..0f1ac1b22 100644
--- a/app/include/zmk/events/position-state-changed.h
+++ b/app/include/zmk/events/position_state_changed.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 
 struct position_state_changed {
     struct zmk_event_header header;
diff --git a/app/include/zmk/events/sensor-event.h b/app/include/zmk/events/sensor_event.h
similarity index 91%
rename from app/include/zmk/events/sensor-event.h
rename to app/include/zmk/events/sensor_event.h
index 0bd3ccf08..14fb2d3df 100644
--- a/app/include/zmk/events/sensor-event.h
+++ b/app/include/zmk/events/sensor_event.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 #include <device.h>
 
 struct sensor_event {
diff --git a/app/include/zmk/events/usb-conn-state-changed.h b/app/include/zmk/events/usb_conn_state_changed.h
similarity index 91%
rename from app/include/zmk/events/usb-conn-state-changed.h
rename to app/include/zmk/events/usb_conn_state_changed.h
index d6cc69859..b38fb9fe5 100644
--- a/app/include/zmk/events/usb-conn-state-changed.h
+++ b/app/include/zmk/events/usb_conn_state_changed.h
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <usb/usb_device.h>
 
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 #include <zmk/usb.h>
 
 struct usb_conn_state_changed {
diff --git a/app/src/activity.c b/app/src/activity.c
index c441fa92e..8fe912a3d 100644
--- a/app/src/activity.c
+++ b/app/src/activity.c
@@ -12,10 +12,10 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/event-manager.h>
-#include <zmk/events/activity-state-changed.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/activity_state_changed.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/sensor_event.h>
 
 #include <zmk/activity.h>
 
diff --git a/app/src/battery.c b/app/src/battery.c
index 7a09ad7a4..917af9cfe 100644
--- a/app/src/battery.c
+++ b/app/src/battery.c
@@ -14,8 +14,8 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/event-manager.h>
-#include <zmk/events/battery-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/battery_state_changed.h>
 
 const struct device *battery;
 
diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c
index 556273ec0..d3039605a 100644
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -14,10 +14,10 @@
 #include <zmk/behavior.h>
 #include <zmk/matrix.h>
 #include <zmk/endpoints.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/keycode-state-changed.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/events/modifiers_state_changed.h>
 #include <zmk/behavior.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c
index aa19ca96d..df0828ac8 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -10,8 +10,8 @@
 #include <drivers/behavior.h>
 #include <logging/log.h>
 
-#include <zmk/event-manager.h>
-#include <zmk/events/keycode-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
 #include <zmk/behavior.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c
index a0e0accc2..1e659a15b 100644
--- a/app/src/behaviors/behavior_sensor_rotate_key_press.c
+++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c
@@ -11,8 +11,8 @@
 #include <logging/log.h>
 
 #include <drivers/sensor.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/keycode-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c
index 4695c7ab4..643ae48b5 100644
--- a/app/src/behaviors/behavior_sticky_key.c
+++ b/app/src/behaviors/behavior_sticky_key.c
@@ -13,10 +13,10 @@
 
 #include <zmk/matrix.h>
 #include <zmk/endpoints.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/keycode-state-changed.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/events/modifiers_state_changed.h>
 #include <zmk/hid.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/ble.c b/app/src/ble.c
index 9cfef4b86..4d422877a 100644
--- a/app/src/ble.c
+++ b/app/src/ble.c
@@ -32,8 +32,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/ble.h>
 #include <zmk/keys.h>
 #include <zmk/split/bluetooth/uuid.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/ble-active-profile-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/ble_active_profile_changed.h>
 
 static struct bt_conn *auth_passkey_entry_conn;
 static uint8_t passkey_entries[6] = {0, 0, 0, 0, 0, 0};
diff --git a/app/src/display/main.c b/app/src/display/main.c
index ea1e21ab0..0bef6567f 100644
--- a/app/src/display/main.c
+++ b/app/src/display/main.c
@@ -14,8 +14,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <drivers/display.h>
 #include <lvgl.h>
 
-#include <zmk/event-manager.h>
-#include <zmk/events/activity-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/activity_state_changed.h>
 #include <zmk/display/status_screen.h>
 
 #define ZMK_DISPLAY_NAME CONFIG_LVGL_DISPLAY_DEV_NAME
diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c
index b412da2ba..346c51932 100644
--- a/app/src/display/widgets/battery_status.c
+++ b/app/src/display/widgets/battery_status.c
@@ -11,9 +11,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display/widgets/battery_status.h>
 #include <zmk/usb.h>
-#include <zmk/events/usb-conn-state-changed.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/battery-state-changed.h>
+#include <zmk/events/usb_conn_state_changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/battery_state_changed.h>
 
 static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);
 static lv_style_t label_style;
diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c
index 143c7781b..9a725113d 100644
--- a/app/src/display/widgets/output_status.c
+++ b/app/src/display/widgets/output_status.c
@@ -10,9 +10,9 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display/widgets/output_status.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/usb-conn-state-changed.h>
-#include <zmk/events/ble-active-profile-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/usb_conn_state_changed.h>
+#include <zmk/events/ble_active_profile_changed.h>
 #include <zmk/usb.h>
 #include <zmk/ble.h>
 #include <zmk/endpoints.h>
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index b126f3354..9f32f1976 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -13,9 +13,9 @@
 #include <dt-bindings/zmk/hid_usage_pages.h>
 #include <zmk/usb.h>
 #include <zmk/hog.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/ble-active-profile-changed.h>
-#include <zmk/events/usb-conn-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/ble_active_profile_changed.h>
+#include <zmk/events/usb_conn_state_changed.h>
 
 #include <logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/event_manager.c b/app/src/event_manager.c
index 8c454e9e7..872f5c86a 100644
--- a/app/src/event_manager.c
+++ b/app/src/event_manager.c
@@ -9,7 +9,7 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
 
 extern struct zmk_event_type *__event_type_start[];
 extern struct zmk_event_type *__event_type_end[];
diff --git a/app/src/events/activity_state_changed.c b/app/src/events/activity_state_changed.c
index 47aefea1a..001e6a1a2 100644
--- a/app/src/events/activity_state_changed.c
+++ b/app/src/events/activity_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/activity-state-changed.h>
+#include <zmk/events/activity_state_changed.h>
 
 ZMK_EVENT_IMPL(activity_state_changed);
\ No newline at end of file
diff --git a/app/src/events/battery_state_changed.c b/app/src/events/battery_state_changed.c
index 4b937e341..ed6147a01 100644
--- a/app/src/events/battery_state_changed.c
+++ b/app/src/events/battery_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/battery-state-changed.h>
+#include <zmk/events/battery_state_changed.h>
 
 ZMK_EVENT_IMPL(battery_state_changed);
\ No newline at end of file
diff --git a/app/src/events/ble_active_profile_changed.c b/app/src/events/ble_active_profile_changed.c
index 06988e237..e2d172fd7 100644
--- a/app/src/events/ble_active_profile_changed.c
+++ b/app/src/events/ble_active_profile_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/ble-active-profile-changed.h>
+#include <zmk/events/ble_active_profile_changed.h>
 
 ZMK_EVENT_IMPL(ble_active_profile_changed);
\ No newline at end of file
diff --git a/app/src/events/keycode_state_changed.c b/app/src/events/keycode_state_changed.c
index 9a1984a31..d46126be0 100644
--- a/app/src/events/keycode_state_changed.c
+++ b/app/src/events/keycode_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/keycode-state-changed.h>
+#include <zmk/events/keycode_state_changed.h>
 
 ZMK_EVENT_IMPL(keycode_state_changed);
diff --git a/app/src/events/layer_state_changed.c b/app/src/events/layer_state_changed.c
index e45671150..e7f8039ce 100644
--- a/app/src/events/layer_state_changed.c
+++ b/app/src/events/layer_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/layer-state-changed.h>
+#include <zmk/events/layer_state_changed.h>
 
 ZMK_EVENT_IMPL(layer_state_changed);
\ No newline at end of file
diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c
index 8becd02f4..4143796e0 100644
--- a/app/src/events/modifiers_state_changed.c
+++ b/app/src/events/modifiers_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/events/modifiers_state_changed.h>
 
 ZMK_EVENT_IMPL(modifiers_state_changed);
\ No newline at end of file
diff --git a/app/src/events/position_state_changed.c b/app/src/events/position_state_changed.c
index f8f1a2681..b80314b9e 100644
--- a/app/src/events/position_state_changed.c
+++ b/app/src/events/position_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/events/position_state_changed.h>
 
 ZMK_EVENT_IMPL(position_state_changed);
\ No newline at end of file
diff --git a/app/src/events/sensor_event.c b/app/src/events/sensor_event.c
index c6b80cd64..6811e7ddc 100644
--- a/app/src/events/sensor_event.c
+++ b/app/src/events/sensor_event.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/events/sensor_event.h>
 
 ZMK_EVENT_IMPL(sensor_event);
\ No newline at end of file
diff --git a/app/src/events/usb_conn_state_changed.c b/app/src/events/usb_conn_state_changed.c
index d845f6d72..c299da7a8 100644
--- a/app/src/events/usb_conn_state_changed.c
+++ b/app/src/events/usb_conn_state_changed.c
@@ -5,6 +5,6 @@
  */
 
 #include <kernel.h>
-#include <zmk/events/usb-conn-state-changed.h>
+#include <zmk/events/usb_conn_state_changed.h>
 
 ZMK_EVENT_IMPL(usb_conn_state_changed);
\ No newline at end of file
diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c
index 534831cce..cf8835a2f 100644
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@@ -9,9 +9,9 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/event-manager.h>
-#include <zmk/events/keycode-state-changed.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/events/modifiers_state_changed.h>
 #include <zmk/hid.h>
 #include <dt-bindings/zmk/hid_usage_pages.h>
 #include <zmk/endpoints.h>
diff --git a/app/src/keymap.c b/app/src/keymap.c
index cab6d474b..cafe2ffe7 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -14,10 +14,10 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <drivers/behavior.h>
 #include <zmk/behavior.h>
 
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/layer-state-changed.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/layer_state_changed.h>
+#include <zmk/events/sensor_event.h>
 
 static zmk_keymap_layers_state _zmk_keymap_layer_state = 0;
 static uint8_t _zmk_keymap_layer_default = 0;
diff --git a/app/src/kscan.c b/app/src/kscan.c
index c22d71b42..6b84490a8 100644
--- a/app/src/kscan.c
+++ b/app/src/kscan.c
@@ -12,8 +12,8 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/matrix_transform.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
 
 #define ZMK_KSCAN_EVENT_STATE_PRESSED 0
 #define ZMK_KSCAN_EVENT_STATE_RELEASED 1
diff --git a/app/src/matrix_transform.c b/app/src/matrix_transform.c
index 33be93d39..8f54f3123 100644
--- a/app/src/matrix_transform.c
+++ b/app/src/matrix_transform.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <zmk/matrix_transform.h>
 #include <zmk/matrix.h>
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 #ifdef ZMK_KEYMAP_TRANSFORM_NODE
 
diff --git a/app/src/sensors.c b/app/src/sensors.c
index 5b4f683b4..5e9ef150a 100644
--- a/app/src/sensors.c
+++ b/app/src/sensors.c
@@ -13,8 +13,8 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/sensors.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/sensor_event.h>
 
 #if ZMK_KEYMAP_HAS_SENSORS
 
diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c
index c41894f22..5ad83ad2e 100644
--- a/app/src/split/bluetooth/central.c
+++ b/app/src/split/bluetooth/central.c
@@ -19,8 +19,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/ble.h>
 #include <zmk/split/bluetooth/uuid.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
 #include <init.h>
 
 static int start_scan(void);
diff --git a/app/src/split_listener.c b/app/src/split_listener.c
index b2adfb2eb..153ed99d9 100644
--- a/app/src/split_listener.c
+++ b/app/src/split_listener.c
@@ -14,8 +14,8 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
 #include <zmk/hid.h>
 #include <zmk/endpoints.h>
 
diff --git a/app/src/usb.c b/app/src/usb.c
index 2b3de782a..7900acefa 100644
--- a/app/src/usb.c
+++ b/app/src/usb.c
@@ -12,8 +12,8 @@
 
 #include <zmk/hid.h>
 #include <zmk/keymap.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/usb-conn-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/usb_conn_state_changed.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap b/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
index 10336ef30..040cdd3ee 100644
--- a/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
index aa93b8620..11d033f40 100644
--- a/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
index 6f08689b9..abb31b4b3 100644
--- a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
index 392d328b7..38575e9a2 100644
--- a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
index 77306cd07..21baa447e 100644
--- a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
index 144133118..cd7ff384b 100644
--- a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
index c10c6d640..b84aa6265 100644
--- a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
index ce163f535..bdfaf9d3d 100644
--- a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
index 7abda41a5..c0fd1bd18 100644
--- a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
index ce030af37..69c19676e 100644
--- a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
index 546766000..301ef0ac5 100644
--- a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/balanced/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/behavior_keymap.dtsi
index 7d18bb6eb..34a4d4584 100644
--- a/app/tests/hold-tap/balanced/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/balanced/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	behaviors {
diff --git a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap b/app/tests/hold-tap/balanced/many-nested/native_posix.keymap
index f51ffb56f..7941e4d35 100644
--- a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/many-nested/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	behaviors {
diff --git a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
index 10336ef30..040cdd3ee 100644
--- a/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
index aa93b8620..11d033f40 100644
--- a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
index 6f08689b9..abb31b4b3 100644
--- a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
index 392d328b7..38575e9a2 100644
--- a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
index 77306cd07..21baa447e 100644
--- a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
index 144133118..cd7ff384b 100644
--- a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
index c10c6d640..b84aa6265 100644
--- a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
index ce163f535..bdfaf9d3d 100644
--- a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
index 7abda41a5..c0fd1bd18 100644
--- a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
index ce030af37..69c19676e 100644
--- a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
index 546766000..301ef0ac5 100644
--- a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
index 64847a577..e61431952 100644
--- a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 
diff --git a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
index 10336ef30..040cdd3ee 100644
--- a/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
index aa93b8620..11d033f40 100644
--- a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
index 6f08689b9..abb31b4b3 100644
--- a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
index 392d328b7..38575e9a2 100644
--- a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
index 77306cd07..21baa447e 100644
--- a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
index 144133118..cd7ff384b 100644
--- a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
index c10c6d640..b84aa6265 100644
--- a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
index ce163f535..bdfaf9d3d 100644
--- a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
index 7abda41a5..c0fd1bd18 100644
--- a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
index ce030af37..69c19676e 100644
--- a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
index 546766000..301ef0ac5 100644
--- a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
+++ b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
index 6e91466d8..e6d33c0b6 100644
--- a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	behaviors {
diff --git a/app/tests/keypress/behavior_keymap.dtsi b/app/tests/keypress/behavior_keymap.dtsi
index 64851a845..f0c5d0c2f 100644
--- a/app/tests/keypress/behavior_keymap.dtsi
+++ b/app/tests/keypress/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap
index 1f3502d60..26af56570 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-dn-lctl-up-lctl-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap
index 9c7d7c834..9df2c1527 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lctl-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap
index 34bb522b1..5f9375fb8 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lctl-up-lsft-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap
index 68e4de730..1b175d445 100644
--- a/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/explicit/kp-lctl-dn-lsft-dn-lsft-up-lctl-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap
index 73fa7cc89..0e9a2d6a8 100644
--- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap
+++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod1-up-mod2-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap
index 109d60e54..10d0dbf8c 100644
--- a/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap
+++ b/app/tests/modifiers/implicit/kp-mod1-dn-mod2-dn-mod2-up-mod1-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap
index 09816d94e..3d6494dd8 100644
--- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap
+++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-lctl-up-mod-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap
index 1de00a0ef..d5f372f19 100644
--- a/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap
+++ b/app/tests/modifiers/mixed/kp-lctl-dn-mod-dn-mod-up-lctl-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 
 &kscan {
diff --git a/app/tests/momentary-layer/1-normal/native_posix.keymap b/app/tests/momentary-layer/1-normal/native_posix.keymap
index 2fc24d2bc..b5249f7b7 100644
--- a/app/tests/momentary-layer/1-normal/native_posix.keymap
+++ b/app/tests/momentary-layer/1-normal/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 / {
diff --git a/app/tests/momentary-layer/2-early-key-release/native_posix.keymap b/app/tests/momentary-layer/2-early-key-release/native_posix.keymap
index 9ffa5f6e7..96e4e8d96 100644
--- a/app/tests/momentary-layer/2-early-key-release/native_posix.keymap
+++ b/app/tests/momentary-layer/2-early-key-release/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 / {
diff --git a/app/tests/momentary-layer/3-covered/native_posix.keymap b/app/tests/momentary-layer/3-covered/native_posix.keymap
index 2484d8b8a..2dde6d88c 100644
--- a/app/tests/momentary-layer/3-covered/native_posix.keymap
+++ b/app/tests/momentary-layer/3-covered/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 /*
 this test verifies that the correct key is released when a layer is enabled "on top"
diff --git a/app/tests/momentary-layer/4-nested/native_posix.keymap b/app/tests/momentary-layer/4-nested/native_posix.keymap
index 0eb77d209..fd376d000 100644
--- a/app/tests/momentary-layer/4-nested/native_posix.keymap
+++ b/app/tests/momentary-layer/4-nested/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap b/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap
index a67035bf6..c467aea35 100644
--- a/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap
+++ b/app/tests/momentary-layer/5-nested-early-key-release/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/momentary-layer/behavior_keymap.dtsi b/app/tests/momentary-layer/behavior_keymap.dtsi
index a5b6c12b7..40bc31ecb 100644
--- a/app/tests/momentary-layer/behavior_keymap.dtsi
+++ b/app/tests/momentary-layer/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/none/behavior_keymap.dtsi b/app/tests/none/behavior_keymap.dtsi
index 0a4f7cb72..40d863c14 100644
--- a/app/tests/none/behavior_keymap.dtsi
+++ b/app/tests/none/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/none/layered/native_posix.keymap b/app/tests/none/layered/native_posix.keymap
index 59ea4811e..597ca2db7 100644
--- a/app/tests/none/layered/native_posix.keymap
+++ b/app/tests/none/layered/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/none/normal/native_posix.keymap b/app/tests/none/normal/native_posix.keymap
index 94d7539cf..cbeb61dc4 100644
--- a/app/tests/none/normal/native_posix.keymap
+++ b/app/tests/none/normal/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap b/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap
index dd2e6ea56..d0f26b2f7 100644
--- a/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap
+++ b/app/tests/sticky-keys/1-os-dn-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap
index c96eb9f9f..2d078ba5f 100644
--- a/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/2-os-dn-up-kcdn-kcup/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap
index 3c33908fc..438880d5e 100644
--- a/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap
+++ b/app/tests/sticky-keys/3a-os-dn-kcdn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap
index e9290a31f..067f23793 100644
--- a/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/3b-os-dn-kcdn-up-kcup/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap
index 84daad69f..d58641bd8 100644
--- a/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap
+++ b/app/tests/sticky-keys/4-os-dn-up-kcdn-timer-kcup/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap
index 71a0a1bba..aac6725e5 100644
--- a/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap
+++ b/app/tests/sticky-keys/5-os-kcdn-dn-kcup-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap
index 7a9901bf4..66bb72d81 100644
--- a/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap
+++ b/app/tests/sticky-keys/7-os-dn-up-kc1dn-kc2dn-kc1up-kc2up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap
index 45cef5019..beedd44ed 100644
--- a/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap
+++ b/app/tests/sticky-keys/8-lsk-osk-combination/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap
index 2fcc3ff65..d4c30fbf9 100644
--- a/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap
+++ b/app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/sticky-keys/behavior_keymap.dtsi b/app/tests/sticky-keys/behavior_keymap.dtsi
index ae463966f..f12770093 100644
--- a/app/tests/sticky-keys/behavior_keymap.dtsi
+++ b/app/tests/sticky-keys/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/toggle-layer/behavior_keymap.dtsi b/app/tests/toggle-layer/behavior_keymap.dtsi
index 2523d867f..b9c0d4a46 100644
--- a/app/tests/toggle-layer/behavior_keymap.dtsi
+++ b/app/tests/toggle-layer/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/toggle-layer/early-key-release/native_posix.keymap b/app/tests/toggle-layer/early-key-release/native_posix.keymap
index 6b2b8f201..6c2933900 100644
--- a/app/tests/toggle-layer/early-key-release/native_posix.keymap
+++ b/app/tests/toggle-layer/early-key-release/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/toggle-layer/normal/native_posix.keymap b/app/tests/toggle-layer/normal/native_posix.keymap
index 202c105cf..9df9d649c 100644
--- a/app/tests/toggle-layer/normal/native_posix.keymap
+++ b/app/tests/toggle-layer/normal/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/transparent/behavior_keymap.dtsi b/app/tests/transparent/behavior_keymap.dtsi
index d6c5e27fb..2a7e783ab 100644
--- a/app/tests/transparent/behavior_keymap.dtsi
+++ b/app/tests/transparent/behavior_keymap.dtsi
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 
 / {
 	keymap {
diff --git a/app/tests/transparent/layered/native_posix.keymap b/app/tests/transparent/layered/native_posix.keymap
index 59ea4811e..597ca2db7 100644
--- a/app/tests/transparent/layered/native_posix.keymap
+++ b/app/tests/transparent/layered/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/app/tests/transparent/normal/native_posix.keymap b/app/tests/transparent/normal/native_posix.keymap
index 94d7539cf..cbeb61dc4 100644
--- a/app/tests/transparent/normal/native_posix.keymap
+++ b/app/tests/transparent/normal/native_posix.keymap
@@ -1,6 +1,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan_mock.h>
 #include "../behavior_keymap.dtsi"
 
 &kscan {
diff --git a/docs/docs/development/new-shield.md b/docs/docs/development/new-shield.md
index 306f1b3fe..18f8b4203 100644
--- a/docs/docs/development/new-shield.md
+++ b/docs/docs/development/new-shield.md
@@ -163,7 +163,7 @@ It is preferred to define only the `col-gpios` or `row-gpios` in the common shie
 For `col2row` directed boards like the iris, the shared .dtsi file may look like this:
 
 ```
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
@@ -315,7 +315,7 @@ Whenever that default key position mapping is insufficient, the `<shield_name>.o
 Here is an example for the [nice60](https://github.com/Nicell/nice60), which uses an efficient 8x8 GPIO matrix, and uses a transform:
 
 ```
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
 
 / {
 	chosen {
@@ -344,7 +344,7 @@ RC(7,0)    RC(7,1)   RC(7,2)                     RC(7,3)                    RC(7
 
 Some important things to note:
 
-- The `#include <dt-bindings/zmk/matrix-transform.h>` is critical. The `RC` macro is used to generate the internal storage in the matrix transform, and is actually replaced by a C preprocessor before the final devicetree is compiled into ZMK.
+- The `#include <dt-bindings/zmk/matrix_transform.h>` is critical. The `RC` macro is used to generate the internal storage in the matrix transform, and is actually replaced by a C preprocessor before the final devicetree is compiled into ZMK.
 - `RC(row, column)` is placed sequentially to define what row and column values that position corresponds to.
 - If you have a keyboard with options for `2u` keys in certain positions, or break away portions, it is a good idea to set the chosen `zmk,matrix_transform` to the default arrangement, and include _other_ possible matrix transform nodes in the devicetree that users can select in their user config by overriding the chosen node.