diff --git a/keyboards/sepsepkbd/yubino_hara/keyboard.json b/keyboards/sepsepkbd/yubino_hara/keyboard.json
index 7eec80a245f..504d60a807b 100644
--- a/keyboards/sepsepkbd/yubino_hara/keyboard.json
+++ b/keyboards/sepsepkbd/yubino_hara/keyboard.json
@@ -49,7 +49,7 @@
         }
     },
     "layouts": {
-        "LAYOUT_split_7x4": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "label":"0,0",  "x":0, "y":0},
                 {"matrix": [0, 1], "label":"0,1",  "x":1, "y":0},
diff --git a/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c b/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c
index 605b32aabfc..9bb669da3c6 100644
--- a/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c
+++ b/keyboards/sepsepkbd/yubino_hara/keymaps/default/keymap.c
@@ -4,25 +4,25 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_split_7x4(
+    [0] = LAYOUT(
         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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_MINS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_BTN1,          KC_BTN2, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ESC,
                                             KC_LGUI, MO(1),   KC_SPC,           KC_ENT,  MO(2),   KC_RALT
     ),
-    [1] = LAYOUT_split_7x4(
+    [1] = LAYOUT(
         KC_TAB,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_ASTR, KC_AMPR, KC_LPRN, KC_RPRN, KC_CIRC, KC_BSPC,
         KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LGUI(KC_SPC),                       KC_QUOT, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
         KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG2,  _______,         _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
                                             _______, _______,  _______,         _______,  MO(3),  _______
     ),
-    [2] = LAYOUT_split_7x4(
+    [2] = LAYOUT(
         KC_TAB,  XXXXXXX,    KC_7,    KC_8,    KC_9, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX,
         KC_LCTL, XXXXXXX,    KC_4,    KC_5,    KC_6, XXXXXXX,                            XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
         KC_LSFT, KC_LALT,    KC_1,    KC_2,    KC_3,    KC_0,  _______,         _______, KC_LNG1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                             _______,   MO(3),  _______,         _______,  _______, _______
     ),
-    [3] = LAYOUT_split_7x4(
+    [3] = 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_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         KC_LSFT, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  RGB_TOG,         _______, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c b/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c
index 7ec79f7adda..39ba1843abc 100644
--- a/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c
+++ b/keyboards/sepsepkbd/yubino_hara/keymaps/via/keymap.c
@@ -4,25 +4,25 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_split_7x4(
+    [0] = LAYOUT(
         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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_MINS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_BTN1,          KC_BTN2, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ESC,
                                             KC_LGUI, MO(1),   KC_SPC,           KC_ENT,  MO(2),   KC_RALT
     ),
-    [1] = LAYOUT_split_7x4(
+    [1] = LAYOUT(
         KC_TAB,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_ASTR, KC_AMPR, KC_LPRN, KC_RPRN, KC_CIRC, KC_BSPC,
         KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LGUI(KC_SPC),                       KC_QUOT, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
         KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG2,  RGB_TOG,         _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
                                             _______, _______,  _______,         _______,  MO(3),  _______
     ),
-    [2] = LAYOUT_split_7x4(
+    [2] = LAYOUT(
         KC_TAB,  XXXXXXX,    KC_7,    KC_8,    KC_9, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX,
         KC_LCTL, XXXXXXX,    KC_4,    KC_5,    KC_6, XXXXXXX,                            XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
         KC_LSFT, KC_LALT,    KC_1,    KC_2,    KC_3,    KC_0,  KC_BTN1,         _______, KC_LNG1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
                                             _______,   MO(3),  _______,         _______,  _______, _______
     ),
-    [3] = LAYOUT_split_7x4(
+    [3] = 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_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______,         _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,