diff --git a/data/resources/discsets.yaml b/data/resources/discsets.yaml
index 7b46d4a7a..9a01fa6a9 100644
--- a/data/resources/discsets.yaml
+++ b/data/resources/discsets.yaml
@@ -3002,12 +3002,14 @@
     - SLPS-02184
 - name: "Tomb Raider III - Adventures of Lara Croft"
   localizedName: "トゥームレイダー３"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Asia)"
   serials:
     - SCPS-45385
     - SCPS-45386
 - name: "Tomb Raider III - Adventures of Lara Croft"
   localizedName: "トゥームレイダー３"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Japan)"
   serials:
     - SLPM-86196
diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index ae4b8f7ad..107994281 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -20097,6 +20097,7 @@ SLES-02854:
     linkCable: false
 SLES-01304:
   name: "Breath of Fire III"
+  sortName: "Breath of Fire 3"
   saveName: "Breath of Fire III (Europe)"
   controllers:
     - DigitalController
@@ -20121,6 +20122,7 @@ SLES-01304:
     linkCable: false
 SLES-01319:
   name: "Breath of Fire III"
+  sortName: "Breath of Fire 3"
   saveName: "Breath of Fire III (France)"
   controllers:
     - DigitalController
@@ -20145,6 +20147,7 @@ SLES-01319:
     linkCable: false
 SLES-01320:
   name: "Breath of Fire III"
+  sortName: "Breath of Fire 3"
   saveName: "Breath of Fire III (Germany)"
   controllers:
     - DigitalController
@@ -20170,6 +20173,7 @@ SLES-01320:
 SLPS-00990:
   name: "Breath of Fire III"
   localizedName: "ブレス　オブ　ファイアⅢ"
+  sortName: "Breath of Fire 3"
   saveName: "Breath of Fire III (Japan)"
   controllers:
     - DigitalController
@@ -20195,6 +20199,7 @@ SLPS-00990:
 SLPM-80115:
   name: "Breath of Fire III (Demo)"
   localizedName: "ブレス　オブ　ファイアⅢ"
+  sortName: "Breath of Fire 3 (Demo)"
   saveName: "Breath of Fire III (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
@@ -20205,6 +20210,7 @@ SLPM-80115:
     cdromMaxReadSpeedupCycles: 60000
 SLUS-00422:
   name: "Breath of Fire III"
+  sortName: "Breath of Fire 3"
   saveName: "Breath of Fire III (USA)"
   compatibility:
     rating: NoIssues
@@ -20232,6 +20238,7 @@ SLUS-00422:
     linkCable: false
 SLPM-86720:
   name: "Breath of Fire III [PlayStation the Best] (aka Breath of Fire 3 [PlayStation the Best])"
+  sortName: "Breath of Fire 3"
   controllers:
     - DigitalController
   traits:
@@ -20255,6 +20262,7 @@ SLPM-86720:
     linkCable: false
 SLES-03552:
   name: "Breath of Fire IV"
+  sortName: "Breath of Fire 4"
   saveName: "Breath of Fire IV (Europe)"
   controllers:
     - AnalogController
@@ -20281,6 +20289,7 @@ SLES-03552:
     linkCable: false
 SLUS-01324:
   name: "Breath of Fire IV"
+  sortName: "Breath of Fire 4"
   saveName: "Breath of Fire IV (USA)"
   compatibility:
     rating: NoIssues
@@ -20310,6 +20319,7 @@ SLUS-01324:
     linkCable: false
 SLPS-02728:
   name: "Breath of Fire IV: Utsurowazaru Mono"
+  sortName: "Breath of Fire 4"
   controllers:
     - AnalogController
     - DigitalController
@@ -28392,6 +28402,7 @@ SLPS-01838:
     linkCable: false
 SLES-00870:
   name: "Clock Tower"
+  sortName: "Clock Tower 2"
   saveName: "Clock Tower (Europe)"
   controllers:
     - DigitalController
@@ -28412,6 +28423,7 @@ SLES-00870:
     linkCable: false
 SLES-00871:
   name: "Clock Tower"
+  sortName: "Clock Tower 2"
   saveName: "Clock Tower (France)"
   controllers:
     - DigitalController
@@ -28432,6 +28444,7 @@ SLES-00871:
     linkCable: false
 SLES-00872:
   name: "Clock Tower"
+  sortName: "Clock Tower 2"
   saveName: "Clock Tower (Germany)"
   controllers:
     - DigitalController
@@ -28452,6 +28465,7 @@ SLES-00872:
     linkCable: false
 SLUS-00539:
   name: "Clock Tower"
+  sortName: "Clock Tower 2"
   saveName: "Clock Tower (USA)"
   compatibility:
     rating: NoIssues
@@ -28475,6 +28489,7 @@ SLUS-00539:
     linkCable: false
 SCPS-45173:
   name: "Clock Tower - Ghost Head"
+  sortName: "Clock Tower 3"
   controllers:
     - AnalogController
     - DigitalController
@@ -28496,6 +28511,7 @@ SCPS-45173:
 SLPS-01290:
   name: "Clock Tower - Ghost Head"
   localizedName: "クロックタワー　～ゴーストヘッド～"
+  sortName: "Clock Tower 3"
   saveName: "Clock Tower - Ghost Head (Japan)"
   controllers:
     - AnalogController
@@ -28518,11 +28534,13 @@ SLPS-01290:
 SLPM-80219:
   name: "Clock Tower - Ghost Head (Demo)"
   localizedName: "クロックタワー　～ゴーストヘッド～"
+  sortName: "Clock Tower 3 (Demo)"
   saveName: "Clock Tower - Ghost Head (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91175:
   name: "Clock Tower - Ghost Head [Playstation the Best]"
+  sortName: "Clock Tower 3 (Playstation the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28544,6 +28562,7 @@ SLPS-91175:
 SLPS-00917:
   name: "Clock Tower - The First Fear"
   localizedName: "クロック・タワー　～ザ・ファースト・フィアー～"
+  sortName: "Clock Tower 1"
   saveName: "Clock Tower - The First Fear (Japan)"
   compatibility:
     rating: NoIssues
@@ -28604,6 +28623,7 @@ SLPM-80063:
     genre: "** DEMO **"
 SLUS-00695:
   name: "Clock Tower II - The Struggle Within"
+  sortName: "Clock Tower 3"
   saveName: "Clock Tower II - The Struggle Within (USA)"
   controllers:
     - AnalogController
@@ -89452,6 +89472,7 @@ SLPS-00247:
     linkCable: false
 SCES-00510:
   name: "King's Field"
+  sortName: "King's Field 2"
   saveName: "King's Field (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
@@ -89493,6 +89514,7 @@ SLPS-00017:
     linkCable: false
 SLUS-00158:
   name: "King's Field"
+  sortName: "King's Field 2"
   saveName: "King's Field (USA)"
   compatibility:
     rating: NoIssues
@@ -89516,6 +89538,7 @@ SLUS-00158:
 SLPS-00069:
   name: "King's Field II"
   localizedName: "キングスフィールドＩＩ"
+  sortName: "King's Field 2"
   saveName: "King's Field II (Japan)"
   controllers:
     - DigitalController
@@ -89538,6 +89561,7 @@ SLPS-00069:
 SLPS-91003:
   name: "King's Field II (PlayStation the Best)"
   localizedName: "キングスフィールドＩＩ"
+  sortName: "King's Field 2 (PlayStation the Best)"
   saveName: "King's Field II (Japan) (PlayStation the Best)"
   controllers:
     - DigitalController
@@ -89558,6 +89582,7 @@ SLPS-91003:
 SLPS-03579:
   name: "King's Field II (PlayStation the Best)"
   localizedName: "キングスフィールドＩＩ"
+  sortName: "King's Field 2 (PlayStation the Best) (Rev 1)"
   saveName: "King's Field II (Japan) (PlayStation the Best) (Rev 1)"
   controllers:
     - DigitalController
@@ -89580,6 +89605,7 @@ SLPS-03579:
     linkCable: false
 SLUS-00255:
   name: "King's Field II"
+  sortName: "King's Field 3"
   saveName: "King's Field II (USA)"
   compatibility:
     rating: NoIssues
@@ -89603,6 +89629,7 @@ SLUS-00255:
 SLPS-00377:
   name: "King's Field III"
   localizedName: "キングス・フィールドⅢ"
+  sortName: "King's Field 3"
   saveName: "King's Field III (Japan)"
   controllers:
     - DigitalController
@@ -89623,6 +89650,7 @@ SLPS-00377:
 SLPS-03580:
   name: "King's Field III"
   localizedName: "キングス・フィールドⅢ"
+  sortName: "King's Field 3 (Rev 1)"
   saveName: "King's Field III (Japan) (Rev 1)"
   controllers:
     - DigitalController
@@ -181216,6 +181244,7 @@ SLUS-00152:
     linkCable: false
 SLES-03334:
   name: "Tomb Raider - Die Chronik"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider - Die Chronik (Germany)"
   controllers:
     - AnalogController
@@ -181236,6 +181265,7 @@ SLES-03334:
     linkCable: false
 SLES-02239:
   name: "Tomb Raider - La Revelation Finale"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider - La Revelation Finale (France)"
   compatibility:
     rating: NoIssues
@@ -181259,6 +181289,7 @@ SLES-02239:
     linkCable: false
 SLES-03333:
   name: "Tomb Raider - Sur les Traces de Lara Croft"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider - Sur les Traces de Lara Croft (France)"
   controllers:
     - AnalogController
@@ -181279,6 +181310,7 @@ SLES-03333:
     linkCable: false
 SLES-02238:
   name: "Tomb Raider - The Last Revelation"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider - The Last Revelation (Europe, Australia)"
   controllers:
     - AnalogController
@@ -181299,11 +181331,13 @@ SLES-02238:
     linkCable: false
 SLED-02418:
   name: "Tomb Raider - The Last Revelation (Demo)"
+  sortName: "Tomb Raider 4 (Demo)"
   saveName: "Tomb Raider - The Last Revelation (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02241:
   name: "Tomb Raider - The Last Revelation"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider - The Last Revelation (Italy)"
   controllers:
     - AnalogController
@@ -181324,6 +181358,7 @@ SLES-02241:
     linkCable: false
 SLES-02242:
   name: "Tomb Raider - The Last Revelation"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider - The Last Revelation (Spain)"
   controllers:
     - AnalogController
@@ -181344,6 +181379,7 @@ SLES-02242:
     linkCable: false
 SLUS-00885:
   name: "Tomb Raider - The Last Revelation"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider - The Last Revelation (USA)"
   compatibility:
     rating: NoIssues
@@ -181399,6 +181435,7 @@ SLPM-80168:
     genre: "** DEMO **"
 SLES-03331:
   name: "Tomb Raider Chronicles"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider Chronicles (Europe)"
   controllers:
     - AnalogController
@@ -181419,6 +181456,7 @@ SLES-03331:
     linkCable: false
 SLES-03336:
   name: "Tomb Raider Chronicles"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider Chronicles (Spain)"
   controllers:
     - AnalogController
@@ -181439,6 +181477,7 @@ SLES-03336:
     linkCable: false
 SLUS-01311:
   name: "Tomb Raider Chronicles"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider Chronicles (USA)"
   compatibility:
     rating: NoIssues
@@ -181464,6 +181503,7 @@ SLUS-01311:
     linkCable: false
 SLES-03335:
   name: "Tomb Raider Chronicles - La Leggenda di Lara Croft"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider Chronicles - La Leggenda di Lara Croft (Italy)"
   controllers:
     - AnalogController
@@ -181484,6 +181524,7 @@ SLES-03335:
     linkCable: false
 SLES-00718:
   name: "Tomb Raider II - Starring Lara Croft"
+  sortName: "Tomb Raider 2"
   saveName: "Tomb Raider II - Starring Lara Croft (Europe)"
   controllers:
     - DigitalController
@@ -181503,6 +181544,7 @@ SLES-00718:
     linkCable: false
 SLES-00719:
   name: "Tomb Raider II - Starring Lara Croft"
+  sortName: "Tomb Raider 2"
   saveName: "Tomb Raider II - Starring Lara Croft (France)"
   controllers:
     - DigitalController
@@ -181522,11 +181564,13 @@ SLES-00719:
     linkCable: false
 SLED-01036:
   name: "Tomb Raider II - Starring Lara Croft (Demo)"
+  sortName: "Tomb Raider 2 (Demo)"
   saveName: "Tomb Raider II - Starring Lara Croft (France) (En,Fr,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00720:
   name: "Tomb Raider II - Starring Lara Croft"
+  sortName: "Tomb Raider 2"
   saveName: "Tomb Raider II - Starring Lara Croft (Germany)"
   controllers:
     - DigitalController
@@ -181546,6 +181590,7 @@ SLES-00720:
     linkCable: false
 SLES-00107:
   name: "Tomb Raider II - Starring Lara Croft"
+  sortName: "Tomb Raider 2"
   saveName: "Tomb Raider II - Starring Lara Croft (Italy)"
   controllers:
     - DigitalController
@@ -181567,6 +181612,7 @@ SLES-00107:
     linkCable: false
 SLUS-00437:
   name: "Tomb Raider II - Starring Lara Croft"
+  sortName: "Tomb Raider 2"
   saveName: "Tomb Raider II - Starring Lara Croft (USA)"
   compatibility:
     rating: NoIssues
@@ -181590,6 +181636,7 @@ SLUS-00437:
 SCPS-45385:
   name: "Tomb Raider III - Adventures of Lara Croft (Disc 1) (Japanese Version)"
   localizedName: "トゥームレイダー３"
+  sortName: "Tomb Raider 3 (Disc 1)"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Asia) (Disc 1) (Japanese Version)"
   controllers:
     - AnalogController
@@ -181612,6 +181659,7 @@ SCPS-45385:
 SCPS-45386:
   name: "Tomb Raider III - Adventures of Lara Croft (Disc 2) (International Version)"
   localizedName: "トゥームレイダー3"
+  sortName: "Tomb Raider 3 (Disc 2)"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Asia) (Disc 2) (International Version)"
   controllers:
     - AnalogController
@@ -181633,6 +181681,7 @@ SCPS-45386:
     linkCable: false
 SLES-01649:
   name: "Tomb Raider III - Adventures of Lara Croft"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Europe)"
   controllers:
     - AnalogController
@@ -181653,6 +181702,7 @@ SLES-01649:
     linkCable: false
 SLES-01683:
   name: "Tomb Raider III - Adventures of Lara Croft"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Germany)"
   controllers:
     - AnalogController
@@ -181673,6 +181723,7 @@ SLES-01683:
     linkCable: false
 SLES-01684:
   name: "Tomb Raider III - Adventures of Lara Croft"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Italy)"
   controllers:
     - AnalogController
@@ -181694,12 +181745,14 @@ SLES-01684:
 SLPM-80385:
   name: "Tomb Raider III - Adventures of Lara Croft (Demo)"
   localizedName: "トゥームレイダー３"
+  sortName: "Tomb Raider 3 (Demo)"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86196:
   name: "Tomb Raider III - Adventures of Lara Croft (Disc 1) (Japanese Version)"
   localizedName: "トゥームレイダー３"
+  sortName: "Tomb Raider 3 (Disc 1)"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 1) (Japanese Version)"
   controllers:
     - AnalogController
@@ -181722,6 +181775,7 @@ SLPM-86196:
 SLPM-86197:
   name: "Tomb Raider III - Adventures of Lara Croft (Disc 2) (International Version)"
   localizedName: "トゥームレイダー３"
+  sortName: "Tomb Raider 3 (Disc 2)"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 2) (International Version)"
   controllers:
     - AnalogController
@@ -181743,6 +181797,7 @@ SLPM-86197:
     linkCable: false
 SLES-01685:
   name: "Tomb Raider III - Adventures of Lara Croft"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (Spain)"
   controllers:
     - AnalogController
@@ -181763,6 +181818,7 @@ SLES-01685:
     linkCable: false
 SLUS-00691:
   name: "Tomb Raider III - Adventures of Lara Croft"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Adventures of Lara Croft (USA)"
   compatibility:
     rating: NoIssues
@@ -181786,6 +181842,7 @@ SLUS-00691:
     linkCable: false
 SLES-01682:
   name: "Tomb Raider III - Les Aventures de Lara Croft"
+  sortName: "Tomb Raider 3"
   saveName: "Tomb Raider III - Les Aventures de Lara Croft (France)"
   controllers:
     - AnalogController
@@ -181806,11 +181863,13 @@ SLES-01682:
     linkCable: false
 SLED-01709:
   name: "Tomb Raider III - Les Aventures de Lara Croft (Demo)"
+  sortName: "Tomb Raider 3 (Demo)"
   saveName: "Tomb Raider III - Les Aventures de Lara Croft (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02240:
   name: "Tomb Raider IV - The Last Revelation"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider IV - The Last Revelation (Germany)"
   controllers:
     - AnalogController
@@ -181832,6 +181891,7 @@ SLES-02240:
 SLPM-86896:
   name: "Tomb Raider IV - The Last Revelation"
   localizedName: "トゥームレイダー４　ラスト　レベレーション"
+  sortName: "Tomb Raider 4"
   saveName: "Tomb Raider IV - The Last Revelation (Japan)"
   controllers:
     - AnalogController
@@ -181860,6 +181920,7 @@ SLED-01623:
     genre: "** DEMO **"
 SLPM-87160:
   name: "Tomb Raider V - Chronicles (Capkore)"
+  sortName: "Tomb Raider 5"
   controllers:
     - AnalogController
     - DigitalController
@@ -181880,6 +181941,7 @@ SLPM-87160:
 SLPM-86779:
   name: "Tomb Raider V - Chronicles"
   localizedName: "トゥームレイダー５　クロニクル"
+  sortName: "Tomb Raider 5"
   saveName: "Tomb Raider V - Chronicles (Japan)"
   controllers:
     - AnalogController