diff --git a/keyboards/trnthsn/s6xty5/readme.md b/keyboards/trnthsn/s6xty5/readme.md
index a14ef0a5397..2c8e021089a 100644
--- a/keyboards/trnthsn/s6xty5/readme.md
+++ b/keyboards/trnthsn/s6xty5/readme.md
@@ -9,7 +9,7 @@ A PCB for 65% keyboards. Uses a Left USB Type C connector or JST SH daughter boa
 
 * Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn)
 * Hardware Supported: STM32, S6xty5, Bakeneko65, Krush65
-* Hardware Availability: [Trnthsn](https://www.facebook.com/ThanhSon.mech)
+* Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/trnthsn/tyson60s/keyboard.json b/keyboards/trnthsn/tyson60s/keyboard.json
index a2ec365fa98..1f56820f936 100644
--- a/keyboards/trnthsn/tyson60s/keyboard.json
+++ b/keyboards/trnthsn/tyson60s/keyboard.json
@@ -1,7 +1,7 @@
 {
-    "manufacturer": "TrnThSnMech",
+    "manufacturer": "ThanhSon.Mech",
     "keyboard_name": "Tyson60s",
-    "maintainer": "TrnThSnMech",
+    "maintainer": "trnthsn",
     "bootloader": "rp2040",
     "build": {
         "debounce_type": "sym_defer_pk"
@@ -46,11 +46,11 @@
         "pin": "GP29"
     },
     "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+        "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
     },
     "community_layouts": [
         "60_ansi_tsangan",
-        "60_tsangan_hhkb",
+        "60_ansi_tsangan_split_bs_rshift",
         "60_ansi_wkl",
         "60_ansi_wkl_split_bs_rshift",
         "60_hhkb"
@@ -124,7 +124,7 @@
                 {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
-        "LAYOUT_60_tsangan_hhkb": {
+        "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/trnthsn/tyson60s/readme.md b/keyboards/trnthsn/tyson60s/readme.md
index 6a1261e70c3..32aa8e8f67c 100644
--- a/keyboards/trnthsn/tyson60s/readme.md
+++ b/keyboards/trnthsn/tyson60s/readme.md
@@ -8,7 +8,7 @@ A Hiney H60 form factor PCB for 60% keyboards. Uses a Left USB Type C connector
 
 * Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn)
 * Hardware Supported: RP2040, Tyson60s PCB, Hiney H60
-* Hardware Availability: [Trnthsn](https://www.facebook.com/TrnThSn.Mech)
+* Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech)
 
 Make example for this keyboard (after setting up your build environment):