3 files changed, 17 insertions, 17 deletions

diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index e7fe453308..03b0af9277 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -16,17 +16,17 @@ float compute_freq_for_midi_note(uint8_t note) {
 }
 
 bool process_audio(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == AU_ON && record->event.pressed) {
+    if (keycode == QK_AUDIO_ON && record->event.pressed) {
         audio_on();
         return false;
     }
 
-    if (keycode == AU_OFF && record->event.pressed) {
+    if (keycode == QK_AUDIO_OFF && record->event.pressed) {
         audio_off();
         return false;
     }
 
-    if (keycode == AU_TOG && record->event.pressed) {
+    if (keycode == QK_AUDIO_TOGGLE && record->event.pressed) {
         if (is_audio_on()) {
             audio_off();
         } else {
@@ -35,13 +35,13 @@ bool process_audio(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MUV_IN && record->event.pressed) {
+    if (keycode == QK_AUDIO_VOICE_NEXT && record->event.pressed) {
         voice_iterate();
         PLAY_SONG(voice_change_song);
         return false;
     }
 
-    if (keycode == MUV_DE && record->event.pressed) {
+    if (keycode == QK_AUDIO_VOICE_PREVIOUS && record->event.pressed) {
         voice_deiterate();
         PLAY_SONG(voice_change_song);
         return false;
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index 9795734984..b662a3f2f4 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -82,31 +82,31 @@ bool is_clicky_on(void) {
 }
 
 bool process_clicky(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == CLICKY_TOGGLE && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_TOGGLE && record->event.pressed) {
         clicky_toggle();
     }
 
-    if (keycode == CLICKY_ENABLE && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_ON && record->event.pressed) {
         clicky_on();
     }
-    if (keycode == CLICKY_DISABLE && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_OFF && record->event.pressed) {
         clicky_off();
     }
 
-    if (keycode == CLICKY_RESET && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_RESET && record->event.pressed) {
         clicky_freq_reset();
     }
 
-    if (keycode == CLICKY_UP && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_UP && record->event.pressed) {
         clicky_freq_up();
     }
-    if (keycode == CLICKY_DOWN && record->event.pressed) {
+    if (keycode == QK_AUDIO_CLICKY_DOWN && record->event.pressed) {
         clicky_freq_down();
     }
 
     if (audio_config.enable && audio_config.clicky_enable) {
-        if (record->event.pressed) {                      // Leave this separate so it's easier to add upstroke sound
-            if (keycode != AU_OFF && keycode != AU_TOG) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
+        if (record->event.pressed) {                                 // Leave this separate so it's easier to add upstroke sound
+            if (keycode != QK_AUDIO_ON && keycode != QK_AUDIO_OFF) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
                 clicky_play();
             }
         }
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index eeec0c28a4..950aec22f9 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -101,17 +101,17 @@ void music_all_notes_off(void) {
 }
 
 bool process_music(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == MU_ON && record->event.pressed) {
+    if (keycode == QK_MUSIC_ON && record->event.pressed) {
         music_on();
         return false;
     }
 
-    if (keycode == MU_OFF && record->event.pressed) {
+    if (keycode == QK_MUSIC_OFF && record->event.pressed) {
         music_off();
         return false;
     }
 
-    if (keycode == MU_TOG && record->event.pressed) {
+    if (keycode == QK_MUSIC_TOGGLE && record->event.pressed) {
         if (music_activated) {
             music_off();
         } else {
@@ -139,7 +139,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MU_MOD && record->event.pressed) {
+    if (keycode == QK_MUSIC_MODE_NEXT && record->event.pressed) {
         music_mode_cycle();
         return false;
     }