Remove legacy keycodes, part 2 (#18660)

* `KC_SYSREQ` -> `KC_SYRQ`

And one `KC_ALT_ERASE` -> `KC_ERAS`

* `KC_NONUS_BSLASH` -> `KC_NUBS`

* `KC_NUMLOCK` -> `KC_NUM`

* `KC_CLCK` -> `KC_CAPS`

* `KC_SCROLLLOCK` -> `KC_SCRL`

* `KC_LBRACKET` -> `KC_LBRC`

* `KC_RBRACKET` -> `KC_RBRC`

* `KC_CAPSLOCK` -> `KC_CAPS`

17 files changed, 34 insertions, 34 deletions

diff --git a/users/bbaserdem/bb-macro.c b/users/bbaserdem/bb-macro.c
index a84a7bbc21..6a722e6db1 100644
--- a/users/bbaserdem/bb-macro.c
+++ b/users/bbaserdem/bb-macro.c
@@ -80,7 +80,7 @@ const uint32_t PROGMEM unicode_map[] = {
 bool process_record_macro(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         // AltGr + Caps should change the oled layout variable
-        case KC_CAPSLOCK:
+        case KC_CAPS_LOCK:
             if (record->event.pressed) {
                 if (get_mods() & MOD_BIT(KC_RALT)) {
                     userspace_config.layout = (userspace_config.layout + 1) % 3;
diff --git a/users/cedrikl/cedrikl.c b/users/cedrikl/cedrikl.c
index 0479e22b5d..f9f4f1fbc0 100644
--- a/users/cedrikl/cedrikl.c
+++ b/users/cedrikl/cedrikl.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (host_keyboard_led_state().num_lock != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/cwebster2/my_miryoku.h b/users/cwebster2/my_miryoku.h
index 2c8ab6fe2b..8b167cd619 100644
--- a/users/cwebster2/my_miryoku.h
+++ b/users/cwebster2/my_miryoku.h
@@ -56,7 +56,7 @@
 #define _______NUM______L3____ KC_GRV,   KC_1,  KC_2,  KC_3,  KC_BSLS
 #define _______NUM_______T____ KC_DOT,   KC_0,  KC_MINS
 
-#define _______FN_______L1____ KC_F12,   KC_F7,   KC_F8,  KC_F9,  KC_SYSREQ
+#define _______FN_______L1____ KC_F12,   KC_F7,   KC_F8,  KC_F9,  KC_SYRQ
 #define _______FN_______L2____ KC_F11,   KC_F4,   KC_F5,  KC_F6,  KC_TRNS
 #define _______FN_______L3____ KC_F10,   KC_F1,   KC_F2,  KC_F3,  KC_PAUSE
 #define _______FN________T____ KC_MENU,  KC_SPC,  KC_TAB
diff --git a/users/dennytom/chording_engine/engine.part.1 b/users/dennytom/chording_engine/engine.part.1
index 73df4cdeaa..a2b39284f5 100644
--- a/users/dennytom/chording_engine/engine.part.1
+++ b/users/dennytom/chording_engine/engine.part.1
@@ -85,10 +85,10 @@ bool handle_US_ANSI_shifted_keys(int16_t keycode, bool in) {
             regular_keycode = KC_EQUAL;
             break;
         case KC_LEFT_CURLY_BRACE:
-            regular_keycode = KC_LBRACKET;
+            regular_keycode = KC_LEFT_BRACKET;
             break;
         case KC_RIGHT_CURLY_BRACE:
-            regular_keycode = KC_RBRACKET;
+            regular_keycode = KC_RIGHT_BRACKET;
             break;
         case KC_PIPE:
             regular_keycode = KC_BSLASH;
diff --git a/users/dennytom/chording_engine/tests/minunit.h b/users/dennytom/chording_engine/tests/minunit.h
index ed71b62533..c7ddc9e444 100644
--- a/users/dennytom/chording_engine/tests/minunit.h
+++ b/users/dennytom/chording_engine/tests/minunit.h
@@ -113,9 +113,9 @@ enum keycodes {
     KC_PLUS,
     KC_EQUAL,
     KC_LEFT_CURLY_BRACE,
-    KC_LBRACKET,
+    KC_LEFT_BRACKET,
     KC_RIGHT_CURLY_BRACE,
-    KC_RBRACKET,
+    KC_RIGHT_BRACKET,
     KC_PIPE,
     KC_BSLASH,
     KC_COLON,
diff --git a/users/edvorakjp/edvorakjp.h b/users/edvorakjp/edvorakjp.h
index a878f71ca8..9d04eb744e 100644
--- a/users/edvorakjp/edvorakjp.h
+++ b/users/edvorakjp/edvorakjp.h
@@ -23,8 +23,8 @@
 #define __EDVORAKJP_SYMBOL_L__            KC_EXCLAIM,         KC_AT,              KC_HASH,      KC_DOLLAR
 #define __EDVORAKJP_SYMBOL_R__            KC_PERCENT, KC_CIRCUMFLEX,         KC_AMPERSAND,    KC_ASTERISK
 
-#define __EDVORAKJP_BRACKET_L__  KC_LEFT_CURLY_BRACE,   KC_LBRACKET,        KC_LEFT_PAREN
-#define __EDVORAKJP_BRACKET_R__       KC_RIGHT_PAREN,   KC_RBRACKET, KC_RIGHT_CURLY_BRACE
+#define __EDVORAKJP_BRACKET_L__  KC_LEFT_CURLY_BRACE,   KC_LBRC,            KC_LEFT_PAREN
+#define __EDVORAKJP_BRACKET_R__       KC_RIGHT_PAREN,   KC_RBRC, KC_RIGHT_CURLY_BRACE
 
 #define __EDVORAKJP_PAGE__                   KC_HOME,     KC_PGDOWN,              KC_PGUP,         KC_END
 #define __EDVORAKJP_CURSOR__                 KC_LEFT,       KC_DOWN,                KC_UP,       KC_RIGHT
diff --git a/users/gordon/gordon.h b/users/gordon/gordon.h
index 49b4f0569f..567e7343ec 100644
--- a/users/gordon/gordon.h
+++ b/users/gordon/gordon.h
@@ -12,10 +12,10 @@
 
 // KC codes that are too long
 #define DOLLAR    KC_DOLLAR
-#define LSQUIGLY  KC_LBRACKET
-#define RSQUIGLY  KC_RBRACKET
-#define NUMLOCK   KC_NUMLOCK
-#define CAPLOCK   KC_CAPSLOCK
+#define LSQUIGLY  KC_LBRC
+#define RSQUIGLY  KC_RBRC
+#define NUMLOCK   KC_NUM_LOCK
+#define CAPLOCK   KC_CAPS_LOCK
 #define BK_SLASH  KC_BSLASH
 #define ASTERSK   KC_KP_ASTERISK
 
diff --git a/users/gourdo1/gourdo1.c b/users/gourdo1/gourdo1.c
index 26ecd8c1c0..b724a2f48d 100644
--- a/users/gourdo1/gourdo1.c
+++ b/users/gourdo1/gourdo1.c
@@ -593,7 +593,7 @@ bool caps_word_press_user(uint16_t keycode) {
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/issmirnov/rows.h b/users/issmirnov/rows.h
index d35af2175c..d15693f2b2 100644
--- a/users/issmirnov/rows.h
+++ b/users/issmirnov/rows.h
@@ -22,7 +22,7 @@
 
 #define _________________SYMB_L1___________________        KC_MINS , KC_AT   , KC_LCBR     , KC_RCBR     , KC_GRV
 #define _________________SYMB_L2___________________        KC_CIRC , KC_UNDS , KC_LPRN     , KC_RPRN     , KC_DLR
-#define _________________SYMB_L3___________________        KC_LABK , KC_RABK , KC_LBRACKET , KC_RBRACKET , KC_TILD
+#define _________________SYMB_L3___________________        KC_LABK , KC_RABK , KC_LBRC     , KC_RBRC     , KC_TILD
 
 #define _________________SYMB_R1___________________        KC_ASTR , KC_EXLM , KC_PIPE     , KC_PERC     , KC_PLUS
 #define _________________SYMB_R2___________________        KC_HASH , KC_EQL  , KC_COLN     , KC_SCLN     , TAP_TOG_LAYER
diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c
index b66b444f36..f203bd77df 100644
--- a/users/jonavin/jonavin.c
+++ b/users/jonavin/jonavin.c
@@ -213,7 +213,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 // Turn on/off NUM LOCK if current state is different
 void activate_numlock(bool turn_on) {
     if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) {
-        tap_code(KC_NUMLOCK);
+        tap_code(KC_NUM_LOCK);
     }
 }
 
diff --git a/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h b/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
index 8276cf207f..81bddca4cb 100644
--- a/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
+++ b/users/not-quite-neo/nqn-keys-on-quertz-de-latin1.h
@@ -23,7 +23,7 @@ Additionally, there are some common chars that we dit not yet define:
 
 
 // NQN key definitions in no particular order
-#define N_LT KC_NONUS_BSLASH
+#define N_LT KC_NONUS_BACKSLASH
 #define N_HS KC_NONUS_HASH
 #define N_DOTS RALT(KC_DOT) // …
 #define N_USC LSFT(KC_SLASH) // _
@@ -31,7 +31,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_RSQBR RALT(KC_9) // ]
 #define N_CIRC KC_GRAVE // ^
 #define N_EXKL LSFT(KC_1) // !
-#define N_GT LSFT(KC_NONUS_BSLASH) // >
+#define N_GT LSFT(KC_NONUS_BACKSLASH) // >
 #define N_EQ LSFT(KC_0) // =
 #define N_AMP LSFT(KC_6) // &
 #define N_BSLS RALT(KC_MINS) // \ backslash
@@ -46,7 +46,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_COLN LSFT(KC_DOT) // :
 #define N_HASH KC_BSLASH // #
 #define N_DLR LSFT(KC_4) // $
-#define N_PIPE RALT(KC_NONUS_BSLASH) // |
+#define N_PIPE RALT(KC_NONUS_BACKSLASH) // |
 #define N_TILD RALT(KC_RBRC) // ~
 #define N_GRAVE LSFT(KC_EQUAL) // `
 #define N_PLUS KC_RBRC // +
@@ -60,7 +60,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_Y KC_Z
 #define N_AE KC_QUOTE // ä
 #define N_OE KC_SCOLON // ö
-#define N_UE KC_LBRACKET // ü
+#define N_UE KC_LBRC // ü
 #define N_MU RALT(KC_M) // µ
 #define N_SS KC_MINS // ß
 #define N_DEGRE LSFT(KC_GRAVE) // °
diff --git a/users/pcoves/tapDance.c b/users/pcoves/tapDance.c
index f8c9aaf466..548ed35274 100644
--- a/users/pcoves/tapDance.c
+++ b/users/pcoves/tapDance.c
@@ -6,7 +6,7 @@ void left(qk_tap_dance_state_t* state, void* user_data) {
     switch (state->count) {
         case 1:
             if (state->pressed)
-                tap_code16(S(KC_LBRACKET));
+                tap_code16(S(KC_LEFT_BRACKET));
             else
                 tap_code16(S(KC_9));
             break;
@@ -14,7 +14,7 @@ void left(qk_tap_dance_state_t* state, void* user_data) {
             if (state->pressed)
                 tap_code16(S(KC_COMM));
             else
-                tap_code(KC_LBRACKET);
+                tap_code(KC_LEFT_BRACKET);
             break;
         default:
             reset_tap_dance(state);
@@ -25,7 +25,7 @@ void right(qk_tap_dance_state_t* state, void* user_data) {
     switch (state->count) {
         case 1:
             if (state->pressed)
-                tap_code16(S(KC_RBRACKET));
+                tap_code16(S(KC_RIGHT_BRACKET));
             else
                 tap_code16(S(KC_0));
             break;
@@ -33,7 +33,7 @@ void right(qk_tap_dance_state_t* state, void* user_data) {
             if (state->pressed)
                 tap_code16(S(KC_DOT));
             else
-                tap_code(KC_RBRACKET);
+                tap_code(KC_RIGHT_BRACKET);
             break;
         default:
             reset_tap_dance(state);
diff --git a/users/romus/romus.h b/users/romus/romus.h
index b65e32eb5b..a72b78c138 100644
--- a/users/romus/romus.h
+++ b/users/romus/romus.h
@@ -184,7 +184,7 @@ enum {
  * `------------------------------------------------------------------------' */
 #define ALTCHAR \
     KC_GRV,	DBL_QUO,DBL_DQT,CUR_EUR,CUR_BPN,_______,_______,KC_HOME,KC_PGUP,KC_PSCREEN,		KC_BSLASH,	KC_SLSH, \
-    REDO,	DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,KC_LALT,KC_INS,	KC_END, KC_PGDN,KC_SCROLLLOCK,	CUR_BIT,	KC_MINUS, \
+    REDO,	DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,KC_LALT,KC_INS,	KC_END, KC_PGDN,KC_SCRL,	CUR_BIT,	KC_MINUS, \
     UNDO,	CUT,    COPY,   PASTE,	EXIT,	KC_LSFT,_______,_______,_______,_______,		CUR_YEN,	KC_EQUAL,   \
     _______,_______,_______,_______,_______,_______,_______,DBL_SPC,_______,_______,		_______,	_______
 
diff --git a/users/scheiklp/koy_keys_on_quertz_de_latin1.h b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
index e098e75dfc..0062803bd4 100644
--- a/users/scheiklp/koy_keys_on_quertz_de_latin1.h
+++ b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
@@ -16,7 +16,7 @@ Additionally, there are some common chars that we dit not yet define:
 
 
 // NQN key definitions in no particular order
-#define N_LT KC_NONUS_BSLASH
+#define N_LT KC_NONUS_BACKSLASH
 #define N_HS KC_NONUS_HASH
 #define N_DOTS RALT(KC_DOT) // …
 #define N_USC LSFT(KC_SLASH) // _
@@ -24,7 +24,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_RSQBR RALT(KC_9) // ]
 #define N_CIRC KC_GRAVE // ^
 #define N_EXKL LSFT(KC_1) // !
-#define N_GT LSFT(KC_NONUS_BSLASH) // >
+#define N_GT LSFT(KC_NONUS_BACKSLASH) // >
 #define N_EQ LSFT(KC_0) // =
 #define N_AMP LSFT(KC_6) // &
 #define N_BSLS RALT(KC_MINS) // \ backslash
@@ -39,7 +39,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_COLN LSFT(KC_DOT) // :
 #define N_HASH KC_BSLASH // #
 #define N_DLR LSFT(KC_4) // $
-#define N_PIPE RALT(KC_NONUS_BSLASH) // |
+#define N_PIPE RALT(KC_NONUS_BACKSLASH) // |
 #define N_TILD RALT(KC_RBRC) // ~
 #define N_GRAVE LSFT(KC_EQUAL) // `
 #define N_PLUS KC_RBRC // +
@@ -53,7 +53,7 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_Y KC_Z
 #define N_AE KC_QUOTE // ä
 #define N_OE KC_SCOLON // ö
-#define N_UE KC_LBRACKET // ü
+#define N_UE KC_LBRC // ü
 #define N_MU RALT(KC_M) // µ
 #define N_SS KC_MINS // ß
 #define N_DEGRE LSFT(KC_GRAVE) // °
diff --git a/users/twschum/xtonhasvim.c b/users/twschum/xtonhasvim.c
index a1adf39f04..15d1b0d940 100644
--- a/users/twschum/xtonhasvim.c
+++ b/users/twschum/xtonhasvim.c
@@ -70,7 +70,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_COMMA:
     if (SHIFTED) {
       // indent
-      tap_code16(LGUI(KC_LBRACKET));
+      tap_code16(LGUI(KC_LEFT_BRACKET));
     } else {
       // toggle comment
       tap_code16(LGUI(KC_SLASH));
@@ -79,7 +79,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_PERIOD:
     if (SHIFTED) {
       // outdent
-      tap_code16(LGUI(KC_RBRACKET));
+      tap_code16(LGUI(KC_RIGHT_BRACKET));
     }
     break;
   }
diff --git a/users/xtonhasvim/xtonhasvim.c b/users/xtonhasvim/xtonhasvim.c
index 5f6701830f..1bb5781c47 100644
--- a/users/xtonhasvim/xtonhasvim.c
+++ b/users/xtonhasvim/xtonhasvim.c
@@ -108,7 +108,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_COMMA:
     if (SHIFTED) {
       // indent
-      CMD(KC_LBRACKET);
+      CMD(KC_LEFT_BRACKET);
     } else {
       // toggle comment
       CMD(KC_SLASH);
@@ -117,7 +117,7 @@ static void comma_period(uint16_t keycode) {
   case VIM_PERIOD:
     if (SHIFTED) {
       // outdent
-      CMD(KC_RBRACKET);
+      CMD(KC_RIGHT_BRACKET);
     }
     break;
   }
diff --git a/users/zigotica/combos.c b/users/zigotica/combos.c
index 8fb5b3c9fc..a4d4f15618 100644
--- a/users/zigotica/combos.c
+++ b/users/zigotica/combos.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM caps_combo[] = {KC_C, KC_L, COMBO_END};
 
 combo_t key_combos[] = {
   [EM_EMAIL] = COMBO_ACTION(email_combo),
-  [CL_CAPSL] = COMBO(caps_combo, KC_CAPSLOCK),
+  [CL_CAPSL] = COMBO(caps_combo, KC_CAPS),
 };
 
 void process_combo_event(uint16_t combo_index, bool pressed) {