5 files changed, 11 insertions, 7 deletions

diff --git a/keyboards/suihankey/split/alpha/alpha.h b/keyboards/suihankey/split/alpha/alpha.h
index f14639806..ba93405ec 100644
--- a/keyboards/suihankey/split/alpha/alpha.h
+++ b/keyboards/suihankey/split/alpha/alpha.h
@@ -25,7 +25,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_split_3x5_3( \
     L00, L01, L02, L03, L04,            R04, R03, R02, R01, R00, \
     L10, L11, L12, L13, L14,            R14, R13, R12, R11, R10, \
     L20, L21, L22, L23, L24,            R24, R23, R22, R21, R20, \
@@ -42,3 +42,4 @@
     { R30, R31, R32  }, \
 }
 
+#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/suihankey/split/info.json b/keyboards/suihankey/split/info.json
index f50012dd1..e95f2bd9c 100644
--- a/keyboards/suihankey/split/info.json
+++ b/keyboards/suihankey/split/info.json
@@ -5,7 +5,7 @@
     "width": 13.2,
     "height": 4.85,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_3": {
             "layout": [
                 {"x": 0, "y": 0.375},
                 {"x": 1, "y": 0.125},
diff --git a/keyboards/suihankey/split/keymaps/default/keymap.c b/keyboards/suihankey/split/keymaps/default/keymap.c
index 9b8448ac2..e844db9ed 100644
--- a/keyboards/suihankey/split/keymaps/default/keymap.c
+++ b/keyboards/suihankey/split/keymaps/default/keymap.c
@@ -29,25 +29,25 @@ enum layers{
 #define KC_SET_CTRL  LT(SETTING,KC_LCTRL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT( /* Base */
+  [BASE] = LAYOUT_split_3x5_3( /* Base */
           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_SCLN,
           KC_Z,  KC_X,  KC_C, KC_V, KC_B,                 KC_N,  KC_M,  KC_COMMA, KC_DOT, KC_SLASH,
        KC_SET_CTRL,  KC_NUM_ALT,  KC_CMD_SP,                 KC_CMD_ET,  KC_BSPC,  KC_LSFT
   ),
-  [COMMAND] = LAYOUT( /* Base */
+  [COMMAND] = LAYOUT_split_3x5_3( /* Base */
           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_SCLN,
     LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V), LCTL(KC_B),   KC_N,  KC_M,  KC_COMMA, KC_DOT, KC_SLASH,
                    KC_NO,  KC_NO,  KC_NO,                           KC_NO,  KC_NO,  KC_NO
   ),
-  [NUMBER] = LAYOUT( /* Base */
+  [NUMBER] = LAYOUT_split_3x5_3( /* Base */
           KC_F1,  KC_F2,  KC_F3, KC_F4, KC_F5,                 KC_P7,  KC_P8,  KC_P9, KC_NO, KC_NO,
           KC_F6,  KC_F7,  KC_F8, KC_F9, KC_F10,                KC_P4,  KC_P5,  KC_P6, KC_NO, KC_NO,
           KC_F11, KC_F12, KC_NO, KC_NO, KC_NO,                 KC_P1,  KC_P2,  KC_P3, KC_NO, KC_NO,
                         KC_NO,  KC_NO,  KC_NO,                 KC_P0,  KC_PDOT,  KC_NO
   ),
-  [SETTING] = LAYOUT( /* Base */
+  [SETTING] = LAYOUT_split_3x5_3( /* Base */
           KC_NO,  KC_NO,  KC_NO, KC_NO, KC_NO,                 KC_NO,  KC_NO,  KC_NO, KC_NO, KC_NO,
           KC_NO,  KC_NO,  KC_NO, KC_NO, KC_NO,                 KC_NO,  KC_NO,  KC_NO, KC_NO, KC_NO,
           KC_NO,  KC_NO,  KC_NO, KC_NO, RGB_MOD,                 KC_NO,  KC_NO,  KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/suihankey/split/rev1/rev1.h b/keyboards/suihankey/split/rev1/rev1.h
index bf5468234..98618ba71 100644
--- a/keyboards/suihankey/split/rev1/rev1.h
+++ b/keyboards/suihankey/split/rev1/rev1.h
@@ -25,7 +25,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_split_3x5_3( \
     L00, L01, L02, L03, L04,            R04, R03, R02, R01, R00, \
     L10, L11, L12, L13, L14,            R14, R13, R12, R11, R10, \
     L20, L21, L22, L23, L24,            R24, R23, R22, R21, R20, \
@@ -43,3 +43,5 @@
     { R03, R13, R23, KC_NO }, \
     { R04, R14, R24, KC_NO }, \
 }
+
+#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/suihankey/split/rev1/rules.mk b/keyboards/suihankey/split/rev1/rules.mk
index 1e3cebb14..d3661099d 100644
--- a/keyboards/suihankey/split/rev1/rules.mk
+++ b/keyboards/suihankey/split/rev1/rules.mk
@@ -1 +1,2 @@
 RGBLIGHT_ENABLE = yes
+LAYOUTS = split_3x5_3