diff --git a/app/tests/dynamic-macros/basic/keycode_events.snapshot b/app/tests/dynamic-macros/basic/keycode_events.snapshot
index 2be6ee25d..d5403c7d3 100644
--- a/app/tests/dynamic-macros/basic/keycode_events.snapshot
+++ b/app/tests/dynamic-macros/basic/keycode_events.snapshot
@@ -8,21 +8,21 @@ kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 mac_pressed: Recording Status: 0
 mac_pressed: Playing Dynamic Macro
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
diff --git a/app/tests/dynamic-macros/call-macro/keycode_events.snapshot b/app/tests/dynamic-macros/call-macro/keycode_events.snapshot
index fb128a85b..cc79923fd 100644
--- a/app/tests/dynamic-macros/call-macro/keycode_events.snapshot
+++ b/app/tests/dynamic-macros/call-macro/keycode_events.snapshot
@@ -1,40 +1,40 @@
 mac_pressed: Recording Status: 1
 mac_pressed: Recording new macro: 0
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
 mac_pressed: Recording Status: 0
 mac_pressed: Playing Dynamic Macro
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
diff --git a/app/tests/dynamic-macros/interrupt/keycode_events.snapshot b/app/tests/dynamic-macros/interrupt/keycode_events.snapshot
index 2be6ee25d..d5403c7d3 100644
--- a/app/tests/dynamic-macros/interrupt/keycode_events.snapshot
+++ b/app/tests/dynamic-macros/interrupt/keycode_events.snapshot
@@ -8,21 +8,21 @@ kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 mac_pressed: Recording Status: 0
 mac_pressed: Playing Dynamic Macro
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 10ms
diff --git a/app/tests/dynamic-macros/recorded-time/keycode_events.snapshot b/app/tests/dynamic-macros/recorded-time/keycode_events.snapshot
index e8d346357..70b8ed8d0 100644
--- a/app/tests/dynamic-macros/recorded-time/keycode_events.snapshot
+++ b/app/tests/dynamic-macros/recorded-time/keycode_events.snapshot
@@ -8,21 +8,21 @@ kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 mac_pressed: Recording Status: 0
 mac_pressed: Playing Dynamic Macro
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 11ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 1001ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 11ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 1001ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 11ms
-queue_process_next: Invoking KEY_PRESS: 0x70004 0x00
+queue_process_next: Invoking key_press: 0x70004 0x00
 kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
 queue_process_next: Processing next queued behavior in 0ms