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 e6754b71..3438f9bc 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 95382432..9120e8c3 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 d6d187e2..a227fe4c 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 f1c7eee7..4fbf2407 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 134b77df..59f4391f 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 8d94872b..68077849 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 96eccea4..a11b86ad 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 d2176390..a2edc32f 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 e8284665..e89a3f22 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 a695a388..4b0166be 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 6bf0e710..5c38bcfc 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 0a2f5ee1..48e3397f 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 900c4af3..55e8f1e7 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 dac0bd5c..da2e9483 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 19bad1d0..b1494cec 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 2eb6271e..87692864 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 6bd432f9..26cd241b 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 6ca6487b..a71de45a 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 9a395a41..2e0a67a3 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 86ca3931..8d4838eb 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 65089578..9c75e570 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 832e9705..46b35be0 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 7fdb012e..d64876da 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 5e3fac42..c472dd6d 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 18f94da5..14adcf45 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 621945a8..72b218f5 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 23ceeeb6..bafdbe38 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 39020751..38c8fb4c 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 663e897d..7dc857fe 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 4cb23809..6ccc9088 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