diff --git a/keyboards/nora/v01/keymaps/default/keymap.c b/keyboards/nora/v01/keymaps/default/keymap.c
index d1f952de6666..d9c6846f86a5 100644
--- a/keyboards/nora/v01/keymaps/default/keymap.c
+++ b/keyboards/nora/v01/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,       KC_BSPC,
            KC_LCTL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
-        KC_MUTE,  KC_LANG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
+        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
         KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/nora/v01/keymaps/duo/keymap.c b/keyboards/nora/v01/keymaps/duo/keymap.c
index 271fad41bfd5..6ad7cc827c96 100644
--- a/keyboards/nora/v01/keymaps/duo/keymap.c
+++ b/keyboards/nora/v01/keymaps/duo/keymap.c
@@ -71,10 +71,10 @@ enum custom_keycodes {
 // #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_NUM)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_US] = LAYOUT(
diff --git a/keyboards/nora/v01/keymaps/jpskenn/keymap.c b/keyboards/nora/v01/keymaps/jpskenn/keymap.c
index 4a54f626144d..ca920b31e29c 100644
--- a/keyboards/nora/v01/keymaps/jpskenn/keymap.c
+++ b/keyboards/nora/v01/keymaps/jpskenn/keymap.c
@@ -67,10 +67,10 @@ enum custom_keycodes {
 #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_NUM)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAC] = LAYOUT(
diff --git a/keyboards/nora/v03/keymaps/default/keymap.c b/keyboards/nora/v03/keymaps/default/keymap.c
index d1f952de6666..d9c6846f86a5 100644
--- a/keyboards/nora/v03/keymaps/default/keymap.c
+++ b/keyboards/nora/v03/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,       KC_BSPC,
            KC_LCTL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
-        KC_MUTE,  KC_LANG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
+        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
         KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/nora/v03/keymaps/jpskenn/keymap.c b/keyboards/nora/v03/keymaps/jpskenn/keymap.c
index 5b9426c7e516..716bd736489c 100644
--- a/keyboards/nora/v03/keymaps/jpskenn/keymap.c
+++ b/keyboards/nora/v03/keymaps/jpskenn/keymap.c
@@ -67,10 +67,10 @@ enum custom_keycodes {
 #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_NUM)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAC] = LAYOUT(
diff --git a/keyboards/nora/v03/keymaps/jpskenn_full/keymap.c b/keyboards/nora/v03/keymaps/jpskenn_full/keymap.c
index d5baef9f59f1..2b14a613845c 100644
--- a/keyboards/nora/v03/keymaps/jpskenn_full/keymap.c
+++ b/keyboards/nora/v03/keymaps/jpskenn_full/keymap.c
@@ -119,10 +119,10 @@ enum custom_keycodes {
 // #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_BASE3)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE1] = LAYOUT(
diff --git a/keyboards/nora/v03/keymaps/jpskenn_full_midi/keymap.c b/keyboards/nora/v03/keymaps/jpskenn_full_midi/keymap.c
index c3dfb4629636..88cf01cdc63e 100644
--- a/keyboards/nora/v03/keymaps/jpskenn_full_midi/keymap.c
+++ b/keyboards/nora/v03/keymaps/jpskenn_full_midi/keymap.c
@@ -119,10 +119,10 @@ enum custom_keycodes {
 // #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_BASE3)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE1] = LAYOUT(
diff --git a/keyboards/nora/v031/keymaps/default/keymap.c b/keyboards/nora/v031/keymaps/default/keymap.c
index d1f952de6666..d9c6846f86a5 100644
--- a/keyboards/nora/v031/keymaps/default/keymap.c
+++ b/keyboards/nora/v031/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,       KC_BSPC,
            KC_LCTL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
-        KC_MUTE,  KC_LANG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
+        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
         KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/nora/v031/keymaps/jpskenn/keymap.c b/keyboards/nora/v031/keymaps/jpskenn/keymap.c
index ea9f4d182f79..cb44532f0c69 100644
--- a/keyboards/nora/v031/keymaps/jpskenn/keymap.c
+++ b/keyboards/nora/v031/keymaps/jpskenn/keymap.c
@@ -74,10 +74,10 @@ enum custom_keycodes {
 #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_NUM)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAC] = LAYOUT(
diff --git a/keyboards/nora/v031/keymaps/jpskenn_re/keymap.c b/keyboards/nora/v031/keymaps/jpskenn_re/keymap.c
index d538cb89bada..8d7762097483 100644
--- a/keyboards/nora/v031/keymaps/jpskenn_re/keymap.c
+++ b/keyboards/nora/v031/keymaps/jpskenn_re/keymap.c
@@ -76,10 +76,10 @@ enum custom_keycodes {
 #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_NUM)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAC] = LAYOUT(
diff --git a/keyboards/nora/v1/keymaps/default/keymap.c b/keyboards/nora/v1/keymaps/default/keymap.c
index d1f952de6666..d9c6846f86a5 100644
--- a/keyboards/nora/v1/keymaps/default/keymap.c
+++ b/keyboards/nora/v1/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,       KC_BSPC,
            KC_LCTL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
-        KC_MUTE,  KC_LANG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
+        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
         KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
     ),
     [_LOWER] = LAYOUT(
diff --git a/keyboards/nora/v1/keymaps/jpskenn_full/keymap.c b/keyboards/nora/v1/keymaps/jpskenn_full/keymap.c
index c21ffe5d9376..43bf465fa1c4 100644
--- a/keyboards/nora/v1/keymaps/jpskenn_full/keymap.c
+++ b/keyboards/nora/v1/keymaps/jpskenn_full/keymap.c
@@ -92,10 +92,10 @@ enum custom_keycodes {
 // #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_BASE3)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE1] = LAYOUT_all(
diff --git a/keyboards/nora/v1/keymaps/jpskenn_fw/keymap.c b/keyboards/nora/v1/keymaps/jpskenn_fw/keymap.c
index fc6dbc6ce18f..6416208284a5 100644
--- a/keyboards/nora/v1/keymaps/jpskenn_fw/keymap.c
+++ b/keyboards/nora/v1/keymaps/jpskenn_fw/keymap.c
@@ -92,10 +92,10 @@ enum custom_keycodes {
 // #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_BASE3)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE1] = LAYOUT_fw(
diff --git a/keyboards/nora/v1/keymaps/jpskenn_re/keymap.c b/keyboards/nora/v1/keymaps/jpskenn_re/keymap.c
index 36a4df54c8af..d7aa474cb815 100644
--- a/keyboards/nora/v1/keymaps/jpskenn_re/keymap.c
+++ b/keyboards/nora/v1/keymaps/jpskenn_re/keymap.c
@@ -74,10 +74,10 @@ enum custom_keycodes {
 #define ADJUST  MO(_ADJUST)
 #define NUM     TG(_NUM)
 // #define HENKAN  LGUI(KC_GRV)
-#define GUI_JA  LGUI_T(KC_LANG1)
-#define GUI_EN  LGUI_T(KC_LANG2)
-#define ALT_JA  LALT_T(KC_LANG1)
-#define ALT_EN  LALT_T(KC_LANG2)
+#define GUI_JA  LGUI_T(KC_LNG1)
+#define GUI_EN  LGUI_T(KC_LNG2)
+#define ALT_JA  LALT_T(KC_LNG1)
+#define ALT_EN  LALT_T(KC_LNG2)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAC] = LAYOUT_re(