Rename layouts containing keyboard name (#23930)

qmk · Jun 23, 2024 · d5e0562 · d5e0562
1 parent 191c8cc
commit d5e0562
Show file tree

Hide file tree

Showing 33 changed files with 112 additions and 83 deletions.
diff --git a/keyboards/boardrun/classic/keyboard.json b/keyboards/boardrun/classic/keyboard.json
@@ -52,8 +52,11 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_classic": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_classic": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
                 {"matrix": [0, 1], "x": 1.5, "y": 0},

diff --git a/keyboards/boardrun/classic/keymaps/default/keymap.c b/keyboards/boardrun/classic/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *          | LGUI   | DEL    | ~`     | LALT   | SPACE  |        | FN     | SPACE  |        | LEFT   | DOWN   | UP     | RIGHT  |
      *          '--------------------------------------------------------------------------------------------------------------------'
      */
-    [_CLASSIC] = LAYOUT_classic(
+    [_CLASSIC] = LAYOUT(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,           KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         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_BSLS,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,           KC_PGUP, KC_H,	   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *          | RGUI   |        |        | RALT   |                 |        |                 |        |        |        |        |
      *          '--------------------------------------------------------------------------------------------------------------------'
      */
-    [_FNCLASSIC] = LAYOUT_classic(
+    [_FNCLASSIC] = LAYOUT(
         QK_BOOT,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,           KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
         _______, _______, KC_APP,  _______, QK_BOOT, _______, _______,          _______, _______, _______, KC_INS,  _______, KC_PSCR, _______,
         KC_CAPS, _______, KC_SCRL, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, KC_RCTL,

diff --git a/keyboards/boardrun/classic/keymaps/via/keymap.c b/keyboards/boardrun/classic/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *          | LGUI   | DEL    | ~`     | LALT   | SPACE  |        | MO     | SPACE  |        | LEFT   | DOWN   | UP     | RIGHT  |
      *          '--------------------------------------------------------------------------------------------------------------------'
      */
-    [0] = LAYOUT_classic(
+    [0] = LAYOUT(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,           KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
         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_BSLS,
         KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,           KC_PGUP, KC_H,	   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -51,23 +51,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *          |        |        |        |        |                 |        |                 |        |        |        |        |
      *          '--------------------------------------------------------------------------------------------------------------------'
      */
-    [1] = LAYOUT_classic(
+    [1] = LAYOUT(
         _______,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,          _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
         _______, _______, KC_APP,  _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_PSCR, KC_F12,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [2] = LAYOUT_classic(
+    [2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [3] = LAYOUT_classic(
+    [3] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,

diff --git a/keyboards/deltasplit75/keymaps/default/keymap.c b/keyboards/deltasplit75/keymaps/default/keymap.c
@@ -7,7 +7,7 @@
 // entirely and just use numbers.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  LAYOUT_v2(
+  LAYOUT_all(
     KC_ESC,  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_INS,  KC_HOME, KC_PGUP,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_END,  KC_PGDN,
     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_BSPC,          KC_SCRL,
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  LAYOUT_v2(
+  LAYOUT_all(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
     KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_VOLU, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,

diff --git a/keyboards/deltasplit75/v2/keyboard.json b/keyboards/deltasplit75/v2/keyboard.json
@@ -36,8 +36,11 @@
             "resync": true
         }
     },
+    "layout_aliases": {
+      "LAYOUT_v2": "LAYOUT_all"
+    },
     "layouts": {
-      "LAYOUT_v2": {
+      "LAYOUT_all": {
         "layout": [
           {"matrix": [0, 0], "x": 0, "y": 0},
           {"matrix": [0, 1], "x": 1, "y": 0},

diff --git a/keyboards/doro67/multi/keyboard.json b/keyboards/doro67/multi/keyboard.json
@@ -34,6 +34,7 @@
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi_blocker"],
   "layout_aliases": {
+    "LAYOUT_multi": "LAYOUT_all",
     "LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
   },
   "layouts": {
@@ -188,7 +189,7 @@
         {"matrix": [4, 14], "x": 15, "y": 4}
       ]
     },
-    "LAYOUT_multi": {
+    "LAYOUT_all": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
         {"matrix": [0, 1], "x": 1, "y": 0},

diff --git a/keyboards/doro67/multi/keymaps/default_multi/keymap.c b/keyboards/doro67/multi/keymaps/default_multi/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │LCtl│LGui│LAlt│  Space   │Spc │ Space  │RAl│Fn │RCt│ ← │ ↓ │ → │
      * └────┴────┴────┴──────────┴────┴────────┴───┴───┴───┴───┴───┴───┘
      */
-    [0] = LAYOUT_multi(
+    [0] = LAYOUT_all(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_INS,
         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_BSPC,          KC_DEL,
         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_ENT,           KC_PGUP,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │    │    │    │          │    │        │   │   │   │   │   │   │
      * └────┴────┴────┴──────────┴────┴────────┴───┴───┴───┴───┴───┴───┘
      */
-    [1] = LAYOUT_multi(
+    [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
         BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,

diff --git a/keyboards/flehrad/tradestation/keyboard.json b/keyboards/flehrad/tradestation/keyboard.json
@@ -30,8 +30,11 @@
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x4"],
+    "layout_aliases": {
+        "LAYOUT_tradestation": "LAYOUT_4x2u"
+    },
     "layouts": {
-        "LAYOUT_tradestation": {
+        "LAYOUT_4x2u": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1.125, "y": 0},

diff --git a/keyboards/handwired/concertina/64key/keyboard.json b/keyboards/handwired/concertina/64key/keyboard.json
@@ -29,8 +29,11 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_64key": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_64key": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [2, 2], "x": 2.5, "y": 0.4},
                 {"matrix": [2, 1], "x": 3.5, "y": 0},

diff --git a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ tap_dance_action_t tap_dance_actions[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_QWERTY] = LAYOUT_64key(
+[_QWERTY] = LAYOUT(
                       SC_LSPO, KC_MINS, KC_EQL,                           KC_VOLD, KC_VOLU, SC_RSPC,
                       SC_LCPO, KC_LGUI, KC_LNG1, KC_ENT,         KC_MUTE, TD(PNX), LAYER_N, SC_RCPC,
                                SC_LAPO, KC_SPC,  SLQ,            SRQ,     KC_ESC,  SC_RAPC,
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                KC_PGDN,                                            KC_DOWN
 ),
 
-[_COLEMAK] = LAYOUT_64key(
+[_COLEMAK] = LAYOUT(
                       _______, _______, _______,                          _______, _______, _______,
                       _______, _______, _______, _______,        _______, _______, _______, _______,
                                _______, _______, _______,        _______, _______, _______,
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                _______,                                            _______
 ),
 
-[_GAMING] = LAYOUT_64key(
+[_GAMING] = LAYOUT(
                       _______, _______, _______,                          _______, _______, _______,
                       _______, _______, _______, _______,        _______, _______, _______, _______,
                                _______, _______, _______,        _______, _______, _______,
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                KC_DOWN,                                            KC_PGDN
 ),
 
-[_NUMERIC] = LAYOUT_64key(
+[_NUMERIC] = LAYOUT(
                       _______, _______, _______,                          KC_ACL1, KC_ACL2, _______,
                       _______, _______, LAYER_C, _______,        KC_ACL0, _______, _______, _______,
                                _______, _______, _______,        KC_SLEP, _______, _______,

diff --git a/keyboards/handwired/dactyl/keyboard.json b/keyboards/handwired/dactyl/keyboard.json
@@ -22,8 +22,11 @@
   "tapping": {
     "toggle": 1
   },
+  "layout_aliases": {
+    "LAYOUT_dactyl": "LAYOUT"
+  },
   "layouts": {
-    "LAYOUT_dactyl": {
+    "LAYOUT": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
         {"matrix": [0, 1], "x": 1, "y": 0},

diff --git a/keyboards/handwired/dactyl/keymaps/default/keymap.c b/keyboards/handwired/dactyl/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |ace   | End  |  | PgDn |      |      |
  *                               `--------------------'  `--------------------'
  */
-[BASE] = LAYOUT_dactyl(  // layer 0 : default
+[BASE] = LAYOUT(  // layer 0 : default
         // left hand
           KC_EQL,          KC_1,           KC_2,     KC_3,     KC_4,  KC_5,
           KC_DEL,          KC_Q,           KC_W,     KC_E,     KC_R,  KC_T,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               `--------------------'  `--------------------'
  */
 // SYMBOLS
-[SYMB] = LAYOUT_dactyl(
+[SYMB] = LAYOUT(
        // left hand
           VRSN,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
        KC_TRNS,  KC_EXLM,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_PIPE,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *
  */
 // MEDIA AND MOUSE
-[MDIA] = LAYOUT_dactyl(
+[MDIA] = LAYOUT(
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MS_U,  KC_TRNS,  KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_TRNS,

diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |ace   | End  |  | PgDn |      |      |
  *                               `--------------------'  `--------------------'
  */
-[BASE] = LAYOUT_dactyl(  // layer 0 : default
+[BASE] = LAYOUT(  // layer 0 : default
         // left hand
           KC_EQL,             KC_1,           KC_2,     KC_3,     KC_4,  KC_5,
           KC_DEL,          KC_QUOT,        KC_COMM,   KC_DOT,     KC_P,  KC_Y,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               `--------------------'  `--------------------'
  */
 // SYMBOLS
-[SYMB] = LAYOUT_dactyl(
+[SYMB] = LAYOUT(
        // left hand
           VRSN,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
        KC_TRNS,  KC_EXLM,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_PIPE,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *
  */
 // MEDIA AND MOUSE
-[MDIA] = LAYOUT_dactyl(
+[MDIA] = LAYOUT(
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MS_U,  KC_TRNS,  KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_TRNS,

diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |Space |      | LGui |  | RGui |      |      |
  *                               `--------------------'  `--------------------'
  */
-[BASE] = LAYOUT_dactyl(  // layer 0 : default
+[BASE] = LAYOUT(  // layer 0 : default
         // left hand
     KC_ESC,     KC_1,     KC_2,     KC_3,     KC_4,      KC_5,
     KC_TAB,  KC_QUOT,  KC_COMM,   KC_DOT,     KC_P,      KC_Y,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               `--------------------'  `--------------------'
  */
 // SYMBOLS
-[CONT] = LAYOUT_dactyl(
+[CONT] = LAYOUT(
        // left hand
        KC_TRNS,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
        KC_TRNS,  KC_TRNS,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *
  */
 // QWERTY
-[QWER] = LAYOUT_dactyl(
+[QWER] = LAYOUT(
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
        KC_TRNS,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
        KC_TRNS,     KC_A,     KC_S,     KC_D,     KC_F,     KC_G,

diff --git a/keyboards/handwired/owlet60/keyboard.json b/keyboards/handwired/owlet60/keyboard.json
@@ -42,11 +42,13 @@
     "debounce": 9,
     "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
+        "LAYOUT_owlet60_full_bsp": "LAYOUT_full_bs",
+        "LAYOUT_owlet60_split_bsp": "LAYOUT_split_bs",
         "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
         "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
     },
     "layouts": {
-        "LAYOUT_owlet60_full_bsp": {
+        "LAYOUT_full_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0.5, "y": 0},
 
@@ -132,7 +134,7 @@
                 {"matrix": [3, 7], "x": 18, "y": 4}
             ]
         },
-        "LAYOUT_owlet60_split_bsp": {
+        "LAYOUT_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0.5, "y": 0},
 

diff --git a/keyboards/handwired/owlet60/keymaps/default/keymap.c b/keyboards/handwired/owlet60/keymaps/default/keymap.c
@@ -16,15 +16,15 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_owlet60_full_bsp(
+  [0] = LAYOUT_full_bs(
     KC_1,    KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,    KC_EQL,     KC_BSPC,   KC_PGUP,
     KC_2,    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_BSLS,   KC_PGDN,
     KC_3,    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_ENT,                KC_HOME,
             KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT,    KC_UP,     KC_END,
             KC_LCTL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT
   ),
 
-  [1] = LAYOUT_owlet60_full_bsp(
+  [1] = LAYOUT_full_bs(
     KC_NO,       KC_GRV, 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_DEL,   RGB_TOG,
     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,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_NO,    KC_NO,                RGB_VAI,

diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
@@ -16,15 +16,15 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_owlet60_full_bsp(
+  [0] = LAYOUT_full_bs(
     KC_1,    KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,    KC_EQL,     KC_BSPC,   KC_PGUP,
     KC_2,    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_BSLS,   KC_PGDN,
     KC_3,    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_ENT,                KC_HOME,
             KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,    KC_RSFT,    KC_UP,     KC_END,
             KC_LCTL,        KC_LALT,        KC_SPC, MO(1),KC_SPC,                 KC_RALT,                    KC_LEFT,    KC_DOWN,   KC_RIGHT
   ),
 
-  [1] = LAYOUT_owlet60_full_bsp(
+  [1] = LAYOUT_full_bs(
     KC_NO,       KC_GRV, 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_DEL,   RGB_TOG,
     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,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_NO,    KC_NO,                RGB_VAI,

diff --git a/keyboards/handwired/pterodactyl/keyboard.json b/keyboards/handwired/pterodactyl/keyboard.json
@@ -26,8 +26,11 @@
   "bluetooth": {
     "driver": "bluefruit_le"
   },
+  "layout_aliases": {
+    "LAYOUT_pterodactyl": "LAYOUT"
+  },
   "layouts": {
-    "LAYOUT_pterodactyl": {
+    "LAYOUT": {
       "layout": [
         {"matrix": [0, 11], "x": 0, "y": 0},
         {"matrix": [0, 10], "x": 1, "y": 0},