4 files changed, 23 insertions, 23 deletions
diff --git a/tests/tap_dance/examples.c b/tests/tap_dance/examples.c
index 5377b397d3..4b6bdb2090 100644
--- a/tests/tap_dance/examples.c
+++ b/tests/tap_dance/examples.c
@@ -16,6 +16,7 @@
 
 #include "quantum.h"
 #include "examples.h"
+#include "keymap_introspection.h"
 
 // Example code from the tap dance documentation, adapted for testing
 
@@ -83,7 +84,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     switch (keycode) {
         case TD(CT_CLN):
-            action = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(keycode)];
+            action = tap_dance_get(QK_TAP_DANCE_GET_INDEX(keycode));
             if (!record->event.pressed && action->state.count && !action->state.finished) {
                 tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
                 tap_code16(tap_hold->tap);
diff --git a/tests/tap_dance/tap_dance_layers/test.mk b/tests/tap_dance/tap_dance_layers/test.mk
index b4cdc9b088..a677fda648 100644
--- a/tests/tap_dance/tap_dance_layers/test.mk
+++ b/tests/tap_dance/tap_dance_layers/test.mk
@@ -7,4 +7,4 @@
 
 TAP_DANCE_ENABLE = yes
 
-SRC += tap_dance_defs.c
+INTROSPECTION_KEYMAP_C = tap_dance_defs.c
diff --git a/tests/tap_dance/test.mk b/tests/tap_dance/test.mk
index 041d9b4dc9..0e727da9e8 100644
--- a/tests/tap_dance/test.mk
+++ b/tests/tap_dance/test.mk
@@ -18,5 +18,4 @@
 # --------------------------------------------------------------------------------
 
 TAP_DANCE_ENABLE = yes
-
-SRC += examples.c
+INTROSPECTION_KEYMAP_C = examples.c
diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
index 18dd536027..4c28ab4d20 100644
--- a/tests/test_common/keycode_table.cpp
+++ b/tests/test_common/keycode_table.cpp
@@ -225,25 +225,25 @@ std::map<uint16_t, std::string> KEYCODE_ID_TABLE = {
     {KC_ASSISTANT, "KC_ASSISTANT"},
     {KC_MISSION_CONTROL, "KC_MISSION_CONTROL"},
     {KC_LAUNCHPAD, "KC_LAUNCHPAD"},
-    {KC_MS_UP, "KC_MS_UP"},
-    {KC_MS_DOWN, "KC_MS_DOWN"},
-    {KC_MS_LEFT, "KC_MS_LEFT"},
-    {KC_MS_RIGHT, "KC_MS_RIGHT"},
-    {KC_MS_BTN1, "KC_MS_BTN1"},
-    {KC_MS_BTN2, "KC_MS_BTN2"},
-    {KC_MS_BTN3, "KC_MS_BTN3"},
-    {KC_MS_BTN4, "KC_MS_BTN4"},
-    {KC_MS_BTN5, "KC_MS_BTN5"},
-    {KC_MS_BTN6, "KC_MS_BTN6"},
-    {KC_MS_BTN7, "KC_MS_BTN7"},
-    {KC_MS_BTN8, "KC_MS_BTN8"},
-    {KC_MS_WH_UP, "KC_MS_WH_UP"},
-    {KC_MS_WH_DOWN, "KC_MS_WH_DOWN"},
-    {KC_MS_WH_LEFT, "KC_MS_WH_LEFT"},
-    {KC_MS_WH_RIGHT, "KC_MS_WH_RIGHT"},
-    {KC_MS_ACCEL0, "KC_MS_ACCEL0"},
-    {KC_MS_ACCEL1, "KC_MS_ACCEL1"},
-    {KC_MS_ACCEL2, "KC_MS_ACCEL2"},
+    {QK_MOUSE_CURSOR_UP, "QK_MOUSE_CURSOR_UP"},
+    {QK_MOUSE_CURSOR_DOWN, "QK_MOUSE_CURSOR_DOWN"},
+    {QK_MOUSE_CURSOR_LEFT, "QK_MOUSE_CURSOR_LEFT"},
+    {QK_MOUSE_CURSOR_RIGHT, "QK_MOUSE_CURSOR_RIGHT"},
+    {QK_MOUSE_BUTTON_1, "QK_MOUSE_BUTTON_1"},
+    {QK_MOUSE_BUTTON_2, "QK_MOUSE_BUTTON_2"},
+    {QK_MOUSE_BUTTON_3, "QK_MOUSE_BUTTON_3"},
+    {QK_MOUSE_BUTTON_4, "QK_MOUSE_BUTTON_4"},
+    {QK_MOUSE_BUTTON_5, "QK_MOUSE_BUTTON_5"},
+    {QK_MOUSE_BUTTON_6, "QK_MOUSE_BUTTON_6"},
+    {QK_MOUSE_BUTTON_7, "QK_MOUSE_BUTTON_7"},
+    {QK_MOUSE_BUTTON_8, "QK_MOUSE_BUTTON_8"},
+    {QK_MOUSE_WHEEL_UP, "QK_MOUSE_WHEEL_UP"},
+    {QK_MOUSE_WHEEL_DOWN, "QK_MOUSE_WHEEL_DOWN"},
+    {QK_MOUSE_WHEEL_LEFT, "QK_MOUSE_WHEEL_LEFT"},
+    {QK_MOUSE_WHEEL_RIGHT, "QK_MOUSE_WHEEL_RIGHT"},
+    {QK_MOUSE_ACCELERATION_0, "QK_MOUSE_ACCELERATION_0"},
+    {QK_MOUSE_ACCELERATION_1, "QK_MOUSE_ACCELERATION_1"},
+    {QK_MOUSE_ACCELERATION_2, "QK_MOUSE_ACCELERATION_2"},
     {KC_LEFT_CTRL, "KC_LEFT_CTRL"},
     {KC_LEFT_SHIFT, "KC_LEFT_SHIFT"},
     {KC_LEFT_ALT, "KC_LEFT_ALT"},