diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index f15cc9c3870..597c5dc818f 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -21,13 +21,16 @@
             ["D3", "D0", "C4", "B4"]
         ]
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ortho_1x4"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_ortho_1x4": {
             "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 3, "y": 0, "matrix": [0, 3]}
+                {"label": "L", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "O", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "V", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}
             ]
         }
     }
diff --git a/keyboards/xiudi/xd004/keymaps/default/keymap.c b/keyboards/xiudi/xd004/keymaps/default/keymap.c
index f54f422613f..2034bc15eec 100644
--- a/keyboards/xiudi/xd004/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd004/keymaps/default/keymap.c
@@ -3,6 +3,6 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
-    LAYOUT_all(KC_L, KC_O, KC_V, KC_E),
+    LAYOUT_ortho_1x4(KC_L, KC_O, KC_V, KC_E),
 
 };
diff --git a/keyboards/xiudi/xd004/keymaps/narze/keymap.c b/keyboards/xiudi/xd004/keymaps/narze/keymap.c
index 30ea48d6837..9aa47081b49 100644
--- a/keyboards/xiudi/xd004/keymaps/narze/keymap.c
+++ b/keyboards/xiudi/xd004/keymaps/narze/keymap.c
@@ -19,6 +19,6 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
-    LAYOUT_all(HYPR(KC_F2), HYPR(KC_F1), LCTL(KC_B), LCTL(KC_X)),
+    LAYOUT_ortho_1x4(HYPR(KC_F2), HYPR(KC_F1), LCTL(KC_B), LCTL(KC_X)),
 
 };
diff --git a/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c b/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
index 60f0e15bbe3..f87a04e1e43 100644
--- a/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
+++ b/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
@@ -25,13 +25,13 @@ enum custom_keycodes {  // Make sure have the awesome keycode ready
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     // 0: Base Layer
-    [_BASE] = LAYOUT_all(LT(_SYSTEM, KC_F5), C(G(KC_LEFT)), C(G(KC_RIGHT)), LT(_VOLUME, KC_F7)),
+    [_BASE] = LAYOUT_ortho_1x4(LT(_SYSTEM, KC_F5), C(G(KC_LEFT)), C(G(KC_RIGHT)), LT(_VOLUME, KC_F7)),
 
     // 1: System actions
-    [_SYSTEM] = LAYOUT_all(_______, SUPER_ALT_F4, G(KC_D), G(KC_L)),
+    [_SYSTEM] = LAYOUT_ortho_1x4(_______, SUPER_ALT_F4, G(KC_D), G(KC_L)),
 
     // 2: Volume actions
-    [_VOLUME] = LAYOUT_all(KC_MEDIA_NEXT_TRACK, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _______),
+    [_VOLUME] = LAYOUT_ortho_1x4(KC_MEDIA_NEXT_TRACK, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _______),
 
 };