Remove legacy keycodes, part 6 (#18740)

* `KC_RSHIFT` -> `KC_RSFT`

* `KC_RCTRL` -> `KC_RCTL`

* `KC_LSHIFT` -> `KC_LSFT`

* `KC_LCTRL` -> `KC_LCTL`

30 files changed, 132 insertions, 132 deletions

diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 019fd11c48..f158e3bc01 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_E,      KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,      KC_O,      KC_P,       KC_BSPC              ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_S,        KC_D,      KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,      KC_L,      KC_SCLN,    MT(MOD_RSFT, KC_ENT) ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT            ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+  KC_LSFT,               KC_Z,       KC_X,        KC_C,      KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSFT              ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
 /* Colemak-DHm
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT(
   LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,    KC_BSPC              ,
   MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,      KC_I,      KC_O,       MT(MOD_RSFT, KC_ENT) ,
-  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,                      KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT            ,
-  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+  KC_LSFT,               KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,                      KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSFT              ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSFT,   KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
 /* Function
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FUNC] = LAYOUT(
   KC_F1,     KC_F2,   KC_F3,    KC_F4,         KC_F5,   KC_F6,                     KC_F7,   KC_F8,      KC_F9,    KC_F10,  KC_F11,  KC_F12               ,
   KC_1,      KC_2,    KC_3,     KC_4,          KC_5,    KC_6,                      KC_7,    KC_8,       KC_9,     KC_0,    UK_TILD, KC_INSERT            ,
-  KC_LSHIFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
+  KC_LSFT,   KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS,                   KC_EQL,  KC_BSLS,    KC_LBRC,  KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
   _______,   _______, _______,  _______,       _______, _______, _______, _______, _______, MO(_MOUSE), _______,  _______, _______, _______
 ),
 
diff --git a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
index d9634786a8..5f53092aef 100644
--- a/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
+++ b/keyboards/handwired/co60/keymaps/jmdaly_hhkb_split_space/keymap.c
@@ -64,37 +64,37 @@ void matrix_scan_user(void) {
     // Close a program in i3wm
     SEQ_ONE_KEY(KC_Q) {
       register_code(KC_LGUI);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_Q);
       unregister_code(KC_Q);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LGUI);
     }
     // Exit i3wm
     SEQ_ONE_KEY(KC_E) {
       register_code(KC_LGUI);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_E);
       unregister_code(KC_E);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LGUI);
     }
     // Copy selected text in suckless terminal
     SEQ_ONE_KEY(KC_C) {
       register_code(KC_LCTL);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_C);
       unregister_code(KC_C);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LCTL);
     }
     // Paste text in suckless terminal
     SEQ_ONE_KEY(KC_V) {
       register_code(KC_LCTL);
-      register_code(KC_LSHIFT);
+      register_code(KC_LSFT);
       register_code(KC_V);
       unregister_code(KC_V);
-      unregister_code(KC_LSHIFT);
+      unregister_code(KC_LSFT);
       unregister_code(KC_LCTL);
     }
     // FZF shortcut to fuzzy switch directories
diff --git a/keyboards/handwired/d48/keymaps/anderson/keymap.c b/keyboards/handwired/d48/keymaps/anderson/keymap.c
index 48f3c00679..63d480a72c 100644
--- a/keyboards/handwired/d48/keymaps/anderson/keymap.c
+++ b/keyboards/handwired/d48/keymaps/anderson/keymap.c
@@ -29,7 +29,7 @@ enum custom_keycodes {
 taphold_t taphold_config[TAPHOLD_CONFIG_SIZE] = {
     {.key=KC_ALPHA, .mode=TAPHOLD_LAYER, .shortAction=KC_ESC, .longAction=_ALPHA},
     {.key=KC_BETA, .mode=TAPHOLD_LAYER, .shortAction=KC_EQL, .longAction=_BETA},
-    {.key=KC_RCTRL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTRL},
+    {.key=KC_RCTL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTL},
 };
 uint16_t taphold_config_size = TAPHOLD_CONFIG_SIZE;
 uint32_t taphold_timeout = 90;
@@ -67,8 +67,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 KC_MUTE,                   LCTL(KC_D),
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
         KC_ALPHA,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,  \
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTRL,\
-        KC_LCTRL,_______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, KC_QUOT, _______, _______, KC_BSLS  \
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL, \
+        KC_LCTL, _______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, KC_QUOT, _______, _______, KC_BSLS  \
     ),
 
     /* Alpha layer (𝛼)
@@ -191,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
     }
 
-    if (keycode == KC_LCTRL || keycode == KC_RCTRL) {
+    if (keycode == KC_LCTL || keycode == KC_RCTL) {
         ctrl_pressed = record->event.pressed;
     } else if (keycode == KC_LALT) {
         alt_pressed = record->event.pressed;
@@ -213,9 +213,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         next_light_mode(layer_colors[_MAIN]);
     }
 #endif
-    if (keycode == KC_LCTRL) {
+    if (keycode == KC_LCTL) {
         /* Some Overlay1_Enable fuckery! */
-        (record->event.pressed ? register_code : unregister_code)(KC_LCTRL);
+        (record->event.pressed ? register_code : unregister_code)(KC_LCTL);
         return false;
     }
     return taphold_process(keycode, record);
diff --git a/keyboards/handwired/d48/keymaps/default/keymap.c b/keyboards/handwired/d48/keymaps/default/keymap.c
index 9b83a26216..45da0e0765 100644
--- a/keyboards/handwired/d48/keymaps/default/keymap.c
+++ b/keyboards/handwired/d48/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 taphold_t taphold_config[TAPHOLD_CONFIG_SIZE] = {
     {.key=KC_ALPHA, .mode=TAPHOLD_LAYER, .shortAction=KC_ESC, .longAction=_ALPHA},
     {.key=KC_BETA, .mode=TAPHOLD_LAYER, .shortAction=KC_EQL, .longAction=_BETA},
-    {.key=KC_RCTRL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTRL},
+    {.key=KC_RCTL, .mode=TAPHOLD_MOD, .shortAction=KC_MINS, .longAction=KC_LCTL},
 };
 uint16_t taphold_config_size = TAPHOLD_CONFIG_SIZE;
 uint32_t taphold_timeout = 90;
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                                 KC_MUTE,                   _______,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
         KC_ALPHA,KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTRL,
-        KC_LCTRL,_______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, KC_QUOT, _______, _______, KC_BSLS
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
+        KC_LCTL, _______, _______, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_BETA, KC_QUOT, _______, _______, KC_BSLS
     ),
 
     /* Alpha layer (𝛼)
@@ -149,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         }
     }
 
-    if (keycode == KC_LCTRL || keycode == KC_RCTRL) {
+    if (keycode == KC_LCTL || keycode == KC_RCTL) {
         ctrl_pressed = record->event.pressed;
     } else if (keycode == KC_LALT) {
         alt_pressed = record->event.pressed;
@@ -166,9 +166,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (keycode == QK_BOOT) {
         rgblight_setrgb(255, 255, 0);
     }
-    if (keycode == KC_LCTRL) {
+    if (keycode == KC_LCTL) {
         /* Some Overlay1_Enable fuckery! */
-        (record->event.pressed ? register_code : unregister_code)(KC_LCTRL);
+        (record->event.pressed ? register_code : unregister_code)(KC_LCTL);
         return false;
     }
     return taphold_process(keycode, record);
diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
index e54d31c184..1c4bdfd5ee 100644
--- a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   COLON_EQ,     KC_A,     KC_O,     KC_E,     KC_U,      KC_I,
    KC_LSFT,  KC_SCLN,     KC_Q,     KC_J,     KC_K,      KC_X,
    KC_HOME,   KC_GRV,   KC_EQL,  KC_LEFT,  KC_RGHT,
-                                                    KC_LCTRL,   KC_LALT,
+                                                    KC_LCTL,    KC_LALT,
                                                                MO(CONT),
                                           KC_BSPC,    KC_DEL,   KC_LGUI,
         // right hand
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
index 7362505f0f..cb78c9fb56 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LBRC, KC_RBRC,                                              KC_QUOT, KC_GRV,
                                     SH_ESC,                            KC_BSPC,
                                     KC_LGUI, KC_TAB,          KC_RSFT, KC_SPC,
-                                    RAISE,   KC_LCTRL,        LOWER,  KC_ENT
+                                    RAISE,   KC_LCTL,         LOWER,  KC_ENT
     ),
    
     /* Colemak
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LBRC, KC_RBRC,                                              KC_QUOT, KC_GRV,
                                     KC_ESC,                            KC_BSPC,
                                     KC_LGUI, KC_TAB,          KC_RSFT, KC_SPC,
-                                    RAISE,   KC_LCTRL,        LOWER,  KC_ENT
+                                    RAISE,   KC_LCTL,         LOWER,  KC_ENT
     ),
     /*  RAISE
      * ,----------------------------------,                  ,----------------------------------,
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
index cf6d7d7120..0e96202315 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCBR, KC_RCBR,                                              KC_QUOT, KC_GRV,
                                    SH_ESC,                             KC_ENT,
                                    KC_LGUI, KC_TAB,           KC_RSFT, KC_SPC,
-                                   RAISE,   KC_LCTRL,         KC_BSPC, LOWER
+                                   RAISE,   KC_LCTL,          KC_BSPC, LOWER
     ),
    
     /* Colemak
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCBR, KC_RCBR,                                              KC_QUOT, KC_GRV,
                                    SH_ESC,                             KC_ENT,
                                    KC_LGUI, KC_TAB,           KC_RSFT, KC_SPC,
-                                   RAISE,   KC_LCTRL,         KC_BSPC, LOWER
+                                   RAISE,   KC_LCTL,          KC_BSPC, LOWER
     ),
     /*  RAISE
      * ,----------------------------------,                  ,----------------------------------,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
index 2c33aa3e57..c4887a3dbb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
      KC_BSPC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
      KC_LSFT, CTL_T(KC_Z)  , KC_X  , KC_C  , KC_V  , KC_B  ,                  KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
-                      KC_LALT,KC_LCTRL,                                                       KC_DEL, KC_PMNS,
+                      KC_LALT,KC_LCTL,                                                        KC_DEL, KC_PMNS,
                                       KC_SPC, MO(_ARROWS),                          MO(_MOUSE), KC_ENT,
                                       KC_LCMD, MO(_SYMBOLS),                        KC_EQL, KC_RALT,
                                       KC_LALT, MO(_NUMBERS),                        MO(_MEDIA), KC_EJCT
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______ ,_______,
                           KC_LCMD,KC_LALT,                                                       _______, _______,
                                              _______,_______,            _______,_______,
-                                             KC_LCTRL,_______,            _______,_______,
+                                             KC_LCTL,_______,            _______,_______,
                                              _______,_______,            _______,_______
 
   ),
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index 19d4a8b0b9..e5a5dcc6c1 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -176,33 +176,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void hold_shift(void) {
   shift_count = shift_count + 1;
-  register_code(KC_LSHIFT);
+  register_code(KC_LSFT);
 }
 
 void release_shift(void) {
   shift_count = shift_count - 1;
   if(shift_count <= 0){
-    unregister_code(KC_LSHIFT);
+    unregister_code(KC_LSFT);
     shift_count = 0;
   }
 }
 
 void press_space(void) {
-  if(shift_count > 0) unregister_code (KC_LSHIFT);
+  if(shift_count > 0) unregister_code (KC_LSFT);
   tap_code(KC_SPACE);
-  if(shift_count > 0) register_code (KC_LSHIFT);
+  if(shift_count > 0) register_code (KC_LSFT);
 }
 
 void press_enter(void) {
-  if(shift_count > 0) unregister_code (KC_LSHIFT);
+  if(shift_count > 0) unregister_code (KC_LSFT);
   tap_code (KC_ENT);
-  if(shift_count > 0) register_code (KC_LSHIFT);
+  if(shift_count > 0) register_code (KC_LSFT);
 }
 
 void press_underscore(void) {
-  if(shift_count > 0) unregister_code (KC_LSHIFT);
+  if(shift_count > 0) unregister_code (KC_LSFT);
   tap_code ((unsigned char) BP_UNDS);
-  if(shift_count > 0) register_code (KC_LSHIFT);
+  if(shift_count > 0) register_code (KC_LSFT);
 }
 
 // Bleah globals need to be initialized.
diff --git a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
index 05f1dc51dc..28721c6b7d 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
+++ b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
                   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,      KC_H,     KC_J,     KC_K,     KC_L,     KC_LPRN,  KC_RPRN,
         KC_PEQL,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,      KC_N,     KC_M,     KC_COMMA, KC_DOT,   KC_QUES,
-                  XXXXXXX,  XXXXXXX,  KC_BSPC,  KC_ENT,   KC_SPC,    KC_LSFT,  KC_LCTRL, KC_LALT,  KC_ALGR,  KC_LWIN,  XXXXXXX
+                  XXXXXXX,  XXXXXXX,  KC_BSPC,  KC_ENT,   KC_SPC,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_ALGR,  KC_LWIN,  XXXXXXX
   ),
 };
 
diff --git a/keyboards/handwired/hexon38/keymaps/default/keymap.c b/keyboards/handwired/hexon38/keymaps/default/keymap.c
index 38ae903ec8..90e2d47cf5 100644
--- a/keyboards/handwired/hexon38/keymaps/default/keymap.c
+++ b/keyboards/handwired/hexon38/keymaps/default/keymap.c
@@ -40,8 +40,8 @@
 #define COLN_CTL CTL_T(KC_SCLN)
 
 #define ______ KC_TRNS
-#define LSHIFT KC_LSHIFT
-#define RSHIFT KC_RSHIFT
+#define LSHIFT KC_LSFT
+#define RSHIFT KC_RSFT
 #define COMMA KC_COMM
 #define SLASH KC_SLSH
 #define SPACE KC_SPC
diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
index 5707d769de..714491d305 100644
--- a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c
@@ -44,8 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,      KC_NO,      MO(3),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_P4,   KC_P5,   KC_P6,   MO(4),
-    LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    LCTL(KC_C), LCTL(KC_V), KC_LCTRL, KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTRL,                      KC_DOWN,             KC_P0,            KC_PDOT
+    LCTL(KC_F), KC_LALT,    KC_LSFT,  KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    LCTL(KC_C), LCTL(KC_V), KC_LCTL,  KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTL,                       KC_DOWN,             KC_P0,            KC_PDOT
   ),
 
   // Qwerty layer + function
@@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC, TO(0),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  KC_NO,  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,  KC_NO,  MO(3),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_LALT,KC_LCTRL, KC_LGUI,                                      KC_SPC,                                KC_RALT,  KC_RCTRL,                    KC_DOWN,             KC_P0,            KC_PDOT
+    KC_NO,  KC_NO,  KC_LSFT,  KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_NO,  KC_LALT,KC_LCTL,  KC_LGUI,                                      KC_SPC,                                KC_RALT,  KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
   ),
 
   // Orirginal Layer
@@ -66,8 +66,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC, TO(1),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_NO,  TO(0),  KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,     KC_P,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_NO,  KC_NO,  KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,  KC_LSHIFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_LALT,KC_LCTRL, KC_LGUI,                                        KC_SPC,                              KC_RALT,  KC_RCTRL,                    KC_DOWN,             KC_P0,            KC_PDOT
+    KC_NO,  KC_NO,  KC_LSFT,  KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_NO,  KC_LALT,KC_LCTL,  KC_LGUI,                                        KC_SPC,                              KC_RALT,  KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
   ),
 
   // Function Layer
@@ -77,8 +77,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MU_TOG, KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCLN,    KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
-    KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
-    KC_NO,  KC_NO,    KC_LCTRL, KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
+    KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
+    KC_NO,  KC_NO,    KC_LCTL,  KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
   ),
 
   // Literally just the numpad is different
@@ -88,8 +88,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
   KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_BTN1,  KC_MS_U,  KC_BTN2,  KC_NO,
   KC_NO,      KC_NO,      TO(0),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_MS_L,  KC_NO,    KC_MS_R,  KC_TRNS,
-  LCTL(KC_F), KC_LALT,    KC_LSHIFT,KC_NO,    KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_GT,    KC_MS_D,  KC_GT,    KC_PENT,
-  LCTL(KC_C), LCTL(KC_V), KC_LCTRL, KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTRL,                      KC_DOWN,             KC_BTN1,            KC_PDOT
+  LCTL(KC_F), KC_LALT,    KC_LSFT,  KC_NO,    KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_GT,    KC_MS_D,  KC_GT,    KC_PENT,
+  LCTL(KC_C), LCTL(KC_V), KC_LCTL,  KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTL,                       KC_DOWN,             KC_BTN1,            KC_PDOT
 
   ),
 
@@ -100,8 +100,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MU_TOG, TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
     MU_MOD, KC_NO,    KC_TAB,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
     KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
-    KC_NO,  KC_LALT,  KC_LSHIFT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
-    KC_NO,  KC_LGUI,  KC_LCTRL, KC_LALT,                                                  KC_SPC,                 KC_RALT,  KC_RCTRL,                    KC_DOWN,             LSFT(KC_A),             KC_PDOT
+    KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
+    KC_NO,  KC_LGUI,  KC_LCTL,  KC_LALT,                                                  KC_SPC,                 KC_RALT,  KC_RCTL,                     KC_DOWN,             LSFT(KC_A),             KC_PDOT
 
   ),*/
   /*[0] = LAYOUT(
@@ -126,14 +126,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_A, KC_SPC,KC_C,KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, TO(0)
   ),
   [2] = LAYOUT(
-     KC_LCTRL,    KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
+     KC_LCTL,     KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
      KC_PPLS,     KC_B,     KC_C,     KC_D,       KC_A,       KC_S, KC_D, KC_F, KC_J, KC_J, KC_K,   KC_NO,  KC_K,     KC_L,   KC_SCLN,    KC_P4,    KC_DEL, KC_P5,    KC_P6,      KC_RIGHT,
      KC_PMNS,     KC_1,     KC_C,    KC_D,       KC_1,       KC_2, KC_3, KC_4, KC_7, KC_J, KC_K,   KC_L,   KC_8,     KC_9,   KC_0,       KC_NUM,   KC_PGUP,KC_PSLS,  KC_PAST,    KC_T,
      KC_A,        KC_ESC,   TO(0),KC_D,     KC_GRV,     KC_F, KC_G, KC_5, KC_6, KC_J, KC_K,   KC_L,   KC_EQL,   KC_N,   KC_MINUS,   KC_BSPC,  KC_INS, KC_HOME,  KC_S,       KC_T,
      KC_PPLS,     KC_NO,    KC_TAB,   KC_D,       KC_Q,       KC_W, KC_E, KC_R, KC_U, KC_J, KC_K,   KC_L,   KC_I,     KC_O,   KC_P,       KC_P7,    KC_PGDN,KC_P8,    KC_P9,      KC_T,
      KC_A,        KC_B,     KC_C,     KC_D,       KC_E,       KC_F, KC_G, KC_T, KC_Y, KC_J, KC_K,   KC_L,   KC_RBRC,  KC_N,   KC_LBRC,    KC_P,     KC_END, KC_R,     KC_S,       KC_T,
      KC_LEFT,     KC_P1,    KC_CAPS,  KC_RSFT,    KC_Z,       KC_X, KC_C, KC_V, KC_M, KC_J, KC_K,   KC_L,   KC_COMMA, KC_DOT, KC_BSLS,    KC_PENT,  KC_Q,   KC_P2,    KC_P3,      KC_T,
-     KC_LGUI,     KC_SPACE, KC_RCTRL, KC_LSHIFT,  KC_E,       KC_F, KC_G, KC_B, KC_N, KC_J, KC_K,   KC_L,   KC_M,     KC_N,   KC_SLSH,    KC_P,     KC_Q,   KC_P0,    KC_PDOT,    KC_KP_ENTER
+     KC_LGUI,     KC_SPACE, KC_RCTL,  KC_LSFT,    KC_E,       KC_F, KC_G, KC_B, KC_N, KC_J, KC_K,   KC_L,   KC_M,     KC_N,   KC_SLSH,    KC_P,     KC_Q,   KC_P0,    KC_PDOT,    KC_KP_ENTER
     ),*/
 };
 
@@ -142,7 +142,7 @@ bool right_shift_down = false;
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      switch (keycode) {
-    case KC_LSHIFT:
+    case KC_LEFT_SHIFT:
     if (record->event.pressed)
       {
         left_shift_down = true;
@@ -154,7 +154,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return true;
       }
     break;
-    case KC_RSHIFT:
+    case KC_RIGHT_SHIFT:
 
       if (record->event.pressed)
       {
@@ -207,17 +207,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if(record->event.pressed)
         {
           if(left_shift_down)
-            unregister_code(KC_LSHIFT);
+            unregister_code(KC_LEFT_SHIFT);
           if(right_shift_down)
-            unregister_code(KC_RSHIFT);
+            unregister_code(KC_RIGHT_SHIFT);
 
           register_code(KC_7);
           unregister_code(KC_7);