diff --git a/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
index e6754b71128..3438f9bc77d 100644
--- a/app/tests/combo/combos-and-holdtaps-0/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-0/native_posix_64.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>
 
 &mt {
     flavor = "hold-preferred";
diff --git a/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
index 9538243291c..9120e8c3b4a 100644
--- a/app/tests/combo/combos-and-holdtaps-1/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-1/native_posix_64.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>
 
 &mt {
     flavor = "hold-preferred";
diff --git a/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
index d6d187e2046..a227fe4c91f 100644
--- a/app/tests/combo/combos-and-holdtaps-2/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-2/native_posix_64.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>
 
 &mt {
     flavor = "hold-preferred";
diff --git a/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap
index f1c7eee7087..4fbf24071e6 100644
--- a/app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-3/native_posix_64.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>
 
 &mt {
     flavor = "hold-preferred";
diff --git a/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
index 134b77dfa34..59f4391f288 100644
--- a/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
+++ b/app/tests/combo/combos-and-holdtaps-4/native_posix_64.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>
 
 
 #define ZMK_COMBO(name, combo_bindings, keypos, combo_term) \
diff --git a/app/tests/combo/layer-filter-0/native_posix_64.keymap b/app/tests/combo/layer-filter-0/native_posix_64.keymap
index 8d94872b658..68077849a34 100644
--- a/app/tests/combo/layer-filter-0/native_posix_64.keymap
+++ b/app/tests/combo/layer-filter-0/native_posix_64.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>
 
 /* it is useful to set timeout to a large value when attaching a debugger. */
 #define TIMEOUT (60*60*1000)
diff --git a/app/tests/combo/layer-filter-1/native_posix_64.keymap b/app/tests/combo/layer-filter-1/native_posix_64.keymap
index 96eccea4ea8..a11b86ad4d9 100644
--- a/app/tests/combo/layer-filter-1/native_posix_64.keymap
+++ b/app/tests/combo/layer-filter-1/native_posix_64.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>
 
 /* it is useful to set timeout to a large value when attaching a debugger. */
 #define TIMEOUT (60*60*1000)
diff --git a/app/tests/combo/multiple-timeouts/native_posix_64.keymap b/app/tests/combo/multiple-timeouts/native_posix_64.keymap
index d2176390403..a2edc32fcc3 100644
--- a/app/tests/combo/multiple-timeouts/native_posix_64.keymap
+++ b/app/tests/combo/multiple-timeouts/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/overlapping-combos-0/native_posix_64.keymap b/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
index e82846652d3..e89a3f22d33 100644
--- a/app/tests/combo/overlapping-combos-0/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-0/native_posix_64.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>
 
 /*
     combo 0 timeout inf
diff --git a/app/tests/combo/overlapping-combos-1/native_posix_64.keymap b/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
index a695a388c66..4b0166bee15 100644
--- a/app/tests/combo/overlapping-combos-1/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-1/native_posix_64.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>
 
 /*
     combo 01 timeout 50
diff --git a/app/tests/combo/overlapping-combos-2/native_posix_64.keymap b/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
index 6bf0e7100cd..5c38bcfc403 100644
--- a/app/tests/combo/overlapping-combos-2/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-2/native_posix_64.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>
 
 /*
     combo 01 timeout 100
diff --git a/app/tests/combo/overlapping-combos-3/native_posix_64.keymap b/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
index 0a2f5ee137f..48e3397f4a6 100644
--- a/app/tests/combo/overlapping-combos-3/native_posix_64.keymap
+++ b/app/tests/combo/overlapping-combos-3/native_posix_64.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>
 
 /*
     combo 12 timeout 100
diff --git a/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap b/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
index 900c4af3f1e..55e8f1e77b6 100644
--- a/app/tests/combo/partially-overlapping-combos/native_posix_64.keymap
+++ b/app/tests/combo/partially-overlapping-combos/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap b/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
index dac0bd5ca4c..da2e9483ff7 100644
--- a/app/tests/combo/press-release-long-combo-complete/native_posix_64.keymap
+++ b/app/tests/combo/press-release-long-combo-complete/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap b/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
index 19bad1d0d1d..b1494cecf20 100644
--- a/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.keymap
+++ b/app/tests/combo/press-release-long-combo-incomplete/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap b/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
index 2eb6271e2f0..8769286413b 100644
--- a/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.keymap
+++ b/app/tests/combo/press-release-long-combo-wrong-last-key/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press-release/native_posix_64.keymap b/app/tests/combo/press-release/native_posix_64.keymap
index 6bd432f9c86..26cd241b0bb 100644
--- a/app/tests/combo/press-release/native_posix_64.keymap
+++ b/app/tests/combo/press-release/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press-timeout/native_posix_64.keymap b/app/tests/combo/press-timeout/native_posix_64.keymap
index 6ca6487ba93..a71de45a7d2 100644
--- a/app/tests/combo/press-timeout/native_posix_64.keymap
+++ b/app/tests/combo/press-timeout/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap b/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
index 9a395a41468..2e0a67a3e7f 100644
--- a/app/tests/combo/press1-press2-release1-release2/native_posix_64.keymap
+++ b/app/tests/combo/press1-press2-release1-release2/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap b/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
index 86ca3931dce..8d4838eb511 100644
--- a/app/tests/combo/press1-press2-release2-release1/native_posix_64.keymap
+++ b/app/tests/combo/press1-press2-release2-release1/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap b/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
index 650895784ae..9c75e5705b1 100644
--- a/app/tests/combo/press1-release1-press2-release2/native_posix_64.keymap
+++ b/app/tests/combo/press1-release1-press2-release2/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/slowrelease-disabled/native_posix_64.keymap b/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
index 832e9705897..46b35be02ee 100644
--- a/app/tests/combo/slowrelease-disabled/native_posix_64.keymap
+++ b/app/tests/combo/slowrelease-disabled/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/combo/slowrelease-enabled/native_posix_64.keymap b/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
index 7fdb012ed15..d64876da557 100644
--- a/app/tests/combo/slowrelease-enabled/native_posix_64.keymap
+++ b/app/tests/combo/slowrelease-enabled/native_posix_64.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>
 
 / {
     combos {
diff --git a/app/tests/gresc/gresc-press-release/native_posix_64.keymap b/app/tests/gresc/gresc-press-release/native_posix_64.keymap
index 5e3fac42c72..c472dd6d4ad 100644
--- a/app/tests/gresc/gresc-press-release/native_posix_64.keymap
+++ b/app/tests/gresc/gresc-press-release/native_posix_64.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/gresc/gresc-two-instances/native_posix_64.keymap b/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
index 18f94da5771..14adcf45c8e 100644
--- a/app/tests/gresc/gresc-two-instances/native_posix_64.keymap
+++ b/app/tests/gresc/gresc-two-instances/native_posix_64.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 checks nothing breaks if two grave-escapes are pressed at the same time.
diff --git a/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap b/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
index 621945a8218..72b218f510f 100644
--- a/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.keymap
+++ b/app/tests/modifiers/explicit/kp-hyper-dn-a-dn-a-up-hyper-up/native_posix_64.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/sticky-keys/10-sl-sl-kp/native_posix_64.keymap b/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
index 23ceeeb6161..bafdbe38d39 100644
--- a/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.keymap
+++ b/app/tests/sticky-keys/10-sl-sl-kp/native_posix_64.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>
 
 /*
  sticky layers should quick-release.
diff --git a/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap b/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
index 390207515dd..38c8fb4c91c 100644
--- a/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.keymap
+++ b/app/tests/sticky-keys/2-sl-dn-up-kcdn-kcup/native_posix_64.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>
 
 /*
  sticky layers should quick-release.
diff --git a/app/tests/to-layer/behavior_keymap.dtsi b/app/tests/to-layer/behavior_keymap.dtsi
index 663e897d74b..7dc857fe143 100644
--- a/app/tests/to-layer/behavior_keymap.dtsi
+++ b/app/tests/to-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/to-layer/normal/native_posix_64.keymap b/app/tests/to-layer/normal/native_posix_64.keymap
index 4cb23809452..6ccc9088bb2 100644
--- a/app/tests/to-layer/normal/native_posix_64.keymap
+++ b/app/tests/to-layer/normal/native_posix_64.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"
 
 // Press key A