diff --git a/app/tests/hold-tap/balanced/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/behavior_keymap.dtsi
index df56fb5b75..7d18bb6ebb 100644
--- a/app/tests/hold-tap/balanced/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/balanced/behavior_keymap.dtsi
@@ -20,8 +20,8 @@
 
 		default_layer {
 			bindings = <
-				&ht_bal LSFT F &ht_bal LCTL J
-				&kp D &kp RCTL>;
+				&ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL J
+				&kp D &kp RIGHT_CONTROL>;
 		};
 	};
 };
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 3cb04c349d..f51ffb56f8 100644
--- a/app/tests/hold-tap/balanced/many-nested/native_posix.keymap
+++ b/app/tests/hold-tap/balanced/many-nested/native_posix.keymap
@@ -20,8 +20,8 @@
 
 		default_layer {
 			bindings = <
-				&ht_bal LSFT F &ht_bal LCTL J 
-				&ht_bal LGUI H &ht_bal LALT L
+				&ht_bal LEFT_SHIFT F &ht_bal LEFT_CONTROL J 
+				&ht_bal LEFT_GUI H &ht_bal LEFT_ALT L
 			>;
 		};
 	};
diff --git a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
index 375ffd93ea..64847a5773 100644
--- a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi
@@ -22,8 +22,8 @@
 
 		default_layer {
 			bindings = <
-				&ht_hold LSFT F &ht_hold LCTL J
-				&kp D &kp RCTL>;
+				&ht_hold LEFT_SHIFT F &ht_hold LEFT_CONTROL J
+				&kp D &kp RIGHT_CONTROL>;
 		};
 	};
 };
diff --git a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
index e514fa6567..6e91466d80 100644
--- a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
+++ b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi
@@ -20,8 +20,8 @@
 
 		default_layer {
 			bindings = <
-				&tp LSFT F &tp LCTL J
-				&kp D &kp RCTL>;
+				&tp LEFT_SHIFT F &tp LEFT_CONTROL J
+				&kp D &kp RIGHT_CONTROL>;
 		};
 	};
 };
diff --git a/app/tests/keypress/behavior_keymap.dtsi b/app/tests/keypress/behavior_keymap.dtsi
index 3a4580925b..2e45ca090e 100644
--- a/app/tests/keypress/behavior_keymap.dtsi
+++ b/app/tests/keypress/behavior_keymap.dtsi
@@ -10,7 +10,7 @@
 		default_layer {
 			bindings = <
 				&kp B &none
-				&cp M_NEXT &none>;
+				&cp C_NEXT &none>;
 		};
 	};
 };
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 6150094690..1f3502d60e 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
@@ -19,8 +19,8 @@
 
 		default_layer {
 			bindings = <
-				&kp LCTL &kp LCTL
-				&kp LSFT &none
+				&kp LEFT_CONTROL &kp LEFT_CONTROL
+				&kp LEFT_SHIFT &none
 			>;
 		};
 	};
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 3324584dc9..9c7d7c834f 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
@@ -17,8 +17,8 @@
 
 		default_layer {
 			bindings = <
-				&kp LCTL &kp LCTL
-				&kp LSFT &none
+				&kp LEFT_CONTROL &kp LEFT_CONTROL
+				&kp LEFT_SHIFT &none
 			>;
 		};
 	};
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 b6f9631196..34bb522b11 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
@@ -19,8 +19,8 @@
 
 		default_layer {
 			bindings = <
-				&kp LCTL &kp LCTL
-				&kp LSFT &none
+				&kp LEFT_CONTROL &kp LEFT_CONTROL
+				&kp LEFT_SHIFT &none
 			>;
 		};
 	};
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 3fedad2519..68e4de7301 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
@@ -20,8 +20,8 @@
 
 		default_layer {
 			bindings = <
-				&kp LCTL &kp LCTL
-				&kp LSFT &none
+				&kp LEFT_CONTROL &kp LEFT_CONTROL
+				&kp LEFT_SHIFT &none
 			>;
 		};
 	};
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 c603c0094b..73fa7cc89a 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
@@ -20,7 +20,7 @@
 		default_layer {
 			bindings = <
 				&kp LC(A) &kp LS(B)
-				&kp LCTL &none
+				&kp LEFT_CONTROL &none
 			>;
 		};
 	};
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 d381e4bf1a..09816d94ef 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
@@ -20,7 +20,7 @@
 		default_layer {
 			bindings = <
 				&kp LC(A) &kp LS(B)
-				&kp LCTL &none
+				&kp LEFT_CONTROL &none
 			>;
 		};
 	};
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 b47b5f7edd..1de00a0ef3 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
@@ -20,7 +20,7 @@
 		default_layer {
 			bindings = <
 				&kp LC(A) &kp LS(B)
-				&kp LCTL &none
+				&kp LEFT_CONTROL &none
 			>;
 		};
 	};
diff --git a/app/tests/momentary-layer/behavior_keymap.dtsi b/app/tests/momentary-layer/behavior_keymap.dtsi
index 34c445cff4..cdc37a79b5 100644
--- a/app/tests/momentary-layer/behavior_keymap.dtsi
+++ b/app/tests/momentary-layer/behavior_keymap.dtsi
@@ -15,7 +15,7 @@
 
 		lower_layer {
 			bindings = <
-				&cp M_NEXT &trans
+				&cp C_NEXT &trans
 				&kp L  &kp J>;
 		};
 
diff --git a/app/tests/toggle-layer/behavior_keymap.dtsi b/app/tests/toggle-layer/behavior_keymap.dtsi
index d2b41a9a6a..5098785dc0 100644
--- a/app/tests/toggle-layer/behavior_keymap.dtsi
+++ b/app/tests/toggle-layer/behavior_keymap.dtsi
@@ -15,7 +15,7 @@
 
 		lower_layer {
 			bindings = <
-				&cp M_NEXT &trans
+				&cp C_NEXT &trans
 				&kp L  &kp J>;
 		};