diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index 50ffda0d8..d55877f76 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -17,11 +17,13 @@ SLPS-03086:
     multitap: false
     linkCable: false
 SLPM-80238:
-  name: "'98 Koushien (Japan) (Demo)"
+  name: "'98 Koushien (Demo)"
+  saveName: "'98 Koushien (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01204:
-  name: "'98 Koushien - Koukou Yakyuu Simulation (Japan)"
+  name: "'98 Koushien - Koukou Yakyuu Simulation"
+  saveName: "'98 Koushien - Koukou Yakyuu Simulation (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -60,7 +62,8 @@ SLPS-03085:
     multitap: false
     linkCable: false
 SLPS-02110:
-  name: "'99 Koushien (Japan)"
+  name: "'99 Koushien"
+  saveName: "'99 Koushien (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -78,9 +81,11 @@ SLPS-02110:
     multitap: false
     linkCable: false
 SLPM-80421:
-  name: "'99 Koushien (Japan) (Taikenban)"
+  name: "'99 Koushien (Taikenban)"
+  saveName: "'99 Koushien (Japan) (Taikenban)"
 SLPS-01169:
-  name: "'Butagee' de Iinja Nai (Japan)"
+  name: "'Butagee' de Iinja Nai"
+  saveName: "'Butagee' de Iinja Nai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98,7 +103,8 @@ SLPS-01169:
     multitap: false
     linkCable: false
 SLPS-00965:
-  name: "...Iru! (Japan)"
+  name: "...Iru!"
+  saveName: "...Iru! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -152,7 +158,8 @@ SLPS-02044:
     multitap: false
     linkCable: false
 SLPS-01311:
-  name: "0 kara no Mahjong - Mahjong Youchien Tamago-gumi (Japan)"
+  name: "0 kara no Mahjong - Mahjong Youchien Tamago-gumi"
+  saveName: "0 kara no Mahjong - Mahjong Youchien Tamago-gumi (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
@@ -177,7 +184,8 @@ SLPS-01311:
     multitap: false
     linkCable: false
 SLPS-01986:
-  name: "0 kara no Shougi - Shougi Youchien Ayumi-gumi (Japan)"
+  name: "0 kara no Shougi - Shougi Youchien Ayumi-gumi"
+  saveName: "0 kara no Shougi - Shougi Youchien Ayumi-gumi (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
@@ -201,7 +209,8 @@ SLPS-01986:
     multitap: false
     linkCable: false
 SLES-02375:
-  name: "007 - Demain ne Meurt Jamais (France)"
+  name: "007 - Demain ne Meurt Jamais"
+  saveName: "007 - Demain ne Meurt Jamais (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -220,7 +229,8 @@ SLES-02375:
     multitap: false
     linkCable: false
 SLES-02376:
-  name: "007 - Der Morgen Stirbt Nie (Germany)"
+  name: "007 - Der Morgen Stirbt Nie"
+  saveName: "007 - Der Morgen Stirbt Nie (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -239,7 +249,8 @@ SLES-02376:
     multitap: false
     linkCable: false
 SLES-03136:
-  name: "007 - Die Welt Ist Nicht Genug (Germany)"
+  name: "007 - Die Welt Ist Nicht Genug"
+  saveName: "007 - Die Welt Ist Nicht Genug (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -258,7 +269,8 @@ SLES-03136:
     multitap: false
     linkCable: false
 SLES-03137:
-  name: "007 - El Mundo Nunca es Suficiente (Spain)"
+  name: "007 - El Mundo Nunca es Suficiente"
+  saveName: "007 - El Mundo Nunca es Suficiente (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -277,7 +289,8 @@ SLES-03137:
     multitap: false
     linkCable: false
 SLES-03135:
-  name: "007 - Le Monde ne Suffit Pas (France)"
+  name: "007 - Le Monde ne Suffit Pas"
+  saveName: "007 - Le Monde ne Suffit Pas (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -296,7 +309,8 @@ SLES-03135:
     multitap: false
     linkCable: false
 SLES-03134:
-  name: "007 - The World Is Not Enough (Europe)"
+  name: "007 - The World Is Not Enough"
+  saveName: "007 - The World Is Not Enough (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -315,7 +329,8 @@ SLES-03134:
     multitap: false
     linkCable: false
 SLES-03138:
-  name: "007 - The World Is Not Enough (Sweden)"
+  name: "007 - The World Is Not Enough"
+  saveName: "007 - The World Is Not Enough (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -334,7 +349,8 @@ SLES-03138:
     multitap: false
     linkCable: false
 SLUS-01272:
-  name: "007 - The World Is Not Enough (USA)"
+  name: "007 - The World Is Not Enough"
+  saveName: "007 - The World Is Not Enough (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -356,9 +372,11 @@ SLUS-01272:
     multitap: false
     linkCable: false
 SLUS-00978:
-  name: "007 - The World Is Not Enough (USA) (Beta)"
+  name: "007 - The World Is Not Enough (Beta)"
+  saveName: "007 - The World Is Not Enough (USA) (Beta)"
 SLES-01324:
-  name: "007 - Tomorrow Never Dies (Europe)"
+  name: "007 - Tomorrow Never Dies"
+  saveName: "007 - Tomorrow Never Dies (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -377,7 +395,8 @@ SLES-01324:
     multitap: false
     linkCable: false
 SLPS-02604:
-  name: "007 - Tomorrow Never Dies (Japan)"
+  name: "007 - Tomorrow Never Dies"
+  saveName: "007 - Tomorrow Never Dies (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -399,7 +418,8 @@ SLPS-02604:
     multitap: false
     linkCable: false
 SLUS-00975:
-  name: "007 - Tomorrow Never Dies (USA)"
+  name: "007 - Tomorrow Never Dies"
+  saveName: "007 - Tomorrow Never Dies (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -421,7 +441,8 @@ SLUS-00975:
     multitap: false
     linkCable: false
 SLES-03355:
-  name: "007 Racing (Europe)"
+  name: "007 Racing"
+  saveName: "007 Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -441,7 +462,8 @@ SLES-03355:
     multitap: false
     linkCable: false
 SLES-03356:
-  name: "007 Racing (France)"
+  name: "007 Racing"
+  saveName: "007 Racing (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -461,7 +483,8 @@ SLES-03356:
     multitap: false
     linkCable: false
 SLES-03357:
-  name: "007 Racing (Germany)"
+  name: "007 Racing"
+  saveName: "007 Racing (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -481,7 +504,8 @@ SLES-03357:
     multitap: false
     linkCable: false
 SLUS-01300:
-  name: "007 Racing (USA)"
+  name: "007 Racing"
+  saveName: "007 Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -504,7 +528,8 @@ SLUS-01300:
     multitap: false
     linkCable: false
 SLPS-01706:
-  name: "1 on 1 (Japan)"
+  name: "1 on 1"
+  saveName: "1 on 1 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -529,11 +554,13 @@ SLPS-01706:
     multitap: false
     linkCable: false
 SLPM-80351:
-  name: "1 on 1 (Japan) (Demo)"
+  name: "1 on 1 (Demo)"
+  saveName: "1 on 1 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01730:
-  name: "100 Man Yen Quiz Hunter (Japan)"
+  name: "100 Man Yen Quiz Hunter"
+  saveName: "100 Man Yen Quiz Hunter (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -552,7 +579,8 @@ SLPS-01730:
     multitap: true
     linkCable: false
 SLES-03784:
-  name: "100% Star (Europe)"
+  name: "100% Star"
+  saveName: "100% Star (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -571,7 +599,8 @@ SLES-03784:
     multitap: false
     linkCable: false
 SLES-03658:
-  name: "100% Star (France)"
+  name: "100% Star"
+  saveName: "100% Star (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -590,7 +619,8 @@ SLES-03658:
     multitap: false
     linkCable: false
 SLPS-01054:
-  name: "10101 - Will the Starship (Japan)"
+  name: "10101 - Will the Starship"
+  saveName: "10101 - Will the Starship (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -611,12 +641,14 @@ SLPS-01054:
     multitap: false
     linkCable: false
 SLPM-80643:
-  name: "10th Anniversary Memorial Save Data (Japan) (Disc 1) (PlayStation Taiou)"
+  name: "10th Anniversary Memorial Save Data (Disc 1) (PlayStation Taiou)"
+  saveName: "10th Anniversary Memorial Save Data (Japan) (Disc 1) (PlayStation Taiou)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
 LSP-99012101:
-  name: "16 Tales 1 (USA)"
+  name: "16 Tales 1"
+  saveName: "16 Tales 1 (USA)"
   codes:
     - LSP99012101
   metadata:
@@ -626,7 +658,8 @@ LSP-99012101:
     languages:
       - English
 LSP-99012201:
-  name: "16 Tales 2 (USA)"
+  name: "16 Tales 2"
+  saveName: "16 Tales 2 (USA)"
   codes:
     - LSP99012201
   metadata:
@@ -639,7 +672,8 @@ LSP-99012201:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
 LSP-99012301:
-  name: "16 Tales 3 (USA)"
+  name: "16 Tales 3"
+  saveName: "16 Tales 3 (USA)"
   codes:
     - LSP99012301
   metadata:
@@ -649,7 +683,8 @@ LSP-99012301:
     languages:
       - English
 LSP-99012401:
-  name: "16 Tales 4 (USA)"
+  name: "16 Tales 4"
+  saveName: "16 Tales 4 (USA)"
   codes:
     - LSP99012401
   metadata:
@@ -659,7 +694,8 @@ LSP-99012401:
     languages:
       - English
 SLPS-01865:
-  name: "19 ji 03 pun - Ueno-hatsu Yakou Ressha (Japan)"
+  name: "19 ji 03 pun - Ueno-hatsu Yakou Ressha"
+  saveName: "19 ji 03 pun - Ueno-hatsu Yakou Ressha (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -681,7 +717,8 @@ SLPS-01865:
     multitap: false
     linkCable: false
 SLPM-80181:
-  name: "19 ji 03 pun - Ueno-hatsu Yakou Ressha (Japan) (Taikenban)"
+  name: "19 ji 03 pun - Ueno-hatsu Yakou Ressha (Taikenban)"
+  saveName: "19 ji 03 pun - Ueno-hatsu Yakou Ressha (Japan) (Taikenban)"
 SLPS-02881:
   name: "19-03 Ueno Hatsu Yakou Ressha (Rerelease)"
   controllers:
@@ -702,7 +739,8 @@ SLPS-02881:
     multitap: false
     linkCable: false
 SCUS-94503:
-  name: "1Xtreme (USA)"
+  name: "1Xtreme"
+  saveName: "1Xtreme (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -720,7 +758,8 @@ SCUS-94503:
     multitap: false
     linkCable: false
 SLPS-02466:
-  name: "2 Demos in 1 - Driver - You Are the Wheelman + V-Rally - Championship Edition 2 (Japan)"
+  name: "2 Demos in 1 - Driver - You Are the Wheelman + V-Rally - Championship Edition 2"
+  saveName: "2 Demos in 1 - Driver - You Are the Wheelman + V-Rally - Championship Edition 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -782,7 +821,8 @@ SLPS-02857:
     multitap: true
     linkCable: false
 SLPS-91416:
-  name: "20-seiki Striker Retsuden - The 20th Century's Real Strikers (Japan)"
+  name: "20-seiki Striker Retsuden - The 20th Century's Real Strikers"
+  saveName: "20-seiki Striker Retsuden - The 20th Century's Real Strikers (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -801,7 +841,8 @@ SLPS-91416:
     multitap: true
     linkCable: false
 SLES-03830:
-  name: "2002 FIFA World Cup (Europe) (En,Sv)"
+  name: "2002 FIFA World Cup"
+  saveName: "2002 FIFA World Cup (Europe) (En,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -821,7 +862,8 @@ SLES-03830:
     multitap: true
     linkCable: false
 SLES-03831:
-  name: "2002 FIFA World Cup (France)"
+  name: "2002 FIFA World Cup"
+  saveName: "2002 FIFA World Cup (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -840,7 +882,8 @@ SLES-03831:
     multitap: true
     linkCable: false
 SLES-03832:
-  name: "2002 FIFA World Cup (Germany)"
+  name: "2002 FIFA World Cup"
+  saveName: "2002 FIFA World Cup (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -859,7 +902,8 @@ SLES-03832:
     multitap: true
     linkCable: false
 SLES-03833:
-  name: "2002 FIFA World Cup (Italy)"
+  name: "2002 FIFA World Cup"
+  saveName: "2002 FIFA World Cup (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -878,7 +922,8 @@ SLES-03833:
     multitap: true
     linkCable: false
 SLES-03834:
-  name: "2002 FIFA World Cup (Spain)"
+  name: "2002 FIFA World Cup"
+  saveName: "2002 FIFA World Cup (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -897,7 +942,8 @@ SLES-03834:
     multitap: true
     linkCable: false
 SLUS-01449:
-  name: "2002 FIFA World Cup (USA) (En,Es)"
+  name: "2002 FIFA World Cup"
+  saveName: "2002 FIFA World Cup (USA) (En,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -920,7 +966,8 @@ SLUS-01449:
     multitap: true
     linkCable: false
 SCES-00400:
-  name: "2Xtreme (Europe)"
+  name: "2Xtreme"
+  saveName: "2Xtreme (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -938,7 +985,8 @@ SCES-00400:
     multitap: false
     linkCable: false
 SCUS-94508:
-  name: "2Xtreme (USA)"
+  name: "2Xtreme"
+  saveName: "2Xtreme (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -959,7 +1007,8 @@ SCUS-94508:
     multitap: false
     linkCable: false
 SLES-03120:
-  name: "3, 2, 1, Smurf! My First Racing Game (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "3, 2, 1, Smurf! My First Racing Game"
+  saveName: "3, 2, 1, Smurf! My First Racing Game (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -984,7 +1033,8 @@ SLES-03120:
     multitap: false
     linkCable: false
 SLES-02089:
-  name: "360 Three Sixty (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "360 Three Sixty"
+  saveName: "360 Three Sixty (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1012,7 +1062,8 @@ SLES-02089:
     multitap: false
     linkCable: false
 SLUS-00066:
-  name: "3D Baseball (USA)"
+  name: "3D Baseball"
+  saveName: "3D Baseball (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -1033,7 +1084,8 @@ SLUS-00066:
     multitap: false
     linkCable: false
 SLPS-00693:
-  name: "3D Baseball - The Majors (Japan)"
+  name: "3D Baseball - The Majors"
+  saveName: "3D Baseball - The Majors (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
@@ -1054,7 +1106,8 @@ SLPS-00693:
     multitap: false
     linkCable: false
 SLPS-01434:
-  name: "3D Kakutou Tkool (Japan)"
+  name: "3D Kakutou Tkool"
+  saveName: "3D Kakutou Tkool (Japan)"
   compatibility:
     rating: NoIssues
     comments: "Disable Interlacing option needs to be ON."
@@ -1077,7 +1130,8 @@ SLPS-01434:
     multitap: false
     linkCable: false
 SCES-00009:
-  name: "3D Lemmings (Europe)"
+  name: "3D Lemmings"
+  saveName: "3D Lemmings (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -1096,7 +1150,8 @@ SCES-00009:
     multitap: false
     linkCable: false
 SIPS-60002:
-  name: "3D Lemmings (Japan)"
+  name: "3D Lemmings"
+  saveName: "3D Lemmings (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
@@ -1118,7 +1173,8 @@ SIPS-60002:
     multitap: false
     linkCable: false
 SCUS-94601:
-  name: "3D Lemmings (USA)"
+  name: "3D Lemmings"
+  saveName: "3D Lemmings (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -1140,7 +1196,8 @@ SCUS-94601:
     multitap: false
     linkCable: false
 SLPS-00461:
-  name: "3D Mission Shooting - Finalist (Japan)"
+  name: "3D Mission Shooting - Finalist"
+  saveName: "3D Mission Shooting - Finalist (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -1158,7 +1215,8 @@ SLPS-00461:
     multitap: false
     linkCable: false
 SLPS-00654:
-  name: "3D Shooting Tkool (Japan)"
+  name: "3D Shooting Tkool"
+  saveName: "3D Shooting Tkool (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -1176,7 +1234,8 @@ SLPS-00654:
     multitap: false
     linkCable: false
 SCPS-18006:
-  name: "3D-Kaleidoscope - Baby Universe (Japan)"
+  name: "3D-Kaleidoscope - Baby Universe"
+  saveName: "3D-Kaleidoscope - Baby Universe (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -1196,7 +1255,8 @@ SCPS-18006:
     multitap: false
     linkCable: false
 SCUS-94231:
-  name: "3Xtreme (USA)"
+  name: "3Xtreme"
+  saveName: "3Xtreme (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -1218,11 +1278,13 @@ SCUS-94231:
     multitap: false
     linkCable: false
 SCUS-94365:
-  name: "3Xtreme (USA) (Demo)"
+  name: "3Xtreme (Demo)"
+  saveName: "3Xtreme (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00071:
-  name: "3x3 Eyes - Kyuusei Koushu (Japan) (Disc 1)"
+  name: "3x3 Eyes - Kyuusei Koushu (Disc 1)"
+  saveName: "3x3 Eyes - Kyuusei Koushu (Japan) (Disc 1)"
   discSet:
     name: "3x3 Eyes - Kyuusei Koushu (Japan)"
     serials:
@@ -1245,7 +1307,8 @@ SLPS-00071:
     multitap: false
     linkCable: false
 SLPS-00072:
-  name: "3x3 Eyes - Kyuusei Koushu (Japan) (Disc 2)"
+  name: "3x3 Eyes - Kyuusei Koushu (Disc 2)"
+  saveName: "3x3 Eyes - Kyuusei Koushu (Japan) (Disc 2)"
   discSet:
     name: "3x3 Eyes - Kyuusei Koushu (Japan)"
     serials:
@@ -1268,7 +1331,8 @@ SLPS-00072:
     multitap: false
     linkCable: false
 SLPS-01497:
-  name: "3x3 Eyes - Tenrinou Genmu (Japan) (Disc 1)"
+  name: "3x3 Eyes - Tenrinou Genmu (Disc 1)"
+  saveName: "3x3 Eyes - Tenrinou Genmu (Japan) (Disc 1)"
   discSet:
     name: "3x3 Eyes - Tenrinou Genmu (Japan)"
     serials:
@@ -1295,7 +1359,8 @@ SLPS-01497:
     multitap: false
     linkCable: false
 SLPS-01498:
-  name: "3x3 Eyes - Tenrinou Genmu (Japan) (Disc 2)"
+  name: "3x3 Eyes - Tenrinou Genmu (Disc 2)"
+  saveName: "3x3 Eyes - Tenrinou Genmu (Japan) (Disc 2)"
   discSet:
     name: "3x3 Eyes - Tenrinou Genmu (Japan)"
     serials:
@@ -1322,7 +1387,8 @@ SLPS-01498:
     multitap: false
     linkCable: false
 SLPS-01499:
-  name: "3x3 Eyes - Tenrinou Genmu (Japan) (Disc 3)"
+  name: "3x3 Eyes - Tenrinou Genmu (Disc 3)"
+  saveName: "3x3 Eyes - Tenrinou Genmu (Japan) (Disc 3)"
   discSet:
     name: "3x3 Eyes - Tenrinou Genmu (Japan)"
     serials:
@@ -1349,7 +1415,8 @@ SLPS-01499:
     multitap: false
     linkCable: false
 SLES-00095:
-  name: "4-4-2 Soccer (Europe) (En,Fr,De,Es)"
+  name: "4-4-2 Soccer"
+  saveName: "4-4-2 Soccer (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -1370,7 +1437,8 @@ SLES-00095:
     multitap: true
     linkCable: false
 SLES-01937:
-  name: "40 Winks (Europe)"
+  name: "40 Winks"
+  saveName: "40 Winks (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1389,11 +1457,13 @@ SLES-01937:
     multitap: false
     linkCable: false
 SLED-02435:
-  name: "40 Winks (Europe) (Demo)"
+  name: "40 Winks (Demo)"
+  saveName: "40 Winks (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01940:
-  name: "40 Winks (Italy)"
+  name: "40 Winks"
+  saveName: "40 Winks (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1412,7 +1482,8 @@ SLES-01940:
     multitap: false
     linkCable: false
 SLES-01941:
-  name: "40 Winks (Spain)"
+  name: "40 Winks"
+  saveName: "40 Winks (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1431,7 +1502,8 @@ SLES-01941:
     multitap: false
     linkCable: false
 SLUS-00874:
-  name: "40 Winks (USA)"
+  name: "40 Winks"
+  saveName: "40 Winks (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -1453,7 +1525,8 @@ SLUS-00874:
     multitap: false
     linkCable: false
 SLES-02017:
-  name: "4x4 World Trophy (Europe) (En,Fr,De,Es,It)"
+  name: "4x4 World Trophy"
+  saveName: "4x4 World Trophy (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1477,7 +1550,8 @@ SLES-02017:
     multitap: false
     linkCable: false
 SLES-04064:
-  name: "5 Star Racing (Europe)"
+  name: "5 Star Racing"
+  saveName: "5 Star Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1497,11 +1571,13 @@ SLES-04064:
     multitap: false
     linkCable: false
 SLPM-80387:
-  name: "70's Robot Anime - Geppy-X (Japan) (Demo)"
+  name: "70's Robot Anime - Geppy-X (Demo)"
+  saveName: "70's Robot Anime - Geppy-X (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01995:
-  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 1)"
+  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Disc 1)"
+  saveName: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 1)"
   discSet:
     name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan)"
     serials:
@@ -1532,7 +1608,8 @@ SLPS-01995:
     multitap: false
     linkCable: false
 SLPS-01996:
-  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 2)"
+  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Disc 2)"
+  saveName: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 2)"
   discSet:
     name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan)"
     serials:
@@ -1563,7 +1640,8 @@ SLPS-01996:
     multitap: false
     linkCable: false
 SLPS-01997:
-  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 3)"
+  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Disc 3)"
+  saveName: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 3)"
   discSet:
     name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan)"
     serials:
@@ -1594,7 +1672,8 @@ SLPS-01997:
     multitap: false
     linkCable: false
 SLPS-01998:
-  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 4)"
+  name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Disc 4)"
+  saveName: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 4)"
   discSet:
     name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan)"
     serials:
@@ -1625,7 +1704,8 @@ SLPS-01998:
     multitap: false
     linkCable: false
 SLPS-00004:
-  name: "A Ressha de Ikou 4 - Evolution (Japan)"
+  name: "A Ressha de Ikou 4 - Evolution"
+  saveName: "A Ressha de Ikou 4 - Evolution (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -1643,7 +1723,8 @@ SLPS-00004:
     multitap: false
     linkCable: false
 SLPS-00011:
-  name: "A Ressha de Ikou 4 - Evolution (Japan) (Gentei Set)"
+  name: "A Ressha de Ikou 4 - Evolution (Gentei Set)"
+  saveName: "A Ressha de Ikou 4 - Evolution (Japan) (Gentei Set)"
   controllers:
     - DigitalController
   metadata:
@@ -1661,7 +1742,8 @@ SLPS-00011:
     multitap: false
     linkCable: false
 SLPS-00125:
-  name: "A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De)"
+  name: "A Ressha de Ikou 4 - Evolution Global"
+  saveName: "A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -1679,7 +1761,8 @@ SLPS-00125:
     multitap: false
     linkCable: false
 SLPS-91019:
-  name: "A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De) (PlayStation the Best)"
+  name: "A Ressha de Ikou 4 - Evolution Global (PlayStation the Best)"
+  saveName: "A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De) (PlayStation the Best)"
   controllers:
     - DigitalController
   metadata:
@@ -1697,7 +1780,8 @@ SLPS-91019:
     multitap: false
     linkCable: false
 SLPS-02050:
-  name: "A Ressha de Ikou Z - Mezase! Tairiku Oudan (Japan)"
+  name: "A Ressha de Ikou Z - Mezase! Tairiku Oudan"
+  saveName: "A Ressha de Ikou Z - Mezase! Tairiku Oudan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1719,7 +1803,8 @@ SLPS-02050:
     multitap: false
     linkCable: false
 SCES-02153:
-  name: "A Sangre Fria (Spain) (Disc 1)"
+  name: "A Sangre Fria (Disc 1)"
+  saveName: "A Sangre Fria (Spain) (Disc 1)"
   discSet:
     name: "A Sangre Fria (Spain)"
     serials:
@@ -1743,7 +1828,8 @@ SCES-02153:
     multitap: false
     linkCable: false
 SCES-12153:
-  name: "A Sangre Fria (Spain) (Disc 2)"
+  name: "A Sangre Fria (Disc 2)"
+  saveName: "A Sangre Fria (Spain) (Disc 2)"
   discSet:
     name: "A Sangre Fria (Spain)"
     serials:
@@ -1767,7 +1853,8 @@ SCES-12153:
     multitap: false
     linkCable: false
 SCES-02152:
-  name: "A Sangue Freddo (Italy) (Disc 1)"
+  name: "A Sangue Freddo (Disc 1)"
+  saveName: "A Sangue Freddo (Italy) (Disc 1)"
   discSet:
     name: "A Sangue Freddo (Italy)"
     serials:
@@ -1791,7 +1878,8 @@ SCES-02152:
     multitap: false
     linkCable: false
 SCES-12152:
-  name: "A Sangue Freddo (Italy) (Disc 2)"
+  name: "A Sangue Freddo (Disc 2)"
+  saveName: "A Sangue Freddo (Italy) (Disc 2)"
   discSet:
     name: "A Sangue Freddo (Italy)"
     serials:
@@ -1815,7 +1903,8 @@ SCES-12152:
     multitap: false
     linkCable: false
 SLUS-00003:
-  name: "A-Train - Trains, Power, Money (USA) (En,Ja,Fr,De)"
+  name: "A-Train - Trains, Power, Money"
+  saveName: "A-Train - Trains, Power, Money (USA) (En,Ja,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -1837,7 +1926,8 @@ SLUS-00003:
     multitap: false
     linkCable: false
 SCES-00290:
-  name: "A.IV - Evolution Global (Europe) (En,Ja,Fr,De)"
+  name: "A.IV - Evolution Global"
+  saveName: "A.IV - Evolution Global (Europe) (En,Ja,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -1858,7 +1948,8 @@ SCES-00290:
     multitap: false
     linkCable: false
 SLES-02695:
-  name: "A2 Racer - Europa Tour (Netherlands)"
+  name: "A2 Racer - Europa Tour"
+  saveName: "A2 Racer - Europa Tour (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1878,7 +1969,8 @@ SLES-02695:
     multitap: false
     linkCable: false
 SLPS-01120:
-  name: "A5 - A Ressha de Ikou 5 (Japan)"
+  name: "A5 - A Ressha de Ikou 5"
+  saveName: "A5 - A Ressha de Ikou 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1916,7 +2008,8 @@ SLPS-91124:
     multitap: false
     linkCable: false
 SLES-01875:
-  name: "AFL 99 (Australia)"
+  name: "AFL 99"
+  saveName: "AFL 99 (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -1935,7 +2028,8 @@ SLES-01875:
     multitap: true
     linkCable: false
 SLPS-02411:
-  name: "AI Mahjong 2000 (Japan)"
+  name: "AI Mahjong 2000"
+  saveName: "AI Mahjong 2000 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -1953,7 +2047,8 @@ SLPS-02411:
     multitap: false
     linkCable: false
 SLPM-87117:
-  name: "AI Mahjong Selection (Japan)"
+  name: "AI Mahjong Selection"
+  saveName: "AI Mahjong Selection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -1971,7 +2066,8 @@ SLPM-87117:
     multitap: false
     linkCable: false
 SLPS-00109:
-  name: "AI Shougi (Japan)"
+  name: "AI Shougi"
+  saveName: "AI Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -1989,7 +2085,8 @@ SLPS-00109:
     multitap: false
     linkCable: false
 SLPS-01159:
-  name: "AI Shougi 2 (Japan)"
+  name: "AI Shougi 2"
+  saveName: "AI Shougi 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -2007,7 +2104,8 @@ SLPS-01159:
     multitap: false
     linkCable: false
 SLPS-02285:
-  name: "AI Shougi 2 Deluxe (Japan)"
+  name: "AI Shougi 2 Deluxe"
+  saveName: "AI Shougi 2 Deluxe (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -2025,7 +2123,8 @@ SLPS-02285:
     multitap: false
     linkCable: false
 SLPM-87068:
-  name: "AI Shougi Selection (Japan)"
+  name: "AI Shougi Selection"
+  saveName: "AI Shougi Selection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -2043,7 +2142,8 @@ SLPM-87068:
     multitap: false
     linkCable: false
 SLUS-90010:
-  name: "ASCII Entertainment Demo CD (USA)"
+  name: "ASCII Entertainment Demo CD"
+  saveName: "ASCII Entertainment Demo CD (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -2052,9 +2152,11 @@ SLUS-90010:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
 SLPM-80289:
-  name: "ASCII Zanmai (Japan)"
+  name: "ASCII Zanmai"
+  saveName: "ASCII Zanmai (Japan)"
 SLES-02822:
-  name: "ATV - Quad Power Racing (Europe) (En,Fr,De)"
+  name: "ATV - Quad Power Racing"
+  saveName: "ATV - Quad Power Racing (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2076,7 +2178,8 @@ SLES-02822:
     multitap: false
     linkCable: false
 SLPM-86636:
-  name: "ATV - Quad Power Racing (Japan)"
+  name: "ATV - Quad Power Racing"
+  saveName: "ATV - Quad Power Racing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2096,7 +2199,8 @@ SLPM-86636:
     multitap: false
     linkCable: false
 SLUS-01137:
-  name: "ATV - Quad Power Racing (USA)"
+  name: "ATV - Quad Power Racing"
+  saveName: "ATV - Quad Power Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -2119,7 +2223,8 @@ SLUS-01137:
     multitap: false
     linkCable: false
 SLES-04099:
-  name: "ATV Mania (Europe) (En,Fr,De,It)"
+  name: "ATV Mania"
+  saveName: "ATV Mania (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2142,7 +2247,8 @@ SLES-04099:
     multitap: false
     linkCable: false
 SLUS-01545:
-  name: "ATV Mania (USA)"
+  name: "ATV Mania"
+  saveName: "ATV Mania (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -2165,7 +2271,8 @@ SLUS-01545:
     multitap: false
     linkCable: false
 SLES-04059:
-  name: "ATV Racers (Europe)"
+  name: "ATV Racers"
+  saveName: "ATV Racers (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2185,7 +2292,8 @@ SLES-04059:
     multitap: false
     linkCable: false
 SLUS-01572:
-  name: "ATV Racers (USA)"
+  name: "ATV Racers"
+  saveName: "ATV Racers (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1265-gdd9a419"
@@ -2208,7 +2316,8 @@ SLUS-01572:
     multitap: false
     linkCable: false
 SLPS-01280:
-  name: "AbalaBurn (Japan)"
+  name: "AbalaBurn"
+  saveName: "AbalaBurn (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -2226,7 +2335,8 @@ SLPS-01280:
     multitap: false
     linkCable: false
 SLPS-02095:
-  name: "Abe '99 (Japan) (Disc 1)"
+  name: "Abe '99 (Disc 1)"
+  saveName: "Abe '99 (Japan) (Disc 1)"
   discSet:
     name: "Abe '99 (Japan)"
     serials:
@@ -2249,7 +2359,8 @@ SLPS-02095:
     multitap: false
     linkCable: false
 SLPS-02096:
-  name: "Abe '99 (Japan) (Disc 2)"
+  name: "Abe '99 (Disc 2)"
+  saveName: "Abe '99 (Japan) (Disc 2)"
   discSet:
     name: "Abe '99 (Japan)"
     serials:
@@ -2272,7 +2383,8 @@ SLPS-02096:
     multitap: false
     linkCable: false
 SLPS-01118:
-  name: "Abe a GoGo (Japan)"
+  name: "Abe a GoGo"
+  saveName: "Abe a GoGo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -2290,11 +2402,13 @@ SLPS-01118:
     multitap: false
     linkCable: false
 SLPM-80175:
-  name: "Abe a GoGo (Japan) (Demo)"
+  name: "Abe a GoGo (Demo)"
+  saveName: "Abe a GoGo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01341:
-  name: "Absolute Football (France) (En,Fr,De,Es,It,Pt)"
+  name: "Absolute Football"
+  saveName: "Absolute Football (France) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2313,7 +2427,8 @@ SLES-01341:
     multitap: true
     linkCable: false
 SLPS-00061:
-  name: "Ace Combat (Japan)"
+  name: "Ace Combat"
+  saveName: "Ace Combat (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -2336,7 +2451,8 @@ SLPS-00061:
     multitap: false
     linkCable: false
 SCES-00699:
-  name: "Ace Combat 2 (Europe)"
+  name: "Ace Combat 2"
+  saveName: "Ace Combat 2 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4416-g24b4be51"
@@ -2360,7 +2476,8 @@ SCES-00699:
     multitap: false
     linkCable: false
 SCES-00901:
-  name: "Ace Combat 2 (France)"
+  name: "Ace Combat 2"
+  saveName: "Ace Combat 2 (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -2381,7 +2498,8 @@ SCES-00901:
     multitap: false
     linkCable: false
 SCES-00902:
-  name: "Ace Combat 2 (Germany)"
+  name: "Ace Combat 2"
+  saveName: "Ace Combat 2 (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -2402,7 +2520,8 @@ SCES-00902:
     multitap: false
     linkCable: false
 SLPS-00830:
-  name: "Ace Combat 2 (Japan)"
+  name: "Ace Combat 2"
+  saveName: "Ace Combat 2 (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -2423,7 +2542,8 @@ SLPS-00830:
     multitap: false
     linkCable: false
 SLUS-00404:
-  name: "Ace Combat 2 (USA)"
+  name: "Ace Combat 2"
+  saveName: "Ace Combat 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1302-gf28ef01"
@@ -2448,7 +2568,8 @@ SLUS-00404:
     multitap: false
     linkCable: false
 SCES-02066:
-  name: "Ace Combat 3 - Electrosphere (Europe) (En,Fr,De,Es,It)"
+  name: "Ace Combat 3 - Electrosphere"
+  saveName: "Ace Combat 3 - Electrosphere (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4416-g24b4be51"
@@ -2476,7 +2597,8 @@ SCES-02066:
     multitap: false
     linkCable: false
 SLPS-02020:
-  name: "Ace Combat 3 - Electrosphere (Japan) (Disc 1)"
+  name: "Ace Combat 3 - Electrosphere (Disc 1)"
+  saveName: "Ace Combat 3 - Electrosphere (Japan) (Disc 1)"
   discSet:
     name: "Ace Combat 3 - Electrosphere (Japan)"
     serials:
@@ -2508,7 +2630,8 @@ SLPS-02020:
     multitap: false
     linkCable: false
 SLPS-02021:
-  name: "Ace Combat 3 - Electrosphere (Japan) (Disc 2)"
+  name: "Ace Combat 3 - Electrosphere (Disc 2)"
+  saveName: "Ace Combat 3 - Electrosphere (Japan) (Disc 2)"
   discSet:
     name: "Ace Combat 3 - Electrosphere (Japan)"
     serials:
@@ -2540,7 +2663,8 @@ SLPS-02021:
     multitap: false
     linkCable: false
 SLUS-00972:
-  name: "Ace Combat 3 - Electrosphere (USA)"
+  name: "Ace Combat 3 - Electrosphere"
+  saveName: "Ace Combat 3 - Electrosphere (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -2564,9 +2688,11 @@ SLUS-00972:
     multitap: false
     linkCable: false
 SLPM-80453:
-  name: "Ace Combat 3 - Electrosphere - Direct Audio with AppenDisc (Japan)"
+  name: "Ace Combat 3 - Electrosphere - Direct Audio with AppenDisc"
+  saveName: "Ace Combat 3 - Electrosphere - Direct Audio with AppenDisc (Japan)"
 SLUS-01470:
-  name: "Aces of the Air (USA)"
+  name: "Aces of the Air"
+  saveName: "Aces of the Air (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -2591,7 +2717,8 @@ SLUS-01470:
     multitap: false
     linkCable: false
 SLPS-02119:
-  name: "Acid (Japan)"
+  name: "Acid"
+  saveName: "Acid (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2610,11 +2737,13 @@ SLPS-02119:
     multitap: false
     linkCable: false
 SLPM-80430:
-  name: "Acid (Japan) (Demo)"
+  name: "Acid (Demo)"
+  saveName: "Acid (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86589:
-  name: "Acid (Japan) (Major Wave)"
+  name: "Acid (Major Wave)"
+  saveName: "Acid (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2633,7 +2762,8 @@ SLPM-86589:
     multitap: false
     linkCable: false
 SCPS-10131:
-  name: "Aconcagua (Japan) (Disc 1)"
+  name: "Aconcagua (Disc 1)"
+  saveName: "Aconcagua (Japan) (Disc 1)"
   discSet:
     name: "Aconcagua (Japan)"
     serials:
@@ -2658,7 +2788,8 @@ SCPS-10131:
     multitap: false
     linkCable: false
 SCPS-10132:
-  name: "Aconcagua (Japan) (Disc 2)"
+  name: "Aconcagua (Disc 2)"
+  saveName: "Aconcagua (Japan) (Disc 2)"
   discSet:
     name: "Aconcagua (Japan)"
     serials:
@@ -2702,7 +2833,8 @@ SLPS-02482:
     multitap: false
     linkCable: false
 SLES-03105:
-  name: "Action Bass (Europe)"
+  name: "Action Bass"
+  saveName: "Action Bass (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2721,7 +2853,8 @@ SLES-03105:
     multitap: false
     linkCable: false
 SLPM-86927:
-  name: "Action Bass (Japan)"
+  name: "Action Bass"
+  saveName: "Action Bass (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2740,7 +2873,8 @@ SLPM-86927:
     multitap: false
     linkCable: false
 SLUS-01248:
-  name: "Action Bass (USA)"
+  name: "Action Bass"
+  saveName: "Action Bass (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -2762,7 +2896,8 @@ SLUS-01248:
     multitap: false
     linkCable: false
 SLES-03083:
-  name: "Action Man - Destruction X (Europe) (En,Fr,De,Es,It)"
+  name: "Action Man - Destruction X"
+  saveName: "Action Man - Destruction X (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2785,7 +2920,8 @@ SLES-03083:
     multitap: false
     linkCable: false
 SLES-01761:
-  name: "Action Man - Mission Xtreme (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
+  name: "Action Man - Mission Xtreme"
+  saveName: "Action Man - Mission Xtreme (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2813,7 +2949,8 @@ SLES-01761:
     multitap: false
     linkCable: false
 SLUS-00887:
-  name: "Action Man - Operation Extreme (USA)"
+  name: "Action Man - Operation Extreme"
+  saveName: "Action Man - Operation Extreme (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -2835,7 +2972,8 @@ SLUS-00887:
     multitap: false
     linkCable: false
 SLUS-00777:
-  name: "Activision Classics (USA)"
+  name: "Activision Classics"
+  saveName: "Activision Classics (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -2856,7 +2994,8 @@ SLUS-00777:
     multitap: false
     linkCable: false
 SLES-00015:
-  name: "Actua Golf (Europe) (En,Fr,De)"
+  name: "Actua Golf"
+  saveName: "Actua Golf (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -2876,7 +3015,8 @@ SLES-00015:
     multitap: true
     linkCable: false
 SLPS-00298:
-  name: "Actua Golf (Japan)"
+  name: "Actua Golf"
+  saveName: "Actua Golf (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -2894,7 +3034,8 @@ SLPS-00298:
     multitap: true
     linkCable: false
 SLES-00044:
-  name: "Actua Golf 2 (Europe)"
+  name: "Actua Golf 2"
+  saveName: "Actua Golf 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -2912,7 +3053,8 @@ SLES-00044:
     multitap: true
     linkCable: false
 SLES-01042:
-  name: "Actua Golf 3 (Europe)"
+  name: "Actua Golf 3"
+  saveName: "Actua Golf 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2931,7 +3073,8 @@ SLES-01042:
     multitap: true
     linkCable: false
 SLES-00188:
-  name: "Actua Ice Hockey (Europe) (En,Fr,De,Sv,Fi)"
+  name: "Actua Ice Hockey"
+  saveName: "Actua Ice Hockey (Europe) (En,Fr,De,Sv,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2954,7 +3097,8 @@ SLES-00188:
     multitap: true
     linkCable: false
 SLPM-86078:
-  name: "Actua Ice Hockey (Japan)"
+  name: "Actua Ice Hockey"
+  saveName: "Actua Ice Hockey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2973,7 +3117,8 @@ SLPM-86078:
     multitap: true
     linkCable: false
 SLES-01226:
-  name: "Actua Ice Hockey 2 (Europe)"
+  name: "Actua Ice Hockey 2"
+  saveName: "Actua Ice Hockey 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -2993,7 +3138,8 @@ SLES-01226:
     multitap: true
     linkCable: false
 SLES-01647:
-  name: "Actua Pool (Europe)"
+  name: "Actua Pool"
+  saveName: "Actua Pool (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3012,7 +3158,8 @@ SLES-01647:
     multitap: true
     linkCable: false
 SLES-00014:
-  name: "Actua Soccer (Europe) (En,Fr)"
+  name: "Actua Soccer"
+  saveName: "Actua Soccer (Europe) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -3031,7 +3178,8 @@ SLES-00014:
     multitap: false
     linkCable: false
 SLPS-00297:
-  name: "Actua Soccer (Japan)"
+  name: "Actua Soccer"
+  saveName: "Actua Soccer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -3049,7 +3197,8 @@ SLPS-00297:
     multitap: false
     linkCable: false
 SLES-00190:
-  name: "Actua Soccer - Club Edition (Europe)"
+  name: "Actua Soccer - Club Edition"
+  saveName: "Actua Soccer - Club Edition (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -3067,7 +3216,8 @@ SLES-00190:
     multitap: false
     linkCable: false
 SLES-00021:
-  name: "Actua Soccer 2 (Europe) (En,Fr)"
+  name: "Actua Soccer 2"
+  saveName: "Actua Soccer 2 (Europe) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3087,7 +3237,8 @@ SLES-00021:
     multitap: true
     linkCable: false
 SLES-01029:
-  name: "Actua Soccer 2 (Germany) (En,De)"
+  name: "Actua Soccer 2"
+  saveName: "Actua Soccer 2 (Germany) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3107,7 +3258,8 @@ SLES-01029:
     multitap: true
     linkCable: false
 SLES-01028:
-  name: "Actua Soccer 2 (Italy)"
+  name: "Actua Soccer 2"
+  saveName: "Actua Soccer 2 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3126,7 +3278,8 @@ SLES-01028:
     multitap: true
     linkCable: false
 SLES-01210:
-  name: "Actua Soccer 3 (Europe)"
+  name: "Actua Soccer 3"
+  saveName: "Actua Soccer 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3145,7 +3298,8 @@ SLES-01210:
     multitap: true
     linkCable: false
 SLES-01644:
-  name: "Actua Soccer 3 (France)"
+  name: "Actua Soccer 3"
+  saveName: "Actua Soccer 3 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3164,7 +3318,8 @@ SLES-01644:
     multitap: true
     linkCable: false
 SLES-01645:
-  name: "Actua Soccer 3 (Germany)"
+  name: "Actua Soccer 3"
+  saveName: "Actua Soccer 3 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3183,7 +3338,8 @@ SLES-01645:
     multitap: true
     linkCable: false
 SLES-01646:
-  name: "Actua Soccer 3 (Italy)"
+  name: "Actua Soccer 3"
+  saveName: "Actua Soccer 3 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3202,7 +3358,8 @@ SLES-01646:
     multitap: true
     linkCable: false
 SLES-00265:
-  name: "Actua Tennis (Europe)"
+  name: "Actua Tennis"
+  saveName: "Actua Tennis (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3221,7 +3378,8 @@ SLES-00265:
     multitap: true
     linkCable: false
 SLES-01396:
-  name: "Actua Tennis (Europe) (Fr,De)"
+  name: "Actua Tennis"
+  saveName: "Actua Tennis (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3240,7 +3398,8 @@ SLES-01396:
     multitap: true
     linkCable: false
 SCPS-10126:
-  name: "Addie no Okurimono - To Moze from Addie (Japan)"
+  name: "Addie no Okurimono - To Moze from Addie"
+  saveName: "Addie no Okurimono - To Moze from Addie (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3262,11 +3421,13 @@ SCPS-10126:
     multitap: false
     linkCable: false
 PAPX-90105:
-  name: "Addie no Okurimono - To Moze from Addie (Japan) (Demo)"
+  name: "Addie no Okurimono - To Moze from Addie (Demo)"
+  saveName: "Addie no Okurimono - To Moze from Addie (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-04108:
-  name: "Adiboo & Paziral's Secret (Europe) (En,Fr,De,Es,It)"
+  name: "Adiboo & Paziral's Secret"
+  saveName: "Adiboo & Paziral's Secret (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3292,7 +3453,8 @@ SLES-04108:
     multitap: false
     linkCable: false
 SCES-03558:
-  name: "Adibou et L'Ombre Verte (France)"
+  name: "Adibou et L'Ombre Verte"
+  saveName: "Adibou et L'Ombre Verte (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3311,7 +3473,8 @@ SCES-03558:
     multitap: false
     linkCable: false
 SLES-00189:
-  name: "Adidas Power Soccer (Europe) (En,Fr,De,Es,It)"
+  name: "Adidas Power Soccer"
+  saveName: "Adidas Power Soccer (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -3336,7 +3499,8 @@ SLES-00189:
     multitap: true
     linkCable: false
 SCUS-94502:
-  name: "Adidas Power Soccer (USA)"
+  name: "Adidas Power Soccer"
+  saveName: "Adidas Power Soccer (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -3354,7 +3518,8 @@ SCUS-94502:
     multitap: true
     linkCable: false
 SLES-00857:
-  name: "Adidas Power Soccer 2 (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Adidas Power Soccer 2"
+  saveName: "Adidas Power Soccer 2 (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -3377,7 +3542,8 @@ SLES-00857:
     multitap: true
     linkCable: false
 SLES-01239:
-  name: "Adidas Power Soccer 98 (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Adidas Power Soccer 98"
+  saveName: "Adidas Power Soccer 98 (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3403,19 +3569,22 @@ SLES-01239:
     multitap: true
     linkCable: false
 SLED-01310:
-  name: "Adidas Power Soccer 98 (France) (Demo)"
+  name: "Adidas Power Soccer 98 (Demo)"
+  saveName: "Adidas Power Soccer 98 (France) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 100
 SLED-01311:
-  name: "Adidas Power Soccer 98 (Germany) (Demo)"
+  name: "Adidas Power Soccer 98 (Demo)"
+  saveName: "Adidas Power Soccer 98 (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 100
 SLUS-00547:
-  name: "Adidas Power Soccer 98 (USA)"
+  name: "Adidas Power Soccer 98"
+  saveName: "Adidas Power Soccer 98 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3187-gf580dbc6"
@@ -3439,7 +3608,8 @@ SLUS-00547:
     multitap: true
     linkCable: false
 SLES-00270:
-  name: "Adidas Power Soccer International '97 (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Adidas Power Soccer International '97"
+  saveName: "Adidas Power Soccer International '97 (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -3462,7 +3632,8 @@ SLES-00270:
     multitap: true
     linkCable: false
 SLPS-03510:
-  name: "Adlib Ouji - ...to Fuyukai na Nakamatachi! (Japan)"
+  name: "Adlib Ouji - ...to Fuyukai na Nakamatachi!"
+  saveName: "Adlib Ouji - ...to Fuyukai na Nakamatachi! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -3480,7 +3651,8 @@ SLPS-03510:
     multitap: false
     linkCable: false
 SLPS-01689:
-  name: "Advan Racing (Japan)"
+  name: "Advan Racing"
+  saveName: "Advan Racing (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -3503,7 +3675,8 @@ SLPS-01689:
     multitap: false
     linkCable: false
 SLES-00386:
-  name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (Europe)"
+  name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft"
+  saveName: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -3521,7 +3694,8 @@ SLES-00386:
     multitap: false
     linkCable: false
 SLUS-00378:
-  name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (USA)"
+  name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft"
+  saveName: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -3542,11 +3716,13 @@ SLUS-00378:
     multitap: false
     linkCable: false
 SLUS-00212:
-  name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (USA) (Demo)"
+  name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (Demo)"
+  saveName: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00208:
-  name: "Advanced V.G. (Japan)"
+  name: "Advanced V.G."
+  saveName: "Advanced V.G. (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -3568,11 +3744,13 @@ SLPS-00208:
     multitap: false
     linkCable: false
 SLPM-80017:
-  name: "Advanced V.G. (Japan) (Demo)"
+  name: "Advanced V.G. (Demo)"
+  saveName: "Advanced V.G. (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01318:
-  name: "Advanced V.G. 2 (Japan)"
+  name: "Advanced V.G. 2"
+  saveName: "Advanced V.G. 2 (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -3611,7 +3789,8 @@ SLPM-87122:
     multitap: false
     linkCable: false
 SCUS-94906:
-  name: "Adventures of Lomax, The (USA)"
+  name: "Adventures of Lomax, The"
+  saveName: "Adventures of Lomax, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -3634,7 +3813,8 @@ SCUS-94906:
     multitap: false
     linkCable: false
 SLPS-02367:
-  name: "Aerodive (Japan)"
+  name: "Aerodive"
+  saveName: "Aerodive (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3653,9 +3833,11 @@ SLPS-02367:
     multitap: false
     linkCable: false
 SLPM-80552:
-  name: "Affect Taikenban Vol. 1 (Japan)"
+  name: "Affect Taikenban Vol. 1"
+  saveName: "Affect Taikenban Vol. 1 (Japan)"
 SLPS-00995:
-  name: "Afraid Gear (Japan)"
+  name: "Afraid Gear"
+  saveName: "Afraid Gear (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -3673,7 +3855,8 @@ SLPS-00995:
     multitap: false
     linkCable: false
 SLPM-86834:
-  name: "Afraid Gear Another (Japan)"
+  name: "Afraid Gear Another"
+  saveName: "Afraid Gear Another (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3710,7 +3893,8 @@ SLPM-86876:
     multitap: false
     linkCable: false
 SLES-00474:
-  name: "Agent Armstrong (Europe) (En,Fr,De,Es)"
+  name: "Agent Armstrong"
+  saveName: "Agent Armstrong (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -3731,7 +3915,8 @@ SLES-00474:
     multitap: false
     linkCable: false
 SLPS-01073:
-  name: "Agent Armstrong - Himitsu Shirei Daisakusen (Japan)"
+  name: "Agent Armstrong - Himitsu Shirei Daisakusen"
+  saveName: "Agent Armstrong - Himitsu Shirei Daisakusen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -3749,7 +3934,8 @@ SLPS-01073:
     multitap: false
     linkCable: false
 SLES-00124:
-  name: "Agile Warrior - F-111X (Europe)"
+  name: "Agile Warrior - F-111X"
+  saveName: "Agile Warrior - F-111X (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -3767,7 +3953,8 @@ SLES-00124:
     multitap: false
     linkCable: false
 SLPS-00179:
-  name: "Agile Warrior - F-111X (Japan)"
+  name: "Agile Warrior - F-111X"
+  saveName: "Agile Warrior - F-111X (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -3785,7 +3972,8 @@ SLPS-00179:
     multitap: false
     linkCable: false
 SLUS-00023:
-  name: "Agile Warrior - F-111X (USA)"
+  name: "Agile Warrior - F-111X"
+  saveName: "Agile Warrior - F-111X (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -3806,7 +3994,8 @@ SLUS-00023:
     multitap: false
     linkCable: false
 PTPX-97002:
-  name: "Aging Disk (Japan)"
+  name: "Aging Disk"
+  saveName: "Aging Disk (Japan)"
 SLPS-00840:
   name: "Ai Shogi [Reprint]"
   controllers:
@@ -3826,7 +4015,8 @@ SLPS-00840:
     multitap: false
     linkCable: false
 SLPS-01409:
-  name: "Ai to Yuujou no Neko Monogatari. - Jingle Cats - Love Para Daisakusen no Maki (Japan)"
+  name: "Ai to Yuujou no Neko Monogatari. - Jingle Cats - Love Para Daisakusen no Maki"
+  saveName: "Ai to Yuujou no Neko Monogatari. - Jingle Cats - Love Para Daisakusen no Maki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -3846,7 +4036,8 @@ SLPS-01409:
     multitap: false
     linkCable: false
 SCES-00007:
-  name: "Air Combat (Europe)"
+  name: "Air Combat"
+  saveName: "Air Combat (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -3864,7 +4055,8 @@ SCES-00007:
     multitap: false
     linkCable: false
 SLUS-00001:
-  name: "Air Combat (USA)"
+  name: "Air Combat"
+  saveName: "Air Combat (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1669-g455f3591"
@@ -3885,7 +4077,8 @@ SLUS-00001:
     multitap: false
     linkCable: false
 SLES-03743:
-  name: "Air Hockey (Europe)"
+  name: "Air Hockey"
+  saveName: "Air Hockey (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -3903,7 +4096,8 @@ SLES-03743:
     multitap: false
     linkCable: false
 SLUS-01467:
-  name: "Air Hockey (USA)"
+  name: "Air Hockey"
+  saveName: "Air Hockey (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1773-gbdd98281"
@@ -3924,7 +4118,8 @@ SLUS-01467:
     multitap: false
     linkCable: false
 SLPS-00269:
-  name: "Air Management '96 (Japan)"
+  name: "Air Management '96"
+  saveName: "Air Management '96 (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -3980,7 +4175,8 @@ SLPM-86206:
     multitap: false
     linkCable: false
 SLES-00762:
-  name: "Air Race (Europe)"
+  name: "Air Race"
+  saveName: "Air Race (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -4017,7 +4213,8 @@ SLPS-03074:
     multitap: false
     linkCable: false
 SIPS-60005:
-  name: "AirAssault - The Red Mercury Missions (Japan)"
+  name: "AirAssault - The Red Mercury Missions"
+  saveName: "AirAssault - The Red Mercury Missions (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -4038,11 +4235,13 @@ SIPS-60005:
     multitap: false
     linkCable: false
 PCPX-96041:
-  name: "AirAssault - The Red Mercury Missions (Japan) (Demo)"
+  name: "AirAssault - The Red Mercury Missions (Demo)"
+  saveName: "AirAssault - The Red Mercury Missions (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00559:
-  name: "AirGrave (Japan)"
+  name: "AirGrave"
+  saveName: "AirGrave (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -4063,7 +4262,8 @@ SLPS-00559:
     multitap: false
     linkCable: false
 SLPS-01879:
-  name: "AirRace Championship (Japan)"
+  name: "AirRace Championship"
+  saveName: "AirRace Championship (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4082,7 +4282,8 @@ SLPS-01879:
     multitap: false
     linkCable: false
 SLES-02137:
-  name: "Aironauts (Europe) (En,Fr,De)"
+  name: "Aironauts"
+  saveName: "Aironauts (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4103,7 +4304,8 @@ SLES-02137:
     multitap: false
     linkCable: false
 SLPS-01916:
-  name: "Airs, The (Japan)"
+  name: "Airs, The"
+  saveName: "Airs, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4122,7 +4324,8 @@ SLPS-01916:
     multitap: false
     linkCable: false
 SLPS-01096:
-  name: "Aishiau Koto Shika Dekinai (Japan)"
+  name: "Aishiau Koto Shika Dekinai"
+  saveName: "Aishiau Koto Shika Dekinai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -4158,7 +4361,8 @@ SLPS-02824:
     multitap: false
     linkCable: false
 SLPM-86254:
-  name: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 1)"
+  name: "Aitakute... - Your Smiles in My Heart (Disc 1)"
+  saveName: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 1)"
   discSet:
     name: "Aitakute... - Your Smiles in My Heart (Japan)"
     serials:
@@ -4184,7 +4388,8 @@ SLPM-86254:
     multitap: false
     linkCable: false
 SLPM-86255:
-  name: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 2)"
+  name: "Aitakute... - Your Smiles in My Heart (Disc 2)"
+  saveName: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 2)"
   discSet:
     name: "Aitakute... - Your Smiles in My Heart (Japan)"
     serials:
@@ -4210,7 +4415,8 @@ SLPM-86255:
     multitap: false
     linkCable: false
 SLPM-86256:
-  name: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 3)"
+  name: "Aitakute... - Your Smiles in My Heart (Disc 3)"
+  saveName: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 3)"
   discSet:
     name: "Aitakute... - Your Smiles in My Heart (Japan)"
     serials:
@@ -4236,7 +4442,8 @@ SLPM-86256:
     multitap: false
     linkCable: false
 SLPM-86257:
-  name: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 4)"
+  name: "Aitakute... - Your Smiles in My Heart (Disc 4)"
+  saveName: "Aitakute... - Your Smiles in My Heart (Japan) (Disc 4)"
   discSet:
     name: "Aitakute... - Your Smiles in My Heart (Japan)"
     serials:
@@ -4262,7 +4469,8 @@ SLPM-86257:
     multitap: false
     linkCable: false
 SLPM-80162:
-  name: "Aitakute... - Your Smiles in My Heart - Oroshitate no Diary - Introduction Disc (Japan)"
+  name: "Aitakute... - Your Smiles in My Heart - Oroshitate no Diary - Introduction Disc"
+  saveName: "Aitakute... - Your Smiles in My Heart - Oroshitate no Diary - Introduction Disc (Japan)"
 SCPS-45302:
   name: "Aizouban Houshinengi"
   controllers:
@@ -4283,7 +4491,8 @@ SCPS-45302:
     multitap: false
     linkCable: false
 SLPS-01863:
-  name: "Akagawa Jiro - Majo Tachi no Nemuri - Fukkatsusai (Japan)"
+  name: "Akagawa Jiro - Majo Tachi no Nemuri - Fukkatsusai"
+  saveName: "Akagawa Jiro - Majo Tachi no Nemuri - Fukkatsusai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4302,7 +4511,8 @@ SLPS-01863:
     multitap: false
     linkCable: false
 SLPS-91503:
-  name: "Akagawa Jiro - Yasoukyoku (Japan)"
+  name: "Akagawa Jiro - Yasoukyoku"
+  saveName: "Akagawa Jiro - Yasoukyoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4325,7 +4535,8 @@ SLPS-91503:
     multitap: false
     linkCable: false
 SLPS-01415:
-  name: "Akagawa Jiro - Yasoukyoku (Japan) (Shokai Genteiban)"
+  name: "Akagawa Jiro - Yasoukyoku (Shokai Genteiban)"
+  saveName: "Akagawa Jiro - Yasoukyoku (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4344,7 +4555,8 @@ SLPS-01415:
     multitap: false
     linkCable: false
 SLPS-03213:
-  name: "Akagawa Jiro - Yasoukyoku 2 (Japan)"
+  name: "Akagawa Jiro - Yasoukyoku 2"
+  saveName: "Akagawa Jiro - Yasoukyoku 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4382,7 +4594,8 @@ SLPS-91505:
     multitap: false
     linkCable: false
 SLPS-00619:
-  name: "Akazu no Ma (Japan)"
+  name: "Akazu no Ma"
+  saveName: "Akazu no Ma (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -4418,7 +4631,8 @@ SLPS-03263:
     multitap: false
     linkCable: false
 SLES-01298:
-  name: "Akuji the Heartless (Europe) (En,Fr,De)"
+  name: "Akuji the Heartless"
+  saveName: "Akuji the Heartless (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4439,7 +4653,8 @@ SLES-01298:
     multitap: false
     linkCable: false
 SLUS-00715:
-  name: "Akuji the Heartless (USA)"
+  name: "Akuji the Heartless"
+  saveName: "Akuji the Heartless (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -4462,11 +4677,13 @@ SLUS-00715:
     multitap: false
     linkCable: false
 SLUS-80715:
-  name: "Akuji the Heartless (USA) (Demo)"
+  name: "Akuji the Heartless (Demo)"
+  saveName: "Akuji the Heartless (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86023:
-  name: "Akumajou Dracula X - Gekka no Yasoukyoku (Japan)"
+  name: "Akumajou Dracula X - Gekka no Yasoukyoku"
+  saveName: "Akumajou Dracula X - Gekka no Yasoukyoku (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -4487,7 +4704,8 @@ SLPM-86023:
     multitap: false
     linkCable: false
 SLPM-86073:
-  name: "Akumajou Dracula X - Gekka no Yasoukyoku (Japan) (Rev 2)"
+  name: "Akumajou Dracula X - Gekka no Yasoukyoku"
+  saveName: "Akumajou Dracula X - Gekka no Yasoukyoku (Japan) (Rev 2)"
   controllers:
     - DigitalController
   codes:
@@ -4508,7 +4726,8 @@ SLPM-86073:
     multitap: false
     linkCable: false
 SLPS-01578:
-  name: "Albaria no Otome - Uruwashi no Seikishitachi (Japan)"
+  name: "Albaria no Otome - Uruwashi no Seikishitachi"
+  saveName: "Albaria no Otome - Uruwashi no Seikishitachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4527,7 +4746,8 @@ SLPS-01578:
     multitap: false
     linkCable: false
 SLES-03150:
-  name: "Alex Ferguson's Player Manager 2001 (Europe)"
+  name: "Alex Ferguson's Player Manager 2001"
+  saveName: "Alex Ferguson's Player Manager 2001 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4546,7 +4766,8 @@ SLES-03150:
     multitap: false
     linkCable: false
 SLES-03775:
-  name: "Alex Ferguson's Player Manager 2002 (Europe)"
+  name: "Alex Ferguson's Player Manager 2002"
+  saveName: "Alex Ferguson's Player Manager 2002 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -4564,7 +4785,8 @@ SLES-03775:
     multitap: false
     linkCable: false
 SLES-03290:
-  name: "Alexandra Ledermann 2 - Equitation Competition (France)"
+  name: "Alexandra Ledermann 2 - Equitation Competition"
+  saveName: "Alexandra Ledermann 2 - Equitation Competition (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4585,7 +4807,8 @@ SLES-03290:
     multitap: false
     linkCable: false
 SLUS-00872:
-  name: "Alexi Lalas International Soccer (USA) (En,Fr,De,Es,It)"
+  name: "Alexi Lalas International Soccer"
+  saveName: "Alexi Lalas International Soccer (USA) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -4611,7 +4834,8 @@ SLUS-00872:
     multitap: false
     linkCable: false
 SCES-03817:
-  name: "Alfred Chicken (Europe) (En,Fr,De,Es,It)"
+  name: "Alfred Chicken"
+  saveName: "Alfred Chicken (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4634,9 +4858,11 @@ SCES-03817:
     multitap: false
     linkCable: false
 SLES-12345:
-  name: "Alfred Chicken (Europe) (Proto)"
+  name: "Alfred Chicken (Proto)"
+  saveName: "Alfred Chicken (Europe) (Proto)"
 SLPS-00636:
-  name: "Alice in Cyberland (Japan)"
+  name: "Alice in Cyberland"
+  saveName: "Alice in Cyberland (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -4657,7 +4883,8 @@ SLPS-00636:
     multitap: false
     linkCable: false
 SLES-02913:
-  name: "Alien Resurrection (Europe) (En,Fr,De,Es,It)"
+  name: "Alien Resurrection"
+  saveName: "Alien Resurrection (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4683,7 +4910,8 @@ SLES-02913:
     multitap: false
     linkCable: false
 SLUS-00633:
-  name: "Alien Resurrection (USA)"
+  name: "Alien Resurrection"
+  saveName: "Alien Resurrection (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -4708,7 +4936,8 @@ SLUS-00633:
     multitap: false
     linkCable: false
 SLES-00101:
-  name: "Alien Trilogy (Europe) (En,Fr,Es,It)"
+  name: "Alien Trilogy"
+  saveName: "Alien Trilogy (Europe) (En,Fr,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -4729,11 +4958,13 @@ SLES-00101:
     multitap: false
     linkCable: false
 SLES-00288:
-  name: "Alien Trilogy (France) (Demo)"
+  name: "Alien Trilogy (Demo)"
+  saveName: "Alien Trilogy (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00246:
-  name: "Alien Trilogy (Germany)"
+  name: "Alien Trilogy"
+  saveName: "Alien Trilogy (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -4751,7 +4982,8 @@ SLES-00246:
     multitap: false
     linkCable: false
 SLPS-00332:
-  name: "Alien Trilogy (Japan)"
+  name: "Alien Trilogy"
+  saveName: "Alien Trilogy (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -4769,7 +5001,8 @@ SLPS-00332:
     multitap: false
     linkCable: false
 SLUS-00007:
-  name: "Alien Trilogy (USA)"
+  name: "Alien Trilogy"
+  saveName: "Alien Trilogy (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -4790,7 +5023,8 @@ SLUS-00007:
     multitap: false
     linkCable: false
 SLPS-01527:
-  name: "Alive (Japan) (Disc 1)"
+  name: "Alive (Disc 1)"
+  saveName: "Alive (Japan) (Disc 1)"
   discSet:
     name: "Alive (Japan)"
     serials:
@@ -4818,7 +5052,8 @@ SLPS-01527:
     multitap: false
     linkCable: false
 SLPS-01528:
-  name: "Alive (Japan) (Disc 2)"
+  name: "Alive (Disc 2)"
+  saveName: "Alive (Japan) (Disc 2)"
   discSet:
     name: "Alive (Japan)"
     serials:
@@ -4843,7 +5078,8 @@ SLPS-01528:
     multitap: false
     linkCable: false
 SLPS-01529:
-  name: "Alive (Japan) (Disc 3)"
+  name: "Alive (Disc 3)"
+  saveName: "Alive (Japan) (Disc 3)"
   discSet:
     name: "Alive (Japan)"
     serials:
@@ -4868,7 +5104,8 @@ SLPS-01529:
     multitap: false
     linkCable: false
 SLES-04162:
-  name: "All Music Dance! (Italy)"
+  name: "All Music Dance!"
+  saveName: "All Music Dance! (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4887,7 +5124,8 @@ SLES-04162:
     multitap: false
     linkCable: false
 SLES-04107:
-  name: "All Star Action (Europe) (Disc 1)"
+  name: "All Star Action (Disc 1)"
+  saveName: "All Star Action (Europe) (Disc 1)"
   discSet:
     name: "All Star Action (Europe)"
     serials:
@@ -4911,7 +5149,8 @@ SLES-04107:
     multitap: false
     linkCable: false
 SLES-14107:
-  name: "All Star Action (Europe) (Disc 2)"
+  name: "All Star Action (Disc 2)"
+  saveName: "All Star Action (Europe) (Disc 2)"
   discSet:
     name: "All Star Action (Europe)"
     serials:
@@ -4935,7 +5174,8 @@ SLES-14107:
     multitap: false
     linkCable: false
 SLES-03958:
-  name: "All Star Boxing (Europe)"
+  name: "All Star Boxing"
+  saveName: "All Star Boxing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4954,7 +5194,8 @@ SLES-03958:
     multitap: false
     linkCable: false
 SLES-03740:
-  name: "All Star Racing (Europe)"
+  name: "All Star Racing"
+  saveName: "All Star Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -4974,7 +5215,8 @@ SLES-03740:
     multitap: false
     linkCable: false
 SLUS-01460:
-  name: "All Star Racing (USA)"
+  name: "All Star Racing"
+  saveName: "All Star Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -4997,7 +5239,8 @@ SLUS-01460:
     multitap: false
     linkCable: false
 SLES-03933:
-  name: "All Star Racing 2 (Europe)"
+  name: "All Star Racing 2"
+  saveName: "All Star Racing 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -5017,7 +5260,8 @@ SLES-03933:
     multitap: false
     linkCable: false
 SLUS-01510:
-  name: "All Star Racing 2 (USA)"
+  name: "All Star Racing 2"
+  saveName: "All Star Racing 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -5040,7 +5284,8 @@ SLUS-01510:
     multitap: false
     linkCable: false
 SLES-00747:
-  name: "All Star Soccer (Europe) (En,Fr,De,It)"
+  name: "All Star Soccer"
+  saveName: "All Star Soccer (Europe) (En,Fr,De,It)"
   controllers:
     - DigitalController
   metadata:
@@ -5061,11 +5306,13 @@ SLES-00747:
     multitap: true
     linkCable: false
 SLED-01560:
-  name: "All Star Tennis '99 (Europe) (Demo)"
+  name: "All Star Tennis '99 (Demo)"
+  saveName: "All Star Tennis '99 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01433:
-  name: "All Star Tennis '99 (Europe) (En,Fr,De,Es,It)"
+  name: "All Star Tennis '99"
+  saveName: "All Star Tennis '99 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -5088,7 +5335,8 @@ SLES-01433:
     multitap: true
     linkCable: false
 SLPS-01962:
-  name: "All Star Tennis '99 (Japan)"
+  name: "All Star Tennis '99"
+  saveName: "All Star Tennis '99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -5107,7 +5355,8 @@ SLPS-01962:
     multitap: true
     linkCable: false
 SLES-03963:
-  name: "All Star Tennis (Europe)"
+  name: "All Star Tennis"
+  saveName: "All Star Tennis (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -5126,7 +5375,8 @@ SLES-03963:
     multitap: true
     linkCable: false
 SLES-02764:
-  name: "All Star Tennis 2000 (Europe) (En,De,Es,It)"
+  name: "All Star Tennis 2000"
+  saveName: "All Star Tennis 2000 (Europe) (En,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -5147,7 +5397,8 @@ SLES-02764:
     multitap: true
     linkCable: false
 SLES-02765:
-  name: "All Star Tennis 2000 (France)"
+  name: "All Star Tennis 2000"
+  saveName: "All Star Tennis 2000 (France)"
   controllers:
     - DigitalController
   metadata:
@@ -5165,7 +5416,8 @@ SLES-02765:
     multitap: true
     linkCable: false
 SLES-04060:
-  name: "All Star Watersports (Europe)"
+  name: "All Star Watersports"
+  saveName: "All Star Watersports (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -5184,7 +5436,8 @@ SLES-04060:
     multitap: true
     linkCable: false
 SLUS-00392:
-  name: "All-Star Baseball 97 featuring Frank Thomas (USA)"
+  name: "All-Star Baseball 97 featuring Frank Thomas"
+  saveName: "All-Star Baseball 97 featuring Frank Thomas (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -5202,7 +5455,8 @@ SLUS-00392:
     multitap: false
     linkCable: false
 SLPS-00993:
-  name: "All-Star Mahjong - Karei naru Shoubushi kara no Chousen (Japan)"
+  name: "All-Star Mahjong - Karei naru Shoubushi kara no Chousen"
+  saveName: "All-Star Mahjong - Karei naru Shoubushi kara no Chousen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -5220,7 +5474,8 @@ SLPS-00993:
     multitap: false
     linkCable: false
 SLUS-01431:
-  name: "All-Star Slammin' D-Ball (USA)"
+  name: "All-Star Slammin' D-Ball"
+  saveName: "All-Star Slammin' D-Ball (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -5242,7 +5497,8 @@ SLUS-01431:
     multitap: false
     linkCable: false
 SLES-02984:
-  name: "Alla Ricerca della Valle Incantata - Ritorno alla Grande Vallata (Italy)"
+  name: "Alla Ricerca della Valle Incantata - Ritorno alla Grande Vallata"
+  saveName: "Alla Ricerca della Valle Incantata - Ritorno alla Grande Vallata (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -5261,7 +5517,8 @@ SLES-02984:
     multitap: false
     linkCable: false
 SLES-00417:
-  name: "Allied General (Europe)"
+  name: "Allied General"
+  saveName: "Allied General (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -5279,7 +5536,8 @@ SLES-00417:
     multitap: false
     linkCable: false
 SLPS-00843:
-  name: "Allied General (Japan)"
+  name: "Allied General"
+  saveName: "Allied General (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -5297,7 +5555,8 @@ SLPS-00843:
     multitap: false
     linkCable: false
 SLUS-00303:
-  name: "Allied General (USA)"
+  name: "Allied General"
+  saveName: "Allied General (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1558-gf852be74"
@@ -5318,7 +5577,8 @@ SLUS-00303:
     multitap: false
     linkCable: false
 SLPS-00173:
-  name: "Alnam no Kiba - Juuzoku Juuni Shinto Densetsu (Japan)"
+  name: "Alnam no Kiba - Juuzoku Juuni Shinto Densetsu"
+  saveName: "Alnam no Kiba - Juuzoku Juuni Shinto Densetsu (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -5338,11 +5598,13 @@ SLPS-00173:
     multitap: false
     linkCable: false
 SLPM-80069:
-  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Demo)"
+  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Demo)"
+  saveName: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01187:
-  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 1)"
+  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Disc 1)"
+  saveName: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 1)"
   discSet:
     name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan)"
     serials:
@@ -5366,7 +5628,8 @@ SLPS-01187:
     multitap: false
     linkCable: false
 SLPS-01188:
-  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 2)"
+  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Disc 2)"
+  saveName: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 2)"
   discSet:
     name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan)"
     serials:
@@ -5390,7 +5653,8 @@ SLPS-01188:
     multitap: false
     linkCable: false
 SLPS-01189:
-  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 3)"
+  name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Disc 3)"
+  saveName: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 3)"
   discSet:
     name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan)"
     serials:
@@ -5414,7 +5678,8 @@ SLPS-01189:
     multitap: false
     linkCable: false
 SLES-00037:
-  name: "Alone in the Dark - Jack Is Back (Europe) (En,Fr,De,Es,It)"
+  name: "Alone in the Dark - Jack Is Back"
+  saveName: "Alone in the Dark - Jack Is Back (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -5436,7 +5701,8 @@ SLES-00037:
     multitap: false
     linkCable: false
 SLUS-00239:
-  name: "Alone in the Dark - One-Eyed Jack's Revenge (USA)"
+  name: "Alone in the Dark - One-Eyed Jack's Revenge"
+  saveName: "Alone in the Dark - One-Eyed Jack's Revenge (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -5457,7 +5723,8 @@ SLUS-00239:
     multitap: false
     linkCable: false
 SLES-02801:
-  name: "Alone in the Dark - The New Nightmare (Europe) (Disc 1)"
+  name: "Alone in the Dark - The New Nightmare (Disc 1)"
+  saveName: "Alone in the Dark - The New Nightmare (Europe) (Disc 1)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Europe)"
     serials:
@@ -5485,7 +5752,8 @@ SLES-02801:
     multitap: false
     linkCable: false
 SLES-12801:
-  name: "Alone in the Dark - The New Nightmare (Europe) (Disc 2)"
+  name: "Alone in the Dark - The New Nightmare (Disc 2)"
+  saveName: "Alone in the Dark - The New Nightmare (Europe) (Disc 2)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Europe)"
     serials:
@@ -5513,7 +5781,8 @@ SLES-12801:
     multitap: false
     linkCable: false
 SLES-02802:
-  name: "Alone in the Dark - The New Nightmare (France) (Disc 1)"
+  name: "Alone in the Dark - The New Nightmare (Disc 1)"
+  saveName: "Alone in the Dark - The New Nightmare (France) (Disc 1)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (France)"
     serials:
@@ -5541,7 +5810,8 @@ SLES-02802:
     multitap: false
     linkCable: false
 SLES-12802:
-  name: "Alone in the Dark - The New Nightmare (France) (Disc 2)"
+  name: "Alone in the Dark - The New Nightmare (Disc 2)"
+  saveName: "Alone in the Dark - The New Nightmare (France) (Disc 2)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (France)"
     serials:
@@ -5569,7 +5839,8 @@ SLES-12802:
     multitap: false
     linkCable: false
 SLES-02803:
-  name: "Alone in the Dark - The New Nightmare (Germany) (Disc 1)"
+  name: "Alone in the Dark - The New Nightmare (Disc 1)"
+  saveName: "Alone in the Dark - The New Nightmare (Germany) (Disc 1)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Germany)"
     serials:
@@ -5597,7 +5868,8 @@ SLES-02803:
     multitap: false
     linkCable: false
 SLES-12803:
-  name: "Alone in the Dark - The New Nightmare (Germany) (Disc 2)"
+  name: "Alone in the Dark - The New Nightmare (Disc 2)"
+  saveName: "Alone in the Dark - The New Nightmare (Germany) (Disc 2)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Germany)"
     serials:
@@ -5625,7 +5897,8 @@ SLES-12803:
     multitap: false
     linkCable: false
 SLES-02805:
-  name: "Alone in the Dark - The New Nightmare (Italy) (Disc 1)"
+  name: "Alone in the Dark - The New Nightmare (Disc 1)"
+  saveName: "Alone in the Dark - The New Nightmare (Italy) (Disc 1)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Italy)"
     serials:
@@ -5653,7 +5926,8 @@ SLES-02805:
     multitap: false
     linkCable: false
 SLES-12805:
-  name: "Alone in the Dark - The New Nightmare (Italy) (Disc 2)"
+  name: "Alone in the Dark - The New Nightmare (Disc 2)"
+  saveName: "Alone in the Dark - The New Nightmare (Italy) (Disc 2)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Italy)"
     serials:
@@ -5681,7 +5955,8 @@ SLES-12805:
     multitap: false
     linkCable: false
 SLES-02804:
-  name: "Alone in the Dark - The New Nightmare (Spain) (Disc 1)"
+  name: "Alone in the Dark - The New Nightmare (Disc 1)"
+  saveName: "Alone in the Dark - The New Nightmare (Spain) (Disc 1)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Spain)"
     serials:
@@ -5709,7 +5984,8 @@ SLES-02804:
     multitap: false
     linkCable: false
 SLES-12804:
-  name: "Alone in the Dark - The New Nightmare (Spain) (Disc 2)"
+  name: "Alone in the Dark - The New Nightmare (Disc 2)"
+  saveName: "Alone in the Dark - The New Nightmare (Spain) (Disc 2)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (Spain)"
     serials:
@@ -5737,7 +6013,8 @@ SLES-12804:
     multitap: false
     linkCable: false
 SLUS-01201:
-  name: "Alone in the Dark - The New Nightmare (USA) (Disc 1)"
+  name: "Alone in the Dark - The New Nightmare (Disc 1)"
+  saveName: "Alone in the Dark - The New Nightmare (USA) (Disc 1)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (USA)"
     serials:
@@ -5769,7 +6046,8 @@ SLUS-01201:
     multitap: false
     linkCable: false
 SLUS-01377:
-  name: "Alone in the Dark - The New Nightmare (USA) (Disc 2)"
+  name: "Alone in the Dark - The New Nightmare (Disc 2)"
+  saveName: "Alone in the Dark - The New Nightmare (USA) (Disc 2)"
   discSet:
     name: "Alone in the Dark - The New Nightmare (USA)"
     serials:
@@ -5825,7 +6103,8 @@ SLPM-87005:
     multitap: false
     linkCable: false
 SLPS-00141:
-  name: "Alone in the Dark 2 (Japan)"
+  name: "Alone in the Dark 2"
+  saveName: "Alone in the Dark 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -5843,7 +6122,8 @@ SLPS-00141:
     multitap: false
     linkCable: false
 SLES-01135:
-  name: "Alundra (Europe)"
+  name: "Alundra"
+  saveName: "Alundra (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -5866,13 +6146,15 @@ SLES-01135:
     multitap: false
     linkCable: false
 SLED-01308:
-  name: "Alundra (Europe) (Demo)"
+  name: "Alundra (Demo)"
+  saveName: "Alundra (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-01198:
-  name: "Alundra (France)"
+  name: "Alundra"
+  saveName: "Alundra (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -5895,7 +6177,8 @@ SLES-01198:
     multitap: false
     linkCable: false
 SLES-01256:
-  name: "Alundra (Germany)"
+  name: "Alundra"
+  saveName: "Alundra (Germany)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -5918,7 +6201,8 @@ SLES-01256:
     multitap: false
     linkCable: false
 SLES-01257:
-  name: "Alundra (Italy)"
+  name: "Alundra"
+  saveName: "Alundra (Italy)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -5941,7 +6225,8 @@ SLES-01257:
     multitap: false
     linkCable: false
 SCPS-10035:
-  name: "Alundra (Japan)"
+  name: "Alundra"
+  saveName: "Alundra (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -5964,7 +6249,8 @@ SCPS-10035:
     multitap: false
     linkCable: false
 SLES-01258:
-  name: "Alundra (Spain)"
+  name: "Alundra"
+  saveName: "Alundra (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -5987,7 +6273,8 @@ SLES-01258:
     multitap: false
     linkCable: false
 SLUS-00553:
-  name: "Alundra (USA)"
+  name: "Alundra"
+  saveName: "Alundra (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -6029,7 +6316,8 @@ SCPS-45449:
     multitap: false
     linkCable: false
 SLES-02600:
-  name: "Alundra 2 - A New Legend Begins (Europe)"
+  name: "Alundra 2 - A New Legend Begins"
+  saveName: "Alundra 2 - A New Legend Begins (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6050,7 +6338,8 @@ SLES-02600:
     multitap: false
     linkCable: false
 SLUS-01017:
-  name: "Alundra 2 - A New Legend Begins (USA)"
+  name: "Alundra 2 - A New Legend Begins"
+  saveName: "Alundra 2 - A New Legend Begins (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -6074,7 +6363,8 @@ SLUS-01017:
     multitap: false
     linkCable: false
 SLES-02602:
-  name: "Alundra 2 - Der Beginn einer neuen Legende (Germany)"
+  name: "Alundra 2 - Der Beginn einer neuen Legende"
+  saveName: "Alundra 2 - Der Beginn einer neuen Legende (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6095,7 +6385,8 @@ SLES-02602:
     multitap: false
     linkCable: false
 SCPS-10115:
-  name: "Alundra 2 - Mashinka no Nazo (Japan)"
+  name: "Alundra 2 - Mashinka no Nazo"
+  saveName: "Alundra 2 - Mashinka no Nazo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6116,13 +6407,15 @@ SCPS-10115:
     multitap: false
     linkCable: false
 PAPX-90097:
-  name: "Alundra 2 - Mashinka no Nazo (Japan) (Demo)"
+  name: "Alundra 2 - Mashinka no Nazo (Demo)"
+  saveName: "Alundra 2 - Mashinka no Nazo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLES-02601:
-  name: "Alundra 2 - Une Legende Est Nee (France)"
+  name: "Alundra 2 - Une Legende Est Nee"
+  saveName: "Alundra 2 - Une Legende Est Nee (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6143,7 +6436,8 @@ SLES-02601:
     multitap: false
     linkCable: false
 SLES-03858:
-  name: "Amazing Virtual Sea-Monkeys, The (Europe) (En,Fr,De,Es,It,Nl,Pt)"
+  name: "Amazing Virtual Sea-Monkeys, The"
+  saveName: "Amazing Virtual Sea-Monkeys, The (Europe) (En,Fr,De,Es,It,Nl,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6168,7 +6462,8 @@ SLES-03858:
     multitap: false
     linkCable: false
 SLUS-01475:
-  name: "Amazing Virtual Sea-Monkeys, The (USA) (En,Es)"
+  name: "Amazing Virtual Sea-Monkeys, The"
+  saveName: "Amazing Virtual Sea-Monkeys, The (USA) (En,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1773-gbdd98281"
@@ -6191,7 +6486,8 @@ SLUS-01475:
     multitap: false
     linkCable: false
 SLPS-00241:
-  name: "America Oudan Ultra Quiz (Japan)"
+  name: "America Oudan Ultra Quiz"
+  saveName: "America Oudan Ultra Quiz (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -6209,7 +6505,8 @@ SLPS-00241:
     multitap: true
     linkCable: false
 SLPS-01802:
-  name: "America Oudan Ultra Quiz (Japan) (Fukkokuban)"
+  name: "America Oudan Ultra Quiz (Fukkokuban)"
+  saveName: "America Oudan Ultra Quiz (Japan) (Fukkokuban)"
   controllers:
     - DigitalController
   codes:
@@ -6230,7 +6527,8 @@ SLPS-01802:
     multitap: true
     linkCable: false
 SLES-04037:
-  name: "American Pool (Europe)"
+  name: "American Pool"
+  saveName: "American Pool (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6249,7 +6547,8 @@ SLES-04037:
     multitap: false
     linkCable: false
 SLUS-01488:
-  name: "American Pool (USA)"
+  name: "American Pool"
+  saveName: "American Pool (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -6271,7 +6570,8 @@ SLUS-01488:
     multitap: false
     linkCable: false
 SLES-02348:
-  name: "Amerzone - Das Testament des Forschungsreisenden (Germany) (Disc 1)"
+  name: "Amerzone - Das Testament des Forschungsreisenden (Disc 1)"
+  saveName: "Amerzone - Das Testament des Forschungsreisenden (Germany) (Disc 1)"
   discSet:
     name: "Amerzone - Das Testament des Forschungsreisenden (Germany)"
     serials:
@@ -6296,7 +6596,8 @@ SLES-02348:
     multitap: false
     linkCable: false
 SLES-12348:
-  name: "Amerzone - Das Testament des Forschungsreisenden (Germany) (Disc 2)"
+  name: "Amerzone - Das Testament des Forschungsreisenden (Disc 2)"
+  saveName: "Amerzone - Das Testament des Forschungsreisenden (Germany) (Disc 2)"
   discSet:
     name: "Amerzone - Das Testament des Forschungsreisenden (Germany)"
     serials:
@@ -6321,7 +6622,8 @@ SLES-12348:
     multitap: false
     linkCable: false
 SLES-02349:
-  name: "Amerzone - El Legado del Explorador (Spain) (Disc 1)"
+  name: "Amerzone - El Legado del Explorador (Disc 1)"
+  saveName: "Amerzone - El Legado del Explorador (Spain) (Disc 1)"
   discSet:
     name: "Amerzone - El Legado del Explorador (Spain)"
     serials:
@@ -6346,7 +6648,8 @@ SLES-02349:
     multitap: false
     linkCable: false
 SLES-12349:
-  name: "Amerzone - El Legado del Explorador (Spain) (Disc 2)"
+  name: "Amerzone - El Legado del Explorador (Disc 2)"
+  saveName: "Amerzone - El Legado del Explorador (Spain) (Disc 2)"
   discSet:
     name: "Amerzone - El Legado del Explorador (Spain)"
     serials:
@@ -6371,7 +6674,8 @@ SLES-12349:
     multitap: false
     linkCable: false
 SLES-02350:
-  name: "Amerzone - Il Testamento dell'Esploratore (Italy) (Disc 1)"
+  name: "Amerzone - Il Testamento dell'Esploratore (Disc 1)"
+  saveName: "Amerzone - Il Testamento dell'Esploratore (Italy) (Disc 1)"
   discSet:
     name: "Amerzone - Il Testamento dell'Esploratore (Italy)"
     serials:
@@ -6396,7 +6700,8 @@ SLES-02350:
     multitap: false
     linkCable: false
 SLES-12350:
-  name: "Amerzone - Il Testamento dell'Esploratore (Italy) (Disc 2)"
+  name: "Amerzone - Il Testamento dell'Esploratore (Disc 2)"
+  saveName: "Amerzone - Il Testamento dell'Esploratore (Italy) (Disc 2)"
   discSet:
     name: "Amerzone - Il Testamento dell'Esploratore (Italy)"
     serials:
@@ -6421,7 +6726,8 @@ SLES-12350:
     multitap: false
     linkCable: false
 SLES-02429:
-  name: "Amerzone - O Testamento do Explorador (Portugal) (Disc 1)"
+  name: "Amerzone - O Testamento do Explorador (Disc 1)"
+  saveName: "Amerzone - O Testamento do Explorador (Portugal) (Disc 1)"
   discSet:
     name: "Amerzone - O Testamento do Explorador (Portugal)"
     serials:
@@ -6446,7 +6752,8 @@ SLES-02429:
     multitap: false
     linkCable: false
 SLES-12429:
-  name: "Amerzone - O Testamento do Explorador (Portugal) (Disc 2)"
+  name: "Amerzone - O Testamento do Explorador (Disc 2)"
+  saveName: "Amerzone - O Testamento do Explorador (Portugal) (Disc 2)"
   discSet:
     name: "Amerzone - O Testamento do Explorador (Portugal)"
     serials:
@@ -6471,7 +6778,8 @@ SLES-12429:
     multitap: false
     linkCable: false
 SLES-02347:
-  name: "Amerzone - The Explorer's Legacy (Europe) (Disc 1)"
+  name: "Amerzone - The Explorer's Legacy (Disc 1)"
+  saveName: "Amerzone - The Explorer's Legacy (Europe) (Disc 1)"
   discSet:
     name: "Amerzone - The Explorer's Legacy (Europe)"
     serials:
@@ -6496,7 +6804,8 @@ SLES-02347:
     multitap: false
     linkCable: false
 SLES-12347:
-  name: "Amerzone - The Explorer's Legacy (Europe) (Disc 2)"
+  name: "Amerzone - The Explorer's Legacy (Disc 2)"
+  saveName: "Amerzone - The Explorer's Legacy (Europe) (Disc 2)"
   discSet:
     name: "Amerzone - The Explorer's Legacy (Europe)"
     serials:
@@ -6521,7 +6830,8 @@ SLES-12347:
     multitap: false
     linkCable: false
 SLES-02346:
-  name: "Amerzone, L' (France) (Disc 1)"
+  name: "Amerzone, L' (Disc 1)"
+  saveName: "Amerzone, L' (France) (Disc 1)"
   discSet:
     name: "Amerzone, L' (France)"
     serials:
@@ -6546,7 +6856,8 @@ SLES-02346:
     multitap: false
     linkCable: false
 SLES-12346:
-  name: "Amerzone, L' (France) (Disc 2)"
+  name: "Amerzone, L' (Disc 2)"
+  saveName: "Amerzone, L' (France) (Disc 2)"
   discSet:
     name: "Amerzone, L' (France)"
     serials:
@@ -6571,13 +6882,17 @@ SLES-12346:
     multitap: false
     linkCable: false
 PEPX-94009:
-  name: "Analog Controller Service Disc (Revised) (Europe)"
+  name: "Analog Controller Service Disc (Revised)"
+  saveName: "Analog Controller Service Disc (Revised) (Europe)"
 PUPX-93010:
-  name: "Analog Controller Service Disc (Revised) (USA)"
+  name: "Analog Controller Service Disc (Revised)"
+  saveName: "Analog Controller Service Disc (Revised) (USA)"
 PUPX-93008:
-  name: "Analog Controller Service Disc (USA)"
+  name: "Analog Controller Service Disc"
+  saveName: "Analog Controller Service Disc (USA)"
 SLES-02961:
-  name: "Anastasia (Europe) (En,Fr,De,Nl)"
+  name: "Anastasia"
+  saveName: "Anastasia (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -6599,7 +6914,8 @@ SLES-02961:
     multitap: false
     linkCable: false
 SLPS-01108:
-  name: "Ancient Roman - Power of Dark Side (Japan) (Disc 1)"
+  name: "Ancient Roman - Power of Dark Side (Disc 1)"
+  saveName: "Ancient Roman - Power of Dark Side (Japan) (Disc 1)"
   discSet:
     name: "Ancient Roman - Power of Dark Side (Japan)"
     serials:
@@ -6622,7 +6938,8 @@ SLPS-01108:
     multitap: false
     linkCable: false
 SLPS-01109:
-  name: "Ancient Roman - Power of Dark Side (Japan) (Disc 2)"
+  name: "Ancient Roman - Power of Dark Side (Disc 2)"
+  saveName: "Ancient Roman - Power of Dark Side (Japan) (Disc 2)"
   discSet:
     name: "Ancient Roman - Power of Dark Side (Japan)"
     serials:
@@ -6645,11 +6962,13 @@ SLPS-01109:
     multitap: false
     linkCable: false
 SLPM-80141:
-  name: "Ancient Roman Extra (Japan) (Demo)"
+  name: "Ancient Roman Extra (Demo)"
+  saveName: "Ancient Roman Extra (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00438:
-  name: "Andretti Racing (Europe)"
+  name: "Andretti Racing"
+  saveName: "Andretti Racing (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -6668,7 +6987,8 @@ SLES-00438:
     multitap: false
     linkCable: true
 SLES-00439:
-  name: "Andretti Racing (France)"
+  name: "Andretti Racing"
+  saveName: "Andretti Racing (France)"
   controllers:
     - DigitalController
     - NeGcon
@@ -6687,7 +7007,8 @@ SLES-00439:
     multitap: false
     linkCable: true
 SLES-00440:
-  name: "Andretti Racing (Germany)"
+  name: "Andretti Racing"
+  saveName: "Andretti Racing (Germany)"
   controllers:
     - DigitalController
     - NeGcon
@@ -6706,7 +7027,8 @@ SLES-00440:
     multitap: false
     linkCable: true
 SLPS-00759:
-  name: "Andretti Racing (Japan)"
+  name: "Andretti Racing"
+  saveName: "Andretti Racing (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -6725,7 +7047,8 @@ SLPS-00759:
     multitap: false
     linkCable: true
 SLUS-00264:
-  name: "Andretti Racing (USA)"
+  name: "Andretti Racing"
+  saveName: "Andretti Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1580-g136a9d60"
@@ -6747,7 +7070,8 @@ SLUS-00264:
     multitap: false
     linkCable: true
 SLPS-00894:
-  name: "Angel Blade - Neo Tokyo Guardians (Japan)"
+  name: "Angel Blade - Neo Tokyo Guardians"
+  saveName: "Angel Blade - Neo Tokyo Guardians (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -6765,11 +7089,13 @@ SLPS-00894:
     multitap: false
     linkCable: false
 SLPM-80094:
-  name: "Angel Blade - Neo Tokyo Guardians (Japan) (Demo)"
+  name: "Angel Blade - Neo Tokyo Guardians (Demo)"
+  saveName: "Angel Blade - Neo Tokyo Guardians (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86960:
-  name: "Angel Blade - Neo Tokyo Guardians (Japan) (Major Wave)"
+  name: "Angel Blade - Neo Tokyo Guardians (Major Wave)"
+  saveName: "Angel Blade - Neo Tokyo Guardians (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -6787,7 +7113,8 @@ SLPM-86960:
     multitap: false
     linkCable: false
 SLPS-00163:
-  name: "Angel Graffiti - Anata e no Profile (Japan)"
+  name: "Angel Graffiti - Anata e no Profile"
+  saveName: "Angel Graffiti - Anata e no Profile (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -6811,7 +7138,8 @@ SLPS-00163:
     multitap: false
     linkCable: false
 SLPM-86165:
-  name: "Angelique - Tenkuu no Requiem (Japan)"
+  name: "Angelique - Tenkuu no Requiem"
+  saveName: "Angelique - Tenkuu no Requiem (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -6832,7 +7160,8 @@ SLPM-86165:
     multitap: false
     linkCable: false
 SLPM-86510:
-  name: "Angelique - Tenkuu no Requiem (Japan) (Angelique History)"
+  name: "Angelique - Tenkuu no Requiem (Angelique History)"
+  saveName: "Angelique - Tenkuu no Requiem (Japan) (Angelique History)"
   controllers:
     - DigitalController
   metadata:
@@ -6868,7 +7197,8 @@ SLPS-01337:
     multitap: false
     linkCable: false
 SLPM-86493:
-  name: "Angelique Duet (Japan)"
+  name: "Angelique Duet"
+  saveName: "Angelique Duet (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -6886,7 +7216,8 @@ SLPM-86493:
     multitap: false
     linkCable: false
 SLPM-86509:
-  name: "Angelique Duet (Japan) (Angelique History)"
+  name: "Angelique Duet (Angelique History)"
+  saveName: "Angelique Duet (Japan) (Angelique History)"
   controllers:
     - DigitalController
   metadata:
@@ -6922,7 +7253,8 @@ SLPS-01336:
     multitap: false
     linkCable: false
 SLPM-86189:
-  name: "Angelique Special (Japan)"
+  name: "Angelique Special"
+  saveName: "Angelique Special (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -6944,7 +7276,8 @@ SLPM-86189:
     multitap: false
     linkCable: false
 SLPM-86492:
-  name: "Angelique Special 2 (Japan)"
+  name: "Angelique Special 2"
+  saveName: "Angelique Special 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -6965,7 +7298,8 @@ SLPM-86492:
     multitap: false
     linkCable: false
 SLPM-86508:
-  name: "Angelique Special 2 (Japan) (Angelique History)"
+  name: "Angelique Special 2 (Angelique History)"
+  saveName: "Angelique Special 2 (Japan) (Angelique History)"
   controllers:
     - DigitalController
   metadata:
@@ -7073,7 +7407,8 @@ SLPM-86164:
     multitap: false
     linkCable: false
 SLES-04071:
-  name: "Animal Football (Europe) (En,Fr,De)"
+  name: "Animal Football"
+  saveName: "Animal Football (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7094,7 +7429,8 @@ SLES-04071:
     multitap: false
     linkCable: false
 SLES-04036:
-  name: "Animal Snap - Rescue Them 2 by 2 (Europe)"
+  name: "Animal Snap - Rescue Them 2 by 2"
+  saveName: "Animal Snap - Rescue Them 2 by 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -7112,7 +7448,8 @@ SLES-04036:
     multitap: false
     linkCable: false
 SLUS-00784:
-  name: "Animaniacs - Ten Pin Alley (USA)"
+  name: "Animaniacs - Ten Pin Alley"
+  saveName: "Animaniacs - Ten Pin Alley (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -7151,7 +7488,8 @@ SLES-01717:
     multitap: false
     linkCable: false
 SLPS-01830:
-  name: "Animetic Story Game 1 - Cardcaptor Sakura (Japan) (Disc 1)"
+  name: "Animetic Story Game 1 - Cardcaptor Sakura (Disc 1)"
+  saveName: "Animetic Story Game 1 - Cardcaptor Sakura (Japan) (Disc 1)"
   discSet:
     name: "Animetic Story Game 1 - Cardcaptor Sakura (Japan)"
     serials:
@@ -7175,7 +7513,8 @@ SLPS-01830:
     multitap: false
     linkCable: false
 SLPS-01831:
-  name: "Animetic Story Game 1 - Cardcaptor Sakura (Japan) (Disc 2)"
+  name: "Animetic Story Game 1 - Cardcaptor Sakura (Disc 2)"
+  saveName: "Animetic Story Game 1 - Cardcaptor Sakura (Japan) (Disc 2)"
   discSet:
     name: "Animetic Story Game 1 - Cardcaptor Sakura (Japan)"
     serials:
@@ -7199,7 +7538,8 @@ SLPS-01831:
     multitap: false
     linkCable: false
 SLUS-01010:
-  name: "Animorphs - Shattered Reality (USA)"
+  name: "Animorphs - Shattered Reality"
+  saveName: "Animorphs - Shattered Reality (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -7221,7 +7561,8 @@ SLUS-01010:
     multitap: false
     linkCable: false
 SLPS-01068:
-  name: "Ankh - Tutankhamen no Nazo (Japan) (Disc 1)"
+  name: "Ankh - Tutankhamen no Nazo (Disc 1)"
+  saveName: "Ankh - Tutankhamen no Nazo (Japan) (Disc 1)"
   discSet:
     name: "Ankh - Tutankhamen no Nazo (Japan)"
     serials:
@@ -7244,7 +7585,8 @@ SLPS-01068:
     multitap: false
     linkCable: false
 SLPS-01069:
-  name: "Ankh - Tutankhamen no Nazo (Japan) (Disc 2)"
+  name: "Ankh - Tutankhamen no Nazo (Disc 2)"
+  saveName: "Ankh - Tutankhamen no Nazo (Japan) (Disc 2)"
   discSet:
     name: "Ankh - Tutankhamen no Nazo (Japan)"
     serials:
@@ -7267,7 +7609,8 @@ SLPS-01069:
     multitap: false
     linkCable: false
 SCES-01833:
-  name: "Anna Kournikova's Smash Court Tennis (Europe)"
+  name: "Anna Kournikova's Smash Court Tennis"
+  saveName: "Anna Kournikova's Smash Court Tennis (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7286,7 +7629,8 @@ SCES-01833:
     multitap: true
     linkCable: false
 SLPS-01424:
-  name: "Annanjarin (Japan)"
+  name: "Annanjarin"
+  saveName: "Annanjarin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7305,7 +7649,8 @@ SLPS-01424:
     multitap: false
     linkCable: false
 SLPS-01522:
-  name: "Ano Ko Doko no Ko (Japan)"
+  name: "Ano Ko Doko no Ko"
+  saveName: "Ano Ko Doko no Ko (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7324,7 +7669,8 @@ SLPS-01522:
     multitap: true
     linkCable: false
 SLPS-01431:
-  name: "Another Memories (Japan)"
+  name: "Another Memories"
+  saveName: "Another Memories (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -7342,7 +7688,8 @@ SLPS-01431:
     multitap: false
     linkCable: false
 SLPS-01655:
-  name: "Another Mind (Japan)"
+  name: "Another Mind"
+  saveName: "Another Mind (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7361,11 +7708,13 @@ SLPS-01655:
     multitap: false
     linkCable: false
 SLPM-80321:
-  name: "Another Mind (Japan) (Demo)"
+  name: "Another Mind (Demo)"
+  saveName: "Another Mind (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02563:
-  name: "Anstoss - Premier Manager (Germany)"
+  name: "Anstoss - Premier Manager"
+  saveName: "Anstoss - Premier Manager (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7385,7 +7734,8 @@ SLES-02563:
     multitap: true
     linkCable: false
 SLPS-02940:
-  name: "Ao no 6-gou - Antarctica (Japan) (Disc 1)"
+  name: "Ao no 6-gou - Antarctica (Disc 1)"
+  saveName: "Ao no 6-gou - Antarctica (Japan) (Disc 1)"
   discSet:
     name: "Ao no 6-gou - Antarctica (Japan)"
     serials:
@@ -7409,7 +7759,8 @@ SLPS-02940:
     multitap: false
     linkCable: false
 SLPS-02941:
-  name: "Ao no 6-gou - Antarctica (Japan) (Disc 2)"
+  name: "Ao no 6-gou - Antarctica (Disc 2)"
+  saveName: "Ao no 6-gou - Antarctica (Japan) (Disc 2)"
   discSet:
     name: "Ao no 6-gou - Antarctica (Japan)"
     serials:
@@ -7469,7 +7820,8 @@ SLPM-86303:
     multitap: false
     linkCable: false
 SLPS-01579:
-  name: "Aoki Ookami to Shiroki Mejika - Genchou Hishi (Japan)"
+  name: "Aoki Ookami to Shiroki Mejika - Genchou Hishi"
+  saveName: "Aoki Ookami to Shiroki Mejika - Genchou Hishi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -7487,7 +7839,8 @@ SLPS-01579:
     multitap: false
     linkCable: false
 SLPS-03564:
-  name: "Aozora to Nakama-tachi - Yume no Bouken Plus (Japan)"
+  name: "Aozora to Nakama-tachi - Yume no Bouken Plus"
+  saveName: "Aozora to Nakama-tachi - Yume no Bouken Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7506,7 +7859,8 @@ SLPS-03564:
     multitap: false
     linkCable: false
 SCES-01564:
-  name: "Ape Escape (Europe)"
+  name: "Ape Escape"
+  saveName: "Ape Escape (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7526,11 +7880,13 @@ SCES-01564:
     multitap: false
     linkCable: false
 SCED-02133:
-  name: "Ape Escape (Europe) (Demo)"
+  name: "Ape Escape (Demo)"
+  saveName: "Ape Escape (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02028:
-  name: "Ape Escape (France)"
+  name: "Ape Escape"
+  saveName: "Ape Escape (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7550,7 +7906,8 @@ SCES-02028:
     multitap: false
     linkCable: false
 SCES-02029:
-  name: "Ape Escape (Germany)"
+  name: "Ape Escape"
+  saveName: "Ape Escape (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7570,7 +7927,8 @@ SCES-02029:
     multitap: false
     linkCable: false
 SCES-02030:
-  name: "Ape Escape (Italy)"
+  name: "Ape Escape"
+  saveName: "Ape Escape (Italy)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7590,7 +7948,8 @@ SCES-02030:
     multitap: false
     linkCable: false
 SCUS-94423:
-  name: "Ape Escape (USA)"
+  name: "Ape Escape"
+  saveName: "Ape Escape (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -7612,18 +7971,21 @@ SCUS-94423:
     multitap: false
     linkCable: false
 SCUS-94470:
-  name: "Ape Escape (USA) (Demo 1) (EDC)"
+  name: "Ape Escape (Demo 1) (EDC)"
+  saveName: "Ape Escape (USA) (Demo 1) (EDC)"
   metadata:
     genre: "** DEMO **"
 SCUS-94489:
-  name: "Ape Escape (USA) (Demo 2)"
+  name: "Ape Escape (Demo 2)"
+  saveName: "Ape Escape (USA) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
 SCES-02031:
-  name: "Ape Escape - La Invasion de los Monos (Spain)"
+  name: "Ape Escape - La Invasion de los Monos"
+  saveName: "Ape Escape - La Invasion de los Monos (Spain)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7643,7 +8005,8 @@ SCES-02031:
     multitap: false
     linkCable: false
 SLES-00460:
-  name: "Apocalypse (Europe)"
+  name: "Apocalypse"
+  saveName: "Apocalypse (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7663,11 +8026,13 @@ SLES-00460:
     multitap: false
     linkCable: false
 SLED-01610:
-  name: "Apocalypse (Europe) (Demo)"
+  name: "Apocalypse (Demo)"
+  saveName: "Apocalypse (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00834:
-  name: "Apocalypse (France)"
+  name: "Apocalypse"
+  saveName: "Apocalypse (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7687,7 +8052,8 @@ SLES-00834:
     multitap: false
     linkCable: false
 SLES-00835:
-  name: "Apocalypse (Germany)"
+  name: "Apocalypse"
+  saveName: "Apocalypse (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7707,7 +8073,8 @@ SLES-00835:
     multitap: false
     linkCable: false
 SLES-01463:
-  name: "Apocalypse (Italy)"
+  name: "Apocalypse"
+  saveName: "Apocalypse (Italy)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7727,7 +8094,8 @@ SLES-01463:
     multitap: false
     linkCable: false
 SLPM-86879:
-  name: "Apocalypse (Japan)"
+  name: "Apocalypse"
+  saveName: "Apocalypse (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -7747,7 +8115,8 @@ SLPM-86879:
     multitap: false
     linkCable: false
 SLUS-00373:
-  name: "Apocalypse (USA)"
+  name: "Apocalypse"
+  saveName: "Apocalypse (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -7790,7 +8159,8 @@ SLPM-86271:
     multitap: false
     linkCable: false
 SLES-03390:
-  name: "Aqua GT (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Aqua GT"
+  saveName: "Aqua GT (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7815,7 +8185,8 @@ SLES-03390:
     multitap: false
     linkCable: false
 SLPS-03095:
-  name: "Aqua Paradise (Japan)"
+  name: "Aqua Paradise"
+  saveName: "Aqua Paradise (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7834,7 +8205,8 @@ SLPS-03095:
     multitap: false
     linkCable: false
 SLPS-00060:
-  name: "Aquanaut no Kyuujitsu (Japan)"
+  name: "Aquanaut no Kyuujitsu"
+  saveName: "Aquanaut no Kyuujitsu (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -7854,7 +8226,8 @@ SLPS-00060:
     multitap: false
     linkCable: false
 SLPS-00406:
-  name: "Aquanaut no Kyuujitsu - Memories of Summer 1996 (Japan)"
+  name: "Aquanaut no Kyuujitsu - Memories of Summer 1996"
+  saveName: "Aquanaut no Kyuujitsu - Memories of Summer 1996 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -7872,7 +8245,8 @@ SLPS-00406:
     multitap: false
     linkCable: false
 SLPS-02023:
-  name: "Aquanaut no Kyuujitsu - Memories of Summer 1996 (Japan) (Artdink Best Choice)"
+  name: "Aquanaut no Kyuujitsu - Memories of Summer 1996 (Artdink Best Choice)"
+  saveName: "Aquanaut no Kyuujitsu - Memories of Summer 1996 (Japan) (Artdink Best Choice)"
   controllers:
     - DigitalController
   metadata:
@@ -7890,7 +8264,8 @@ SLPS-02023:
     multitap: false
     linkCable: false
 SLPS-02141:
-  name: "Aquanaut no Kyuujitsu 2 (Japan)"
+  name: "Aquanaut no Kyuujitsu 2"
+  saveName: "Aquanaut no Kyuujitsu 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -7909,7 +8284,8 @@ SLPS-02141:
     multitap: false
     linkCable: false
 SLPM-80449:
-  name: "Aquanaut no Kyuujitsu 2 (Japan) (Demo)"
+  name: "Aquanaut no Kyuujitsu 2 (Demo)"
+  saveName: "Aquanaut no Kyuujitsu 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02919:
@@ -7932,7 +8308,8 @@ SLPS-02919:
     multitap: false
     linkCable: false
 SCES-00241:
-  name: "Aquanaut's Holiday (Europe)"
+  name: "Aquanaut's Holiday"
+  saveName: "Aquanaut's Holiday (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -7951,7 +8328,8 @@ SCES-00241:
     multitap: false
     linkCable: false
 SCUS-94603:
-  name: "Aquanaut's Holiday (USA)"
+  name: "Aquanaut's Holiday"
+  saveName: "Aquanaut's Holiday (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -7970,7 +8348,8 @@ SCUS-94603:
     multitap: false
     linkCable: false
 SLPS-02731:
-  name: "Aquarian Age - Tokyo Wars (Japan)"
+  name: "Aquarian Age - Tokyo Wars"
+  saveName: "Aquarian Age - Tokyo Wars (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -7988,7 +8367,8 @@ SLPS-02731:
     multitap: true
     linkCable: false
 SCPS-10008:
-  name: "Arc the Lad (Japan)"
+  name: "Arc the Lad"
+  saveName: "Arc the Lad (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8006,7 +8386,8 @@ SCPS-10008:
     multitap: false
     linkCable: false
 SCPS-10040:
-  name: "Arc the Lad - Monster Game with Casino Game (Japan) (Disc 1) (Monster Game)"
+  name: "Arc the Lad - Monster Game with Casino Game (Disc 1) (Monster Game)"
+  saveName: "Arc the Lad - Monster Game with Casino Game (Japan) (Disc 1) (Monster Game)"
   discSet:
     name: "Arc the Lad - Monster Game with Casino Game (Japan)"
     serials:
@@ -8029,7 +8410,8 @@ SCPS-10040:
     multitap: false
     linkCable: false
 SCPS-10041:
-  name: "Arc the Lad - Monster Game with Casino Game (Japan) (Disc 2) (Casino Game)"
+  name: "Arc the Lad - Monster Game with Casino Game (Disc 2) (Casino Game)"
+  saveName: "Arc the Lad - Monster Game with Casino Game (Japan) (Disc 2) (Casino Game)"
   discSet:
     name: "Arc the Lad - Monster Game with Casino Game (Japan)"
     serials:
@@ -8052,7 +8434,8 @@ SCPS-10041:
     multitap: false
     linkCable: false
 SLUS-01255:
-  name: "Arc the Lad Collection - Arc Arena - Monster Tournament (USA)"
+  name: "Arc the Lad Collection - Arc Arena - Monster Tournament"
+  saveName: "Arc the Lad Collection - Arc Arena - Monster Tournament (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -8071,7 +8454,8 @@ SLUS-01255:
     multitap: false
     linkCable: false
 SLUS-01224:
-  name: "Arc the Lad Collection - Arc the Lad (USA)"
+  name: "Arc the Lad Collection - Arc the Lad"
+  saveName: "Arc the Lad Collection - Arc the Lad (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -8093,7 +8477,8 @@ SLUS-01224:
     multitap: false
     linkCable: false
 SLUS-01252:
-  name: "Arc the Lad Collection - Arc the Lad II (USA)"
+  name: "Arc the Lad Collection - Arc the Lad II"
+  saveName: "Arc the Lad Collection - Arc the Lad II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -8117,7 +8502,8 @@ SLUS-01252:
     multitap: false
     linkCable: false
 SLUS-01253:
-  name: "Arc the Lad Collection - Arc the Lad III (USA) (Disc 1)"
+  name: "Arc the Lad Collection - Arc the Lad III (Disc 1)"
+  saveName: "Arc the Lad Collection - Arc the Lad III (USA) (Disc 1)"
   discSet:
     name: "Arc the Lad Collection - Arc the Lad III (USA)"
     serials:
@@ -8144,7 +8530,8 @@ SLUS-01253:
     multitap: false
     linkCable: false
 SLUS-01254:
-  name: "Arc the Lad Collection - Arc the Lad III (USA) (Disc 2)"
+  name: "Arc the Lad Collection - Arc the Lad III (Disc 2)"
+  saveName: "Arc the Lad Collection - Arc the Lad III (USA) (Disc 2)"
   discSet:
     name: "Arc the Lad Collection - Arc the Lad III (USA)"
     serials:
@@ -8171,7 +8558,8 @@ SLUS-01254:
     multitap: false
     linkCable: false
 SLUS-01256:
-  name: "Arc the Lad Collection - The Making of Arc the Lad (USA)"
+  name: "Arc the Lad Collection - The Making of Arc the Lad"
+  saveName: "Arc the Lad Collection - The Making of Arc the Lad (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -8193,7 +8581,8 @@ SLUS-01256:
     multitap: false
     linkCable: false
 SCPS-10026:
-  name: "Arc the Lad II (Japan)"
+  name: "Arc the Lad II"
+  saveName: "Arc the Lad II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8211,7 +8600,8 @@ SCPS-10026:
     multitap: false
     linkCable: false
 SCPS-91071:
-  name: "Arc the Lad II (Japan) (Rev 1)"
+  name: "Arc the Lad II"
+  saveName: "Arc the Lad II (Japan) (Rev 1)"
   controllers:
     - DigitalController
   codes:
@@ -8232,15 +8622,18 @@ SCPS-91071:
     multitap: false
     linkCable: false
 PAPX-90099:
-  name: "Arc the Lad III (Japan) (Demo 1)"
+  name: "Arc the Lad III (Demo 1)"
+  saveName: "Arc the Lad III (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PCPX-96176:
-  name: "Arc the Lad III (Japan) (Demo 2)"
+  name: "Arc the Lad III (Demo 2)"
+  saveName: "Arc the Lad III (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-10106:
-  name: "Arc the Lad III (Japan) (Disc 1)"
+  name: "Arc the Lad III (Disc 1)"
+  saveName: "Arc the Lad III (Japan) (Disc 1)"
   discSet:
     name: "Arc the Lad III (Japan)"
     serials:
@@ -8264,7 +8657,8 @@ SCPS-10106:
     multitap: false
     linkCable: false
 SCPS-91228:
-  name: "Arc the Lad III (Japan) (Disc 1) (Rev 1)"
+  name: "Arc the Lad III (Disc 1)"
+  saveName: "Arc the Lad III (Japan) (Disc 1) (Rev 1)"
   discSet:
     name: "Arc the Lad III (Japan) (Rev 1)"
     serials:
@@ -8291,7 +8685,8 @@ SCPS-91228:
     multitap: false
     linkCable: false
 SCPS-10107:
-  name: "Arc the Lad III (Japan) (Disc 2)"
+  name: "Arc the Lad III (Disc 2)"
+  saveName: "Arc the Lad III (Japan) (Disc 2)"
   discSet:
     name: "Arc the Lad III (Japan)"
     serials:
@@ -8315,7 +8710,8 @@ SCPS-10107:
     multitap: false
     linkCable: false
 SCPS-91229:
-  name: "Arc the Lad III (Japan) (Disc 2) (Rev 1)"
+  name: "Arc the Lad III (Disc 2)"
+  saveName: "Arc the Lad III (Japan) (Disc 2) (Rev 1)"
   discSet:
     name: "Arc the Lad III (Japan) (Rev 1)"
     serials:
@@ -8382,7 +8778,8 @@ SCPS-91302:
     multitap: false
     linkCable: false
 SLPS-01267:
-  name: "Arcade Gears - ImageFight & XMultiply (Japan)"
+  name: "Arcade Gears - ImageFight & XMultiply"
+  saveName: "Arcade Gears - ImageFight & XMultiply (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -8402,7 +8799,8 @@ SLPS-01267:
     multitap: false
     linkCable: false
 SLPS-00928:
-  name: "Arcade Gears - Pu-Li-Ru-La (Japan)"
+  name: "Arcade Gears - Pu-Li-Ru-La"
+  saveName: "Arcade Gears - Pu-Li-Ru-La (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8420,7 +8818,8 @@ SLPS-00928:
     multitap: false
     linkCable: false
 SLPS-00927:
-  name: "Arcade Gears - Wonder 3 (Japan)"
+  name: "Arcade Gears - Wonder 3"
+  saveName: "Arcade Gears - Wonder 3 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -8441,7 +8840,8 @@ SLPS-00927:
     multitap: false
     linkCable: false
 SLPM-87067:
-  name: "Arcade Hits - Crazy Climber (Japan)"
+  name: "Arcade Hits - Crazy Climber"
+  saveName: "Arcade Hits - Crazy Climber (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -8462,7 +8862,8 @@ SLPM-87067:
     multitap: false
     linkCable: false
 SLPM-87118:
-  name: "Arcade Hits - Frisky Tom (Japan)"
+  name: "Arcade Hits - Frisky Tom"
+  saveName: "Arcade Hits - Frisky Tom (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -8483,7 +8884,8 @@ SLPM-87118:
     multitap: false
     linkCable: false
 SLPM-87173:
-  name: "Arcade Hits - Magical Drop (Japan)"
+  name: "Arcade Hits - Magical Drop"
+  saveName: "Arcade Hits - Magical Drop (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
@@ -8504,7 +8906,8 @@ SLPM-87173:
     multitap: false
     linkCable: false
 SLPM-87082:
-  name: "Arcade Hits - Moon Cresta (Japan)"
+  name: "Arcade Hits - Moon Cresta"
+  saveName: "Arcade Hits - Moon Cresta (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1835-ge2fab72b"
@@ -8525,7 +8928,8 @@ SLPM-87082:
     multitap: false
     linkCable: false
 SLPM-86613:
-  name: "Arcade Hits - Raiden (Japan)"
+  name: "Arcade Hits - Raiden"
+  saveName: "Arcade Hits - Raiden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8543,7 +8947,8 @@ SLPM-86613:
     multitap: false
     linkCable: false
 SLPM-87228:
-  name: "Arcade Hits - Shienryuu (Japan)"
+  name: "Arcade Hits - Shienryuu"
+  saveName: "Arcade Hits - Shienryuu (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -8564,7 +8969,8 @@ SLPM-87228:
     multitap: false
     linkCable: false
 SLPM-87137:
-  name: "Arcade Hits - Sonic Wings Special (Japan)"
+  name: "Arcade Hits - Sonic Wings Special"
+  saveName: "Arcade Hits - Sonic Wings Special (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -8585,7 +8991,8 @@ SLPM-87137:
     multitap: false
     linkCable: false
 SLPM-87255:
-  name: "Arcade Hits - Soukyuu Gurentai (Japan)"
+  name: "Arcade Hits - Soukyuu Gurentai"
+  saveName: "Arcade Hits - Soukyuu Gurentai (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -8609,7 +9016,8 @@ SLPM-87255:
     multitap: false
     linkCable: false
 SLPM-87145:
-  name: "Arcade Hits - Suiko Enbu - Outlaws of the Lost Dynasty (Japan)"
+  name: "Arcade Hits - Suiko Enbu - Outlaws of the Lost Dynasty"
+  saveName: "Arcade Hits - Suiko Enbu - Outlaws of the Lost Dynasty (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8627,7 +9035,8 @@ SLPM-87145:
     multitap: false
     linkCable: false
 SLPM-87270:
-  name: "Arcade Hits - Wolf Fang - Kuuga 2001 (Japan)"
+  name: "Arcade Hits - Wolf Fang - Kuuga 2001"
+  saveName: "Arcade Hits - Wolf Fang - Kuuga 2001 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -8648,7 +9057,8 @@ SLPM-87270:
     multitap: false
     linkCable: false
 SLES-02339:
-  name: "Arcade Party Pak (Europe, Australia)"
+  name: "Arcade Party Pak"
+  saveName: "Arcade Party Pak (Europe, Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -8668,7 +9078,8 @@ SLES-02339:
     multitap: true
     linkCable: false
 SLUS-00952:
-  name: "Arcade Party Pak (USA)"
+  name: "Arcade Party Pak"
+  saveName: "Arcade Party Pak (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -8691,7 +9102,8 @@ SLUS-00952:
     multitap: true
     linkCable: false
 SLES-00466:
-  name: "Arcade's Greatest Hits - The Atari Collection 1 (Europe)"
+  name: "Arcade's Greatest Hits - The Atari Collection 1"
+  saveName: "Arcade's Greatest Hits - The Atari Collection 1 (Europe)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -8712,7 +9124,8 @@ SLES-00466:
     multitap: false
     linkCable: false
 SLUS-00399:
-  name: "Arcade's Greatest Hits - The Atari Collection 1 (USA)"
+  name: "Arcade's Greatest Hits - The Atari Collection 1"
+  saveName: "Arcade's Greatest Hits - The Atari Collection 1 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1313-g10cd00c"
@@ -8736,7 +9149,8 @@ SLUS-00399:
     multitap: false
     linkCable: false
 SLES-00712:
-  name: "Arcade's Greatest Hits - The Atari Collection 2 (Europe)"
+  name: "Arcade's Greatest Hits - The Atari Collection 2"
+  saveName: "Arcade's Greatest Hits - The Atari Collection 2 (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -8755,7 +9169,8 @@ SLES-00712:
     multitap: true
     linkCable: false
 SLUS-00449:
-  name: "Arcade's Greatest Hits - The Atari Collection 2 (USA)"
+  name: "Arcade's Greatest Hits - The Atari Collection 2"
+  saveName: "Arcade's Greatest Hits - The Atari Collection 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -8777,7 +9192,8 @@ SLUS-00449:
     multitap: true
     linkCable: false
 SLES-00739:
-  name: "Arcade's Greatest Hits - The Midway Collection 2 (Europe)"
+  name: "Arcade's Greatest Hits - The Midway Collection 2"
+  saveName: "Arcade's Greatest Hits - The Midway Collection 2 (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -8799,7 +9215,8 @@ SLES-00739:
     multitap: false
     linkCable: false
 SLUS-00450:
-  name: "Arcade's Greatest Hits - The Midway Collection 2 (USA)"
+  name: "Arcade's Greatest Hits - The Midway Collection 2"
+  saveName: "Arcade's Greatest Hits - The Midway Collection 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -8824,7 +9241,8 @@ SLUS-00450:
     multitap: false
     linkCable: false
 SLPS-01438:
-  name: "Arcana Senki Ludo (Japan)"
+  name: "Arcana Senki Ludo"
+  saveName: "Arcana Senki Ludo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8842,7 +9260,8 @@ SLPS-01438:
     multitap: true
     linkCable: false
 SLES-04096:
-  name: "Archer Maclean's 3D Pool (Europe)"
+  name: "Archer Maclean's 3D Pool"
+  saveName: "Archer Maclean's 3D Pool (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -8861,7 +9280,8 @@ SLES-04096:
     multitap: false
     linkCable: false
 SLPS-00428:
-  name: "Are!Mo KoreMo Momotarou (Japan)"
+  name: "Are!Mo KoreMo Momotarou"
+  saveName: "Are!Mo KoreMo Momotarou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -8879,7 +9299,8 @@ SLPS-00428:
     multitap: false
     linkCable: false
 SLES-00578:
-  name: "Area 51 (Europe) (En,Fr,De,Es)"
+  name: "Area 51"
+  saveName: "Area 51 (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
     - Justifier
@@ -8902,7 +9323,8 @@ SLES-00578:
     multitap: false
     linkCable: false
 SLES-03783:
-  name: "Area 51 (Europe) (En,Fr,De,Es) (Midway Classics)"
+  name: "Area 51 (Midway Classics)"
+  saveName: "Area 51 (Europe) (En,Fr,De,Es) (Midway Classics)"
   controllers:
     - DigitalController
     - Justifier
@@ -8925,7 +9347,8 @@ SLES-03783:
     multitap: false
     linkCable: false
 SLPS-00726:
-  name: "Area 51 (Japan)"
+  name: "Area 51"
+  saveName: "Area 51 (Japan)"
   controllers:
     - DigitalController
     - Justifier
@@ -8945,7 +9368,8 @@ SLPS-00726:
     multitap: false
     linkCable: false
 SLPS-00725:
-  name: "Area 51 (Japan) (Special Pack)"
+  name: "Area 51 (Special Pack)"
+  saveName: "Area 51 (Japan) (Special Pack)"
   controllers:
     - DigitalController
     - Justifier
@@ -8965,7 +9389,8 @@ SLPS-00725:
     multitap: false
     linkCable: false
 SLUS-00164:
-  name: "Area 51 (USA)"
+  name: "Area 51"
+  saveName: "Area 51 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -8988,7 +9413,8 @@ SLUS-00164:
     multitap: false
     linkCable: false
 SLES-00748:
-  name: "Ark of Time (Europe) (En,Fr,De,Es,It)"
+  name: "Ark of Time"
+  saveName: "Ark of Time (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4416-g24b4be51"
@@ -9015,7 +9441,8 @@ SLES-00748:
     multitap: false
     linkCable: false
 SLPM-86262:
-  name: "Arkanoid R 2000 (Japan)"
+  name: "Arkanoid R 2000"
+  saveName: "Arkanoid R 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9034,7 +9461,8 @@ SLPM-86262:
     multitap: false
     linkCable: false
 SLPS-00948:
-  name: "Arkanoid Returns (Japan)"
+  name: "Arkanoid Returns"
+  saveName: "Arkanoid Returns (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -9054,7 +9482,8 @@ SLPS-00948:
     multitap: false
     linkCable: false
 SLPS-01598:
-  name: "Armed Fighter (Japan)"
+  name: "Armed Fighter"
+  saveName: "Armed Fighter (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9091,7 +9520,8 @@ SCPS-45060:
     multitap: false
     linkCable: true
 SCES-00842:
-  name: "Armored Core (Europe) (En,Fr,De,Es,It)"
+  name: "Armored Core"
+  saveName: "Armored Core (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   settings:
@@ -9115,7 +9545,8 @@ SCES-00842:
     multitap: false
     linkCable: true
 SLPS-00900:
-  name: "Armored Core (Japan)"
+  name: "Armored Core"
+  saveName: "Armored Core (Japan)"
   controllers:
     - DigitalController
   settings:
@@ -9135,19 +9566,23 @@ SLPS-00900:
     multitap: false
     linkCable: true
 SLPM-80111:
-  name: "Armored Core (Japan) (Demo 1)"
+  name: "Armored Core (Demo 1)"
+  saveName: "Armored Core (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80118:
-  name: "Armored Core (Japan) (Demo 2)"
+  name: "Armored Core (Demo 2)"
+  saveName: "Armored Core (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLPM-80119:
-  name: "Armored Core (Japan) (Demo 3)"
+  name: "Armored Core (Demo 3)"
+  saveName: "Armored Core (Japan) (Demo 3)"
   metadata:
     genre: "** DEMO **"
 SLPS-03581:
-  name: "Armored Core (Japan) (Rev 1)"
+  name: "Armored Core"
+  saveName: "Armored Core (Japan) (Rev 1)"
   controllers:
     - DigitalController
   settings:
@@ -9170,7 +9605,8 @@ SLPS-03581:
     multitap: false
     linkCable: true
 SCUS-94182:
-  name: "Armored Core (USA)"
+  name: "Armored Core"
+  saveName: "Armored Core (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
@@ -9193,7 +9629,8 @@ SCUS-94182:
     multitap: false
     linkCable: true
 SLUS-01323:
-  name: "Armored Core (USA) (Reprint)"
+  name: "Armored Core (Reprint)"
+  saveName: "Armored Core (USA) (Reprint)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -9215,11 +9652,13 @@ SLUS-01323:
     multitap: false
     linkCable: true
 SLPM-80371:
-  name: "Armored Core - Master of Arena (Japan) (Demo)"
+  name: "Armored Core - Master of Arena (Demo)"
+  saveName: "Armored Core - Master of Arena (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01855:
-  name: "Armored Core - Master of Arena (Japan) (Disc 1)"
+  name: "Armored Core - Master of Arena (Disc 1)"
+  saveName: "Armored Core - Master of Arena (Japan) (Disc 1)"
   discSet:
     name: "Armored Core - Master of Arena (Japan)"
     serials:
@@ -9248,7 +9687,8 @@ SLPS-01855:
     multitap: false
     linkCable: true
 SLPS-91444:
-  name: "Armored Core - Master of Arena (Japan) (Disc 1) (PSone Books)"
+  name: "Armored Core - Master of Arena (Disc 1) (PSone Books)"
+  saveName: "Armored Core - Master of Arena (Japan) (Disc 1) (PSone Books)"
   discSet:
     name: "Armored Core - Master of Arena (Japan) (PSone Books)"
     serials:
@@ -9274,7 +9714,8 @@ SLPS-91444:
     multitap: false
     linkCable: true
 SLPS-01856:
-  name: "Armored Core - Master of Arena (Japan) (Disc 2)"
+  name: "Armored Core - Master of Arena (Disc 2)"
+  saveName: "Armored Core - Master of Arena (Japan) (Disc 2)"
   discSet:
     name: "Armored Core - Master of Arena (Japan)"
     serials:
@@ -9303,7 +9744,8 @@ SLPS-01856:
     multitap: false
     linkCable: true
 SLPS-91445:
-  name: "Armored Core - Master of Arena (Japan) (Disc 2) (PSone Books)"
+  name: "Armored Core - Master of Arena (Disc 2) (PSone Books)"
+  saveName: "Armored Core - Master of Arena (Japan) (Disc 2) (PSone Books)"
   discSet:
     name: "Armored Core - Master of Arena (Japan) (PSone Books)"
     serials:
@@ -9329,7 +9771,8 @@ SLPS-91445:
     multitap: false
     linkCable: true
 SLUS-01030:
-  name: "Armored Core - Master of Arena (USA) (Disc 1)"
+  name: "Armored Core - Master of Arena (Disc 1)"
+  saveName: "Armored Core - Master of Arena (USA) (Disc 1)"
   discSet:
     name: "Armored Core - Master of Arena (USA)"
     serials:
@@ -9358,7 +9801,8 @@ SLUS-01030:
     multitap: false
     linkCable: true
 SLUS-01081:
-  name: "Armored Core - Master of Arena (USA) (Disc 2)"
+  name: "Armored Core - Master of Arena (Disc 2)"
+  saveName: "Armored Core - Master of Arena (USA) (Disc 2)"
   discSet:
     name: "Armored Core - Master of Arena (USA)"
     serials:
@@ -9387,7 +9831,8 @@ SLUS-01081:
     multitap: false
     linkCable: true
 SLPS-01130:
-  name: "Armored Core - Project Phantasma (Japan)"
+  name: "Armored Core - Project Phantasma"
+  saveName: "Armored Core - Project Phantasma (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -9405,7 +9850,8 @@ SLPS-01130:
     multitap: false
     linkCable: true
 SLPS-91110:
-  name: "Armored Core - Project Phantasma (Japan) (PlayStation the Best)"
+  name: "Armored Core - Project Phantasma (PlayStation the Best)"
+  saveName: "Armored Core - Project Phantasma (Japan) (PlayStation the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9429,7 +9875,8 @@ SLPS-91110:
     multitap: false
     linkCable: true
 SLUS-00670:
-  name: "Armored Core - Project Phantasma (USA)"
+  name: "Armored Core - Project Phantasma"
+  saveName: "Armored Core - Project Phantasma (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2732-gfcec1126"
@@ -9471,7 +9918,8 @@ SLPS-91402:
     multitap: false
     linkCable: true
 SLES-02617:
-  name: "Armorines - Project S.W.A.R.M. (Europe) (En,Fr,Es,It)"
+  name: "Armorines - Project S.W.A.R.M."
+  saveName: "Armorines - Project S.W.A.R.M. (Europe) (En,Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9493,7 +9941,8 @@ SLES-02617:
     multitap: false
     linkCable: false
 SLES-02726:
-  name: "Armorines - Project S.W.A.R.M. (Germany)"
+  name: "Armorines - Project S.W.A.R.M."
+  saveName: "Armorines - Project S.W.A.R.M. (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9512,7 +9961,8 @@ SLES-02726:
     multitap: false
     linkCable: false
 SLPM-86502:
-  name: "Armorines - Project S.W.A.R.M. (Japan)"
+  name: "Armorines - Project S.W.A.R.M."
+  saveName: "Armorines - Project S.W.A.R.M. (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9531,7 +9981,8 @@ SLPM-86502:
     multitap: false
     linkCable: false
 SLUS-01022:
-  name: "Armorines - Project S.W.A.R.M. (USA)"
+  name: "Armorines - Project S.W.A.R.M."
+  saveName: "Armorines - Project S.W.A.R.M. (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -9553,7 +10004,8 @@ SLUS-01022:
     multitap: false
     linkCable: false
 SLES-02620:
-  name: "Army Men - Air Attack (Europe) (En,Es,It)"
+  name: "Army Men - Air Attack"
+  saveName: "Army Men - Air Attack (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9574,7 +10026,8 @@ SLES-02620:
     multitap: false
     linkCable: false
 SLES-02498:
-  name: "Army Men - Air Attack (Europe) (En,Fr,De)"
+  name: "Army Men - Air Attack"
+  saveName: "Army Men - Air Attack (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9595,7 +10048,8 @@ SLES-02498:
     multitap: false
     linkCable: false
 SLUS-00913:
-  name: "Army Men - Air Attack (USA)"
+  name: "Army Men - Air Attack"
+  saveName: "Army Men - Air Attack (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -9617,7 +10071,8 @@ SLUS-00913:
     multitap: false
     linkCable: false
 SLES-03226:
-  name: "Army Men - Air Attack 2 (Europe)"
+  name: "Army Men - Air Attack 2"
+  saveName: "Army Men - Air Attack 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9636,7 +10091,8 @@ SLES-03226:
     multitap: false
     linkCable: false
 SLES-03227:
-  name: "Army Men - Air Attack 2 (France)"
+  name: "Army Men - Air Attack 2"
+  saveName: "Army Men - Air Attack 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9655,7 +10111,8 @@ SLES-03227:
     multitap: false
     linkCable: false
 SLES-03228:
-  name: "Army Men - Air Attack 2 (Germany)"
+  name: "Army Men - Air Attack 2"
+  saveName: "Army Men - Air Attack 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9674,7 +10131,8 @@ SLES-03228:
     multitap: false
     linkCable: false
 SLES-03229:
-  name: "Army Men - Air Attack 2 (Italy)"
+  name: "Army Men - Air Attack 2"
+  saveName: "Army Men - Air Attack 2 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9693,7 +10151,8 @@ SLES-03229:
     multitap: false
     linkCable: false
 SLES-03230:
-  name: "Army Men - Air Attack 2 (Spain)"
+  name: "Army Men - Air Attack 2"
+  saveName: "Army Men - Air Attack 2 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9712,7 +10171,8 @@ SLES-03230:
     multitap: false
     linkCable: false
 SLUS-01132:
-  name: "Army Men - Air Attack 2 (USA)"
+  name: "Army Men - Air Attack 2"
+  saveName: "Army Men - Air Attack 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -9734,7 +10194,8 @@ SLUS-01132:
     multitap: false
     linkCable: false
 SLUS-01330:
-  name: "Army Men - Green Rogue (USA)"
+  name: "Army Men - Green Rogue"
+  saveName: "Army Men - Green Rogue (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -9756,7 +10217,8 @@ SLUS-01330:
     multitap: false
     linkCable: false
 SLES-03231:
-  name: "Army Men - Land, Sea, Air (Europe) (En,Fr,De,Es,It)"
+  name: "Army Men - Land, Sea, Air"
+  saveName: "Army Men - Land, Sea, Air (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9779,7 +10241,8 @@ SLES-03231:
     multitap: false
     linkCable: false
 SLES-03414:
-  name: "Army Men - Lock 'n' Load (Europe) (En,Fr,De,Es,It)"
+  name: "Army Men - Lock 'n' Load"
+  saveName: "Army Men - Lock 'n' Load (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9802,7 +10265,8 @@ SLES-03414:
     multitap: false
     linkCable: false
 SLES-03431:
-  name: "Army Men - Omega Soldier (Europe) (En,Fr,De,Es,It)"
+  name: "Army Men - Omega Soldier"
+  saveName: "Army Men - Omega Soldier (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9825,7 +10289,8 @@ SLES-03431:
     multitap: false
     linkCable: false
 SLES-02855:
-  name: "Army Men - Operation Meltdown (Europe) (En,Fr,De,Es,It)"
+  name: "Army Men - Operation Meltdown"
+  saveName: "Army Men - Operation Meltdown (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9848,7 +10313,8 @@ SLES-02855:
     multitap: false
     linkCable: false
 SLES-02626:
-  name: "Army Men - Sarge's Heroes (Europe)"
+  name: "Army Men - Sarge's Heroes"
+  saveName: "Army Men - Sarge's Heroes (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9870,7 +10336,8 @@ SLES-02626:
     multitap: false
     linkCable: false
 SLES-02627:
-  name: "Army Men - Sarge's Heroes (France)"
+  name: "Army Men - Sarge's Heroes"
+  saveName: "Army Men - Sarge's Heroes (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9892,7 +10359,8 @@ SLES-02627:
     multitap: false
     linkCable: false
 SLES-02628:
-  name: "Army Men - Sarge's Heroes (Germany)"
+  name: "Army Men - Sarge's Heroes"
+  saveName: "Army Men - Sarge's Heroes (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9914,7 +10382,8 @@ SLES-02628:
     multitap: false
     linkCable: false
 SLES-02630:
-  name: "Army Men - Sarge's Heroes (Italy)"
+  name: "Army Men - Sarge's Heroes"
+  saveName: "Army Men - Sarge's Heroes (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9936,7 +10405,8 @@ SLES-02630:
     multitap: false
     linkCable: false
 SLES-02629:
-  name: "Army Men - Sarge's Heroes (Spain)"
+  name: "Army Men - Sarge's Heroes"
+  saveName: "Army Men - Sarge's Heroes (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -9958,7 +10428,8 @@ SLES-02629:
     multitap: false
     linkCable: false
 SLUS-00914:
-  name: "Army Men - Sarge's Heroes (USA)"
+  name: "Army Men - Sarge's Heroes"
+  saveName: "Army Men - Sarge's Heroes (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -9983,7 +10454,8 @@ SLUS-00914:
     multitap: false
     linkCable: false
 SLES-03316:
-  name: "Army Men - Sarge's Heroes 2 (Europe) (En,Fr,De,Es,It)"
+  name: "Army Men - Sarge's Heroes 2"
+  saveName: "Army Men - Sarge's Heroes 2 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10006,7 +10478,8 @@ SLES-03316:
     multitap: false
     linkCable: false
 SLUS-01202:
-  name: "Army Men - Sarge's Heroes 2 (USA)"
+  name: "Army Men - Sarge's Heroes 2"
+  saveName: "Army Men - Sarge's Heroes 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -10028,7 +10501,8 @@ SLUS-01202:
     multitap: false
     linkCable: false
 SLES-03633:
-  name: "Army Men - Team Assault (Europe) (En,Fr,De,Es,It)"
+  name: "Army Men - Team Assault"
+  saveName: "Army Men - Team Assault (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10051,7 +10525,8 @@ SLES-03633:
     multitap: false
     linkCable: false
 SLUS-01079:
-  name: "Army Men - World War (USA)"
+  name: "Army Men - World War"
+  saveName: "Army Men - World War (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -10073,7 +10548,8 @@ SLUS-01079:
     multitap: false
     linkCable: false
 SLUS-01327:
-  name: "Army Men - World War - Final Front (USA)"
+  name: "Army Men - World War - Final Front"
+  saveName: "Army Men - World War - Final Front (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -10095,7 +10571,8 @@ SLUS-01327:
     multitap: false
     linkCable: false
 SLUS-01203:
-  name: "Army Men - World War - Land, Sea, Air (USA)"
+  name: "Army Men - World War - Land, Sea, Air"
+  saveName: "Army Men - World War - Land, Sea, Air (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -10117,7 +10594,8 @@ SLUS-01203:
     multitap: false
     linkCable: false
 SLUS-01435:
-  name: "Army Men - World War - Team Assault (USA)"
+  name: "Army Men - World War - Team Assault"
+  saveName: "Army Men - World War - Team Assault (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-967-gf856a8a"
@@ -10139,7 +10617,8 @@ SLUS-01435:
     multitap: false
     linkCable: false
 SLES-02378:
-  name: "Army Men 3D (Europe) (En,Fr,De)"
+  name: "Army Men 3D"
+  saveName: "Army Men 3D (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10160,7 +10639,8 @@ SLES-02378:
     multitap: false
     linkCable: false
 SLUS-00491:
-  name: "Army Men 3D (USA)"
+  name: "Army Men 3D"
+  saveName: "Army Men 3D (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -10182,7 +10662,8 @@ SLUS-00491:
     multitap: false
     linkCable: false
 SLPS-02405:
-  name: "Art Camion - Geijutsuden (Japan)"
+  name: "Art Camion - Geijutsuden"
+  saveName: "Art Camion - Geijutsuden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10202,7 +10683,8 @@ SLPS-02405:
     multitap: false
     linkCable: false
 SLPS-02710:
-  name: "Art Camion - Sugorokuden (Japan)"
+  name: "Art Camion - Sugorokuden"
+  saveName: "Art Camion - Sugorokuden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10241,11 +10723,13 @@ SLPM-87186:
     multitap: false
     linkCable: false
 SLPM-80144:
-  name: "Artdink Preview (Japan)"
+  name: "Artdink Preview"
+  saveName: "Artdink Preview (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-00363:
-  name: "Arthur to Astaroth no Nazo Makaimura - Incredible Toons (Japan)"
+  name: "Arthur to Astaroth no Nazo Makaimura - Incredible Toons"
+  saveName: "Arthur to Astaroth no Nazo Makaimura - Incredible Toons (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -10263,7 +10747,8 @@ SLPS-00363:
     multitap: false
     linkCable: false
 SLUS-01090:
-  name: "Arthur! Ready to Race (USA)"
+  name: "Arthur! Ready to Race"
+  saveName: "Arthur! Ready to Race (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -10286,11 +10771,13 @@ SLUS-01090:
     multitap: false
     linkCable: false
 SLUS-90027:
-  name: "Asciiware Training CD (USA)"
+  name: "Asciiware Training CD"
+  saveName: "Asciiware Training CD (USA)"
   metadata:
     genre: "** DEMO **"
 SLPS-03540:
-  name: "Asonde AIUEO (Japan)"
+  name: "Asonde AIUEO"
+  saveName: "Asonde AIUEO (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -10308,9 +10795,11 @@ SLPS-03540:
     multitap: false
     linkCable: false
 SLPS-03542:
-  name: "Asonde Chinou Up (Japan)"
+  name: "Asonde Chinou Up"
+  saveName: "Asonde Chinou Up (Japan)"
 SLPS-03541:
-  name: "Asonde Kazu Suuji (Japan)"
+  name: "Asonde Kazu Suuji"
+  saveName: "Asonde Kazu Suuji (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -10328,7 +10817,8 @@ SLPS-03541:
     multitap: false
     linkCable: false
 SLES-01244:
-  name: "Assault (Europe) (En,Fr,De,Es,It)"
+  name: "Assault"
+  saveName: "Assault (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10351,7 +10841,8 @@ SLES-01244:
     multitap: false
     linkCable: false
 SLUS-00713:
-  name: "Assault - Retribution (USA)"
+  name: "Assault - Retribution"
+  saveName: "Assault - Retribution (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10370,7 +10861,8 @@ SLUS-00713:
     multitap: false
     linkCable: false
 SLES-00093:
-  name: "Assault Rigs (Europe)"
+  name: "Assault Rigs"
+  saveName: "Assault Rigs (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -10388,7 +10880,8 @@ SLES-00093:
     multitap: false
     linkCable: true
 SLPS-00512:
-  name: "Assault Rigs (Japan)"
+  name: "Assault Rigs"
+  saveName: "Assault Rigs (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -10406,7 +10899,8 @@ SLPS-00512:
     multitap: false
     linkCable: true
 SCUS-94405:
-  name: "Assault Rigs (USA)"
+  name: "Assault Rigs"
+  saveName: "Assault Rigs (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -10446,7 +10940,8 @@ SCPS-45420:
     multitap: false
     linkCable: false
 SLPM-86872:
-  name: "Assault Suits Valken 2 (Japan)"
+  name: "Assault Suits Valken 2"
+  saveName: "Assault Suits Valken 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10468,11 +10963,13 @@ SLPM-86872:
     multitap: false
     linkCable: false
 SLPM-80452:
-  name: "Assault Suits Valken 2 (Japan) (Demo)"
+  name: "Assault Suits Valken 2 (Demo)"
+  saveName: "Assault Suits Valken 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02475:
-  name: "Asterix & Obelix Take On Caesar (Europe)"
+  name: "Asterix & Obelix Take On Caesar"
+  saveName: "Asterix & Obelix Take On Caesar (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10491,7 +10988,8 @@ SLES-02475:
     multitap: false
     linkCable: false
 SLES-02473:
-  name: "Asterix & Obelix Take On Caesar (Europe) (Es,Sv,No)"
+  name: "Asterix & Obelix Take On Caesar"
+  saveName: "Asterix & Obelix Take On Caesar (Europe) (Es,Sv,No)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10512,7 +11010,8 @@ SLES-02473:
     multitap: false
     linkCable: false
 SLES-02092:
-  name: "Asterix & Obelix Take On Caesar (Europe) (Fr,De,Nl)"
+  name: "Asterix & Obelix Take On Caesar"
+  saveName: "Asterix & Obelix Take On Caesar (Europe) (Fr,De,Nl)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -10536,7 +11035,8 @@ SLES-02092:
     multitap: false
     linkCable: false
 SLES-02474:
-  name: "Asterix & Obelix contro Cesare (Italy)"
+  name: "Asterix & Obelix contro Cesare"
+  saveName: "Asterix & Obelix contro Cesare (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10555,7 +11055,8 @@ SLES-02474:
     multitap: false
     linkCable: false
 SLES-01748:
-  name: "Asterix (Europe) (De,Es,It)"
+  name: "Asterix"
+  saveName: "Asterix (Europe) (De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -10577,7 +11078,8 @@ SLES-01748:
     multitap: false
     linkCable: false
 SLES-01416:
-  name: "Asterix (Europe) (En,Fr,De,Nl)"
+  name: "Asterix"
+  saveName: "Asterix (Europe) (En,Fr,De,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -10598,7 +11100,8 @@ SLES-01416:
     multitap: false
     linkCable: false
 SLES-03324:
-  name: "Asterix - Mega Madness (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Asterix - Mega Madness"
+  saveName: "Asterix - Mega Madness (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10623,11 +11126,13 @@ SLES-03324:
     multitap: false
     linkCable: false
 SLED-03446:
-  name: "Asterix - Mega Madness (Europe) (En,Fr,De,Es,It,Nl) (Demo)"
+  name: "Asterix - Mega Madness (Demo)"
+  saveName: "Asterix - Mega Madness (Europe) (En,Fr,De,Es,It,Nl) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01418:
-  name: "Asteroids (Europe)"
+  name: "Asteroids"
+  saveName: "Asteroids (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10646,7 +11151,8 @@ SLES-01418:
     multitap: false
     linkCable: false
 SLES-01468:
-  name: "Asteroids (France)"
+  name: "Asteroids"
+  saveName: "Asteroids (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10665,7 +11171,8 @@ SLES-01468:
     multitap: false
     linkCable: false
 SLES-01469:
-  name: "Asteroids (Germany)"
+  name: "Asteroids"
+  saveName: "Asteroids (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10684,7 +11191,8 @@ SLES-01469:
     multitap: false
     linkCable: false
 SLES-01470:
-  name: "Asteroids (Italy)"
+  name: "Asteroids"
+  saveName: "Asteroids (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10703,7 +11211,8 @@ SLES-01470:
     multitap: false
     linkCable: false
 SLUS-00773:
-  name: "Asteroids (USA)"
+  name: "Asteroids"
+  saveName: "Asteroids (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -10725,7 +11234,8 @@ SLUS-00773:
     multitap: false
     linkCable: false
 SLPS-01862:
-  name: "Astro Trooper Vanark (Japan)"
+  name: "Astro Trooper Vanark"
+  saveName: "Astro Trooper Vanark (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10744,11 +11254,13 @@ SLPS-01862:
     multitap: false
     linkCable: false
 SLPM-80278:
-  name: "Astronoka (Japan) (Demo Movie)"
+  name: "Astronoka (Demo Movie)"
+  saveName: "Astronoka (Japan) (Demo Movie)"
   metadata:
     genre: "** DEMO **"
 SLPM-86107:
-  name: "Astronoka (Japan) (Demo)"
+  name: "Astronoka (Demo)"
+  saveName: "Astronoka (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10767,7 +11279,8 @@ SLPM-86107:
     multitap: false
     linkCable: false
 SLPM-86088:
-  name: "Astronoka (Japan) (Disc 1)"
+  name: "Astronoka (Disc 1)"
+  saveName: "Astronoka (Japan) (Disc 1)"
   controllers:
     - DigitalController
   metadata:
@@ -10785,7 +11298,8 @@ SLPM-86088:
     multitap: false
     linkCable: false
 SLPS-00849:
-  name: "Asuka 120% Excellent - Burning Fest. Excellent (Japan)"
+  name: "Asuka 120% Excellent - Burning Fest. Excellent"
+  saveName: "Asuka 120% Excellent - Burning Fest. Excellent (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -10805,7 +11319,8 @@ SLPS-00849:
     multitap: false
     linkCable: false
 SLPS-02074:
-  name: "Asuka 120% Final - Burning Fest. Final (Japan)"
+  name: "Asuka 120% Final - Burning Fest. Final"
+  saveName: "Asuka 120% Final - Burning Fest. Final (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -10826,7 +11341,8 @@ SLPS-02074:
     multitap: false
     linkCable: false
 SLPS-00231:
-  name: "Asuka 120% Special - Burning Fest. Special (Japan)"
+  name: "Asuka 120% Special - Burning Fest. Special"
+  saveName: "Asuka 120% Special - Burning Fest. Special (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -10846,7 +11362,8 @@ SLPS-00231:
     multitap: false
     linkCable: false
 SLPS-01097:
-  name: "Asuncia - Majou no Jubaku (Japan)"
+  name: "Asuncia - Majou no Jubaku"
+  saveName: "Asuncia - Majou no Jubaku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -10883,7 +11400,8 @@ SLPS-03075:
     multitap: false
     linkCable: false
 SLES-03808:
-  name: "Atari Anniversary Edition Redux (Europe)"
+  name: "Atari Anniversary Edition Redux"
+  saveName: "Atari Anniversary Edition Redux (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10904,7 +11422,8 @@ SLES-03808:
     multitap: true
     linkCable: false
 SLUS-01427:
-  name: "Atari Anniversary Edition Redux (USA)"
+  name: "Atari Anniversary Edition Redux"
+  saveName: "Atari Anniversary Edition Redux (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -10928,11 +11447,13 @@ SLUS-01427:
     multitap: true
     linkCable: false
 SLED-02251:
-  name: "Atari Demo Disk (Europe)"
+  name: "Atari Demo Disk"
+  saveName: "Atari Demo Disk (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-01751:
-  name: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2 (Japan)"
+  name: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2"
+  saveName: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10951,7 +11472,8 @@ SLPS-01751:
     multitap: false
     linkCable: false
 SLPS-91180:
-  name: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2 (Japan) (PlayStation the Best)"
+  name: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2 (PlayStation the Best)"
+  saveName: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2 (Japan) (PlayStation the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -10970,13 +11492,15 @@ SLPS-91180:
     multitap: false
     linkCable: false
 SLPM-80413:
-  name: "Athena - Awakening from the Ordinary Life (Japan) (Demo)"
+  name: "Athena - Awakening from the Ordinary Life (Demo)"
+  saveName: "Athena - Awakening from the Ordinary Life (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen # Pre-rendered backgrounds.
 SLPM-86185:
-  name: "Athena - Awakening from the Ordinary Life (Japan) (Disc 1)"
+  name: "Athena - Awakening from the Ordinary Life (Disc 1)"
+  saveName: "Athena - Awakening from the Ordinary Life (Japan) (Disc 1)"
   discSet:
     name: "Athena - Awakening from the Ordinary Life (Japan)"
     serials:
@@ -11006,7 +11530,8 @@ SLPM-86185:
     multitap: false
     linkCable: false
 SLPM-86186:
-  name: "Athena - Awakening from the Ordinary Life (Japan) (Disc 2)"
+  name: "Athena - Awakening from the Ordinary Life (Disc 2)"
+  saveName: "Athena - Awakening from the Ordinary Life (Japan) (Disc 2)"
   discSet:
     name: "Athena - Awakening from the Ordinary Life (Japan)"
     serials:
@@ -11033,7 +11558,8 @@ SLPM-86186:
     multitap: false
     linkCable: false
 SLPM-86187:
-  name: "Athena - Awakening from the Ordinary Life (Japan) (Disc 3)"
+  name: "Athena - Awakening from the Ordinary Life (Disc 3)"
+  saveName: "Athena - Awakening from the Ordinary Life (Japan) (Disc 3)"
   discSet:
     name: "Athena - Awakening from the Ordinary Life (Japan)"
     serials:
@@ -11060,7 +11586,8 @@ SLPM-86187:
     multitap: false
     linkCable: false
 SLPS-02751:
-  name: "Athena no Kateiban - Family Games (Japan)"
+  name: "Athena no Kateiban - Family Games"
+  saveName: "Athena no Kateiban - Family Games (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -11081,7 +11608,8 @@ SLPS-02751:
     multitap: true
     linkCable: false
 SLES-01603:
-  name: "Atlantis - Das sagenhafte Abenteuer (Germany) (Disc 1)"
+  name: "Atlantis - Das sagenhafte Abenteuer (Disc 1)"
+  saveName: "Atlantis - Das sagenhafte Abenteuer (Germany) (Disc 1)"
   discSet:
     name: "Atlantis - Das sagenhafte Abenteuer (Germany)"
     serials:
@@ -11105,7 +11633,8 @@ SLES-01603:
     multitap: false
     linkCable: false
 SLES-11603:
-  name: "Atlantis - Das sagenhafte Abenteuer (Germany) (Disc 2)"
+  name: "Atlantis - Das sagenhafte Abenteuer (Disc 2)"
+  saveName: "Atlantis - Das sagenhafte Abenteuer (Germany) (Disc 2)"
   discSet:
     name: "Atlantis - Das sagenhafte Abenteuer (Germany)"
     serials:
@@ -11129,7 +11658,8 @@ SLES-11603:
     multitap: false
     linkCable: false
 SLES-21603:
-  name: "Atlantis - Das sagenhafte Abenteuer (Germany) (Disc 3)"
+  name: "Atlantis - Das sagenhafte Abenteuer (Disc 3)"
+  saveName: "Atlantis - Das sagenhafte Abenteuer (Germany) (Disc 3)"
   discSet:
     name: "Atlantis - Das sagenhafte Abenteuer (Germany)"
     serials:
@@ -11153,7 +11683,8 @@ SLES-21603:
     multitap: false
     linkCable: false
 SLES-01602:
-  name: "Atlantis - Secrets d'un Monde Oublie (France) (Disc 1)"
+  name: "Atlantis - Secrets d'un Monde Oublie (Disc 1)"
+  saveName: "Atlantis - Secrets d'un Monde Oublie (France) (Disc 1)"
   discSet:
     name: "Atlantis - Secrets d'un Monde Oublie (France)"
     serials:
@@ -11180,7 +11711,8 @@ SLES-01602:
     multitap: false
     linkCable: false
 SLES-11602:
-  name: "Atlantis - Secrets d'un Monde Oublie (France) (Disc 2)"
+  name: "Atlantis - Secrets d'un Monde Oublie (Disc 2)"
+  saveName: "Atlantis - Secrets d'un Monde Oublie (France) (Disc 2)"
   discSet:
     name: "Atlantis - Secrets d'un Monde Oublie (France)"
     serials:
@@ -11204,7 +11736,8 @@ SLES-11602:
     multitap: false
     linkCable: false
 SLES-21602:
-  name: "Atlantis - Secrets d'un Monde Oublie (France) (Disc 3)"
+  name: "Atlantis - Secrets d'un Monde Oublie (Disc 3)"
+  saveName: "Atlantis - Secrets d'un Monde Oublie (France) (Disc 3)"
   discSet:
     name: "Atlantis - Secrets d'un Monde Oublie (France)"
     serials:
@@ -11228,7 +11761,8 @@ SLES-21602:
     multitap: false
     linkCable: false
 SLES-01604:
-  name: "Atlantis - Segreti d'un Mondo Perduto (Italy) (Disc 1)"
+  name: "Atlantis - Segreti d'un Mondo Perduto (Disc 1)"
+  saveName: "Atlantis - Segreti d'un Mondo Perduto (Italy) (Disc 1)"
   discSet:
     name: "Atlantis - Segreti d'un Mondo Perduto (Italy)"
     serials:
@@ -11252,7 +11786,8 @@ SLES-01604:
     multitap: false
     linkCable: false
 SLES-11604:
-  name: "Atlantis - Segreti d'un Mondo Perduto (Italy) (Disc 2)"
+  name: "Atlantis - Segreti d'un Mondo Perduto (Disc 2)"
+  saveName: "Atlantis - Segreti d'un Mondo Perduto (Italy) (Disc 2)"
   discSet:
     name: "Atlantis - Segreti d'un Mondo Perduto (Italy)"
     serials:
@@ -11276,7 +11811,8 @@ SLES-11604:
     multitap: false
     linkCable: false
 SLES-21604:
-  name: "Atlantis - Segreti d'un Mondo Perduto (Italy) (Disc 3)"
+  name: "Atlantis - Segreti d'un Mondo Perduto (Disc 3)"
+  saveName: "Atlantis - Segreti d'un Mondo Perduto (Italy) (Disc 3)"
   discSet:
     name: "Atlantis - Segreti d'un Mondo Perduto (Italy)"
     serials:
@@ -11300,7 +11836,8 @@ SLES-21604:
     multitap: false
     linkCable: false
 SLES-04066:
-  name: "Atlantis - The Lost Continent (Europe) (En,Fr,De)"
+  name: "Atlantis - The Lost Continent"
+  saveName: "Atlantis - The Lost Continent (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -11321,7 +11858,8 @@ SLES-04066:
     multitap: false
     linkCable: false
 SLES-01291:
-  name: "Atlantis - The Lost Tales (Europe) (Disc 1)"
+  name: "Atlantis - The Lost Tales (Disc 1)"
+  saveName: "Atlantis - The Lost Tales (Europe) (Disc 1)"
   discSet:
     name: "Atlantis - The Lost Tales (Europe)"
     serials:
@@ -11346,7 +11884,8 @@ SLES-01291:
     multitap: false
     linkCable: false
 SLES-11291:
-  name: "Atlantis - The Lost Tales (Europe) (Disc 2)"
+  name: "Atlantis - The Lost Tales (Disc 2)"
+  saveName: "Atlantis - The Lost Tales (Europe) (Disc 2)"
   discSet:
     name: "Atlantis - The Lost Tales (Europe)"
     serials:
@@ -11371,7 +11910,8 @@ SLES-11291:
     multitap: false
     linkCable: false
 SLES-21291:
-  name: "Atlantis - The Lost Tales (Europe) (Disc 3)"
+  name: "Atlantis - The Lost Tales (Disc 3)"
+  saveName: "Atlantis - The Lost Tales (Europe) (Disc 3)"
   discSet:
     name: "Atlantis - The Lost Tales (Europe)"
     serials:
@@ -11396,7 +11936,8 @@ SLES-21291:
     multitap: false
     linkCable: false
 SLES-01605:
-  name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 1)"
+  name: "Atlantis - The Lost Tales (Disc 1)"
+  saveName: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 1)"
   discSet:
     name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv)"
     serials:
@@ -11424,7 +11965,8 @@ SLES-01605:
     multitap: false
     linkCable: false
 SLES-11605:
-  name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 2)"
+  name: "Atlantis - The Lost Tales (Disc 2)"
+  saveName: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 2)"
   discSet:
     name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv)"
     serials:
@@ -11452,7 +11994,8 @@ SLES-11605:
     multitap: false
     linkCable: false
 SLES-21605:
-  name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 3)"
+  name: "Atlantis - The Lost Tales (Disc 3)"
+  saveName: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 3)"
   discSet:
     name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv)"
     serials:
@@ -11480,11 +12023,13 @@ SLES-21605:
     multitap: false
     linkCable: false
 SLPM-80224:
-  name: "Atlus Shinsaku Title Demo CD-ROM (Japan)"
+  name: "Atlus Shinsaku Title Demo CD-ROM"
+  saveName: "Atlus Shinsaku Title Demo CD-ROM (Japan)"
   metadata:
     genre: "** DEMO **"
 SLES-01718:
-  name: "Attack of the Saucerman (Europe) (En,Fr,De,Es,It)"
+  name: "Attack of the Saucerman"
+  saveName: "Attack of the Saucerman (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -11510,7 +12055,8 @@ SLES-01718:
     multitap: false
     linkCable: false
 SLPS-00546:
-  name: "Aubirdforce (Japan)"
+  name: "Aubirdforce"
+  saveName: "Aubirdforce (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -11528,11 +12074,13 @@ SLPS-00546:
     multitap: false
     linkCable: false
 SLPM-80053:
-  name: "Aubirdforce (Japan) (Demo)"
+  name: "Aubirdforce (Demo)"
+  saveName: "Aubirdforce (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00533:
-  name: "Aubirdforce (Japan) (Shokai Genteiban)"
+  name: "Aubirdforce (Shokai Genteiban)"
+  saveName: "Aubirdforce (Japan) (Shokai Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -11550,7 +12098,8 @@ SLPS-00533:
     multitap: false
     linkCable: false
 SLPS-01606:
-  name: "Aubirdforce - After (Japan)"
+  name: "Aubirdforce - After"
+  saveName: "Aubirdforce - After (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -11568,7 +12117,8 @@ SLPS-01606:
     multitap: false
     linkCable: false
 SLPS-02390:
-  name: "Aura Battler Dunbine (Japan) (Rev 1)"
+  name: "Aura Battler Dunbine"
+  saveName: "Aura Battler Dunbine (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -11606,7 +12156,8 @@ SLPS-03257:
     multitap: false
     linkCable: false
 SLES-03945:
-  name: "Austin Powers Pinball (Europe) (En,Fr,De)"
+  name: "Austin Powers Pinball"
+  saveName: "Austin Powers Pinball (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -11626,7 +12177,8 @@ SLES-03945:
     multitap: false
     linkCable: false
 SLUS-01456:
-  name: "Austin Powers Pinball (USA)"
+  name: "Austin Powers Pinball"
+  saveName: "Austin Powers Pinball (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -11647,11 +12199,13 @@ SLUS-01456:
     multitap: false
     linkCable: false
 SCED-01570:
-  name: "Australian Summer Special (Australia)"
+  name: "Australian Summer Special"
+  saveName: "Australian Summer Special (Australia)"
   metadata:
     genre: "** DEMO **"
 SLES-00909:
-  name: "Auto Destruct (Europe) (En,Fr,De,Es,Sv)"
+  name: "Auto Destruct"
+  saveName: "Auto Destruct (Europe) (En,Fr,De,Es,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -11674,7 +12228,8 @@ SLES-00909:
     multitap: false
     linkCable: false
 SLUS-00522:
-  name: "Auto Destruct (USA)"
+  name: "Auto Destruct"
+  saveName: "Auto Destruct (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2632-g14c227a8"
@@ -11696,7 +12251,8 @@ SLUS-00522:
     multitap: false
     linkCable: false
 SLES-02341:
-  name: "Autobahn Raser II (Germany)"
+  name: "Autobahn Raser II"
+  saveName: "Autobahn Raser II (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -11716,13 +12272,16 @@ SLES-02341:
     multitap: false
     linkCable: false
 SCED-01306:
-  name: "Autorennen Spezial '98 (Germany)"
+  name: "Autorennen Spezial '98"
+  saveName: "Autorennen Spezial '98 (Germany)"
 SCED-00273:
-  name: "Autumn-Christmas Releases '96 (Europe)"
+  name: "Autumn-Christmas Releases '96"
+  saveName: "Autumn-Christmas Releases '96 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-00946:
-  name: "Ayakashi Ninden Kunoichiban (Japan) (Disc 1)"
+  name: "Ayakashi Ninden Kunoichiban (Disc 1)"
+  saveName: "Ayakashi Ninden Kunoichiban (Japan) (Disc 1)"
   discSet:
     name: "Ayakashi Ninden Kunoichiban (Japan)"
     serials:
@@ -11745,7 +12304,8 @@ SLPS-00946:
     multitap: false
     linkCable: false
 SLPS-00947:
-  name: "Ayakashi Ninden Kunoichiban (Japan) (Disc 2)"
+  name: "Ayakashi Ninden Kunoichiban (Disc 2)"
+  saveName: "Ayakashi Ninden Kunoichiban (Japan) (Disc 2)"
   discSet:
     name: "Ayakashi Ninden Kunoichiban (Japan)"
     serials:
@@ -11768,7 +12328,8 @@ SLPS-00947:
     multitap: false
     linkCable: false
 SLES-00493:
-  name: "Ayrton Senna Kart Duel (Europe)"
+  name: "Ayrton Senna Kart Duel"
+  saveName: "Ayrton Senna Kart Duel (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -11787,7 +12348,8 @@ SLES-00493:
     multitap: false
     linkCable: true
 SLPS-00380:
-  name: "Ayrton Senna Kart Duel (Japan)"
+  name: "Ayrton Senna Kart Duel"
+  saveName: "Ayrton Senna Kart Duel (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -11806,7 +12368,8 @@ SLPS-00380:
     multitap: false
     linkCable: true
 SLES-01024:
-  name: "Ayrton Senna Kart Duel 2 (Europe)"
+  name: "Ayrton Senna Kart Duel 2"
+  saveName: "Ayrton Senna Kart Duel 2 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -11825,7 +12388,8 @@ SLES-01024:
     multitap: false
     linkCable: false
 SLPS-01659:
-  name: "Ayrton Senna Kart Duel Special (Japan)"
+  name: "Ayrton Senna Kart Duel Special"
+  saveName: "Ayrton Senna Kart Duel Special (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -11844,7 +12408,8 @@ SLPS-01659:
     multitap: false
     linkCable: false
 SLPS-01072:
-  name: "Ayrton Senna KartDuel 2 (Japan)"
+  name: "Ayrton Senna KartDuel 2"
+  saveName: "Ayrton Senna KartDuel 2 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -11863,7 +12428,8 @@ SLPS-01072:
     multitap: false
     linkCable: false
 SLPS-00683:
-  name: "Azito (Japan)"
+  name: "Azito"
+  saveName: "Azito (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -11881,7 +12447,8 @@ SLPS-00683:
     multitap: false
     linkCable: false
 SLPM-87284:
-  name: "Azito (Japan) (Major Wave)"
+  name: "Azito (Major Wave)"
+  saveName: "Azito (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -11899,7 +12466,8 @@ SLPM-87284:
     multitap: false
     linkCable: false
 SLPS-01526:
-  name: "Azito 2 (Japan)"
+  name: "Azito 2"
+  saveName: "Azito 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -11917,7 +12485,8 @@ SLPS-01526:
     multitap: false
     linkCable: false
 SLPS-02496:
-  name: "Azito 3 (Japan)"
+  name: "Azito 3"
+  saveName: "Azito 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -11935,7 +12504,8 @@ SLPS-02496:
     multitap: false
     linkCable: false
 SLES-03053:
-  name: "Aztec - The Curse in the Heart of the City of Gold (Europe) (En,Nl)"
+  name: "Aztec - The Curse in the Heart of the City of Gold"
+  saveName: "Aztec - The Curse in the Heart of the City of Gold (Europe) (En,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -11954,7 +12524,8 @@ SLES-03053:
     multitap: false
     linkCable: false
 SLES-03109:
-  name: "Aztec - The Curse in the Heart of the City of Gold (Europe) (Es,It)"
+  name: "Aztec - The Curse in the Heart of the City of Gold"
+  saveName: "Aztec - The Curse in the Heart of the City of Gold (Europe) (Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -11973,7 +12544,8 @@ SLES-03109:
     multitap: false
     linkCable: false
 SLES-03052:
-  name: "Aztec - The Curse in the Heart of the City of Gold (Europe) (Fr,De)"
+  name: "Aztec - The Curse in the Heart of the City of Gold"
+  saveName: "Aztec - The Curse in the Heart of the City of Gold (Europe) (Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -11992,7 +12564,8 @@ SLES-03052:
     multitap: false
     linkCable: false
 SLPS-03424:
-  name: "Azumanga Donjara Daiou (Japan)"
+  name: "Azumanga Donjara Daiou"
+  saveName: "Azumanga Donjara Daiou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12011,7 +12584,8 @@ SLPS-03424:
     multitap: false
     linkCable: false
 SLES-01219:
-  name: "Azure Dreams (Europe) (En,Fr,De)"
+  name: "Azure Dreams"
+  saveName: "Azure Dreams (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   traits:
@@ -12033,7 +12607,8 @@ SLES-01219:
     multitap: false
     linkCable: false
 SLUS-00614:
-  name: "Azure Dreams (USA)"
+  name: "Azure Dreams"
+  saveName: "Azure Dreams (USA)"
   controllers:
     - DigitalController
   traits:
@@ -12053,11 +12628,13 @@ SLUS-00614:
     multitap: false
     linkCable: false
 SLPM-80138:
-  name: "B Senjou no Alice - Alice on Borderlines (Japan) (Demo)"
+  name: "B Senjou no Alice - Alice on Borderlines (Demo)"
+  saveName: "B Senjou no Alice - Alice on Borderlines (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01003:
-  name: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 1)"
+  name: "B Senjou no Alice - Alice on Borderlines (Disc 1)"
+  saveName: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 1)"
   discSet:
     name: "B Senjou no Alice - Alice on Borderlines (Japan)"
     serials:
@@ -12081,7 +12658,8 @@ SLPS-01003:
     multitap: false
     linkCable: false
 SLPS-01004:
-  name: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 2)"
+  name: "B Senjou no Alice - Alice on Borderlines (Disc 2)"
+  saveName: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 2)"
   discSet:
     name: "B Senjou no Alice - Alice on Borderlines (Japan)"
     serials:
@@ -12105,7 +12683,8 @@ SLPS-01004:
     multitap: false
     linkCable: false
 SLPS-01005:
-  name: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 3)"
+  name: "B Senjou no Alice - Alice on Borderlines (Disc 3)"
+  saveName: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 3)"
   discSet:
     name: "B Senjou no Alice - Alice on Borderlines (Japan)"
     serials:
@@ -12129,7 +12708,8 @@ SLPS-01005:
     multitap: false
     linkCable: false
 SLES-01260:
-  name: "B-Movie (Europe) (En,Es,It)"
+  name: "B-Movie"
+  saveName: "B-Movie (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12150,7 +12730,8 @@ SLES-01260:
     multitap: false
     linkCable: false
 SLES-01550:
-  name: "B-Movie (Germany)"
+  name: "B-Movie"
+  saveName: "B-Movie (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12169,7 +12750,8 @@ SLES-01550:
     multitap: false
     linkCable: false
 SLPS-01459:
-  name: "B. L. U. E. - Legend of Water (Japan)"
+  name: "B. L. U. E. - Legend of Water"
+  saveName: "B. L. U. E. - Legend of Water (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12187,12 +12769,14 @@ SLPS-01459:
     multitap: false
     linkCable: false
 PAPX-90050:
-  name: "B. L. U. E. - Legend of Water (Japan) (Taikenban)"
+  name: "B. L. U. E. - Legend of Water (Taikenban)"
+  saveName: "B. L. U. E. - Legend of Water (Japan) (Taikenban)"
   codes:
     - PAPX-90050
     - SLPM-80243
 SLES-02977:
-  name: "BDFL Manager 2001 (Germany)"
+  name: "BDFL Manager 2001"
+  saveName: "BDFL Manager 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12212,7 +12796,8 @@ SLES-02977:
     multitap: false
     linkCable: false
 SLES-03605:
-  name: "BDFL Manager 2002 (Germany)"
+  name: "BDFL Manager 2002"
+  saveName: "BDFL Manager 2002 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12232,7 +12817,8 @@ SLES-03605:
     multitap: false
     linkCable: false
 SLPS-00566:
-  name: "BFS - Blue Forest Story - Kaze no Fuuin (Japan)"
+  name: "BFS - Blue Forest Story - Kaze no Fuuin"
+  saveName: "BFS - Blue Forest Story - Kaze no Fuuin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12250,11 +12836,13 @@ SLPS-00566:
     multitap: false
     linkCable: false
 SLED-01054:
-  name: "BMG Demos (France)"
+  name: "BMG Demos"
+  saveName: "BMG Demos (France)"
   metadata:
     genre: "** DEMO **"
 SLES-03991:
-  name: "Baby Felix Tennis (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Baby Felix Tennis"
+  saveName: "Baby Felix Tennis (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12278,7 +12866,8 @@ SLES-03991:
     multitap: false
     linkCable: false
 SCES-00982:
-  name: "Baby Universe (Europe)"
+  name: "Baby Universe"
+  saveName: "Baby Universe (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -12296,7 +12885,8 @@ SCES-00982:
     multitap: false
     linkCable: false
 SLPS-01446:
-  name: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Japan) (Disc 1)"
+  name: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Disc 1)"
+  saveName: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Japan) (Disc 1)"
   discSet:
     name: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Japan)"
     serials:
@@ -12319,7 +12909,8 @@ SLPS-01446:
     multitap: false
     linkCable: false
 SLPS-01447:
-  name: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Japan) (Disc 2)"
+  name: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Disc 2)"
+  saveName: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Japan) (Disc 2)"
   discSet:
     name: "Back Guiner - Yomigaeru Yuusha Tachi - Hishou Hen 'Uragiri no Senjou' (Japan)"
     serials:
@@ -12342,7 +12933,8 @@ SLPS-01447:
     multitap: false
     linkCable: false
 SLPS-01217:
-  name: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Japan) (Disc 1)"
+  name: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Disc 1)"
+  saveName: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Japan) (Disc 1)"
   discSet:
     name: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Japan)"
     serials:
@@ -12365,7 +12957,8 @@ SLPS-01217:
     multitap: false
     linkCable: false
 SLPS-01218:
-  name: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Japan) (Disc 2)"
+  name: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Disc 2)"
+  saveName: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Japan) (Disc 2)"
   discSet:
     name: "Back Guiner - Yomigaeru Yuusha Tachi - Kakusei Hen 'Guiner Tensei' (Japan)"
     serials:
@@ -12388,7 +12981,8 @@ SLPS-01218:
     multitap: false
     linkCable: false
 SLPS-01448:
-  name: "Back Guiner - Yomigaeru Yuusha Tachi - Service Disc (Japan)"
+  name: "Back Guiner - Yomigaeru Yuusha Tachi - Service Disc"
+  saveName: "Back Guiner - Yomigaeru Yuusha Tachi - Service Disc (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12406,7 +13000,8 @@ SLPS-01448:
     multitap: false
     linkCable: false
 SLPS-01782:
-  name: "Backgammon (Japan)"
+  name: "Backgammon"
+  saveName: "Backgammon (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -12427,7 +13022,8 @@ SLPS-01782:
     multitap: false
     linkCable: false
 SLPS-02729:
-  name: "Backgammon 2000 (Japan)"
+  name: "Backgammon 2000"
+  saveName: "Backgammon 2000 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12463,7 +13059,8 @@ SLPM-86733:
     multitap: false
     linkCable: false
 SLUS-00659:
-  name: "Backstreet Billiards (USA)"
+  name: "Backstreet Billiards"
+  saveName: "Backstreet Billiards (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -12487,7 +13084,8 @@ SLUS-00659:
     multitap: true
     linkCable: false
 SLUS-01094:
-  name: "Backyard Soccer (USA)"
+  name: "Backyard Soccer"
+  saveName: "Backyard Soccer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -12509,7 +13107,8 @@ SLUS-01094:
     multitap: true
     linkCable: false
 SLPM-86118:
-  name: "Bakumatsu Roman - Gekka no Kenshi (Japan)"
+  name: "Bakumatsu Roman - Gekka no Kenshi"
+  saveName: "Bakumatsu Roman - Gekka no Kenshi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12550,7 +13149,8 @@ SCPS-45382:
     multitap: false
     linkCable: false
 SLPS-00541:
-  name: "Bakuretsu Hunter - Mahjong Special (Japan)"
+  name: "Bakuretsu Hunter - Mahjong Special"
+  saveName: "Bakuretsu Hunter - Mahjong Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12569,7 +13169,8 @@ SLPS-00541:
     multitap: false
     linkCable: false
 SLPS-00718:
-  name: "Bakuretsu Hunter - Sorezore no Omoi ... Nowaanchatte (Japan)"
+  name: "Bakuretsu Hunter - Sorezore no Omoi ... Nowaanchatte"
+  saveName: "Bakuretsu Hunter - Sorezore no Omoi ... Nowaanchatte (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12587,7 +13188,8 @@ SLPS-00718:
     multitap: false
     linkCable: false
 SLPS-03437:
-  name: "Bakuretsu Soccer (Japan)"
+  name: "Bakuretsu Soccer"
+  saveName: "Bakuretsu Soccer (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12606,7 +13208,8 @@ SLPS-03437:
     multitap: false
     linkCable: false
 SLPS-02429:
-  name: "Bakuryuu (Japan)"
+  name: "Bakuryuu"
+  saveName: "Bakuryuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12625,7 +13228,8 @@ SLPS-02429:
     multitap: false
     linkCable: false
 SLPS-00158:
-  name: "Bakushou!! All Yoshimoto Quiz-ou Kettei-sen DX (Japan)"
+  name: "Bakushou!! All Yoshimoto Quiz-ou Kettei-sen DX"
+  saveName: "Bakushou!! All Yoshimoto Quiz-ou Kettei-sen DX (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12681,7 +13285,8 @@ SLPS-91172:
     multitap: false
     linkCable: false
 SLPS-01441:
-  name: "Bakusou Dekotora Densetsu - Otoko Ippiki Yume Kaidou (Japan)"
+  name: "Bakusou Dekotora Densetsu - Otoko Ippiki Yume Kaidou"
+  saveName: "Bakusou Dekotora Densetsu - Otoko Ippiki Yume Kaidou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12700,7 +13305,8 @@ SLPS-01441:
     multitap: false
     linkCable: false
 SLPS-02465:
-  name: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro (Japan)"
+  name: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro"
+  saveName: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12722,7 +13328,8 @@ SLPS-02465:
     multitap: false
     linkCable: false
 SLPM-80506:
-  name: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro (Japan) (Demo)"
+  name: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro (Demo)"
+  saveName: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02093:
@@ -12745,7 +13352,8 @@ SLPS-02093:
     multitap: false
     linkCable: false
 SLPS-01489:
-  name: "Bakusou Kyoudai Let's & Go!! Eternal Wings (Japan)"
+  name: "Bakusou Kyoudai Let's & Go!! Eternal Wings"
+  saveName: "Bakusou Kyoudai Let's & Go!! Eternal Wings (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12764,7 +13372,8 @@ SLPS-01489:
     multitap: false
     linkCable: false
 SLPM-86980:
-  name: "Bakuten Shoot Beyblade - Bey Battle Tournament (Japan)"
+  name: "Bakuten Shoot Beyblade - Bey Battle Tournament"
+  saveName: "Bakuten Shoot Beyblade - Bey Battle Tournament (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12783,7 +13392,8 @@ SLPM-86980:
     multitap: false
     linkCable: false
 SLPM-87130:
-  name: "Bakuten Shoot Beyblade 2002 - Bey Battle Tournament 2 (Japan)"
+  name: "Bakuten Shoot Beyblade 2002 - Bey Battle Tournament 2"
+  saveName: "Bakuten Shoot Beyblade 2002 - Bey Battle Tournament 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12821,7 +13431,8 @@ SLPM-87131:
     multitap: false
     linkCable: false
 SLES-04091:
-  name: "Baldies (Europe)"
+  name: "Baldies"
+  saveName: "Baldies (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12841,7 +13452,8 @@ SLES-04091:
     multitap: false
     linkCable: false
 SLUS-01567:
-  name: "Baldies (USA)"
+  name: "Baldies"
+  saveName: "Baldies (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12878,7 +13490,8 @@ SLUS-01037:
     multitap: false
     linkCable: false
 SLPS-01074:
-  name: "Baldy Land (Japan)"
+  name: "Baldy Land"
+  saveName: "Baldy Land (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12897,7 +13510,8 @@ SLPS-01074:
     multitap: false
     linkCable: false
 SLUS-01249:
-  name: "Ball Breakers (USA)"
+  name: "Ball Breakers"
+  saveName: "Ball Breakers (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -12916,7 +13530,8 @@ SLUS-01249:
     multitap: false
     linkCable: false
 SLES-00651:
-  name: "BallBlazer Champions (Europe)"
+  name: "BallBlazer Champions"
+  saveName: "BallBlazer Champions (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -12934,7 +13549,8 @@ SLES-00651:
     multitap: false
     linkCable: false
 SLES-00592:
-  name: "BallBlazer Champions (Germany)"
+  name: "BallBlazer Champions"
+  saveName: "BallBlazer Champions (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -12952,7 +13568,8 @@ SLES-00592:
     multitap: false
     linkCable: false
 SLES-00641:
-  name: "BallBlazer Champions (Italy)"
+  name: "BallBlazer Champions"
+  saveName: "BallBlazer Champions (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -12970,7 +13587,8 @@ SLES-00641:
     multitap: false
     linkCable: false
 SLPS-00796:
-  name: "BallBlazer Champions (Japan)"
+  name: "BallBlazer Champions"
+  saveName: "BallBlazer Champions (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -12988,7 +13606,8 @@ SLPS-00796:
     multitap: false
     linkCable: false
 SLES-00647:
-  name: "BallBlazer Champions (Spain)"
+  name: "BallBlazer Champions"
+  saveName: "BallBlazer Champions (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -13006,7 +13625,8 @@ SLES-00647:
     multitap: false
     linkCable: false
 SLUS-00068:
-  name: "BallBlazer Champions (USA)"
+  name: "BallBlazer Champions"
+  saveName: "BallBlazer Champions (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -13027,7 +13647,8 @@ SLUS-00068:
     multitap: false
     linkCable: false
 SLES-04017:
-  name: "Ballerburg (Europe)"
+  name: "Ballerburg"
+  saveName: "Ballerburg (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13046,7 +13667,8 @@ SLES-04017:
     multitap: false
     linkCable: false
 SLES-04018:
-  name: "Ballerburg (Germany)"
+  name: "Ballerburg"
+  saveName: "Ballerburg (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13065,7 +13687,8 @@ SLES-04018:
     multitap: false
     linkCable: false
 SLUS-01568:
-  name: "Ballerburg - Castle Chaos (USA)"
+  name: "Ballerburg - Castle Chaos"
+  saveName: "Ballerburg - Castle Chaos (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13084,7 +13707,8 @@ SLUS-01568:
     multitap: false
     linkCable: false
 SLES-02701:
-  name: "Ballistic (Europe) (En,Fr,De)"
+  name: "Ballistic"
+  saveName: "Ballistic (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13105,7 +13729,8 @@ SLES-02701:
     multitap: false
     linkCable: false
 SLUS-00966:
-  name: "Ballistic (USA)"
+  name: "Ballistic"
+  saveName: "Ballistic (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
@@ -13127,7 +13752,8 @@ SLUS-00966:
     multitap: false
     linkCable: false
 SCES-00348:
-  name: "Baphomets Fluch (Germany)"
+  name: "Baphomets Fluch"
+  saveName: "Baphomets Fluch (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -13145,7 +13771,8 @@ SCES-00348:
     multitap: false
     linkCable: false
 SCES-00800:
-  name: "Baphomets Fluch II - Die Spiegel der Finsternis (Germany)"
+  name: "Baphomets Fluch II - Die Spiegel der Finsternis"
+  saveName: "Baphomets Fluch II - Die Spiegel der Finsternis (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -13163,7 +13790,8 @@ SCES-00800:
     multitap: false
     linkCable: false
 SCES-02366:
-  name: "Barbie - Aventure Equestre (France)"
+  name: "Barbie - Aventure Equestre"
+  saveName: "Barbie - Aventure Equestre (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13183,7 +13811,8 @@ SCES-02366:
     multitap: false
     linkCable: false
 SLES-03693:
-  name: "Barbie - Aventuriere (France)"
+  name: "Barbie - Aventuriere"
+  saveName: "Barbie - Aventuriere (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13202,7 +13831,8 @@ SLES-03693:
     multitap: false
     linkCable: false
 SLES-03695:
-  name: "Barbie - Esploratrice (Italy)"
+  name: "Barbie - Esploratrice"
+  saveName: "Barbie - Esploratrice (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13221,7 +13851,8 @@ SLES-03695:
     multitap: false
     linkCable: false
 SLES-03692:
-  name: "Barbie - Explorer (Europe)"
+  name: "Barbie - Explorer"
+  saveName: "Barbie - Explorer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13240,7 +13871,8 @@ SLES-03692:
     multitap: false
     linkCable: false
 SLES-03694:
-  name: "Barbie - Explorer (Germany)"
+  name: "Barbie - Explorer"
+  saveName: "Barbie - Explorer (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13259,7 +13891,8 @@ SLES-03694:
     multitap: false
     linkCable: false
 SLES-03696:
-  name: "Barbie - Explorer (Spain)"
+  name: "Barbie - Explorer"
+  saveName: "Barbie - Explorer (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13278,7 +13911,8 @@ SLES-03696:
     multitap: false
     linkCable: false
 SLUS-01361:
-  name: "Barbie - Explorer (USA)"
+  name: "Barbie - Explorer"
+  saveName: "Barbie - Explorer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -13300,7 +13934,8 @@ SLUS-01361:
     multitap: false
     linkCable: false
 SLUS-01569:
-  name: "Barbie - Gotta Have Games (USA)"
+  name: "Barbie - Gotta Have Games"
+  saveName: "Barbie - Gotta Have Games (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -13322,7 +13957,8 @@ SLUS-01569:
     multitap: false
     linkCable: false
 SCES-02365:
-  name: "Barbie - Race & Ride (Europe)"
+  name: "Barbie - Race & Ride"
+  saveName: "Barbie - Race & Ride (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13342,7 +13978,8 @@ SCES-02365:
     multitap: false
     linkCable: false
 SCES-02367:
-  name: "Barbie - Race & Ride (Germany)"
+  name: "Barbie - Race & Ride"
+  saveName: "Barbie - Race & Ride (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13362,7 +13999,8 @@ SCES-02367:
     multitap: false
     linkCable: false
 SCES-02368:
-  name: "Barbie - Race & Ride (Italy)"
+  name: "Barbie - Race & Ride"
+  saveName: "Barbie - Race & Ride (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13382,7 +14020,8 @@ SCES-02368:
     multitap: false
     linkCable: false
 SCES-02369:
-  name: "Barbie - Race & Ride (Spain)"
+  name: "Barbie - Race & Ride"
+  saveName: "Barbie - Race & Ride (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13402,7 +14041,8 @@ SCES-02369:
     multitap: false
     linkCable: false
 SLUS-00981:
-  name: "Barbie - Race & Ride (USA)"
+  name: "Barbie - Race & Ride"
+  saveName: "Barbie - Race & Ride (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -13424,7 +14064,8 @@ SLUS-00981:
     multitap: false
     linkCable: false
 SCES-02488:
-  name: "Barbie - Sports Extreme (France)"
+  name: "Barbie - Sports Extreme"
+  saveName: "Barbie - Sports Extreme (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13444,7 +14085,8 @@ SCES-02488:
     multitap: false
     linkCable: false
 SCES-02489:
-  name: "Barbie - Super Sport (Germany)"
+  name: "Barbie - Super Sport"
+  saveName: "Barbie - Super Sport (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13464,7 +14106,8 @@ SCES-02489:
     multitap: false
     linkCable: false
 SCES-02487:
-  name: "Barbie - Super Sports (Europe)"
+  name: "Barbie - Super Sports"
+  saveName: "Barbie - Super Sports (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13484,7 +14127,8 @@ SCES-02487:
     multitap: false
     linkCable: false
 SCES-02490:
-  name: "Barbie - Super Sports (Italy)"
+  name: "Barbie - Super Sports"
+  saveName: "Barbie - Super Sports (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13504,7 +14148,8 @@ SCES-02490:
     multitap: false
     linkCable: false
 SCES-02491:
-  name: "Barbie - Super Sports (Spain)"
+  name: "Barbie - Super Sports"
+  saveName: "Barbie - Super Sports (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13524,7 +14169,8 @@ SCES-02491:
     multitap: false
     linkCable: false
 SLUS-00946:
-  name: "Barbie - Super Sports (USA)"
+  name: "Barbie - Super Sports"
+  saveName: "Barbie - Super Sports (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -13546,7 +14192,8 @@ SLUS-00946:
     multitap: false
     linkCable: false
 SLES-02615:
-  name: "Barca Manager 2000 (Spain) (Es,Ca)"
+  name: "Barca Manager 2000"
+  saveName: "Barca Manager 2000 (Spain) (Es,Ca)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13566,7 +14213,8 @@ SLES-02615:
     multitap: false
     linkCable: false
 SLPS-02187:
-  name: "Bardysh - Kromeford no Juunin (Japan)"
+  name: "Bardysh - Kromeford no Juunin"
+  saveName: "Bardysh - Kromeford no Juunin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13604,7 +14252,8 @@ SLPM-86341:
     multitap: false
     linkCable: false
 SLPM-86759:
-  name: "Baroque - Yuganda Mousou (Japan)"
+  name: "Baroque - Yuganda Mousou"
+  saveName: "Baroque - Yuganda Mousou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13623,7 +14272,8 @@ SLPM-86759:
     multitap: false
     linkCable: false
 SLPM-86328:
-  name: "Baroque - Yuganda Mousou (Japan) (Genteiban)"
+  name: "Baroque - Yuganda Mousou (Genteiban)"
+  saveName: "Baroque - Yuganda Mousou (Japan) (Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13642,7 +14292,8 @@ SLPM-86328:
     multitap: false
     linkCable: false
 SLPM-86540:
-  name: "Baroque Syndrome (Japan)"
+  name: "Baroque Syndrome"
+  saveName: "Baroque Syndrome (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13664,7 +14315,8 @@ SLPM-86540:
     multitap: false
     linkCable: false
 SLPS-03055:
-  name: "Baseball - Pro-nami Kusayakyuu! (Japan)"
+  name: "Baseball - Pro-nami Kusayakyuu!"
+  saveName: "Baseball - Pro-nami Kusayakyuu! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13683,7 +14335,8 @@ SLPS-03055:
     multitap: false
     linkCable: false
 SLPS-00687:
-  name: "Baseball Navigator (Japan)"
+  name: "Baseball Navigator"
+  saveName: "Baseball Navigator (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -13704,7 +14357,8 @@ SLPS-00687:
     multitap: false
     linkCable: false
 SLPM-86650:
-  name: "Baseball Simulation - ID Pro Yakyuu (Japan)"
+  name: "Baseball Simulation - ID Pro Yakyuu"
+  saveName: "Baseball Simulation - ID Pro Yakyuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13723,7 +14377,8 @@ SLPM-86650:
     multitap: false
     linkCable: false
 SLUS-00086:
-  name: "Bases Loaded '96 - Double Header (USA)"
+  name: "Bases Loaded '96 - Double Header"
+  saveName: "Bases Loaded '96 - Double Header (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -13741,7 +14396,8 @@ SLUS-00086:
     multitap: false
     linkCable: false
 SLPS-01304:
-  name: "Bass Fisherman - Texas (Japan)"
+  name: "Bass Fisherman - Texas"
+  saveName: "Bass Fisherman - Texas (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13760,7 +14416,8 @@ SLPS-01304:
     multitap: false
     linkCable: false
 SLPS-01765:
-  name: "Bass Landing (Japan)"
+  name: "Bass Landing"
+  saveName: "Bass Landing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13782,9 +14439,11 @@ SLPS-01765:
     multitap: false
     linkCable: false
 SLPM-80354:
-  name: "Bass Landing (Japan) (Taikenban)"
+  name: "Bass Landing (Taikenban)"
+  saveName: "Bass Landing (Japan) (Taikenban)"
 SLUS-00873:
-  name: "Bass Landing (USA)"
+  name: "Bass Landing"
+  saveName: "Bass Landing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13822,7 +14481,8 @@ SLPS-01764:
     multitap: false
     linkCable: false
 SLPS-02647:
-  name: "Bass Landing 2 (Japan)"
+  name: "Bass Landing 2"
+  saveName: "Bass Landing 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13879,7 +14539,8 @@ SLPS-02646:
     multitap: false
     linkCable: false
 SLUS-00905:
-  name: "Bass Rise (USA)"
+  name: "Bass Rise"
+  saveName: "Bass Rise (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1773-gbdd98281"
@@ -13901,7 +14562,8 @@ SLUS-00905:
     multitap: false
     linkCable: false
 SLPS-01914:
-  name: "Bass Tsuri ni Ikou! (Japan)"
+  name: "Bass Tsuri ni Ikou!"
+  saveName: "Bass Tsuri ni Ikou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13920,7 +14582,8 @@ SLPS-01914:
     multitap: false
     linkCable: false
 SLPS-02859:
-  name: "Bassing Beat 2 (Japan)"
+  name: "Bassing Beat 2"
+  saveName: "Bassing Beat 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13939,7 +14602,8 @@ SLPS-02859:
     multitap: false
     linkCable: false
 SLPS-00542:
-  name: "Bastard!! Utsuronaru Kamigami no Utsuwa (Japan)"
+  name: "Bastard!! Utsuronaru Kamigami no Utsuwa"
+  saveName: "Bastard!! Utsuronaru Kamigami no Utsuwa (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -13957,11 +14621,13 @@ SLPS-00542:
     multitap: false
     linkCable: false
 SLPM-80051:
-  name: "Bastard!! Utsuronaru Kamigami no Utsuwa (Japan) (Demo)"
+  name: "Bastard!! Utsuronaru Kamigami no Utsuwa (Demo)"
+  saveName: "Bastard!! Utsuronaru Kamigami no Utsuwa (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00102:
-  name: "Batman & Robin (Europe) (En,Fr,De,Es)"
+  name: "Batman & Robin"
+  saveName: "Batman & Robin (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -13983,7 +14649,8 @@ SLES-00102:
     multitap: false
     linkCable: false
 SLES-01220:
-  name: "Batman & Robin (Italy)"
+  name: "Batman & Robin"
+  saveName: "Batman & Robin (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14002,7 +14669,8 @@ SLES-01220:
     multitap: false
     linkCable: false
 SLUS-00393:
-  name: "Batman & Robin (USA)"
+  name: "Batman & Robin"
+  saveName: "Batman & Robin (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -14024,7 +14692,8 @@ SLUS-00393:
     multitap: false
     linkCable: false
 SLES-02874:
-  name: "Batman - Gotham City Racer (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Batman - Gotham City Racer"
+  saveName: "Batman - Gotham City Racer (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -14049,7 +14718,8 @@ SLES-02874:
     multitap: false
     linkCable: false
 SLUS-01141:
-  name: "Batman - Gotham City Racer (USA)"
+  name: "Batman - Gotham City Racer"
+  saveName: "Batman - Gotham City Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -14072,7 +14742,8 @@ SLUS-01141:
     multitap: false
     linkCable: false
 SLUS-01207:
-  name: "Batman Beyond - Return of the Joker (USA)"
+  name: "Batman Beyond - Return of the Joker"
+  saveName: "Batman Beyond - Return of the Joker (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -14096,7 +14767,8 @@ SLUS-01207:
     multitap: false
     linkCable: false
 SLES-00525:
-  name: "Batman Forever - The Arcade Game (Europe)"
+  name: "Batman Forever - The Arcade Game"
+  saveName: "Batman Forever - The Arcade Game (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -14114,7 +14786,8 @@ SLES-00525:
     multitap: false
     linkCable: false
 SLPS-00698:
-  name: "Batman Forever - The Arcade Game (Japan)"
+  name: "Batman Forever - The Arcade Game"
+  saveName: "Batman Forever - The Arcade Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14132,7 +14805,8 @@ SLPS-00698:
     multitap: false
     linkCable: false
 SLUS-00387:
-  name: "Batman Forever - The Arcade Game (USA)"
+  name: "Batman Forever - The Arcade Game"
+  saveName: "Batman Forever - The Arcade Game (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -14153,7 +14827,8 @@ SLUS-00387:
     multitap: false
     linkCable: false
 SLES-02902:
-  name: "Batman of the Future - Return of the Joker (Europe) (En,Fr,De)"
+  name: "Batman of the Future - Return of the Joker"
+  saveName: "Batman of the Future - Return of the Joker (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14174,7 +14849,8 @@ SLES-02902:
     multitap: false
     linkCable: false
 SLPS-00485:
-  name: "Battle Arena Nitoushinden (Japan)"
+  name: "Battle Arena Nitoushinden"
+  saveName: "Battle Arena Nitoushinden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14192,7 +14868,8 @@ SLPS-00485:
     multitap: false
     linkCable: false
 SCES-00002:
-  name: "Battle Arena Toshinden (Europe)"
+  name: "Battle Arena Toshinden"
+  saveName: "Battle Arena Toshinden (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -14212,7 +14889,8 @@ SCES-00002:
     multitap: false
     linkCable: false
 SCUS-94003:
-  name: "Battle Arena Toshinden (USA)"
+  name: "Battle Arena Toshinden"
+  saveName: "Battle Arena Toshinden (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -14238,7 +14916,8 @@ SCUS-94003:
     multitap: false
     linkCable: false
 SCES-00232:
-  name: "Battle Arena Toshinden 2 (Europe)"
+  name: "Battle Arena Toshinden 2"
+  saveName: "Battle Arena Toshinden 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -14256,7 +14935,8 @@ SCES-00232:
     multitap: false
     linkCable: false
 SLUS-00220:
-  name: "Battle Arena Toshinden 2 (USA)"
+  name: "Battle Arena Toshinden 2"
+  saveName: "Battle Arena Toshinden 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -14277,7 +14957,8 @@ SLUS-00220:
     multitap: false
     linkCable: false
 SCES-00700:
-  name: "Battle Arena Toshinden 3 (Europe)"
+  name: "Battle Arena Toshinden 3"
+  saveName: "Battle Arena Toshinden 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14299,7 +14980,8 @@ SCES-00700:
     multitap: false
     linkCable: false
 SLUS-00483:
-  name: "Battle Arena Toshinden 3 (USA) (En,Ja)"
+  name: "Battle Arena Toshinden 3"
+  saveName: "Battle Arena Toshinden 3 (USA) (En,Ja)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1558-gf852be74"
@@ -14324,7 +15006,8 @@ SLUS-00483:
     multitap: false
     linkCable: false
 SLPS-00200:
-  name: "Battle Arena Toushinden 2 (Japan)"
+  name: "Battle Arena Toushinden 2"
+  saveName: "Battle Arena Toushinden 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14342,9 +15025,11 @@ SLPS-00200:
     multitap: false
     linkCable: false
 SLPM-80028:
-  name: "Battle Arena Toushinden 2 - Gyouten Kyougaku no Shishoku-ban (Japan)"
+  name: "Battle Arena Toushinden 2 - Gyouten Kyougaku no Shishoku-ban"
+  saveName: "Battle Arena Toushinden 2 - Gyouten Kyougaku no Shishoku-ban (Japan)"
 SLPS-91006:
-  name: "Battle Arena Toushinden 2 Plus (Japan)"
+  name: "Battle Arena Toushinden 2 Plus"
+  saveName: "Battle Arena Toushinden 2 Plus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14362,7 +15047,8 @@ SLPS-91006:
     multitap: false
     linkCable: false
 SLPS-00650:
-  name: "Battle Arena Toushinden 3 (Japan)"
+  name: "Battle Arena Toushinden 3"
+  saveName: "Battle Arena Toushinden 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14384,7 +15070,8 @@ SLPS-00650:
     multitap: false
     linkCable: false
 SLPS-01133:
-  name: "Battle Athletess - Daiundoukai Alternative (Japan)"
+  name: "Battle Athletess - Daiundoukai Alternative"
+  saveName: "Battle Athletess - Daiundoukai Alternative (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14402,7 +15089,8 @@ SLPS-01133:
     multitap: false
     linkCable: false
 SLPM-86525:
-  name: "Battle Athletess - Daiundoukai Alternative (Japan) (Major Wave)"
+  name: "Battle Athletess - Daiundoukai Alternative (Major Wave)"
+  saveName: "Battle Athletess - Daiundoukai Alternative (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -14420,7 +15108,8 @@ SLPM-86525:
     multitap: false
     linkCable: false
 SLPS-01548:
-  name: "Battle Athletess - Daiundoukai GTO (Grand Trial Onnanoco) (Japan)"
+  name: "Battle Athletess - Daiundoukai GTO (Grand Trial Onnanoco)"
+  saveName: "Battle Athletess - Daiundoukai GTO (Grand Trial Onnanoco) (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14442,7 +15131,8 @@ SLPS-01548:
     multitap: false
     linkCable: false
 SLPM-86526:
-  name: "Battle Athletess - Daiundoukai GTO (Grand Trial Onnanoco) (Japan) (Major Wave)"
+  name: "Battle Athletess - Daiundoukai GTO (Grand Trial Onnanoco) (Major Wave)"
+  saveName: "Battle Athletess - Daiundoukai GTO (Grand Trial Onnanoco) (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14464,9 +15154,11 @@ SLPM-86526:
     multitap: false
     linkCable: false
 SLPM-80361:
-  name: "Battle Bombee (Japan)"
+  name: "Battle Bombee"
+  saveName: "Battle Bombee (Japan)"
 SLPS-02457:
-  name: "Battle Bombee 2 - Sukkiri Momoaji (Japan)"
+  name: "Battle Bombee 2 - Sukkiri Momoaji"
+  saveName: "Battle Bombee 2 - Sukkiri Momoaji (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14485,7 +15177,8 @@ SLPS-02457:
     multitap: true
     linkCable: false
 SLPS-00991:
-  name: "Battle Bugs (Japan)"
+  name: "Battle Bugs"
+  saveName: "Battle Bugs (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14503,7 +15196,8 @@ SLPS-00991:
     multitap: false
     linkCable: false
 SLPS-00968:
-  name: "Battle Formation (Japan)"
+  name: "Battle Formation"
+  saveName: "Battle Formation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14522,7 +15216,8 @@ SLPS-00968:
     multitap: true
     linkCable: false
 SLUS-01335:
-  name: "Battle Hunter (USA)"
+  name: "Battle Hunter"
+  saveName: "Battle Hunter (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14541,7 +15236,8 @@ SLUS-01335:
     multitap: true
     linkCable: false
 SLPS-01779:
-  name: "Battle Konchuuden (Japan)"
+  name: "Battle Konchuuden"
+  saveName: "Battle Konchuuden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14559,7 +15255,8 @@ SLPS-01779:
     multitap: false
     linkCable: false
 SLPS-01064:
-  name: "Battle Master (Japan)"
+  name: "Battle Master"
+  saveName: "Battle Master (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14577,7 +15274,8 @@ SLPS-01064:
     multitap: false
     linkCable: false
 SLPM-86519:
-  name: "Battle Master (Japan) (Major Wave)"
+  name: "Battle Master (Major Wave)"
+  saveName: "Battle Master (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -14595,7 +15293,8 @@ SLPM-86519:
     multitap: false
     linkCable: false
 SLES-00662:
-  name: "Battle Stations (Europe) (En,Fr,De)"
+  name: "Battle Stations"
+  saveName: "Battle Stations (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -14615,7 +15314,8 @@ SLES-00662:
     multitap: false
     linkCable: false
 SLUS-00456:
-  name: "Battle Stations (USA)"
+  name: "Battle Stations"
+  saveName: "Battle Stations (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -14635,7 +15335,8 @@ SLUS-00456:
     multitap: false
     linkCable: false
 SLPS-01127:
-  name: "BattleRound USA (Japan)"
+  name: "BattleRound USA"
+  saveName: "BattleRound USA (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -14654,7 +15355,8 @@ SLPS-01127:
     multitap: false
     linkCable: false
 SLES-00628:
-  name: "BattleSport (Europe)"
+  name: "BattleSport"
+  saveName: "BattleSport (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -14672,7 +15374,8 @@ SLES-00628:
     multitap: false
     linkCable: false
 SLUS-00389:
-  name: "BattleSport (USA)"
+  name: "BattleSport"
+  saveName: "BattleSport (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -14690,7 +15393,8 @@ SLUS-00389:
     multitap: false
     linkCable: false
 SLES-02774:
-  name: "BattleTanx - Global Assault (Europe) (En,Es,It)"
+  name: "BattleTanx - Global Assault"
+  saveName: "BattleTanx - Global Assault (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14711,7 +15415,8 @@ SLES-02774:
     multitap: false
     linkCable: false
 SLES-02773:
-  name: "BattleTanx - Global Assault (Europe) (En,Fr,De)"
+  name: "BattleTanx - Global Assault"
+  saveName: "BattleTanx - Global Assault (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14732,7 +15437,8 @@ SLES-02773:
     multitap: false
     linkCable: false
 SLUS-01044:
-  name: "BattleTanx - Global Assault (USA)"
+  name: "BattleTanx - Global Assault"
+  saveName: "BattleTanx - Global Assault (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14751,7 +15457,8 @@ SLUS-01044:
     multitap: false
     linkCable: false
 SLES-02808:
-  name: "Beach Volleyball (Europe) (En,Fr,De,Es,It)"
+  name: "Beach Volleyball"
+  saveName: "Beach Volleyball (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14774,7 +15481,8 @@ SLES-02808:
     multitap: true
     linkCable: false
 SCPS-10138:
-  name: "Bealphareth (Japan)"
+  name: "Bealphareth"
+  saveName: "Bealphareth (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -14792,7 +15500,8 @@ SCPS-10138:
     multitap: false
     linkCable: false
 SLES-00709:
-  name: "Beast Wars - Transformers (Europe) (En,Fr,De,Es,It)"
+  name: "Beast Wars - Transformers"
+  saveName: "Beast Wars - Transformers (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -14814,11 +15523,13 @@ SLES-00709:
     multitap: false
     linkCable: false
 SLED-01339:
-  name: "Beast Wars - Transformers (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Beast Wars - Transformers (Demo)"
+  saveName: "Beast Wars - Transformers (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00508:
-  name: "Beast Wars - Transformers (USA)"
+  name: "Beast Wars - Transformers"
+  saveName: "Beast Wars - Transformers (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -14836,7 +15547,8 @@ SLUS-00508:
     multitap: false
     linkCable: false
 SLPM-86126:
-  name: "Beat Mania (Japan) (Disc 1) (Arcade)"
+  name: "Beat Mania (Disc 1) (Arcade)"
+  saveName: "Beat Mania (Japan) (Disc 1) (Arcade)"
   discSet:
     name: "Beat Mania (Japan)"
     serials:
@@ -14863,7 +15575,8 @@ SLPM-86126:
     multitap: false
     linkCable: false
 SLPM-86127:
-  name: "Beat Mania (Japan) (Disc 2) (Append)"
+  name: "Beat Mania (Disc 2) (Append)"
+  saveName: "Beat Mania (Japan) (Disc 2) (Append)"
   discSet:
     name: "Beat Mania (Japan)"
     serials:
@@ -14890,7 +15603,8 @@ SLPM-86127:
     multitap: false
     linkCable: false
 SLPM-86769:
-  name: "Beat Mania - The Sound of Tokyo (Japan)"
+  name: "Beat Mania - The Sound of Tokyo"
+  saveName: "Beat Mania - The Sound of Tokyo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14909,9 +15623,11 @@ SLPM-86769:
     multitap: false
     linkCable: false
 SLPM-86156:
-  name: "Beat Mania 3rd Mix Mini (Japan)"
+  name: "Beat Mania 3rd Mix Mini"
+  saveName: "Beat Mania 3rd Mix Mini (Japan)"
 SLPM-86184:
-  name: "Beat Mania Append 3rdMix (Japan)"
+  name: "Beat Mania Append 3rdMix"
+  saveName: "Beat Mania Append 3rdMix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14930,7 +15646,8 @@ SLPM-86184:
     multitap: false
     linkCable: false
 SCPS-45403:
-  name: "Beat Mania Append GottaMix (Japan, Asia)"
+  name: "Beat Mania Append GottaMix"
+  saveName: "Beat Mania Append GottaMix (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14952,7 +15669,8 @@ SCPS-45403:
     multitap: false
     linkCable: false
 SLPM-86574:
-  name: "Beat Mania Append GottaMix 2 - Going Global (Japan)"
+  name: "Beat Mania Append GottaMix 2 - Going Global"
+  saveName: "Beat Mania Append GottaMix 2 - Going Global (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14971,7 +15689,8 @@ SLPM-86574:
     multitap: false
     linkCable: false
 SCPS-18013:
-  name: "Beat Planet Music (Japan)"
+  name: "Beat Planet Music"
+  saveName: "Beat Planet Music (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -14990,15 +15709,18 @@ SCPS-18013:
     multitap: false
     linkCable: false
 SCED-01991:
-  name: "Beat-Em-Up Special (Europe)"
+  name: "Beat-Em-Up Special"
+  saveName: "Beat-Em-Up Special (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01643:
-  name: "Beat-Em-Up Speziale (Germany)"
+  name: "Beat-Em-Up Speziale"
+  saveName: "Beat-Em-Up Speziale (Germany)"
   metadata:
     genre: "** DEMO **"
 SLES-02096:
-  name: "Beatmania (Europe)"
+  name: "Beatmania"
+  saveName: "Beatmania (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15036,7 +15758,8 @@ SLPM-86938:
     multitap: false
     linkCable: false
 SLPM-87012:
-  name: "Beatmania 6thMix + Core Remix (Japan)"
+  name: "Beatmania 6thMix + Core Remix"
+  saveName: "Beatmania 6thMix + Core Remix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15093,7 +15816,8 @@ SCPS-45419:
     multitap: false
     linkCable: false
 SLPM-86266:
-  name: "Beatmania Append 4thMix - The Beat Goes On (Japan)"
+  name: "Beatmania Append 4thMix - The Beat Goes On"
+  saveName: "Beatmania Append 4thMix - The Beat Goes On (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15112,7 +15836,8 @@ SLPM-86266:
     multitap: false
     linkCable: false
 SLPM-86322:
-  name: "Beatmania Append 5thMix - Time to Get Down (Japan)"
+  name: "Beatmania Append 5thMix - Time to Get Down"
+  saveName: "Beatmania Append 5thMix - Time to Get Down (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15131,7 +15856,8 @@ SLPM-86322:
     multitap: false
     linkCable: false
 SLPM-86692:
-  name: "Beatmania Append Club Mix (Japan)"
+  name: "Beatmania Append Club Mix"
+  saveName: "Beatmania Append Club Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15150,7 +15876,8 @@ SLPM-86692:
     multitap: false
     linkCable: false
 SLPM-86596:
-  name: "Beatmania Best Hits (Japan)"
+  name: "Beatmania Best Hits"
+  saveName: "Beatmania Best Hits (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15188,7 +15915,8 @@ SLPM-86830:
     multitap: false
     linkCable: false
 SLPM-86597:
-  name: "Beatmania featuring Dreams Come True (Japan)"
+  name: "Beatmania featuring Dreams Come True"
+  saveName: "Beatmania featuring Dreams Come True (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15207,7 +15935,8 @@ SLPM-86597:
     multitap: false
     linkCable: false
 SLPS-01219:
-  name: "Beavis and Butt-Head - Virtual Aho Shoukougun (Japan)"
+  name: "Beavis and Butt-Head - Virtual Aho Shoukougun"
+  saveName: "Beavis and Butt-Head - Virtual Aho Shoukougun (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -15225,7 +15954,8 @@ SLPS-01219:
     multitap: false
     linkCable: false
 SLES-00334:
-  name: "Bedlam (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Bedlam"
+  saveName: "Bedlam (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -15251,7 +15981,8 @@ SLES-00334:
     multitap: false
     linkCable: false
 SLPS-00582:
-  name: "Beltlogger 9 (Japan)"
+  name: "Beltlogger 9"
+  saveName: "Beltlogger 9 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -15269,7 +16000,8 @@ SLPS-00582:
     multitap: false
     linkCable: false
 SLPS-00581:
-  name: "Beltlogger 9 (Japan) (Shokai Genteiban)"
+  name: "Beltlogger 9 (Shokai Genteiban)"
+  saveName: "Beltlogger 9 (Japan) (Shokai Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -15305,36 +16037,44 @@ SLPS-91462:
     multitap: false
     linkCable: false
 SCUS-94286:
-  name: "Best Buy Demo CD (USA)"
+  name: "Best Buy Demo CD"
+  saveName: "Best Buy Demo CD (USA)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
 SCUS-94668:
-  name: "Best Buy Greatest Hits Demo Disc - Volume One (USA)"
+  name: "Best Buy Greatest Hits Demo Disc - Volume One"
+  saveName: "Best Buy Greatest Hits Demo Disc - Volume One (USA)"
   metadata:
     genre: "** DEMO **"
 SCED-02420:
-  name: "Best Horror Games Ever Demo (Europe, Australia)"
+  name: "Best Horror Games Ever Demo"
+  saveName: "Best Horror Games Ever Demo (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCED-02327:
-  name: "Best PlayStation Games Ever, The - No. 1 of 4 (Europe, Australia)"
+  name: "Best PlayStation Games Ever, The - No. 1 of 4"
+  saveName: "Best PlayStation Games Ever, The - No. 1 of 4 (Europe, Australia)"
 SCED-02421:
-  name: "Best Sports Games Ever (Europe, Australia)"
+  name: "Best Sports Games Ever"
+  saveName: "Best Sports Games Ever (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCED-03167:
-  name: "Best Sports Games Ever 2000 (Europe, Australia)"
+  name: "Best Sports Games Ever 2000"
+  saveName: "Best Sports Games Ever 2000 (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCUS-94261:
-  name: "Best of PlayStation Underground Year One, The (USA)"
+  name: "Best of PlayStation Underground Year One, The"
+  saveName: "Best of PlayStation Underground Year One, The (USA)"
   metadata:
     genre: "** DEMO **"
 SLES-04093:
-  name: "Beyblade (Europe) (En,Fr,De,Es,It)"
+  name: "Beyblade"
+  saveName: "Beyblade (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15353,7 +16093,8 @@ SLES-04093:
     multitap: false
     linkCable: false
 SLUS-01489:
-  name: "Beyblade (USA)"
+  name: "Beyblade"
+  saveName: "Beyblade (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -15375,9 +16116,11 @@ SLUS-01489:
     multitap: false
     linkCable: false
 PAPX-90005:
-  name: "Beyond the Beyond (Japan) (Tentou-you Special CD-ROM)"
+  name: "Beyond the Beyond (Tentou-you Special CD-ROM)"
+  saveName: "Beyond the Beyond (Japan) (Tentou-you Special CD-ROM)"
 SCUS-94702:
-  name: "Beyond the Beyond (USA)"
+  name: "Beyond the Beyond"
+  saveName: "Beyond the Beyond (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3711-g65f99f89"
@@ -15398,7 +16141,8 @@ SCUS-94702:
     multitap: false
     linkCable: false
 SCPS-10014:
-  name: "Beyond the Beyond - Harukanaru Kanaan he (Japan)"
+  name: "Beyond the Beyond - Harukanaru Kanaan he"
+  saveName: "Beyond the Beyond - Harukanaru Kanaan he (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -15416,7 +16160,8 @@ SCPS-10014:
     multitap: false
     linkCable: false
 SLES-01531:
-  name: "Big Air (Europe) (En,Fr,De,Sv)"
+  name: "Big Air"
+  saveName: "Big Air (Europe) (En,Fr,De,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15438,7 +16183,8 @@ SLES-01531:
     multitap: false
     linkCable: false
 SLUS-00645:
-  name: "Big Air (USA)"
+  name: "Big Air"
+  saveName: "Big Air (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -15460,7 +16206,8 @@ SLUS-00645:
     multitap: false
     linkCable: false
 SLES-03847:
-  name: "Big Bass Fishing (Europe) (En,Fr,De,Es,It)"
+  name: "Big Bass Fishing"
+  saveName: "Big Bass Fishing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15483,7 +16230,8 @@ SLES-03847:
     multitap: false
     linkCable: false
 SLUS-01442:
-  name: "Big Bass Fishing (USA)"
+  name: "Big Bass Fishing"
+  saveName: "Big Bass Fishing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15502,7 +16250,8 @@ SLUS-01442:
     multitap: false
     linkCable: false
 SLUS-00228:
-  name: "Big Bass World Championship (USA)"
+  name: "Big Bass World Championship"
+  saveName: "Big Bass World Championship (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -15520,7 +16269,8 @@ SLUS-00228:
     multitap: false
     linkCable: false
 SLPS-00459:
-  name: "Big Challenge Golf - Tokyo Yomiuri Country Club-hen (Japan)"
+  name: "Big Challenge Golf - Tokyo Yomiuri Country Club-hen"
+  saveName: "Big Challenge Golf - Tokyo Yomiuri Country Club-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -15538,7 +16288,8 @@ SLPS-00459:
     multitap: false
     linkCable: false
 SLUS-01527:
-  name: "Big League Slugger Baseball (USA)"
+  name: "Big League Slugger Baseball"
+  saveName: "Big League Slugger Baseball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15557,7 +16308,8 @@ SLUS-01527:
     multitap: false
     linkCable: false
 SLUS-01259:
-  name: "Big Ol' Bass 2 (USA)"
+  name: "Big Ol' Bass 2"
+  saveName: "Big Ol' Bass 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1149-g6834f2c"
@@ -15580,7 +16332,8 @@ SLUS-01259:
     multitap: false
     linkCable: false
 SLES-04025:
-  name: "Big Strike Bowling (Europe) (En,De,It)"
+  name: "Big Strike Bowling"
+  saveName: "Big Strike Bowling (Europe) (En,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15601,7 +16354,8 @@ SLES-04025:
     multitap: false
     linkCable: false
 SLUS-01478:
-  name: "Big Strike Bowling (USA)"
+  name: "Big Strike Bowling"
+  saveName: "Big Strike Bowling (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15620,7 +16374,8 @@ SLUS-01478:
     multitap: false
     linkCable: false
 SLUS-01289:
-  name: "Billiards (USA)"
+  name: "Billiards"
+  saveName: "Billiards (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15639,7 +16394,8 @@ SLUS-01289:
     multitap: false
     linkCable: false
 SLES-01316:
-  name: "Bio F.R.E.A.K.S. (Europe)"
+  name: "Bio F.R.E.A.K.S."
+  saveName: "Bio F.R.E.A.K.S. (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -15657,7 +16413,8 @@ SLES-01316:
     multitap: false
     linkCable: false
 SLUS-00502:
-  name: "Bio F.R.E.A.K.S. (USA)"
+  name: "Bio F.R.E.A.K.S."
+  saveName: "Bio F.R.E.A.K.S. (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
@@ -15678,7 +16435,8 @@ SLUS-00502:
     multitap: false
     linkCable: false
 SLPS-00222:
-  name: "Bio Hazard (Japan)"
+  name: "Bio Hazard"
+  saveName: "Bio Hazard (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -15696,11 +16454,13 @@ SLPS-00222:
     multitap: false
     linkCable: false
 SLPM-80027:
-  name: "Bio Hazard (Japan) (Demo)"
+  name: "Bio Hazard (Demo)"
+  saveName: "Bio Hazard (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01513:
-  name: "Bio Hazard - Complete Disc (Japan)"
+  name: "Bio Hazard - Complete Disc"
+  saveName: "Bio Hazard - Complete Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15719,7 +16479,8 @@ SLPS-01513:
     multitap: false
     linkCable: false
 SLPS-00998:
-  name: "Bio Hazard - Director's Cut (Japan)"
+  name: "Bio Hazard - Director's Cut"
+  saveName: "Bio Hazard - Director's Cut (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -15737,7 +16498,8 @@ SLPS-00998:
     multitap: false
     linkCable: false
 SLPS-01512:
-  name: "Bio Hazard - Director's Cut - Dual Shock Ver. (Japan)"
+  name: "Bio Hazard - Director's Cut - Dual Shock Ver."
+  saveName: "Bio Hazard - Director's Cut - Dual Shock Ver. (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15756,7 +16518,8 @@ SLPS-01512:
     multitap: false
     linkCable: false
 SLPM-86749:
-  name: "Biohazard - Gun Survivor (Japan)"
+  name: "Biohazard - Gun Survivor"
+  saveName: "Biohazard - Gun Survivor (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15779,7 +16542,8 @@ SLPM-86749:
     multitap: false
     linkCable: false
 SLPS-01222:
-  name: "Biohazard 2 (Japan) (Disc 1) (Leon-hen)"
+  name: "Biohazard 2 (Disc 1) (Leon-hen)"
+  saveName: "Biohazard 2 (Japan) (Disc 1) (Leon-hen)"
   discSet:
     name: "Biohazard 2 (Japan)"
     serials:
@@ -15806,7 +16570,8 @@ SLPS-01222:
     multitap: false
     linkCable: false
 SLPS-01223:
-  name: "Biohazard 2 (Japan) (Disc 2) (Claire-hen)"
+  name: "Biohazard 2 (Disc 2) (Claire-hen)"
+  saveName: "Biohazard 2 (Japan) (Disc 2) (Claire-hen)"
   discSet:
     name: "Biohazard 2 (Japan)"
     serials:
@@ -15833,7 +16598,8 @@ SLPS-01223:
     multitap: false
     linkCable: false
 SLPS-00999:
-  name: "Biohazard 2 (Japan) (Trial Edition)"
+  name: "Biohazard 2 (Trial Edition)"
+  saveName: "Biohazard 2 (Japan) (Trial Edition)"
   controllers:
     - DigitalController
   traits:
@@ -15841,7 +16607,8 @@ SLPS-00999:
   settings:
     cdromMaxReadSpeedupCycles: 70000
 SLPS-01510:
-  name: "Biohazard 2 - Dual Shock Ver. (Japan) (Disc 1) (Leon-hen)"
+  name: "Biohazard 2 - Dual Shock Ver. (Disc 1) (Leon-hen)"
+  saveName: "Biohazard 2 - Dual Shock Ver. (Japan) (Disc 1) (Leon-hen)"
   discSet:
     name: "Biohazard 2 - Dual Shock Ver. (Japan)"
     serials:
@@ -15869,7 +16636,8 @@ SLPS-01510:
     multitap: false
     linkCable: false
 SLPS-01511:
-  name: "Biohazard 2 - Dual Shock Ver. (Japan) (Disc 2) (Claire-hen)"
+  name: "Biohazard 2 - Dual Shock Ver. (Disc 2) (Claire-hen)"
+  saveName: "Biohazard 2 - Dual Shock Ver. (Japan) (Disc 2) (Claire-hen)"
   discSet:
     name: "Biohazard 2 - Dual Shock Ver. (Japan)"
     serials:
@@ -15897,7 +16665,8 @@ SLPS-01511:
     multitap: false
     linkCable: false
 SLPS-02300:
-  name: "Biohazard 3 - Last Escape (Japan)"
+  name: "Biohazard 3 - Last Escape"
+  saveName: "Biohazard 3 - Last Escape (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15922,7 +16691,8 @@ SLPS-02300:
     multitap: false
     linkCable: false
 SLPM-80485:
-  name: "Biohazard 3 - Last Escape (Japan) (Demo)"
+  name: "Biohazard 3 - Last Escape (Demo)"
+  saveName: "Biohazard 3 - Last Escape (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -15932,7 +16702,8 @@ SLPM-80485:
   settings:
     cdromMaxReadSpeedupCycles: 70000
 SLPM-87224:
-  name: "Biohazard 3 - Last Escape (Japan) (Rev 1)"
+  name: "Biohazard 3 - Last Escape"
+  saveName: "Biohazard 3 - Last Escape (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15957,7 +16728,8 @@ SLPM-87224:
     multitap: false
     linkCable: false
 SLES-02537:
-  name: "Bishi Bashi Special (Europe)"
+  name: "Bishi Bashi Special"
+  saveName: "Bishi Bashi Special (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4416-g24b4be51"
@@ -15979,7 +16751,8 @@ SLES-02537:
     multitap: true
     linkCable: false
 SLPM-86123:
-  name: "Bishi Bashi Special (Japan)"
+  name: "Bishi Bashi Special"
+  saveName: "Bishi Bashi Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -15998,7 +16771,8 @@ SLPM-86123:
     multitap: true
     linkCable: false
 SLPM-86267:
-  name: "Bishi Bashi Special 2 (Japan)"
+  name: "Bishi Bashi Special 2"
+  saveName: "Bishi Bashi Special 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16055,7 +16829,8 @@ SLPM-87207:
     multitap: false
     linkCable: false
 SLPM-86539:
-  name: "Bishi Bashi Special 3 - Step Champ (Japan)"
+  name: "Bishi Bashi Special 3 - Step Champ"
+  saveName: "Bishi Bashi Special 3 - Step Champ (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16131,7 +16906,8 @@ SLPM-87206:
     multitap: true
     linkCable: false
 SLPS-00941:
-  name: "Bishoujo Hanafuda Kikou - Michinoku Hitou Koi Monogatari (Japan)"
+  name: "Bishoujo Hanafuda Kikou - Michinoku Hitou Koi Monogatari"
+  saveName: "Bishoujo Hanafuda Kikou - Michinoku Hitou Koi Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16149,7 +16925,8 @@ SLPS-00941:
     multitap: false
     linkCable: false
 SLPM-86414:
-  name: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Doki Doki-hen (Japan)"
+  name: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Doki Doki-hen"
+  saveName: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Doki Doki-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16168,7 +16945,8 @@ SLPM-86414:
     multitap: false
     linkCable: false
 SLPM-86468:
-  name: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Munekyun-hen (Japan)"
+  name: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Munekyun-hen"
+  saveName: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Munekyun-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16187,7 +16965,8 @@ SLPM-86468:
     multitap: false
     linkCable: false
 SLPM-86474:
-  name: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Pure Love-hen (Japan)"
+  name: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Pure Love-hen"
+  saveName: "Bishoujo Ren'ai Mahjong Series - Karan Koron Gakuen - Pure Love-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16206,7 +16985,8 @@ SLPM-86474:
     multitap: false
     linkCable: false
 SLPM-86680:
-  name: "Bishoujo Ren'ai Mahjong Series 2nd - Shiritsu Houou Gakuen - 1-nen Jun'ai-gumi (Japan)"
+  name: "Bishoujo Ren'ai Mahjong Series 2nd - Shiritsu Houou Gakuen - 1-nen Jun'ai-gumi"
+  saveName: "Bishoujo Ren'ai Mahjong Series 2nd - Shiritsu Houou Gakuen - 1-nen Jun'ai-gumi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16224,7 +17004,8 @@ SLPM-86680:
     multitap: false
     linkCable: false
 SLPM-86716:
-  name: "Bishoujo Ren'ai Mahjong Series 2nd - Shiritsu Houou Gakuen - 2-nen Junjou-gumi (Japan)"
+  name: "Bishoujo Ren'ai Mahjong Series 2nd - Shiritsu Houou Gakuen - 2-nen Junjou-gumi"
+  saveName: "Bishoujo Ren'ai Mahjong Series 2nd - Shiritsu Houou Gakuen - 2-nen Junjou-gumi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16242,7 +17023,8 @@ SLPM-86716:
     multitap: false
     linkCable: false
 SLPS-00262:
-  name: "Bishoujo Senshi Sailor Moon SuperS - Shin Shuyaku Soudatsusen (Japan)"
+  name: "Bishoujo Senshi Sailor Moon SuperS - Shin Shuyaku Soudatsusen"
+  saveName: "Bishoujo Senshi Sailor Moon SuperS - Shin Shuyaku Soudatsusen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16260,7 +17042,8 @@ SLPS-00262:
     multitap: false
     linkCable: false
 SLPS-00260:
-  name: "Bishoujo Senshi Sailor Moon SuperS - Shin Shuyaku Soudatsusen (Japan) (Shokai Genteiban)"
+  name: "Bishoujo Senshi Sailor Moon SuperS - Shin Shuyaku Soudatsusen (Shokai Genteiban)"
+  saveName: "Bishoujo Senshi Sailor Moon SuperS - Shin Shuyaku Soudatsusen (Japan) (Shokai Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -16278,7 +17061,8 @@ SLPS-00260:
     multitap: false
     linkCable: false
 SLPS-02294:
-  name: "Bistro, The - Ryouri & Wine no Shokunin-tachi (Japan)"
+  name: "Bistro, The - Ryouri & Wine no Shokunin-tachi"
+  saveName: "Bistro, The - Ryouri & Wine no Shokunin-tachi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16296,7 +17080,8 @@ SLPS-02294:
     multitap: false
     linkCable: false
 SLUS-00648:
-  name: "Black Bass with Blue Marlin (USA)"
+  name: "Black Bass with Blue Marlin"
+  saveName: "Black Bass with Blue Marlin (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16315,7 +17100,8 @@ SLUS-00648:
     multitap: false
     linkCable: false
 SLES-00407:
-  name: "Black Dawn (Europe)"
+  name: "Black Dawn"
+  saveName: "Black Dawn (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -16333,7 +17119,8 @@ SLES-00407:
     multitap: false
     linkCable: false
 SLPS-00663:
-  name: "Black Dawn (Japan)"
+  name: "Black Dawn"
+  saveName: "Black Dawn (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16351,7 +17138,8 @@ SLPS-00663:
     multitap: false
     linkCable: false
 SLUS-00321:
-  name: "Black Dawn (USA)"
+  name: "Black Dawn"
+  saveName: "Black Dawn (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -16391,7 +17179,8 @@ SLPS-02962:
     multitap: false
     linkCable: false
 SLPS-03415:
-  name: "Black-Matrix + (Japan) (Disc 1)"
+  name: "Black-Matrix + (Disc 1)"
+  saveName: "Black-Matrix + (Japan) (Disc 1)"
   discSet:
     name: "Black-Matrix + (Japan)"
     serials:
@@ -16415,7 +17204,8 @@ SLPS-03415:
     multitap: false
     linkCable: false
 SLPS-03416:
-  name: "Black-Matrix + (Japan) (Disc 2)"
+  name: "Black-Matrix + (Disc 2)"
+  saveName: "Black-Matrix + (Japan) (Disc 2)"
   discSet:
     name: "Black-Matrix + (Japan)"
     serials:
@@ -16439,7 +17229,8 @@ SLPS-03416:
     multitap: false
     linkCable: false
 SLPS-03573:
-  name: "Black-Matrix 00 (Japan) (Disc 1)"
+  name: "Black-Matrix 00 (Disc 1)"
+  saveName: "Black-Matrix 00 (Japan) (Disc 1)"
   discSet:
     name: "Black-Matrix 00 (Japan)"
     serials:
@@ -16463,7 +17254,8 @@ SLPS-03573:
     multitap: false
     linkCable: false
 SLPS-03571:
-  name: "Black-Matrix 00 (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Black-Matrix 00 (Disc 1) (Shokai Genteiban)"
+  saveName: "Black-Matrix 00 (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Black-Matrix 00 (Japan) (Shokai Genteiban)"
     serials:
@@ -16487,7 +17279,8 @@ SLPS-03571:
     multitap: false
     linkCable: false
 SLPS-03574:
-  name: "Black-Matrix 00 (Japan) (Disc 2)"
+  name: "Black-Matrix 00 (Disc 2)"
+  saveName: "Black-Matrix 00 (Japan) (Disc 2)"
   discSet:
     name: "Black-Matrix 00 (Japan)"
     serials:
@@ -16511,7 +17304,8 @@ SLPS-03574:
     multitap: false
     linkCable: false
 SLPS-03572:
-  name: "Black-Matrix 00 (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Black-Matrix 00 (Disc 2) (Shokai Genteiban)"
+  saveName: "Black-Matrix 00 (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Black-Matrix 00 (Japan) (Shokai Genteiban)"
     serials:
@@ -16535,7 +17329,8 @@ SLPS-03572:
     multitap: false
     linkCable: false
 SLPS-01983:
-  name: "Blackjack vs. Matsuda Jun (Japan)"
+  name: "Blackjack vs. Matsuda Jun"
+  saveName: "Blackjack vs. Matsuda Jun (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16554,7 +17349,8 @@ SLPS-01983:
     multitap: true
     linkCable: false
 SLES-03213:
-  name: "Blade (Europe)"
+  name: "Blade"
+  saveName: "Blade (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16573,7 +17369,8 @@ SLES-03213:
     multitap: false
     linkCable: false
 SLES-03214:
-  name: "Blade (France)"
+  name: "Blade"
+  saveName: "Blade (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16592,7 +17389,8 @@ SLES-03214:
     multitap: false
     linkCable: false
 SLES-03215:
-  name: "Blade (Germany)"
+  name: "Blade"
+  saveName: "Blade (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16611,7 +17409,8 @@ SLES-03215:
     multitap: false
     linkCable: false
 SLUS-01215:
-  name: "Blade (USA)"
+  name: "Blade"
+  saveName: "Blade (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -16634,7 +17433,8 @@ SLUS-01215:
     multitap: false
     linkCable: false
 SLPM-86602:
-  name: "Blade Arts - Tasogare no Miyako R'lyeh (Japan)"
+  name: "Blade Arts - Tasogare no Miyako R'lyeh"
+  saveName: "Blade Arts - Tasogare no Miyako R'lyeh (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16653,7 +17453,8 @@ SLPM-86602:
     multitap: false
     linkCable: false
 SLPS-01795:
-  name: "Blade Maker (Japan)"
+  name: "Blade Maker"
+  saveName: "Blade Maker (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16689,7 +17490,8 @@ SCPS-45067:
     multitap: false
     linkCable: false
 SLES-00349:
-  name: "Blam! Machinehead (Europe)"
+  name: "Blam! Machinehead"
+  saveName: "Blam! Machinehead (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -16707,7 +17509,8 @@ SLES-00349:
     multitap: false
     linkCable: false
 SLES-00350:
-  name: "Blam! Machinehead (France)"
+  name: "Blam! Machinehead"
+  saveName: "Blam! Machinehead (France)"
   controllers:
     - DigitalController
   metadata:
@@ -16725,7 +17528,8 @@ SLES-00350:
     multitap: false
     linkCable: false
 SLES-00351:
-  name: "Blam! Machinehead (Germany)"
+  name: "Blam! Machinehead"
+  saveName: "Blam! Machinehead (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -16743,7 +17547,8 @@ SLES-00351:
     multitap: false
     linkCable: false
 SLPS-00798:
-  name: "Blam! Machinehead (Japan)"
+  name: "Blam! Machinehead"
+  saveName: "Blam! Machinehead (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -16761,7 +17566,8 @@ SLPS-00798:
     multitap: false
     linkCable: false
 SLES-00476:
-  name: "Blast Chamber (Europe) (En,Fr,De,Es,It)"
+  name: "Blast Chamber"
+  saveName: "Blast Chamber (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -16783,7 +17589,8 @@ SLES-00476:
     multitap: true
     linkCable: false
 SLUS-00219:
-  name: "Blast Chamber (USA)"
+  name: "Blast Chamber"
+  saveName: "Blast Chamber (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -16804,7 +17611,8 @@ SLUS-00219:
     multitap: true
     linkCable: false
 SLUS-01380:
-  name: "Blast Lacrosse (USA)"
+  name: "Blast Lacrosse"
+  saveName: "Blast Lacrosse (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16823,7 +17631,8 @@ SLUS-01380:
     multitap: false
     linkCable: false
 SLES-01169:
-  name: "Blast Radius (Europe)"
+  name: "Blast Radius"
+  saveName: "Blast Radius (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16842,11 +17651,13 @@ SLES-01169:
     multitap: false
     linkCable: true
 SLED-01272:
-  name: "Blast Radius (Europe) (Demo)"
+  name: "Blast Radius (Demo)"
+  saveName: "Blast Radius (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01192:
-  name: "Blast Radius (France)"
+  name: "Blast Radius"
+  saveName: "Blast Radius (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16865,7 +17676,8 @@ SLES-01192:
     multitap: false
     linkCable: true
 SLUS-00642:
-  name: "Blast Radius (USA)"
+  name: "Blast Radius"
+  saveName: "Blast Radius (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16884,7 +17696,8 @@ SLUS-00642:
     multitap: false
     linkCable: true
 SLPS-02617:
-  name: "Blaster Master (Japan)"
+  name: "Blaster Master"
+  saveName: "Blaster Master (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16906,7 +17719,8 @@ SLPS-02617:
     multitap: false
     linkCable: false
 SLES-02273:
-  name: "Blaster Master - Blasting Again (Europe) (En,Fr,De,Es,It)"
+  name: "Blaster Master - Blasting Again"
+  saveName: "Blaster Master - Blasting Again (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -16929,7 +17743,8 @@ SLES-02273:
     multitap: false
     linkCable: false
 SLUS-01031:
-  name: "Blaster Master - Blasting Again (USA)"
+  name: "Blaster Master - Blasting Again"
+  saveName: "Blaster Master - Blasting Again (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -16951,7 +17766,8 @@ SLUS-01031:
     multitap: false
     linkCable: false
 SCES-01224:
-  name: "Blasto (Europe) (En,Fr,De,Es,It)"
+  name: "Blasto"
+  saveName: "Blasto (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2498-gd7de578d"
@@ -16980,7 +17796,8 @@ SCES-01224:
     multitap: false
     linkCable: false
 SCUS-94412:
-  name: "Blasto (USA)"
+  name: "Blasto"
+  saveName: "Blasto (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -17002,7 +17819,8 @@ SCUS-94412:
     multitap: false
     linkCable: false
 SLES-00845:
-  name: "Blaze & Blade - Eternal Quest (Europe)"
+  name: "Blaze & Blade - Eternal Quest"
+  saveName: "Blaze & Blade - Eternal Quest (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17021,7 +17839,8 @@ SLES-00845:
     multitap: true
     linkCable: false
 SLES-01274:
-  name: "Blaze & Blade - Eternal Quest (Germany)"
+  name: "Blaze & Blade - Eternal Quest"
+  saveName: "Blaze & Blade - Eternal Quest (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17040,7 +17859,8 @@ SLES-01274:
     multitap: true
     linkCable: false
 SLPS-01209:
-  name: "Blaze & Blade - Eternal Quest (Japan)"
+  name: "Blaze & Blade - Eternal Quest"
+  saveName: "Blaze & Blade - Eternal Quest (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17059,7 +17879,8 @@ SLPS-01209:
     multitap: true
     linkCable: false
 SLPS-01576:
-  name: "Blaze & Blade Busters (Japan)"
+  name: "Blaze & Blade Busters"
+  saveName: "Blaze & Blade Busters (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -17077,7 +17898,8 @@ SLPS-01576:
     multitap: true
     linkCable: false
 SLES-00247:
-  name: "Blazing Dragons (Europe)"
+  name: "Blazing Dragons"
+  saveName: "Blazing Dragons (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -17095,7 +17917,8 @@ SLES-00247:
     multitap: false
     linkCable: false
 SLES-00305:
-  name: "Blazing Dragons (France)"
+  name: "Blazing Dragons"
+  saveName: "Blazing Dragons (France)"
   controllers:
     - DigitalController
   metadata:
@@ -17113,7 +17936,8 @@ SLES-00305:
     multitap: false
     linkCable: false
 SLES-00306:
-  name: "Blazing Dragons (Germany)"
+  name: "Blazing Dragons"
+  saveName: "Blazing Dragons (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -17131,7 +17955,8 @@ SLES-00306:
     multitap: false
     linkCable: false
 SLUS-00100:
-  name: "Blazing Dragons (USA)"
+  name: "Blazing Dragons"
+  saveName: "Blazing Dragons (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -17149,7 +17974,8 @@ SLUS-00100:
     multitap: false
     linkCable: false
 SLPS-02818:
-  name: "Blend x Brand - Odekake Gousei RPG (Japan)"
+  name: "Blend x Brand - Odekake Gousei RPG"
+  saveName: "Blend x Brand - Odekake Gousei RPG (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -17170,7 +17996,8 @@ SLPS-02818:
     multitap: false
     linkCable: false
 SLES-04067:
-  name: "Block Buster (Europe)"
+  name: "Block Buster"
+  saveName: "Block Buster (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17189,7 +18016,8 @@ SLES-04067:
     multitap: false
     linkCable: false
 SLPM-87236:
-  name: "Block Kuzushi (Japan)"
+  name: "Block Kuzushi"
+  saveName: "Block Kuzushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17208,7 +18036,8 @@ SLPM-87236:
     multitap: false
     linkCable: false
 SLPS-00353:
-  name: "Block Kuzushi - Deden no Gyakushuu (Japan)"
+  name: "Block Kuzushi - Deden no Gyakushuu"
+  saveName: "Block Kuzushi - Deden no Gyakushuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -17226,7 +18055,8 @@ SLPS-00353:
     multitap: false
     linkCable: false
 SLPS-03042:
-  name: "Block Kuzushi - Kowashite Help! (Japan)"
+  name: "Block Kuzushi - Kowashite Help!"
+  saveName: "Block Kuzushi - Kowashite Help! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17245,7 +18075,8 @@ SLPS-03042:
     multitap: false
     linkCable: false
 SLPS-02578:
-  name: "Block Kuzushi 2 (Japan)"
+  name: "Block Kuzushi 2"
+  saveName: "Block Kuzushi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17264,7 +18095,8 @@ SLPS-02578:
     multitap: false
     linkCable: false
 SLPS-03219:
-  name: "Block Wars (Japan)"
+  name: "Block Wars"
+  saveName: "Block Wars (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17283,15 +18115,18 @@ SLPS-03219:
     multitap: false
     linkCable: false
 SLPM-80619:
-  name: "Block Wars (Japan) (Demo)"
+  name: "Block Wars (Demo)"
+  saveName: "Block Wars (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-00877:
-  name: "Blockbuster Playstation Challenge (Europe)"
+  name: "Blockbuster Playstation Challenge"
+  saveName: "Blockbuster Playstation Challenge (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-04003:
-  name: "Blockids (Europe)"
+  name: "Blockids"
+  saveName: "Blockids (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -17309,7 +18144,8 @@ SLES-04003:
     multitap: false
     linkCable: false
 SLPS-00205:
-  name: "Blockids (Japan)"
+  name: "Blockids"
+  saveName: "Blockids (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -17327,7 +18163,8 @@ SLPS-00205:
     multitap: false
     linkCable: false
 SLPS-00206:
-  name: "Blockids (Japan) (DX Pack)"
+  name: "Blockids (DX Pack)"
+  saveName: "Blockids (Japan) (DX Pack)"
   controllers:
     - DigitalController
   metadata:
@@ -17345,7 +18182,8 @@ SLPS-00206:
     multitap: false
     linkCable: false
 SLUS-01496:
-  name: "Blockids (USA)"
+  name: "Blockids"
+  saveName: "Blockids (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -17363,7 +18201,8 @@ SLUS-01496:
     multitap: false
     linkCable: false
 SLPS-00235:
-  name: "Blood Factory (Japan)"
+  name: "Blood Factory"
+  saveName: "Blood Factory (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -17381,7 +18220,8 @@ SLPS-00235:
     multitap: false
     linkCable: false
 SCES-01443:
-  name: "Blood Lines (Europe) (En,Fr,De,Es,It)"
+  name: "Blood Lines"
+  saveName: "Blood Lines (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17404,7 +18244,8 @@ SCES-01443:
     multitap: true
     linkCable: false
 SLES-00075:
-  name: "Blood Omen - Legacy of Kain (Europe)"
+  name: "Blood Omen - Legacy of Kain"
+  saveName: "Blood Omen - Legacy of Kain (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -17422,7 +18263,8 @@ SLES-00075:
     multitap: false
     linkCable: false
 SLES-00522:
-  name: "Blood Omen - Legacy of Kain (France)"
+  name: "Blood Omen - Legacy of Kain"
+  saveName: "Blood Omen - Legacy of Kain (France)"
   controllers:
     - DigitalController
   metadata:
@@ -17440,7 +18282,8 @@ SLES-00522:
     multitap: false
     linkCable: false
 SLES-00523:
-  name: "Blood Omen - Legacy of Kain (Germany)"
+  name: "Blood Omen - Legacy of Kain"
+  saveName: "Blood Omen - Legacy of Kain (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -17458,7 +18301,8 @@ SLES-00523:
     multitap: false
     linkCable: false
 SLUS-00027:
-  name: "Blood Omen - Legacy of Kain (USA)"
+  name: "Blood Omen - Legacy of Kain"
+  saveName: "Blood Omen - Legacy of Kain (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f2366"
@@ -17498,7 +18342,8 @@ SCPS-45129:
     multitap: false
     linkCable: false
 SCUS-94199:
-  name: "Bloody Roar (USA)"
+  name: "Bloody Roar"
+  saveName: "Bloody Roar (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -17519,7 +18364,8 @@ SCUS-94199:
     multitap: false
     linkCable: false
 SLES-01010:
-  name: "Bloody Roar - Hyper Beast Duel (Europe)"
+  name: "Bloody Roar - Hyper Beast Duel"
+  saveName: "Bloody Roar - Hyper Beast Duel (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17538,11 +18384,13 @@ SLES-01010:
     multitap: false
     linkCable: false
 SLED-00108:
-  name: "Bloody Roar - Hyper Beast Duel (Europe) (Demo)"
+  name: "Bloody Roar - Hyper Beast Duel (Demo)"
+  saveName: "Bloody Roar - Hyper Beast Duel (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91157:
-  name: "Bloody Roar - Hyper Beast Duel (Japan) (En,Ja)"
+  name: "Bloody Roar - Hyper Beast Duel"
+  saveName: "Bloody Roar - Hyper Beast Duel (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17564,9 +18412,11 @@ SLPS-91157:
     multitap: false
     linkCable: false
 SLPM-80155:
-  name: "Bloody Roar - Hyper Beast Duel (Japan) (Taikenban)"
+  name: "Bloody Roar - Hyper Beast Duel (Taikenban)"
+  saveName: "Bloody Roar - Hyper Beast Duel (Japan) (Taikenban)"
 SLES-01722:
-  name: "Bloody Roar 2 - Bringer of the New Age (Europe)"
+  name: "Bloody Roar 2 - Bringer of the New Age"
+  saveName: "Bloody Roar 2 - Bringer of the New Age (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -17587,17 +18437,20 @@ SLES-01722:
     multitap: false
     linkCable: false
 SLED-01928:
-  name: "Bloody Roar 2 - Bringer of the New Age (Europe) (Demo)"
+  name: "Bloody Roar 2 - Bringer of the New Age (Demo)"
+  saveName: "Bloody Roar 2 - Bringer of the New Age (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SLPM-80373:
-  name: "Bloody Roar 2 - Bringer of the New Age (Japan) (Demo)"
+  name: "Bloody Roar 2 - Bringer of the New Age (Demo)"
+  saveName: "Bloody Roar 2 - Bringer of the New Age (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45374:
-  name: "Bloody Roar 2 - Bringer of the New Age (Japan, Asia)"
+  name: "Bloody Roar 2 - Bringer of the New Age"
+  saveName: "Bloody Roar 2 - Bringer of the New Age (Japan, Asia)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -17621,7 +18474,8 @@ SCPS-45374:
     multitap: false
     linkCable: false
 SCUS-94424:
-  name: "Bloody Roar II (USA)"
+  name: "Bloody Roar II"
+  saveName: "Bloody Roar II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1047-g8ae04f6"
@@ -17643,7 +18497,8 @@ SCUS-94424:
     multitap: false
     linkCable: false
 SLPS-01122:
-  name: "Blue Breaker - Egao no Yakusoku (Japan)"
+  name: "Blue Breaker - Egao no Yakusoku"
+  saveName: "Blue Breaker - Egao no Yakusoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -17661,7 +18516,8 @@ SLPS-01122:
     multitap: false
     linkCable: false
 SLPM-86646:
-  name: "Blue Breaker - Egao no Yakusoku (Japan) (Major Wave)"
+  name: "Blue Breaker - Egao no Yakusoku (Major Wave)"
+  saveName: "Blue Breaker - Egao no Yakusoku (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -17698,7 +18554,8 @@ SLPS-01502:
     multitap: false
     linkCable: false
 SLPS-01580:
-  name: "Blue Breaker Burst - Egao no Asu ni (Japan)"
+  name: "Blue Breaker Burst - Egao no Asu ni"
+  saveName: "Blue Breaker Burst - Egao no Asu ni (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17717,7 +18574,8 @@ SLPS-01580:
     multitap: false
     linkCable: false
 SLPM-86648:
-  name: "Blue Breaker Burst - Egao no Asu ni (Japan) (Major Wave)"
+  name: "Blue Breaker Burst - Egao no Asu ni (Major Wave)"
+  saveName: "Blue Breaker Burst - Egao no Asu ni (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17736,7 +18594,8 @@ SLPM-86648:
     multitap: false
     linkCable: false
 SLPS-01469:
-  name: "Blue Breaker Burst - Hohoemi o Anata to (Japan)"
+  name: "Blue Breaker Burst - Hohoemi o Anata to"
+  saveName: "Blue Breaker Burst - Hohoemi o Anata to (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17755,7 +18614,8 @@ SLPS-01469:
     multitap: false
     linkCable: false
 SLPM-86647:
-  name: "Blue Breaker Burst - Hohoemi o Anata to (Japan) (Major Wave)"
+  name: "Blue Breaker Burst - Hohoemi o Anata to (Major Wave)"
+  saveName: "Blue Breaker Burst - Hohoemi o Anata to (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17774,7 +18634,8 @@ SLPM-86647:
     multitap: false
     linkCable: false
 SLPM-86718:
-  name: "Blue Marlin, The (Japan)"
+  name: "Blue Marlin, The"
+  saveName: "Blue Marlin, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17796,7 +18657,8 @@ SLPM-86718:
     multitap: false
     linkCable: false
 SLES-03570:
-  name: "Blue's Clues - Blue's Big Musical (Australia)"
+  name: "Blue's Clues - Blue's Big Musical"
+  saveName: "Blue's Clues - Blue's Big Musical (Australia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1153-g06b329b"
@@ -17818,7 +18680,8 @@ SLES-03570:
     multitap: false
     linkCable: false
 SLUS-01198:
-  name: "Blue's Clues - Blue's Big Musical (USA)"
+  name: "Blue's Clues - Blue's Big Musical"
+  saveName: "Blue's Clues - Blue's Big Musical (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1153-g06b329b"
@@ -17840,7 +18703,8 @@ SLUS-01198:
     multitap: false
     linkCable: false
 SLUS-01333:
-  name: "Board Game - Top Shop (USA)"
+  name: "Board Game - Top Shop"
+  saveName: "Board Game - Top Shop (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -17858,7 +18722,8 @@ SLUS-01333:
     multitap: true
     linkCable: false
 SLES-03674:
-  name: "Bob Aggiustatutto (Italy)"
+  name: "Bob Aggiustatutto"
+  saveName: "Bob Aggiustatutto (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17877,7 +18742,8 @@ SLES-03674:
     multitap: false
     linkCable: false
 SLES-03798:
-  name: "Bob le Bricoleur - Reparer C'est Gagne! (France)"
+  name: "Bob le Bricoleur - Reparer C'est Gagne!"
+  saveName: "Bob le Bricoleur - Reparer C'est Gagne! (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17896,7 +18762,8 @@ SLES-03798:
     multitap: false
     linkCable: false
 SLES-02856:
-  name: "Bob the Builder - Can We Fix It (Europe)"
+  name: "Bob the Builder - Can We Fix It"
+  saveName: "Bob the Builder - Can We Fix It (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17915,7 +18782,8 @@ SLES-02856:
     multitap: false
     linkCable: false
 SLUS-01407:
-  name: "Bob the Builder - Can We Fix It (USA)"
+  name: "Bob the Builder - Can We Fix It"
+  saveName: "Bob the Builder - Can We Fix It (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17934,7 +18802,8 @@ SLUS-01407:
     multitap: false
     linkCable: false
 SLPS-00865:
-  name: "Body Hazard (Japan)"
+  name: "Body Hazard"
+  saveName: "Body Hazard (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -17952,7 +18821,8 @@ SLPS-00865:
     multitap: false
     linkCable: false
 SCUS-94307:
-  name: "Bogey - Dead 6 (USA)"
+  name: "Bogey - Dead 6"
+  saveName: "Bogey - Dead 6 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -17970,7 +18840,8 @@ SCUS-94307:
     multitap: false
     linkCable: true
 SLPM-87024:
-  name: "Boku no Choro Q (Japan)"
+  name: "Boku no Choro Q"
+  saveName: "Boku no Choro Q (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -17989,7 +18860,8 @@ SLPM-87024:
     multitap: false
     linkCable: false
 SCPS-10088:
-  name: "Boku no Natsuyasumi - Summer Holiday 20th Century (Japan)"
+  name: "Boku no Natsuyasumi - Summer Holiday 20th Century"
+  saveName: "Boku no Natsuyasumi - Summer Holiday 20th Century (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18011,7 +18883,8 @@ SCPS-10088:
     multitap: false
     linkCable: false
 SLPS-02514:
-  name: "Boku wa Koukuu Kanseikan (Japan)"
+  name: "Boku wa Koukuu Kanseikan"
+  saveName: "Boku wa Koukuu Kanseikan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18029,7 +18902,8 @@ SLPS-02514:
     multitap: false
     linkCable: false
 SLPS-02489:
-  name: "Bokujou Monogatari - Harvest Moon (Japan)"
+  name: "Bokujou Monogatari - Harvest Moon"
+  saveName: "Bokujou Monogatari - Harvest Moon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18048,7 +18922,8 @@ SLPS-02489:
     multitap: false
     linkCable: false
 SLPS-91218:
-  name: "Bokujou Monogatari - Harvest Moon (Japan) (Rev 1)"
+  name: "Bokujou Monogatari - Harvest Moon"
+  saveName: "Bokujou Monogatari - Harvest Moon (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18067,7 +18942,8 @@ SLPS-91218:
     multitap: false
     linkCable: false
 SLPS-03087:
-  name: "Bokujou Monogatari - Harvest Moon for Girl (Japan)"
+  name: "Bokujou Monogatari - Harvest Moon for Girl"
+  saveName: "Bokujou Monogatari - Harvest Moon for Girl (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18105,7 +18981,8 @@ SLPS-91525:
     multitap: false
     linkCable: false
 SLES-01893:
-  name: "Bomberman (Europe)"
+  name: "Bomberman"
+  saveName: "Bomberman (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18124,7 +19001,8 @@ SLES-01893:
     multitap: true
     linkCable: false
 SLPM-86844:
-  name: "Bomberman (Japan)"
+  name: "Bomberman"
+  saveName: "Bomberman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18146,7 +19024,8 @@ SLPM-86844:
     multitap: true
     linkCable: false
 SLUS-01189:
-  name: "Bomberman - Party Edition (USA)"
+  name: "Bomberman - Party Edition"
+  saveName: "Bomberman - Party Edition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18165,7 +19044,8 @@ SLUS-01189:
     multitap: true
     linkCable: false
 SLES-01712:
-  name: "Bomberman Fantasy Race (Europe) (En,Fr,De,Es)"
+  name: "Bomberman Fantasy Race"
+  saveName: "Bomberman Fantasy Race (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -18189,7 +19069,8 @@ SLES-01712:
     multitap: false
     linkCable: false
 SLPM-87102:
-  name: "Bomberman Fantasy Race (Japan)"
+  name: "Bomberman Fantasy Race"
+  saveName: "Bomberman Fantasy Race (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1064-g73cdd676"
@@ -18217,7 +19098,8 @@ SLPM-87102:
     multitap: false
     linkCable: false
 SLUS-00823:
-  name: "Bomberman Fantasy Race (USA)"
+  name: "Bomberman Fantasy Race"
+  saveName: "Bomberman Fantasy Race (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -18241,7 +19123,8 @@ SLUS-00823:
     multitap: false
     linkCable: false
 SLPS-03002:
-  name: "Bomberman Land (Japan)"
+  name: "Bomberman Land"
+  saveName: "Bomberman Land (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -18262,7 +19145,8 @@ SLPS-03002:
     multitap: true
     linkCable: false
 SLPM-87080:
-  name: "Bomberman Land (Japan) (Rev 2)"
+  name: "Bomberman Land"
+  saveName: "Bomberman Land (Japan) (Rev 2)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18284,7 +19168,8 @@ SLPM-87080:
     multitap: true
     linkCable: false
 SCPS-45225:
-  name: "Bomberman Wars (Japan, Asia)"
+  name: "Bomberman Wars"
+  saveName: "Bomberman Wars (Japan, Asia)"
   compatibility:
     rating: NoIssues
     comments: "Unofficial translation works too"
@@ -18327,7 +19212,8 @@ SCPS-45168:
     multitap: true
     linkCable: false
 SCES-01078:
-  name: "Bomberman World (Europe, Australia) (En,Fr,De,Es,It)"
+  name: "Bomberman World"
+  saveName: "Bomberman World (Europe, Australia) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18350,7 +19236,8 @@ SCES-01078:
     multitap: true
     linkCable: false
 SLPS-01155:
-  name: "Bomberman World (Japan)"
+  name: "Bomberman World"
+  saveName: "Bomberman World (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18369,7 +19256,8 @@ SLPS-01155:
     multitap: true
     linkCable: false
 SLPS-91149:
-  name: "Bomberman World (Japan) (Rev 1)"
+  name: "Bomberman World"
+  saveName: "Bomberman World (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18388,7 +19276,8 @@ SLPS-91149:
     multitap: true
     linkCable: false
 SLUS-00680:
-  name: "Bomberman World (USA)"
+  name: "Bomberman World"
+  saveName: "Bomberman World (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -18410,7 +19299,8 @@ SLUS-00680:
     multitap: true
     linkCable: false
 SLES-03163:
-  name: "Bombing Islands, The (Europe)"
+  name: "Bombing Islands, The"
+  saveName: "Bombing Islands, The (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -18428,7 +19318,8 @@ SLES-03163:
     multitap: false
     linkCable: false
 SLPS-91449:
-  name: "Bombing Islands, The (Japan)"
+  name: "Bombing Islands, The"
+  saveName: "Bombing Islands, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18446,7 +19337,8 @@ SLPS-91449:
     multitap: false
     linkCable: false
 SLUS-01292:
-  name: "Bombing Islands, The (USA)"
+  name: "Bombing Islands, The"
+  saveName: "Bombing Islands, The (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -18464,7 +19356,8 @@ SLUS-01292:
     multitap: false
     linkCable: false
 SLPS-00333:
-  name: "Bonogurashi - Kore de Kanpeki Disu (Japan)"
+  name: "Bonogurashi - Kore de Kanpeki Disu"
+  saveName: "Bonogurashi - Kore de Kanpeki Disu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18482,7 +19375,8 @@ SLPS-00333:
     multitap: false
     linkCable: false
 SCPS-10094:
-  name: "Book of Watermarks, The (Japan) (Disc 1)"
+  name: "Book of Watermarks, The (Disc 1)"
+  saveName: "Book of Watermarks, The (Japan) (Disc 1)"
   discSet:
     name: "Book of Watermarks, The (Japan)"
     serials:
@@ -18506,7 +19400,8 @@ SCPS-10094:
     multitap: false
     linkCable: false
 SCPS-10095:
-  name: "Book of Watermarks, The (Japan) (Disc 2)"
+  name: "Book of Watermarks, The (Disc 2)"
+  saveName: "Book of Watermarks, The (Japan) (Disc 2)"
   discSet:
     name: "Book of Watermarks, The (Japan)"
     serials:
@@ -18530,7 +19425,8 @@ SCPS-10095:
     multitap: false
     linkCable: false
 SLUS-00968:
-  name: "BoomBots (USA)"
+  name: "BoomBots"
+  saveName: "BoomBots (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18549,7 +19445,8 @@ SLUS-00968:
     multitap: false
     linkCable: false
 SLUS-00296:
-  name: "Bottom of the 9th '97 (USA)"
+  name: "Bottom of the 9th '97"
+  saveName: "Bottom of the 9th '97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -18567,7 +19464,8 @@ SLUS-00296:
     multitap: false
     linkCable: false
 SLUS-00678:
-  name: "Bottom of the 9th '99 (USA)"
+  name: "Bottom of the 9th '99"
+  saveName: "Bottom of the 9th '99 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -18585,7 +19483,8 @@ SLUS-00678:
     multitap: false
     linkCable: false
 SLUS-00049:
-  name: "Bottom of the 9th (USA)"
+  name: "Bottom of the 9th"
+  saveName: "Bottom of the 9th (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -18603,7 +19502,8 @@ SLUS-00049:
     multitap: false
     linkCable: false
 SLPM-86004:
-  name: "Bottom of the 9th - Major League Heroes (Japan)"
+  name: "Bottom of the 9th - Major League Heroes"
+  saveName: "Bottom of the 9th - Major League Heroes (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18621,7 +19521,8 @@ SLPM-86004:
     multitap: false
     linkCable: false
 SCES-00799:
-  name: "Boucliers de Quetzalcoatl, Les - Les Chevaliers de Baphomet II (France)"
+  name: "Boucliers de Quetzalcoatl, Les - Les Chevaliers de Baphomet II"
+  saveName: "Boucliers de Quetzalcoatl, Les - Les Chevaliers de Baphomet II (France)"
   controllers:
     - DigitalController
   metadata:
@@ -18639,7 +19540,8 @@ SCES-00799:
     multitap: false
     linkCable: false
 SLPS-00907:
-  name: "Boundary Gate - Daughter of Kingdom (Japan)"
+  name: "Boundary Gate - Daughter of Kingdom"
+  saveName: "Boundary Gate - Daughter of Kingdom (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18657,7 +19559,8 @@ SLPS-00907:
     multitap: false
     linkCable: false
 SLPM-86735:
-  name: "Bounty Hunter Sara - Holy Mountain no Teiou (Japan)"
+  name: "Bounty Hunter Sara - Holy Mountain no Teiou"
+  saveName: "Bounty Hunter Sara - Holy Mountain no Teiou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18676,7 +19579,8 @@ SLPM-86735:
     multitap: false
     linkCable: false
 SLPS-01479:
-  name: "Bounty Sword - Double Edge (Japan)"
+  name: "Bounty Sword - Double Edge"
+  saveName: "Bounty Sword - Double Edge (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18694,7 +19598,8 @@ SLPS-01479:
     multitap: false
     linkCable: false
 SLPM-86625:
-  name: "Bounty Sword - Double Edge (Japan) (Major Wave)"
+  name: "Bounty Sword - Double Edge (Major Wave)"
+  saveName: "Bounty Sword - Double Edge (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -18712,7 +19617,8 @@ SLPM-86625:
     multitap: false
     linkCable: false
 SLPS-00757:
-  name: "Bounty Sword First (Japan)"
+  name: "Bounty Sword First"
+  saveName: "Bounty Sword First (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18730,11 +19636,13 @@ SLPS-00757:
     multitap: false
     linkCable: false
 SLPM-80101:
-  name: "Bounty Sword First (Japan) (Demo)"
+  name: "Bounty Sword First (Demo)"
+  saveName: "Bounty Sword First (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86614:
-  name: "Bounty Sword First (Japan) (Major Wave)"
+  name: "Bounty Sword First (Major Wave)"
+  saveName: "Bounty Sword First (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -18752,7 +19660,8 @@ SLPM-86614:
     multitap: false
     linkCable: false
 SLUS-01288:
-  name: "Bowling (USA)"
+  name: "Bowling"
+  saveName: "Bowling (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -18774,7 +19683,8 @@ SLUS-01288:
     multitap: false
     linkCable: false
 SLES-02324:
-  name: "Box Champions 2000 (Germany)"
+  name: "Box Champions 2000"
+  saveName: "Box Champions 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18793,7 +19703,8 @@ SLES-02324:
     multitap: false
     linkCable: false
 SLES-03123:
-  name: "Box Champions 2001 (Germany)"
+  name: "Box Champions 2001"
+  saveName: "Box Champions 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18812,7 +19723,8 @@ SLES-03123:
     multitap: false
     linkCable: false
 SLES-01451:
-  name: "Box-Champions (Germany)"
+  name: "Box-Champions"
+  saveName: "Box-Champions (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18831,7 +19743,8 @@ SLES-01451:
     multitap: false
     linkCable: false
 SLPS-00033:
-  name: "Boxer's Road (Japan)"
+  name: "Boxer's Road"
+  saveName: "Boxer's Road (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18849,7 +19762,8 @@ SLPS-00033:
     multitap: false
     linkCable: false
 SLPS-91007:
-  name: "Boxer's Road (Japan) (Rev 1)"
+  name: "Boxer's Road"
+  saveName: "Boxer's Road (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -18867,7 +19781,8 @@ SLPS-91007:
     multitap: false
     linkCable: false
 SLUS-01309:
-  name: "Boxing (USA)"
+  name: "Boxing"
+  saveName: "Boxing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -18889,7 +19804,8 @@ SLUS-01309:
     multitap: false
     linkCable: false
 SLPS-00779:
-  name: "Boys Be... (Japan)"
+  name: "Boys Be..."
+  saveName: "Boys Be... (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -18907,7 +19823,8 @@ SLPS-00779:
     multitap: false
     linkCable: false
 SLPS-01705:
-  name: "Boys Be... 2nd Season (Japan)"
+  name: "Boys Be... 2nd Season"
+  saveName: "Boys Be... 2nd Season (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -18926,7 +19843,8 @@ SLPS-01705:
     multitap: false
     linkCable: false
 SLES-00754:
-  name: "Brahma Force (Europe)"
+  name: "Brahma Force"
+  saveName: "Brahma Force (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -18946,7 +19864,8 @@ SLES-00754:
     multitap: false
     linkCable: false
 SLUS-00444:
-  name: "Brahma Force - The Assault on Beltlogger 9 (USA)"
+  name: "Brahma Force - The Assault on Beltlogger 9"
+  saveName: "Brahma Force - The Assault on Beltlogger 9 (USA)"
   controllers:
     - DigitalController
   traits:
@@ -18966,7 +19885,8 @@ SLUS-00444:
     multitap: false
     linkCable: false
 SLPS-00514:
-  name: "BrainDead 13 (Japan) (Disc 1)"
+  name: "BrainDead 13 (Disc 1)"
+  saveName: "BrainDead 13 (Japan) (Disc 1)"
   discSet:
     name: "BrainDead 13 (Japan)"
     serials:
@@ -18989,7 +19909,8 @@ SLPS-00514:
     multitap: false
     linkCable: false
 SLPS-00515:
-  name: "BrainDead 13 (Japan) (Disc 2)"
+  name: "BrainDead 13 (Disc 2)"
+  saveName: "BrainDead 13 (Japan) (Disc 2)"
   discSet:
     name: "BrainDead 13 (Japan)"
     serials:
@@ -19012,7 +19933,8 @@ SLPS-00515:
     multitap: false
     linkCable: false
 SLUS-00083:
-  name: "BrainDead 13 (USA) (Disc 1)"
+  name: "BrainDead 13 (Disc 1)"
+  saveName: "BrainDead 13 (USA) (Disc 1)"
   discSet:
     name: "BrainDead 13 (USA)"
     serials:
@@ -19035,7 +19957,8 @@ SLUS-00083:
     multitap: false
     linkCable: false
 SLUS-00171:
-  name: "BrainDead 13 (USA) (Disc 2)"
+  name: "BrainDead 13 (Disc 2)"
+  saveName: "BrainDead 13 (USA) (Disc 2)"
   discSet:
     name: "BrainDead 13 (USA)"
     serials:
@@ -19058,7 +19981,8 @@ SLUS-00171:
     multitap: false
     linkCable: false
 SLES-03992:
-  name: "Bratz - Dress Up, Get Down and Be a Bratz Superstar! (Europe) (En,Fr,De,Es,It)"
+  name: "Bratz - Dress Up, Get Down and Be a Bratz Superstar!"
+  saveName: "Bratz - Dress Up, Get Down and Be a Bratz Superstar! (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19081,7 +20005,8 @@ SLES-03992:
     multitap: false
     linkCable: false
 SLUS-01508:
-  name: "Bratz - Dress Up, Get Down and Be a Bratz Superstar! (USA) (En,Fr,Es)"
+  name: "Bratz - Dress Up, Get Down and Be a Bratz Superstar!"
+  saveName: "Bratz - Dress Up, Get Down and Be a Bratz Superstar! (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19102,7 +20027,8 @@ SLUS-01508:
     multitap: false
     linkCable: false
 SLUS-00726:
-  name: "Brave Fencer Musashi (USA)"
+  name: "Brave Fencer Musashi"
+  saveName: "Brave Fencer Musashi (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-9510-g4c349ffd4"
@@ -19147,7 +20073,8 @@ SCPS-45291:
     multitap: false
     linkCable: false
 SLPS-01490:
-  name: "Brave Fencer Musashiden (Japan)"
+  name: "Brave Fencer Musashiden"
+  saveName: "Brave Fencer Musashiden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19171,13 +20098,15 @@ SLPS-01490:
     multitap: false
     linkCable: false
 SLPM-80262:
-  name: "Brave Fencer Musashiden (Japan) (Demo)"
+  name: "Brave Fencer Musashiden (Demo)"
+  saveName: "Brave Fencer Musashiden (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     cdromMaxReadSpeedupCycles: 40000
 SLPS-01316:
-  name: "Brave Prove (Japan)"
+  name: "Brave Prove"
+  saveName: "Brave Prove (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -19195,7 +20124,8 @@ SLPS-01316:
     multitap: false
     linkCable: false
 SLPS-02580:
-  name: "Brave Saga 2 (Japan) (Disc 1)"
+  name: "Brave Saga 2 (Disc 1)"
+  saveName: "Brave Saga 2 (Japan) (Disc 1)"
   discSet:
     name: "Brave Saga 2 (Japan)"
     serials:
@@ -19219,7 +20149,8 @@ SLPS-02580:
     multitap: false
     linkCable: false
 SLPS-02581:
-  name: "Brave Saga 2 (Japan) (Disc 2)"
+  name: "Brave Saga 2 (Disc 2)"
+  saveName: "Brave Saga 2 (Japan) (Disc 2)"
   discSet:
     name: "Brave Saga 2 (Japan)"
     serials:
@@ -19243,7 +20174,8 @@ SLPS-02581:
     multitap: false
     linkCable: false
 SLPS-02314:
-  name: "Brave Saga 2 - Koushiki Data Disc - Yuusha no Akashi 2 (Japan)"
+  name: "Brave Saga 2 - Koushiki Data Disc - Yuusha no Akashi 2"
+  saveName: "Brave Saga 2 - Koushiki Data Disc - Yuusha no Akashi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19262,7 +20194,8 @@ SLPS-02314:
     multitap: false
     linkCable: false
 SLPS-02889:
-  name: "Brave Sword (Japan)"
+  name: "Brave Sword"
+  saveName: "Brave Sword (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19281,7 +20214,8 @@ SLPS-02889:
     multitap: false
     linkCable: false
 SLUS-00488:
-  name: "Bravo Air Race (USA)"
+  name: "Bravo Air Race"
+  saveName: "Bravo Air Race (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -19299,7 +20233,8 @@ SLUS-00488:
     multitap: false
     linkCable: false
 SLES-00258:
-  name: "Break Point (Europe) (En,Fr)"
+  name: "Break Point"
+  saveName: "Break Point (Europe) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -19318,7 +20253,8 @@ SLES-00258:
     multitap: true
     linkCable: false
 SLPM-86044:
-  name: "Break Point (Japan)"
+  name: "Break Point"
+  saveName: "Break Point (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -19336,7 +20272,8 @@ SLPM-86044:
     multitap: true
     linkCable: false
 SLPS-00129:
-  name: "Break Thru! (Japan)"
+  name: "Break Thru!"
+  saveName: "Break Thru! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -19354,7 +20291,8 @@ SLPS-00129:
     multitap: false
     linkCable: false
 SLPS-02375:
-  name: "Break Volley (Japan)"
+  name: "Break Volley"
+  saveName: "Break Volley (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19373,7 +20311,8 @@ SLPS-02375:
     multitap: false
     linkCable: false
 SLUS-01170:
-  name: "Breakout (USA)"
+  name: "Breakout"
+  saveName: "Breakout (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19394,7 +20333,8 @@ SLUS-01170:
     multitap: true
     linkCable: false
 SLES-02854:
-  name: "Breakout - A Story of Bat Meets Ball...! (Europe) (En,Fr,De,It)"
+  name: "Breakout - A Story of Bat Meets Ball...!"
+  saveName: "Breakout - A Story of Bat Meets Ball...! (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19418,7 +20358,8 @@ SLES-02854:
     multitap: true
     linkCable: false
 SLES-01304:
-  name: "Breath of Fire III (Europe)"
+  name: "Breath of Fire III"
+  saveName: "Breath of Fire III (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -19441,7 +20382,8 @@ SLES-01304:
     multitap: false
     linkCable: false
 SLES-01319:
-  name: "Breath of Fire III (France)"
+  name: "Breath of Fire III"
+  saveName: "Breath of Fire III (France)"
   controllers:
     - DigitalController
   traits:
@@ -19464,7 +20406,8 @@ SLES-01319:
     multitap: false
     linkCable: false
 SLES-01320:
-  name: "Breath of Fire III (Germany)"
+  name: "Breath of Fire III"
+  saveName: "Breath of Fire III (Germany)"
   controllers:
     - DigitalController
   traits:
@@ -19487,7 +20430,8 @@ SLES-01320:
     multitap: false
     linkCable: false
 SLPS-00990:
-  name: "Breath of Fire III (Japan)"
+  name: "Breath of Fire III"
+  saveName: "Breath of Fire III (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -19510,7 +20454,8 @@ SLPS-00990:
     multitap: false
     linkCable: false
 SLPM-80115:
-  name: "Breath of Fire III (Japan) (Demo)"
+  name: "Breath of Fire III (Demo)"
+  saveName: "Breath of Fire III (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -19519,7 +20464,8 @@ SLPM-80115:
   settings:
     cdromMaxReadSpeedupCycles: 60000
 SLUS-00422:
-  name: "Breath of Fire III (USA)"
+  name: "Breath of Fire III"
+  saveName: "Breath of Fire III (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1072-g840a806"
@@ -19568,7 +20514,8 @@ SLPM-86720:
     multitap: false
     linkCable: false
 SLES-03552:
-  name: "Breath of Fire IV (Europe)"
+  name: "Breath of Fire IV"
+  saveName: "Breath of Fire IV (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19593,7 +20540,8 @@ SLES-03552:
     multitap: false
     linkCable: false
 SLUS-01324:
-  name: "Breath of Fire IV (USA)"
+  name: "Breath of Fire IV"
+  saveName: "Breath of Fire IV (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -19649,7 +20597,8 @@ SLPS-02728:
     multitap: false
     linkCable: false
 SLPM-87054:
-  name: "Breed Master (Japan)"
+  name: "Breed Master"
+  saveName: "Breed Master (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19668,7 +20617,8 @@ SLPM-87054:
     multitap: false
     linkCable: false
 SLPM-86012:
-  name: "Breeding Stud - Bokujou de Aimashou (Japan)"
+  name: "Breeding Stud - Bokujou de Aimashou"
+  saveName: "Breeding Stud - Bokujou de Aimashou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -19686,7 +20636,8 @@ SLPM-86012:
     multitap: false
     linkCable: false
 SLPM-86087:
-  name: "Breeding Stud 2 (Japan)"
+  name: "Breeding Stud 2"
+  saveName: "Breeding Stud 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -19704,7 +20655,8 @@ SLPM-86087:
     multitap: false
     linkCable: false
 SLES-00759:
-  name: "Brian Lara Cricket (Europe)"
+  name: "Brian Lara Cricket"
+  saveName: "Brian Lara Cricket (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19723,7 +20675,8 @@ SLES-00759:
     multitap: true
     linkCable: false
 SLPS-01107:
-  name: "Brigandine - Gensou Tairiku Senki (Japan)"
+  name: "Brigandine - Gensou Tairiku Senki"
+  saveName: "Brigandine - Gensou Tairiku Senki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -19741,7 +20694,8 @@ SLPS-01107:
     multitap: false
     linkCable: false
 SLPS-02661:
-  name: "Brigandine - Grand Edition (Japan) (Disc 1)"
+  name: "Brigandine - Grand Edition (Disc 1)"
+  saveName: "Brigandine - Grand Edition (Japan) (Disc 1)"
   discSet:
     name: "Brigandine - Grand Edition (Japan)"
     serials:
@@ -19765,7 +20719,8 @@ SLPS-02661:
     multitap: false
     linkCable: false
 SLPS-02662:
-  name: "Brigandine - Grand Edition (Japan) (Disc 2)"
+  name: "Brigandine - Grand Edition (Disc 2)"
+  saveName: "Brigandine - Grand Edition (Japan) (Disc 2)"
   discSet:
     name: "Brigandine - Grand Edition (Japan)"
     serials:
@@ -19789,7 +20744,8 @@ SLPS-02662:
     multitap: false
     linkCable: false
 SLUS-00687:
-  name: "Brigandine - The Legend of Forsena (USA)"
+  name: "Brigandine - The Legend of Forsena"
+  saveName: "Brigandine - The Legend of Forsena (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -19810,7 +20766,8 @@ SLUS-00687:
     multitap: false
     linkCable: false
 SCPS-10105:
-  name: "Brightis (Japan)"
+  name: "Brightis"
+  saveName: "Brightis (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19829,7 +20786,8 @@ SCPS-10105:
     multitap: false
     linkCable: false
 SLES-00873:
-  name: "Broken Helix (Europe)"
+  name: "Broken Helix"
+  saveName: "Broken Helix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19848,7 +20806,8 @@ SLES-00873:
     multitap: false
     linkCable: false
 SLES-00962:
-  name: "Broken Helix (Germany)"
+  name: "Broken Helix"
+  saveName: "Broken Helix (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19867,7 +20826,8 @@ SLES-00962:
     multitap: false
     linkCable: false
 SLPM-86065:
-  name: "Broken Helix (Japan)"
+  name: "Broken Helix"
+  saveName: "Broken Helix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19886,7 +20846,8 @@ SLPM-86065:
     multitap: false
     linkCable: false
 SLUS-00289:
-  name: "Broken Helix (USA)"
+  name: "Broken Helix"
+  saveName: "Broken Helix (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -19905,7 +20866,8 @@ SLUS-00289:
     multitap: false
     linkCable: false
 SCES-00414:
-  name: "Broken Sword - La Leyenda de los Templarios (Spain)"
+  name: "Broken Sword - La Leyenda de los Templarios"
+  saveName: "Broken Sword - La Leyenda de los Templarios (Spain)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -19924,7 +20886,8 @@ SCES-00414:
     multitap: false
     linkCable: false
 SCES-00346:
-  name: "Broken Sword - The Shadow of the Templars (Europe)"
+  name: "Broken Sword - The Shadow of the Templars"
+  saveName: "Broken Sword - The Shadow of the Templars (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -19943,7 +20906,8 @@ SCES-00346:
     multitap: false
     linkCable: false
 SCES-00468:
-  name: "Broken Sword - The Shadow of the Templars (Italy)"
+  name: "Broken Sword - The Shadow of the Templars"
+  saveName: "Broken Sword - The Shadow of the Templars (Italy)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -19962,7 +20926,8 @@ SCES-00468:
     multitap: false
     linkCable: false
 SLUS-00484:
-  name: "Broken Sword - The Shadow of the Templars (USA)"
+  name: "Broken Sword - The Shadow of the Templars"
+  saveName: "Broken Sword - The Shadow of the Templars (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -19981,7 +20946,8 @@ SLUS-00484:
     multitap: false
     linkCable: false
 SCES-00801:
-  name: "Broken Sword II - La Profezia dei Maya (Italy)"
+  name: "Broken Sword II - La Profezia dei Maya"
+  saveName: "Broken Sword II - La Profezia dei Maya (Italy)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -20000,7 +20966,8 @@ SCES-00801:
     multitap: false
     linkCable: false
 SCES-00802:
-  name: "Broken Sword II - Las Fuerzas del Mal (Spain)"
+  name: "Broken Sword II - Las Fuerzas del Mal"
+  saveName: "Broken Sword II - Las Fuerzas del Mal (Spain)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -20019,7 +20986,8 @@ SCES-00802:
     multitap: false
     linkCable: false
 SCES-00798:
-  name: "Broken Sword II - The Smoking Mirror (Europe)"
+  name: "Broken Sword II - The Smoking Mirror"
+  saveName: "Broken Sword II - The Smoking Mirror (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -20038,7 +21006,8 @@ SCES-00798:
     multitap: false
     linkCable: false
 SLUS-00812:
-  name: "Broken Sword II - The Smoking Mirror (USA)"
+  name: "Broken Sword II - The Smoking Mirror"
+  saveName: "Broken Sword II - The Smoking Mirror (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20058,7 +21027,8 @@ SLUS-00812:
     multitap: false
     linkCable: false
 SLES-01376:
-  name: "Brunswick Circuit Pro Bowling (Europe)"
+  name: "Brunswick Circuit Pro Bowling"
+  saveName: "Brunswick Circuit Pro Bowling (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -20076,7 +21046,8 @@ SLES-01376:
     multitap: true
     linkCable: false
 SLUS-00571:
-  name: "Brunswick Circuit Pro Bowling (USA)"
+  name: "Brunswick Circuit Pro Bowling"
+  saveName: "Brunswick Circuit Pro Bowling (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -20094,7 +21065,8 @@ SLUS-00571:
     multitap: true
     linkCable: false
 SLES-02618:
-  name: "Brunswick Circuit Pro Bowling 2 (Europe)"
+  name: "Brunswick Circuit Pro Bowling 2"
+  saveName: "Brunswick Circuit Pro Bowling 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20113,7 +21085,8 @@ SLES-02618:
     multitap: true
     linkCable: false
 SLUS-00856:
-  name: "Brunswick Circuit Pro Bowling 2 (USA)"
+  name: "Brunswick Circuit Pro Bowling 2"
+  saveName: "Brunswick Circuit Pro Bowling 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20151,7 +21124,8 @@ SLES-00458:
     multitap: false
     linkCable: false
 SLES-00448:
-  name: "Bubble Bobble also featuring Rainbow Islands (Europe)"
+  name: "Bubble Bobble also featuring Rainbow Islands"
+  saveName: "Bubble Bobble also featuring Rainbow Islands (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -20169,7 +21143,8 @@ SLES-00448:
     multitap: false
     linkCable: false
 SLUS-00370:
-  name: "Bubble Bobble also featuring Rainbow Islands (USA)"
+  name: "Bubble Bobble also featuring Rainbow Islands"
+  saveName: "Bubble Bobble also featuring Rainbow Islands (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -20187,7 +21162,8 @@ SLUS-00370:
     multitap: false
     linkCable: false
 SLPS-01710:
-  name: "Bubblegun Kid (Japan)"
+  name: "Bubblegun Kid"
+  saveName: "Bubblegun Kid (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20206,7 +21182,8 @@ SLPS-01710:
     multitap: false
     linkCable: false
 SLES-00122:
-  name: "Bubsy 3D - Furbitten Planet (Europe)"
+  name: "Bubsy 3D - Furbitten Planet"
+  saveName: "Bubsy 3D - Furbitten Planet (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -20224,7 +21201,8 @@ SLES-00122:
     multitap: false
     linkCable: false
 SLUS-00110:
-  name: "Bubsy 3D - Furbitten Planet (USA)"
+  name: "Bubsy 3D - Furbitten Planet"
+  saveName: "Bubsy 3D - Furbitten Planet (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -20245,7 +21223,8 @@ SLUS-00110:
     multitap: false
     linkCable: false
 SLPS-01105:
-  name: "Buckle Up! (Japan)"
+  name: "Buckle Up!"
+  saveName: "Buckle Up! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20264,7 +21243,8 @@ SLPS-01105:
     multitap: false
     linkCable: false
 SLES-00174:
-  name: "Buggy (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Buggy"
+  saveName: "Buggy (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20289,7 +21269,8 @@ SLES-00174:
     multitap: false
     linkCable: false
 SLPM-86133:
-  name: "Bugi (Japan)"
+  name: "Bugi"
+  saveName: "Bugi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20308,7 +21289,8 @@ SLPM-86133:
     multitap: false
     linkCable: false
 SLES-00875:
-  name: "Bugriders - The Race of Kings (Europe)"
+  name: "Bugriders - The Race of Kings"
+  saveName: "Bugriders - The Race of Kings (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20328,7 +21310,8 @@ SLES-00875:
     multitap: false
     linkCable: false
 SLUS-00354:
-  name: "Bugriders - The Race of Kings (USA)"
+  name: "Bugriders - The Race of Kings"
+  saveName: "Bugriders - The Race of Kings (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20348,7 +21331,8 @@ SLUS-00354:
     multitap: false
     linkCable: false
 SLES-02896:
-  name: "Bugs Bunny & Taz - Time Busters (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Bugs Bunny & Taz - Time Busters"
+  saveName: "Bugs Bunny & Taz - Time Busters (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20372,7 +21356,8 @@ SLES-02896:
     multitap: false
     linkCable: false
 SLUS-01144:
-  name: "Bugs Bunny & Taz - Time Busters (USA) (En,Fr,Es)"
+  name: "Bugs Bunny & Taz - Time Busters"
+  saveName: "Bugs Bunny & Taz - Time Busters (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -20396,7 +21381,8 @@ SLUS-01144:
     multitap: false
     linkCable: false
 SLES-01726:
-  name: "Bugs Bunny - Lost in Time (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Bugs Bunny - Lost in Time"
+  saveName: "Bugs Bunny - Lost in Time (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20420,11 +21406,13 @@ SLES-01726:
     multitap: false
     linkCable: false
 SLED-02125:
-  name: "Bugs Bunny - Lost in Time (Europe) (En,Fr,De,Es,It,Nl) (Demo)"
+  name: "Bugs Bunny - Lost in Time (Demo)"
+  saveName: "Bugs Bunny - Lost in Time (Europe) (En,Fr,De,Es,It,Nl) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00838:
-  name: "Bugs Bunny - Lost in Time (USA) (En,Fr,Es)"
+  name: "Bugs Bunny - Lost in Time"
+  saveName: "Bugs Bunny - Lost in Time (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -20448,11 +21436,13 @@ SLUS-00838:
     multitap: false
     linkCable: false
 SLUS-90058:
-  name: "Bugs Bunny - Lost in Time (USA) (En,Fr,Es) (Demo)"
+  name: "Bugs Bunny - Lost in Time (Demo)"
+  saveName: "Bugs Bunny - Lost in Time (USA) (En,Fr,Es) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01086:
-  name: "Builder's Block (USA)"
+  name: "Builder's Block"
+  saveName: "Builder's Block (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20471,7 +21461,8 @@ SLUS-01086:
     multitap: false
     linkCable: false
 SLPS-00497:
-  name: "Building Crush! (Japan)"
+  name: "Building Crush!"
+  saveName: "Building Crush! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -20489,7 +21480,8 @@ SLPS-00497:
     multitap: false
     linkCable: false
 SLES-02564:
-  name: "Bundesliga 2000 - Der Fussball-Manager (Germany)"
+  name: "Bundesliga 2000 - Der Fussball-Manager"
+  saveName: "Bundesliga 2000 - Der Fussball-Manager (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20508,7 +21500,8 @@ SLES-02564:
     multitap: false
     linkCable: false
 SLES-02143:
-  name: "Bundesliga Stars 2000 (Germany)"
+  name: "Bundesliga Stars 2000"
+  saveName: "Bundesliga Stars 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20527,7 +21520,8 @@ SLES-02143:
     multitap: true
     linkCable: false
 SLES-03065:
-  name: "Bundesliga Stars 2001 (Germany)"
+  name: "Bundesliga Stars 2001"
+  saveName: "Bundesliga Stars 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20546,7 +21540,8 @@ SLES-03065:
     multitap: true
     linkCable: false
 SLPS-00888:
-  name: "Burger Burger - Hamburger Simulation (Japan)"
+  name: "Burger Burger - Hamburger Simulation"
+  saveName: "Burger Burger - Hamburger Simulation (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -20567,7 +21562,8 @@ SLPS-00888:
     multitap: false
     linkCable: false
 SLPM-86246:
-  name: "Burger Burger 2 (Japan)"
+  name: "Burger Burger 2"
+  saveName: "Burger Burger 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -20606,7 +21602,8 @@ SLPM-86853:
     multitap: false
     linkCable: false
 SLES-00345:
-  name: "Burning Road (Europe)"
+  name: "Burning Road"
+  saveName: "Burning Road (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -20628,7 +21625,8 @@ SLES-00345:
     multitap: false
     linkCable: true
 SLPS-00518:
-  name: "Burning Road (Japan)"
+  name: "Burning Road"
+  saveName: "Burning Road (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -20647,7 +21645,8 @@ SLPS-00518:
     multitap: false
     linkCable: true
 SLUS-00324:
-  name: "Burning Road (USA)"
+  name: "Burning Road"
+  saveName: "Burning Road (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2799-g0d281538"
@@ -20669,11 +21668,13 @@ SLUS-00324:
     multitap: false
     linkCable: true
 SLUS-90002:
-  name: "Burning Road (USA) (Demo)"
+  name: "Burning Road (Demo)"
+  saveName: "Burning Road (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03338:
-  name: "BursTrick - Wake Boarding!! (Europe) (En,Fr,De)"
+  name: "BursTrick - Wake Boarding!!"
+  saveName: "BursTrick - Wake Boarding!! (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20694,7 +21695,8 @@ SLES-03338:
     multitap: false
     linkCable: false
 SLPS-02792:
-  name: "BursTrick - Wake Boarding!! (Japan)"
+  name: "BursTrick - Wake Boarding!!"
+  saveName: "BursTrick - Wake Boarding!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20713,7 +21715,8 @@ SLPS-02792:
     multitap: false
     linkCable: false
 SLUS-01317:
-  name: "BursTrick - Wake Boarding!! (USA)"
+  name: "BursTrick - Wake Boarding!!"
+  saveName: "BursTrick - Wake Boarding!! (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20750,7 +21753,8 @@ SCPS-45028:
     multitap: false
     linkCable: true
 SCES-00899:
-  name: "Bushido Blade (Europe)"
+  name: "Bushido Blade"
+  saveName: "Bushido Blade (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -20768,7 +21772,8 @@ SCES-00899:
     multitap: false
     linkCable: true
 SLPM-86020:
-  name: "Bushido Blade (Japan)"
+  name: "Bushido Blade"
+  saveName: "Bushido Blade (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -20789,7 +21794,8 @@ SLPM-86020:
     multitap: false
     linkCable: true
 SCUS-94180:
-  name: "Bushido Blade (USA)"
+  name: "Bushido Blade"
+  saveName: "Bushido Blade (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -20810,7 +21816,8 @@ SCUS-94180:
     multitap: false
     linkCable: true
 SCPS-45187:
-  name: "Bushido Blade 2 (Japan, Asia)"
+  name: "Bushido Blade 2"
+  saveName: "Bushido Blade 2 (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -20832,7 +21839,8 @@ SCPS-45187:
     multitap: false
     linkCable: true
 SLUS-00663:
-  name: "Bushido Blade 2 (USA)"
+  name: "Bushido Blade 2"
+  saveName: "Bushido Blade 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -20873,7 +21881,8 @@ SLPM-87404:
     multitap: false
     linkCable: true
 SCUS-94263:
-  name: "Bust A Groove (USA)"
+  name: "Bust A Groove"
+  saveName: "Bust A Groove (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -20895,11 +21904,13 @@ SCUS-94263:
     multitap: false
     linkCable: false
 SCUS-94376:
-  name: "Bust A Groove (USA) (Demo)"
+  name: "Bust A Groove (Demo)"
+  saveName: "Bust A Groove (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01159:
-  name: "Bust A Groove 2 (USA)"
+  name: "Bust A Groove 2"
+  saveName: "Bust A Groove 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -20923,7 +21934,8 @@ SLUS-01159:
     multitap: false
     linkCable: false
 SLPS-01237:
-  name: "Bust A Move (Japan)"
+  name: "Bust A Move"
+  saveName: "Bust A Move (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -20941,11 +21953,13 @@ SLPS-01237:
     multitap: false
     linkCable: false
 PAPX-90028:
-  name: "Bust A Move (Japan) (Demo)"
+  name: "Bust A Move (Demo)"
+  saveName: "Bust A Move (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01232:
-  name: "Bust A Move (Japan) (Disc 1) (Genteiban)"
+  name: "Bust A Move (Disc 1) (Genteiban)"
+  saveName: "Bust A Move (Japan) (Disc 1) (Genteiban)"
   discSet:
     name: "Bust A Move (Japan) (Genteiban)"
     serials:
@@ -20968,7 +21982,8 @@ SLPS-01232:
     multitap: false
     linkCable: false
 SLPS-01233:
-  name: "Bust A Move (Japan) (Disc 2) (Premium CD-ROM) (Genteiban)"
+  name: "Bust A Move (Disc 2) (Premium CD-ROM) (Genteiban)"
+  saveName: "Bust A Move (Japan) (Disc 2) (Premium CD-ROM) (Genteiban)"
   discSet:
     name: "Bust A Move (Japan) (Genteiban)"
     serials:
@@ -20991,7 +22006,8 @@ SLPS-01233:
     multitap: false
     linkCable: false
 SLPM-86219:
-  name: "Bust A Move 2 - Dance Tengoku Mix (Japan)"
+  name: "Bust A Move 2 - Dance Tengoku Mix"
+  saveName: "Bust A Move 2 - Dance Tengoku Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21012,13 +22028,15 @@ SLPM-86219:
     multitap: false
     linkCable: false
 SLPM-80410:
-  name: "Bust A Move 2 - Dance Tengoku Mix (Japan) (Demo)"
+  name: "Bust A Move 2 - Dance Tengoku Mix (Demo)"
+  saveName: "Bust A Move 2 - Dance Tengoku Mix (Japan) (Demo)"
   traits:
     - ForceFullTrueColor # Fixes title/background mismatch in menu.
   metadata:
     genre: "** DEMO **"
 SCES-01313:
-  name: "Bust-A-Groove (Europe) (En,Fr,De,Es,It)"
+  name: "Bust-A-Groove"
+  saveName: "Bust-A-Groove (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -21040,7 +22058,8 @@ SCES-01313:
     multitap: false
     linkCable: false
 SLUS-00725:
-  name: "Bust-A-Move '99 (USA)"
+  name: "Bust-A-Move '99"
+  saveName: "Bust-A-Move '99 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -21061,7 +22080,8 @@ SLUS-00725:
     multitap: false
     linkCable: false
 SLES-00278:
-  name: "Bust-A-Move 2 - Arcade Edition (Europe)"
+  name: "Bust-A-Move 2 - Arcade Edition"
+  saveName: "Bust-A-Move 2 - Arcade Edition (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -21079,7 +22099,8 @@ SLES-00278:
     multitap: false
     linkCable: false
 SLES-04153:
-  name: "Bust-A-Move 2 - Arcade Edition (Italy) (Reprint)"
+  name: "Bust-A-Move 2 - Arcade Edition (Reprint)"
+  saveName: "Bust-A-Move 2 - Arcade Edition (Italy) (Reprint)"
   controllers:
     - DigitalController
   metadata:
@@ -21097,7 +22118,8 @@ SLES-04153:
     multitap: false
     linkCable: false
 SLUS-00233:
-  name: "Bust-A-Move 2 - Arcade Edition (USA)"
+  name: "Bust-A-Move 2 - Arcade Edition"
+  saveName: "Bust-A-Move 2 - Arcade Edition (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -21118,7 +22140,8 @@ SLUS-00233:
     multitap: false
     linkCable: false
 SLES-00991:
-  name: "Bust-A-Move 3 DX (Europe)"
+  name: "Bust-A-Move 3 DX"
+  saveName: "Bust-A-Move 3 DX (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -21136,7 +22159,8 @@ SLES-00991:
     multitap: false
     linkCable: false
 SLES-14153:
-  name: "Bust-A-Move 3 DX (Italy) (Reprint)"
+  name: "Bust-A-Move 3 DX (Reprint)"
+  saveName: "Bust-A-Move 3 DX (Italy) (Reprint)"
   controllers:
     - DigitalController
   metadata:
@@ -21154,7 +22178,8 @@ SLES-14153:
     multitap: false
     linkCable: false
 SLES-01389:
-  name: "Bust-A-Move 4 (Europe)"
+  name: "Bust-A-Move 4"
+  saveName: "Bust-A-Move 4 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21173,7 +22198,8 @@ SLES-01389:
     multitap: false
     linkCable: false
 SLUS-00754:
-  name: "Bust-A-Move 4 (USA)"
+  name: "Bust-A-Move 4"
+  saveName: "Bust-A-Move 4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -21195,7 +22221,8 @@ SLUS-00754:
     multitap: false
     linkCable: false
 SLUS-00208:
-  name: "Buster Bros. Collection (USA)"
+  name: "Buster Bros. Collection"
+  saveName: "Buster Bros. Collection (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1419-g34a515cd"
@@ -21220,7 +22247,8 @@ SLUS-00208:
     multitap: false
     linkCable: false
 SLES-04104:
-  name: "Buttsubushi (Europe, Australia)"
+  name: "Buttsubushi"
+  saveName: "Buttsubushi (Europe, Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21239,7 +22267,8 @@ SLES-04104:
     multitap: true
     linkCable: false
 SLPS-03162:
-  name: "Buttsubushi (Japan)"
+  name: "Buttsubushi"
+  saveName: "Buttsubushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21258,7 +22287,8 @@ SLPS-03162:
     multitap: true
     linkCable: false
 SLES-03562:
-  name: "Byggare Bob - Kan Vi Fixa Det (Sweden)"
+  name: "Byggare Bob - Kan Vi Fixa Det"
+  saveName: "Byggare Bob - Kan Vi Fixa Det (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21277,7 +22307,8 @@ SLES-03562:
     multitap: false
     linkCable: false
 SLES-03564:
-  name: "Byggemand Bob - Kan Vi Klare Det (Denmark)"
+  name: "Byggemand Bob - Kan Vi Klare Det"
+  saveName: "Byggemand Bob - Kan Vi Klare Det (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21296,7 +22327,8 @@ SLES-03564:
     multitap: false
     linkCable: false
 SLES-03563:
-  name: "Byggmester Bob - Kan Det Fikses (Norway)"
+  name: "Byggmester Bob - Kan Det Fikses"
+  saveName: "Byggmester Bob - Kan Det Fikses (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21315,7 +22347,8 @@ SLES-03563:
     multitap: false
     linkCable: false
 SLUS-00499:
-  name: "C - The Contra Adventure (USA)"
+  name: "C - The Contra Adventure"
+  saveName: "C - The Contra Adventure (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -21337,7 +22370,8 @@ SLUS-00499:
     multitap: false
     linkCable: false
 SCES-03364:
-  name: "C-12 - Final Resistance (Europe)"
+  name: "C-12 - Final Resistance"
+  saveName: "C-12 - Final Resistance (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21356,11 +22390,13 @@ SCES-03364:
     multitap: false
     linkCable: false
 SCED-03516:
-  name: "C-12 - Final Resistance (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "C-12 - Final Resistance (Demo)"
+  saveName: "C-12 - Final Resistance (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03366:
-  name: "C-12 - Final Resistance (Europe) (Es,It)"
+  name: "C-12 - Final Resistance"
+  saveName: "C-12 - Final Resistance (Europe) (Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -21383,7 +22419,8 @@ SCES-03366:
     multitap: false
     linkCable: false
 SCES-03365:
-  name: "C-12 - Final Resistance (Europe) (Fr,De)"
+  name: "C-12 - Final Resistance"
+  saveName: "C-12 - Final Resistance (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21403,7 +22440,8 @@ SCES-03365:
     multitap: false
     linkCable: false
 SCES-03426:
-  name: "C-12 - Final Resistance (Russia)"
+  name: "C-12 - Final Resistance"
+  saveName: "C-12 - Final Resistance (Russia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21422,7 +22460,8 @@ SCES-03426:
     multitap: false
     linkCable: false
 SCUS-94666:
-  name: "C-12 - Final Resistance (USA)"
+  name: "C-12 - Final Resistance"
+  saveName: "C-12 - Final Resistance (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -21444,7 +22483,8 @@ SCUS-94666:
     multitap: false
     linkCable: false
 SLPS-00279:
-  name: "C1 - Circuit (Japan)"
+  name: "C1 - Circuit"
+  saveName: "C1 - Circuit (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -21463,7 +22503,8 @@ SLPS-00279:
     multitap: false
     linkCable: true
 SLES-01363:
-  name: "C3 Racing - Car Constructors Championship (Europe) (En,Fr,De,Es,It)"
+  name: "C3 Racing - Car Constructors Championship"
+  saveName: "C3 Racing - Car Constructors Championship (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2553-g3ed42977"
@@ -21490,7 +22531,8 @@ SLES-01363:
     multitap: false
     linkCable: false
 SCUS-94416:
-  name: "CART World Series (USA)"
+  name: "CART World Series"
+  saveName: "CART World Series (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -21511,7 +22553,8 @@ SCUS-94416:
     multitap: false
     linkCable: true
 SLES-01216:
-  name: "CBZ - CyBall Zone (Germany)"
+  name: "CBZ - CyBall Zone"
+  saveName: "CBZ - CyBall Zone (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21530,7 +22573,8 @@ SLES-01216:
     multitap: false
     linkCable: false
 SLPS-00230:
-  name: "CG Mukashi Banashi - Jiisan 2-do Bikkuri!! (Japan)"
+  name: "CG Mukashi Banashi - Jiisan 2-do Bikkuri!!"
+  saveName: "CG Mukashi Banashi - Jiisan 2-do Bikkuri!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -21548,7 +22592,8 @@ SLPS-00230:
     multitap: false
     linkCable: false
 SLPS-00220:
-  name: "CRW - Counter Revolution War (Japan)"
+  name: "CRW - Counter Revolution War"
+  saveName: "CRW - Counter Revolution War (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -21566,7 +22611,8 @@ SLPS-00220:
     multitap: false
     linkCable: false
 SLES-03986:
-  name: "CT Special Forces (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "CT Special Forces"
+  saveName: "CT Special Forces (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21590,7 +22636,8 @@ SLES-03986:
     multitap: false
     linkCable: false
 SLES-04123:
-  name: "CT Special Forces - Back to Hell (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "CT Special Forces - Back to Hell"
+  saveName: "CT Special Forces - Back to Hell (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21614,7 +22661,8 @@ SLES-04123:
     multitap: false
     linkCable: false
 SLES-04155:
-  name: "CT Special Forces 3 - Bioterror (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "CT Special Forces 3 - Bioterror"
+  saveName: "CT Special Forces 3 - Bioterror (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21638,7 +22686,8 @@ SLES-04155:
     multitap: false
     linkCable: false
 SCES-02105:
-  name: "CTR - Crash Team Racing (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "CTR - Crash Team Racing"
+  saveName: "CTR - Crash Team Racing (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -21670,7 +22719,8 @@ SCES-02105:
     multitap: true
     linkCable: false
 SCUS-94426:
-  name: "CTR - Crash Team Racing (USA)"
+  name: "CTR - Crash Team Racing"
+  saveName: "CTR - Crash Team Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-941-g2e64f77"
@@ -21696,13 +22746,15 @@ SCUS-94426:
     multitap: true
     linkCable: false
 SCUS-94459:
-  name: "CTR - Crash Team Racing (USA) (Demo)"
+  name: "CTR - Crash Team Racing (Demo)"
+  saveName: "CTR - Crash Team Racing (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     gpuPGXPPreserveProjFP: false # Causes holes in geometry.
 SLUS-01391:
-  name: "Cabela's Big Game Hunter - Ultimate Challenge (USA)"
+  name: "Cabela's Big Game Hunter - Ultimate Challenge"
+  saveName: "Cabela's Big Game Hunter - Ultimate Challenge (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21721,7 +22773,8 @@ SLUS-01391:
     multitap: false
     linkCable: false
 SLUS-01474:
-  name: "Cabela's Ultimate Deer Hunt - Open Season (USA)"
+  name: "Cabela's Ultimate Deer Hunt - Open Season"
+  saveName: "Cabela's Ultimate Deer Hunt - Open Season (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21740,7 +22793,8 @@ SLUS-01474:
     multitap: false
     linkCable: false
 SLPS-02079:
-  name: "Cadillac (Japan)"
+  name: "Cadillac"
+  saveName: "Cadillac (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -21763,7 +22817,8 @@ SLPS-02079:
     multitap: false
     linkCable: false
 SLES-01008:
-  name: "Caesars Palace (Europe)"
+  name: "Caesars Palace"
+  saveName: "Caesars Palace (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -21781,7 +22836,8 @@ SLES-01008:
     multitap: false
     linkCable: false
 SLUS-00285:
-  name: "Caesars Palace (USA)"
+  name: "Caesars Palace"
+  saveName: "Caesars Palace (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -21799,7 +22855,8 @@ SLUS-00285:
     multitap: false
     linkCable: false
 SLES-02476:
-  name: "Caesars Palace 2000 - Millennium Gold Edition (Europe)"
+  name: "Caesars Palace 2000 - Millennium Gold Edition"
+  saveName: "Caesars Palace 2000 - Millennium Gold Edition (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21818,7 +22875,8 @@ SLES-02476:
     multitap: true
     linkCable: false
 SLUS-01089:
-  name: "Caesars Palace 2000 - Millennium Gold Edition (USA)"
+  name: "Caesars Palace 2000 - Millennium Gold Edition"
+  saveName: "Caesars Palace 2000 - Millennium Gold Edition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21837,7 +22895,8 @@ SLUS-01089:
     multitap: true
     linkCable: false
 SLES-01486:
-  name: "Caesars Palace II (Europe)"
+  name: "Caesars Palace II"
+  saveName: "Caesars Palace II (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -21855,7 +22914,8 @@ SLES-01486:
     multitap: false
     linkCable: false
 SLUS-00780:
-  name: "Caesars Palace II (USA)"
+  name: "Caesars Palace II"
+  saveName: "Caesars Palace II (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -21873,7 +22933,8 @@ SLUS-00780:
     multitap: false
     linkCable: false
 LSP-200110:
-  name: "Calamity 1 - The Natural World (USA)"
+  name: "Calamity 1 - The Natural World"
+  saveName: "Calamity 1 - The Natural World (USA)"
   controllers:
     - DigitalController
   codes:
@@ -21895,7 +22956,8 @@ LSP-200110:
     multitap: false
     linkCable: false
 LSP-200220:
-  name: "Calamity 2 - People and Traditions (USA)"
+  name: "Calamity 2 - People and Traditions"
+  saveName: "Calamity 2 - People and Traditions (USA)"
   controllers:
     - DigitalController
   codes:
@@ -21917,7 +22979,8 @@ LSP-200220:
     multitap: false
     linkCable: false
 LSP-200330:
-  name: "Calamity 3 - Around the World (USA)"
+  name: "Calamity 3 - Around the World"
+  saveName: "Calamity 3 - Around the World (USA)"
   controllers:
     - DigitalController
   codes:
@@ -21939,7 +23002,8 @@ LSP-200330:
     multitap: false
     linkCable: false
 SLES-02614:
-  name: "Calcio Manager 2000 (Italy)"
+  name: "Calcio Manager 2000"
+  saveName: "Calcio Manager 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -21958,7 +23022,8 @@ SLES-02614:
     multitap: false
     linkCable: false
 SLPS-01071:
-  name: "Calcolo! (Japan)"
+  name: "Calcolo!"
+  saveName: "Calcolo! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -21976,11 +23041,13 @@ SLPS-01071:
     multitap: false
     linkCable: false
 SLPM-80147:
-  name: "Calcolo! (Japan) (Demo)"
+  name: "Calcolo! (Demo)"
+  saveName: "Calcolo! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 LSP-020190:
-  name: "Cali's Geo Tools (USA)"
+  name: "Cali's Geo Tools"
+  saveName: "Cali's Geo Tools (USA)"
   codes:
     - LSP-020190
     - LSP-903426
@@ -21992,7 +23059,8 @@ LSP-020190:
     languages:
       - English
 SLES-03921:
-  name: "California Surfing (Europe)"
+  name: "California Surfing"
+  saveName: "California Surfing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22011,7 +23079,8 @@ SLES-03921:
     multitap: true
     linkCable: false
 SLES-02950:
-  name: "California Watersports (Europe) (En,Fr,De)"
+  name: "California Watersports"
+  saveName: "California Watersports (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22032,7 +23101,8 @@ SLES-02950:
     multitap: true
     linkCable: false
 SLES-02293:
-  name: "Canal+ Premier Manager (Europe) (Fr,Es,It)"
+  name: "Canal+ Premier Manager"
+  saveName: "Canal+ Premier Manager (Europe) (Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22054,7 +23124,8 @@ SLES-02293:
     multitap: true
     linkCable: false
 SLPM-86748:
-  name: "Capcom Generation - Dai-1-shuu Gekitsuiou no Jidai (Japan)"
+  name: "Capcom Generation - Dai-1-shuu Gekitsuiou no Jidai"
+  saveName: "Capcom Generation - Dai-1-shuu Gekitsuiou no Jidai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22076,7 +23147,8 @@ SLPM-86748:
     multitap: false
     linkCable: false
 SLPM-86778:
-  name: "Capcom Generation - Dai-2-shuu Makai to Kishi (Japan)"
+  name: "Capcom Generation - Dai-2-shuu Makai to Kishi"
+  saveName: "Capcom Generation - Dai-2-shuu Makai to Kishi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22098,7 +23170,8 @@ SLPM-86778:
     multitap: false
     linkCable: false
 SLPS-01649:
-  name: "Capcom Generation - Dai-3-shuu Koko ni Rekishi Hajimaru (Japan)"
+  name: "Capcom Generation - Dai-3-shuu Koko ni Rekishi Hajimaru"
+  saveName: "Capcom Generation - Dai-3-shuu Koko ni Rekishi Hajimaru (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22117,7 +23190,8 @@ SLPS-01649:
     multitap: false
     linkCable: false
 SLPM-86814:
-  name: "Capcom Generation - Dai-4-shuu Kokou no Eiyuu (Japan)"
+  name: "Capcom Generation - Dai-4-shuu Kokou no Eiyuu"
+  saveName: "Capcom Generation - Dai-4-shuu Kokou no Eiyuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22139,7 +23213,8 @@ SLPM-86814:
     multitap: true
     linkCable: false
 SLPS-01725:
-  name: "Capcom Generation - Dai-5-shuu Kakutouka-tachi (Japan)"
+  name: "Capcom Generation - Dai-5-shuu Kakutouka-tachi"
+  saveName: "Capcom Generation - Dai-5-shuu Kakutouka-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22196,7 +23271,8 @@ SLPM-86811:
     multitap: false
     linkCable: false
 SLES-01881:
-  name: "Capcom Generations (Europe) (Disc 1) (Wings of Destiny)"
+  name: "Capcom Generations (Disc 1) (Wings of Destiny)"
+  saveName: "Capcom Generations (Europe) (Disc 1) (Wings of Destiny)"
   discSet:
     name: "Capcom Generations (Europe)"
     serials:
@@ -22222,7 +23298,8 @@ SLES-01881:
     multitap: false
     linkCable: false
 SLES-11881:
-  name: "Capcom Generations (Europe) (Disc 2) (Chronicles of Arthur)"
+  name: "Capcom Generations (Disc 2) (Chronicles of Arthur)"
+  saveName: "Capcom Generations (Europe) (Disc 2) (Chronicles of Arthur)"
   discSet:
     name: "Capcom Generations (Europe)"
     serials:
@@ -22248,7 +23325,8 @@ SLES-11881:
     multitap: false
     linkCable: false
 SLES-21881:
-  name: "Capcom Generations (Europe) (Disc 3) (The First Generation)"
+  name: "Capcom Generations (Disc 3) (The First Generation)"
+  saveName: "Capcom Generations (Europe) (Disc 3) (The First Generation)"
   discSet:
     name: "Capcom Generations (Europe)"
     serials:
@@ -22274,7 +23352,8 @@ SLES-21881:
     multitap: false
     linkCable: false
 SLES-31881:
-  name: "Capcom Generations (Europe) (Disc 4) (Blazing Guns)"
+  name: "Capcom Generations (Disc 4) (Blazing Guns)"
+  saveName: "Capcom Generations (Europe) (Disc 4) (Blazing Guns)"
   discSet:
     name: "Capcom Generations (Europe)"
     serials:
@@ -22300,7 +23379,8 @@ SLES-31881:
     multitap: false
     linkCable: false
 SLES-02098:
-  name: "Capcom Generations (Germany) (Disc 1) (Wings of Destiny)"
+  name: "Capcom Generations (Disc 1) (Wings of Destiny)"
+  saveName: "Capcom Generations (Germany) (Disc 1) (Wings of Destiny)"
   discSet:
     name: "Capcom Generations (Germany)"
     serials:
@@ -22325,7 +23405,8 @@ SLES-02098:
     multitap: false
     linkCable: false
 SLES-12098:
-  name: "Capcom Generations (Germany) (Disc 2) (Chronicles of Arthur)"
+  name: "Capcom Generations (Disc 2) (Chronicles of Arthur)"
+  saveName: "Capcom Generations (Germany) (Disc 2) (Chronicles of Arthur)"
   discSet:
     name: "Capcom Generations (Germany)"
     serials:
@@ -22350,7 +23431,8 @@ SLES-12098:
     multitap: false
     linkCable: false
 SLES-22098:
-  name: "Capcom Generations (Germany) (Disc 3) (The First Generation)"
+  name: "Capcom Generations (Disc 3) (The First Generation)"
+  saveName: "Capcom Generations (Germany) (Disc 3) (The First Generation)"
   discSet:
     name: "Capcom Generations (Germany)"
     serials:
@@ -22470,7 +23552,8 @@ SLPM-87365:
     multitap: false
     linkCable: false
 SLES-03889:
-  name: "Capcom vs. SNK - Millennium Fight 2000 Pro (Europe)"
+  name: "Capcom vs. SNK - Millennium Fight 2000 Pro"
+  saveName: "Capcom vs. SNK - Millennium Fight 2000 Pro (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22491,7 +23574,8 @@ SLES-03889:
     multitap: false
     linkCable: false
 SLPM-87053:
-  name: "Capcom vs. SNK - Millennium Fight 2000 Pro (Japan)"
+  name: "Capcom vs. SNK - Millennium Fight 2000 Pro"
+  saveName: "Capcom vs. SNK - Millennium Fight 2000 Pro (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-774-g5a1b008"
@@ -22515,11 +23599,13 @@ SLPM-87053:
     multitap: false
     linkCable: false
 SLPM-80632:
-  name: "Capcom vs. SNK - Millennium Fight 2000 Pro (Japan) (Demo)"
+  name: "Capcom vs. SNK - Millennium Fight 2000 Pro (Demo)"
+  saveName: "Capcom vs. SNK - Millennium Fight 2000 Pro (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01476:
-  name: "Capcom vs. SNK Pro (USA)"
+  name: "Capcom vs. SNK Pro"
+  saveName: "Capcom vs. SNK Pro (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -22543,7 +23629,8 @@ SLUS-01476:
     multitap: false
     linkCable: false
 SLPS-01567:
-  name: "Captain Commando (Japan)"
+  name: "Captain Commando"
+  saveName: "Captain Commando (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -22570,7 +23657,8 @@ SLPS-01567:
     multitap: true
     linkCable: false
 SLPM-86216:
-  name: "Captain Love (Japan)"
+  name: "Captain Love"
+  saveName: "Captain Love (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22589,7 +23677,8 @@ SLPM-86216:
     multitap: false
     linkCable: false
 SLPM-86767:
-  name: "Captain Love (Japan) (Major Wave)"
+  name: "Captain Love (Major Wave)"
+  saveName: "Captain Love (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22627,7 +23716,8 @@ SLPM-87260:
     multitap: false
     linkCable: false
 SLPM-87060:
-  name: "Captain Tsubasa - Aratanaru Densetsu Joshou (Japan)"
+  name: "Captain Tsubasa - Aratanaru Densetsu Joshou"
+  saveName: "Captain Tsubasa - Aratanaru Densetsu Joshou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22646,7 +23736,8 @@ SLPM-87060:
     multitap: false
     linkCable: false
 SLPS-00310:
-  name: "Captain Tsubasa J - Get in the Tomorrow (Japan)"
+  name: "Captain Tsubasa J - Get in the Tomorrow"
+  saveName: "Captain Tsubasa J - Get in the Tomorrow (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -22664,7 +23755,8 @@ SLPS-00310:
     multitap: false
     linkCable: false
 SLUS-00494:
-  name: "Car and Driver Presents - Grand Tour Racing '98 (USA)"
+  name: "Car and Driver Presents - Grand Tour Racing '98"
+  saveName: "Car and Driver Presents - Grand Tour Racing '98 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -22686,7 +23778,8 @@ SLUS-00494:
     multitap: false
     linkCable: true
 SLPS-02561:
-  name: "Cardcaptor Sakura - Clow Card Magic (Japan)"
+  name: "Cardcaptor Sakura - Clow Card Magic"
+  saveName: "Cardcaptor Sakura - Clow Card Magic (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22705,7 +23798,8 @@ SLPS-02561:
     multitap: false
     linkCable: false
 SLPS-02560:
-  name: "Cardcaptor Sakura - Clow Card Magic (Japan) (Genteiban)"
+  name: "Cardcaptor Sakura - Clow Card Magic (Genteiban)"
+  saveName: "Cardcaptor Sakura - Clow Card Magic (Japan) (Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22724,7 +23818,8 @@ SLPS-02560:
     multitap: false
     linkCable: false
 SLUS-01379:
-  name: "Card Games (USA)"
+  name: "Card Games"
+  saveName: "Card Games (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -22746,7 +23841,8 @@ SLUS-01379:
     multitap: false
     linkCable: false
 SLES-03206:
-  name: "Card Shark (Europe)"
+  name: "Card Shark"
+  saveName: "Card Shark (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -22764,7 +23860,8 @@ SLES-03206:
     multitap: true
     linkCable: false
 SCES-01043:
-  name: "Cardinal Syn (Europe)"
+  name: "Cardinal Syn"
+  saveName: "Cardinal Syn (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22783,7 +23880,8 @@ SCES-01043:
     multitap: true
     linkCable: false
 SCES-01077:
-  name: "Cardinal Syn (France)"
+  name: "Cardinal Syn"
+  saveName: "Cardinal Syn (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22802,7 +23900,8 @@ SCES-01077:
     multitap: true
     linkCable: false
 SCES-01205:
-  name: "Cardinal Syn (Italy)"
+  name: "Cardinal Syn"
+  saveName: "Cardinal Syn (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22821,7 +23920,8 @@ SCES-01205:
     multitap: true
     linkCable: false
 SCES-01206:
-  name: "Cardinal Syn (Spain)"
+  name: "Cardinal Syn"
+  saveName: "Cardinal Syn (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22840,7 +23940,8 @@ SCES-01206:
     multitap: true
     linkCable: false
 SCUS-94156:
-  name: "Cardinal Syn (USA)"
+  name: "Cardinal Syn"
+  saveName: "Cardinal Syn (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22859,11 +23960,13 @@ SCUS-94156:
     multitap: true
     linkCable: false
 SCUS-94265:
-  name: "Cardinal Syn (USA) (Demo)"
+  name: "Cardinal Syn (Demo)"
+  saveName: "Cardinal Syn (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01960:
-  name: "Carmageddon (Europe) (En,Fr,Es,It)"
+  name: "Carmageddon"
+  saveName: "Carmageddon (Europe) (En,Fr,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -22890,7 +23993,8 @@ SLES-01960:
     multitap: false
     linkCable: false
 SLES-01961:
-  name: "Carmageddon (Germany) (En,Fr,De,Es)"
+  name: "Carmageddon"
+  saveName: "Carmageddon (Germany) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22913,7 +24017,8 @@ SLES-01961:
     multitap: false
     linkCable: false
 SCES-00441:
-  name: "Carnage Heart (Europe) (En,Fr,De,Es,It)"
+  name: "Carnage Heart"
+  saveName: "Carnage Heart (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22936,7 +24041,8 @@ SCES-00441:
     multitap: false
     linkCable: false
 SLPS-00151:
-  name: "Carnage Heart (Japan)"
+  name: "Carnage Heart"
+  saveName: "Carnage Heart (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -22955,7 +24061,8 @@ SLPS-00151:
     multitap: false
     linkCable: false
 SCUS-94604:
-  name: "Carnage Heart (USA)"
+  name: "Carnage Heart"
+  saveName: "Carnage Heart (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -22977,7 +24084,8 @@ SCUS-94604:
     multitap: false
     linkCable: false
 SCUS-94964:
-  name: "Carnage Heart (USA) (Mission Briefing)"
+  name: "Carnage Heart (Mission Briefing)"
+  saveName: "Carnage Heart (USA) (Mission Briefing)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -22999,7 +24107,8 @@ SCUS-94964:
     multitap: false
     linkCable: false
 SLPS-00919:
-  name: "Carnage Heart EZ (Easy Zapping) (Japan)"
+  name: "Carnage Heart EZ (Easy Zapping)"
+  saveName: "Carnage Heart EZ (Easy Zapping) (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -23017,7 +24126,8 @@ SLPS-00919:
     multitap: false
     linkCable: false
 SLPM-80015:
-  name: "Carnage Heart Extra (Japan)"
+  name: "Carnage Heart Extra"
+  saveName: "Carnage Heart Extra (Japan)"
 SLPS-02540:
   name: "Carnage Heart [Artdink Best Choice]"
   controllers:
@@ -23038,7 +24148,8 @@ SLPS-02540:
     multitap: false
     linkCable: false
 SLPS-00837:
-  name: "Carom Shot (Japan)"
+  name: "Carom Shot"
+  saveName: "Carom Shot (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -23056,7 +24167,8 @@ SLPS-00837:
     multitap: false
     linkCable: false
 SLPS-01486:
-  name: "Carom Shot 2 (Japan)"
+  name: "Carom Shot 2"
+  saveName: "Carom Shot 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23077,11 +24189,13 @@ SLPS-01486:
     multitap: true
     linkCable: false
 SLPM-80267:
-  name: "Carom Shot 2 (Japan) (Demo)"
+  name: "Carom Shot 2 (Demo)"
+  saveName: "Carom Shot 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02935:
-  name: "Carton-kun (Japan)"
+  name: "Carton-kun"
+  saveName: "Carton-kun (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23100,11 +24214,13 @@ SLPS-02935:
     multitap: false
     linkCable: false
 SLPM-80572:
-  name: "Carton-kun (Japan) (Demo)"
+  name: "Carton-kun (Demo)"
+  saveName: "Carton-kun (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00045:
-  name: "Casper (Europe) (En,Fr,De)"
+  name: "Casper"
+  saveName: "Casper (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -23124,7 +24240,8 @@ SLES-00045:
     multitap: false
     linkCable: false
 SLUS-00162:
-  name: "Casper (USA)"
+  name: "Casper"
+  saveName: "Casper (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -23146,7 +24263,8 @@ SLUS-00162:
     multitap: false
     linkCable: false
 SLES-03113:
-  name: "Casper - Friends Around the World (Europe) (En,Fr,De,Es,It)"
+  name: "Casper - Friends Around the World"
+  saveName: "Casper - Friends Around the World (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23169,7 +24287,8 @@ SLES-03113:
     multitap: false
     linkCable: false
 SLUS-01245:
-  name: "Casper - Friends Around the World (USA)"
+  name: "Casper - Friends Around the World"
+  saveName: "Casper - Friends Around the World (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -23191,11 +24310,13 @@ SLUS-01245:
     multitap: false
     linkCable: false
 SCPS-45196:
-  name: "Castlevania - Symphony of the Night (Asia)"
+  name: "Castlevania - Symphony of the Night"
+  saveName: "Castlevania - Symphony of the Night (Asia)"
   controllers:
     - DigitalController
 SLES-00524:
-  name: "Castlevania - Symphony of the Night (Europe)"
+  name: "Castlevania - Symphony of the Night"
+  saveName: "Castlevania - Symphony of the Night (Europe)"
   controllers:
     - DigitalController
   settings:
@@ -23215,7 +24336,8 @@ SLES-00524:
     multitap: false
     linkCable: false
 SLUS-00067:
-  name: "Castlevania - Symphony of the Night (USA)"
+  name: "Castlevania - Symphony of the Night"
+  saveName: "Castlevania - Symphony of the Night (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -23238,7 +24360,8 @@ SLUS-00067:
     multitap: false
     linkCable: false
 SLPM-86754:
-  name: "Castlevania Chronicle - Akumajou Dracula (Japan)"
+  name: "Castlevania Chronicle - Akumajou Dracula"
+  saveName: "Castlevania Chronicle - Akumajou Dracula (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -23256,7 +24379,8 @@ SLPM-86754:
     multitap: false
     linkCable: false
 SLES-03532:
-  name: "Castlevania Chronicles (Europe)"
+  name: "Castlevania Chronicles"
+  saveName: "Castlevania Chronicles (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -23274,7 +24398,8 @@ SLES-03532:
     multitap: false
     linkCable: false
 SLUS-01384:
-  name: "Castlevania Chronicles (USA)"
+  name: "Castlevania Chronicles"
+  saveName: "Castlevania Chronicles (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -23295,7 +24420,8 @@ SLUS-01384:
     multitap: false
     linkCable: false
 SLES-01182:
-  name: "Castrol Honda Superbike Racing (Europe) (En,Fr,De,It)"
+  name: "Castrol Honda Superbike Racing"
+  saveName: "Castrol Honda Superbike Racing (Europe) (En,Fr,De,It)"
   compatibility:
     comments: "Intro logos require the software renderer to display correctly."
   controllers:
@@ -23324,7 +24450,8 @@ SLES-01182:
     multitap: false
     linkCable: false
 SLUS-00882:
-  name: "Castrol Honda Superbike Racing (USA)"
+  name: "Castrol Honda Superbike Racing"
+  saveName: "Castrol Honda Superbike Racing (USA)"
   compatibility:
     rating: NoIssues
     comments: "Intro logos require the software renderer to display correctly."
@@ -23351,7 +24478,8 @@ SLUS-00882:
     multitap: false
     linkCable: false
 SLES-02942:
-  name: "Castrol Honda VTR (Europe) (En,Fr,De,It)"
+  name: "Castrol Honda VTR"
+  saveName: "Castrol Honda VTR (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23374,7 +24502,8 @@ SLES-02942:
     multitap: false
     linkCable: false
 SLUS-01579:
-  name: "Cat in the Hat, The (USA)"
+  name: "Cat in the Hat, The"
+  saveName: "Cat in the Hat, The (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23393,7 +24522,8 @@ SLUS-01579:
     multitap: false
     linkCable: false
 SLPS-00908:
-  name: "Cat the Ripper - 13Ninme no Tanteishi (Japan)"
+  name: "Cat the Ripper - 13Ninme no Tanteishi"
+  saveName: "Cat the Ripper - 13Ninme no Tanteishi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -23429,7 +24559,8 @@ SLPS-02864:
     multitap: false
     linkCable: false
 SLES-02825:
-  name: "Catan - Die erste Insel (Germany)"
+  name: "Catan - Die erste Insel"
+  saveName: "Catan - Die erste Insel (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23448,7 +24579,8 @@ SLES-02825:
     multitap: true
     linkCable: false
 SLPS-01081:
-  name: "Cellophanes (Japan)"
+  name: "Cellophanes"
+  saveName: "Cellophanes (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23467,7 +24599,8 @@ SLPS-01081:
     multitap: false
     linkCable: false
 SCPS-10013:
-  name: "Center Shiken Trial - Eigo no Tetsujin (Japan)"
+  name: "Center Shiken Trial - Eigo no Tetsujin"
+  saveName: "Center Shiken Trial - Eigo no Tetsujin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -23485,7 +24618,8 @@ SCPS-10013:
     multitap: false
     linkCable: false
 SLES-01664:
-  name: "Centipede (Europe) (En,Es,Sv)"
+  name: "Centipede"
+  saveName: "Centipede (Europe) (En,Es,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23506,7 +24640,8 @@ SLES-01664:
     multitap: false
     linkCable: false
 SLES-01900:
-  name: "Centipede (Europe) (Fr,De,It,Nl)"
+  name: "Centipede"
+  saveName: "Centipede (Europe) (Fr,De,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23528,7 +24663,8 @@ SLES-01900:
     multitap: false
     linkCable: false
 SLUS-00807:
-  name: "Centipede (USA)"
+  name: "Centipede"
+  saveName: "Centipede (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -23551,11 +24687,13 @@ SLUS-00807:
     multitap: false
     linkCable: false
 SCED-01992:
-  name: "Cha Cha Special 04-99 Demo (Belgium, Netherlands) (En,Fr,Nl)"
+  name: "Cha Cha Special 04-99 Demo"
+  saveName: "Cha Cha Special 04-99 Demo (Belgium, Netherlands) (En,Fr,Nl)"
   metadata:
     genre: "** DEMO **"
 SLPS-02422:
-  name: "Chakushin Melody Damon (Japan)"
+  name: "Chakushin Melody Damon"
+  saveName: "Chakushin Melody Damon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23574,7 +24712,8 @@ SLPS-02422:
     multitap: false
     linkCable: false
 SLPS-02847:
-  name: "Chakushin Melody Damon Gold (Japan)"
+  name: "Chakushin Melody Damon Gold"
+  saveName: "Chakushin Melody Damon Gold (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23593,7 +24732,8 @@ SLPS-02847:
     multitap: false
     linkCable: false
 SLPS-02556:
-  name: "Chakushin Melody Damon Volume.2 (Japan)"
+  name: "Chakushin Melody Damon Volume.2"
+  saveName: "Chakushin Melody Damon Volume.2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23612,7 +24752,8 @@ SLPS-02556:
     multitap: false
     linkCable: false
 SLPS-02601:
-  name: "Chakushin Melody Damon Volume.3 (Japan)"
+  name: "Chakushin Melody Damon Volume.3"
+  saveName: "Chakushin Melody Damon Volume.3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23631,7 +24772,8 @@ SLPS-02601:
     multitap: false
     linkCable: false
 SLPS-02707:
-  name: "Chakushin Melody Damon Volume.4 (Japan)"
+  name: "Chakushin Melody Damon Volume.4"
+  saveName: "Chakushin Melody Damon Volume.4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23650,7 +24792,8 @@ SLPS-02707:
     multitap: false
     linkCable: false
 SLPM-86617:
-  name: "Champion Wrestler - Jikkyou Live (Japan)"
+  name: "Champion Wrestler - Jikkyou Live"
+  saveName: "Champion Wrestler - Jikkyou Live (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -23671,7 +24814,8 @@ SLPM-86617:
     multitap: true
     linkCable: false
 SLES-02775:
-  name: "Championship Bass (Europe)"
+  name: "Championship Bass"
+  saveName: "Championship Bass (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23690,7 +24834,8 @@ SLES-02775:
     multitap: false
     linkCable: false
 SLPS-02674:
-  name: "Championship Bass (Japan)"
+  name: "Championship Bass"
+  saveName: "Championship Bass (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23709,7 +24854,8 @@ SLPS-02674:
     multitap: false
     linkCable: false
 SLUS-01084:
-  name: "Championship Bass (USA)"
+  name: "Championship Bass"
+  saveName: "Championship Bass (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23728,7 +24874,8 @@ SLUS-01084:
     multitap: false
     linkCable: false
 SLES-03634:
-  name: "Championship Manager Quiz (Europe)"
+  name: "Championship Manager Quiz"
+  saveName: "Championship Manager Quiz (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23747,7 +24894,8 @@ SLES-03634:
     multitap: false
     linkCable: false
 SLES-03252:
-  name: "Championship Motocross 2001 featuring Ricky Carmichael (Europe)"
+  name: "Championship Motocross 2001 featuring Ricky Carmichael"
+  saveName: "Championship Motocross 2001 featuring Ricky Carmichael (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23766,7 +24914,8 @@ SLES-03252:
     multitap: false
     linkCable: false
 SLUS-01230:
-  name: "Championship Motocross 2001 featuring Ricky Carmichael (USA)"
+  name: "Championship Motocross 2001 featuring Ricky Carmichael"
+  saveName: "Championship Motocross 2001 featuring Ricky Carmichael (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -23788,7 +24937,8 @@ SLUS-01230:
     multitap: false
     linkCable: false
 SLES-02200:
-  name: "Championship Motocross featuring Ricky Carmichael (Europe)"
+  name: "Championship Motocross featuring Ricky Carmichael"
+  saveName: "Championship Motocross featuring Ricky Carmichael (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23807,11 +24957,13 @@ SLES-02200:
     multitap: false
     linkCable: false
 SLED-02385:
-  name: "Championship Motocross featuring Ricky Carmichael (Europe) (Demo)"
+  name: "Championship Motocross featuring Ricky Carmichael (Demo)"
+  saveName: "Championship Motocross featuring Ricky Carmichael (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00790:
-  name: "Championship Motocross featuring Ricky Carmichael (USA)"
+  name: "Championship Motocross featuring Ricky Carmichael"
+  saveName: "Championship Motocross featuring Ricky Carmichael (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23830,7 +24982,8 @@ SLUS-00790:
     multitap: false
     linkCable: false
 SLES-03427:
-  name: "Championship Surfer (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Championship Surfer"
+  saveName: "Championship Surfer (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23854,7 +25007,8 @@ SLES-03427:
     multitap: false
     linkCable: false
 SLUS-01216:
-  name: "Championship Surfer (USA)"
+  name: "Championship Surfer"
+  saveName: "Championship Surfer (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23892,7 +25046,8 @@ SCPS-45480:
     multitap: false
     linkCable: false
 SLES-03107:
-  name: "Chaos Break (Europe) (En,Fr,De,It)"
+  name: "Chaos Break"
+  saveName: "Chaos Break (Europe) (En,Fr,De,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -23917,7 +25072,8 @@ SLES-03107:
     multitap: false
     linkCable: false
 SLPM-86363:
-  name: "Chaos Break (Japan)"
+  name: "Chaos Break"
+  saveName: "Chaos Break (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-930-gcb66889"
@@ -23939,7 +25095,8 @@ SLPM-86363:
     multitap: false
     linkCable: false
 SLPS-00168:
-  name: "Chaos Control (Japan)"
+  name: "Chaos Control"
+  saveName: "Chaos Control (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -23958,7 +25115,8 @@ SLPS-00168:
     multitap: false
     linkCable: false
 SLPS-02415:
-  name: "Charumera (Japan)"
+  name: "Charumera"
+  saveName: "Charumera (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -23999,7 +25157,8 @@ SLPS-91519:
     multitap: false
     linkCable: false
 SCES-02812:
-  name: "Chase the Express (Europe) (Disc 1)"
+  name: "Chase the Express (Disc 1)"
+  saveName: "Chase the Express (Europe) (Disc 1)"
   discSet:
     name: "Chase the Express (Europe)"
     serials:
@@ -24023,7 +25182,8 @@ SCES-02812:
     multitap: false
     linkCable: false
 SCES-12812:
-  name: "Chase the Express (Europe) (Disc 2)"
+  name: "Chase the Express (Disc 2)"
+  saveName: "Chase the Express (Europe) (Disc 2)"
   discSet:
     name: "Chase the Express (Europe)"
     serials:
@@ -24047,7 +25207,8 @@ SCES-12812:
     multitap: false
     linkCable: false
 SCES-02813:
-  name: "Chase the Express (France) (Disc 1)"
+  name: "Chase the Express (Disc 1)"
+  saveName: "Chase the Express (France) (Disc 1)"
   discSet:
     name: "Chase the Express (France)"
     serials:
@@ -24071,7 +25232,8 @@ SCES-02813:
     multitap: false
     linkCable: false
 SCES-12813:
-  name: "Chase the Express (France) (Disc 2)"
+  name: "Chase the Express (Disc 2)"
+  saveName: "Chase the Express (France) (Disc 2)"
   discSet:
     name: "Chase the Express (France)"
     serials:
@@ -24095,7 +25257,8 @@ SCES-12813:
     multitap: false
     linkCable: false
 SCES-02814:
-  name: "Chase the Express (Germany) (Disc 1)"
+  name: "Chase the Express (Disc 1)"
+  saveName: "Chase the Express (Germany) (Disc 1)"
   discSet:
     name: "Chase the Express (Germany)"
     serials:
@@ -24119,7 +25282,8 @@ SCES-02814:
     multitap: false
     linkCable: false
 SCES-12814:
-  name: "Chase the Express (Germany) (Disc 2)"
+  name: "Chase the Express (Disc 2)"
+  saveName: "Chase the Express (Germany) (Disc 2)"
   discSet:
     name: "Chase the Express (Germany)"
     serials:
@@ -24143,7 +25307,8 @@ SCES-12814:
     multitap: false
     linkCable: false
 SCES-02815:
-  name: "Chase the Express (Italy) (Disc 1)"
+  name: "Chase the Express (Disc 1)"
+  saveName: "Chase the Express (Italy) (Disc 1)"
   discSet:
     name: "Chase the Express (Italy)"
     serials:
@@ -24167,7 +25332,8 @@ SCES-02815:
     multitap: false
     linkCable: false
 SCES-12815:
-  name: "Chase the Express (Italy) (Disc 2)"
+  name: "Chase the Express (Disc 2)"
+  saveName: "Chase the Express (Italy) (Disc 2)"
   discSet:
     name: "Chase the Express (Italy)"
     serials:
@@ -24191,15 +25357,18 @@ SCES-12815:
     multitap: false
     linkCable: false
 PAPX-90107:
-  name: "Chase the Express (Japan) (Demo 1)"
+  name: "Chase the Express (Demo 1)"
+  saveName: "Chase the Express (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PCPX-96189:
-  name: "Chase the Express (Japan) (Demo 2)"
+  name: "Chase the Express (Demo 2)"
+  saveName: "Chase the Express (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-10109:
-  name: "Chase the Express (Japan, Asia) (Disc 1)"
+  name: "Chase the Express (Disc 1)"
+  saveName: "Chase the Express (Japan, Asia) (Disc 1)"
   discSet:
     name: "Chase the Express (Japan, Asia)"
     serials:
@@ -24226,7 +25395,8 @@ SCPS-10109:
     multitap: false
     linkCable: false
 SCPS-10110:
-  name: "Chase the Express (Japan, Asia) (Disc 2)"
+  name: "Chase the Express (Disc 2)"
+  saveName: "Chase the Express (Japan, Asia) (Disc 2)"
   discSet:
     name: "Chase the Express (Japan, Asia)"
     serials:
@@ -24253,7 +25423,8 @@ SCPS-10110:
     multitap: false
     linkCable: false
 SCES-02816:
-  name: "Chase the Express - El Expreso de la Muerte (Spain) (Disc 1)"
+  name: "Chase the Express - El Expreso de la Muerte (Disc 1)"
+  saveName: "Chase the Express - El Expreso de la Muerte (Spain) (Disc 1)"
   discSet:
     name: "Chase the Express - El Expreso de la Muerte (Spain)"
     serials:
@@ -24280,7 +25451,8 @@ SCES-02816:
     multitap: false
     linkCable: false
 SCES-12816:
-  name: "Chase the Express - El Expreso de la Muerte (Spain) (Disc 2)"
+  name: "Chase the Express - El Expreso de la Muerte (Disc 2)"
+  saveName: "Chase the Express - El Expreso de la Muerte (Spain) (Disc 2)"
   discSet:
     name: "Chase the Express - El Expreso de la Muerte (Spain)"
     serials:
@@ -24325,7 +25497,8 @@ SLPS-01251:
     multitap: false
     linkCable: false
 SLES-02917:
-  name: "Checkmate (Europe)"
+  name: "Checkmate"
+  saveName: "Checkmate (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24344,7 +25517,8 @@ SLES-02917:
     multitap: false
     linkCable: false
 SLPS-03136:
-  name: "Checkmate (Japan) (Renkaban)"
+  name: "Checkmate (Renkaban)"
+  saveName: "Checkmate (Japan) (Renkaban)"
   controllers:
     - DigitalController
   metadata:
@@ -24362,7 +25536,8 @@ SLPS-03136:
     multitap: false
     linkCable: false
 SLES-04053:
-  name: "Checkmate II (Europe)"
+  name: "Checkmate II"
+  saveName: "Checkmate II (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -24380,7 +25555,8 @@ SLES-04053:
     multitap: false
     linkCable: false
 SLES-00053:
-  name: "Cheesy (Europe) (En,Fr)"
+  name: "Cheesy"
+  saveName: "Cheesy (Europe) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -24399,7 +25575,8 @@ SLES-00053:
     multitap: false
     linkCable: false
 SLPS-00893:
-  name: "Cheesy (Japan)"
+  name: "Cheesy"
+  saveName: "Cheesy (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -24417,7 +25594,8 @@ SLPS-00893:
     multitap: false
     linkCable: false
 SLUS-01400:
-  name: "Chess (USA)"
+  name: "Chess"
+  saveName: "Chess (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -24435,7 +25613,8 @@ SLUS-01400:
     multitap: false
     linkCable: false
 SLPS-02624:
-  name: "Chess 2000 (Japan)"
+  name: "Chess 2000"
+  saveName: "Chess 2000 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -24453,7 +25632,8 @@ SLPS-02624:
     multitap: false
     linkCable: false
 SLES-00187:
-  name: "Chessmaster 3-D, The (Europe)"
+  name: "Chessmaster 3-D, The"
+  saveName: "Chessmaster 3-D, The (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -24471,7 +25651,8 @@ SLES-00187:
     multitap: false
     linkCable: false
 SLUS-00052:
-  name: "Chessmaster 3-D, The (USA)"
+  name: "Chessmaster 3-D, The"
+  saveName: "Chessmaster 3-D, The (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -24489,7 +25670,8 @@ SLUS-00052:
     multitap: false
     linkCable: false
 SLES-02117:
-  name: "Chessmaster II (Europe)"
+  name: "Chessmaster II"
+  saveName: "Chessmaster II (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -24507,7 +25689,8 @@ SLES-02117:
     multitap: false
     linkCable: false
 SLUS-00886:
-  name: "Chessmaster II (USA)"
+  name: "Chessmaster II"
+  saveName: "Chessmaster II (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -24525,7 +25708,8 @@ SLUS-00886:
     multitap: false
     linkCable: false
 SLPS-00331:
-  name: "Chessmaster, The (Japan)"
+  name: "Chessmaster, The"
+  saveName: "Chessmaster, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -24543,7 +25727,8 @@ SLPS-00331:
     multitap: false
     linkCable: false
 SCES-00347:
-  name: "Chevaliers de Baphomet, Les (France)"
+  name: "Chevaliers de Baphomet, Les"
+  saveName: "Chevaliers de Baphomet, Les (France)"
   controllers:
     - DigitalController
   metadata:
@@ -24561,7 +25746,8 @@ SCES-00347:
     multitap: false
     linkCable: false
 SLES-03582:
-  name: "Chi Vuol Essere Miliardario (Italy)"
+  name: "Chi Vuol Essere Miliardario"
+  saveName: "Chi Vuol Essere Miliardario (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24580,7 +25766,8 @@ SLES-03582:
     multitap: true
     linkCable: false
 SLES-03917:
-  name: "Chi Vuol Essere Milionario - Seconda Edizione (Italy)"
+  name: "Chi Vuol Essere Milionario - Seconda Edizione"
+  saveName: "Chi Vuol Essere Milionario - Seconda Edizione (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24599,7 +25786,8 @@ SLES-03917:
     multitap: false
     linkCable: false
 SLPS-01834:
-  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 1) (Go! Go! Casino) (Shokai Tokuten Reinhart Genteiban)"
+  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Disc 1) (Go! Go! Casino) (Shokai Tokuten Reinhart Genteiban)"
+  saveName: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 1) (Go! Go! Casino) (Shokai Tokuten Reinhart Genteiban)"
   discSet:
     name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Shokai Tokuten Reinhart Genteiban)"
     serials:
@@ -24622,7 +25810,8 @@ SLPS-01834:
     multitap: false
     linkCable: false
 SLPS-02025:
-  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 1) (Go! Go! Casino) (Shokai Tokuten Yan Genteiban)"
+  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Disc 1) (Go! Go! Casino) (Shokai Tokuten Yan Genteiban)"
+  saveName: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 1) (Go! Go! Casino) (Shokai Tokuten Yan Genteiban)"
   discSet:
     name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Shokai Tokuten Yan Genteiban)"
     serials:
@@ -24645,7 +25834,8 @@ SLPS-02025:
     multitap: false
     linkCable: false
 SLPS-01835:
-  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 2) (Let's Sugoroku) (Shokai Tokuten Reinhart Genteiban)"
+  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Disc 2) (Let's Sugoroku) (Shokai Tokuten Reinhart Genteiban)"
+  saveName: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 2) (Let's Sugoroku) (Shokai Tokuten Reinhart Genteiban)"
   discSet:
     name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Shokai Tokuten Reinhart Genteiban)"
     serials:
@@ -24668,7 +25858,8 @@ SLPS-01835:
     multitap: false
     linkCable: false
 SLPS-02026:
-  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 2) (Let's Surogoku) (Shokai Tokuten Yan Genteiban)"
+  name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Disc 2) (Let's Surogoku) (Shokai Tokuten Yan Genteiban)"
+  saveName: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Disc 2) (Let's Surogoku) (Shokai Tokuten Yan Genteiban)"
   discSet:
     name: "Chibi Chara Game - Ginga Eiyuu Densetsu (Japan) (Shokai Tokuten Yan Genteiban)"
     serials:
@@ -24712,7 +25903,8 @@ SLPS-02027:
     multitap: false
     linkCable: false
 SLPS-00166:
-  name: "Chibi Maruko-chan - Maruko Enikki World (Japan)"
+  name: "Chibi Maruko-chan - Maruko Enikki World"
+  saveName: "Chibi Maruko-chan - Maruko Enikki World (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -24730,7 +25922,8 @@ SLPS-00166:
     multitap: false
     linkCable: false
 SLES-03188:
-  name: "Chicken Run (Europe)"
+  name: "Chicken Run"
+  saveName: "Chicken Run (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24749,7 +25942,8 @@ SLES-03188:
     multitap: false
     linkCable: false
 SLES-03285:
-  name: "Chicken Run (Europe) (Fr,De,Es,It)"
+  name: "Chicken Run"
+  saveName: "Chicken Run (Europe) (Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24771,7 +25965,8 @@ SLES-03285:
     multitap: false
     linkCable: false
 SLUS-01304:
-  name: "Chicken Run (USA)"
+  name: "Chicken Run"
+  saveName: "Chicken Run (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -24793,7 +25988,8 @@ SLUS-01304:
     multitap: false
     linkCable: false
 SLPS-01926:
-  name: "Chiisana Kyojin Microman (Japan)"
+  name: "Chiisana Kyojin Microman"
+  saveName: "Chiisana Kyojin Microman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24815,7 +26011,8 @@ SLPS-01926:
     multitap: false
     linkCable: false
 SLPS-02750:
-  name: "Chiisana Oukoku Erutoria (Japan)"
+  name: "Chiisana Oukoku Erutoria"
+  saveName: "Chiisana Oukoku Erutoria (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24834,7 +26031,8 @@ SLPS-02750:
     multitap: false
     linkCable: false
 SLPM-86845:
-  name: "Chiki Chiki Machine Mou Race - Wacky Races (Japan)"
+  name: "Chiki Chiki Machine Mou Race - Wacky Races"
+  saveName: "Chiki Chiki Machine Mou Race - Wacky Races (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24854,11 +26052,13 @@ SLPM-86845:
     multitap: false
     linkCable: false
 SLED-01194:
-  name: "Chill (Europe) (Demo)"
+  name: "Chill (Demo)"
+  saveName: "Chill (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00711:
-  name: "Chill (Europe) (En,Fr,De,Es,It)"
+  name: "Chill"
+  saveName: "Chill (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24881,7 +26081,8 @@ SLES-00711:
     multitap: false
     linkCable: false
 SLES-02297:
-  name: "China - The Forbidden City (Europe) (En,Es,Nl,Sv)"
+  name: "China - The Forbidden City"
+  saveName: "China - The Forbidden City (Europe) (En,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -24902,7 +26103,8 @@ SLES-02297:
     multitap: false
     linkCable: false
 SLES-02090:
-  name: "Chine - Intrigue dans la Cite Interdite (France)"
+  name: "Chine - Intrigue dans la Cite Interdite"
+  saveName: "Chine - Intrigue dans la Cite Interdite (France)"
   controllers:
     - DigitalController
   metadata:
@@ -24920,7 +26122,8 @@ SLES-02090:
     multitap: false
     linkCable: false
 SLPS-02788:
-  name: "Chinmoku no Kantai - The Silent Service (Japan)"
+  name: "Chinmoku no Kantai - The Silent Service"
+  saveName: "Chinmoku no Kantai - The Silent Service (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -24939,13 +26142,15 @@ SLPS-02788:
     multitap: false
     linkCable: false
 SLPM-80433:
-  name: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Japan) (Demo)"
+  name: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Demo)"
+  saveName: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SLPS-01853:
-  name: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Japan) (Rev 1)"
+  name: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph"
+  saveName: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Japan) (Rev 1)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -24966,7 +26171,8 @@ SLPS-01853:
     multitap: false
     linkCable: false
 SLPS-01893:
-  name: "Chivas 1-2-3 - Destiny! Unmei wo Kaeru Mono! (Japan)"
+  name: "Chivas 1-2-3 - Destiny! Unmei wo Kaeru Mono!"
+  saveName: "Chivas 1-2-3 - Destiny! Unmei wo Kaeru Mono! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25008,7 +26214,8 @@ SCPS-45473:
     multitap: false
     linkCable: false
 SLES-02079:
-  name: "Chocobo Racing (Europe)"
+  name: "Chocobo Racing"
+  saveName: "Chocobo Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25028,7 +26235,8 @@ SLES-02079:
     multitap: false
     linkCable: false
 SLUS-00844:
-  name: "Chocobo Racing (USA)"
+  name: "Chocobo Racing"
+  saveName: "Chocobo Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -25071,7 +26279,8 @@ SCPS-45392:
     multitap: false
     linkCable: false
 SLPS-01951:
-  name: "Chocobo Racing - Genkai e no Road (Japan)"
+  name: "Chocobo Racing - Genkai e no Road"
+  saveName: "Chocobo Racing - Genkai e no Road (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -25117,7 +26326,8 @@ SCPS-45472:
     multitap: false
     linkCable: false
 SLPS-02520:
-  name: "Chocobo Stallion (Japan)"
+  name: "Chocobo Stallion"
+  saveName: "Chocobo Stallion (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25139,7 +26349,8 @@ SLPS-02520:
     multitap: false
     linkCable: false
 SLPS-01234:
-  name: "Chocobo no Fushigi na Dungeon (Japan)"
+  name: "Chocobo no Fushigi na Dungeon"
+  saveName: "Chocobo no Fushigi na Dungeon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -25200,7 +26411,8 @@ SCPS-45351:
     multitap: false
     linkCable: false
 SCPS-45371:
-  name: "Chocobo no Fushigi na Dungeon 2 (Japan, Asia) (Disc 1)"
+  name: "Chocobo no Fushigi na Dungeon 2 (Disc 1)"
+  saveName: "Chocobo no Fushigi na Dungeon 2 (Japan, Asia) (Disc 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25240,7 +26452,8 @@ SLPS-91439:
     multitap: false
     linkCable: false
 SLUS-00814:
-  name: "Chocobo's Dungeon 2 (USA)"
+  name: "Chocobo's Dungeon 2"
+  saveName: "Chocobo's Dungeon 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -25262,7 +26475,8 @@ SLUS-00814:
     multitap: false
     linkCable: false
 SLPS-03400:
-  name: "Chocolate Kiss (Japan)"
+  name: "Chocolate Kiss"
+  saveName: "Chocolate Kiss (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25281,7 +26495,8 @@ SLPS-03400:
     multitap: false
     linkCable: false
 SLPS-00242:
-  name: "Choro Q (Japan)"
+  name: "Choro Q"
+  saveName: "Choro Q (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -25320,7 +26535,8 @@ SCPS-45018:
     multitap: false
     linkCable: false
 SLPS-00710:
-  name: "Choro Q 2 (Japan)"
+  name: "Choro Q 2"
+  saveName: "Choro Q 2 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2553-g3ed42977"
@@ -25346,7 +26562,8 @@ SLPS-00710:
     multitap: false
     linkCable: false
 SLPS-01244:
-  name: "Choro Q 3 (Japan)"
+  name: "Choro Q 3"
+  saveName: "Choro Q 3 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2553-g3ed42977"
@@ -25391,7 +26608,8 @@ SLPM-87338:
     multitap: false
     linkCable: false
 SLPS-01140:
-  name: "Choro Q Jet - Rainbow Wings (Japan)"
+  name: "Choro Q Jet - Rainbow Wings"
+  saveName: "Choro Q Jet - Rainbow Wings (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25432,7 +26650,8 @@ SLPM-87337:
     multitap: false
     linkCable: false
 SLPS-01436:
-  name: "Choro Q Marine - Q-Boat (Japan)"
+  name: "Choro Q Marine - Q-Boat"
+  saveName: "Choro Q Marine - Q-Boat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25455,7 +26674,8 @@ SLPS-01436:
     multitap: false
     linkCable: false
 SLPM-80227:
-  name: "Choro Q Marine - Q-Boat (Japan) (Demo)"
+  name: "Choro Q Marine - Q-Boat (Demo)"
+  saveName: "Choro Q Marine - Q-Boat (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-87339:
@@ -25478,7 +26698,8 @@ SLPM-87339:
     multitap: false
     linkCable: false
 SLPS-91015:
-  name: "Choro Q Ver. 1.02 (Japan)"
+  name: "Choro Q Ver. 1.02"
+  saveName: "Choro Q Ver. 1.02 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -25515,7 +26736,8 @@ SLPM-87336:
     multitap: false
     linkCable: false
 SLPM-86902:
-  name: "Choro Q Wonderful! (Japan)"
+  name: "Choro Q Wonderful!"
+  saveName: "Choro Q Wonderful! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -25540,7 +26762,8 @@ SLPM-86902:
     multitap: false
     linkCable: false
 SLPM-86873:
-  name: "Chou Aniki - Kyuukyoku Muteki Ginga Saikyou Otoko (Japan)"
+  name: "Chou Aniki - Kyuukyoku Muteki Ginga Saikyou Otoko"
+  saveName: "Chou Aniki - Kyuukyoku Muteki Ginga Saikyou Otoko (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -25561,7 +26784,8 @@ SLPM-86873:
     multitap: false
     linkCable: false
 SLPM-86299:
-  name: "Chou Hatsumei Boy Kanipan - Hirameki Wonderland (Japan)"
+  name: "Chou Hatsumei Boy Kanipan - Hirameki Wonderland"
+  saveName: "Chou Hatsumei Boy Kanipan - Hirameki Wonderland (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25580,7 +26804,8 @@ SLPM-86299:
     multitap: false
     linkCable: false
 SLPS-02005:
-  name: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Japan) (Disc 1)"
+  name: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Disc 1)"
+  saveName: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Japan) (Disc 1)"
   discSet:
     name: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Japan)"
     serials:
@@ -25603,7 +26828,8 @@ SLPS-02005:
     multitap: false
     linkCable: false
 SLPS-02006:
-  name: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Japan) (Disc 2)"
+  name: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Disc 2)"
+  saveName: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Japan) (Disc 2)"
   discSet:
     name: "Chou Jikuu Yousai Macross - Ai Oboete Imasu ka (Japan)"
     serials:
@@ -25626,7 +26852,8 @@ SLPS-02006:
     multitap: false
     linkCable: false
 SLPS-02490:
-  name: "Chou Jiryoku Senshi Microman - Generation 2000 (Japan)"
+  name: "Chou Jiryoku Senshi Microman - Generation 2000"
+  saveName: "Chou Jiryoku Senshi Microman - Generation 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25645,7 +26872,8 @@ SLPS-02490:
     multitap: false
     linkCable: false
 SLPS-01368:
-  name: "Chou Mashin Eiyuuden Wataru - Another Step (Japan)"
+  name: "Chou Mashin Eiyuuden Wataru - Another Step"
+  saveName: "Chou Mashin Eiyuuden Wataru - Another Step (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -25663,7 +26891,8 @@ SLPS-01368:
     multitap: false
     linkCable: false
 SLPS-02123:
-  name: "Chou Nazoou (Japan)"
+  name: "Chou Nazoou"
+  saveName: "Chou Nazoou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25682,7 +26911,8 @@ SLPS-02123:
     multitap: false
     linkCable: false
 SLPS-01871:
-  name: "Chou Sentou Kyuugi Vanborg (Japan)"
+  name: "Chou Sentou Kyuugi Vanborg"
+  saveName: "Chou Sentou Kyuugi Vanborg (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25701,7 +26931,8 @@ SLPS-01871:
     multitap: false
     linkCable: false
 SLPS-00935:
-  name: "Chou-Kousoku Gran Doll (Japan)"
+  name: "Chou-Kousoku Gran Doll"
+  saveName: "Chou-Kousoku Gran Doll (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -25721,7 +26952,8 @@ SLPS-00935:
     multitap: false
     linkCable: false
 SLPS-00869:
-  name: "Chou-Kousoku Gran Doll (Japan) (Disc 1) (Premium Edition)"
+  name: "Chou-Kousoku Gran Doll (Disc 1) (Premium Edition)"
+  saveName: "Chou-Kousoku Gran Doll (Japan) (Disc 1) (Premium Edition)"
   discSet:
     name: "Chou-Kousoku Gran Doll (Japan) (Premium Edition)"
     serials:
@@ -25746,7 +26978,8 @@ SLPS-00869:
     multitap: false
     linkCable: false
 SLPS-00870:
-  name: "Chou-Kousoku Gran Doll (Japan) (Disc 2) (Tokusei Premium Disc) (Premium Edition)"
+  name: "Chou-Kousoku Gran Doll (Disc 2) (Tokusei Premium Disc) (Premium Edition)"
+  saveName: "Chou-Kousoku Gran Doll (Japan) (Disc 2) (Tokusei Premium Disc) (Premium Edition)"
   discSet:
     name: "Chou-Kousoku Gran Doll (Japan) (Premium Edition)"
     serials:
@@ -25771,7 +27004,8 @@ SLPS-00870:
     multitap: false
     linkCable: false
 SLPS-00527:
-  name: "Choujin Gakuen - Gowcaizer (Japan)"
+  name: "Choujin Gakuen - Gowcaizer"
+  saveName: "Choujin Gakuen - Gowcaizer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -25789,11 +27023,14 @@ SLPS-00527:
     multitap: false
     linkCable: false
 SLPM-80396:
-  name: "Chouzetsu Daigirin '99-nen Natsu-ban (Japan)"
+  name: "Chouzetsu Daigirin '99-nen Natsu-ban"
+  saveName: "Chouzetsu Daigirin '99-nen Natsu-ban (Japan)"
 SLPM-80519:
-  name: "Chouzetsu Daigirin 2000-nen Fuyu-ban (Japan)"
+  name: "Chouzetsu Daigirin 2000-nen Fuyu-ban"
+  saveName: "Chouzetsu Daigirin 2000-nen Fuyu-ban (Japan)"
 SLES-02948:
-  name: "Chris Kamara's Street Soccer (Europe)"
+  name: "Chris Kamara's Street Soccer"
+  saveName: "Chris Kamara's Street Soccer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -25812,7 +27049,8 @@ SLES-02948:
     multitap: true
     linkCable: false
 SLES-00165:
-  name: "Chronicles of the Sword (Europe) (Disc 1)"
+  name: "Chronicles of the Sword (Disc 1)"
+  saveName: "Chronicles of the Sword (Europe) (Disc 1)"
   discSet:
     name: "Chronicles of the Sword (Europe)"
     serials:
@@ -25835,7 +27073,8 @@ SLES-00165:
     multitap: false
     linkCable: false
 SLES-10165:
-  name: "Chronicles of the Sword (Europe) (Disc 2)"
+  name: "Chronicles of the Sword (Disc 2)"
+  saveName: "Chronicles of the Sword (Europe) (Disc 2)"
   discSet:
     name: "Chronicles of the Sword (Europe)"
     serials:
@@ -25858,7 +27097,8 @@ SLES-10165:
     multitap: false
     linkCable: false
 SLES-00166:
-  name: "Chronicles of the Sword (France) (Disc 1)"
+  name: "Chronicles of the Sword (Disc 1)"
+  saveName: "Chronicles of the Sword (France) (Disc 1)"
   discSet:
     name: "Chronicles of the Sword (France)"
     serials:
@@ -25882,7 +27122,8 @@ SLES-00166:
     multitap: false
     linkCable: false
 SLES-10166:
-  name: "Chronicles of the Sword (France) (Disc 2)"
+  name: "Chronicles of the Sword (Disc 2)"
+  saveName: "Chronicles of the Sword (France) (Disc 2)"
   discSet:
     name: "Chronicles of the Sword (France)"
     serials:
@@ -25906,7 +27147,8 @@ SLES-10166:
     multitap: false
     linkCable: false
 SLES-00167:
-  name: "Chronicles of the Sword (Germany) (Disc 1)"
+  name: "Chronicles of the Sword (Disc 1)"
+  saveName: "Chronicles of the Sword (Germany) (Disc 1)"
   discSet:
     name: "Chronicles of the Sword (Germany)"
     serials:
@@ -25929,7 +27171,8 @@ SLES-00167:
     multitap: false
     linkCable: false
 SLES-10167:
-  name: "Chronicles of the Sword (Germany) (Disc 2)"
+  name: "Chronicles of the Sword (Disc 2)"
+  saveName: "Chronicles of the Sword (Germany) (Disc 2)"
   discSet:
     name: "Chronicles of the Sword (Germany)"
     serials:
@@ -25952,7 +27195,8 @@ SLES-10167:
     multitap: false
     linkCable: false
 SLES-00192:
-  name: "Chronicles of the Sword (Italy) (Disc 1)"
+  name: "Chronicles of the Sword (Disc 1)"
+  saveName: "Chronicles of the Sword (Italy) (Disc 1)"
   discSet:
     name: "Chronicles of the Sword (Italy)"
     serials:
@@ -25975,7 +27219,8 @@ SLES-00192:
     multitap: false
     linkCable: false
 SLES-10192:
-  name: "Chronicles of the Sword (Italy) (Disc 2)"
+  name: "Chronicles of the Sword (Disc 2)"
+  saveName: "Chronicles of the Sword (Italy) (Disc 2)"
   discSet:
     name: "Chronicles of the Sword (Italy)"
     serials:
@@ -25998,7 +27243,8 @@ SLES-10192:
     multitap: false
     linkCable: false
 SLES-00191:
-  name: "Chronicles of the Sword (Spain) (Disc 1)"
+  name: "Chronicles of the Sword (Disc 1)"
+  saveName: "Chronicles of the Sword (Spain) (Disc 1)"
   discSet:
     name: "Chronicles of the Sword (Spain)"
     serials:
@@ -26021,7 +27267,8 @@ SLES-00191:
     multitap: false
     linkCable: false
 SLES-10191:
-  name: "Chronicles of the Sword (Spain) (Disc 2)"
+  name: "Chronicles of the Sword (Disc 2)"
+  saveName: "Chronicles of the Sword (Spain) (Disc 2)"
   discSet:
     name: "Chronicles of the Sword (Spain)"
     serials:
@@ -26044,7 +27291,8 @@ SLES-10191:
     multitap: false
     linkCable: false
 SCUS-94700:
-  name: "Chronicles of the Sword (USA) (Disc 1)"
+  name: "Chronicles of the Sword (Disc 1)"
+  saveName: "Chronicles of the Sword (USA) (Disc 1)"
   discSet:
     name: "Chronicles of the Sword (USA)"
     serials:
@@ -26070,7 +27318,8 @@ SCUS-94700:
     multitap: false
     linkCable: false
 SCUS-94701:
-  name: "Chronicles of the Sword (USA) (Disc 2)"
+  name: "Chronicles of the Sword (Disc 2)"
+  saveName: "Chronicles of the Sword (USA) (Disc 2)"
   discSet:
     name: "Chronicles of the Sword (USA)"
     serials:
@@ -26118,7 +27367,8 @@ SCPS-45447:
     multitap: false
     linkCable: false
 SLPM-87395:
-  name: "Chrono Cross (Japan) (Disc 1)"
+  name: "Chrono Cross (Disc 1)"
+  saveName: "Chrono Cross (Japan) (Disc 1)"
   discSet:
     name: "Chrono Cross (Japan)"
     serials:
@@ -26156,7 +27406,8 @@ SLPM-87395:
     multitap: false
     linkCable: false
 SLPM-87396:
-  name: "Chrono Cross (Japan) (Disc 2)"
+  name: "Chrono Cross (Disc 2)"
+  saveName: "Chrono Cross (Japan) (Disc 2)"
   discSet:
     name: "Chrono Cross (Japan)"
     serials:
@@ -26192,7 +27443,8 @@ SLPM-87396:
     multitap: false
     linkCable: false
 SLUS-01041:
-  name: "Chrono Cross (USA) (Disc 1)"
+  name: "Chrono Cross (Disc 1)"
+  saveName: "Chrono Cross (USA) (Disc 1)"
   discSet:
     name: "Chrono Cross (USA)"
     serials:
@@ -26226,7 +27478,8 @@ SLUS-01041:
     multitap: false
     linkCable: false
 SLUS-01080:
-  name: "Chrono Cross (USA) (Disc 2)"
+  name: "Chrono Cross (Disc 2)"
+  saveName: "Chrono Cross (USA) (Disc 2)"
   discSet:
     name: "Chrono Cross (USA)"
     serials:
@@ -26279,7 +27532,8 @@ SCPS-45446:
     multitap: false
     linkCable: false
 SLPM-87374:
-  name: "Chrono Trigger (Japan)"
+  name: "Chrono Trigger"
+  saveName: "Chrono Trigger (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -26303,7 +27557,8 @@ SLPM-87374:
     multitap: false
     linkCable: false
 SLES-02296:
-  name: "Cina - Crimini nella Citta Proibita (Italy)"
+  name: "Cina - Crimini nella Citta Proibita"
+  saveName: "Cina - Crimini nella Citta Proibita (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -26321,7 +27576,8 @@ SLES-02296:
     multitap: false
     linkCable: false
 SLES-04148:
-  name: "Cindy's Caribbean Holiday (Europe)"
+  name: "Cindy's Caribbean Holiday"
+  saveName: "Cindy's Caribbean Holiday (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -26340,7 +27596,8 @@ SLES-04148:
     multitap: false
     linkCable: false
 SLES-04147:
-  name: "Cindy's Fashion World (Europe)"
+  name: "Cindy's Fashion World"
+  saveName: "Cindy's Fashion World (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -26359,7 +27616,8 @@ SLES-04147:
     multitap: false
     linkCable: false
 SLPM-86565:
-  name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan) (Disc 1) (Joukan)"
+  name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Disc 1) (Joukan)"
+  saveName: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan) (Disc 1) (Joukan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan)"
     serials:
@@ -26386,7 +27644,8 @@ SLPM-86565:
     multitap: false
     linkCable: false
 SLPM-86566:
-  name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan) (Disc 2) (Chuukan)"
+  name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Disc 2) (Chuukan)"
+  saveName: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan) (Disc 2) (Chuukan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan)"
     serials:
@@ -26413,7 +27672,8 @@ SLPM-86566:
     multitap: false
     linkCable: false
 SLPM-86567:
-  name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan) (Disc 3) (Gekan)"
+  name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Disc 3) (Gekan)"
+  saveName: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan) (Disc 3) (Gekan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-1-dan - Tengoku ni Ikenai Papa (Japan)"
     serials:
@@ -26440,7 +27700,8 @@ SLPM-86567:
     multitap: false
     linkCable: false
 SLPM-86554:
-  name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan) (Disc 1) (Joukan)"
+  name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Disc 1) (Joukan)"
+  saveName: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan) (Disc 1) (Joukan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan)"
     serials:
@@ -26467,7 +27728,8 @@ SLPM-86554:
     multitap: false
     linkCable: false
 SLPM-86555:
-  name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan) (Disc 2) (Chuukan)"
+  name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Disc 2) (Chuukan)"
+  saveName: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan) (Disc 2) (Chuukan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan)"
     serials:
@@ -26494,7 +27756,8 @@ SLPM-86555:
     multitap: false
     linkCable: false
 SLPM-86556:
-  name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan) (Disc 3) (Gekan)"
+  name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Disc 3) (Gekan)"
+  saveName: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan) (Disc 3) (Gekan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-2-dan - Interceptor (Japan)"
     serials:
@@ -26521,7 +27784,8 @@ SLPM-86556:
     multitap: false
     linkCable: false
 SLPM-86551:
-  name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan) (Disc 1) (Joukan)"
+  name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Disc 1) (Joukan)"
+  saveName: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan) (Disc 1) (Joukan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan)"
     serials:
@@ -26548,7 +27812,8 @@ SLPM-86551:
     multitap: false
     linkCable: false
 SLPM-86552:
-  name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan) (Disc 2) (Chuukan)"
+  name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Disc 2) (Chuukan)"
+  saveName: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan) (Disc 2) (Chuukan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan)"
     serials:
@@ -26575,7 +27840,8 @@ SLPM-86552:
     multitap: false
     linkCable: false
 SLPM-86553:
-  name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan) (Disc 3) (Gekan)"
+  name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Disc 3) (Gekan)"
+  saveName: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan) (Disc 3) (Gekan)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-3-dan - Arashigaoka (Japan)"
     serials:
@@ -26602,7 +27868,8 @@ SLPM-86553:
     multitap: false
     linkCable: false
 SLPM-86568:
-  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 1)"
+  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Disc 1)"
+  saveName: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 1)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan)"
     serials:
@@ -26630,7 +27897,8 @@ SLPM-86568:
     multitap: false
     linkCable: false
 SLPM-86569:
-  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 2)"
+  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Disc 2)"
+  saveName: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 2)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan)"
     serials:
@@ -26658,7 +27926,8 @@ SLPM-86569:
     multitap: false
     linkCable: false
 SLPM-86570:
-  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 3)"
+  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Disc 3)"
+  saveName: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 3)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan)"
     serials:
@@ -26686,7 +27955,8 @@ SLPM-86570:
     multitap: false
     linkCable: false
 SLPM-86571:
-  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 4)"
+  name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Disc 4)"
+  saveName: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan) (Disc 4)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-4-dan - Boy's Life (Japan)"
     serials:
@@ -26714,7 +27984,8 @@ SLPM-86571:
     multitap: false
     linkCable: false
 SLPM-86557:
-  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 1)"
+  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Disc 1)"
+  saveName: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 1)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan)"
     serials:
@@ -26742,7 +28013,8 @@ SLPM-86557:
     multitap: false
     linkCable: false
 SLPM-86558:
-  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 2)"
+  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Disc 2)"
+  saveName: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 2)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan)"
     serials:
@@ -26770,7 +28042,8 @@ SLPM-86558:
     multitap: false
     linkCable: false
 SLPM-86559:
-  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 3)"
+  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Disc 3)"
+  saveName: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 3)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan)"
     serials:
@@ -26798,7 +28071,8 @@ SLPM-86559:
     multitap: false
     linkCable: false
 SLPM-86560:
-  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 4)"
+  name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Disc 4)"
+  saveName: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan) (Disc 4)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-5-dan - Zombie (Japan)"
     serials:
@@ -26826,7 +28100,8 @@ SLPM-86560:
     multitap: false
     linkCable: false
 SLPM-86241:
-  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 1)"
+  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Disc 1)"
+  saveName: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 1)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan)"
     serials:
@@ -26854,7 +28129,8 @@ SLPM-86241:
     multitap: false
     linkCable: false
 SLPM-86242:
-  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 2)"
+  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Disc 2)"
+  saveName: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 2)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan)"
     serials:
@@ -26882,7 +28158,8 @@ SLPM-86242:
     multitap: false
     linkCable: false
 SLPM-86243:
-  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 3)"
+  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Disc 3)"
+  saveName: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 3)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan)"
     serials:
@@ -26910,7 +28187,8 @@ SLPM-86243:
     multitap: false
     linkCable: false
 SLPM-86244:
-  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 4)"
+  name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Disc 4)"
+  saveName: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan) (Disc 4)"
   discSet:
     name: "Cinema Eikaiwa Series Dai-6-dan - Ai no Hate ni (Japan)"
     serials:
@@ -26933,14 +28211,16 @@ SLPM-86244:
     multitap: false
     linkCable: false
 PCPX-96138:
-  name: "Circadia (Japan) (Demo)"
+  name: "Circadia (Demo)"
+  saveName: "Circadia (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
     - PCPX-96138
     - PCPX-96140
 SCPS-10077:
-  name: "Circadia (Japan) (Disc 1)"
+  name: "Circadia (Disc 1)"
+  saveName: "Circadia (Japan) (Disc 1)"
   discSet:
     name: "Circadia (Japan)"
     serials:
@@ -26964,7 +28244,8 @@ SCPS-10077:
     multitap: false
     linkCable: false
 SCPS-10078:
-  name: "Circadia (Japan) (Disc 2)"
+  name: "Circadia (Disc 2)"
+  saveName: "Circadia (Japan) (Disc 2)"
   discSet:
     name: "Circadia (Japan)"
     serials:
@@ -26988,7 +28269,8 @@ SCPS-10078:
     multitap: false
     linkCable: false
 SLPS-00311:
-  name: "Circuit Beat (Japan)"
+  name: "Circuit Beat"
+  saveName: "Circuit Beat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27008,7 +28290,8 @@ SLPS-00311:
     multitap: false
     linkCable: false
 SLES-00753:
-  name: "Circuit Breakers (Europe) (En,Fr,De,Es,It)"
+  name: "Circuit Breakers"
+  saveName: "Circuit Breakers (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27032,11 +28315,13 @@ SLES-00753:
     multitap: true
     linkCable: false
 SLED-01403:
-  name: "Circuit Breakers (Europe) (En,Fr,De,Es,It) (Demo-Add-On Disc)"
+  name: "Circuit Breakers (Demo-Add-On Disc)"
+  saveName: "Circuit Breakers (Europe) (En,Fr,De,Es,It) (Demo-Add-On Disc)"
   metadata:
     genre: "** DEMO **"
 SLUS-00697:
-  name: "Circuit Breakers (USA)"
+  name: "Circuit Breakers"
+  saveName: "Circuit Breakers (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27056,7 +28341,8 @@ SLUS-00697:
     multitap: true
     linkCable: false
 SLES-00573:
-  name: "Cite des Enfants Perdus, La (France)"
+  name: "Cite des Enfants Perdus, La"
+  saveName: "Cite des Enfants Perdus, La (France)"
   controllers:
     - DigitalController
   metadata:
@@ -27074,11 +28360,13 @@ SLES-00573:
     multitap: false
     linkCable: false
 SLED-00734:
-  name: "Cite des Enfants Perdus, La (France) (Demo)"
+  name: "Cite des Enfants Perdus, La (Demo)"
+  saveName: "Cite des Enfants Perdus, La (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00361:
-  name: "City Bravo! (Japan)"
+  name: "City Bravo!"
+  saveName: "City Bravo! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -27099,7 +28387,8 @@ SLPS-00361:
     multitap: false
     linkCable: false
 SLPS-02421:
-  name: "City Bravo! Business Hen (Japan)"
+  name: "City Bravo! Business Hen"
+  saveName: "City Bravo! Business Hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27118,7 +28407,8 @@ SLPS-02421:
     multitap: false
     linkCable: false
 SLES-00170:
-  name: "City of Lost Children, The (Europe) (En,Es,It)"
+  name: "City of Lost Children, The"
+  saveName: "City of Lost Children, The (Europe) (En,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -27138,7 +28428,8 @@ SLES-00170:
     multitap: false
     linkCable: false
 SCUS-94150:
-  name: "City of Lost Children, The (USA) (En,Es,It)"
+  name: "City of Lost Children, The"
+  saveName: "City of Lost Children, The (USA) (En,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -27158,7 +28449,8 @@ SCUS-94150:
     multitap: false
     linkCable: false
 SLES-00638:
-  name: "Ciudad de los ninos perdidos, La (Spain)"
+  name: "Ciudad de los ninos perdidos, La"
+  saveName: "Ciudad de los ninos perdidos, La (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -27176,7 +28468,8 @@ SLES-00638:
     multitap: false
     linkCable: false
 SLES-01794:
-  name: "Civilization II (Europe)"
+  name: "Civilization II"
+  saveName: "Civilization II (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27195,7 +28488,8 @@ SLES-01794:
     multitap: false
     linkCable: false
 SLES-01795:
-  name: "Civilization II (France)"
+  name: "Civilization II"
+  saveName: "Civilization II (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27214,7 +28508,8 @@ SLES-01795:
     multitap: false
     linkCable: false
 SLES-01796:
-  name: "Civilization II (Germany)"
+  name: "Civilization II"
+  saveName: "Civilization II (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27233,7 +28528,8 @@ SLES-01796:
     multitap: false
     linkCable: false
 SLES-01797:
-  name: "Civilization II (Italy)"
+  name: "Civilization II"
+  saveName: "Civilization II (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27252,7 +28548,8 @@ SLES-01797:
     multitap: false
     linkCable: false
 SLPS-01735:
-  name: "Civilization II (Japan)"
+  name: "Civilization II"
+  saveName: "Civilization II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27271,7 +28568,8 @@ SLPS-01735:
     multitap: false
     linkCable: false
 SLES-01798:
-  name: "Civilization II (Spain)"
+  name: "Civilization II"
+  saveName: "Civilization II (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -27293,7 +28591,8 @@ SLES-01798:
     multitap: false
     linkCable: false
 SLUS-00792:
-  name: "Civilization II (USA)"
+  name: "Civilization II"
+  saveName: "Civilization II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -27315,7 +28614,8 @@ SLUS-00792:
     multitap: false
     linkCable: false
 SLPS-00618:
-  name: "Civizard - Majutsu no Keifu (Japan)"
+  name: "Civizard - Majutsu no Keifu"
+  saveName: "Civizard - Majutsu no Keifu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -27333,7 +28633,8 @@ SLPS-00618:
     multitap: false
     linkCable: false
 SLPS-00160:
-  name: "Classic Road (Japan)"
+  name: "Classic Road"
+  saveName: "Classic Road (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -27354,7 +28655,8 @@ SLPS-00160:
     multitap: false
     linkCable: false
 SLPS-01325:
-  name: "Classic Road - Yuushun 2 (Japan)"
+  name: "Classic Road - Yuushun 2"
+  saveName: "Classic Road - Yuushun 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -27372,7 +28674,8 @@ SLPS-01325:
     multitap: false
     linkCable: false
 SLPS-02039:
-  name: "Classic Road 2 (Japan)"
+  name: "Classic Road 2"
+  saveName: "Classic Road 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27391,7 +28694,8 @@ SLPS-02039:
     multitap: false
     linkCable: false
 SLES-03935:
-  name: "Cleopatra Fortune (Europe)"
+  name: "Cleopatra Fortune"
+  saveName: "Cleopatra Fortune (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -27409,7 +28713,8 @@ SLES-03935:
     multitap: false
     linkCable: false
 SLPS-03187:
-  name: "Cleopatra Fortune (Japan)"
+  name: "Cleopatra Fortune"
+  saveName: "Cleopatra Fortune (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -27427,7 +28732,8 @@ SLPS-03187:
     multitap: false
     linkCable: false
 SLUS-01491:
-  name: "Cleopatra's Fortune (USA)"
+  name: "Cleopatra's Fortune"
+  saveName: "Cleopatra's Fortune (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -27448,11 +28754,13 @@ SLUS-01491:
     multitap: false
     linkCable: false
 SLPM-80482:
-  name: "Click Manga (Japan) (Demo)"
+  name: "Click Manga (Demo)"
+  saveName: "Click Manga (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02354:
-  name: "Click Manga - Click no Hi (Japan)"
+  name: "Click Manga - Click no Hi"
+  saveName: "Click Manga - Click no Hi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27471,7 +28779,8 @@ SLPS-02354:
     multitap: false
     linkCable: false
 SLPS-02131:
-  name: "Click Manga - Dynamic Robot Taisen 1 - Shutsugeki! Kyoui no Robot Gundan!! (Japan)"
+  name: "Click Manga - Dynamic Robot Taisen 1 - Shutsugeki! Kyoui no Robot Gundan!!"
+  saveName: "Click Manga - Dynamic Robot Taisen 1 - Shutsugeki! Kyoui no Robot Gundan!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27490,7 +28799,8 @@ SLPS-02131:
     multitap: false
     linkCable: false
 SLPS-02407:
-  name: "Click Manga - Dynamic Robot Taisen 2 - Kyoufu! Akuma Zoku Fukkatsu (Japan)"
+  name: "Click Manga - Dynamic Robot Taisen 2 - Kyoufu! Akuma Zoku Fukkatsu"
+  saveName: "Click Manga - Dynamic Robot Taisen 2 - Kyoufu! Akuma Zoku Fukkatsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27509,7 +28819,8 @@ SLPS-02407:
     multitap: false
     linkCable: false
 SLPS-02128:
-  name: "Click Manga - Ginga Eiyuu Densetsu 1 - Eien no Yoru no Naka de (Japan)"
+  name: "Click Manga - Ginga Eiyuu Densetsu 1 - Eien no Yoru no Naka de"
+  saveName: "Click Manga - Ginga Eiyuu Densetsu 1 - Eien no Yoru no Naka de (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27528,7 +28839,8 @@ SLPS-02128:
     multitap: false
     linkCable: false
 SLPS-02353:
-  name: "Click Manga - Ginga Eiyuu Densetsu 2 - Iserlohn Kouryaku (Japan)"
+  name: "Click Manga - Ginga Eiyuu Densetsu 2 - Iserlohn Kouryaku"
+  saveName: "Click Manga - Ginga Eiyuu Densetsu 2 - Iserlohn Kouryaku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27547,7 +28859,8 @@ SLPS-02353:
     multitap: false
     linkCable: false
 SLPS-02130:
-  name: "Click Manga - Opera-za no Kaijin (Japan)"
+  name: "Click Manga - Opera-za no Kaijin"
+  saveName: "Click Manga - Opera-za no Kaijin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27566,7 +28879,8 @@ SLPS-02130:
     multitap: false
     linkCable: false
 SLPS-01838:
-  name: "Click Medic (Japan)"
+  name: "Click Medic"
+  saveName: "Click Medic (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27585,7 +28899,8 @@ SLPS-01838:
     multitap: false
     linkCable: false
 SLES-00870:
-  name: "Clock Tower (Europe)"
+  name: "Clock Tower"
+  saveName: "Clock Tower (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -27604,7 +28919,8 @@ SLES-00870:
     multitap: false
     linkCable: false
 SLES-00871:
-  name: "Clock Tower (France)"
+  name: "Clock Tower"
+  saveName: "Clock Tower (France)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -27623,7 +28939,8 @@ SLES-00871:
     multitap: false
     linkCable: false
 SLES-00872:
-  name: "Clock Tower (Germany)"
+  name: "Clock Tower"
+  saveName: "Clock Tower (Germany)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -27642,7 +28959,8 @@ SLES-00872:
     multitap: false
     linkCable: false
 SLUS-00539:
-  name: "Clock Tower (USA)"
+  name: "Clock Tower"
+  saveName: "Clock Tower (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
@@ -27684,7 +29002,8 @@ SCPS-45173:
     multitap: false
     linkCable: false
 SLPS-01290:
-  name: "Clock Tower - Ghost Head (Japan)"
+  name: "Clock Tower - Ghost Head"
+  saveName: "Clock Tower - Ghost Head (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27704,7 +29023,8 @@ SLPS-01290:
     multitap: false
     linkCable: false
 SLPM-80219:
-  name: "Clock Tower - Ghost Head (Japan) (Demo)"
+  name: "Clock Tower - Ghost Head (Demo)"
+  saveName: "Clock Tower - Ghost Head (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91175:
@@ -27728,7 +29048,8 @@ SLPS-91175:
     multitap: false
     linkCable: false
 SLPS-00917:
-  name: "Clock Tower - The First Fear (Japan)"
+  name: "Clock Tower - The First Fear"
+  saveName: "Clock Tower - The First Fear (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -27750,7 +29071,8 @@ SLPS-00917:
     multitap: false
     linkCable: false
 SLPS-00657:
-  name: "Clock Tower 2 (Japan)"
+  name: "Clock Tower 2"
+  saveName: "Clock Tower 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27773,15 +29095,18 @@ SLPS-00657:
     multitap: false
     linkCable: false
 SLPM-80062:
-  name: "Clock Tower 2 (Japan) (Demo 1)"
+  name: "Clock Tower 2 (Demo 1)"
+  saveName: "Clock Tower 2 (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80063:
-  name: "Clock Tower 2 (Japan) (Demo 2)"
+  name: "Clock Tower 2 (Demo 2)"
+  saveName: "Clock Tower 2 (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLUS-00695:
-  name: "Clock Tower II - The Struggle Within (USA)"
+  name: "Clock Tower II - The Struggle Within"
+  saveName: "Clock Tower II - The Struggle Within (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27801,7 +29126,8 @@ SLUS-00695:
     multitap: false
     linkCable: false
 SLPS-00387:
-  name: "ClockWerx (Japan)"
+  name: "ClockWerx"
+  saveName: "ClockWerx (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -27819,7 +29145,8 @@ SLPS-00387:
     multitap: false
     linkCable: false
 SLES-02766:
-  name: "Cochons de Guerre, Les (France)"
+  name: "Cochons de Guerre, Les"
+  saveName: "Cochons de Guerre, Les (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27839,7 +29166,8 @@ SLES-02766:
     multitap: true
     linkCable: false
 SLPS-01569:
-  name: "Cocktail Harmony (Japan)"
+  name: "Cocktail Harmony"
+  saveName: "Cocktail Harmony (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27858,21 +29186,26 @@ SLPS-01569:
     multitap: false
     linkCable: false
 PL-646:
-  name: "Codebreaker D.J. (USA) (Unl)"
+  name: "Codebreaker D.J."
+  saveName: "Codebreaker D.J. (USA) (Unl)"
 SLUS-90091:
-  name: "Codemasters Demo CD (USA)"
+  name: "Codemasters Demo CD"
+  saveName: "Codemasters Demo CD (USA)"
   metadata:
     genre: "** DEMO **"
 SLED-02809:
-  name: "Codemasters Demo Disk (Europe)"
+  name: "Codemasters Demo Disk"
+  saveName: "Codemasters Demo Disk (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-03094:
-  name: "Codemasters Q3 2000 Demo (Europe)"
+  name: "Codemasters Q3 2000 Demo"
+  saveName: "Codemasters Q3 2000 Demo (Europe)"
   metadata:
     genre: "** DEMO **"
 SCUS-94409:
-  name: "Codename - Tenka (USA)"
+  name: "Codename - Tenka"
+  saveName: "Codename - Tenka (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -27895,7 +29228,8 @@ SCUS-94409:
     multitap: false
     linkCable: false
 SCES-02151:
-  name: "Cold Blood (Germany) (Disc 1)"
+  name: "Cold Blood (Disc 1)"
+  saveName: "Cold Blood (Germany) (Disc 1)"
   discSet:
     name: "Cold Blood (Germany)"
     serials:
@@ -27919,7 +29253,8 @@ SCES-02151:
     multitap: false
     linkCable: false
 SCES-12151:
-  name: "Cold Blood (Germany) (Disc 2)"
+  name: "Cold Blood (Disc 2)"
+  saveName: "Cold Blood (Germany) (Disc 2)"
   discSet:
     name: "Cold Blood (Germany)"
     serials:
@@ -27943,11 +29278,13 @@ SCES-12151:
     multitap: false
     linkCable: false
 SLPM-80380:
-  name: "Colin McRae - The Rally (Japan) (Demo)"
+  name: "Colin McRae - The Rally (Demo)"
+  saveName: "Colin McRae - The Rally (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01938:
-  name: "Colin McRae - The Rally (Japan) (En,Ja)"
+  name: "Colin McRae - The Rally"
+  saveName: "Colin McRae - The Rally (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27970,7 +29307,8 @@ SLPS-01938:
     multitap: false
     linkCable: false
 SLPS-02878:
-  name: "Colin McRae - The Rally 02 (Japan)"
+  name: "Colin McRae - The Rally 02"
+  saveName: "Colin McRae - The Rally 02 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -27990,11 +29328,13 @@ SLPS-02878:
     multitap: false
     linkCable: false
 SLED-01380:
-  name: "Colin McRae Rally (Europe) (Demo)"
+  name: "Colin McRae Rally (Demo)"
+  saveName: "Colin McRae Rally (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00477:
-  name: "Colin McRae Rally (Europe) (En,Fr,De,Es)"
+  name: "Colin McRae Rally"
+  saveName: "Colin McRae Rally (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28017,11 +29357,13 @@ SLES-00477:
     multitap: false
     linkCable: false
 SLED-01381:
-  name: "Colin McRae Rally (Germany) (Demo)"
+  name: "Colin McRae Rally (Demo)"
+  saveName: "Colin McRae Rally (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01204:
-  name: "Colin McRae Rally (Italy)"
+  name: "Colin McRae Rally"
+  saveName: "Colin McRae Rally (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28041,11 +29383,13 @@ SLES-01204:
     multitap: false
     linkCable: false
 SLED-01388:
-  name: "Colin McRae Rally (Italy) (Demo)"
+  name: "Colin McRae Rally (Demo)"
+  saveName: "Colin McRae Rally (Italy) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94474:
-  name: "Colin McRae Rally (USA)"
+  name: "Colin McRae Rally"
+  saveName: "Colin McRae Rally (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1669-g455f3591"
@@ -28108,7 +29452,8 @@ SLPS-03274:
     multitap: false
     linkCable: false
 SLES-02605:
-  name: "Colin McRae Rally 2.0 (Europe) (En,Fr,De,Es,It)"
+  name: "Colin McRae Rally 2.0"
+  saveName: "Colin McRae Rally 2.0 (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4315-gf7587eae"
@@ -28135,7 +29480,8 @@ SLES-02605:
     multitap: false
     linkCable: false
 SLUS-01222:
-  name: "Colin McRae Rally 2.0 (USA) (En,Fr,Es)"
+  name: "Colin McRae Rally 2.0"
+  saveName: "Colin McRae Rally 2.0 (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -28183,7 +29529,8 @@ SLPS-91431:
     multitap: false
     linkCable: false
 SLUS-00196:
-  name: "College Slam (USA)"
+  name: "College Slam"
+  saveName: "College Slam (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -28223,7 +29570,8 @@ SCPS-45254:
     multitap: false
     linkCable: false
 SLES-00860:
-  name: "Colony Wars (Europe) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (Europe) (Disc 1)"
   discSet:
     name: "Colony Wars (Europe)"
     serials:
@@ -28247,7 +29595,8 @@ SLES-00860:
     multitap: false
     linkCable: false
 SLES-10860:
-  name: "Colony Wars (Europe) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (Europe) (Disc 2)"
   discSet:
     name: "Colony Wars (Europe)"
     serials:
@@ -28271,11 +29620,13 @@ SLES-10860:
     multitap: false
     linkCable: false
 SLED-00091:
-  name: "Colony Wars (Europe) (Fr,De) (Demo)"
+  name: "Colony Wars (Demo)"
+  saveName: "Colony Wars (Europe) (Fr,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00861:
-  name: "Colony Wars (France) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (France) (Disc 1)"
   discSet:
     name: "Colony Wars (France)"
     serials:
@@ -28299,7 +29650,8 @@ SLES-00861:
     multitap: false
     linkCable: false
 SLES-10861:
-  name: "Colony Wars (France) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (France) (Disc 2)"
   discSet:
     name: "Colony Wars (France)"
     serials:
@@ -28323,7 +29675,8 @@ SLES-10861:
     multitap: false
     linkCable: false
 SLES-00862:
-  name: "Colony Wars (Germany) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (Germany) (Disc 1)"
   discSet:
     name: "Colony Wars (Germany)"
     serials:
@@ -28347,7 +29700,8 @@ SLES-00862:
     multitap: false
     linkCable: false
 SLES-10862:
-  name: "Colony Wars (Germany) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (Germany) (Disc 2)"
   discSet:
     name: "Colony Wars (Germany)"
     serials:
@@ -28371,7 +29725,8 @@ SLES-10862:
     multitap: false
     linkCable: false
 SLES-00863:
-  name: "Colony Wars (Italy) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (Italy) (Disc 1)"
   discSet:
     name: "Colony Wars (Italy)"
     serials:
@@ -28395,7 +29750,8 @@ SLES-00863:
     multitap: false
     linkCable: false
 SLES-10863:
-  name: "Colony Wars (Italy) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (Italy) (Disc 2)"
   discSet:
     name: "Colony Wars (Italy)"
     serials:
@@ -28419,11 +29775,13 @@ SLES-10863:
     multitap: false
     linkCable: false
 SLPM-80304:
-  name: "Colony Wars (Japan) (Demo)"
+  name: "Colony Wars (Demo)"
+  saveName: "Colony Wars (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01403:
-  name: "Colony Wars (Japan) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (Japan) (Disc 1)"
   discSet:
     name: "Colony Wars (Japan)"
     serials:
@@ -28447,7 +29805,8 @@ SLPS-01403:
     multitap: false
     linkCable: false
 SLPS-01404:
-  name: "Colony Wars (Japan) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (Japan) (Disc 2)"
   discSet:
     name: "Colony Wars (Japan)"
     serials:
@@ -28471,7 +29830,8 @@ SLPS-01404:
     multitap: false
     linkCable: false
 SLES-00864:
-  name: "Colony Wars (Spain) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (Spain) (Disc 1)"
   discSet:
     name: "Colony Wars (Spain)"
     serials:
@@ -28498,7 +29858,8 @@ SLES-00864:
     multitap: false
     linkCable: false
 SLES-10864:
-  name: "Colony Wars (Spain) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (Spain) (Disc 2)"
   discSet:
     name: "Colony Wars (Spain)"
     serials:
@@ -28525,7 +29886,8 @@ SLES-10864:
     multitap: false
     linkCable: false
 SLUS-00543:
-  name: "Colony Wars (USA) (Disc 1)"
+  name: "Colony Wars (Disc 1)"
+  saveName: "Colony Wars (USA) (Disc 1)"
   discSet:
     name: "Colony Wars (USA)"
     serials:
@@ -28549,7 +29911,8 @@ SLUS-00543:
     multitap: false
     linkCable: false
 SLUS-00554:
-  name: "Colony Wars (USA) (Disc 2)"
+  name: "Colony Wars (Disc 2)"
+  saveName: "Colony Wars (USA) (Disc 2)"
   discSet:
     name: "Colony Wars (USA)"
     serials:
@@ -28573,7 +29936,8 @@ SLUS-00554:
     multitap: false
     linkCable: false
 SCES-02624:
-  name: "Colony Wars - El Sol Rojo (Spain)"
+  name: "Colony Wars - El Sol Rojo"
+  saveName: "Colony Wars - El Sol Rojo (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28592,7 +29956,8 @@ SCES-02624:
     multitap: false
     linkCable: false
 SCES-01924:
-  name: "Colony Wars - Red Sun (Europe)"
+  name: "Colony Wars - Red Sun"
+  saveName: "Colony Wars - Red Sun (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28611,7 +29976,8 @@ SCES-01924:
     multitap: false
     linkCable: false
 SCES-02621:
-  name: "Colony Wars - Red Sun (France)"
+  name: "Colony Wars - Red Sun"
+  saveName: "Colony Wars - Red Sun (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28630,7 +29996,8 @@ SCES-02621:
     multitap: false
     linkCable: false
 SCES-02622:
-  name: "Colony Wars - Red Sun (Germany)"
+  name: "Colony Wars - Red Sun"
+  saveName: "Colony Wars - Red Sun (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28649,7 +30016,8 @@ SCES-02622:
     multitap: false
     linkCable: false
 SCES-02623:
-  name: "Colony Wars - Red Sun (Italy)"
+  name: "Colony Wars - Red Sun"
+  saveName: "Colony Wars - Red Sun (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28668,7 +30036,8 @@ SCES-02623:
     multitap: false
     linkCable: false
 SLUS-00866:
-  name: "Colony Wars - Red Sun (USA)"
+  name: "Colony Wars - Red Sun"
+  saveName: "Colony Wars - Red Sun (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1558-gf852be74"
@@ -28690,7 +30059,8 @@ SLUS-00866:
     multitap: false
     linkCable: false
 SLES-01392:
-  name: "Colony Wars - Vengeance (Europe)"
+  name: "Colony Wars - Vengeance"
+  saveName: "Colony Wars - Vengeance (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28709,11 +30079,13 @@ SLES-01392:
     multitap: false
     linkCable: false
 SLED-01471:
-  name: "Colony Wars - Vengeance (Europe) (Demo)"
+  name: "Colony Wars - Vengeance (Demo)"
+  saveName: "Colony Wars - Vengeance (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01405:
-  name: "Colony Wars - Vengeance (France)"
+  name: "Colony Wars - Vengeance"
+  saveName: "Colony Wars - Vengeance (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28732,7 +30104,8 @@ SLES-01405:
     multitap: false
     linkCable: false
 SLES-01406:
-  name: "Colony Wars - Vengeance (Germany)"
+  name: "Colony Wars - Vengeance"
+  saveName: "Colony Wars - Vengeance (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28751,7 +30124,8 @@ SLES-01406:
     multitap: false
     linkCable: false
 SLES-01407:
-  name: "Colony Wars - Vengeance (Italy)"
+  name: "Colony Wars - Vengeance"
+  saveName: "Colony Wars - Vengeance (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28770,7 +30144,8 @@ SLES-01407:
     multitap: false
     linkCable: false
 SLES-01408:
-  name: "Colony Wars - Vengeance (Spain)"
+  name: "Colony Wars - Vengeance"
+  saveName: "Colony Wars - Vengeance (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28789,7 +30164,8 @@ SLES-01408:
     multitap: false
     linkCable: false
 SLUS-00722:
-  name: "Colony Wars - Vengeance (USA)"
+  name: "Colony Wars - Vengeance"
+  saveName: "Colony Wars - Vengeance (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28808,7 +30184,8 @@ SLUS-00722:
     multitap: false
     linkCable: false
 SLPS-02794:
-  name: "Colorful Logic (Japan)"
+  name: "Colorful Logic"
+  saveName: "Colorful Logic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -28826,7 +30203,8 @@ SLPS-02794:
     multitap: false
     linkCable: false
 SLPS-03115:
-  name: "Colorful Logic 2 (Japan)"
+  name: "Colorful Logic 2"
+  saveName: "Colorful Logic 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -28844,7 +30222,8 @@ SLPS-03115:
     multitap: false
     linkCable: false
 SLPS-03239:
-  name: "Colorful Logic 3 (Japan)"
+  name: "Colorful Logic 3"
+  saveName: "Colorful Logic 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -28862,7 +30241,8 @@ SLPS-03239:
     multitap: false
     linkCable: false
 SLPS-01904:
-  name: "Combat Choro Q (Japan)"
+  name: "Combat Choro Q"
+  saveName: "Combat Choro Q (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28919,7 +30299,8 @@ SLPS-03070:
     multitap: true
     linkCable: false
 SLPM-86515:
-  name: "Combi Mahjong Awase uchi with Maboroshi Tsukiyo Characters (Japan)"
+  name: "Combi Mahjong Awase uchi with Maboroshi Tsukiyo Characters"
+  saveName: "Combi Mahjong Awase uchi with Maboroshi Tsukiyo Characters (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -28938,7 +30319,8 @@ SLPM-86515:
     multitap: false
     linkCable: false
 SLPS-01429:
-  name: "Combination Pro Soccer - J.League no Kantoku ni Natte Sekai o Mezase! (Japan)"
+  name: "Combination Pro Soccer - J.League no Kantoku ni Natte Sekai o Mezase!"
+  saveName: "Combination Pro Soccer - J.League no Kantoku ni Natte Sekai o Mezase! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -28956,15 +30338,19 @@ SLPS-01429:
     multitap: false
     linkCable: false
 SLPM-80402:
-  name: "Comic Bom Bom - DigimonWorld Premium Disc (Japan)"
+  name: "Comic Bom Bom - DigimonWorld Premium Disc"
+  saveName: "Comic Bom Bom - DigimonWorld Premium Disc (Japan)"
 SLPM-80536:
-  name: "Comic Bom Bom - Special Movie Disc (Japan)"
+  name: "Comic Bom Bom - Special Movie Disc"
+  saveName: "Comic Bom Bom - Special Movie Disc (Japan)"
 SLED-00652:
-  name: "Command & Conquer (Europe) (Demo)"
+  name: "Command & Conquer (Demo)"
+  saveName: "Command & Conquer (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00530:
-  name: "Command & Conquer (Europe) (Disc 1) (GDI)"
+  name: "Command & Conquer (Disc 1) (GDI)"
+  saveName: "Command & Conquer (Europe) (Disc 1) (GDI)"
   discSet:
     name: "Command & Conquer (Europe)"
     serials:
@@ -28991,7 +30377,8 @@ SLES-00530:
     multitap: false
     linkCable: false
 SLES-10530:
-  name: "Command & Conquer (Europe) (Disc 2) (NOD)"
+  name: "Command & Conquer (Disc 2) (NOD)"
+  saveName: "Command & Conquer (Europe) (Disc 2) (NOD)"
   discSet:
     name: "Command & Conquer (Europe)"
     serials:
@@ -29018,7 +30405,8 @@ SLES-10530:
     multitap: false
     linkCable: false
 SLES-00531:
-  name: "Command & Conquer (France) (Disc 1) (GDI)"
+  name: "Command & Conquer (Disc 1) (GDI)"
+  saveName: "Command & Conquer (France) (Disc 1) (GDI)"
   discSet:
     name: "Command & Conquer (France)"
     serials:
@@ -29042,7 +30430,8 @@ SLES-00531:
     multitap: false
     linkCable: false
 SLES-10531:
-  name: "Command & Conquer (France) (Disc 2) (NOD)"
+  name: "Command & Conquer (Disc 2) (NOD)"
+  saveName: "Command & Conquer (France) (Disc 2) (NOD)"
   discSet:
     name: "Command & Conquer (France)"
     serials:
@@ -29066,7 +30455,8 @@ SLES-10531:
     multitap: false
     linkCable: false
 SLUS-00379:
-  name: "Command & Conquer (USA) (Disc 1) (GDI)"
+  name: "Command & Conquer (Disc 1) (GDI)"
+  saveName: "Command & Conquer (USA) (Disc 1) (GDI)"
   discSet:
     name: "Command & Conquer (USA)"
     serials:
@@ -29093,7 +30483,8 @@ SLUS-00379:
     multitap: false
     linkCable: false
 SLUS-00410:
-  name: "Command & Conquer (USA) (Disc 2) (NOD)"
+  name: "Command & Conquer (Disc 2) (NOD)"
+  saveName: "Command & Conquer (USA) (Disc 2) (NOD)"
   discSet:
     name: "Command & Conquer (USA)"
     serials:
@@ -29120,11 +30511,13 @@ SLUS-00410:
     multitap: false
     linkCable: false
 SLED-01270:
-  name: "Command & Conquer - Alarmstufe Rot & Bloody Roar (Germany) (Demo)"
+  name: "Command & Conquer - Alarmstufe Rot & Bloody Roar (Demo)"
+  saveName: "Command & Conquer - Alarmstufe Rot & Bloody Roar (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01007:
-  name: "Command & Conquer - Alarmstufe Rot (Germany) (Disc 1)"
+  name: "Command & Conquer - Alarmstufe Rot (Disc 1)"
+  saveName: "Command & Conquer - Alarmstufe Rot (Germany) (Disc 1)"
   discSet:
     name: "Command & Conquer - Alarmstufe Rot (Germany)"
     serials:
@@ -29148,7 +30541,8 @@ SLES-01007:
     multitap: false
     linkCable: true
 SLES-11007:
-  name: "Command & Conquer - Alarmstufe Rot (Germany) (Disc 2)"
+  name: "Command & Conquer - Alarmstufe Rot (Disc 2)"
+  saveName: "Command & Conquer - Alarmstufe Rot (Germany) (Disc 2)"
   discSet:
     name: "Command & Conquer - Alarmstufe Rot (Germany)"
     serials:
@@ -29172,7 +30566,8 @@ SLES-11007:
     multitap: false
     linkCable: true
 SLES-01345:
-  name: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Germany) (Disc 1) (Die Alliierten)"
+  name: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Disc 1) (Die Alliierten)"
+  saveName: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Germany) (Disc 1) (Die Alliierten)"
   discSet:
     name: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Germany)"
     serials:
@@ -29196,7 +30591,8 @@ SLES-01345:
     multitap: false
     linkCable: true
 SLES-11345:
-  name: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Germany) (Disc 2) (Die Sowjets)"
+  name: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Disc 2) (Die Sowjets)"
+  saveName: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Germany) (Disc 2) (Die Sowjets)"
   discSet:
     name: "Command & Conquer - Alarmstufe Rot - Gegenschlag (Germany)"
     serials:
@@ -29220,11 +30616,13 @@ SLES-11345:
     multitap: false
     linkCable: true
 SLED-01067:
-  name: "Command & Conquer - Alerte Rouge (France) (Demo)"
+  name: "Command & Conquer - Alerte Rouge (Demo)"
+  saveName: "Command & Conquer - Alerte Rouge (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01006:
-  name: "Command & Conquer - Alerte Rouge (France) (Disc 1) (Allies)"
+  name: "Command & Conquer - Alerte Rouge (Disc 1) (Allies)"
+  saveName: "Command & Conquer - Alerte Rouge (France) (Disc 1) (Allies)"
   discSet:
     name: "Command & Conquer - Alerte Rouge (France)"
     serials:
@@ -29248,7 +30646,8 @@ SLES-01006:
     multitap: false
     linkCable: true
 SLES-11006:
-  name: "Command & Conquer - Alerte Rouge (France) (Disc 2) (Sovietiques)"
+  name: "Command & Conquer - Alerte Rouge (Disc 2) (Sovietiques)"
+  saveName: "Command & Conquer - Alerte Rouge (France) (Disc 2) (Sovietiques)"
   discSet:
     name: "Command & Conquer - Alerte Rouge (France)"
     serials:
@@ -29272,7 +30671,8 @@ SLES-11006:
     multitap: false
     linkCable: true
 SLES-01344:
-  name: "Command & Conquer - Alerte Rouge - Mission Tesla (France) (Disc 1) (Allies)"
+  name: "Command & Conquer - Alerte Rouge - Mission Tesla (Disc 1) (Allies)"
+  saveName: "Command & Conquer - Alerte Rouge - Mission Tesla (France) (Disc 1) (Allies)"
   discSet:
     name: "Command & Conquer - Alerte Rouge - Mission Tesla (France)"
     serials:
@@ -29296,7 +30696,8 @@ SLES-01344:
     multitap: false
     linkCable: true
 SLES-11344:
-  name: "Command & Conquer - Alerte Rouge - Mission Tesla (France) (Disc 2) (Sovietiques)"
+  name: "Command & Conquer - Alerte Rouge - Mission Tesla (Disc 2) (Sovietiques)"
+  saveName: "Command & Conquer - Alerte Rouge - Mission Tesla (France) (Disc 2) (Sovietiques)"
   discSet:
     name: "Command & Conquer - Alerte Rouge - Mission Tesla (France)"
     serials:
@@ -29320,11 +30721,13 @@ SLES-11344:
     multitap: false
     linkCable: true
 SLED-01255:
-  name: "Command & Conquer - Red Alert & Bloody Roar (Europe)"
+  name: "Command & Conquer - Red Alert & Bloody Roar"
+  saveName: "Command & Conquer - Red Alert & Bloody Roar (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-00949:
-  name: "Command & Conquer - Red Alert (Europe) (Disc 1) (Allies)"
+  name: "Command & Conquer - Red Alert (Disc 1) (Allies)"
+  saveName: "Command & Conquer - Red Alert (Europe) (Disc 1) (Allies)"
   discSet:
     name: "Command & Conquer - Red Alert (Europe)"
     serials:
@@ -29351,7 +30754,8 @@ SLES-00949:
     multitap: false
     linkCable: true
 SLES-10949:
-  name: "Command & Conquer - Red Alert (Europe) (Disc 2) (Soviet)"
+  name: "Command & Conquer - Red Alert (Disc 2)"
+  saveName: "Command & Conquer - Red Alert (Europe) (Disc 2) (Soviet)"
   discSet:
     name: "Command & Conquer - Red Alert (Europe)"
     serials:
@@ -29378,7 +30782,8 @@ SLES-10949:
     multitap: false
     linkCable: true
 SLUS-00431:
-  name: "Command & Conquer - Red Alert (USA) (Disc 1) (Allies)"
+  name: "Command & Conquer - Red Alert (Disc 1) (Allies)"
+  saveName: "Command & Conquer - Red Alert (USA) (Disc 1) (Allies)"
   discSet:
     name: "Command & Conquer - Red Alert (USA)"
     serials:
@@ -29405,7 +30810,8 @@ SLUS-00431:
     multitap: false
     linkCable: true
 SLUS-00485:
-  name: "Command & Conquer - Red Alert (USA) (Disc 2) (Soviet)"
+  name: "Command & Conquer - Red Alert (Disc 2)"
+  saveName: "Command & Conquer - Red Alert (USA) (Disc 2) (Soviet)"
   discSet:
     name: "Command & Conquer - Red Alert (USA)"
     serials:
@@ -29432,7 +30838,8 @@ SLUS-00485:
     multitap: false
     linkCable: true
 SLES-01343:
-  name: "Command & Conquer - Red Alert - Retaliation (Europe) (Disc 1) (Allies)"
+  name: "Command & Conquer - Red Alert - Retaliation (Disc 1) (Allies)"
+  saveName: "Command & Conquer - Red Alert - Retaliation (Europe) (Disc 1) (Allies)"
   discSet:
     name: "Command & Conquer - Red Alert - Retaliation (Europe)"
     serials:
@@ -29456,7 +30863,8 @@ SLES-01343:
     multitap: false
     linkCable: true
 SLES-11343:
-  name: "Command & Conquer - Red Alert - Retaliation (Europe) (Disc 2) (Soviet)"
+  name: "Command & Conquer - Red Alert - Retaliation (Disc 2)"
+  saveName: "Command & Conquer - Red Alert - Retaliation (Europe) (Disc 2) (Soviet)"
   discSet:
     name: "Command & Conquer - Red Alert - Retaliation (Europe)"
     serials:
@@ -29480,7 +30888,8 @@ SLES-11343:
     multitap: false
     linkCable: true
 SLUS-00665:
-  name: "Command & Conquer - Red Alert - Retaliation (USA) (Disc 1) (Allies)"
+  name: "Command & Conquer - Red Alert - Retaliation (Disc 1) (Allies)"
+  saveName: "Command & Conquer - Red Alert - Retaliation (USA) (Disc 1) (Allies)"
   discSet:
     name: "Command & Conquer - Red Alert - Retaliation (USA)"
     serials:
@@ -29507,7 +30916,8 @@ SLUS-00665:
     multitap: false
     linkCable: true
 SLUS-00667:
-  name: "Command & Conquer - Red Alert - Retaliation (USA) (Disc 2) (Soviet)"
+  name: "Command & Conquer - Red Alert - Retaliation (Disc 2)"
+  saveName: "Command & Conquer - Red Alert - Retaliation (USA) (Disc 2) (Soviet)"
   discSet:
     name: "Command & Conquer - Red Alert - Retaliation (USA)"
     serials:
@@ -29534,11 +30944,13 @@ SLUS-00667:
     multitap: false
     linkCable: true
 SLED-00695:
-  name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Demo)"
+  name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Demo)"
+  saveName: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00532:
-  name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Disc 1) (GDI)"
+  name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Disc 1) (GDI)"
+  saveName: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Disc 1) (GDI)"
   discSet:
     name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany)"
     serials:
@@ -29562,7 +30974,8 @@ SLES-00532:
     multitap: false
     linkCable: false
 SLES-10532:
-  name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Disc 2) (NOD)"
+  name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Disc 2) (NOD)"
+  saveName: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Disc 2) (NOD)"
   discSet:
     name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany)"
     serials:
@@ -29585,11 +30998,13 @@ SLES-10532:
     multitap: false
     linkCable: false
 SLPM-80222:
-  name: "Command & Conquer Complete (Japan) (Demo)"
+  name: "Command & Conquer Complete (Demo)"
+  saveName: "Command & Conquer Complete (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00976:
-  name: "Command & Conquer Complete (Japan) (Disc 1) (GDI)"
+  name: "Command & Conquer Complete (Disc 1) (GDI)"
+  saveName: "Command & Conquer Complete (Japan) (Disc 1) (GDI)"
   discSet:
     name: "Command & Conquer Complete (Japan)"
     serials:
@@ -29613,7 +31028,8 @@ SLPS-00976:
     multitap: false
     linkCable: false
 SLPS-00977:
-  name: "Command & Conquer Complete (Japan) (Disc 2) (NOD)"
+  name: "Command & Conquer Complete (Disc 2) (NOD)"
+  saveName: "Command & Conquer Complete (Japan) (Disc 2) (NOD)"
   discSet:
     name: "Command & Conquer Complete (Japan)"
     serials:
@@ -29637,7 +31053,8 @@ SLPS-00977:
     multitap: false
     linkCable: false
 SLPS-00817:
-  name: "Community Pom (Japan)"
+  name: "Community Pom"
+  saveName: "Community Pom (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -29655,7 +31072,8 @@ SLPS-00817:
     multitap: false
     linkCable: false
 SLPS-02116:
-  name: "Community Pom - Omoide o Dakishimete (Japan)"
+  name: "Community Pom - Omoide o Dakishimete"
+  saveName: "Community Pom - Omoide o Dakishimete (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -29673,21 +31091,25 @@ SLPS-02116:
     multitap: false
     linkCable: false
 SLED-02310:
-  name: "Compilation 01 (Australia)"
+  name: "Compilation 01"
+  saveName: "Compilation 01 (Australia)"
   metadata:
     genre: "** DEMO **"
 SLED-02439:
-  name: "Compilation 03 (Australia)"
+  name: "Compilation 03"
+  saveName: "Compilation 03 (Australia)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisablePGXPCulling
 SLED-02440:
-  name: "Compilation 04 (Australia)"
+  name: "Compilation 04"
+  saveName: "Compilation 04 (Australia)"
   metadata:
     genre: "** DEMO **"
 SLPS-01062:
-  name: "Complete Soccer Onside (Japan)"
+  name: "Complete Soccer Onside"
+  saveName: "Complete Soccer Onside (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -29705,7 +31127,8 @@ SLPS-01062:
     multitap: false
     linkCable: false
 SLES-00927:
-  name: "Constructor (Europe) (En,Fr,De,Es)"
+  name: "Constructor"
+  saveName: "Constructor (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -29732,7 +31155,8 @@ SLES-00927:
     multitap: false
     linkCable: false
 SLES-01428:
-  name: "Constructor (Italy)"
+  name: "Constructor"
+  saveName: "Constructor (Italy)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -29756,7 +31180,8 @@ SLES-01428:
     multitap: false
     linkCable: false
 SCUS-94294:
-  name: "Contender (USA)"
+  name: "Contender"
+  saveName: "Contender (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -29778,7 +31203,8 @@ SCUS-94294:
     multitap: false
     linkCable: false
 SCUS-94380:
-  name: "Contender (USA) (Demo)"
+  name: "Contender (Demo)"
+  saveName: "Contender (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94494:
@@ -29801,7 +31227,8 @@ SCUS-94494:
     multitap: false
     linkCable: false
 SLUS-01305:
-  name: "Contender 2 (USA)"
+  name: "Contender 2"
+  saveName: "Contender 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -29823,7 +31250,8 @@ SLUS-01305:
     multitap: false
     linkCable: false
 SLES-00608:
-  name: "Contra - Legacy of War (Europe)"
+  name: "Contra - Legacy of War"
+  saveName: "Contra - Legacy of War (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -29841,7 +31269,8 @@ SLES-00608:
     multitap: false
     linkCable: false
 SLUS-00288:
-  name: "Contra - Legacy of War (USA)"
+  name: "Contra - Legacy of War"
+  saveName: "Contra - Legacy of War (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -29862,7 +31291,8 @@ SLUS-00288:
     multitap: false
     linkCable: false
 SLPS-01146:
-  name: "Conveni 2, The - Zenkoku Chain Tenkai da! (Japan)"
+  name: "Conveni 2, The - Zenkoku Chain Tenkai da!"
+  saveName: "Conveni 2, The - Zenkoku Chain Tenkai da! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -29880,7 +31310,8 @@ SLPS-01146:
     multitap: false
     linkCable: false
 SLPM-86691:
-  name: "Conveni 2, The - Zenkoku Chain Tenkai da! (Japan) (Major Wave)"
+  name: "Conveni 2, The - Zenkoku Chain Tenkai da! (Major Wave)"
+  saveName: "Conveni 2, The - Zenkoku Chain Tenkai da! (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -29898,7 +31329,8 @@ SLPM-86691:
     multitap: false
     linkCable: false
 SLPS-01301:
-  name: "Conveni Special, The - Mitsu no Sekai o Dokusen seyo (Japan)"
+  name: "Conveni Special, The - Mitsu no Sekai o Dokusen seyo"
+  saveName: "Conveni Special, The - Mitsu no Sekai o Dokusen seyo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -29916,7 +31348,8 @@ SLPS-01301:
     multitap: false
     linkCable: false
 SLPS-00782:
-  name: "Conveni, The - Ano Machi o Dokusen seyo (Japan)"
+  name: "Conveni, The - Ano Machi o Dokusen seyo"
+  saveName: "Conveni, The - Ano Machi o Dokusen seyo (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -29937,7 +31370,8 @@ SLPS-00782:
     multitap: false
     linkCable: false
 SLPM-86655:
-  name: "Conveni, The - Ano Machi o Dokusen seyo (Japan) (Major Wave)"
+  name: "Conveni, The - Ano Machi o Dokusen seyo (Major Wave)"
+  saveName: "Conveni, The - Ano Machi o Dokusen seyo (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -29975,7 +31409,8 @@ SCPS-45061:
     multitap: false
     linkCable: false
 SCES-00568:
-  name: "Cool Boarders (Europe)"
+  name: "Cool Boarders"
+  saveName: "Cool Boarders (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -29996,7 +31431,8 @@ SCES-00568:
     multitap: false
     linkCable: false
 SLPS-00456:
-  name: "Cool Boarders (Japan)"
+  name: "Cool Boarders"
+  saveName: "Cool Boarders (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -30020,7 +31456,8 @@ SLPS-00456:
     multitap: false
     linkCable: false
 SCUS-94356:
-  name: "Cool Boarders (USA)"
+  name: "Cool Boarders"
+  saveName: "Cool Boarders (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -30044,7 +31481,8 @@ SCUS-94356:
     multitap: false
     linkCable: false
 SCES-00992:
-  name: "Cool Boarders 2 (Europe)"
+  name: "Cool Boarders 2"
+  saveName: "Cool Boarders 2 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -30066,7 +31504,8 @@ SCES-00992:
     multitap: false
     linkCable: true
 SCUS-94358:
-  name: "Cool Boarders 2 (USA)"
+  name: "Cool Boarders 2"
+  saveName: "Cool Boarders 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -30088,11 +31527,13 @@ SCUS-94358:
     multitap: false
     linkCable: true
 SLPM-80143:
-  name: "Cool Boarders 2 - Killing Session (Japan) (Demo)"
+  name: "Cool Boarders 2 - Killing Session (Demo)"
+  saveName: "Cool Boarders 2 - Killing Session (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45103:
-  name: "Cool Boarders 2 - Killing Session (Japan, Asia)"
+  name: "Cool Boarders 2 - Killing Session"
+  saveName: "Cool Boarders 2 - Killing Session (Japan, Asia)"
   controllers:
     - DigitalController
     - NeGcon
@@ -30133,7 +31574,8 @@ SLPS-91122:
     multitap: false
     linkCable: true
 SCUS-94597:
-  name: "Cool Boarders 2001 (USA)"
+  name: "Cool Boarders 2001"
+  saveName: "Cool Boarders 2001 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3187-gf580dbc6"
@@ -30156,11 +31598,13 @@ SCUS-94597:
     multitap: false
     linkCable: false
 SCUS-94625:
-  name: "Cool Boarders 2001 (USA) (Demo)"
+  name: "Cool Boarders 2001 (Demo)"
+  saveName: "Cool Boarders 2001 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01615:
-  name: "Cool Boarders 3 (Europe)"
+  name: "Cool Boarders 3"
+  saveName: "Cool Boarders 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30180,7 +31624,8 @@ SCES-01615:
     multitap: false
     linkCable: true
 SLPS-01698:
-  name: "Cool Boarders 3 (Japan)"
+  name: "Cool Boarders 3"
+  saveName: "Cool Boarders 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30200,7 +31645,8 @@ SLPS-01698:
     multitap: false
     linkCable: true
 SCUS-94251:
-  name: "Cool Boarders 3 (USA)"
+  name: "Cool Boarders 3"
+  saveName: "Cool Boarders 3 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30220,11 +31666,13 @@ SCUS-94251:
     multitap: false
     linkCable: true
 SCUS-94374:
-  name: "Cool Boarders 3 (USA) (Demo)"
+  name: "Cool Boarders 3 (Demo)"
+  saveName: "Cool Boarders 3 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02283:
-  name: "Cool Boarders 4 (Europe)"
+  name: "Cool Boarders 4"
+  saveName: "Cool Boarders 4 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30244,7 +31692,8 @@ SCES-02283:
     multitap: false
     linkCable: false
 SLPS-02527:
-  name: "Cool Boarders 4 (Japan)"
+  name: "Cool Boarders 4"
+  saveName: "Cool Boarders 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30264,11 +31713,13 @@ SLPS-02527:
     multitap: false
     linkCable: false
 SLPM-80539:
-  name: "Cool Boarders 4 (Japan) (Demo)"
+  name: "Cool Boarders 4 (Demo)"
+  saveName: "Cool Boarders 4 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94559:
-  name: "Cool Boarders 4 (USA)"
+  name: "Cool Boarders 4"
+  saveName: "Cool Boarders 4 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30288,11 +31739,13 @@ SCUS-94559:
     multitap: false
     linkCable: false
 SCUS-94388:
-  name: "Cool Boarders 4 (USA) (Demo)"
+  name: "Cool Boarders 4 (Demo)"
+  saveName: "Cool Boarders 4 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00499:
-  name: "Cooly Skunk (Japan)"
+  name: "Cooly Skunk"
+  saveName: "Cooly Skunk (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -30311,7 +31764,8 @@ SLPS-00499:
     multitap: false
     linkCable: false
 SLES-01269:
-  name: "Copa del Mundo - Francia '98 (Spain)"
+  name: "Copa del Mundo - Francia '98"
+  saveName: "Copa del Mundo - Francia '98 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30330,7 +31784,8 @@ SLES-01269:
     multitap: true
     linkCable: false
 LSP-080230:
-  name: "Cosmic Cookoff - Language Arts (USA)"
+  name: "Cosmic Cookoff - Language Arts"
+  saveName: "Cosmic Cookoff - Language Arts (USA)"
   codes:
     - LSP-080230
     - LSP-905154
@@ -30342,7 +31797,8 @@ LSP-080230:
     languages:
       - English
 LSP-080240:
-  name: "Cosmic Cookoff - Mathematics (USA)"
+  name: "Cosmic Cookoff - Mathematics"
+  saveName: "Cosmic Cookoff - Mathematics (USA)"
   controllers:
     - DigitalController
   codes:
@@ -30364,7 +31820,8 @@ LSP-080240:
     multitap: false
     linkCable: false
 SLPS-00009:
-  name: "Cosmic Race (Japan)"
+  name: "Cosmic Race"
+  saveName: "Cosmic Race (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -30382,7 +31839,8 @@ SLPS-00009:
     multitap: false
     linkCable: false
 SLPM-86484:
-  name: "Cosmowarrior Zero (Japan)"
+  name: "Cosmowarrior Zero"
+  saveName: "Cosmowarrior Zero (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30401,7 +31859,8 @@ SLPM-86484:
     multitap: false
     linkCable: false
 SLPS-02504:
-  name: "Countdown Vampires (Japan) (Disc 1)"
+  name: "Countdown Vampires (Disc 1)"
+  saveName: "Countdown Vampires (Japan) (Disc 1)"
   discSet:
     name: "Countdown Vampires (Japan)"
     serials:
@@ -30427,7 +31886,8 @@ SLPS-02504:
     multitap: false
     linkCable: false
 SLPS-02505:
-  name: "Countdown Vampires (Japan) (Disc 2)"
+  name: "Countdown Vampires (Disc 2)"
+  saveName: "Countdown Vampires (Japan) (Disc 2)"
   discSet:
     name: "Countdown Vampires (Japan)"
     serials:
@@ -30453,7 +31913,8 @@ SLPS-02505:
     multitap: false
     linkCable: false
 SLUS-00898:
-  name: "Countdown Vampires (USA) (Disc 1)"
+  name: "Countdown Vampires (Disc 1)"
+  saveName: "Countdown Vampires (USA) (Disc 1)"
   discSet:
     name: "Countdown Vampires (USA)"
     serials:
@@ -30479,7 +31940,8 @@ SLUS-00898:
     multitap: false
     linkCable: false
 SLUS-01199:
-  name: "Countdown Vampires (USA) (Disc 2)"
+  name: "Countdown Vampires (Disc 2)"
+  saveName: "Countdown Vampires (USA) (Disc 2)"
   discSet:
     name: "Countdown Vampires (USA)"
     serials:
@@ -30505,7 +31967,8 @@ SLUS-01199:
     multitap: false
     linkCable: false
 SLES-01266:
-  name: "Coupe du Monde 98 (France)"
+  name: "Coupe du Monde 98"
+  saveName: "Coupe du Monde 98 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30524,7 +31987,8 @@ SLES-01266:
     multitap: true
     linkCable: false
 SLES-00326:
-  name: "Courier Crisis - The Saga of the Modern Fatalist (Europe) (En,Fr,De,It)"
+  name: "Courier Crisis - The Saga of the Modern Fatalist"
+  saveName: "Courier Crisis - The Saga of the Modern Fatalist (Europe) (En,Fr,De,It)"
   controllers:
     - DigitalController
   metadata:
@@ -30545,7 +32009,8 @@ SLES-00326:
     multitap: false
     linkCable: false
 SLPS-01128:
-  name: "Courier Crisis - The Saga of the Modern Fatalist (Japan)"
+  name: "Courier Crisis - The Saga of the Modern Fatalist"
+  saveName: "Courier Crisis - The Saga of the Modern Fatalist (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -30563,7 +32028,8 @@ SLPS-01128:
     multitap: false
     linkCable: false
 SLUS-00442:
-  name: "Courier Crisis - The Saga of the Modern Fatalist (USA)"
+  name: "Courier Crisis - The Saga of the Modern Fatalist"
+  saveName: "Courier Crisis - The Saga of the Modern Fatalist (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -30581,7 +32047,8 @@ SLUS-00442:
     multitap: false
     linkCable: false
 SLUS-01151:
-  name: "Covert Ops - Nuclear Dawn (USA) (Disc 1)"
+  name: "Covert Ops - Nuclear Dawn (Disc 1)"
+  saveName: "Covert Ops - Nuclear Dawn (USA) (Disc 1)"
   discSet:
     name: "Covert Ops - Nuclear Dawn (USA)"
     serials:
@@ -30608,7 +32075,8 @@ SLUS-01151:
     multitap: false
     linkCable: false
 SLUS-01157:
-  name: "Covert Ops - Nuclear Dawn (USA) (Disc 2)"
+  name: "Covert Ops - Nuclear Dawn (Disc 2)"
+  saveName: "Covert Ops - Nuclear Dawn (USA) (Disc 2)"
   discSet:
     name: "Covert Ops - Nuclear Dawn (USA)"
     serials:
@@ -30635,7 +32103,8 @@ SLUS-01157:
     multitap: false
     linkCable: false
 SLPS-01126:
-  name: "Cowboy Bebop (Japan)"
+  name: "Cowboy Bebop"
+  saveName: "Cowboy Bebop (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30657,7 +32126,8 @@ SLPS-01126:
     multitap: false
     linkCable: false
 SCES-00344:
-  name: "Crash Bandicoot (Europe)"
+  name: "Crash Bandicoot"
+  saveName: "Crash Bandicoot (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30679,9 +32149,11 @@ SCES-00344:
     multitap: false
     linkCable: false
 PAPX-90010:
-  name: "Crash Bandicoot (Japan) (Otameshi Disc)"
+  name: "Crash Bandicoot (Otameshi Disc)"
+  saveName: "Crash Bandicoot (Japan) (Otameshi Disc)"
 SCPS-10031:
-  name: "Crash Bandicoot (Japan, Asia)"
+  name: "Crash Bandicoot"
+  saveName: "Crash Bandicoot (Japan, Asia)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30707,7 +32179,8 @@ SCPS-10031:
     multitap: false
     linkCable: false
 SCUS-94900:
-  name: "Crash Bandicoot (USA)"
+  name: "Crash Bandicoot"
+  saveName: "Crash Bandicoot (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30729,7 +32202,8 @@ SCUS-94900:
     multitap: false
     linkCable: false
 SCUS-94244:
-  name: "Crash Bandicoot - Warped (USA)"
+  name: "Crash Bandicoot - Warped"
+  saveName: "Crash Bandicoot - Warped (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -30756,11 +32230,13 @@ SCUS-94244:
     multitap: false
     linkCable: false
 SCUS-94289:
-  name: "Crash Bandicoot - Warped (USA) (Demo)"
+  name: "Crash Bandicoot - Warped (Demo)"
+  saveName: "Crash Bandicoot - Warped (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00967:
-  name: "Crash Bandicoot 2 - Cortex Strikes Back (Europe) (En,Fr,De,Es,It)"
+  name: "Crash Bandicoot 2 - Cortex Strikes Back"
+  saveName: "Crash Bandicoot 2 - Cortex Strikes Back (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30787,7 +32263,8 @@ SCES-00967:
     multitap: false
     linkCable: false
 SCUS-94154:
-  name: "Crash Bandicoot 2 - Cortex Strikes Back (USA)"
+  name: "Crash Bandicoot 2 - Cortex Strikes Back"
+  saveName: "Crash Bandicoot 2 - Cortex Strikes Back (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30810,7 +32287,8 @@ SCUS-94154:
     multitap: false
     linkCable: false
 SCPS-10047:
-  name: "Crash Bandicoot 2 - Cortex no Gyakushuu! (Japan)"
+  name: "Crash Bandicoot 2 - Cortex no Gyakushuu!"
+  saveName: "Crash Bandicoot 2 - Cortex no Gyakushuu! (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30837,11 +32315,13 @@ SCPS-10047:
     multitap: false
     linkCable: false
 PCPX-96098:
-  name: "Crash Bandicoot 2 - Cortex no Gyakushuu! (Japan) (Demo)"
+  name: "Crash Bandicoot 2 - Cortex no Gyakushuu! (Demo)"
+  saveName: "Crash Bandicoot 2 - Cortex no Gyakushuu! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10073:
-  name: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (Japan)"
+  name: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu"
+  saveName: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30871,7 +32351,8 @@ SCPS-10073:
     multitap: false
     linkCable: false
 PCPX-96145:
-  name: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (Japan) (Tentou You Taikenban)"
+  name: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (Tentou You Taikenban)"
+  saveName: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (Japan) (Tentou You Taikenban)"
 SCPS-45350:
   name: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (aka Crash Bandicoot 3 - Buttobi! Sekai Isshuu / Crash Bandicoot 3 - Warped)"
   controllers:
@@ -30897,7 +32378,8 @@ SCPS-45350:
     multitap: false
     linkCable: false
 SCES-01420:
-  name: "Crash Bandicoot 3 - Warped (Europe) (En,Fr,De,Es,It)"
+  name: "Crash Bandicoot 3 - Warped"
+  saveName: "Crash Bandicoot 3 - Warped (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -30946,7 +32428,8 @@ SCPS-45511:
     multitap: true
     linkCable: false
 SCPS-10140:
-  name: "Crash Bandicoot Carnival (Japan)"
+  name: "Crash Bandicoot Carnival"
+  saveName: "Crash Bandicoot Carnival (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -30968,7 +32451,8 @@ SCPS-10140:
     multitap: true
     linkCable: false
 PCPX-96202:
-  name: "Crash Bandicoot Carnival (Japan) (Demo)"
+  name: "Crash Bandicoot Carnival (Demo)"
+  saveName: "Crash Bandicoot Carnival (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45470:
@@ -30994,7 +32478,8 @@ SCPS-45470:
     multitap: true
     linkCable: false
 SCPS-10118:
-  name: "Crash Bandicoot Racing (Japan)"
+  name: "Crash Bandicoot Racing"
+  saveName: "Crash Bandicoot Racing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31019,7 +32504,8 @@ SCPS-10118:
     multitap: true
     linkCable: false
 PCPX-96183:
-  name: "Crash Bandicoot Racing (Japan) (Demo)"
+  name: "Crash Bandicoot Racing (Demo)"
+  saveName: "Crash Bandicoot Racing (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
@@ -31067,11 +32553,13 @@ SCPS-91304:
     multitap: false
     linkCable: false
 SCUS-94654:
-  name: "Crash Bash & Spyro - Year of the Dragon (USA) (Demo)"
+  name: "Crash Bash & Spyro - Year of the Dragon (Demo)"
+  saveName: "Crash Bash & Spyro - Year of the Dragon (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02834:
-  name: "Crash Bash (Europe) (En,Fr,De,Es,It)"
+  name: "Crash Bash"
+  saveName: "Crash Bash (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31100,7 +32588,8 @@ SCES-02834:
     multitap: true
     linkCable: false
 SCUS-94570:
-  name: "Crash Bash (USA)"
+  name: "Crash Bash"
+  saveName: "Crash Bash (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31122,11 +32611,13 @@ SCUS-94570:
     multitap: true
     linkCable: false
 SCUS-94616:
-  name: "Crash Bash (USA) (Demo)"
+  name: "Crash Bash (Demo)"
+  saveName: "Crash Bash (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02582:
-  name: "Crazy Climber 2000 (Japan)"
+  name: "Crazy Climber 2000"
+  saveName: "Crazy Climber 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31145,7 +32636,8 @@ SLPS-02582:
     multitap: false
     linkCable: false
 LSP-130110:
-  name: "Creative Camp (USA)"
+  name: "Creative Camp"
+  saveName: "Creative Camp (USA)"
   controllers:
     - DigitalController
   codes:
@@ -31167,7 +32659,8 @@ LSP-130110:
     multitap: false
     linkCable: false
 LSP-130120:
-  name: "Creative Isle (USA)"
+  name: "Creative Isle"
+  saveName: "Creative Isle (USA)"
   codes:
     - LSP-130120
     - LSP13012001
@@ -31176,7 +32669,8 @@ LSP-130120:
     developer: "Lightspan"
     genre: "Educational"
 LSP-905109:
-  name: "Creative Journey (USA)"
+  name: "Creative Journey"
+  saveName: "Creative Journey (USA)"
   codes:
     - LSP-905109
     - LSP90510901
@@ -31186,7 +32680,8 @@ LSP-905109:
     developer: "Lightspan"
     genre: "Educational"
 LSP-907097:
-  name: "Creative Voyage (USA)"
+  name: "Creative Voyage"
+  saveName: "Creative Voyage (USA)"
   codes:
     - LSP-907097
     - LSP-90709701
@@ -31196,7 +32691,8 @@ LSP-907097:
     developer: "Lightspan"
     genre: "Educational"
 SLPS-00120:
-  name: "Creature Shock (Japan) (Disc 1)"
+  name: "Creature Shock (Disc 1)"
+  saveName: "Creature Shock (Japan) (Disc 1)"
   discSet:
     name: "Creature Shock (Japan)"
     serials:
@@ -31220,7 +32716,8 @@ SLPS-00120:
     multitap: false
     linkCable: false
 SLPS-00121:
-  name: "Creature Shock (Japan) (Disc 2)"
+  name: "Creature Shock (Disc 2)"
+  saveName: "Creature Shock (Japan) (Disc 2)"
   discSet:
     name: "Creature Shock (Japan)"
     serials:
@@ -31244,7 +32741,8 @@ SLPS-00121:
     multitap: false
     linkCable: false
 SLES-03690:
-  name: "Creatures (Europe) (En,Fr,De,Es,It)"
+  name: "Creatures"
+  saveName: "Creatures (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31267,7 +32765,8 @@ SLES-03690:
     multitap: false
     linkCable: false
 SLUS-01438:
-  name: "Creatures (USA)"
+  name: "Creatures"
+  saveName: "Creatures (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -31289,7 +32788,8 @@ SLUS-01438:
     multitap: false
     linkCable: false
 SLES-04111:
-  name: "Creatures - Raised in Space (Europe) (En,Fr,De,Es,It)"
+  name: "Creatures - Raised in Space"
+  saveName: "Creatures - Raised in Space (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31312,7 +32812,8 @@ SLES-04111:
     multitap: false
     linkCable: false
 SLUS-01553:
-  name: "Creatures - Raised in Space (USA)"
+  name: "Creatures - Raised in Space"
+  saveName: "Creatures - Raised in Space (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -31334,7 +32835,8 @@ SLUS-01553:
     multitap: false
     linkCable: false
 SLES-02495:
-  name: "Cricket 2000 (Europe)"
+  name: "Cricket 2000"
+  saveName: "Cricket 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31353,7 +32855,8 @@ SLES-02495:
     multitap: false
     linkCable: false
 SCPS-10003:
-  name: "Crime Crackers (Japan)"
+  name: "Crime Crackers"
+  saveName: "Crime Crackers (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-7272-g143acca03"
@@ -31379,7 +32882,8 @@ SCPS-10003:
     multitap: false
     linkCable: false
 SCPS-10037:
-  name: "Crime Crackers 2 (Japan)"
+  name: "Crime Crackers 2"
+  saveName: "Crime Crackers 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -31397,11 +32901,13 @@ SCPS-10037:
     multitap: false
     linkCable: false
 SLED-01085:
-  name: "Crime Killer (Europe) (Demo)"
+  name: "Crime Killer (Demo)"
+  saveName: "Crime Killer (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00954:
-  name: "Crime Killer (Europe) (En,Fr,De,Es,It)"
+  name: "Crime Killer"
+  saveName: "Crime Killer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31424,11 +32930,13 @@ SLES-00954:
     multitap: false
     linkCable: false
 SLED-01305:
-  name: "Crime Killer (Germany) (Demo)"
+  name: "Crime Killer (Demo)"
+  saveName: "Crime Killer (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00576:
-  name: "Crime Killer (USA)"
+  name: "Crime Killer"
+  saveName: "Crime Killer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -31452,11 +32960,13 @@ SLUS-00576:
     multitap: false
     linkCable: false
 SLUS-90020:
-  name: "Crime Killer (USA) (Demo)"
+  name: "Crime Killer (Demo)"
+  saveName: "Crime Killer (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02793:
-  name: "Crisis Beat (Europe)"
+  name: "Crisis Beat"
+  saveName: "Crisis Beat (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31478,7 +32988,8 @@ SLES-02793:
     multitap: false
     linkCable: false
 SLPS-01430:
-  name: "Crisis Beat (Japan)"
+  name: "Crisis Beat"
+  saveName: "Crisis Beat (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31500,7 +33011,8 @@ SLPS-01430:
     multitap: false
     linkCable: false
 SLPS-01269:
-  name: "Crisis City (Japan)"
+  name: "Crisis City"
+  saveName: "Crisis City (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31519,7 +33031,8 @@ SLPS-01269:
     multitap: false
     linkCable: false
 SLPS-01044:
-  name: "Critical Blow (Japan)"
+  name: "Critical Blow"
+  saveName: "Critical Blow (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31538,7 +33051,8 @@ SLPS-01044:
     multitap: false
     linkCable: false
 SLES-00136:
-  name: "Critical Depth (Europe)"
+  name: "Critical Depth"
+  saveName: "Critical Depth (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31557,7 +33071,8 @@ SLES-00136:
     multitap: false
     linkCable: false
 SLUS-00428:
-  name: "Critical Depth (USA)"
+  name: "Critical Depth"
+  saveName: "Critical Depth (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31576,7 +33091,8 @@ SLUS-00428:
     multitap: false
     linkCable: false
 SLES-00196:
-  name: "Criticom (Europe)"
+  name: "Criticom"
+  saveName: "Criticom (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -31594,7 +33110,8 @@ SLES-00196:
     multitap: false
     linkCable: false
 SLUS-00046:
-  name: "Criticom (USA)"
+  name: "Criticom"
+  saveName: "Criticom (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -31612,7 +33129,8 @@ SLUS-00046:
     multitap: false
     linkCable: false
 SLPS-00229:
-  name: "Criticom - The Critical Combat (Japan)"
+  name: "Criticom - The Critical Combat"
+  saveName: "Criticom - The Critical Combat (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -31630,7 +33148,8 @@ SLPS-00229:
     multitap: false
     linkCable: false
 SLES-00593:
-  name: "Croc - Legend of the Gobbos (Europe)"
+  name: "Croc - Legend of the Gobbos"
+  saveName: "Croc - Legend of the Gobbos (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31651,13 +33170,15 @@ SLES-00593:
     multitap: false
     linkCable: false
 SLED-00038:
-  name: "Croc - Legend of the Gobbos (Europe) (Demo)"
+  name: "Croc - Legend of the Gobbos (Demo)"
+  saveName: "Croc - Legend of the Gobbos (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLUS-00530:
-  name: "Croc - Legend of the Gobbos (USA)"
+  name: "Croc - Legend of the Gobbos"
+  saveName: "Croc - Legend of the Gobbos (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31681,7 +33202,8 @@ SLUS-00530:
     multitap: false
     linkCable: false
 SLED-02119:
-  name: "Croc 2 (Europe) (Demo)"
+  name: "Croc 2 (Demo)"
+  saveName: "Croc 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   compatibility:
@@ -31690,7 +33212,8 @@ SLED-02119:
   traits:
     - ForcePGXPCPUMode
 SLES-02088:
-  name: "Croc 2 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  name: "Croc 2"
+  saveName: "Croc 2 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-7272-g143acca03"
@@ -31720,7 +33243,8 @@ SLES-02088:
     multitap: false
     linkCable: false
 SLUS-00634:
-  name: "Croc 2 (USA)"
+  name: "Croc 2"
+  saveName: "Croc 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31744,13 +33268,15 @@ SLUS-00634:
     multitap: false
     linkCable: false
 SLUS-90056:
-  name: "Croc 2 (USA) (Demo)"
+  name: "Croc 2 (Demo)"
+  saveName: "Croc 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPM-86310:
-  name: "Croc Adventure (Japan)"
+  name: "Croc Adventure"
+  saveName: "Croc Adventure (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -31774,13 +33300,15 @@ SLPM-86310:
     multitap: false
     linkCable: false
 SLPM-80473:
-  name: "Croc Adventure (Japan) (Demo)"
+  name: "Croc Adventure (Demo)"
+  saveName: "Croc Adventure (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPS-01055:
-  name: "Croc! Pau-Pau Island (Japan)"
+  name: "Croc! Pau-Pau Island"
+  saveName: "Croc! Pau-Pau Island (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31801,13 +33329,15 @@ SLPS-01055:
     multitap: false
     linkCable: false
 SLPM-80173:
-  name: "Croc! Pau-Pau Island (Japan) (Demo)"
+  name: "Croc! Pau-Pau Island (Demo)"
+  saveName: "Croc! Pau-Pau Island (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPM-87235:
-  name: "Croket! Kindan no Kinka Box! (Japan)"
+  name: "Croket! Kindan no Kinka Box!"
+  saveName: "Croket! Kindan no Kinka Box! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31829,7 +33359,8 @@ SLPM-87235:
     multitap: false
     linkCable: false
 SLPS-00713:
-  name: "Cross Romance - Koi to Mahjong to Hanafuda to (Japan)"
+  name: "Cross Romance - Koi to Mahjong to Hanafuda to"
+  saveName: "Cross Romance - Koi to Mahjong to Hanafuda to (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -31850,7 +33381,8 @@ SLPS-00713:
     multitap: false
     linkCable: false
 SLPM-86280:
-  name: "Cross Tantei Monogatari (Japan) (Disc 1)"
+  name: "Cross Tantei Monogatari (Disc 1)"
+  saveName: "Cross Tantei Monogatari (Japan) (Disc 1)"
   discSet:
     name: "Cross Tantei Monogatari (Japan)"
     serials:
@@ -31874,7 +33406,8 @@ SLPM-86280:
     multitap: false
     linkCable: false
 SLPM-86281:
-  name: "Cross Tantei Monogatari (Japan) (Disc 2)"
+  name: "Cross Tantei Monogatari (Disc 2)"
+  saveName: "Cross Tantei Monogatari (Japan) (Disc 2)"
   discSet:
     name: "Cross Tantei Monogatari (Japan)"
     serials:
@@ -31898,9 +33431,11 @@ SLPM-86281:
     multitap: false
     linkCable: false
 SLPM-80461:
-  name: "Cross Tantei Monogatari (Japan) (Taikenban)"
+  name: "Cross Tantei Monogatari (Taikenban)"
+  saveName: "Cross Tantei Monogatari (Japan) (Taikenban)"
 SLPM-86639:
-  name: "Cross Tantei Monogatari 1 - Kouhen (Japan)"
+  name: "Cross Tantei Monogatari 1 - Kouhen"
+  saveName: "Cross Tantei Monogatari 1 - Kouhen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31919,7 +33454,8 @@ SLPM-86639:
     multitap: false
     linkCable: false
 SLPM-86638:
-  name: "Cross Tantei Monogatari 1 - Zenpen (Japan)"
+  name: "Cross Tantei Monogatari 1 - Zenpen"
+  saveName: "Cross Tantei Monogatari 1 - Zenpen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31938,7 +33474,8 @@ SLPM-86638:
     multitap: false
     linkCable: false
 SLUS-01342:
-  name: "Crossroad Crisis (USA)"
+  name: "Crossroad Crisis"
+  saveName: "Crossroad Crisis (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -31957,7 +33494,8 @@ SLUS-01342:
     multitap: false
     linkCable: false
 SLES-00279:
-  name: "Crow, The - City of Angels (Europe)"
+  name: "Crow, The - City of Angels"
+  saveName: "Crow, The - City of Angels (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -31975,7 +33513,8 @@ SLES-00279:
     multitap: false
     linkCable: false
 SLES-00648:
-  name: "Crow, The - City of Angels (Germany)"
+  name: "Crow, The - City of Angels"
+  saveName: "Crow, The - City of Angels (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -31993,7 +33532,8 @@ SLES-00648:
     multitap: false
     linkCable: false
 SLPS-00769:
-  name: "Crow, The - City of Angels (Japan)"
+  name: "Crow, The - City of Angels"
+  saveName: "Crow, The - City of Angels (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -32011,7 +33551,8 @@ SLPS-00769:
     multitap: false
     linkCable: false
 SLUS-00242:
-  name: "Crow, The - City of Angels (USA)"
+  name: "Crow, The - City of Angels"
+  saveName: "Crow, The - City of Angels (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -32029,7 +33570,8 @@ SLUS-00242:
     multitap: false
     linkCable: false
 SLPS-01558:
-  name: "Crown Knights, The - Jaja-Uma! Quartet - Mega Dream Destruction (Japan)"
+  name: "Crown Knights, The - Jaja-Uma! Quartet - Mega Dream Destruction"
+  saveName: "Crown Knights, The - Jaja-Uma! Quartet - Mega Dream Destruction (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -32047,7 +33589,8 @@ SLPS-01558:
     multitap: false
     linkCable: false
 SLES-00587:
-  name: "Crusader - No Remorse (Europe)"
+  name: "Crusader - No Remorse"
+  saveName: "Crusader - No Remorse (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -32065,7 +33608,8 @@ SLES-00587:
     multitap: false
     linkCable: false
 SLES-00588:
-  name: "Crusader - No Remorse (France)"
+  name: "Crusader - No Remorse"
+  saveName: "Crusader - No Remorse (France)"
   controllers:
     - DigitalController
   metadata:
@@ -32083,7 +33627,8 @@ SLES-00588:
     multitap: false
     linkCable: false
 SLES-00589:
-  name: "Crusader - No Remorse (Germany)"
+  name: "Crusader - No Remorse"
+  saveName: "Crusader - No Remorse (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -32101,7 +33646,8 @@ SLES-00589:
     multitap: false
     linkCable: false
 SLUS-00268:
-  name: "Crusader - No Remorse (USA)"
+  name: "Crusader - No Remorse"
+  saveName: "Crusader - No Remorse (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1064-g73cdd676"
@@ -32122,7 +33668,8 @@ SLUS-00268:
     multitap: false
     linkCable: false
 SLES-02582:
-  name: "Crusaders of Might and Magic (Europe)"
+  name: "Crusaders of Might and Magic"
+  saveName: "Crusaders of Might and Magic (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32141,7 +33688,8 @@ SLES-02582:
     multitap: false
     linkCable: false
 SLES-02583:
-  name: "Crusaders of Might and Magic (France)"
+  name: "Crusaders of Might and Magic"
+  saveName: "Crusaders of Might and Magic (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32160,7 +33708,8 @@ SLES-02583:
     multitap: false
     linkCable: false
 SLES-02584:
-  name: "Crusaders of Might and Magic (Germany)"
+  name: "Crusaders of Might and Magic"
+  saveName: "Crusaders of Might and Magic (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32179,7 +33728,8 @@ SLES-02584:
     multitap: false
     linkCable: false
 SLES-02692:
-  name: "Crusaders of Might and Magic (Italy)"
+  name: "Crusaders of Might and Magic"
+  saveName: "Crusaders of Might and Magic (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32198,7 +33748,8 @@ SLES-02692:
     multitap: false
     linkCable: false
 SLES-02691:
-  name: "Crusaders of Might and Magic (Spain)"
+  name: "Crusaders of Might and Magic"
+  saveName: "Crusaders of Might and Magic (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32217,7 +33768,8 @@ SLES-02691:
     multitap: false
     linkCable: false
 SLUS-00799:
-  name: "Crusaders of Might and Magic (USA)"
+  name: "Crusaders of Might and Magic"
+  saveName: "Crusaders of Might and Magic (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32236,7 +33788,8 @@ SLUS-00799:
     multitap: false
     linkCable: false
 SLES-00292:
-  name: "Crypt Killer (Europe)"
+  name: "Crypt Killer"
+  saveName: "Crypt Killer (Europe)"
   controllers:
     - DigitalController
     - Justifier
@@ -32257,7 +33810,8 @@ SLES-00292:
     multitap: false
     linkCable: false
 SLUS-00335:
-  name: "Crypt Killer (USA)"
+  name: "Crypt Killer"
+  saveName: "Crypt Killer (USA)"
   controllers:
     - DigitalController
     - Justifier
@@ -32278,7 +33832,8 @@ SLUS-00335:
     multitap: false
     linkCable: false
 SLPS-01026:
-  name: "Cu-On-Pa (Japan)"
+  name: "Cu-On-Pa"
+  saveName: "Cu-On-Pa (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -32296,11 +33851,13 @@ SLPS-01026:
     multitap: true
     linkCable: false
 SLPM-80142:
-  name: "Cu-On-Pa (Japan) (Demo)"
+  name: "Cu-On-Pa (Demo)"
+  saveName: "Cu-On-Pa (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03729:
-  name: "Cubix Robots for Everyone - Race 'n Robots (Europe)"
+  name: "Cubix Robots for Everyone - Race 'n Robots"
+  saveName: "Cubix Robots for Everyone - Race 'n Robots (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32320,7 +33877,8 @@ SLES-03729:
     multitap: true
     linkCable: false
 SLUS-01422:
-  name: "Cubix Robots for Everyone - Race 'n Robots (USA)"
+  name: "Cubix Robots for Everyone - Race 'n Robots"
+  saveName: "Cubix Robots for Everyone - Race 'n Robots (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32340,11 +33898,14 @@ SLUS-01422:
     multitap: true
     linkCable: false
 SLPM-80451:
-  name: "Culdcept - Cepter's Guild Vol. 1 (Japan)"
+  name: "Culdcept - Cepter's Guild Vol. 1"
+  saveName: "Culdcept - Cepter's Guild Vol. 1 (Japan)"
 SLPM-80477:
-  name: "Culdcept - Cepter's Guild Vol. 2 (Japan)"
+  name: "Culdcept - Cepter's Guild Vol. 2"
+  saveName: "Culdcept - Cepter's Guild Vol. 2 (Japan)"
 SLPM-86223:
-  name: "Culdcept - Expansion (Japan)"
+  name: "Culdcept - Expansion"
+  saveName: "Culdcept - Expansion (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32363,7 +33924,8 @@ SLPM-86223:
     multitap: true
     linkCable: false
 SLPM-86658:
-  name: "Culdcept - Expansion Plus (Japan)"
+  name: "Culdcept - Expansion Plus"
+  saveName: "Culdcept - Expansion Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32382,7 +33944,8 @@ SLPM-86658:
     multitap: true
     linkCable: false
 SLPS-01711:
-  name: "Curiosity Kills the Cat Koukishin wa Neko o Korosu ka (Japan)"
+  name: "Curiosity Kills the Cat Koukishin wa Neko o Korosu ka"
+  saveName: "Curiosity Kills the Cat Koukishin wa Neko o Korosu ka (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32401,7 +33964,8 @@ SLPS-01711:
     multitap: false
     linkCable: false
 SLPS-01864:
-  name: "Cyber Daisenryaku - Shutsugeki! Haruka Tai (Japan)"
+  name: "Cyber Daisenryaku - Shutsugeki! Haruka Tai"
+  saveName: "Cyber Daisenryaku - Shutsugeki! Haruka Tai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32420,7 +33984,8 @@ SLPS-01864:
     multitap: false
     linkCable: false
 SLPS-01048:
-  name: "Cyber Egg - Battle Champion (Japan)"
+  name: "Cyber Egg - Battle Champion"
+  saveName: "Cyber Egg - Battle Champion (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32458,7 +34023,8 @@ SCPS-45381:
     multitap: false
     linkCable: false
 SLPS-01910:
-  name: "Cyber Org (Japan)"
+  name: "Cyber Org"
+  saveName: "Cyber Org (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32477,7 +34043,8 @@ SLPS-01910:
     multitap: false
     linkCable: false
 SCES-00006:
-  name: "CyberSled (Europe)"
+  name: "CyberSled"
+  saveName: "CyberSled (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -32496,7 +34063,8 @@ SCES-00006:
     multitap: false
     linkCable: false
 SLPS-00023:
-  name: "CyberSled (Japan)"
+  name: "CyberSled"
+  saveName: "CyberSled (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -32517,7 +34085,8 @@ SLPS-00023:
     multitap: false
     linkCable: false
 SLUS-00008:
-  name: "CyberSled (USA)"
+  name: "CyberSled"
+  saveName: "CyberSled (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1629-g101907a7"
@@ -32539,7 +34108,8 @@ SLUS-00008:
     multitap: false
     linkCable: false
 SLES-00114:
-  name: "CyberSpeed (Europe) (En,Fr,De)"
+  name: "CyberSpeed"
+  saveName: "CyberSpeed (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
     - NeGcon
@@ -32558,7 +34128,8 @@ SLES-00114:
     multitap: false
     linkCable: false
 SLPS-00396:
-  name: "CyberSpeed (Japan)"
+  name: "CyberSpeed"
+  saveName: "CyberSpeed (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -32577,7 +34148,8 @@ SLPS-00396:
     multitap: false
     linkCable: false
 SLUS-00116:
-  name: "CyberSpeed (USA)"
+  name: "CyberSpeed"
+  saveName: "CyberSpeed (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -32596,7 +34168,8 @@ SLUS-00116:
     multitap: false
     linkCable: false
 SLES-02371:
-  name: "CyberTiger (Australia)"
+  name: "CyberTiger"
+  saveName: "CyberTiger (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32615,7 +34188,8 @@ SLES-02371:
     multitap: true
     linkCable: false
 SLES-02370:
-  name: "CyberTiger (Europe) (En,Fr,De,Es,Sv)"
+  name: "CyberTiger"
+  saveName: "CyberTiger (Europe) (En,Fr,De,Es,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32638,7 +34212,8 @@ SLES-02370:
     multitap: true
     linkCable: false
 SLUS-01004:
-  name: "CyberTiger (USA)"
+  name: "CyberTiger"
+  saveName: "CyberTiger (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -32657,7 +34232,8 @@ SLUS-01004:
     multitap: true
     linkCable: false
 SLPS-01011:
-  name: "Cyberbots - Fullmetal Madness (Japan)"
+  name: "Cyberbots - Fullmetal Madness"
+  saveName: "Cyberbots - Fullmetal Madness (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -32675,7 +34251,8 @@ SLPS-01011:
     multitap: false
     linkCable: false
 SLES-00233:
-  name: "Cyberia (Europe)"
+  name: "Cyberia"
+  saveName: "Cyberia (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -32694,7 +34271,8 @@ SLES-00233:
     multitap: false
     linkCable: false
 SLES-00272:
-  name: "Cyberia (Europe) (Fr,De)"
+  name: "Cyberia"
+  saveName: "Cyberia (Europe) (Fr,De)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -32714,7 +34292,8 @@ SLES-00272:
     multitap: false
     linkCable: false
 SLPS-00218:
-  name: "Cyberia (Japan)"
+  name: "Cyberia"
+  saveName: "Cyberia (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -32733,7 +34312,8 @@ SLPS-00218:
     multitap: false
     linkCable: false
 SLUS-00053:
-  name: "Cyberia (USA)"
+  name: "Cyberia"
+  saveName: "Cyberia (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -32752,7 +34332,8 @@ SLUS-00053:
     multitap: false
     linkCable: false
 SLPS-01912:
-  name: "Cybernetic Empire (Japan) (Disc 1)"
+  name: "Cybernetic Empire (Disc 1)"
+  saveName: "Cybernetic Empire (Japan) (Disc 1)"
   discSet:
     name: "Cybernetic Empire (Japan)"
     serials:
@@ -32776,7 +34357,8 @@ SLPS-01912:
     multitap: false
     linkCable: false
 SLPS-01913:
-  name: "Cybernetic Empire (Japan) (Disc 2)"
+  name: "Cybernetic Empire (Disc 2)"
+  saveName: "Cybernetic Empire (Japan) (Disc 2)"
   discSet:
     name: "Cybernetic Empire (Japan)"
     serials:
@@ -32800,9 +34382,11 @@ SLPS-01913:
     multitap: false
     linkCable: false
 SLPM-80422:
-  name: "Cybernetic Tuning Master, The - Exhaust King (Japan)"
+  name: "Cybernetic Tuning Master, The - Exhaust King"
+  saveName: "Cybernetic Tuning Master, The - Exhaust King (Japan)"
 SLPS-00055:
-  name: "Cyberwar (Japan) (Disc 1)"
+  name: "Cyberwar (Disc 1)"
+  saveName: "Cyberwar (Japan) (Disc 1)"
   discSet:
     name: "Cyberwar (Japan)"
     serials:
@@ -32829,7 +34413,8 @@ SLPS-00055:
     multitap: false
     linkCable: false
 SLPS-00056:
-  name: "Cyberwar (Japan) (Disc 2)"
+  name: "Cyberwar (Disc 2)"
+  saveName: "Cyberwar (Japan) (Disc 2)"
   discSet:
     name: "Cyberwar (Japan)"
     serials:
@@ -32854,7 +34439,8 @@ SLPS-00056:
     multitap: false
     linkCable: false
 SLPS-00057:
-  name: "Cyberwar (Japan) (Disc 3)"
+  name: "Cyberwar (Disc 3)"
+  saveName: "Cyberwar (Japan) (Disc 3)"
   discSet:
     name: "Cyberwar (Japan)"
     serials:
@@ -32879,7 +34465,8 @@ SLPS-00057:
     multitap: false
     linkCable: false
 SLES-00065:
-  name: "D (Europe) (Disc 1)"
+  name: "D (Disc 1)"
+  saveName: "D (Europe) (Disc 1)"
   discSet:
     name: "D (Europe)"
     serials:
@@ -32903,7 +34490,8 @@ SLES-00065:
     multitap: false
     linkCable: false
 SLES-10065:
-  name: "D (Europe) (Disc 2)"
+  name: "D (Disc 2)"
+  saveName: "D (Europe) (Disc 2)"
   discSet:
     name: "D (Europe)"
     serials:
@@ -32927,7 +34515,8 @@ SLES-10065:
     multitap: false
     linkCable: false
 SLES-20065:
-  name: "D (Europe) (Disc 3)"
+  name: "D (Disc 3)"
+  saveName: "D (Europe) (Disc 3)"
   discSet:
     name: "D (Europe)"
     serials:
@@ -32951,7 +34540,8 @@ SLES-20065:
     multitap: false
     linkCable: false
 SLES-00161:
-  name: "D (France) (Disc 1)"
+  name: "D (Disc 1)"
+  saveName: "D (France) (Disc 1)"
   discSet:
     name: "D (France)"
     serials:
@@ -32975,7 +34565,8 @@ SLES-00161:
     multitap: false
     linkCable: false
 SLES-10161:
-  name: "D (France) (Disc 2)"
+  name: "D (Disc 2)"
+  saveName: "D (France) (Disc 2)"
   discSet:
     name: "D (France)"
     serials:
@@ -32999,7 +34590,8 @@ SLES-10161:
     multitap: false
     linkCable: false
 SLES-20161:
-  name: "D (France) (Disc 3)"
+  name: "D (Disc 3)"
+  saveName: "D (France) (Disc 3)"
   discSet:
     name: "D (France)"
     serials:
@@ -33023,7 +34615,8 @@ SLES-20161:
     multitap: false
     linkCable: false
 SLES-00160:
-  name: "D (Germany) (Disc 1)"
+  name: "D (Disc 1)"
+  saveName: "D (Germany) (Disc 1)"
   discSet:
     name: "D (Germany)"
     serials:
@@ -33047,7 +34640,8 @@ SLES-00160:
     multitap: false
     linkCable: false
 SLES-10160:
-  name: "D (Germany) (Disc 2)"
+  name: "D (Disc 2)"
+  saveName: "D (Germany) (Disc 2)"
   discSet:
     name: "D (Germany)"
     serials:
@@ -33071,7 +34665,8 @@ SLES-10160:
     multitap: false
     linkCable: false
 SLES-20160:
-  name: "D (Germany) (Disc 3)"
+  name: "D (Disc 3)"
+  saveName: "D (Germany) (Disc 3)"
   discSet:
     name: "D (Germany)"
     serials:
@@ -33095,7 +34690,8 @@ SLES-20160:
     multitap: false
     linkCable: false
 SLUS-00128:
-  name: "D (USA) (Disc 1)"
+  name: "D (Disc 1)"
+  saveName: "D (USA) (Disc 1)"
   discSet:
     name: "D (USA)"
     serials:
@@ -33122,7 +34718,8 @@ SLUS-00128:
     multitap: false
     linkCable: false
 SLUS-00173:
-  name: "D (USA) (Disc 2)"
+  name: "D (Disc 2)"
+  saveName: "D (USA) (Disc 2)"
   discSet:
     name: "D (USA)"
     serials:
@@ -33146,7 +34743,8 @@ SLUS-00173:
     multitap: false
     linkCable: false
 SLUS-00174:
-  name: "D (USA) (Disc 3)"
+  name: "D (Disc 3)"
+  saveName: "D (USA) (Disc 3)"
   discSet:
     name: "D (USA)"
     serials:
@@ -33170,7 +34768,8 @@ SLUS-00174:
     multitap: false
     linkCable: false
 SLPS-00133:
-  name: "D no Shokutaku - Complete Graphics (Japan) (Disc 1)"
+  name: "D no Shokutaku - Complete Graphics (Disc 1)"
+  saveName: "D no Shokutaku - Complete Graphics (Japan) (Disc 1)"
   discSet:
     name: "D no Shokutaku - Complete Graphics (Japan)"
     serials:
@@ -33197,7 +34796,8 @@ SLPS-00133:
     multitap: false
     linkCable: false
 SLPS-00134:
-  name: "D no Shokutaku - Complete Graphics (Japan) (Disc 2)"
+  name: "D no Shokutaku - Complete Graphics (Disc 2)"
+  saveName: "D no Shokutaku - Complete Graphics (Japan) (Disc 2)"
   discSet:
     name: "D no Shokutaku - Complete Graphics (Japan)"
     serials:
@@ -33224,7 +34824,8 @@ SLPS-00134:
     multitap: false
     linkCable: false
 SLPS-00135:
-  name: "D no Shokutaku - Complete Graphics (Japan) (Disc 3)"
+  name: "D no Shokutaku - Complete Graphics (Disc 3)"
+  saveName: "D no Shokutaku - Complete Graphics (Japan) (Disc 3)"
   discSet:
     name: "D no Shokutaku - Complete Graphics (Japan)"
     serials:
@@ -33251,11 +34852,13 @@ SLPS-00135:
     multitap: false
     linkCable: false
 SLPM-80558:
-  name: "D-1 Grand Prix (Japan) (Demo)"
+  name: "D-1 Grand Prix (Demo)"
+  saveName: "D-1 Grand Prix (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01040:
-  name: "DBZ - Dead Ball Zone (Europe) (En,Fr,De,Es,It)"
+  name: "DBZ - Dead Ball Zone"
+  saveName: "DBZ - Dead Ball Zone (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33278,7 +34881,8 @@ SLES-01040:
     multitap: false
     linkCable: false
 SLUS-00658:
-  name: "DBZ - Dead Ball Zone (USA) (En,Fr,De,Es,It)"
+  name: "DBZ - Dead Ball Zone"
+  saveName: "DBZ - Dead Ball Zone (USA) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -33299,7 +34903,8 @@ SLUS-00658:
     multitap: false
     linkCable: false
 SLES-03402:
-  name: "DSF Fussball Manager 2001 (Germany)"
+  name: "DSF Fussball Manager 2001"
+  saveName: "DSF Fussball Manager 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33318,7 +34923,8 @@ SLES-03402:
     multitap: false
     linkCable: false
 SLES-03864:
-  name: "DSF Fussball Manager 2002 (Germany)"
+  name: "DSF Fussball Manager 2002"
+  saveName: "DSF Fussball Manager 2002 (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -33336,7 +34942,8 @@ SLES-03864:
     multitap: false
     linkCable: false
 SLPM-86908:
-  name: "DX Hyakunin Isshu (Japan)"
+  name: "DX Hyakunin Isshu"
+  saveName: "DX Hyakunin Isshu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33411,7 +35018,8 @@ SLPM-87348:
     multitap: true
     linkCable: false
 SLPS-02943:
-  name: "DX Monopoly (Japan)"
+  name: "DX Monopoly"
+  saveName: "DX Monopoly (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33447,7 +35055,8 @@ SLPM-87133:
     multitap: true
     linkCable: false
 SLPS-00570:
-  name: "DX Nippon Tokkyuu Ryokou Game - Let's Travel in Japan (Japan)"
+  name: "DX Nippon Tokkyuu Ryokou Game - Let's Travel in Japan"
+  saveName: "DX Nippon Tokkyuu Ryokou Game - Let's Travel in Japan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33465,7 +35074,8 @@ SLPS-00570:
     multitap: false
     linkCable: false
 SLPS-91054:
-  name: "DX Nippon Tokkyuu Ryokou Game - Let's Travel in Japan (Japan) (Rev 1)"
+  name: "DX Nippon Tokkyuu Ryokou Game - Let's Travel in Japan"
+  saveName: "DX Nippon Tokkyuu Ryokou Game - Let's Travel in Japan (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -33483,7 +35093,8 @@ SLPS-91054:
     multitap: false
     linkCable: false
 SLPS-00623:
-  name: "DX Okuman Chouja Game - The Money Battle (Japan)"
+  name: "DX Okuman Chouja Game - The Money Battle"
+  saveName: "DX Okuman Chouja Game - The Money Battle (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -33504,7 +35115,8 @@ SLPS-00623:
     multitap: true
     linkCable: false
 SLPS-01586:
-  name: "DX Okuman Chouja Game II - The Money Battle (Japan)"
+  name: "DX Okuman Chouja Game II - The Money Battle"
+  saveName: "DX Okuman Chouja Game II - The Money Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33545,7 +35157,8 @@ SLPM-87344:
     multitap: true
     linkCable: false
 SLPS-02105:
-  name: "DX Shachou Game (Japan)"
+  name: "DX Shachou Game"
+  saveName: "DX Shachou Game (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -33584,7 +35197,8 @@ SLPM-87345:
     multitap: true
     linkCable: false
 SLPS-02406:
-  name: "Dai-2-Ji Super Robot Taisen (Japan)"
+  name: "Dai-2-Ji Super Robot Taisen"
+  saveName: "Dai-2-Ji Super Robot Taisen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33602,7 +35216,8 @@ SLPS-02406:
     multitap: false
     linkCable: false
 SLPM-87346:
-  name: "Dai-2-kai! Quiz Darake no Jinsei Game (Japan)"
+  name: "Dai-2-kai! Quiz Darake no Jinsei Game"
+  saveName: "Dai-2-kai! Quiz Darake no Jinsei Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33621,7 +35236,8 @@ SLPM-87346:
     multitap: true
     linkCable: false
 SLPS-02530:
-  name: "Dai-3-Ji Super Robot Taisen (Japan)"
+  name: "Dai-3-Ji Super Robot Taisen"
+  saveName: "Dai-3-Ji Super Robot Taisen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33639,7 +35255,8 @@ SLPS-02530:
     multitap: false
     linkCable: false
 SLPS-00196:
-  name: "Dai-4-Ji Super Robot Taisen S (Japan)"
+  name: "Dai-4-Ji Super Robot Taisen S"
+  saveName: "Dai-4-Ji Super Robot Taisen S (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33657,7 +35274,8 @@ SLPS-00196:
     multitap: false
     linkCable: false
 SLPS-91014:
-  name: "Dai-4-Ji Super Robot Taisen S (Japan) (Rev 1)"
+  name: "Dai-4-Ji Super Robot Taisen S"
+  saveName: "Dai-4-Ji Super Robot Taisen S (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -33675,7 +35293,8 @@ SLPS-91014:
     multitap: false
     linkCable: false
 SLPS-00813:
-  name: "Daibouken Deluxe - Haruka naru Umi (Japan)"
+  name: "Daibouken Deluxe - Haruka naru Umi"
+  saveName: "Daibouken Deluxe - Haruka naru Umi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33693,7 +35312,8 @@ SLPS-00813:
     multitap: false
     linkCable: false
 SLPS-01021:
-  name: "Daikoukai Jidai Gaiden (Japan)"
+  name: "Daikoukai Jidai Gaiden"
+  saveName: "Daikoukai Jidai Gaiden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33711,7 +35331,8 @@ SLPS-01021:
     multitap: false
     linkCable: false
 SLPM-86309:
-  name: "Daikoukai Jidai Gaiden (Japan) (Rev 1)"
+  name: "Daikoukai Jidai Gaiden"
+  saveName: "Daikoukai Jidai Gaiden (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -33747,7 +35368,8 @@ SLPM-86863:
     multitap: false
     linkCable: false
 SLPM-86203:
-  name: "Daikoukai Jidai II (Japan)"
+  name: "Daikoukai Jidai II"
+  saveName: "Daikoukai Jidai II (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -33786,7 +35408,8 @@ SLPM-86745:
     multitap: false
     linkCable: false
 SLPM-86382:
-  name: "Daikoukai Jidai IV - Porto Estado (Japan)"
+  name: "Daikoukai Jidai IV - Porto Estado"
+  saveName: "Daikoukai Jidai IV - Porto Estado (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33805,7 +35428,8 @@ SLPM-86382:
     multitap: false
     linkCable: false
 SLPM-86996:
-  name: "Daikoukai Jidai IV - Porto Estado (Japan) (Koei the Best)"
+  name: "Daikoukai Jidai IV - Porto Estado (Koei the Best)"
+  saveName: "Daikoukai Jidai IV - Porto Estado (Japan) (Koei the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33824,7 +35448,8 @@ SLPM-86996:
     multitap: false
     linkCable: false
 SLPM-86431:
-  name: "Daikoukai Jidai IV - Porto Estado (Japan) (Shokai Genteiban)"
+  name: "Daikoukai Jidai IV - Porto Estado (Shokai Genteiban)"
+  saveName: "Daikoukai Jidai IV - Porto Estado (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33881,7 +35506,8 @@ SLPS-01411:
     multitap: false
     linkCable: false
 SLPS-02160:
-  name: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan (Japan)"
+  name: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan"
+  saveName: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33900,11 +35526,13 @@ SLPS-02160:
     multitap: false
     linkCable: false
 SLPM-80259:
-  name: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan (Japan) (Demo)"
+  name: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan (Demo)"
+  saveName: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01699:
-  name: "Daisenryaku - Master Combat (Japan)"
+  name: "Daisenryaku - Master Combat"
+  saveName: "Daisenryaku - Master Combat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -33926,7 +35554,8 @@ SLPS-01699:
     multitap: false
     linkCable: false
 SLPS-00299:
-  name: "Daisenryaku - Player's Spirit (Japan)"
+  name: "Daisenryaku - Player's Spirit"
+  saveName: "Daisenryaku - Player's Spirit (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -33944,7 +35573,8 @@ SLPS-00299:
     multitap: true
     linkCable: false
 SLPS-91178:
-  name: "Daisenryaku - Player's Spirit (Japan) (Rev 1)"
+  name: "Daisenryaku - Player's Spirit"
+  saveName: "Daisenryaku - Player's Spirit (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -33962,7 +35592,8 @@ SLPS-91178:
     multitap: true
     linkCable: false
 SLPS-00634:
-  name: "Dakar '97 (Japan)"
+  name: "Dakar '97"
+  saveName: "Dakar '97 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34002,7 +35633,8 @@ SCPS-45041:
     multitap: false
     linkCable: false
 SLES-04061:
-  name: "Dalmatians 2 (Europe) (En,Fr,De)"
+  name: "Dalmatians 2"
+  saveName: "Dalmatians 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34023,7 +35655,8 @@ SLES-04061:
     multitap: false
     linkCable: false
 SLES-02959:
-  name: "Dalmatians, The (Europe) (En,Fr,De,Nl)"
+  name: "Dalmatians, The"
+  saveName: "Dalmatians, The (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34045,7 +35678,8 @@ SLES-02959:
     multitap: false
     linkCable: false
 SLPS-01135:
-  name: "DamDam Stompland (Japan)"
+  name: "DamDam Stompland"
+  saveName: "DamDam Stompland (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -34063,9 +35697,11 @@ SLPS-01135:
     multitap: false
     linkCable: false
 SLPM-80170:
-  name: "DamDam Stompland (Japan) (Taikenban)"
+  name: "DamDam Stompland (Taikenban)"
+  saveName: "DamDam Stompland (Japan) (Taikenban)"
 SLPM-86222:
-  name: "Dance Dance Revolution (Japan)"
+  name: "Dance Dance Revolution"
+  saveName: "Dance Dance Revolution (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34084,7 +35720,8 @@ SLPM-86222:
     multitap: false
     linkCable: false
 SLUS-01280:
-  name: "Dance Dance Revolution (USA)"
+  name: "Dance Dance Revolution"
+  saveName: "Dance Dance Revolution (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -34106,7 +35743,8 @@ SLUS-01280:
     multitap: false
     linkCable: false
 SLPM-86693:
-  name: "Dance Dance Revolution - Best Hits (Japan)"
+  name: "Dance Dance Revolution - Best Hits"
+  saveName: "Dance Dance Revolution - Best Hits (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34125,7 +35763,8 @@ SLPM-86693:
     multitap: false
     linkCable: false
 SLUS-01281:
-  name: "Dance Dance Revolution - Disney Mix (USA)"
+  name: "Dance Dance Revolution - Disney Mix"
+  saveName: "Dance Dance Revolution - Disney Mix (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -34147,7 +35786,8 @@ SLUS-01281:
     multitap: false
     linkCable: false
 SLPM-86667:
-  name: "Dance Dance Revolution - Disney's Rave (Japan)"
+  name: "Dance Dance Revolution - Disney's Rave"
+  saveName: "Dance Dance Revolution - Disney's Rave (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34166,7 +35806,8 @@ SLPM-86667:
     multitap: false
     linkCable: false
 SLPM-86831:
-  name: "Dance Dance Revolution - Extra Mix (Japan)"
+  name: "Dance Dance Revolution - Extra Mix"
+  saveName: "Dance Dance Revolution - Extra Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34204,7 +35845,8 @@ SCPS-45428:
     multitap: false
     linkCable: false
 SLPM-86252:
-  name: "Dance Dance Revolution 2nd Remix (Japan)"
+  name: "Dance Dance Revolution 2nd Remix"
+  saveName: "Dance Dance Revolution 2nd Remix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34223,7 +35865,8 @@ SLPM-86252:
     multitap: false
     linkCable: false
 SCPS-45456:
-  name: "Dance Dance Revolution 2nd Remix - Append Club Version Vol. 1 (Japan, Asia)"
+  name: "Dance Dance Revolution 2nd Remix - Append Club Version Vol. 1"
+  saveName: "Dance Dance Revolution 2nd Remix - Append Club Version Vol. 1 (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34245,7 +35888,8 @@ SCPS-45456:
     multitap: false
     linkCable: false
 SLPM-86399:
-  name: "Dance Dance Revolution 2nd Remix - Append Club Version Vol. 2 (Japan)"
+  name: "Dance Dance Revolution 2nd Remix - Append Club Version Vol. 2"
+  saveName: "Dance Dance Revolution 2nd Remix - Append Club Version Vol. 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34302,7 +35946,8 @@ SCPS-45492:
     multitap: false
     linkCable: false
 SLPM-86503:
-  name: "Dance Dance Revolution 3rd Mix (Japan)"
+  name: "Dance Dance Revolution 3rd Mix"
+  saveName: "Dance Dance Revolution 3rd Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34321,7 +35966,8 @@ SLPM-86503:
     multitap: false
     linkCable: false
 SLPM-86752:
-  name: "Dance Dance Revolution 4th Mix (Japan)"
+  name: "Dance Dance Revolution 4th Mix"
+  saveName: "Dance Dance Revolution 4th Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34340,7 +35986,8 @@ SLPM-86752:
     multitap: false
     linkCable: false
 SLPM-86897:
-  name: "Dance Dance Revolution 5th Mix (Japan)"
+  name: "Dance Dance Revolution 5th Mix"
+  saveName: "Dance Dance Revolution 5th Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34359,7 +36006,8 @@ SLPM-86897:
     multitap: false
     linkCable: false
 SLUS-01446:
-  name: "Dance Dance Revolution Konamix (USA)"
+  name: "Dance Dance Revolution Konamix"
+  saveName: "Dance Dance Revolution Konamix (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34378,7 +36026,8 @@ SLUS-01446:
     multitap: false
     linkCable: false
 SLES-04129:
-  name: "Dance Europe (Europe) (Fr,De,Es,It,Nl,Pt)"
+  name: "Dance Europe"
+  saveName: "Dance Europe (Europe) (Fr,De,Es,It,Nl,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34421,7 +36070,8 @@ SCPS-45345:
     multitap: false
     linkCable: false
 SLPM-86150:
-  name: "Dance! Dance! Dance! (Japan)"
+  name: "Dance! Dance! Dance!"
+  saveName: "Dance! Dance! Dance! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34440,11 +36090,13 @@ SLPM-86150:
     multitap: false
     linkCable: false
 SLPM-80348:
-  name: "Dance! Dance! Dance! (Japan) (Demo)"
+  name: "Dance! Dance! Dance! (Demo)"
+  saveName: "Dance! Dance! Dance! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-04121:
-  name: "Dance-UK (UK)"
+  name: "Dance-UK"
+  saveName: "Dance-UK (UK)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34463,7 +36115,8 @@ SLES-04121:
     multitap: false
     linkCable: false
 SLES-04161:
-  name: "Dance-UK eXtra Trax (UK)"
+  name: "Dance-UK eXtra Trax"
+  saveName: "Dance-UK eXtra Trax (UK)"
   controllers:
     - DigitalController
   metadata:
@@ -34503,7 +36156,8 @@ SCPS-45303:
     multitap: false
     linkCable: false
 SLPM-86210:
-  name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan) (Disc 1)"
+  name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Disc 1)"
+  saveName: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan) (Disc 1)"
   discSet:
     name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan)"
     serials:
@@ -34527,7 +36181,8 @@ SLPM-86210:
     multitap: false
     linkCable: false
 SLPM-86211:
-  name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan) (Disc 2)"
+  name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Disc 2)"
+  saveName: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan) (Disc 2)"
   discSet:
     name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan)"
     serials:
@@ -34551,7 +36206,8 @@ SLPM-86211:
     multitap: false
     linkCable: false
 SLPM-86212:
-  name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan) (Disc 3)"
+  name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Disc 3)"
+  saveName: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan) (Disc 3)"
   discSet:
     name: "Dancing Blade Katte ni Momotenshi II - Tears of Eden (Japan)"
     serials:
@@ -34575,7 +36231,8 @@ SLPM-86212:
     multitap: false
     linkCable: false
 SLPM-86100:
-  name: "Dancing Blade Katte ni Momotenshi! (Japan) (Disc 1)"
+  name: "Dancing Blade Katte ni Momotenshi! (Disc 1)"
+  saveName: "Dancing Blade Katte ni Momotenshi! (Japan) (Disc 1)"
   discSet:
     name: "Dancing Blade Katte ni Momotenshi! (Japan)"
     serials:
@@ -34599,7 +36256,8 @@ SLPM-86100:
     multitap: false
     linkCable: false
 SLPM-86101:
-  name: "Dancing Blade Katte ni Momotenshi! (Japan) (Disc 2)"
+  name: "Dancing Blade Katte ni Momotenshi! (Disc 2)"
+  saveName: "Dancing Blade Katte ni Momotenshi! (Japan) (Disc 2)"
   discSet:
     name: "Dancing Blade Katte ni Momotenshi! (Japan)"
     serials:
@@ -34623,7 +36281,8 @@ SLPM-86101:
     multitap: false
     linkCable: false
 SLPM-86102:
-  name: "Dancing Blade Katte ni Momotenshi! (Japan) (Disc 3)"
+  name: "Dancing Blade Katte ni Momotenshi! (Disc 3)"
+  saveName: "Dancing Blade Katte ni Momotenshi! (Japan) (Disc 3)"
   discSet:
     name: "Dancing Blade Katte ni Momotenshi! (Japan)"
     serials:
@@ -34647,7 +36306,8 @@ SLPM-86102:
     multitap: false
     linkCable: false
 SLES-03384:
-  name: "Dancing Stage - Disney Mix (Europe)"
+  name: "Dancing Stage - Disney Mix"
+  saveName: "Dancing Stage - Disney Mix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34666,7 +36326,8 @@ SLES-03384:
     multitap: false
     linkCable: false
 SLES-02941:
-  name: "Dancing Stage - Euromix (Europe)"
+  name: "Dancing Stage - Euromix"
+  saveName: "Dancing Stage - Euromix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34685,7 +36346,8 @@ SLES-02941:
     multitap: false
     linkCable: false
 SLES-03882:
-  name: "Dancing Stage - Party Edition (Europe)"
+  name: "Dancing Stage - Party Edition"
+  saveName: "Dancing Stage - Party Edition (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34704,7 +36366,8 @@ SLES-03882:
     multitap: false
     linkCable: false
 SLES-04097:
-  name: "Dancing Stage Fever (Europe)"
+  name: "Dancing Stage Fever"
+  saveName: "Dancing Stage Fever (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34723,7 +36386,8 @@ SLES-04097:
     multitap: false
     linkCable: false
 SLES-04163:
-  name: "Dancing Stage Fusion (Europe) (En,Fr,De,Es,It)"
+  name: "Dancing Stage Fusion"
+  saveName: "Dancing Stage Fusion (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34746,7 +36410,8 @@ SLES-04163:
     multitap: false
     linkCable: false
 SLPM-86505:
-  name: "Dancing Stage featuring Dreams Come True (Japan)"
+  name: "Dancing Stage featuring Dreams Come True"
+  saveName: "Dancing Stage featuring Dreams Come True (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34765,7 +36430,8 @@ SLPM-86505:
     multitap: false
     linkCable: false
 SLPM-86411:
-  name: "Dancing Stage featuring True Kiss Destination (Japan)"
+  name: "Dancing Stage featuring True Kiss Destination"
+  saveName: "Dancing Stage featuring True Kiss Destination (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34784,7 +36450,8 @@ SLPM-86411:
     multitap: false
     linkCable: false
 SLPS-02609:
-  name: "Dangan (Japan)"
+  name: "Dangan"
+  saveName: "Dangan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -34802,7 +36469,8 @@ SLPS-02609:
     multitap: false
     linkCable: false
 SLES-03198:
-  name: "Danger Girl (Europe)"
+  name: "Danger Girl"
+  saveName: "Danger Girl (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34821,7 +36489,8 @@ SLES-03198:
     multitap: false
     linkCable: false
 SLUS-00881:
-  name: "Danger Girl (USA)"
+  name: "Danger Girl"
+  saveName: "Danger Girl (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -34843,7 +36512,8 @@ SLUS-00881:
     multitap: false
     linkCable: false
 SLPS-01025:
-  name: "Dare Devil Derby 3D (Japan)"
+  name: "Dare Devil Derby 3D"
+  saveName: "Dare Devil Derby 3D (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -34862,7 +36532,8 @@ SLPS-01025:
     multitap: true
     linkCable: false
 SLUS-00300:
-  name: "Dare Devil Derby 3D (USA)"
+  name: "Dare Devil Derby 3D"
+  saveName: "Dare Devil Derby 3D (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -34884,7 +36555,8 @@ SLUS-00300:
     multitap: true
     linkCable: false
 SLPS-00574:
-  name: "Darius Gaiden (Japan)"
+  name: "Darius Gaiden"
+  saveName: "Darius Gaiden (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -34905,7 +36577,8 @@ SLPS-00574:
     multitap: false
     linkCable: false
 SLPS-00789:
-  name: "Dark Hunter Ge - Youma no Mori (Japan)"
+  name: "Dark Hunter Ge - Youma no Mori"
+  saveName: "Dark Hunter Ge - Youma no Mori (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -34924,7 +36597,8 @@ SLPS-00789:
     multitap: false
     linkCable: false
 SLPS-00773:
-  name: "Dark Hunter Jou - Ijigen Gakuen (Japan)"
+  name: "Dark Hunter Jou - Ijigen Gakuen"
+  saveName: "Dark Hunter Jou - Ijigen Gakuen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -34943,7 +36617,8 @@ SLPS-00773:
     multitap: false
     linkCable: false
 SLPS-01422:
-  name: "Dark Messiah (Japan)"
+  name: "Dark Messiah"
+  saveName: "Dark Messiah (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34962,7 +36637,8 @@ SLPS-01422:
     multitap: false
     linkCable: false
 SLPS-00938:
-  name: "Dark Seed II (Japan)"
+  name: "Dark Seed II"
+  saveName: "Dark Seed II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -34980,7 +36656,8 @@ SLPS-00938:
     multitap: false
     linkCable: false
 SLPS-02316:
-  name: "Dark Tales - From the Lost Soul (Japan)"
+  name: "Dark Tales - From the Lost Soul"
+  saveName: "Dark Tales - From the Lost Soul (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -34999,7 +36676,8 @@ SLPS-02316:
     multitap: false
     linkCable: false
 SLES-00663:
-  name: "Darklight Conflict (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Darklight Conflict"
+  saveName: "Darklight Conflict (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -35022,7 +36700,8 @@ SLES-00663:
     multitap: false
     linkCable: false
 SLUS-00457:
-  name: "Darklight Conflict (USA) (En,Fr,De,Es,It,Sv)"
+  name: "Darklight Conflict"
+  saveName: "Darklight Conflict (USA) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -35045,7 +36724,8 @@ SLUS-00457:
     multitap: false
     linkCable: false
 SLPS-00108:
-  name: "Darkseed (Japan)"
+  name: "Darkseed"
+  saveName: "Darkseed (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -35064,7 +36744,8 @@ SLPS-00108:
     multitap: false
     linkCable: false
 SLES-00251:
-  name: "Darkstalkers - The Night Warriors (Europe)"
+  name: "Darkstalkers - The Night Warriors"
+  saveName: "Darkstalkers - The Night Warriors (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -35082,7 +36763,8 @@ SLES-00251:
     multitap: false
     linkCable: false
 SLUS-00036:
-  name: "Darkstalkers - The Night Warriors (USA)"
+  name: "Darkstalkers - The Night Warriors"
+  saveName: "Darkstalkers - The Night Warriors (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -35100,7 +36782,8 @@ SLUS-00036:
     multitap: false
     linkCable: false
 SLES-01719:
-  name: "Darkstalkers 3 (Europe)"
+  name: "Darkstalkers 3"
+  saveName: "Darkstalkers 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35121,7 +36804,8 @@ SLES-01719:
     multitap: false
     linkCable: false
 SLUS-00745:
-  name: "Darkstalkers 3 (USA)"
+  name: "Darkstalkers 3"
+  saveName: "Darkstalkers 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -35145,7 +36829,8 @@ SLUS-00745:
     multitap: false
     linkCable: false
 SLES-03447:
-  name: "Darkstone (Australia)"
+  name: "Darkstone"
+  saveName: "Darkstone (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35163,7 +36848,8 @@ SLES-03447:
     multitap: false
     linkCable: false
 SLES-00612:
-  name: "Darkstone (Europe) (En,Fr,De,Es,It)"
+  name: "Darkstone"
+  saveName: "Darkstone (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35186,7 +36872,8 @@ SLES-00612:
     multitap: false
     linkCable: false
 SLUS-01182:
-  name: "Darkstone (USA)"
+  name: "Darkstone"
+  saveName: "Darkstone (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35205,7 +36892,8 @@ SLUS-01182:
     multitap: false
     linkCable: false
 SLES-02740:
-  name: "Dave Mirra Freestyle BMX (Europe)"
+  name: "Dave Mirra Freestyle BMX"
+  saveName: "Dave Mirra Freestyle BMX (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35224,11 +36912,13 @@ SLES-02740:
     multitap: false
     linkCable: false
 SLED-03115:
-  name: "Dave Mirra Freestyle BMX (Europe) (Demo)"
+  name: "Dave Mirra Freestyle BMX (Demo)"
+  saveName: "Dave Mirra Freestyle BMX (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86682:
-  name: "Dave Mirra Freestyle BMX (Japan)"
+  name: "Dave Mirra Freestyle BMX"
+  saveName: "Dave Mirra Freestyle BMX (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35247,7 +36937,8 @@ SLPM-86682:
     multitap: false
     linkCable: false
 SLUS-01026:
-  name: "Dave Mirra Freestyle BMX (USA)"
+  name: "Dave Mirra Freestyle BMX"
+  saveName: "Dave Mirra Freestyle BMX (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -35269,11 +36960,13 @@ SLUS-01026:
     multitap: false
     linkCable: false
 SLUS-81026:
-  name: "Dave Mirra Freestyle BMX (USA) (Demo)"
+  name: "Dave Mirra Freestyle BMX (Demo)"
+  saveName: "Dave Mirra Freestyle BMX (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03371:
-  name: "Dave Mirra Freestyle BMX - Maximum Remix (Europe)"
+  name: "Dave Mirra Freestyle BMX - Maximum Remix"
+  saveName: "Dave Mirra Freestyle BMX - Maximum Remix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35292,7 +36985,8 @@ SLES-03371:
     multitap: false
     linkCable: false
 SLUS-01347:
-  name: "Dave Mirra Freestyle BMX - Maximum Remix (USA)"
+  name: "Dave Mirra Freestyle BMX - Maximum Remix"
+  saveName: "Dave Mirra Freestyle BMX - Maximum Remix (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35311,7 +37005,8 @@ SLUS-01347:
     multitap: false
     linkCable: false
 SLES-03488:
-  name: "David Beckham Soccer (Europe)"
+  name: "David Beckham Soccer"
+  saveName: "David Beckham Soccer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35330,7 +37025,8 @@ SLES-03488:
     multitap: true
     linkCable: false
 SLES-03682:
-  name: "David Beckham Soccer (Europe) (Fr,De,Es,It)"
+  name: "David Beckham Soccer"
+  saveName: "David Beckham Soccer (Europe) (Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35352,7 +37048,8 @@ SLES-03682:
     multitap: true
     linkCable: false
 SLUS-01455:
-  name: "David Beckham Soccer (USA)"
+  name: "David Beckham Soccer"
+  saveName: "David Beckham Soccer (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35371,7 +37068,8 @@ SLUS-01455:
     multitap: true
     linkCable: false
 SLES-00096:
-  name: "Davis Cup Complete Tennis (Europe)"
+  name: "Davis Cup Complete Tennis"
+  saveName: "Davis Cup Complete Tennis (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -35389,7 +37087,8 @@ SLES-00096:
     multitap: true
     linkCable: false
 SCES-02150:
-  name: "De Sang Froid (France) (Disc 1)"
+  name: "De Sang Froid (Disc 1)"
+  saveName: "De Sang Froid (France) (Disc 1)"
   discSet:
     name: "De Sang Froid (France)"
     serials:
@@ -35413,7 +37112,8 @@ SCES-02150:
     multitap: false
     linkCable: false
 SCES-12150:
-  name: "De Sang Froid (France) (Disc 2)"
+  name: "De Sang Froid (Disc 2)"
+  saveName: "De Sang Froid (France) (Disc 2)"
   discSet:
     name: "De Sang Froid (France)"
     serials:
@@ -35437,7 +37137,8 @@ SCES-12150:
     multitap: false
     linkCable: false
 SLUS-00693:
-  name: "Dead in the Water (USA)"
+  name: "Dead in the Water"
+  saveName: "Dead in the Water (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35480,7 +37181,8 @@ SCPS-45190:
     multitap: false
     linkCable: false
 SCES-01259:
-  name: "Dead or Alive (Europe)"
+  name: "Dead or Alive"
+  saveName: "Dead or Alive (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35501,7 +37203,8 @@ SCES-01259:
     multitap: false
     linkCable: false
 SLPS-01289:
-  name: "Dead or Alive (Japan)"
+  name: "Dead or Alive"
+  saveName: "Dead or Alive (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35522,7 +37225,8 @@ SLPS-01289:
     multitap: false
     linkCable: false
 SCED-01372:
-  name: "Dead or Alive (UK) (Demo)"
+  name: "Dead or Alive (Demo)"
+  saveName: "Dead or Alive (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
   controllers:
@@ -35531,7 +37235,8 @@ SCED-01372:
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLUS-00606:
-  name: "Dead or Alive (USA)"
+  name: "Dead or Alive"
+  saveName: "Dead or Alive (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -35555,7 +37260,8 @@ SLUS-00606:
     multitap: false
     linkCable: false
 SLUS-80606:
-  name: "Dead or Alive (USA) (En,Ja) (Demo)"
+  name: "Dead or Alive (Demo)"
+  saveName: "Dead or Alive (USA) (En,Ja) (Demo)"
   metadata:
     genre: "** DEMO **"
   controllers:
@@ -35564,7 +37270,8 @@ SLUS-80606:
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLPS-00267:
-  name: "Deadheat Road (Japan)"
+  name: "Deadheat Road"
+  saveName: "Deadheat Road (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -35585,7 +37292,8 @@ SLPS-00267:
     multitap: false
     linkCable: false
 SLPS-01036:
-  name: "Deadly Skies (Japan)"
+  name: "Deadly Skies"
+  saveName: "Deadly Skies (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -35603,7 +37311,8 @@ SLPS-01036:
     multitap: false
     linkCable: false
 SLPS-00489:
-  name: "Death Wing (Japan)"
+  name: "Death Wing"
+  saveName: "Death Wing (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -35621,7 +37330,8 @@ SLPS-00489:
     multitap: false
     linkCable: false
 SLPS-00225:
-  name: "DeathMask (Japan) (Disc 1)"
+  name: "DeathMask (Disc 1)"
+  saveName: "DeathMask (Japan) (Disc 1)"
   discSet:
     name: "DeathMask (Japan)"
     serials:
@@ -35645,7 +37355,8 @@ SLPS-00225:
     multitap: false
     linkCable: false
 SLPS-00226:
-  name: "DeathMask (Japan) (Disc 2)"
+  name: "DeathMask (Disc 2)"
+  saveName: "DeathMask (Japan) (Disc 2)"
   discSet:
     name: "DeathMask (Japan)"
     serials:
@@ -35669,7 +37380,8 @@ SLPS-00226:
     multitap: false
     linkCable: false
 SLPS-00227:
-  name: "DeathMask (Japan) (Disc 3)"
+  name: "DeathMask (Disc 3)"
+  saveName: "DeathMask (Japan) (Disc 3)"
   discSet:
     name: "DeathMask (Japan)"
     serials:
@@ -35693,7 +37405,8 @@ SLPS-00227:
     multitap: false
     linkCable: false
 SLPS-01229:
-  name: "Debut 21 (Japan)"
+  name: "Debut 21"
+  saveName: "Debut 21 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -35711,7 +37424,8 @@ SLPS-01229:
     multitap: false
     linkCable: false
 SLUS-01067:
-  name: "Deception III - Dark Delusion (USA)"
+  name: "Deception III - Dark Delusion"
+  saveName: "Deception III - Dark Delusion (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -35729,11 +37443,14 @@ SLUS-01067:
     multitap: false
     linkCable: false
 SLPM-80478:
-  name: "Deco Pre 2 '99 Taikenban (Japan)"
+  name: "Deco Pre 2 '99 Taikenban"
+  saveName: "Deco Pre 2 '99 Taikenban (Japan)"
 SLPM-80174:
-  name: "Deco Pre 97-98 - Data East Taikenban Special (Japan)"
+  name: "Deco Pre 97-98 - Data East Taikenban Special"
+  saveName: "Deco Pre 97-98 - Data East Taikenban Special (Japan)"
 SLPS-01817:
-  name: "Deep Freeze (Japan)"
+  name: "Deep Freeze"
+  saveName: "Deep Freeze (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -35774,7 +37491,8 @@ SCPS-45037:
     multitap: false
     linkCable: false
 SLPS-00660:
-  name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Disc 1)"
+  name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Disc 1)"
+  saveName: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Disc 1)"
   discSet:
     name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan)"
     serials:
@@ -35800,7 +37518,8 @@ SLPS-00660:
     multitap: false
     linkCable: false
 SLPS-00661:
-  name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Disc 2)"
+  name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Disc 2)"
+  saveName: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Disc 2)"
   discSet:
     name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan)"
     serials:
@@ -35826,7 +37545,8 @@ SLPS-00661:
     multitap: false
     linkCable: false
 SLPS-00501:
-  name: "Deep, The - Ushinawareta Shinkai (Japan)"
+  name: "Deep, The - Ushinawareta Shinkai"
+  saveName: "Deep, The - Ushinawareta Shinkai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -35844,7 +37564,8 @@ SLPS-00501:
     multitap: false
     linkCable: false
 SLES-00081:
-  name: "Defcon 5 (Europe)"
+  name: "Defcon 5"
+  saveName: "Defcon 5 (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -35865,7 +37586,8 @@ SLES-00081:
     multitap: false
     linkCable: false
 SLES-00149:
-  name: "Defcon 5 (France)"
+  name: "Defcon 5"
+  saveName: "Defcon 5 (France)"
   controllers:
     - DigitalController
   traits:
@@ -35886,7 +37608,8 @@ SLES-00149:
     multitap: false
     linkCable: false
 SLES-00148:
-  name: "Defcon 5 (Germany)"
+  name: "Defcon 5"
+  saveName: "Defcon 5 (Germany)"
   controllers:
     - DigitalController
   traits:
@@ -35907,7 +37630,8 @@ SLES-00148:
     multitap: false
     linkCable: false
 SLES-00146:
-  name: "Defcon 5 (Italy)"
+  name: "Defcon 5"
+  saveName: "Defcon 5 (Italy)"
   controllers:
     - DigitalController
   traits:
@@ -35928,7 +37652,8 @@ SLES-00146:
     multitap: false
     linkCable: false
 SLPS-00275:
-  name: "Defcon 5 (Japan)"
+  name: "Defcon 5"
+  saveName: "Defcon 5 (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -35949,7 +37674,8 @@ SLPS-00275:
     multitap: false
     linkCable: false
 SLES-00147:
-  name: "Defcon 5 (Spain)"
+  name: "Defcon 5"
+  saveName: "Defcon 5 (Spain)"
   controllers:
     - DigitalController
   traits:
@@ -35970,7 +37696,8 @@ SLES-00147:
     multitap: false
     linkCable: false
 SLUS-00009:
-  name: "Defcon 5 - Peace Has a Price... (USA)"
+  name: "Defcon 5 - Peace Has a Price..."
+  saveName: "Defcon 5 - Peace Has a Price... (USA)"
   controllers:
     - DigitalController
   traits:
@@ -35991,7 +37718,8 @@ SLUS-00009:
     multitap: false
     linkCable: false
 SLPS-00853:
-  name: "Defeat Lightning (Japan)"
+  name: "Defeat Lightning"
+  saveName: "Defeat Lightning (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36010,7 +37738,8 @@ SLPS-00853:
     multitap: false
     linkCable: false
 SCES-02174:
-  name: "Defi au Tetris Magique (France)"
+  name: "Defi au Tetris Magique"
+  saveName: "Defi au Tetris Magique (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36048,7 +37777,8 @@ SCPS-45072:
     multitap: false
     linkCable: false
 SLPS-00864:
-  name: "Deka Yonku - Tough the Truck (Japan)"
+  name: "Deka Yonku - Tough the Truck"
+  saveName: "Deka Yonku - Tough the Truck (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -36067,7 +37797,8 @@ SLPS-00864:
     multitap: false
     linkCable: false
 SLPS-01810:
-  name: "Dekiru! Game Center (Japan)"
+  name: "Dekiru! Game Center"
+  saveName: "Dekiru! Game Center (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -36085,7 +37816,8 @@ SLPS-01810:
     multitap: false
     linkCable: false
 SLES-03890:
-  name: "Delta Force Urban Warfare (Europe) (En,Fr,De,Es,It)"
+  name: "Delta Force Urban Warfare"
+  saveName: "Delta Force Urban Warfare (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36108,7 +37840,8 @@ SLES-03890:
     multitap: false
     linkCable: false
 SLES-03952:
-  name: "Delta Force Urban Warfare (France)"
+  name: "Delta Force Urban Warfare"
+  saveName: "Delta Force Urban Warfare (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36127,7 +37860,8 @@ SLES-03952:
     multitap: false
     linkCable: false
 SLES-03919:
-  name: "Delta Force Urban Warfare (Germany)"
+  name: "Delta Force Urban Warfare"
+  saveName: "Delta Force Urban Warfare (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36146,7 +37880,8 @@ SLES-03919:
     multitap: false
     linkCable: false
 SLUS-01429:
-  name: "Delta Force Urban Warfare (USA) (En,Fr,Es)"
+  name: "Delta Force Urban Warfare"
+  saveName: "Delta Force Urban Warfare (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -36170,150 +37905,186 @@ SLUS-01429:
     multitap: false
     linkCable: false
 SLED-01725:
-  name: "Demo Codemasters (France) (SLED-01725)"
+  name: "Demo Codemasters (SLED-01725)"
+  saveName: "Demo Codemasters (France) (SLED-01725)"
   metadata:
     genre: "** DEMO **"
 SLED-02246:
-  name: "Demo Codemasters (France) (SLED-02246)"
+  name: "Demo Codemasters (SLED-02246)"
+  saveName: "Demo Codemasters (France) (SLED-02246)"
   metadata:
     genre: "** DEMO **"
 SCED-02417:
-  name: "Demo Disc (Europe) (En,Fr,De,Es,It)"
+  name: "Demo Disc"
+  saveName: "Demo Disc (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCES-00064:
-  name: "Demo One (Germany) (SCES-00064)"
+  name: "Demo One (SCES-00064)"
+  saveName: "Demo One (Germany) (SCES-00064)"
   metadata:
     genre: "** DEMO **"
 SCES-00121:
-  name: "Demo One (Germany) (SCES-00121)"
+  name: "Demo One (SCES-00121)"
+  saveName: "Demo One (Germany) (SCES-00121)"
   metadata:
     genre: "** DEMO **"
 SCES-00048:
-  name: "Demo One (Version 1) (Europe)"
+  name: "Demo One (Version 1)"
+  saveName: "Demo One (Version 1) (Europe)"
   metadata:
     genre: "** DEMO **"
 SCES-00120:
-  name: "Demo One (Version 2) (Europe, Australia)"
+  name: "Demo One (Version 2)"
+  saveName: "Demo One (Version 2) (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCES-00238:
-  name: "Demo One (Version 3) (Europe, Australia)"
+  name: "Demo One (Version 3)"
+  saveName: "Demo One (Version 3) (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCED-00456:
-  name: "Demo One (Version 4) (Europe)"
+  name: "Demo One (Version 4)"
+  saveName: "Demo One (Version 4) (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00457:
-  name: "Demo One (Version 4) (Germany)"
+  name: "Demo One (Version 4)"
+  saveName: "Demo One (Version 4) (Germany)"
   metadata:
     genre: "** DEMO **"
 PBPX-95001:
-  name: "Demo One (Version 5) (Europe)"
+  name: "Demo One (Version 5)"
+  saveName: "Demo One (Version 5) (Europe)"
   metadata:
     genre: "** DEMO **"
   codes:
     - PBPX-95001
     - SCED-00816
 PBPX-95007:
-  name: "Demo One (Version 6) (Europe) (En,Fr,De,Es,It)"
+  name: "Demo One (Version 6)"
+  saveName: "Demo One (Version 6) (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 PBPX-95008:
-  name: "Demo One (Version 7) (Europe) (En,Fr,De,Es,It)"
+  name: "Demo One (Version 7)"
+  saveName: "Demo One (Version 7) (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 PCPX-96003:
-  name: "DemoDemo PlayStation Soukan-gou Vol. 1 (Japan)"
+  name: "DemoDemo PlayStation Soukan-gou Vol. 1"
+  saveName: "DemoDemo PlayStation Soukan-gou Vol. 1 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96014:
-  name: "DemoDemo PlayStation Vol. 10 (Japan)"
+  name: "DemoDemo PlayStation Vol. 10"
+  saveName: "DemoDemo PlayStation Vol. 10 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96016:
-  name: "DemoDemo PlayStation Vol. 11 (Japan)"
+  name: "DemoDemo PlayStation Vol. 11"
+  saveName: "DemoDemo PlayStation Vol. 11 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96018:
-  name: "DemoDemo PlayStation Vol. 12 (Japan)"
+  name: "DemoDemo PlayStation Vol. 12"
+  saveName: "DemoDemo PlayStation Vol. 12 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96019:
-  name: "DemoDemo PlayStation Vol. 13 (Japan)"
+  name: "DemoDemo PlayStation Vol. 13"
+  saveName: "DemoDemo PlayStation Vol. 13 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96021:
-  name: "DemoDemo PlayStation Vol. 14 (Japan)"
+  name: "DemoDemo PlayStation Vol. 14"
+  saveName: "DemoDemo PlayStation Vol. 14 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96022:
-  name: "DemoDemo PlayStation Vol. 15 (Japan)"
+  name: "DemoDemo PlayStation Vol. 15"
+  saveName: "DemoDemo PlayStation Vol. 15 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96025:
-  name: "DemoDemo PlayStation Vol. 16 (Japan)"
+  name: "DemoDemo PlayStation Vol. 16"
+  saveName: "DemoDemo PlayStation Vol. 16 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96026:
-  name: "DemoDemo PlayStation Vol. 17 (Japan)"
+  name: "DemoDemo PlayStation Vol. 17"
+  saveName: "DemoDemo PlayStation Vol. 17 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96027:
-  name: "DemoDemo PlayStation Vol. 18 (Japan)"
+  name: "DemoDemo PlayStation Vol. 18"
+  saveName: "DemoDemo PlayStation Vol. 18 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96032:
-  name: "DemoDemo PlayStation Vol. 19 (Japan)"
+  name: "DemoDemo PlayStation Vol. 19"
+  saveName: "DemoDemo PlayStation Vol. 19 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96005:
-  name: "DemoDemo PlayStation Vol. 2 (Japan)"
+  name: "DemoDemo PlayStation Vol. 2"
+  saveName: "DemoDemo PlayStation Vol. 2 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96036:
-  name: "DemoDemo PlayStation Vol. 20 (Japan)"
+  name: "DemoDemo PlayStation Vol. 20"
+  saveName: "DemoDemo PlayStation Vol. 20 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96038:
-  name: "DemoDemo PlayStation Vol. 21 (Japan)"
+  name: "DemoDemo PlayStation Vol. 21"
+  saveName: "DemoDemo PlayStation Vol. 21 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96042:
-  name: "DemoDemo PlayStation Vol. 22 (Japan)"
+  name: "DemoDemo PlayStation Vol. 22"
+  saveName: "DemoDemo PlayStation Vol. 22 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96006:
-  name: "DemoDemo PlayStation Vol. 3 (Japan)"
+  name: "DemoDemo PlayStation Vol. 3"
+  saveName: "DemoDemo PlayStation Vol. 3 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96007:
-  name: "DemoDemo PlayStation Vol. 4 (Japan)"
+  name: "DemoDemo PlayStation Vol. 4"
+  saveName: "DemoDemo PlayStation Vol. 4 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96008:
-  name: "DemoDemo PlayStation Vol. 5 (Japan)"
+  name: "DemoDemo PlayStation Vol. 5"
+  saveName: "DemoDemo PlayStation Vol. 5 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96009:
-  name: "DemoDemo PlayStation Vol. 6 (Japan)"
+  name: "DemoDemo PlayStation Vol. 6"
+  saveName: "DemoDemo PlayStation Vol. 6 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96010:
-  name: "DemoDemo PlayStation Vol. 7 (Japan)"
+  name: "DemoDemo PlayStation Vol. 7"
+  saveName: "DemoDemo PlayStation Vol. 7 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96011:
-  name: "DemoDemo PlayStation Vol. 8 (Japan)"
+  name: "DemoDemo PlayStation Vol. 8"
+  saveName: "DemoDemo PlayStation Vol. 8 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96013:
-  name: "DemoDemo PlayStation Vol. 9 (Japan)"
+  name: "DemoDemo PlayStation Vol. 9"
+  saveName: "DemoDemo PlayStation Vol. 9 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLES-02018:
-  name: "Demolition Racer (Europe) (En,Fr,De,Es,It)"
+  name: "Demolition Racer"
+  saveName: "Demolition Racer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36336,7 +38107,8 @@ SLES-02018:
     multitap: false
     linkCable: false
 SLUS-00969:
-  name: "Demolition Racer (USA)"
+  name: "Demolition Racer"
+  saveName: "Demolition Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1629-g101907a7"
@@ -36358,7 +38130,8 @@ SLUS-00969:
     multitap: false
     linkCable: false
 SLPS-01215:
-  name: "Dengeki Construction - Ochigee Yarou ze! (Japan)"
+  name: "Dengeki Construction - Ochigee Yarou ze!"
+  saveName: "Dengeki Construction - Ochigee Yarou ze! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -36376,199 +38149,248 @@ SLPS-01215:
     multitap: true
     linkCable: false
 SLPM-80071:
-  name: "Dengeki PlayStation D (Japan)"
+  name: "Dengeki PlayStation D"
+  saveName: "Dengeki PlayStation D (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80513:
-  name: "Dengeki PlayStation D - Konami Fanbook (Japan)"
+  name: "Dengeki PlayStation D - Konami Fanbook"
+  saveName: "Dengeki PlayStation D - Konami Fanbook (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80281:
-  name: "Dengeki PlayStation D10 (Japan)"
+  name: "Dengeki PlayStation D10"
+  saveName: "Dengeki PlayStation D10 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80327:
-  name: "Dengeki PlayStation D11 (Japan)"
+  name: "Dengeki PlayStation D11"
+  saveName: "Dengeki PlayStation D11 (Japan)"
   metadata:
     genre: "** DEMO **"
 PAPX-90060:
-  name: "Dengeki PlayStation D11 - Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
+  name: "Dengeki PlayStation D11 - Yarudora Series Vol. 3 - Sampaguita (Demo)"
+  saveName: "Dengeki PlayStation D11 - Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80343:
-  name: "Dengeki PlayStation D12 (Japan)"
+  name: "Dengeki PlayStation D12"
+  saveName: "Dengeki PlayStation D12 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80362:
-  name: "Dengeki PlayStation D13 (Japan)"
+  name: "Dengeki PlayStation D13"
+  saveName: "Dengeki PlayStation D13 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80331:
-  name: "Dengeki PlayStation D14 (Japan)"
+  name: "Dengeki PlayStation D14"
+  saveName: "Dengeki PlayStation D14 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80388:
-  name: "Dengeki PlayStation D15 (Japan)"
+  name: "Dengeki PlayStation D15"
+  saveName: "Dengeki PlayStation D15 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80399:
-  name: "Dengeki PlayStation D16 (Japan)"
+  name: "Dengeki PlayStation D16"
+  saveName: "Dengeki PlayStation D16 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80418:
-  name: "Dengeki PlayStation D17 (Japan)"
+  name: "Dengeki PlayStation D17"
+  saveName: "Dengeki PlayStation D17 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80412:
-  name: "Dengeki PlayStation D18 (Japan)"
+  name: "Dengeki PlayStation D18"
+  saveName: "Dengeki PlayStation D18 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80425:
-  name: "Dengeki PlayStation D19 (Japan)"
+  name: "Dengeki PlayStation D19"
+  saveName: "Dengeki PlayStation D19 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80109:
-  name: "Dengeki PlayStation D2 (Japan)"
+  name: "Dengeki PlayStation D2"
+  saveName: "Dengeki PlayStation D2 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80438:
-  name: "Dengeki PlayStation D20 (Japan)"
+  name: "Dengeki PlayStation D20"
+  saveName: "Dengeki PlayStation D20 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80457:
-  name: "Dengeki PlayStation D21 (Japan)"
+  name: "Dengeki PlayStation D21"
+  saveName: "Dengeki PlayStation D21 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96159:
-  name: "Dengeki PlayStation D21 SCE Special (Japan)"
+  name: "Dengeki PlayStation D21 SCE Special"
+  saveName: "Dengeki PlayStation D21 SCE Special (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80471:
-  name: "Dengeki PlayStation D22 (Japan)"
+  name: "Dengeki PlayStation D22"
+  saveName: "Dengeki PlayStation D22 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80481:
-  name: "Dengeki PlayStation D23 (Japan)"
+  name: "Dengeki PlayStation D23"
+  saveName: "Dengeki PlayStation D23 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80496:
-  name: "Dengeki PlayStation D24 (Japan)"
+  name: "Dengeki PlayStation D24"
+  saveName: "Dengeki PlayStation D24 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80497:
-  name: "Dengeki PlayStation D25 (Japan)"
+  name: "Dengeki PlayStation D25"
+  saveName: "Dengeki PlayStation D25 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80505:
-  name: "Dengeki PlayStation D26 (Japan)"
+  name: "Dengeki PlayStation D26"
+  saveName: "Dengeki PlayStation D26 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80516:
-  name: "Dengeki PlayStation D27 (Japan)"
+  name: "Dengeki PlayStation D27"
+  saveName: "Dengeki PlayStation D27 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80526:
-  name: "Dengeki PlayStation D28 (Japan)"
+  name: "Dengeki PlayStation D28"
+  saveName: "Dengeki PlayStation D28 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80545:
-  name: "Dengeki PlayStation D29 (Japan)"
+  name: "Dengeki PlayStation D29"
+  saveName: "Dengeki PlayStation D29 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80130:
-  name: "Dengeki PlayStation D3 (Japan)"
+  name: "Dengeki PlayStation D3"
+  saveName: "Dengeki PlayStation D3 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80547:
-  name: "Dengeki PlayStation D30 (Japan)"
+  name: "Dengeki PlayStation D30"
+  saveName: "Dengeki PlayStation D30 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80555:
-  name: "Dengeki PlayStation D31 (Japan)"
+  name: "Dengeki PlayStation D31"
+  saveName: "Dengeki PlayStation D31 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80557:
-  name: "Dengeki PlayStation D32 (Japan)"
+  name: "Dengeki PlayStation D32"
+  saveName: "Dengeki PlayStation D32 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80562:
-  name: "Dengeki PlayStation D33 (Japan)"
+  name: "Dengeki PlayStation D33"
+  saveName: "Dengeki PlayStation D33 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80569:
-  name: "Dengeki PlayStation D34 (Japan)"
+  name: "Dengeki PlayStation D34"
+  saveName: "Dengeki PlayStation D34 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80574:
-  name: "Dengeki PlayStation D35 (Japan)"
+  name: "Dengeki PlayStation D35"
+  saveName: "Dengeki PlayStation D35 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80578:
-  name: "Dengeki PlayStation D36 (Japan)"
+  name: "Dengeki PlayStation D36"
+  saveName: "Dengeki PlayStation D36 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80582:
-  name: "Dengeki PlayStation D37 (Japan)"
+  name: "Dengeki PlayStation D37"
+  saveName: "Dengeki PlayStation D37 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80589:
-  name: "Dengeki PlayStation D38 (Japan)"
+  name: "Dengeki PlayStation D38"
+  saveName: "Dengeki PlayStation D38 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80603:
-  name: "Dengeki PlayStation D39 (Japan)"
+  name: "Dengeki PlayStation D39"
+  saveName: "Dengeki PlayStation D39 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80157:
-  name: "Dengeki PlayStation D4 (Japan)"
+  name: "Dengeki PlayStation D4"
+  saveName: "Dengeki PlayStation D4 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80607:
-  name: "Dengeki PlayStation D41 (Japan)"
+  name: "Dengeki PlayStation D41"
+  saveName: "Dengeki PlayStation D41 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80611:
-  name: "Dengeki PlayStation D42 (Japan)"
+  name: "Dengeki PlayStation D42"
+  saveName: "Dengeki PlayStation D42 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80612:
-  name: "Dengeki PlayStation D43 (Japan)"
+  name: "Dengeki PlayStation D43"
+  saveName: "Dengeki PlayStation D43 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80615:
-  name: "Dengeki PlayStation D44 (Japan)"
+  name: "Dengeki PlayStation D44"
+  saveName: "Dengeki PlayStation D44 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80618:
-  name: "Dengeki PlayStation D45 (Japan)"
+  name: "Dengeki PlayStation D45"
+  saveName: "Dengeki PlayStation D45 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80186:
-  name: "Dengeki PlayStation D5 (Japan)"
+  name: "Dengeki PlayStation D5"
+  saveName: "Dengeki PlayStation D5 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80214:
-  name: "Dengeki PlayStation D6 (Japan)"
+  name: "Dengeki PlayStation D6"
+  saveName: "Dengeki PlayStation D6 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80309:
-  name: "Dengeki PlayStation D7 (Japan)"
+  name: "Dengeki PlayStation D7"
+  saveName: "Dengeki PlayStation D7 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80257:
-  name: "Dengeki PlayStation D8 (Japan)"
+  name: "Dengeki PlayStation D8"
+  saveName: "Dengeki PlayStation D8 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96116:
-  name: "Dengeki PlayStation D8 - Yarudora Series Vol. 1 - Double Cast (Japan) (Demo)"
+  name: "Dengeki PlayStation D8 - Yarudora Series Vol. 1 - Double Cast (Demo)"
+  saveName: "Dengeki PlayStation D8 - Yarudora Series Vol. 1 - Double Cast (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80266:
-  name: "Dengeki PlayStation D9 (Japan)"
+  name: "Dengeki PlayStation D9"
+  saveName: "Dengeki PlayStation D9 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-02851:
-  name: "Denkousekka Micro Runner - Maniac Hakase no Hisaku (Japan)"
+  name: "Denkousekka Micro Runner - Maniac Hakase no Hisaku"
+  saveName: "Denkousekka Micro Runner - Maniac Hakase no Hisaku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36591,7 +38413,8 @@ SLPS-02851:
     multitap: true
     linkCable: false
 SLPS-01287:
-  name: "Denpa Shounen-teki Game (Japan)"
+  name: "Denpa Shounen-teki Game"
+  saveName: "Denpa Shounen-teki Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -36609,7 +38432,8 @@ SLPS-01287:
     multitap: true
     linkCable: false
 SLPS-00481:
-  name: "Densetsu no Ogre Battle (Japan)"
+  name: "Densetsu no Ogre Battle"
+  saveName: "Densetsu no Ogre Battle (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -36630,7 +38454,8 @@ SLPS-00481:
     multitap: false
     linkCable: false
 SLPS-02297:
-  name: "Densetsu-juu no Ana - Monster Complete World Ver. 2 (Japan)"
+  name: "Densetsu-juu no Ana - Monster Complete World Ver. 2"
+  saveName: "Densetsu-juu no Ana - Monster Complete World Ver. 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36649,7 +38474,8 @@ SLPS-02297:
     multitap: false
     linkCable: false
 SLPS-01753:
-  name: "Densha Daisuki - Plarail ga Ippai (Japan)"
+  name: "Densha Daisuki - Plarail ga Ippai"
+  saveName: "Densha Daisuki - Plarail ga Ippai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -36705,7 +38531,8 @@ SCPS-45167:
     multitap: false
     linkCable: false
 SLPS-01150:
-  name: "Densha de Go! (Japan)"
+  name: "Densha de Go!"
+  saveName: "Densha de Go! (Japan)"
   controllers:
     - DigitalController
     - DDGoController
@@ -36724,14 +38551,16 @@ SLPS-01150:
     multitap: false
     linkCable: false
 SLPM-80166:
-  name: "Densha de Go! (Japan) (Demo)"
+  name: "Densha de Go! (Demo)"
+  saveName: "Densha de Go! (Japan) (Demo)"
   controllers:
     - DigitalController
     - DDGoController
   metadata:
     genre: "** DEMO **"
 SLPM-86263:
-  name: "Densha de Go! (Japan) (PlayStation the Best)"
+  name: "Densha de Go! (PlayStation the Best)"
+  saveName: "Densha de Go! (Japan) (PlayStation the Best)"
   controllers:
     - DigitalController
     - DDGoController
@@ -36750,7 +38579,8 @@ SLPM-86263:
     multitap: false
     linkCable: false
 SLPM-86142:
-  name: "Densha de Go! 2 (Japan)"
+  name: "Densha de Go! 2"
+  saveName: "Densha de Go! 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36770,7 +38600,8 @@ SLPM-86142:
     multitap: false
     linkCable: false
 SLPM-80346:
-  name: "Densha de Go! 2 (Japan) (Demo 1)"
+  name: "Densha de Go! 2 (Demo 1)"
+  saveName: "Densha de Go! 2 (Japan) (Demo 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36778,7 +38609,8 @@ SLPM-80346:
   metadata:
     genre: "** DEMO **"
 SLPM-80406:
-  name: "Densha de Go! 2 (Japan) (Demo 2)"
+  name: "Densha de Go! 2 (Demo 2)"
+  saveName: "Densha de Go! 2 (Japan) (Demo 2)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36786,7 +38618,8 @@ SLPM-80406:
   metadata:
     genre: "** DEMO **"
 SLPM-86615:
-  name: "Densha de Go! 2 (Japan) (Rev 1)"
+  name: "Densha de Go! 2"
+  saveName: "Densha de Go! 2 (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36826,7 +38659,8 @@ SLPM-86141:
     multitap: false
     linkCable: false
 SLPM-86424:
-  name: "Densha de Go! Nagoya Tetsudou-hen (Japan)"
+  name: "Densha de Go! Nagoya Tetsudou-hen"
+  saveName: "Densha de Go! Nagoya Tetsudou-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36846,7 +38680,8 @@ SLPM-86424:
     multitap: false
     linkCable: false
 SLPM-80521:
-  name: "Densha de Go! Nagoya Tetsudou-hen (Japan) (Demo)"
+  name: "Densha de Go! Nagoya Tetsudou-hen (Demo)"
+  saveName: "Densha de Go! Nagoya Tetsudou-hen (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36854,7 +38689,8 @@ SLPM-80521:
   metadata:
     genre: "** DEMO **"
 SLPM-86378:
-  name: "Densha de Go! Professional Shiyou (Japan)"
+  name: "Densha de Go! Professional Shiyou"
+  saveName: "Densha de Go! Professional Shiyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36877,13 +38713,15 @@ SLPM-86378:
     multitap: false
     linkCable: false
 SLPM-80511:
-  name: "Densha de Go! Professional Shiyou (Japan) (Taikenban)"
+  name: "Densha de Go! Professional Shiyou (Taikenban)"
+  saveName: "Densha de Go! Professional Shiyou (Japan) (Taikenban)"
   controllers:
     - AnalogController
     - DigitalController
     - DDGoController
 SCPS-18003:
-  name: "Depth (Japan)"
+  name: "Depth"
+  saveName: "Depth (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -36901,7 +38739,8 @@ SCPS-18003:
     multitap: false
     linkCable: false
 SLPS-03131:
-  name: "Derby Jockey 2001 (Japan)"
+  name: "Derby Jockey 2001"
+  saveName: "Derby Jockey 2001 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36920,7 +38759,8 @@ SLPS-03131:
     multitap: false
     linkCable: false
 SLPS-00616:
-  name: "Derby Jockey R (Japan)"
+  name: "Derby Jockey R"
+  saveName: "Derby Jockey R (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -36938,37 +38778,53 @@ SLPS-00616:
     multitap: false
     linkCable: false
 SLPM-80538:
-  name: "Derby Stallion Magazine 2000 (Japan)"
+  name: "Derby Stallion Magazine 2000"
+  saveName: "Derby Stallion Magazine 2000 (Japan)"
 SLPM-80559:
-  name: "Derby Stallion Magazine 2000 Vol. 2 (Japan)"
+  name: "Derby Stallion Magazine 2000 Vol. 2"
+  saveName: "Derby Stallion Magazine 2000 Vol. 2 (Japan)"
 SLPM-80378:
-  name: "Derby Stallion Magazine Furoku CD-ROM Soushuu-hen (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Soushuu-hen"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Soushuu-hen (Japan)"
 SLPM-80177:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 1 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 1"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 1 (Japan)"
 SLPM-80288:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 10 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 10"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 10 (Japan)"
 SLPM-80315:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 11 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 11"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 11 (Japan)"
 SLPM-80334:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 12 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 12"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 12 (Japan)"
 SLPM-80198:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 2 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 2"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 2 (Japan)"
 SLPM-80211:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 3 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 3"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 3 (Japan)"
 SLPM-80221:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 4 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 4"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 4 (Japan)"
 SLPM-80307:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 5 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 5"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 5 (Japan)"
 SLPM-80235:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 6 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 6"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 6 (Japan)"
 SLPM-80249:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 7 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 7"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 7 (Japan)"
 SLPM-80261:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 8 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 8"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 8 (Japan)"
 SLPM-80280:
-  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 9 (Japan)"
+  name: "Derby Stallion Magazine Furoku CD-ROM Vol. 9"
+  saveName: "Derby Stallion Magazine Furoku CD-ROM Vol. 9 (Japan)"
 SLPS-00180:
-  name: "Deroon Dero Dero (Japan)"
+  name: "Deroon Dero Dero"
+  saveName: "Deroon Dero Dero (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -36987,7 +38843,8 @@ SLPS-00180:
     multitap: false
     linkCable: false
 SLES-00055:
-  name: "Descent (Europe)"
+  name: "Descent"
+  saveName: "Descent (Europe)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -37009,7 +38866,8 @@ SLES-00055:
     multitap: false
     linkCable: true
 SLPS-00212:
-  name: "Descent (Japan)"
+  name: "Descent"
+  saveName: "Descent (Japan)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -37031,7 +38889,8 @@ SLPS-00212:
     multitap: false
     linkCable: true
 SLUS-00037:
-  name: "Descent (USA)"
+  name: "Descent"
+  saveName: "Descent (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -37056,7 +38915,8 @@ SLUS-00037:
     multitap: false
     linkCable: true
 SLES-00558:
-  name: "Descent II (Europe)"
+  name: "Descent II"
+  saveName: "Descent II (Europe)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -37075,7 +38935,8 @@ SLES-00558:
     multitap: false
     linkCable: true
 SLUS-00460:
-  name: "Descent Maximum (USA)"
+  name: "Descent Maximum"
+  saveName: "Descent Maximum (USA)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -37094,7 +38955,8 @@ SLUS-00460:
     multitap: false
     linkCable: true
 SLPS-00602:
-  name: "Deserted Island (Japan)"
+  name: "Deserted Island"
+  saveName: "Deserted Island (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -37112,7 +38974,8 @@ SLPS-00602:
     multitap: false
     linkCable: false
 SCES-01768:
-  name: "Destrega (Europe)"
+  name: "Destrega"
+  saveName: "Destrega (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37131,7 +38994,8 @@ SCES-01768:
     multitap: false
     linkCable: false
 SCES-01769:
-  name: "Destrega (France)"
+  name: "Destrega"
+  saveName: "Destrega (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37150,7 +39014,8 @@ SCES-01769:
     multitap: false
     linkCable: false
 SCES-01770:
-  name: "Destrega (Germany)"
+  name: "Destrega"
+  saveName: "Destrega (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37169,7 +39034,8 @@ SCES-01770:
     multitap: false
     linkCable: false
 SCES-01771:
-  name: "Destrega (Italy)"
+  name: "Destrega"
+  saveName: "Destrega (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37188,7 +39054,8 @@ SCES-01771:
     multitap: false
     linkCable: false
 SLPS-01591:
-  name: "Destrega (Japan)"
+  name: "Destrega"
+  saveName: "Destrega (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37207,11 +39074,13 @@ SLPS-01591:
     multitap: false
     linkCable: false
 SLPM-80310:
-  name: "Destrega (Japan) (Demo)"
+  name: "Destrega (Demo)"
+  saveName: "Destrega (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01772:
-  name: "Destrega (Spain)"
+  name: "Destrega"
+  saveName: "Destrega (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37230,7 +39099,8 @@ SCES-01772:
     multitap: false
     linkCable: false
 SLUS-00732:
-  name: "Destrega (USA)"
+  name: "Destrega"
+  saveName: "Destrega (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -37271,7 +39141,8 @@ SLPM-86336:
     multitap: false
     linkCable: false
 SCES-00008:
-  name: "Destruction Derby (Europe)"
+  name: "Destruction Derby"
+  saveName: "Destruction Derby (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -37290,7 +39161,8 @@ SCES-00008:
     multitap: false
     linkCable: true
 SIPS-60001:
-  name: "Destruction Derby (Japan)"
+  name: "Destruction Derby"
+  saveName: "Destruction Derby (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -37309,7 +39181,8 @@ SIPS-60001:
     multitap: false
     linkCable: true
 SCUS-94302:
-  name: "Destruction Derby (USA)"
+  name: "Destruction Derby"
+  saveName: "Destruction Derby (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -37347,7 +39220,8 @@ SCPS-45076:
     multitap: false
     linkCable: false
 SLES-00299:
-  name: "Destruction Derby 2 (Europe)"
+  name: "Destruction Derby 2"
+  saveName: "Destruction Derby 2 (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -37368,7 +39242,8 @@ SLES-00299:
     multitap: false
     linkCable: false
 SIPS-60012:
-  name: "Destruction Derby 2 (Japan)"
+  name: "Destruction Derby 2"
+  saveName: "Destruction Derby 2 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -37390,7 +39265,8 @@ SIPS-60012:
     multitap: false
     linkCable: false
 SCUS-94350:
-  name: "Destruction Derby 2 (USA)"
+  name: "Destruction Derby 2"
+  saveName: "Destruction Derby 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -37412,7 +39288,8 @@ SCUS-94350:
     multitap: false
     linkCable: false
 SCES-02060:
-  name: "Destruction Derby Raw (Europe) (En,Fr,De,Es,It)"
+  name: "Destruction Derby Raw"
+  saveName: "Destruction Derby Raw (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37439,7 +39316,8 @@ SCES-02060:
     multitap: true
     linkCable: false
 SLUS-00912:
-  name: "Destruction Derby Raw (USA)"
+  name: "Destruction Derby Raw"
+  saveName: "Destruction Derby Raw (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -37464,14 +39342,16 @@ SLUS-00912:
     multitap: true
     linkCable: false
 SLUS-90092:
-  name: "Destruction Derby Raw (USA) (Demo)"
+  name: "Destruction Derby Raw (Demo)"
+  saveName: "Destruction Derby Raw (USA) (Demo)"
   traits:
     - DisableScaledInterlacing # Fixes rendering errors in the main menu.
     - ForceDeinterlacing # Fixes rendering errors in the main menu.
   metadata:
     genre: "** DEMO **"
 SLES-04073:
-  name: "Destructo 2 (Europe)"
+  name: "Destructo 2"
+  saveName: "Destructo 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37490,7 +39370,8 @@ SLES-04073:
     multitap: false
     linkCable: false
 SLPM-86054:
-  name: "Detana Twinbee Yahoo! Deluxe Pack (Japan)"
+  name: "Detana Twinbee Yahoo! Deluxe Pack"
+  saveName: "Detana Twinbee Yahoo! Deluxe Pack (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -37532,7 +39413,8 @@ SLPM-87322:
     multitap: false
     linkCable: false
 SLES-03803:
-  name: "Detective Barbie - The Mystery Cruise (Europe)"
+  name: "Detective Barbie - The Mystery Cruise"
+  saveName: "Detective Barbie - The Mystery Cruise (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37551,7 +39433,8 @@ SLES-03803:
     multitap: false
     linkCable: false
 SLUS-01221:
-  name: "Detective Barbie - The Mystery Cruise (USA)"
+  name: "Detective Barbie - The Mystery Cruise"
+  saveName: "Detective Barbie - The Mystery Cruise (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37570,7 +39453,8 @@ SLUS-01221:
     multitap: false
     linkCable: false
 SLES-04130:
-  name: "Detective Mouse (Europe) (En,Fr,De)"
+  name: "Detective Mouse"
+  saveName: "Detective Mouse (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37591,7 +39475,8 @@ SLES-04130:
     multitap: false
     linkCable: false
 SLPS-01889:
-  name: "Devicereign (Japan)"
+  name: "Devicereign"
+  saveName: "Devicereign (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -37609,7 +39494,8 @@ SLPS-01889:
     multitap: false
     linkCable: false
 SCES-01312:
-  name: "Devil Dice (Europe) (En,Fr,De,Es,It)"
+  name: "Devil Dice"
+  saveName: "Devil Dice (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2854-g24c37324"
@@ -37637,7 +39523,8 @@ SCES-01312:
     multitap: true
     linkCable: false
 SLUS-00672:
-  name: "Devil Dice (USA)"
+  name: "Devil Dice"
+  saveName: "Devil Dice (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37656,7 +39543,8 @@ SLUS-00672:
     multitap: true
     linkCable: false
 SLPS-02275:
-  name: "Devil Man (Japan)"
+  name: "Devil Man"
+  saveName: "Devil Man (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37675,7 +39563,8 @@ SLPS-02275:
     multitap: false
     linkCable: false
 SLPM-87184:
-  name: "Devil Summoner - Soul Hackers (Japan) (Disc 1)"
+  name: "Devil Summoner - Soul Hackers (Disc 1)"
+  saveName: "Devil Summoner - Soul Hackers (Japan) (Disc 1)"
   discSet:
     name: "Devil Summoner - Soul Hackers (Japan)"
     serials:
@@ -37701,7 +39590,8 @@ SLPM-87184:
     multitap: false
     linkCable: false
 SLPM-87185:
-  name: "Devil Summoner - Soul Hackers (Japan) (Disc 2)"
+  name: "Devil Summoner - Soul Hackers (Disc 2)"
+  saveName: "Devil Summoner - Soul Hackers (Japan) (Disc 2)"
   discSet:
     name: "Devil Summoner - Soul Hackers (Japan)"
     serials:
@@ -37748,7 +39638,8 @@ SLPS-91200:
     multitap: false
     linkCable: false
 SLES-00848:
-  name: "Devil's Deception (Europe) (En,Fr,De)"
+  name: "Devil's Deception"
+  saveName: "Devil's Deception (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -37768,7 +39659,8 @@ SLES-00848:
     multitap: false
     linkCable: false
 SCPS-45436:
-  name: "DewPrism (Japan, Asia)"
+  name: "DewPrism"
+  saveName: "DewPrism (Japan, Asia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -37795,7 +39687,8 @@ SCPS-45436:
     multitap: false
     linkCable: false
 SLES-03627:
-  name: "Dexter's Laboratory - Mandark's Lab (Europe)"
+  name: "Dexter's Laboratory - Mandark's Lab"
+  saveName: "Dexter's Laboratory - Mandark's Lab (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37814,7 +39707,8 @@ SLES-03627:
     multitap: false
     linkCable: false
 SLES-03829:
-  name: "Dexter's Laboratory - Mandark's Lab (Europe) (Fr,De)"
+  name: "Dexter's Laboratory - Mandark's Lab"
+  saveName: "Dexter's Laboratory - Mandark's Lab (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37834,7 +39728,8 @@ SLES-03829:
     multitap: false
     linkCable: false
 SLUS-01421:
-  name: "Dexter's Laboratory - Mandark's Lab (USA)"
+  name: "Dexter's Laboratory - Mandark's Lab"
+  saveName: "Dexter's Laboratory - Mandark's Lab (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37853,7 +39748,8 @@ SLUS-01421:
     multitap: false
     linkCable: false
 SLPS-01503:
-  name: "Dezaemon Kids! (Japan)"
+  name: "Dezaemon Kids!"
+  saveName: "Dezaemon Kids! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37891,7 +39787,8 @@ SLPM-86582:
     multitap: false
     linkCable: false
 SLPS-00335:
-  name: "Dezaemon Plus (Japan)"
+  name: "Dezaemon Plus"
+  saveName: "Dezaemon Plus (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -37911,7 +39808,8 @@ SLPS-00335:
     multitap: false
     linkCable: false
 SLPS-01504:
-  name: "Dezaemon Plus Select 100 (Japan) (Rev 1)"
+  name: "Dezaemon Plus Select 100"
+  saveName: "Dezaemon Plus Select 100 (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -37929,7 +39827,8 @@ SLPS-01504:
     multitap: false
     linkCable: false
 SLES-01156:
-  name: "Diablo (Europe) (En,Fr,De,Sv)"
+  name: "Diablo"
+  saveName: "Diablo (Europe) (En,Fr,De,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37954,7 +39853,8 @@ SLES-01156:
     multitap: false
     linkCable: false
 SLPS-01416:
-  name: "Diablo (Japan)"
+  name: "Diablo"
+  saveName: "Diablo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -37976,7 +39876,8 @@ SLPS-01416:
     multitap: false
     linkCable: false
 SLUS-00619:
-  name: "Diablo (USA) (En,Fr,De,Sv)"
+  name: "Diablo"
+  saveName: "Diablo (USA) (En,Fr,De,Sv)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -38026,7 +39927,8 @@ SLPS-91177:
     multitap: false
     linkCable: false
 SLPS-02523:
-  name: "Dice de Chocobo (Japan)"
+  name: "Dice de Chocobo"
+  saveName: "Dice de Chocobo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38045,7 +39947,8 @@ SLPS-02523:
     multitap: false
     linkCable: false
 SLES-00445:
-  name: "Die Hard Trilogy (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Die Hard Trilogy"
+  saveName: "Die Hard Trilogy (Europe) (En,Fr,De,Es,It,Sv)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -38073,7 +39976,8 @@ SLES-00445:
     multitap: false
     linkCable: false
 SLPS-00585:
-  name: "Die Hard Trilogy (Japan)"
+  name: "Die Hard Trilogy"
+  saveName: "Die Hard Trilogy (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -38093,7 +39997,8 @@ SLPS-00585:
     multitap: false
     linkCable: false
 SLUS-00119:
-  name: "Die Hard Trilogy (USA)"
+  name: "Die Hard Trilogy"
+  saveName: "Die Hard Trilogy (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -38116,7 +40021,8 @@ SLUS-00119:
     multitap: false
     linkCable: false
 SLES-02746:
-  name: "Die Hard Trilogy 2 - Viva Las Vegas (Europe)"
+  name: "Die Hard Trilogy 2 - Viva Las Vegas"
+  saveName: "Die Hard Trilogy 2 - Viva Las Vegas (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38138,7 +40044,8 @@ SLES-02746:
     multitap: false
     linkCable: false
 SLES-02747:
-  name: "Die Hard Trilogy 2 - Viva Las Vegas (France)"
+  name: "Die Hard Trilogy 2 - Viva Las Vegas"
+  saveName: "Die Hard Trilogy 2 - Viva Las Vegas (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38160,7 +40067,8 @@ SLES-02747:
     multitap: false
     linkCable: false
 SLES-02748:
-  name: "Die Hard Trilogy 2 - Viva Las Vegas (Germany)"
+  name: "Die Hard Trilogy 2 - Viva Las Vegas"
+  saveName: "Die Hard Trilogy 2 - Viva Las Vegas (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38182,7 +40090,8 @@ SLES-02748:
     multitap: false
     linkCable: false
 SLES-02749:
-  name: "Die Hard Trilogy 2 - Viva Las Vegas (Italy)"
+  name: "Die Hard Trilogy 2 - Viva Las Vegas"
+  saveName: "Die Hard Trilogy 2 - Viva Las Vegas (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38204,7 +40113,8 @@ SLES-02749:
     multitap: false
     linkCable: false
 SLUS-01015:
-  name: "Die Hard Trilogy 2 - Viva Las Vegas (USA)"
+  name: "Die Hard Trilogy 2 - Viva Las Vegas"
+  saveName: "Die Hard Trilogy 2 - Viva Las Vegas (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38264,7 +40174,8 @@ SLPS-03371:
     multitap: false
     linkCable: false
 SLPS-00549:
-  name: "DigiCro - Digital Number Crossword (Japan)"
+  name: "DigiCro - Digital Number Crossword"
+  saveName: "DigiCro - Digital Number Crossword (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -38282,7 +40193,8 @@ SLPS-00549:
     multitap: false
     linkCable: false
 SLPM-86038:
-  name: "Digical League (Japan)"
+  name: "Digical League"
+  saveName: "Digical League (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -38300,7 +40212,8 @@ SLPM-86038:
     multitap: false
     linkCable: false
 SLES-03900:
-  name: "Digimon Digital Card Battle (Europe)"
+  name: "Digimon Digital Card Battle"
+  saveName: "Digimon Digital Card Battle (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38319,7 +40232,8 @@ SLES-03900:
     multitap: false
     linkCable: false
 SLUS-01328:
-  name: "Digimon Digital Card Battle (USA)"
+  name: "Digimon Digital Card Battle"
+  saveName: "Digimon Digital Card Battle (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -38341,7 +40255,8 @@ SLUS-01328:
     multitap: false
     linkCable: false
 SLES-03841:
-  name: "Digimon Rumble Arena (Europe) (En,Fr,De,Es,It)"
+  name: "Digimon Rumble Arena"
+  saveName: "Digimon Rumble Arena (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38364,7 +40279,8 @@ SLES-03841:
     multitap: false
     linkCable: false
 SLUS-01404:
-  name: "Digimon Rumble Arena (USA)"
+  name: "Digimon Rumble Arena"
+  saveName: "Digimon Rumble Arena (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -38386,7 +40302,8 @@ SLUS-01404:
     multitap: false
     linkCable: false
 SLES-02914:
-  name: "Digimon World (Europe)"
+  name: "Digimon World"
+  saveName: "Digimon World (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -38404,7 +40321,8 @@ SLES-02914:
     multitap: false
     linkCable: false
 SLES-03435:
-  name: "Digimon World (France)"
+  name: "Digimon World"
+  saveName: "Digimon World (France)"
   controllers:
     - DigitalController
   metadata:
@@ -38422,7 +40340,8 @@ SLES-03435:
     multitap: false
     linkCable: false
 SLES-03434:
-  name: "Digimon World (Germany)"
+  name: "Digimon World"
+  saveName: "Digimon World (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -38440,7 +40359,8 @@ SLES-03434:
     multitap: false
     linkCable: false
 SLES-03437:
-  name: "Digimon World (Italy)"
+  name: "Digimon World"
+  saveName: "Digimon World (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -38458,7 +40378,8 @@ SLES-03437:
     multitap: false
     linkCable: false
 SLES-03436:
-  name: "Digimon World (Spain)"
+  name: "Digimon World"
+  saveName: "Digimon World (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -38476,7 +40397,8 @@ SLES-03436:
     multitap: false
     linkCable: false
 SLUS-01032:
-  name: "Digimon World (USA)"
+  name: "Digimon World"
+  saveName: "Digimon World (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -38497,7 +40419,8 @@ SLUS-01032:
     multitap: false
     linkCable: false
 SLUS-01193:
-  name: "Digimon World 2 (USA)"
+  name: "Digimon World 2"
+  saveName: "Digimon World 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -38518,7 +40441,8 @@ SLUS-01193:
     multitap: false
     linkCable: false
 SLES-03936:
-  name: "Digimon World 2003 (Europe) (En,Fr,De,Es,It)"
+  name: "Digimon World 2003"
+  saveName: "Digimon World 2003 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38543,7 +40467,8 @@ SLES-03936:
     multitap: false
     linkCable: false
 SLUS-01436:
-  name: "Digimon World 3 (USA)"
+  name: "Digimon World 3"
+  saveName: "Digimon World 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -38585,7 +40510,8 @@ SLPS-91233:
     multitap: false
     linkCable: false
 SLPS-03357:
-  name: "DigimonTamers - Battle Evolution (Japan)"
+  name: "DigimonTamers - Battle Evolution"
+  saveName: "DigimonTamers - Battle Evolution (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38604,7 +40530,8 @@ SLPS-03357:
     multitap: false
     linkCable: false
 SLPS-03211:
-  name: "DigimonTamers - PocketCulumon (Japan)"
+  name: "DigimonTamers - PocketCulumon"
+  saveName: "DigimonTamers - PocketCulumon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38623,7 +40550,8 @@ SLPS-03211:
     multitap: false
     linkCable: false
 SLPS-01797:
-  name: "DigimonWorld (Japan)"
+  name: "DigimonWorld"
+  saveName: "DigimonWorld (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -38641,7 +40569,8 @@ SLPS-01797:
     multitap: false
     linkCable: false
 SLPS-03101:
-  name: "DigimonWorld - Digital Card Arena (Japan)"
+  name: "DigimonWorld - Digital Card Arena"
+  saveName: "DigimonWorld - Digital Card Arena (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38660,7 +40589,8 @@ SLPS-03101:
     multitap: false
     linkCable: false
 SLPS-02506:
-  name: "DigimonWorld - Digital Card Battle (Japan)"
+  name: "DigimonWorld - Digital Card Battle"
+  saveName: "DigimonWorld - Digital Card Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38679,7 +40609,8 @@ SLPS-02506:
     multitap: false
     linkCable: false
 SLPS-02844:
-  name: "DigimonWorld 2 (Japan)"
+  name: "DigimonWorld 2"
+  saveName: "DigimonWorld 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -38697,7 +40628,8 @@ SLPS-02844:
     multitap: false
     linkCable: false
 SLPS-03446:
-  name: "DigimonWorld 3 - Aratanaru Bouken no Tobira (Japan)"
+  name: "DigimonWorld 3 - Aratanaru Bouken no Tobira"
+  saveName: "DigimonWorld 3 - Aratanaru Bouken no Tobira (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38716,7 +40648,8 @@ SLPS-03446:
     multitap: false
     linkCable: false
 SLPM-87103:
-  name: "Digital Ehon Vol. 1 - Imadoki no Momotarou (Japan)"
+  name: "Digital Ehon Vol. 1 - Imadoki no Momotarou"
+  saveName: "Digital Ehon Vol. 1 - Imadoki no Momotarou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38735,7 +40668,8 @@ SLPM-87103:
     multitap: false
     linkCable: false
 SLPM-87104:
-  name: "Digital Ehon Vol. 2 - Imadoki no Kaguya-hime (Japan)"
+  name: "Digital Ehon Vol. 2 - Imadoki no Kaguya-hime"
+  saveName: "Digital Ehon Vol. 2 - Imadoki no Kaguya-hime (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38754,7 +40688,8 @@ SLPM-87104:
     multitap: false
     linkCable: false
 SLPM-87105:
-  name: "Digital Ehon Vol. 3 - Imadoki no Saru Kani (Japan)"
+  name: "Digital Ehon Vol. 3 - Imadoki no Saru Kani"
+  saveName: "Digital Ehon Vol. 3 - Imadoki no Saru Kani (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38773,7 +40708,8 @@ SLPM-87105:
     multitap: false
     linkCable: false
 SLPM-87106:
-  name: "Digital Ehon Vol. 4 - Imadoki no Hanasaka Jiisan (Japan)"
+  name: "Digital Ehon Vol. 4 - Imadoki no Hanasaka Jiisan"
+  saveName: "Digital Ehon Vol. 4 - Imadoki no Hanasaka Jiisan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38792,7 +40728,8 @@ SLPM-87106:
     multitap: false
     linkCable: false
 SLPM-87107:
-  name: "Digital Ehon Vol. 5 - Imadoki no Urashima-tarou (Japan)"
+  name: "Digital Ehon Vol. 5 - Imadoki no Urashima-tarou"
+  saveName: "Digital Ehon Vol. 5 - Imadoki no Urashima-tarou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38811,7 +40748,8 @@ SLPM-87107:
     multitap: false
     linkCable: false
 SLPS-01481:
-  name: "Digital Figure Iina (Japan)"
+  name: "Digital Figure Iina"
+  saveName: "Digital Figure Iina (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -38829,7 +40767,8 @@ SLPS-01481:
     multitap: false
     linkCable: false
 SLPS-02276:
-  name: "Digital Glider Airman (Japan)"
+  name: "Digital Glider Airman"
+  saveName: "Digital Glider Airman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38867,7 +40806,8 @@ SLPS-91486:
     multitap: false
     linkCable: false
 SLES-02207:
-  name: "Dino Crisis (Europe)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38891,7 +40831,8 @@ SLES-02207:
     multitap: false
     linkCable: false
 SLES-02208:
-  name: "Dino Crisis (France)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38915,7 +40856,8 @@ SLES-02208:
     multitap: false
     linkCable: false
 SLES-02209:
-  name: "Dino Crisis (Germany)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38939,7 +40881,8 @@ SLES-02209:
     multitap: false
     linkCable: false
 SLES-02210:
-  name: "Dino Crisis (Italy)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38963,7 +40906,8 @@ SLES-02210:
     multitap: false
     linkCable: false
 SLPS-02180:
-  name: "Dino Crisis (Japan)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -38986,7 +40930,8 @@ SLPS-02180:
     multitap: false
     linkCable: false
 SLES-02211:
-  name: "Dino Crisis (Spain)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -39013,7 +40958,8 @@ SLES-02211:
     multitap: false
     linkCable: false
 SLUS-00922:
-  name: "Dino Crisis (USA)"
+  name: "Dino Crisis"
+  saveName: "Dino Crisis (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -39039,13 +40985,15 @@ SLUS-00922:
     multitap: false
     linkCable: false
 SLUS-90066:
-  name: "Dino Crisis (USA) (Demo)"
+  name: "Dino Crisis (Demo)"
+  saveName: "Dino Crisis (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     cdromMaxReadSpeedupCycles: 120000
 SLES-03221:
-  name: "Dino Crisis 2 (Europe)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39069,7 +41017,8 @@ SLES-03221:
     multitap: false
     linkCable: false
 SLES-03222:
-  name: "Dino Crisis 2 (France)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39093,7 +41042,8 @@ SLES-03222:
     multitap: false
     linkCable: false
 SLES-03223:
-  name: "Dino Crisis 2 (Germany)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39117,7 +41067,8 @@ SLES-03223:
     multitap: false
     linkCable: false
 SLES-03224:
-  name: "Dino Crisis 2 (Italy)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39141,7 +41092,8 @@ SLES-03224:
     multitap: false
     linkCable: false
 SLPM-86627:
-  name: "Dino Crisis 2 (Japan)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39167,7 +41119,8 @@ SLPM-86627:
     multitap: false
     linkCable: false
 SLPM-80573:
-  name: "Dino Crisis 2 (Japan) (Demo)"
+  name: "Dino Crisis 2 (Demo)"
+  saveName: "Dino Crisis 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -39175,7 +41128,8 @@ SLPM-80573:
   settings:
     cdromMaxReadSpeedupCycles: 80000
 SLES-03225:
-  name: "Dino Crisis 2 (Spain)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -39202,7 +41156,8 @@ SLES-03225:
     multitap: false
     linkCable: false
 SLUS-01279:
-  name: "Dino Crisis 2 (USA)"
+  name: "Dino Crisis 2"
+  saveName: "Dino Crisis 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -39228,7 +41183,8 @@ SLUS-01279:
     multitap: false
     linkCable: false
 SLUS-90087:
-  name: "Dino Crisis 2 (USA) (En,Ja) (Demo)"
+  name: "Dino Crisis 2 (Demo)"
+  saveName: "Dino Crisis 2 (USA) (En,Ja) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -39236,7 +41192,8 @@ SLUS-90087:
   settings:
     cdromMaxReadSpeedupCycles: 80000
 SLES-03989:
-  name: "Dinomaster Party (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Dinomaster Party"
+  saveName: "Dinomaster Party (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39260,7 +41217,8 @@ SLES-03989:
     multitap: true
     linkCable: false
 SLES-04063:
-  name: "Dinosaurs (Europe) (En,Fr,De)"
+  name: "Dinosaurs"
+  saveName: "Dinosaurs (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39281,7 +41239,8 @@ SLES-04063:
     multitap: false
     linkCable: false
 SLPS-02797:
-  name: "Dioramos (Japan)"
+  name: "Dioramos"
+  saveName: "Dioramos (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39300,11 +41259,13 @@ SLPS-02797:
     multitap: true
     linkCable: false
 SLPM-80587:
-  name: "Dioramos (Japan) (Demo)"
+  name: "Dioramos (Demo)"
+  saveName: "Dioramos (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02146:
-  name: "Dirt Champ Motocross No. 1 (Japan)"
+  name: "Dirt Champ Motocross No. 1"
+  saveName: "Dirt Champ Motocross No. 1 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39323,11 +41284,13 @@ SLPS-02146:
     multitap: false
     linkCable: false
 SLPM-80501:
-  name: "Dirt Champ Motocross No. 1 (Japan) (Demo)"
+  name: "Dirt Champ Motocross No. 1 (Demo)"
+  saveName: "Dirt Champ Motocross No. 1 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01552:
-  name: "Dirt Jockey - Heavy Equipment Operator (USA)"
+  name: "Dirt Jockey - Heavy Equipment Operator"
+  saveName: "Dirt Jockey - Heavy Equipment Operator (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39346,7 +41309,8 @@ SLUS-01552:
     multitap: false
     linkCable: false
 SLPS-02428:
-  name: "Disc Derby - Meiba o Tsukurou!! (Japan)"
+  name: "Disc Derby - Meiba o Tsukurou!!"
+  saveName: "Disc Derby - Meiba o Tsukurou!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39384,9 +41348,11 @@ SLPS-03024:
     multitap: false
     linkCable: false
 SLPM-80169:
-  name: "Disc Station Bessatsu - I Miss You. Tanaka Katsumi (Japan)"
+  name: "Disc Station Bessatsu - I Miss You. Tanaka Katsumi"
+  saveName: "Disc Station Bessatsu - I Miss You. Tanaka Katsumi (Japan)"
 SLPS-00251:
-  name: "Discworld (Japan)"
+  name: "Discworld"
+  saveName: "Discworld (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -39411,11 +41377,13 @@ SLPS-00251:
     multitap: false
     linkCable: false
 SLED-01109:
-  name: "Discworld II (France) (Demo)"
+  name: "Discworld II (Demo)"
+  saveName: "Discworld II (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00793:
-  name: "Discworld II - Missing Presumed...! (Europe) (En,Es,It)"
+  name: "Discworld II - Missing Presumed...!"
+  saveName: "Discworld II - Missing Presumed...! (Europe) (En,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -39439,7 +41407,8 @@ SLES-00793:
     multitap: false
     linkCable: false
 SCUS-94605:
-  name: "Discworld II - Mortality Bytes! (USA)"
+  name: "Discworld II - Mortality Bytes!"
+  saveName: "Discworld II - Mortality Bytes! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -39461,7 +41430,8 @@ SCUS-94605:
     multitap: false
     linkCable: false
 SLES-00794:
-  name: "Discworld II - Mortellement Votre (France)"
+  name: "Discworld II - Mortellement Votre"
+  saveName: "Discworld II - Mortellement Votre (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -39483,7 +41453,8 @@ SLES-00794:
     multitap: false
     linkCable: false
 SLES-00795:
-  name: "Discworld II - Vermutlich vermisst...! (Germany)"
+  name: "Discworld II - Vermutlich vermisst...!"
+  saveName: "Discworld II - Vermutlich vermisst...! (Germany)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -39505,7 +41476,8 @@ SLES-00795:
     multitap: false
     linkCable: false
 SLES-01549:
-  name: "Discworld Noir (Europe) (En,Es,It)"
+  name: "Discworld Noir"
+  saveName: "Discworld Noir (Europe) (En,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -39526,11 +41498,13 @@ SLES-01549:
     multitap: false
     linkCable: false
 SLED-02604:
-  name: "Discworld Noir (Europe) (En,Es,It) (Demo)"
+  name: "Discworld Noir (Demo)"
+  saveName: "Discworld Noir (Europe) (En,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02063:
-  name: "Discworld Noir (France)"
+  name: "Discworld Noir"
+  saveName: "Discworld Noir (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -39552,7 +41526,8 @@ SLES-02063:
     multitap: false
     linkCable: false
 SLES-02064:
-  name: "Discworld Noir (Germany)"
+  name: "Discworld Noir"
+  saveName: "Discworld Noir (Germany)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -39571,7 +41546,8 @@ SLES-02064:
     multitap: false
     linkCable: false
 SCES-00894:
-  name: "Disney Action Game Disney Presenta Hercules (Italy)"
+  name: "Disney Action Game Disney Presenta Hercules"
+  saveName: "Disney Action Game Disney Presenta Hercules (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39590,7 +41566,8 @@ SCES-00894:
     multitap: false
     linkCable: false
 SCES-03004:
-  name: "Disney Aladdin - La Revanche de Nasira (France)"
+  name: "Disney Aladdin - La Revanche de Nasira"
+  saveName: "Disney Aladdin - La Revanche de Nasira (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39611,7 +41588,8 @@ SCES-03004:
     multitap: false
     linkCable: false
 SCES-03006:
-  name: "Disney Aladdin - La Vendetta di Nasira (Italy)"
+  name: "Disney Aladdin - La Vendetta di Nasira"
+  saveName: "Disney Aladdin - La Vendetta di Nasira (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39632,7 +41610,8 @@ SCES-03006:
     multitap: false
     linkCable: false
 SCES-03008:
-  name: "Disney Aladdin - La Venganza de Nasira (Spain)"
+  name: "Disney Aladdin - La Venganza de Nasira"
+  saveName: "Disney Aladdin - La Venganza de Nasira (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39653,7 +41632,8 @@ SCES-03008:
     multitap: false
     linkCable: false
 SCES-03543:
-  name: "Disney Atlantida - O Continente Perdido (Portugal)"
+  name: "Disney Atlantida - O Continente Perdido"
+  saveName: "Disney Atlantida - O Continente Perdido (Portugal)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39672,7 +41652,8 @@ SCES-03543:
     multitap: false
     linkCable: false
 SCES-03537:
-  name: "Disney Atlantide - L'Empire Perdu (France)"
+  name: "Disney Atlantide - L'Empire Perdu"
+  saveName: "Disney Atlantide - L'Empire Perdu (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39691,11 +41672,13 @@ SCES-03537:
     multitap: false
     linkCable: false
 SCED-03637:
-  name: "Disney Atlantide - L'Empire Perdu (France) (Demo)"
+  name: "Disney Atlantide - L'Empire Perdu (Demo)"
+  saveName: "Disney Atlantide - L'Empire Perdu (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03541:
-  name: "Disney Atlantis - El Imperio Perdido (Spain)"
+  name: "Disney Atlantis - El Imperio Perdido"
+  saveName: "Disney Atlantis - El Imperio Perdido (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4315-gf7587eae"
@@ -39717,7 +41700,8 @@ SCES-03541:
     multitap: false
     linkCable: false
 SCES-03539:
-  name: "Disney Atlantis - L'Impero Perduto (Italy)"
+  name: "Disney Atlantis - L'Impero Perduto"
+  saveName: "Disney Atlantis - L'Impero Perduto (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39736,7 +41720,8 @@ SCES-03539:
     multitap: false
     linkCable: false
 SCES-03715:
-  name: "Disney Aventuras de Peter Pan en el Pais de Nunca Jamas (Spain)"
+  name: "Disney Aventuras de Peter Pan en el Pais de Nunca Jamas"
+  saveName: "Disney Aventuras de Peter Pan en el Pais de Nunca Jamas (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39755,7 +41740,8 @@ SCES-03715:
     multitap: false
     linkCable: false
 SLES-03638:
-  name: "Disney Dingo Une Journee de Dingue! (France)"
+  name: "Disney Dingo Une Journee de Dingue!"
+  saveName: "Disney Dingo Une Journee de Dingue! (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39774,7 +41760,8 @@ SLES-03638:
     multitap: false
     linkCable: false
 SLES-02891:
-  name: "Disney Dinosaure (France)"
+  name: "Disney Dinosaure"
+  saveName: "Disney Dinosaure (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39793,7 +41780,8 @@ SLES-02891:
     multitap: false
     linkCable: false
 SLES-02893:
-  name: "Disney Dinosauri (Italy)"
+  name: "Disney Dinosauri"
+  saveName: "Disney Dinosauri (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39812,7 +41800,8 @@ SLES-02893:
     multitap: false
     linkCable: false
 SLES-02894:
-  name: "Disney Dinosaurio (Spain)"
+  name: "Disney Dinosaurio"
+  saveName: "Disney Dinosaurio (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39831,7 +41820,8 @@ SLES-02894:
     multitap: false
     linkCable: false
 SCES-03018:
-  name: "Disney El Emperador y sus Locuras (Spain)"
+  name: "Disney El Emperador y sus Locuras"
+  saveName: "Disney El Emperador y sus Locuras (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39850,7 +41840,8 @@ SCES-03018:
     multitap: false
     linkCable: false
 SCES-03941:
-  name: "Disney El planeta del tesoro (Spain)"
+  name: "Disney El planeta del tesoro"
+  saveName: "Disney El planeta del tesoro (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39869,7 +41860,8 @@ SCES-03941:
     multitap: false
     linkCable: false
 SCES-02004:
-  name: "Disney Fais Ton Histoire! Mulan (France)"
+  name: "Disney Fais Ton Histoire! Mulan"
+  saveName: "Disney Fais Ton Histoire! Mulan (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39889,7 +41881,8 @@ SCES-02004:
     multitap: false
     linkCable: false
 SCES-03940:
-  name: "Disney Il Pianeta del Tesoro (Italy)"
+  name: "Disney Il Pianeta del Tesoro"
+  saveName: "Disney Il Pianeta del Tesoro (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39908,7 +41901,8 @@ SCES-03940:
     multitap: false
     linkCable: false
 SLES-03271:
-  name: "Disney Il Re Leone - La Grande Avventura di Simba (Italy)"
+  name: "Disney Il Re Leone - La Grande Avventura di Simba"
+  saveName: "Disney Il Re Leone - La Grande Avventura di Simba (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39927,7 +41921,8 @@ SLES-03271:
     multitap: false
     linkCable: false
 SCES-00892:
-  name: "Disney Jeu d'Action Disney Presente Hercule (France)"
+  name: "Disney Jeu d'Action Disney Presente Hercule"
+  saveName: "Disney Jeu d'Action Disney Presente Hercule (France)"
   controllers:
     - DigitalController
   metadata:
@@ -39945,7 +41940,8 @@ SCES-00892:
     multitap: false
     linkCable: false
 SCES-00895:
-  name: "Disney Juego de Accion Disney Presenta Hercules (Spain)"
+  name: "Disney Juego de Accion Disney Presenta Hercules"
+  saveName: "Disney Juego de Accion Disney Presenta Hercules (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -39966,7 +41962,8 @@ SCES-00895:
     multitap: false
     linkCable: false
 SCES-03013:
-  name: "Disney Keisarin Uudet Kuviot (Finland)"
+  name: "Disney Keisarin Uudet Kuviot"
+  saveName: "Disney Keisarin Uudet Kuviot (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -39985,7 +41982,8 @@ SCES-03013:
     multitap: false
     linkCable: false
 SCES-03014:
-  name: "Disney Kuzco - L'Empereur Megalo (France)"
+  name: "Disney Kuzco - L'Empereur Megalo"
+  saveName: "Disney Kuzco - L'Empereur Megalo (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40004,7 +42002,8 @@ SCES-03014:
     multitap: false
     linkCable: false
 SCES-03033:
-  name: "Disney La Petite Sirene 2 (France)"
+  name: "Disney La Petite Sirene 2"
+  saveName: "Disney La Petite Sirene 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40023,7 +42022,8 @@ SCES-03033:
     multitap: false
     linkCable: false
 SCES-03938:
-  name: "Disney La Planete au Tresor (France)"
+  name: "Disney La Planete au Tresor"
+  saveName: "Disney La Planete au Tresor (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40042,7 +42042,8 @@ SCES-03938:
     multitap: false
     linkCable: false
 SCES-03035:
-  name: "Disney La Sirenetta II (Italy)"
+  name: "Disney La Sirenetta II"
+  saveName: "Disney La Sirenetta II (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40061,7 +42062,8 @@ SCES-03035:
     multitap: false
     linkCable: false
 SCES-03036:
-  name: "Disney La Sirenita 2 (Spain)"
+  name: "Disney La Sirenita 2"
+  saveName: "Disney La Sirenita 2 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40080,7 +42082,8 @@ SCES-03036:
     multitap: false
     linkCable: false
 SLES-03641:
-  name: "Disney La Super-Diver Casa de Goofy (Spain)"
+  name: "Disney La Super-Diver Casa de Goofy"
+  saveName: "Disney La Super-Diver Casa de Goofy (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40099,7 +42102,8 @@ SLES-03641:
     multitap: false
     linkCable: false
 SCES-03016:
-  name: "Disney Le Follie dell'Imperatore (Italy)"
+  name: "Disney Le Follie dell'Imperatore"
+  saveName: "Disney Le Follie dell'Imperatore (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40118,7 +42122,8 @@ SCES-03016:
     multitap: false
     linkCable: false
 SLES-03965:
-  name: "Disney Learning - Mickey (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Disney Learning - Mickey"
+  saveName: "Disney Learning - Mickey (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40142,7 +42147,8 @@ SLES-03965:
     multitap: false
     linkCable: false
 SLES-03983:
-  name: "Disney Learning - Winnie the Pooh (Europe) (En,Fr,De,It,Nl,Sv,Da)"
+  name: "Disney Learning - Winnie the Pooh"
+  saveName: "Disney Learning - Winnie the Pooh (Europe) (En,Fr,De,It,Nl,Sv,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40167,7 +42173,8 @@ SLES-03983:
     multitap: false
     linkCable: false
 SCES-02006:
-  name: "Disney Libro Animato Creativo - Mulan (Italy)"
+  name: "Disney Libro Animato Creativo - Mulan"
+  saveName: "Disney Libro Animato Creativo - Mulan (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40187,7 +42194,8 @@ SCES-02006:
     multitap: false
     linkCable: false
 SCES-03874:
-  name: "Disney Lilo & Stitch - Grossi Guai alle Hawaii (Italy)"
+  name: "Disney Lilo & Stitch - Grossi Guai alle Hawaii"
+  saveName: "Disney Lilo & Stitch - Grossi Guai alle Hawaii (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40206,7 +42214,8 @@ SCES-03874:
     multitap: false
     linkCable: false
 SCES-03872:
-  name: "Disney Lilo & Stitch - Ouragan sur Hawai (France)"
+  name: "Disney Lilo & Stitch - Ouragan sur Hawai"
+  saveName: "Disney Lilo & Stitch - Ouragan sur Hawai (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40225,7 +42234,8 @@ SCES-03872:
     multitap: false
     linkCable: false
 SCES-03877:
-  name: "Disney Lilo & Stitch - Sarilhos no Paraiso (Portugal)"
+  name: "Disney Lilo & Stitch - Sarilhos no Paraiso"
+  saveName: "Disney Lilo & Stitch - Sarilhos no Paraiso (Portugal)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40244,7 +42254,8 @@ SCES-03877:
     multitap: false
     linkCable: false
 SCES-03875:
-  name: "Disney Lilo & Stitch en Problemas en el Paraiso (Spain)"
+  name: "Disney Lilo & Stitch en Problemas en el Paraiso"
+  saveName: "Disney Lilo & Stitch en Problemas en el Paraiso (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40263,7 +42274,8 @@ SCES-03875:
     multitap: false
     linkCable: false
 SLES-03099:
-  name: "Disney Pato Donald - Cuac Attack (Spain)"
+  name: "Disney Pato Donald - Cuac Attack"
+  saveName: "Disney Pato Donald - Cuac Attack (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40282,7 +42294,8 @@ SLES-03099:
     multitap: false
     linkCable: false
 SCES-03717:
-  name: "Disney Peter Pan - Aventuras na Terra do Nunca (Portugal)"
+  name: "Disney Peter Pan - Aventuras na Terra do Nunca"
+  saveName: "Disney Peter Pan - Aventuras na Terra do Nunca (Portugal)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40301,7 +42314,8 @@ SCES-03717:
     multitap: false
     linkCable: false
 SCES-03711:
-  name: "Disney Peter Pan - Aventures au Pays Imaginaire (France)"
+  name: "Disney Peter Pan - Aventures au Pays Imaginaire"
+  saveName: "Disney Peter Pan - Aventures au Pays Imaginaire (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40320,7 +42334,8 @@ SCES-03711:
     multitap: false
     linkCable: false
 SCES-03713:
-  name: "Disney Peter Pan - L'Avventura nell'Isola che non c'e (Italy)"
+  name: "Disney Peter Pan - L'Avventura nell'Isola che non c'e"
+  saveName: "Disney Peter Pan - L'Avventura nell'Isola che non c'e (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40339,7 +42354,8 @@ SCES-03713:
     multitap: false
     linkCable: false
 SLES-03640:
-  name: "Disney Pippo Giochi Pazzi (Italy)"
+  name: "Disney Pippo Giochi Pazzi"
+  saveName: "Disney Pippo Giochi Pazzi (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40358,7 +42374,8 @@ SLES-03640:
     multitap: false
     linkCable: false
 SCES-03749:
-  name: "Disney Pooh e Tigro! E Qui la Festa (Italy)"
+  name: "Disney Pooh e Tigro! E Qui la Festa"
+  saveName: "Disney Pooh e Tigro! E Qui la Festa (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40377,7 +42394,8 @@ SCES-03749:
     multitap: true
     linkCable: false
 SLUS-01210:
-  name: "Disney Presents Tigger's Honey Hunt (USA)"
+  name: "Disney Presents Tigger's Honey Hunt"
+  saveName: "Disney Presents Tigger's Honey Hunt (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1558-gf852be74"
@@ -40399,7 +42417,8 @@ SLUS-01210:
     multitap: false
     linkCable: false
 SLUS-01536:
-  name: "Disney Presents Tigger's Honey Hunt (USA) (Collector's Edition)"
+  name: "Disney Presents Tigger's Honey Hunt (Collector's Edition)"
+  saveName: "Disney Presents Tigger's Honey Hunt (USA) (Collector's Edition)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40418,7 +42437,8 @@ SLUS-01536:
     multitap: false
     linkCable: false
 SCES-01516:
-  name: "Disney Tarzan (France)"
+  name: "Disney Tarzan"
+  saveName: "Disney Tarzan (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40438,7 +42458,8 @@ SCES-01516:
     multitap: false
     linkCable: false
 SCES-01518:
-  name: "Disney Tarzan (Italy)"
+  name: "Disney Tarzan"
+  saveName: "Disney Tarzan (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40458,7 +42479,8 @@ SCES-01518:
     multitap: false
     linkCable: false
 SCES-01519:
-  name: "Disney Tarzan (Spain)"
+  name: "Disney Tarzan"
+  saveName: "Disney Tarzan (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4315-gf7587eae"
@@ -40481,7 +42503,8 @@ SCES-01519:
     multitap: false
     linkCable: false
 SLES-03259:
-  name: "Disney Tigger tras un Bote de Miel (Spain)"
+  name: "Disney Tigger tras un Bote de Miel"
+  saveName: "Disney Tigger tras un Bote de Miel (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40500,7 +42523,8 @@ SLES-03259:
     multitap: false
     linkCable: false
 SLES-03258:
-  name: "Disney Tigro e la Caccia al Miele (Italy)"
+  name: "Disney Tigro e la Caccia al Miele"
+  saveName: "Disney Tigro e la Caccia al Miele (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40519,7 +42543,8 @@ SLES-03258:
     multitap: false
     linkCable: false
 SCES-03748:
-  name: "Disney Ven a la Fiesta! con Winnie the Pooh (Spain)"
+  name: "Disney Ven a la Fiesta! con Winnie the Pooh"
+  saveName: "Disney Ven a la Fiesta! con Winnie the Pooh (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40538,7 +42563,8 @@ SCES-03748:
     multitap: true
     linkCable: false
 SLES-03256:
-  name: "Disney Winnie l'Ourson - La Chasse au Miel de Tigrou (France)"
+  name: "Disney Winnie l'Ourson - La Chasse au Miel de Tigrou"
+  saveName: "Disney Winnie l'Ourson - La Chasse au Miel de Tigrou (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40557,7 +42583,8 @@ SLES-03256:
     multitap: false
     linkCable: false
 SLES-03269:
-  name: "Disney le Roi Lion - La Formidable Aventure de Simba (France)"
+  name: "Disney le Roi Lion - La Formidable Aventure de Simba"
+  saveName: "Disney le Roi Lion - La Formidable Aventure de Simba (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40576,7 +42603,8 @@ SLES-03269:
     multitap: false
     linkCable: false
 SLUS-01574:
-  name: "Disney's 101 Dalmatians II - Patch's London Adventure (USA)"
+  name: "Disney's 101 Dalmatians II - Patch's London Adventure"
+  saveName: "Disney's 101 Dalmatians II - Patch's London Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40595,7 +42623,8 @@ SLUS-01574:
     multitap: false
     linkCable: false
 SLES-03189:
-  name: "Disney's 102 Dalmatians - Puppies to the Rescue (Europe)"
+  name: "Disney's 102 Dalmatians - Puppies to the Rescue"
+  saveName: "Disney's 102 Dalmatians - Puppies to the Rescue (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40615,7 +42644,8 @@ SLES-03189:
     multitap: false
     linkCable: false
 SLES-03191:
-  name: "Disney's 102 Dalmatians - Puppies to the Rescue (Europe) (Fr,De,Es,It,Nl)"
+  name: "Disney's 102 Dalmatians - Puppies to the Rescue"
+  saveName: "Disney's 102 Dalmatians - Puppies to the Rescue (Europe) (Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40639,7 +42669,8 @@ SLES-03191:
     multitap: false
     linkCable: false
 SLES-03190:
-  name: "Disney's 102 Dalmatians - Puppies to the Rescue (Scandinavia) (Sv,No,Da)"
+  name: "Disney's 102 Dalmatians - Puppies to the Rescue"
+  saveName: "Disney's 102 Dalmatians - Puppies to the Rescue (Scandinavia) (Sv,No,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40661,7 +42692,8 @@ SLES-03190:
     multitap: false
     linkCable: false
 SLUS-01152:
-  name: "Disney's 102 Dalmatians - Puppies to the Rescue (USA)"
+  name: "Disney's 102 Dalmatians - Puppies to the Rescue"
+  saveName: "Disney's 102 Dalmatians - Puppies to the Rescue (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1558-gf852be74"
@@ -40683,7 +42715,8 @@ SLUS-01152:
     multitap: false
     linkCable: false
 SCES-00891:
-  name: "Disney's Action Game featuring Hercules (Europe)"
+  name: "Disney's Action Game featuring Hercules"
+  saveName: "Disney's Action Game featuring Hercules (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -40701,7 +42734,8 @@ SCES-00891:
     multitap: false
     linkCable: false
 SCES-00896:
-  name: "Disney's Action Game met Hercules (Netherlands)"
+  name: "Disney's Action Game met Hercules"
+  saveName: "Disney's Action Game met Hercules (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40720,7 +42754,8 @@ SCES-00896:
     multitap: false
     linkCable: false
 SCES-00898:
-  name: "Disney's Action spel med Herkules (Sweden)"
+  name: "Disney's Action spel med Herkules"
+  saveName: "Disney's Action spel med Herkules (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40739,7 +42774,8 @@ SCES-00898:
     multitap: false
     linkCable: false
 SCES-03000:
-  name: "Disney's Aladdin in Nasira's Revenge (Europe)"
+  name: "Disney's Aladdin in Nasira's Revenge"
+  saveName: "Disney's Aladdin in Nasira's Revenge (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40760,7 +42796,8 @@ SCES-03000:
     multitap: false
     linkCable: false
 SCUS-94569:
-  name: "Disney's Aladdin in Nasira's Revenge (USA)"
+  name: "Disney's Aladdin in Nasira's Revenge"
+  saveName: "Disney's Aladdin in Nasira's Revenge (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4693-gbbcf1c67"
@@ -40784,7 +42821,8 @@ SCUS-94569:
     multitap: false
     linkCable: false
 SCES-03002:
-  name: "Disney's Aladdin in Nasira's Wraak (Netherlands)"
+  name: "Disney's Aladdin in Nasira's Wraak"
+  saveName: "Disney's Aladdin in Nasira's Wraak (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40805,7 +42843,8 @@ SCES-03002:
     multitap: false
     linkCable: false
 SCES-03535:
-  name: "Disney's Atlantis - De Verzonken Stad (Netherlands)"
+  name: "Disney's Atlantis - De Verzonken Stad"
+  saveName: "Disney's Atlantis - De Verzonken Stad (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40824,7 +42863,8 @@ SCES-03535:
     multitap: false
     linkCable: false
 SCES-03542:
-  name: "Disney's Atlantis - En foersvunnen vaerld (Sweden)"
+  name: "Disney's Atlantis - En foersvunnen vaerld"
+  saveName: "Disney's Atlantis - En foersvunnen vaerld (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40843,11 +42883,13 @@ SCES-03542:
     multitap: false
     linkCable: false
 SCED-03636:
-  name: "Disney's Atlantis - The Lost Empire (Australia) (Demo)"
+  name: "Disney's Atlantis - The Lost Empire (Demo)"
+  saveName: "Disney's Atlantis - The Lost Empire (Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03533:
-  name: "Disney's Atlantis - The Lost Empire (Europe)"
+  name: "Disney's Atlantis - The Lost Empire"
+  saveName: "Disney's Atlantis - The Lost Empire (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40866,7 +42908,8 @@ SCES-03533:
     multitap: false
     linkCable: false
 SCUS-94636:
-  name: "Disney's Atlantis - The Lost Empire (USA)"
+  name: "Disney's Atlantis - The Lost Empire"
+  saveName: "Disney's Atlantis - The Lost Empire (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4739-g1cc6ee48"
@@ -40888,7 +42931,8 @@ SCUS-94636:
     multitap: false
     linkCable: false
 SCES-02007:
-  name: "Disney's Aventura Interactiva - Mulan (Spain)"
+  name: "Disney's Aventura Interactiva - Mulan"
+  saveName: "Disney's Aventura Interactiva - Mulan (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40908,7 +42952,8 @@ SCES-02007:
     multitap: false
     linkCable: false
 SCES-03235:
-  name: "Disney's De Kleine Zeemeermin II (Netherlands)"
+  name: "Disney's De Kleine Zeemeermin II"
+  saveName: "Disney's De Kleine Zeemeermin II (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40927,7 +42972,8 @@ SCES-03235:
     multitap: false
     linkCable: false
 SLES-03268:
-  name: "Disney's De Leeuwenkoning - Simba's Machtige Avontuur (Netherlands)"
+  name: "Disney's De Leeuwenkoning - Simba's Machtige Avontuur"
+  saveName: "Disney's De Leeuwenkoning - Simba's Machtige Avontuur (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40946,7 +42992,8 @@ SLES-03268:
     multitap: false
     linkCable: false
 SLES-02864:
-  name: "Disney's Dinosaur (Europe) (En,Nl,Sv,No,Da,Fi)"
+  name: "Disney's Dinosaur"
+  saveName: "Disney's Dinosaur (Europe) (En,Nl,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40970,7 +43017,8 @@ SLES-02864:
     multitap: false
     linkCable: false
 SLUS-01167:
-  name: "Disney's Dinosaur (USA)"
+  name: "Disney's Dinosaur"
+  saveName: "Disney's Dinosaur (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -40989,7 +43037,8 @@ SLUS-01167:
     multitap: false
     linkCable: false
 SLES-02892:
-  name: "Disney's Dinosaurier (Germany)"
+  name: "Disney's Dinosaurier"
+  saveName: "Disney's Dinosaurier (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41008,7 +43057,8 @@ SLES-02892:
     multitap: false
     linkCable: false
 SLPM-88502:
-  name: "Disney's Donald Duck - Goin' Quackers (Korea)"
+  name: "Disney's Donald Duck - Goin' Quackers"
+  saveName: "Disney's Donald Duck - Goin' Quackers (Korea)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41027,7 +43077,8 @@ SLPM-88502:
     multitap: false
     linkCable: false
 SLUS-01242:
-  name: "Disney's Donald Duck - Goin' Quackers (USA)"
+  name: "Disney's Donald Duck - Goin' Quackers"
+  saveName: "Disney's Donald Duck - Goin' Quackers (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -41049,7 +43100,8 @@ SLUS-01242:
     multitap: false
     linkCable: false
 SLES-03095:
-  name: "Disney's Donald Duck - Quack Attack (Europe) (En,Fr,De,It)"
+  name: "Disney's Donald Duck - Quack Attack"
+  saveName: "Disney's Donald Duck - Quack Attack (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41071,7 +43123,8 @@ SLES-03095:
     multitap: false
     linkCable: false
 SLES-03098:
-  name: "Disney's Donald Duck - Quack Attack (Netherlands)"
+  name: "Disney's Donald Duck - Quack Attack"
+  saveName: "Disney's Donald Duck - Quack Attack (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41090,7 +43143,8 @@ SLES-03098:
     multitap: false
     linkCable: false
 SLES-03097:
-  name: "Disney's Donald Duck - Quack Attack (Scandinavia) (Sv,No,Da,Fi)"
+  name: "Disney's Donald Duck - Quack Attack"
+  saveName: "Disney's Donald Duck - Quack Attack (Scandinavia) (Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41112,7 +43166,8 @@ SLES-03097:
     multitap: false
     linkCable: false
 SLES-03272:
-  name: "Disney's El Rey Leon - Las Aventuras del Poderoso Simba (Spain)"
+  name: "Disney's El Rey Leon - Las Aventuras del Poderoso Simba"
+  saveName: "Disney's El Rey Leon - Las Aventuras del Poderoso Simba (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41131,7 +43186,8 @@ SLES-03272:
     multitap: false
     linkCable: false
 SLES-03178:
-  name: "Disney's Goofy's Fun House (Europe)"
+  name: "Disney's Goofy's Fun House"
+  saveName: "Disney's Goofy's Fun House (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41150,7 +43206,8 @@ SLES-03178:
     multitap: false
     linkCable: false
 SLES-03639:
-  name: "Disney's Goofy's Fun House (Germany)"
+  name: "Disney's Goofy's Fun House"
+  saveName: "Disney's Goofy's Fun House (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41169,7 +43226,8 @@ SLES-03639:
     multitap: false
     linkCable: false
 SLUS-01209:
-  name: "Disney's Goofy's Fun House (USA)"
+  name: "Disney's Goofy's Fun House"
+  saveName: "Disney's Goofy's Fun House (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -41191,7 +43249,8 @@ SLUS-01209:
     multitap: false
     linkCable: false
 SLUS-00529:
-  name: "Disney's Hercules Action Game (USA)"
+  name: "Disney's Hercules Action Game"
+  saveName: "Disney's Hercules Action Game (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -41212,7 +43271,8 @@ SLUS-00529:
     multitap: false
     linkCable: false
 SLUS-01029:
-  name: "Disney's Hercules Action Game (USA) (Rerelease)"
+  name: "Disney's Hercules Action Game (Rerelease)"
+  saveName: "Disney's Hercules Action Game (USA) (Rerelease)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -41233,7 +43293,8 @@ SLUS-01029:
     multitap: false
     linkCable: false
 SCES-03012:
-  name: "Disney's Keizer Kuzco (Netherlands)"
+  name: "Disney's Keizer Kuzco"
+  saveName: "Disney's Keizer Kuzco (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41252,7 +43313,8 @@ SCES-03012:
     multitap: false
     linkCable: false
 SCUS-94646:
-  name: "Disney's Lilo & Stitch (USA)"
+  name: "Disney's Lilo & Stitch"
+  saveName: "Disney's Lilo & Stitch (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1558-gf852be74"
@@ -41274,7 +43336,8 @@ SCUS-94646:
     multitap: false
     linkCable: false
 SCES-03876:
-  name: "Disney's Lilo & Stitch - Heisa op Hawai (Netherlands)"
+  name: "Disney's Lilo & Stitch - Heisa op Hawai"
+  saveName: "Disney's Lilo & Stitch - Heisa op Hawai (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41312,7 +43375,8 @@ SCEs-03880:
     multitap: false
     linkCable: false
 SCES-03871:
-  name: "Disney's Lilo & Stitch - Trouble in Paradise (Europe)"
+  name: "Disney's Lilo & Stitch - Trouble in Paradise"
+  saveName: "Disney's Lilo & Stitch - Trouble in Paradise (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41331,7 +43395,8 @@ SCES-03871:
     multitap: false
     linkCable: false
 SCES-01695:
-  name: "Disney's Mulan - Story Studio (Europe)"
+  name: "Disney's Mulan - Story Studio"
+  saveName: "Disney's Mulan - Story Studio (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41351,7 +43416,8 @@ SCES-01695:
     multitap: false
     linkCable: false
 SCES-03705:
-  name: "Disney's Party Time with Winnie the Pooh (Europe)"
+  name: "Disney's Party Time with Winnie the Pooh"
+  saveName: "Disney's Party Time with Winnie the Pooh (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41370,7 +43436,8 @@ SCES-03705:
     multitap: true
     linkCable: false
 SCES-03745:
-  name: "Disney's Party mit Winnie Puuh (Germany)"
+  name: "Disney's Party mit Winnie Puuh"
+  saveName: "Disney's Party mit Winnie Puuh (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41389,7 +43456,8 @@ SCES-03745:
     multitap: true
     linkCable: false
 SCES-03707:
-  name: "Disney's Peter Pan - Adventures in Never Land (Europe)"
+  name: "Disney's Peter Pan - Adventures in Never Land"
+  saveName: "Disney's Peter Pan - Adventures in Never Land (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41408,11 +43476,13 @@ SCES-03707:
     multitap: false
     linkCable: false
 SCED-03883:
-  name: "Disney's Peter Pan - Adventures in Never Land (Europe) (Demo)"
+  name: "Disney's Peter Pan - Adventures in Never Land (Demo)"
+  saveName: "Disney's Peter Pan - Adventures in Never Land (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03709:
-  name: "Disney's Peter Pan - Avonturen in Nooitgedachtland (Netherlands)"
+  name: "Disney's Peter Pan - Avonturen in Nooitgedachtland"
+  saveName: "Disney's Peter Pan - Avonturen in Nooitgedachtland (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41450,7 +43520,8 @@ SLUS-01583:
     multitap: false
     linkCable: false
 SCES-03942:
-  name: "Disney's Piratenplaneet - De Schat van Kapitein Flint (Netherlands)"
+  name: "Disney's Piratenplaneet - De Schat van Kapitein Flint"
+  saveName: "Disney's Piratenplaneet - De Schat van Kapitein Flint (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41469,7 +43540,8 @@ SCES-03942:
     multitap: false
     linkCable: false
 SLUS-01437:
-  name: "Disney's Pooh's Party Game - In Search of the Treasure (USA)"
+  name: "Disney's Pooh's Party Game - In Search of the Treasure"
+  saveName: "Disney's Pooh's Party Game - In Search of the Treasure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41488,7 +43560,8 @@ SLUS-01437:
     multitap: true
     linkCable: false
 SCES-03943:
-  name: "Disney's Skattkammarplaneten (Sweden)"
+  name: "Disney's Skattkammarplaneten"
+  saveName: "Disney's Skattkammarplaneten (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41507,7 +43580,8 @@ SCES-03943:
     multitap: false
     linkCable: false
 SCES-03746:
-  name: "Disney's Spelen met Winnie de Poeh en zijn Vriendjes! (Netherlands)"
+  name: "Disney's Spelen met Winnie de Poeh en zijn Vriendjes!"
+  saveName: "Disney's Spelen met Winnie de Poeh en zijn Vriendjes! (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41526,7 +43600,8 @@ SCES-03746:
     multitap: true
     linkCable: false
 SLUS-01038:
-  name: "Disney's Story Studio - Mulan (USA)"
+  name: "Disney's Story Studio - Mulan"
+  saveName: "Disney's Story Studio - Mulan (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41545,7 +43620,8 @@ SLUS-01038:
     multitap: false
     linkCable: false
 SCES-01431:
-  name: "Disney's Tarzan (Europe)"
+  name: "Disney's Tarzan"
+  saveName: "Disney's Tarzan (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41565,7 +43641,8 @@ SCES-01431:
     multitap: false
     linkCable: false
 SLPM-86383:
-  name: "Disney's Tarzan (Japan)"
+  name: "Disney's Tarzan"
+  saveName: "Disney's Tarzan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41584,7 +43661,8 @@ SLPM-86383:
     multitap: false
     linkCable: false
 SCES-02185:
-  name: "Disney's Tarzan (Netherlands)"
+  name: "Disney's Tarzan"
+  saveName: "Disney's Tarzan (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41604,7 +43682,8 @@ SCES-02185:
     multitap: false
     linkCable: false
 SCUS-94456:
-  name: "Disney's Tarzan (USA)"
+  name: "Disney's Tarzan"
+  saveName: "Disney's Tarzan (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -41626,7 +43705,8 @@ SCUS-94456:
     multitap: false
     linkCable: false
 SLUS-01537:
-  name: "Disney's Tarzan (USA) (Rerelease)"
+  name: "Disney's Tarzan (Rerelease)"
+  saveName: "Disney's Tarzan (USA) (Rerelease)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41645,7 +43725,8 @@ SLUS-01537:
     multitap: false
     linkCable: false
 SLES-03260:
-  name: "Disney's Teigetjes Honingjacht (Netherlands)"
+  name: "Disney's Teigetjes Honingjacht"
+  saveName: "Disney's Teigetjes Honingjacht (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41664,7 +43745,8 @@ SLES-03260:
     multitap: false
     linkCable: false
 SCES-03010:
-  name: "Disney's The Emperor's New Groove (Europe)"
+  name: "Disney's The Emperor's New Groove"
+  saveName: "Disney's The Emperor's New Groove (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41683,7 +43765,8 @@ SCES-03010:
     multitap: false
     linkCable: false
 SCUS-94571:
-  name: "Disney's The Emperor's New Groove (USA)"
+  name: "Disney's The Emperor's New Groove"
+  saveName: "Disney's The Emperor's New Groove (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -41705,7 +43788,8 @@ SCUS-94571:
     multitap: false
     linkCable: false
 SLES-03267:
-  name: "Disney's The Lion King - Simba's Mighty Adventure (Europe)"
+  name: "Disney's The Lion King - Simba's Mighty Adventure"
+  saveName: "Disney's The Lion King - Simba's Mighty Adventure (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41724,7 +43808,8 @@ SLES-03267:
     multitap: false
     linkCable: false
 SLUS-01282:
-  name: "Disney's The Lion King - Simba's Mighty Adventure (USA)"
+  name: "Disney's The Lion King - Simba's Mighty Adventure"
+  saveName: "Disney's The Lion King - Simba's Mighty Adventure (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -41746,7 +43831,8 @@ SLUS-01282:
     multitap: false
     linkCable: false
 SCES-03032:
-  name: "Disney's The Little Mermaid II (Europe)"
+  name: "Disney's The Little Mermaid II"
+  saveName: "Disney's The Little Mermaid II (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41765,7 +43851,8 @@ SCES-03032:
     multitap: false
     linkCable: false
 SLUS-01286:
-  name: "Disney's The Little Mermaid II (USA)"
+  name: "Disney's The Little Mermaid II"
+  saveName: "Disney's The Little Mermaid II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -41787,7 +43874,8 @@ SLUS-01286:
     multitap: false
     linkCable: false
 SLES-03179:
-  name: "Disney's Tigger's Honey Hunt (Europe)"
+  name: "Disney's Tigger's Honey Hunt"
+  saveName: "Disney's Tigger's Honey Hunt (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41806,7 +43894,8 @@ SLES-03179:
     multitap: false
     linkCable: false
 SCES-03937:
-  name: "Disney's Treasure Planet (Europe)"
+  name: "Disney's Treasure Planet"
+  saveName: "Disney's Treasure Planet (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41825,7 +43914,8 @@ SCES-03937:
     multitap: false
     linkCable: false
 SCUS-94647:
-  name: "Disney's Treasure Planet (USA)"
+  name: "Disney's Treasure Planet"
+  saveName: "Disney's Treasure Planet (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -41847,7 +43937,8 @@ SCUS-94647:
     multitap: false
     linkCable: false
 SCES-02264:
-  name: "Disney's Verhalenstudio - Mulan (Netherlands)"
+  name: "Disney's Verhalenstudio - Mulan"
+  saveName: "Disney's Verhalenstudio - Mulan (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41867,7 +43958,8 @@ SCES-02264:
     multitap: false
     linkCable: false
 SCES-03706:
-  name: "Disney's Winnie L'Ourson - C' Est La Recre! (France)"
+  name: "Disney's Winnie L'Ourson - C' Est La Recre!"
+  saveName: "Disney's Winnie L'Ourson - C' Est La Recre! (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41886,7 +43978,8 @@ SCES-03706:
     multitap: true
     linkCable: false
 SLUS-01513:
-  name: "Disney's Winnie the Pooh - Kindergarten (USA)"
+  name: "Disney's Winnie the Pooh - Kindergarten"
+  saveName: "Disney's Winnie the Pooh - Kindergarten (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -41908,7 +44001,8 @@ SLUS-01513:
     multitap: false
     linkCable: false
 SLUS-01514:
-  name: "Disney's Winnie the Pooh - Preschool (USA)"
+  name: "Disney's Winnie the Pooh - Preschool"
+  saveName: "Disney's Winnie the Pooh - Preschool (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41927,7 +44021,8 @@ SLUS-01514:
     multitap: false
     linkCable: false
 SCES-01489:
-  name: "Disney-Pixar A Bug's Life (Europe)"
+  name: "Disney-Pixar A Bug's Life"
+  saveName: "Disney-Pixar A Bug's Life (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41946,7 +44041,8 @@ SCES-01489:
     multitap: false
     linkCable: false
 SCES-01520:
-  name: "Disney-Pixar A Bug's Life (France)"
+  name: "Disney-Pixar A Bug's Life"
+  saveName: "Disney-Pixar A Bug's Life (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41965,7 +44061,8 @@ SCES-01520:
     multitap: false
     linkCable: false
 SLPM-86330:
-  name: "Disney-Pixar A Bug's Life (Japan)"
+  name: "Disney-Pixar A Bug's Life"
+  saveName: "Disney-Pixar A Bug's Life (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -41984,7 +44081,8 @@ SLPM-86330:
     multitap: false
     linkCable: false
 SCUS-94288:
-  name: "Disney-Pixar A Bug's Life (USA)"
+  name: "Disney-Pixar A Bug's Life"
+  saveName: "Disney-Pixar A Bug's Life (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42003,7 +44101,8 @@ SCUS-94288:
     multitap: false
     linkCable: false
 SLUS-01538:
-  name: "Disney-Pixar A Bug's Life (USA) (Rerelease)"
+  name: "Disney-Pixar A Bug's Life (Rerelease)"
+  saveName: "Disney-Pixar A Bug's Life (USA) (Rerelease)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -42025,7 +44124,8 @@ SLUS-01538:
     multitap: false
     linkCable: false
 SCES-02459:
-  name: "Disney-Pixar A Bug's Life - Atelier de Jeux (France)"
+  name: "Disney-Pixar A Bug's Life - Atelier de Jeux"
+  saveName: "Disney-Pixar A Bug's Life - Atelier de Jeux (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42044,7 +44144,8 @@ SCES-02459:
     multitap: false
     linkCable: false
 SCES-02014:
-  name: "Disney-Pixar A Bug's Life - Disney's Activity Centre (Europe)"
+  name: "Disney-Pixar A Bug's Life - Disney's Activity Centre"
+  saveName: "Disney-Pixar A Bug's Life - Disney's Activity Centre (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42063,7 +44164,8 @@ SCES-02014:
     multitap: false
     linkCable: false
 SCES-02460:
-  name: "Disney-Pixar A Bug's Life - Disneys Malen und Spielen (Germany)"
+  name: "Disney-Pixar A Bug's Life - Disneys Malen und Spielen"
+  saveName: "Disney-Pixar A Bug's Life - Disneys Malen und Spielen (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42082,7 +44184,8 @@ SCES-02460:
     multitap: false
     linkCable: false
 SCES-01522:
-  name: "Disney-Pixar A Bug's Life - Megaminimondo (Italy)"
+  name: "Disney-Pixar A Bug's Life - Megaminimondo"
+  saveName: "Disney-Pixar A Bug's Life - Megaminimondo (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42101,7 +44204,8 @@ SCES-01522:
     multitap: false
     linkCable: false
 SCES-01523:
-  name: "Disney-Pixar Bichos Una Aventura en Miniatura (Spain)"
+  name: "Disney-Pixar Bichos Una Aventura en Miniatura"
+  saveName: "Disney-Pixar Bichos Una Aventura en Miniatura (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -42123,7 +44227,8 @@ SCES-01523:
     multitap: false
     linkCable: false
 SCES-02461:
-  name: "Disney-Pixar Bottega dei Giochi - A Bug's Life Megaminimondo (Italy)"
+  name: "Disney-Pixar Bottega dei Giochi - A Bug's Life Megaminimondo"
+  saveName: "Disney-Pixar Bottega dei Giochi - A Bug's Life Megaminimondo (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42142,7 +44247,8 @@ SCES-02461:
     multitap: false
     linkCable: false
 SLES-03314:
-  name: "Disney-Pixar Buzz Lightyear da Commando Stellare (Italy)"
+  name: "Disney-Pixar Buzz Lightyear da Commando Stellare"
+  saveName: "Disney-Pixar Buzz Lightyear da Commando Stellare (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42161,7 +44267,8 @@ SLES-03314:
     multitap: false
     linkCable: false
 SLES-03310:
-  name: "Disney-Pixar Buzz Lightyear of Star Command (Europe)"
+  name: "Disney-Pixar Buzz Lightyear of Star Command"
+  saveName: "Disney-Pixar Buzz Lightyear of Star Command (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42180,7 +44287,8 @@ SLES-03310:
     multitap: false
     linkCable: false
 SLUS-01192:
-  name: "Disney-Pixar Buzz Lightyear of Star Command (USA)"
+  name: "Disney-Pixar Buzz Lightyear of Star Command"
+  saveName: "Disney-Pixar Buzz Lightyear of Star Command (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4739-g1cc6ee48"
@@ -42202,7 +44310,8 @@ SLUS-01192:
     multitap: false
     linkCable: false
 SLES-03313:
-  name: "Disney-Pixar Captain Buzz Lightyear - Star Command (Germany)"
+  name: "Disney-Pixar Captain Buzz Lightyear - Star Command"
+  saveName: "Disney-Pixar Captain Buzz Lightyear - Star Command (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42221,7 +44330,8 @@ SLES-03313:
     multitap: false
     linkCable: false
 SCES-01521:
-  name: "Disney-Pixar Das grosse Krabbeln (Germany)"
+  name: "Disney-Pixar Das grosse Krabbeln"
+  saveName: "Disney-Pixar Das grosse Krabbeln (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42240,7 +44350,8 @@ SCES-01521:
     multitap: false
     linkCable: false
 SCES-03764:
-  name: "Disney-Pixar Die Monster AG - Schreckens-Insel (Germany)"
+  name: "Disney-Pixar Die Monster AG - Schreckens-Insel"
+  saveName: "Disney-Pixar Die Monster AG - Schreckens-Insel (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42259,7 +44370,8 @@ SCES-03764:
     multitap: false
     linkCable: false
 SCES-01525:
-  name: "Disney-Pixar Een Luizenleven (Netherlands)"
+  name: "Disney-Pixar Een Luizenleven"
+  saveName: "Disney-Pixar Een Luizenleven (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42278,7 +44390,8 @@ SCES-01525:
     multitap: false
     linkCable: false
 SCES-01526:
-  name: "Disney-Pixar Ett smakryps liv (Sweden)"
+  name: "Disney-Pixar Ett smakryps liv"
+  saveName: "Disney-Pixar Ett smakryps liv (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42297,7 +44410,8 @@ SCES-01526:
     multitap: false
     linkCable: false
 SCES-01524:
-  name: "Disney-Pixar Graes-Rodderne (Denmark)"
+  name: "Disney-Pixar Graes-Rodderne"
+  saveName: "Disney-Pixar Graes-Rodderne (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42316,7 +44430,8 @@ SCES-01524:
     multitap: false
     linkCable: false
 SLES-03312:
-  name: "Disney-Pixar Les Aventures de Buzz L'Eclair (France)"
+  name: "Disney-Pixar Les Aventures de Buzz L'Eclair"
+  saveName: "Disney-Pixar Les Aventures de Buzz L'Eclair (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42335,7 +44450,8 @@ SLES-03312:
     multitap: false
     linkCable: false
 SCES-03765:
-  name: "Disney-Pixar Monster & Co. - L'Isola dello Spavento (Italy)"
+  name: "Disney-Pixar Monster & Co. - L'Isola dello Spavento"
+  saveName: "Disney-Pixar Monster & Co. - L'Isola dello Spavento (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42354,7 +44470,8 @@ SCES-03765:
     multitap: false
     linkCable: false
 SCES-03766:
-  name: "Disney-Pixar Monsterbedriften - Skrekkoya (Norway)"
+  name: "Disney-Pixar Monsterbedriften - Skrekkoya"
+  saveName: "Disney-Pixar Monsterbedriften - Skrekkoya (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42373,7 +44490,8 @@ SCES-03766:
     multitap: false
     linkCable: false
 SCES-03762:
-  name: "Disney-Pixar Monsterit Oy - Saeikkysaari (Finland)"
+  name: "Disney-Pixar Monsterit Oy - Saeikkysaari"
+  saveName: "Disney-Pixar Monsterit Oy - Saeikkysaari (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42392,7 +44510,8 @@ SCES-03762:
     multitap: false
     linkCable: false
 SCES-03761:
-  name: "Disney-Pixar Monsters en Co. - Schrik Eiland (Netherlands)"
+  name: "Disney-Pixar Monsters en Co. - Schrik Eiland"
+  saveName: "Disney-Pixar Monsters en Co. - Schrik Eiland (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42411,7 +44530,8 @@ SCES-03761:
     multitap: false
     linkCable: false
 SCES-03769:
-  name: "Disney-Pixar Monsters, Inc. - Monstros e Companhia - Ilha Assustadora (Portugal)"
+  name: "Disney-Pixar Monsters, Inc. - Monstros e Companhia - Ilha Assustadora"
+  saveName: "Disney-Pixar Monsters, Inc. - Monstros e Companhia - Ilha Assustadora (Portugal)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42430,7 +44550,8 @@ SCES-03769:
     multitap: false
     linkCable: false
 SCES-03759:
-  name: "Disney-Pixar Monsters, Inc. - Scare Island (Europe)"
+  name: "Disney-Pixar Monsters, Inc. - Scare Island"
+  saveName: "Disney-Pixar Monsters, Inc. - Scare Island (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42449,11 +44570,13 @@ SCES-03759:
     multitap: false
     linkCable: false
 SCED-03811:
-  name: "Disney-Pixar Monsters, Inc. - Scare Island (Europe) (Demo)"
+  name: "Disney-Pixar Monsters, Inc. - Scare Island (Demo)"
+  saveName: "Disney-Pixar Monsters, Inc. - Scare Island (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94635:
-  name: "Disney-Pixar Monsters, Inc. - Scream Team (USA)"
+  name: "Disney-Pixar Monsters, Inc. - Scream Team"
+  saveName: "Disney-Pixar Monsters, Inc. - Scream Team (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -42476,7 +44599,8 @@ SCUS-94635:
     multitap: false
     linkCable: false
 SCES-03768:
-  name: "Disney-Pixar Monsters, Inc. - Skraemmaroen (Sweden)"
+  name: "Disney-Pixar Monsters, Inc. - Skraemmaroen"
+  saveName: "Disney-Pixar Monsters, Inc. - Skraemmaroen (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42495,7 +44619,8 @@ SCES-03768:
     multitap: false
     linkCable: false
 SCES-03760:
-  name: "Disney-Pixar Monsters, Inc. - Skraemmeoen (Denmark)"
+  name: "Disney-Pixar Monsters, Inc. - Skraemmeoen"
+  saveName: "Disney-Pixar Monsters, Inc. - Skraemmeoen (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42514,7 +44639,8 @@ SCES-03760:
     multitap: false
     linkCable: false
 SCES-03763:
-  name: "Disney-Pixar Monstres & Cie - L'ile de l'Epouvante (France)"
+  name: "Disney-Pixar Monstres & Cie - L'ile de l'Epouvante"
+  saveName: "Disney-Pixar Monstres & Cie - L'ile de l'Epouvante (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42533,7 +44659,8 @@ SCES-03763:
     multitap: false
     linkCable: false
 SCES-03767:
-  name: "Disney-Pixar Monstruos, S.A. - Isla de los Sustos (Spain)"
+  name: "Disney-Pixar Monstruos, S.A. - Isla de los Sustos"
+  saveName: "Disney-Pixar Monstruos, S.A. - Isla de los Sustos (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42552,7 +44679,8 @@ SCES-03767:
     multitap: false
     linkCable: false
 SCES-01737:
-  name: "Disney-Pixar Oetoekaen elaemaeae (Finland)"
+  name: "Disney-Pixar Oetoekaen elaemaeae"
+  saveName: "Disney-Pixar Oetoekaen elaemaeae (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42571,9 +44699,11 @@ SCES-01737:
     multitap: false
     linkCable: false
 SCES-01738:
-  name: "Disney-Pixar Sma-kryp (Norway)"
+  name: "Disney-Pixar Sma-kryp"
+  saveName: "Disney-Pixar Sma-kryp (Norway)"
 SLES-02408:
-  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear al Rescate! (Spain)"
+  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear al Rescate!"
+  saveName: "Disney-Pixar Toy Story 2 - Buzz Lightyear al Rescate! (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42592,7 +44722,8 @@ SLES-02408:
     multitap: false
     linkCable: false
 SLES-02406:
-  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear eilt zur Hilfe! (Germany)"
+  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear eilt zur Hilfe!"
+  saveName: "Disney-Pixar Toy Story 2 - Buzz Lightyear eilt zur Hilfe! (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42611,7 +44742,8 @@ SLES-02406:
     multitap: false
     linkCable: false
 SLES-02067:
-  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (Europe)"
+  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue!"
+  saveName: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42630,11 +44762,13 @@ SLES-02067:
     multitap: false
     linkCable: false
 SLED-02416:
-  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (Europe) (Demo)"
+  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (Demo)"
+  saveName: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00893:
-  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (USA)"
+  name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue!"
+  saveName: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4739-g1cc6ee48"
@@ -42656,7 +44790,8 @@ SLUS-00893:
     multitap: false
     linkCable: false
 SLES-02405:
-  name: "Disney-Pixar Toy Story 2 - Buzz l'Eclair a la Rescousse! (France)"
+  name: "Disney-Pixar Toy Story 2 - Buzz l'Eclair a la Rescousse!"
+  saveName: "Disney-Pixar Toy Story 2 - Buzz l'Eclair a la Rescousse! (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42675,7 +44810,8 @@ SLES-02405:
     multitap: false
     linkCable: false
 SLES-02407:
-  name: "Disney-Pixar Toy Story 2 - Woody e Buzz alla riscossa! (Italy)"
+  name: "Disney-Pixar Toy Story 2 - Woody e Buzz alla riscossa!"
+  saveName: "Disney-Pixar Toy Story 2 - Woody e Buzz alla riscossa! (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42694,7 +44830,8 @@ SLES-02407:
     multitap: false
     linkCable: false
 SLES-03396:
-  name: "Disney-Pixar Toy Story Racer (Europe)"
+  name: "Disney-Pixar Toy Story Racer"
+  saveName: "Disney-Pixar Toy Story Racer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42714,7 +44851,8 @@ SLES-03396:
     multitap: false
     linkCable: false
 SLES-03398:
-  name: "Disney-Pixar Toy Story Racer (Europe) (Es,It,Nl)"
+  name: "Disney-Pixar Toy Story Racer"
+  saveName: "Disney-Pixar Toy Story Racer (Europe) (Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42736,7 +44874,8 @@ SLES-03398:
     multitap: false
     linkCable: false
 SLES-03397:
-  name: "Disney-Pixar Toy Story Racer (Europe) (Fr,De)"
+  name: "Disney-Pixar Toy Story Racer"
+  saveName: "Disney-Pixar Toy Story Racer (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42757,7 +44896,8 @@ SLES-03397:
     multitap: false
     linkCable: false
 SLUS-01214:
-  name: "Disney-Pixar Toy Story Racer (USA)"
+  name: "Disney-Pixar Toy Story Racer"
+  saveName: "Disney-Pixar Toy Story Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1485-ge6156e2a"
@@ -42780,7 +44920,8 @@ SLUS-01214:
     multitap: false
     linkCable: false
 SLES-03315:
-  name: "Disney-Pixar's Buzz Lightyear - Guardianes del Espacio (Spain)"
+  name: "Disney-Pixar's Buzz Lightyear - Guardianes del Espacio"
+  saveName: "Disney-Pixar's Buzz Lightyear - Guardianes del Espacio (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42799,7 +44940,8 @@ SLES-03315:
     multitap: false
     linkCable: false
 SCES-03003:
-  name: "Disneyn Aladdin - Nasiran Kosto (Finland)"
+  name: "Disneyn Aladdin - Nasiran Kosto"
+  saveName: "Disneyn Aladdin - Nasiran Kosto (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42820,7 +44962,8 @@ SCES-03003:
     multitap: false
     linkCable: false
 SCES-03536:
-  name: "Disneyn Atlantis - Kadonnut Kaupunki (Finland)"
+  name: "Disneyn Atlantis - Kadonnut Kaupunki"
+  saveName: "Disneyn Atlantis - Kadonnut Kaupunki (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42839,7 +44982,8 @@ SCES-03536:
     multitap: false
     linkCable: false
 SCES-03710:
-  name: "Disneyn Peter Pan - Seikkailu Mika-Mika-Maassa (Finland)"
+  name: "Disneyn Peter Pan - Seikkailu Mika-Mika-Maassa"
+  saveName: "Disneyn Peter Pan - Seikkailu Mika-Mika-Maassa (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42858,7 +45002,8 @@ SCES-03710:
     multitap: false
     linkCable: false
 SCES-02184:
-  name: "Disneyn Tarzan (Finland)"
+  name: "Disneyn Tarzan"
+  saveName: "Disneyn Tarzan (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42878,7 +45023,8 @@ SCES-02184:
     multitap: false
     linkCable: false
 SCES-00897:
-  name: "Disneys Action Spil med Herkules (Denmark)"
+  name: "Disneys Action Spil med Herkules"
+  saveName: "Disneys Action Spil med Herkules (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42897,7 +45043,8 @@ SCES-00897:
     multitap: false
     linkCable: false
 SCES-03001:
-  name: "Disneys Aladdin - Nasiras Haevn (Denmark)"
+  name: "Disneys Aladdin - Nasiras Haevn"
+  saveName: "Disneys Aladdin - Nasiras Haevn (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42918,7 +45065,8 @@ SCES-03001:
     multitap: false
     linkCable: false
 SCES-03007:
-  name: "Disneys Aladdin - Nasiras Hevn (Norway)"
+  name: "Disneys Aladdin - Nasiras Hevn"
+  saveName: "Disneys Aladdin - Nasiras Hevn (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42939,7 +45087,8 @@ SCES-03007:
     multitap: false
     linkCable: false
 SCES-03005:
-  name: "Disneys Aladdin - Nasiras Rache (Germany)"
+  name: "Disneys Aladdin - Nasiras Rache"
+  saveName: "Disneys Aladdin - Nasiras Rache (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42960,7 +45109,8 @@ SCES-03005:
     multitap: false
     linkCable: false
 SCES-03009:
-  name: "Disneys Aladdin - Nasiras haemnd (Sweden)"
+  name: "Disneys Aladdin - Nasiras haemnd"
+  saveName: "Disneys Aladdin - Nasiras haemnd (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -42981,7 +45131,8 @@ SCES-03009:
     multitap: false
     linkCable: false
 SCES-03034:
-  name: "Disneys Arielle 2 (Germany)"
+  name: "Disneys Arielle 2"
+  saveName: "Disneys Arielle 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43000,7 +45151,8 @@ SCES-03034:
     multitap: false
     linkCable: false
 SCES-03538:
-  name: "Disneys Atlantis - Das Geheimnis der verlorenen Stadt (Germany)"
+  name: "Disneys Atlantis - Das Geheimnis der verlorenen Stadt"
+  saveName: "Disneys Atlantis - Das Geheimnis der verlorenen Stadt (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43019,7 +45171,8 @@ SCES-03538:
     multitap: false
     linkCable: false
 SCES-03534:
-  name: "Disneys Atlantis - Det Forsvundne Rige (Denmark)"
+  name: "Disneys Atlantis - Det Forsvundne Rige"
+  saveName: "Disneys Atlantis - Det Forsvundne Rige (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43038,7 +45191,8 @@ SCES-03534:
     multitap: false
     linkCable: false
 SCES-03540:
-  name: "Disneys Atlantis - En Forsvunnet Verden (Norway)"
+  name: "Disneys Atlantis - En Forsvunnet Verden"
+  saveName: "Disneys Atlantis - En Forsvunnet Verden (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43057,7 +45211,8 @@ SCES-03540:
     multitap: false
     linkCable: false
 SLES-03270:
-  name: "Disneys Der Koenig der Loewen - Simbas grosses Abenteuer (Germany)"
+  name: "Disneys Der Koenig der Loewen - Simbas grosses Abenteuer"
+  saveName: "Disneys Der Koenig der Loewen - Simbas grosses Abenteuer (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43076,7 +45231,8 @@ SLES-03270:
     multitap: false
     linkCable: false
 SCES-03939:
-  name: "Disneys Der Schatzplanet (Germany)"
+  name: "Disneys Der Schatzplanet"
+  saveName: "Disneys Der Schatzplanet (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43095,7 +45251,8 @@ SCES-03939:
     multitap: false
     linkCable: false
 SCES-03015:
-  name: "Disneys Ein Koenigreich fuer ein Lama (Germany)"
+  name: "Disneys Ein Koenigreich fuer ein Lama"
+  saveName: "Disneys Ein Koenigreich fuer ein Lama (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43114,7 +45271,8 @@ SCES-03015:
     multitap: false
     linkCable: false
 SCES-03017:
-  name: "Disneys Et Kongerike for en Lama (Norway)"
+  name: "Disneys Et Kongerike for en Lama"
+  saveName: "Disneys Et Kongerike for en Lama (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43133,7 +45291,8 @@ SCES-03017:
     multitap: false
     linkCable: false
 SCES-00893:
-  name: "Disneys Hercules Action-Spiel (Germany)"
+  name: "Disneys Hercules Action-Spiel"
+  saveName: "Disneys Hercules Action-Spiel (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43152,7 +45311,8 @@ SCES-00893:
     multitap: false
     linkCable: false
 SCES-02005:
-  name: "Disneys Interaktive Abenteuer - Mulan (Germany)"
+  name: "Disneys Interaktive Abenteuer - Mulan"
+  saveName: "Disneys Interaktive Abenteuer - Mulan (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43172,7 +45332,8 @@ SCES-02005:
     multitap: false
     linkCable: false
 SCES-03019:
-  name: "Disneys Kejsarens Nya Stil (Sweden)"
+  name: "Disneys Kejsarens Nya Stil"
+  saveName: "Disneys Kejsarens Nya Stil (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43191,7 +45352,8 @@ SCES-03019:
     multitap: false
     linkCable: false
 SCES-03011:
-  name: "Disneys Kejserens Nye Flip (Denmark)"
+  name: "Disneys Kejserens Nye Flip"
+  saveName: "Disneys Kejserens Nye Flip (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43210,7 +45372,8 @@ SCES-03011:
     multitap: false
     linkCable: false
 SCES-03879:
-  name: "Disneys Lilo & Stitch - Ballade pa Hawaii! (Denmark)"
+  name: "Disneys Lilo & Stitch - Ballade pa Hawaii!"
+  saveName: "Disneys Lilo & Stitch - Ballade pa Hawaii! (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43229,9 +45392,11 @@ SCES-03879:
     multitap: false
     linkCable: false
 SCES-03880:
-  name: "Disneys Lilo & Stitch - Hula Baluba! (Norway)"
+  name: "Disneys Lilo & Stitch - Hula Baluba!"
+  saveName: "Disneys Lilo & Stitch - Hula Baluba! (Norway)"
 SCES-03878:
-  name: "Disneys Lilo & Stitch - Trubbel i Paradiset (Sweden)"
+  name: "Disneys Lilo & Stitch - Trubbel i Paradiset"
+  saveName: "Disneys Lilo & Stitch - Trubbel i Paradiset (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43250,7 +45415,8 @@ SCES-03878:
     multitap: false
     linkCable: false
 SCES-03873:
-  name: "Disneys Lilo & Stitch - Zoff auf Hawaii (Germany)"
+  name: "Disneys Lilo & Stitch - Zoff auf Hawaii"
+  saveName: "Disneys Lilo & Stitch - Zoff auf Hawaii (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43269,7 +45435,8 @@ SCES-03873:
     multitap: false
     linkCable: false
 SCES-03716:
-  name: "Disneys Peter Pan - Aeventyr i landet Ingenstans (Sweden)"
+  name: "Disneys Peter Pan - Aeventyr i landet Ingenstans"
+  saveName: "Disneys Peter Pan - Aeventyr i landet Ingenstans (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43288,7 +45455,8 @@ SCES-03716:
     multitap: false
     linkCable: false
 SCES-03714:
-  name: "Disneys Peter Pan - Eventyr i Drommeland (Norway)"
+  name: "Disneys Peter Pan - Eventyr i Drommeland"
+  saveName: "Disneys Peter Pan - Eventyr i Drommeland (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43307,7 +45475,8 @@ SCES-03714:
     multitap: false
     linkCable: false
 SCES-03708:
-  name: "Disneys Peter Pan - Eventyr pa Onskeoen (Denmark)"
+  name: "Disneys Peter Pan - Eventyr pa Onskeoen"
+  saveName: "Disneys Peter Pan - Eventyr pa Onskeoen (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43326,7 +45495,8 @@ SCES-03708:
     multitap: false
     linkCable: false
 SCES-03712:
-  name: "Disneys Peter Pan - Rueckkehr nach Nimmerland (Germany)"
+  name: "Disneys Peter Pan - Rueckkehr nach Nimmerland"
+  saveName: "Disneys Peter Pan - Rueckkehr nach Nimmerland (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43345,7 +45515,8 @@ SCES-03712:
     multitap: false
     linkCable: false
 SCES-03747:
-  name: "Disneys Plys' Spil-og-Leg-Sted (Denmark)"
+  name: "Disneys Plys' Spil-og-Leg-Sted"
+  saveName: "Disneys Plys' Spil-og-Leg-Sted (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43364,7 +45535,8 @@ SCES-03747:
     multitap: true
     linkCable: false
 SCES-03944:
-  name: "Disneys Skatteplaneten (Denmark)"
+  name: "Disneys Skatteplaneten"
+  saveName: "Disneys Skatteplaneten (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43383,7 +45555,8 @@ SCES-03944:
     multitap: false
     linkCable: false
 SCES-02181:
-  name: "Disneys Tarzan (Denmark)"
+  name: "Disneys Tarzan"
+  saveName: "Disneys Tarzan (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43403,7 +45576,8 @@ SCES-02181:
     multitap: false
     linkCable: false
 SCES-01517:
-  name: "Disneys Tarzan (Germany)"
+  name: "Disneys Tarzan"
+  saveName: "Disneys Tarzan (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43423,7 +45597,8 @@ SCES-01517:
     multitap: false
     linkCable: false
 SCES-02183:
-  name: "Disneys Tarzan (Norway)"
+  name: "Disneys Tarzan"
+  saveName: "Disneys Tarzan (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43442,7 +45617,8 @@ SCES-02183:
     multitap: false
     linkCable: false
 SCES-02182:
-  name: "Disneys Tarzan (Sweden)"
+  name: "Disneys Tarzan"
+  saveName: "Disneys Tarzan (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43462,7 +45638,8 @@ SCES-02182:
     multitap: false
     linkCable: false
 SLES-03261:
-  name: "Disneys Tigerdyrets honningjagt (Denmark)"
+  name: "Disneys Tigerdyrets honningjagt"
+  saveName: "Disneys Tigerdyrets honningjagt (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43481,7 +45658,8 @@ SLES-03261:
     multitap: false
     linkCable: false
 SLES-03257:
-  name: "Disneys Tiggers Honigjagd (Germany)"
+  name: "Disneys Tiggers Honigjagd"
+  saveName: "Disneys Tiggers Honigjagd (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43518,7 +45696,8 @@ SCPS-45043:
     multitap: false
     linkCable: false
 SLES-00535:
-  name: "Disruptor (Europe)"
+  name: "Disruptor"
+  saveName: "Disruptor (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -43536,7 +45715,8 @@ SLES-00535:
     multitap: false
     linkCable: false
 SLES-00564:
-  name: "Disruptor (France)"
+  name: "Disruptor"
+  saveName: "Disruptor (France)"
   controllers:
     - DigitalController
   metadata:
@@ -43554,7 +45734,8 @@ SLES-00564:
     multitap: false
     linkCable: false
 SLES-00565:
-  name: "Disruptor (Germany)"
+  name: "Disruptor"
+  saveName: "Disruptor (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -43572,7 +45753,8 @@ SLES-00565:
     multitap: false
     linkCable: false
 SLPS-00804:
-  name: "Disruptor (Japan)"
+  name: "Disruptor"
+  saveName: "Disruptor (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43590,11 +45772,13 @@ SLPS-00804:
     multitap: false
     linkCable: false
 SLED-00594:
-  name: "Disruptor (UK) (Demo)"
+  name: "Disruptor (Demo)"
+  saveName: "Disruptor (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00224:
-  name: "Disruptor (USA)"
+  name: "Disruptor"
+  saveName: "Disruptor (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -43616,7 +45800,8 @@ SLUS-00224:
     multitap: false
     linkCable: false
 SLES-01535:
-  name: "Diver's Dream (Europe) (En,Fr,De)"
+  name: "Diver's Dream"
+  saveName: "Diver's Dream (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -43636,7 +45821,8 @@ SLES-01535:
     multitap: false
     linkCable: false
 SLUS-00317:
-  name: "Divide, The - Enemies Within (USA)"
+  name: "Divide, The - Enemies Within"
+  saveName: "Divide, The - Enemies Within (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -43654,11 +45840,13 @@ SLUS-00317:
     multitap: false
     linkCable: false
 SLPM-80286:
-  name: "DoDonPachi (Japan) (Demo)"
+  name: "DoDonPachi (Demo)"
+  saveName: "DoDonPachi (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01364:
-  name: "DoDonPachi (Japan) (Rev 1)"
+  name: "DoDonPachi"
+  saveName: "DoDonPachi (Japan) (Rev 1)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4126-g179a7aea"
@@ -43679,7 +45867,8 @@ SLPS-01364:
     multitap: false
     linkCable: false
 SLES-01082:
-  name: "Dodgem Arena (Europe)"
+  name: "Dodgem Arena"
+  saveName: "Dodgem Arena (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43698,9 +45887,11 @@ SLES-01082:
     multitap: false
     linkCable: true
 SLPM-87252:
-  name: "Dog Master, The (Japan)"
+  name: "Dog Master, The"
+  saveName: "Dog Master, The (Japan)"
 SLPM-87175:
-  name: "Dog Master, The (Japan) (Shokai Genteiban)"
+  name: "Dog Master, The (Shokai Genteiban)"
+  saveName: "Dog Master, The (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43719,7 +45910,8 @@ SLPM-87175:
     multitap: false
     linkCable: false
 SLPS-01559:
-  name: "Dokapon! Ikari no Tekken (Japan)"
+  name: "Dokapon! Ikari no Tekken"
+  saveName: "Dokapon! Ikari no Tekken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43737,11 +45929,13 @@ SLPS-01559:
     multitap: true
     linkCable: false
 SLPM-80294:
-  name: "Dokapon! Ikari no Tekken (Japan) (Demo)"
+  name: "Dokapon! Ikari no Tekken (Demo)"
+  saveName: "Dokapon! Ikari no Tekken (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91190:
-  name: "Dokapon! Ikari no Tekken (Japan) (Rev 2)"
+  name: "Dokapon! Ikari no Tekken"
+  saveName: "Dokapon! Ikari no Tekken (Japan) (Rev 2)"
   controllers:
     - DigitalController
   metadata:
@@ -43759,7 +45953,8 @@ SLPS-91190:
     multitap: true
     linkCable: false
 SLPS-01454:
-  name: "Doki Doki On Air (Japan)"
+  name: "Doki Doki On Air"
+  saveName: "Doki Doki On Air (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43777,7 +45972,8 @@ SLPS-01454:
     multitap: false
     linkCable: false
 SLPS-01942:
-  name: "Doki Doki On Air 2 (Japan)"
+  name: "Doki Doki On Air 2"
+  saveName: "Doki Doki On Air 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43795,7 +45991,8 @@ SLPS-01942:
     multitap: false
     linkCable: false
 SLPS-01573:
-  name: "Doki Doki Poyatchio!! (Japan)"
+  name: "Doki Doki Poyatchio!!"
+  saveName: "Doki Doki Poyatchio!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -43814,7 +46011,8 @@ SLPS-01573:
     multitap: false
     linkCable: false
 SLPM-80285:
-  name: "Doki Doki Poyatchio!! (Japan) (Demo)"
+  name: "Doki Doki Poyatchio!! (Demo)"
+  saveName: "Doki Doki Poyatchio!! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03125:
@@ -43837,7 +46035,8 @@ SLPS-03125:
     multitap: false
     linkCable: false
 SLPS-00756:
-  name: "Doki Doki Pretty League (Japan)"
+  name: "Doki Doki Pretty League"
+  saveName: "Doki Doki Pretty League (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43855,7 +46054,8 @@ SLPS-00756:
     multitap: false
     linkCable: false
 SLPS-00513:
-  name: "Doki Doki Pretty League (Japan) (Shokai Genteiban)"
+  name: "Doki Doki Pretty League (Shokai Genteiban)"
+  saveName: "Doki Doki Pretty League (Japan) (Shokai Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -43873,7 +46073,8 @@ SLPS-00513:
     multitap: false
     linkCable: false
 SLPS-02673:
-  name: "Doki Doki Pretty League - Lovely Star (Japan)"
+  name: "Doki Doki Pretty League - Lovely Star"
+  saveName: "Doki Doki Pretty League - Lovely Star (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43891,7 +46092,8 @@ SLPS-02673:
     multitap: false
     linkCable: false
 SLPS-01507:
-  name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan) (Disc 1)"
+  name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Disc 1)"
+  saveName: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan) (Disc 1)"
   discSet:
     name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan)"
     serials:
@@ -43916,7 +46118,8 @@ SLPS-01507:
     multitap: false
     linkCable: false
 SLPS-01508:
-  name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan) (Disc 2)"
+  name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Disc 2)"
+  saveName: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan) (Disc 2)"
   discSet:
     name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan)"
     serials:
@@ -43941,7 +46144,8 @@ SLPS-01508:
     multitap: false
     linkCable: false
 SLPS-01509:
-  name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan) (Disc 3)"
+  name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Disc 3)"
+  saveName: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan) (Disc 3)"
   discSet:
     name: "Doki Doki Pretty League - Nekketsu Otome Seishunki (Japan)"
     serials:
@@ -43966,7 +46170,8 @@ SLPS-01509:
     multitap: false
     linkCable: false
 SLPS-01038:
-  name: "Doki Doki Shutter Chance - Koi no Puzzle o Kumitatete (Japan)"
+  name: "Doki Doki Shutter Chance - Koi no Puzzle o Kumitatete"
+  saveName: "Doki Doki Shutter Chance - Koi no Puzzle o Kumitatete (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -43984,7 +46189,8 @@ SLPS-01038:
     multitap: false
     linkCable: false
 SLPM-86988:
-  name: "Doki Doki Shutter Chance - Koi no Puzzle o Kumitatete (Japan) (Major Wave)"
+  name: "Doki Doki Shutter Chance - Koi no Puzzle o Kumitatete (Major Wave)"
+  saveName: "Doki Doki Shutter Chance - Koi no Puzzle o Kumitatete (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -44002,7 +46208,8 @@ SLPM-86988:
     multitap: false
     linkCable: false
 SLPS-00130:
-  name: "Dokiou Ki (Japan)"
+  name: "Dokiou Ki"
+  saveName: "Dokiou Ki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44020,7 +46227,8 @@ SLPS-00130:
     multitap: false
     linkCable: false
 SLPS-03356:
-  name: "Doko Demo Hamster - Bi! Click Tanken-tai (Japan)"
+  name: "Doko Demo Hamster - Bi! Click Tanken-tai"
+  saveName: "Doko Demo Hamster - Bi! Click Tanken-tai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44039,7 +46247,8 @@ SLPS-03356:
     multitap: false
     linkCable: false
 SLPS-02819:
-  name: "Doko Demo Hamster 2 (Japan)"
+  name: "Doko Demo Hamster 2"
+  saveName: "Doko Demo Hamster 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44058,7 +46267,8 @@ SLPS-02819:
     multitap: false
     linkCable: false
 SLPS-03250:
-  name: "Doko Demo Hamster 4 - Doki Doki Sugoroku Daibouken! (Japan)"
+  name: "Doko Demo Hamster 4 - Doki Doki Sugoroku Daibouken!"
+  saveName: "Doko Demo Hamster 4 - Doki Doki Sugoroku Daibouken! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44076,7 +46286,8 @@ SLPS-03250:
     multitap: true
     linkCable: false
 SCPS-10092:
-  name: "Doko Demo Issho (Japan)"
+  name: "Doko Demo Issho"
+  saveName: "Doko Demo Issho (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44095,13 +46306,16 @@ SCPS-10092:
     multitap: false
     linkCable: false
 SCPM-85006:
-  name: "Doko Demo Issho (Japan) (Calpis Water Version)"
+  name: "Doko Demo Issho (Calpis Water Version)"
+  saveName: "Doko Demo Issho (Japan) (Calpis Water Version)"
 PCPX-96152:
-  name: "Doko Demo Issho (Japan) (Demo)"
+  name: "Doko Demo Issho (Demo)"
+  saveName: "Doko Demo Issho (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10142:
-  name: "Doko Demo Issho (Japan) (Rev 1)"
+  name: "Doko Demo Issho"
+  saveName: "Doko Demo Issho (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44142,7 +46356,8 @@ SCPS-10125:
     multitap: false
     linkCable: false
 SLPS-03388:
-  name: "Doko made mo Aoku... (Japan)"
+  name: "Doko made mo Aoku..."
+  saveName: "Doko made mo Aoku... (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44180,7 +46395,8 @@ SLPS-03393:
     multitap: false
     linkCable: false
 SLPM-86122:
-  name: "Dolphin's Dream (Japan)"
+  name: "Dolphin's Dream"
+  saveName: "Dolphin's Dream (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44198,7 +46414,8 @@ SLPM-86122:
     multitap: false
     linkCable: false
 SLPS-01478:
-  name: "Dome no Yabou 2 - The Race of Champions (Japan)"
+  name: "Dome no Yabou 2 - The Race of Champions"
+  saveName: "Dome no Yabou 2 - The Race of Champions (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44220,7 +46437,8 @@ SLPS-01478:
     multitap: false
     linkCable: false
 SLPS-01095:
-  name: "Domino-kun o Tomenaide (Japan)"
+  name: "Domino-kun o Tomenaide"
+  saveName: "Domino-kun o Tomenaide (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44256,7 +46474,8 @@ SLPS-02536:
     multitap: false
     linkCable: false
 SLPS-00548:
-  name: "DonPachi (Japan)"
+  name: "DonPachi"
+  saveName: "DonPachi (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4126-g179a7aea"
@@ -44277,7 +46496,8 @@ SLPS-00548:
     multitap: false
     linkCable: false
 SLPM-86855:
-  name: "DonPachi (Japan) (Cyclone's Best)"
+  name: "DonPachi (Cyclone's Best)"
+  saveName: "DonPachi (Japan) (Cyclone's Best)"
   controllers:
     - DigitalController
   metadata:
@@ -44295,7 +46515,8 @@ SLPM-86855:
     multitap: false
     linkCable: false
 SLES-00132:
-  name: "Doom (Europe)"
+  name: "Doom"
+  saveName: "Doom (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -44318,11 +46539,13 @@ SLES-00132:
     multitap: false
     linkCable: true
 SLES-00157:
-  name: "Doom (Europe) (One Level Demo Disc)"
+  name: "Doom (One Level Demo Disc)"
+  saveName: "Doom (Europe) (One Level Demo Disc)"
   metadata:
     genre: "** DEMO **"
 SLPS-00308:
-  name: "Doom (Japan)"
+  name: "Doom"
+  saveName: "Doom (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -44345,7 +46568,8 @@ SLPS-00308:
     multitap: false
     linkCable: true
 SLUS-00077:
-  name: "Doom (USA)"
+  name: "Doom"
+  saveName: "Doom (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -44371,7 +46595,8 @@ SLUS-00077:
     multitap: false
     linkCable: true
 SLPS-01726:
-  name: "Doraemon - Nobita to Fukkatsu no Hoshi (Japan)"
+  name: "Doraemon - Nobita to Fukkatsu no Hoshi"
+  saveName: "Doraemon - Nobita to Fukkatsu no Hoshi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44407,7 +46632,8 @@ SLPS-00233:
     multitap: false
     linkCable: false
 SLPS-00628:
-  name: "Doraemon 2 - SOS! Otogi no Kuni (Japan)"
+  name: "Doraemon 2 - SOS! Otogi no Kuni"
+  saveName: "Doraemon 2 - SOS! Otogi no Kuni (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44480,7 +46706,8 @@ SLPS-03421:
     multitap: false
     linkCable: false
 SLPS-03076:
-  name: "Doraemon 3 - Makai no Dungeon (Japan)"
+  name: "Doraemon 3 - Makai no Dungeon"
+  saveName: "Doraemon 3 - Makai no Dungeon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44499,7 +46726,8 @@ SLPS-03076:
     multitap: false
     linkCable: false
 SLPS-01984:
-  name: "Dosukoi Densetsu (Japan)"
+  name: "Dosukoi Densetsu"
+  saveName: "Dosukoi Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44518,7 +46746,8 @@ SLPS-01984:
     multitap: false
     linkCable: false
 SCPS-10129:
-  name: "Dotchi Mecha! (Japan)"
+  name: "Dotchi Mecha!"
+  saveName: "Dotchi Mecha! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44537,7 +46766,8 @@ SCPS-10129:
     multitap: false
     linkCable: false
 SLPS-01362:
-  name: "Dotchi de Ball! (Japan)"
+  name: "Dotchi de Ball!"
+  saveName: "Dotchi de Ball! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44556,7 +46786,8 @@ SLPS-01362:
     multitap: false
     linkCable: false
 SLPS-02891:
-  name: "Dotsubo-chan (Japan)"
+  name: "Dotsubo-chan"
+  saveName: "Dotsubo-chan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44575,7 +46806,8 @@ SLPS-02891:
     multitap: false
     linkCable: false
 SLPS-00191:
-  name: "Double Dragon (Japan)"
+  name: "Double Dragon"
+  saveName: "Double Dragon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44593,11 +46825,13 @@ SLPS-00191:
     multitap: false
     linkCable: false
 SCED-02257:
-  name: "Double Life (Europe) (Demo)"
+  name: "Double Life (Demo)"
+  saveName: "Double Life (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03526:
-  name: "Doubutsu Chara Navi Uranai 2 - Kosei Shinrigaku + Ren'ai Uranai Puzzle (Japan)"
+  name: "Doubutsu Chara Navi Uranai 2 - Kosei Shinrigaku + Ren'ai Uranai Puzzle"
+  saveName: "Doubutsu Chara Navi Uranai 2 - Kosei Shinrigaku + Ren'ai Uranai Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44616,7 +46850,8 @@ SLPS-03526:
     multitap: false
     linkCable: false
 SLPS-00077:
-  name: "Douga de Puzzle da! Puppukupuu (Japan)"
+  name: "Douga de Puzzle da! Puppukupuu"
+  saveName: "Douga de Puzzle da! Puppukupuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44653,7 +46888,8 @@ SLPS-91450:
     multitap: true
     linkCable: false
 SLPS-01385:
-  name: "Doukyuu - Billiard Master (Japan)"
+  name: "Doukyuu - Billiard Master"
+  saveName: "Doukyuu - Billiard Master (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44675,7 +46911,8 @@ SLPS-01385:
     multitap: false
     linkCable: false
 SLPS-02011:
-  name: "Doukyuu re-mix - Billiards Multiple (Japan)"
+  name: "Doukyuu re-mix - Billiards Multiple"
+  saveName: "Doukyuu re-mix - Billiards Multiple (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44694,7 +46931,8 @@ SLPS-02011:
     multitap: true
     linkCable: false
 SLPS-00691:
-  name: "Doukyuusei 2 (Japan)"
+  name: "Doukyuusei 2"
+  saveName: "Doukyuusei 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44712,7 +46950,8 @@ SLPS-00691:
     multitap: false
     linkCable: false
 SLPS-00690:
-  name: "Doukyuusei 2 (Japan) (Extra Box)"
+  name: "Doukyuusei 2 (Extra Box)"
+  saveName: "Doukyuusei 2 (Japan) (Extra Box)"
   controllers:
     - DigitalController
   metadata:
@@ -44730,7 +46969,8 @@ SLPS-00690:
     multitap: false
     linkCable: false
 SLPS-00673:
-  name: "Doukyuusei Mahjong (Japan)"
+  name: "Doukyuusei Mahjong"
+  saveName: "Doukyuusei Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -44748,7 +46988,8 @@ SLPS-00673:
     multitap: false
     linkCable: false
 SLPM-86469:
-  name: "Doukyuusei Mahjong (Japan) (Best Wing 2800)"
+  name: "Doukyuusei Mahjong (Best Wing 2800)"
+  saveName: "Doukyuusei Mahjong (Japan) (Best Wing 2800)"
   controllers:
     - DigitalController
   metadata:
@@ -44766,7 +47007,8 @@ SLPM-86469:
     multitap: false
     linkCable: false
 SLPS-01391:
-  name: "Downhill Snow (Japan)"
+  name: "Downhill Snow"
+  saveName: "Downhill Snow (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44786,7 +47028,8 @@ SLPS-01391:
     multitap: false
     linkCable: false
 SLPM-87171:
-  name: "Dr. Rin ni Kiite Mite! Koi no Happy Four Seasons (Japan)"
+  name: "Dr. Rin ni Kiite Mite! Koi no Happy Four Seasons"
+  saveName: "Dr. Rin ni Kiite Mite! Koi no Happy Four Seasons (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44805,7 +47048,8 @@ SLPM-87171:
     multitap: false
     linkCable: false
 SLPS-01934:
-  name: "Dr. Slump (Japan)"
+  name: "Dr. Slump"
+  saveName: "Dr. Slump (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -44824,7 +47068,8 @@ SLPS-01934:
     multitap: false
     linkCable: false
 SLES-02762:
-  name: "Dracula - A Ressurreicao (Portugal) (Disc 1)"
+  name: "Dracula - A Ressurreicao (Disc 1)"
+  saveName: "Dracula - A Ressurreicao (Portugal) (Disc 1)"
   discSet:
     name: "Dracula - A Ressurreicao (Portugal)"
     serials:
@@ -44848,7 +47093,8 @@ SLES-02762:
     multitap: false
     linkCable: false
 SLES-12762:
-  name: "Dracula - A Ressurreicao (Portugal) (Disc 2)"
+  name: "Dracula - A Ressurreicao (Disc 2)"
+  saveName: "Dracula - A Ressurreicao (Portugal) (Disc 2)"
   discSet:
     name: "Dracula - A Ressurreicao (Portugal)"
     serials:
@@ -44872,7 +47118,8 @@ SLES-12762:
     multitap: false
     linkCable: false
 SLES-02761:
-  name: "Dracula - La Risurrezione (Italy) (Disc 1)"
+  name: "Dracula - La Risurrezione (Disc 1)"
+  saveName: "Dracula - La Risurrezione (Italy) (Disc 1)"
   discSet:
     name: "Dracula - La Risurrezione (Italy)"
     serials:
@@ -44896,7 +47143,8 @@ SLES-02761:
     multitap: false
     linkCable: false
 SLES-12761:
-  name: "Dracula - La Risurrezione (Italy) (Disc 2)"
+  name: "Dracula - La Risurrezione (Disc 2)"
+  saveName: "Dracula - La Risurrezione (Italy) (Disc 2)"
   discSet:
     name: "Dracula - La Risurrezione (Italy)"
     serials:
@@ -44920,7 +47168,8 @@ SLES-12761:
     multitap: false
     linkCable: false
 SLES-02760:
-  name: "Dracula - Resurreccion (Spain) (Disc 1)"
+  name: "Dracula - Resurreccion (Disc 1)"
+  saveName: "Dracula - Resurreccion (Spain) (Disc 1)"
   discSet:
     name: "Dracula - Resurreccion (Spain)"
     serials:
@@ -44944,7 +47193,8 @@ SLES-02760:
     multitap: false
     linkCable: false
 SLES-12760:
-  name: "Dracula - Resurreccion (Spain) (Disc 2)"
+  name: "Dracula - Resurreccion (Disc 2)"
+  saveName: "Dracula - Resurreccion (Spain) (Disc 2)"
   discSet:
     name: "Dracula - Resurreccion (Spain)"
     serials:
@@ -44968,7 +47218,8 @@ SLES-12760:
     multitap: false
     linkCable: false
 SLES-02758:
-  name: "Dracula - Resurrection (France) (Disc 1)"
+  name: "Dracula - Resurrection (Disc 1)"
+  saveName: "Dracula - Resurrection (France) (Disc 1)"
   discSet:
     name: "Dracula - Resurrection (France)"
     serials:
@@ -44992,7 +47243,8 @@ SLES-02758:
     multitap: false
     linkCable: false
 SLES-12758:
-  name: "Dracula - Resurrection (France) (Disc 2)"
+  name: "Dracula - Resurrection (Disc 2)"
+  saveName: "Dracula - Resurrection (France) (Disc 2)"
   discSet:
     name: "Dracula - Resurrection (France)"
     serials:
@@ -45016,7 +47268,8 @@ SLES-12758:
     multitap: false
     linkCable: false
 SLES-02759:
-  name: "Dracula - Resurrection (Germany) (Disc 1)"
+  name: "Dracula - Resurrection (Disc 1)"
+  saveName: "Dracula - Resurrection (Germany) (Disc 1)"
   discSet:
     name: "Dracula - Resurrection (Germany)"
     serials:
@@ -45040,7 +47293,8 @@ SLES-02759:
     multitap: false
     linkCable: false
 SLES-12759:
-  name: "Dracula - Resurrection (Germany) (Disc 2)"
+  name: "Dracula - Resurrection (Disc 2)"
+  saveName: "Dracula - Resurrection (Germany) (Disc 2)"
   discSet:
     name: "Dracula - Resurrection (Germany)"
     serials:
@@ -45064,7 +47318,8 @@ SLES-12759:
     multitap: false
     linkCable: false
 SLUS-01440:
-  name: "Dracula - The Last Sanctuary (USA) (Disc 1)"
+  name: "Dracula - The Last Sanctuary (Disc 1)"
+  saveName: "Dracula - The Last Sanctuary (USA) (Disc 1)"
   discSet:
     name: "Dracula - The Last Sanctuary (USA)"
     serials:
@@ -45087,7 +47342,8 @@ SLUS-01440:
     multitap: false
     linkCable: false
 SLUS-01443:
-  name: "Dracula - The Last Sanctuary (USA) (Disc 2)"
+  name: "Dracula - The Last Sanctuary (Disc 2)"
+  saveName: "Dracula - The Last Sanctuary (USA) (Disc 2)"
   discSet:
     name: "Dracula - The Last Sanctuary (USA)"
     serials:
@@ -45110,7 +47366,8 @@ SLUS-01443:
     multitap: false
     linkCable: false
 SLES-02757:
-  name: "Dracula - The Resurrection (Europe) (Disc 1)"
+  name: "Dracula - The Resurrection (Disc 1)"
+  saveName: "Dracula - The Resurrection (Europe) (Disc 1)"
   discSet:
     name: "Dracula - The Resurrection (Europe)"
     serials:
@@ -45134,7 +47391,8 @@ SLES-02757:
     multitap: false
     linkCable: false
 SLES-12757:
-  name: "Dracula - The Resurrection (Europe) (Disc 2)"
+  name: "Dracula - The Resurrection (Disc 2)"
+  saveName: "Dracula - The Resurrection (Europe) (Disc 2)"
   discSet:
     name: "Dracula - The Resurrection (Europe)"
     serials:
@@ -45158,7 +47416,8 @@ SLES-12757:
     multitap: false
     linkCable: false
 SLUS-01284:
-  name: "Dracula - The Resurrection (USA) (Disc 1)"
+  name: "Dracula - The Resurrection (Disc 1)"
+  saveName: "Dracula - The Resurrection (USA) (Disc 1)"
   discSet:
     name: "Dracula - The Resurrection (USA)"
     serials:
@@ -45182,7 +47441,8 @@ SLUS-01284:
     multitap: false
     linkCable: false
 SLUS-01316:
-  name: "Dracula - The Resurrection (USA) (Disc 2)"
+  name: "Dracula - The Resurrection (Disc 2)"
+  saveName: "Dracula - The Resurrection (USA) (Disc 2)"
   discSet:
     name: "Dracula - The Resurrection (USA)"
     serials:
@@ -45206,7 +47466,8 @@ SLUS-01316:
     multitap: false
     linkCable: false
 SLES-03350:
-  name: "Dracula 2 - Die letzte Zufluchtsstaette (Germany) (Disc 1)"
+  name: "Dracula 2 - Die letzte Zufluchtsstaette (Disc 1)"
+  saveName: "Dracula 2 - Die letzte Zufluchtsstaette (Germany) (Disc 1)"
   discSet:
     name: "Dracula 2 - Die letzte Zufluchtsstaette (Germany)"
     serials:
@@ -45229,7 +47490,8 @@ SLES-03350:
     multitap: false
     linkCable: false
 SLES-13350:
-  name: "Dracula 2 - Die letzte Zufluchtsstaette (Germany) (Disc 2)"
+  name: "Dracula 2 - Die letzte Zufluchtsstaette (Disc 2)"
+  saveName: "Dracula 2 - Die letzte Zufluchtsstaette (Germany) (Disc 2)"
   discSet:
     name: "Dracula 2 - Die letzte Zufluchtsstaette (Germany)"
     serials:
@@ -45252,7 +47514,8 @@ SLES-13350:
     multitap: false
     linkCable: false
 SLES-03352:
-  name: "Dracula 2 - El Ultimo Santuario (Spain) (Disc 1)"
+  name: "Dracula 2 - El Ultimo Santuario (Disc 1)"
+  saveName: "Dracula 2 - El Ultimo Santuario (Spain) (Disc 1)"
   discSet:
     name: "Dracula 2 - El Ultimo Santuario (Spain)"
     serials:
@@ -45275,7 +47538,8 @@ SLES-03352:
     multitap: false
     linkCable: false
 SLES-13352:
-  name: "Dracula 2 - El Ultimo Santuario (Spain) (Disc 2)"
+  name: "Dracula 2 - El Ultimo Santuario (Disc 2)"
+  saveName: "Dracula 2 - El Ultimo Santuario (Spain) (Disc 2)"
   discSet:
     name: "Dracula 2 - El Ultimo Santuario (Spain)"
     serials:
@@ -45298,7 +47562,8 @@ SLES-13352:
     multitap: false
     linkCable: false
 SLES-03351:
-  name: "Dracula 2 - L'Ultimo Santuario (Italy) (Disc 1)"
+  name: "Dracula 2 - L'Ultimo Santuario (Disc 1)"
+  saveName: "Dracula 2 - L'Ultimo Santuario (Italy) (Disc 1)"
   discSet:
     name: "Dracula 2 - L'Ultimo Santuario (Italy)"
     serials:
@@ -45321,7 +47586,8 @@ SLES-03351:
     multitap: false
     linkCable: false
 SLES-13351:
-  name: "Dracula 2 - L'Ultimo Santuario (Italy) (Disc 2)"
+  name: "Dracula 2 - L'Ultimo Santuario (Disc 2)"
+  saveName: "Dracula 2 - L'Ultimo Santuario (Italy) (Disc 2)"
   discSet:
     name: "Dracula 2 - L'Ultimo Santuario (Italy)"
     serials:
@@ -45344,7 +47610,8 @@ SLES-13351:
     multitap: false
     linkCable: false
 SLES-03349:
-  name: "Dracula 2 - Le Dernier Sanctuaire (France) (Disc 1)"
+  name: "Dracula 2 - Le Dernier Sanctuaire (Disc 1)"
+  saveName: "Dracula 2 - Le Dernier Sanctuaire (France) (Disc 1)"
   discSet:
     name: "Dracula 2 - Le Dernier Sanctuaire (France)"
     serials:
@@ -45367,7 +47634,8 @@ SLES-03349:
     multitap: false
     linkCable: false
 SLES-13349:
-  name: "Dracula 2 - Le Dernier Sanctuaire (France) (Disc 2)"
+  name: "Dracula 2 - Le Dernier Sanctuaire (Disc 2)"
+  saveName: "Dracula 2 - Le Dernier Sanctuaire (France) (Disc 2)"
   discSet:
     name: "Dracula 2 - Le Dernier Sanctuaire (France)"
     serials:
@@ -45390,7 +47658,8 @@ SLES-13349:
     multitap: false
     linkCable: false
 SLES-03348:
-  name: "Dracula 2 - The Last Sanctuary (Europe) (Disc 1)"
+  name: "Dracula 2 - The Last Sanctuary (Disc 1)"
+  saveName: "Dracula 2 - The Last Sanctuary (Europe) (Disc 1)"
   discSet:
     name: "Dracula 2 - The Last Sanctuary (Europe)"
     serials:
@@ -45413,7 +47682,8 @@ SLES-03348:
     multitap: false
     linkCable: false
 SLES-13348:
-  name: "Dracula 2 - The Last Sanctuary (Europe) (Disc 2)"
+  name: "Dracula 2 - The Last Sanctuary (Disc 2)"
+  saveName: "Dracula 2 - The Last Sanctuary (Europe) (Disc 2)"
   discSet:
     name: "Dracula 2 - The Last Sanctuary (Europe)"
     serials:
@@ -45436,7 +47706,8 @@ SLES-13348:
     multitap: false
     linkCable: false
 SLES-03735:
-  name: "Dragon Ball - Final Bout (Europe)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -45454,7 +47725,8 @@ SLES-03735:
     multitap: false
     linkCable: false
 SLES-00964:
-  name: "Dragon Ball - Final Bout (France)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (France)"
   controllers:
     - DigitalController
   metadata:
@@ -45472,7 +47744,8 @@ SLES-00964:
     multitap: false
     linkCable: false
 SLES-03683:
-  name: "Dragon Ball - Final Bout (Germany)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -45490,7 +47763,8 @@ SLES-03683:
     multitap: false
     linkCable: false
 SLES-03684:
-  name: "Dragon Ball - Final Bout (Italy)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -45508,7 +47782,8 @@ SLES-03684:
     multitap: false
     linkCable: false
 SLPS-00949:
-  name: "Dragon Ball - Final Bout (Japan)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -45526,11 +47801,13 @@ SLPS-00949:
     multitap: false
     linkCable: false
 SLPM-80112:
-  name: "Dragon Ball - Final Bout (Japan) (Demo)"
+  name: "Dragon Ball - Final Bout (Demo)"
+  saveName: "Dragon Ball - Final Bout (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91079:
-  name: "Dragon Ball - Final Bout (Japan) (Rev 1)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -45548,7 +47825,8 @@ SLPS-91079:
     multitap: false
     linkCable: false
 SLES-03685:
-  name: "Dragon Ball - Final Bout (Spain)"
+  name: "Dragon Ball - Final Bout"
+  saveName: "Dragon Ball - Final Bout (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4315-gf7587eae"
@@ -45569,7 +47847,8 @@ SLES-03685:
     multitap: false
     linkCable: false
 SLUS-00493:
-  name: "Dragon Ball GT - Final Bout (USA)"
+  name: "Dragon Ball GT - Final Bout"
+  saveName: "Dragon Ball GT - Final Bout (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1580-g136a9d60"
@@ -45608,7 +47887,8 @@ SCPS-45109:
     multitap: false
     linkCable: false
 SLPS-00355:
-  name: "Dragon Ball Z - Idainaru Dragon Ball Densetsu (Japan)"
+  name: "Dragon Ball Z - Idainaru Dragon Ball Densetsu"
+  saveName: "Dragon Ball Z - Idainaru Dragon Ball Densetsu (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -45629,7 +47909,8 @@ SLPS-00355:
     multitap: false
     linkCable: false
 SLES-03736:
-  name: "Dragon Ball Z - Ultimate Battle 22 (Europe)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -45647,7 +47928,8 @@ SLES-03736:
     multitap: false
     linkCable: true
 SLES-00291:
-  name: "Dragon Ball Z - Ultimate Battle 22 (France)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (France)"
   controllers:
     - DigitalController
   metadata:
@@ -45665,7 +47947,8 @@ SLES-00291:
     multitap: false
     linkCable: true
 SLES-03737:
-  name: "Dragon Ball Z - Ultimate Battle 22 (Germany)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -45683,7 +47966,8 @@ SLES-03737:
     multitap: false
     linkCable: true
 SLES-03738:
-  name: "Dragon Ball Z - Ultimate Battle 22 (Italy)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -45701,7 +47985,8 @@ SLES-03738:
     multitap: false
     linkCable: true
 SLPS-00073:
-  name: "Dragon Ball Z - Ultimate Battle 22 (Japan)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -45721,7 +48006,8 @@ SLPS-00073:
     multitap: false
     linkCable: true
 SLES-03739:
-  name: "Dragon Ball Z - Ultimate Battle 22 (Spain)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -45739,7 +48025,8 @@ SLES-03739:
     multitap: false
     linkCable: true
 SLUS-01550:
-  name: "Dragon Ball Z - Ultimate Battle 22 (USA)"
+  name: "Dragon Ball Z - Ultimate Battle 22"
+  saveName: "Dragon Ball Z - Ultimate Battle 22 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -45760,7 +48047,8 @@ SLUS-01550:
     multitap: false
     linkCable: true
 SLPS-03470:
-  name: "Dragon Drive - Tactics Break (Japan)"
+  name: "Dragon Drive - Tactics Break"
+  saveName: "Dragon Drive - Tactics Break (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -45779,7 +48067,8 @@ SLPS-03470:
     multitap: false
     linkCable: false
 SLPS-00664:
-  name: "Dragon Knight 4 (Japan)"
+  name: "Dragon Knight 4"
+  saveName: "Dragon Knight 4 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -45797,7 +48086,8 @@ SLPS-00664:
     multitap: false
     linkCable: false
 SLPS-02037:
-  name: "Dragon Money (Japan)"
+  name: "Dragon Money"
+  saveName: "Dragon Money (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -45816,7 +48106,8 @@ SLPS-02037:
     multitap: false
     linkCable: false
 SLPM-86293:
-  name: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon (Japan)"
+  name: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon"
+  saveName: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -45835,11 +48126,13 @@ SLPM-86293:
     multitap: false
     linkCable: false
 SLPM-80479:
-  name: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon (Japan) (Demo)"
+  name: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon (Demo)"
+  saveName: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86916:
-  name: "Dragon Quest IV - Michibikareshi Mono-tachi (Japan)"
+  name: "Dragon Quest IV - Michibikareshi Mono-tachi"
+  saveName: "Dragon Quest IV - Michibikareshi Mono-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -45880,7 +48173,8 @@ SLPM-87356:
     multitap: false
     linkCable: false
 SLPM-87050:
-  name: "Dragon Quest Monsters 1 & 2 - Hoshifuri no Yuusha to Bokujou no Nakama-tachi (Japan)"
+  name: "Dragon Quest Monsters 1 & 2 - Hoshifuri no Yuusha to Bokujou no Nakama-tachi"
+  saveName: "Dragon Quest Monsters 1 & 2 - Hoshifuri no Yuusha to Bokujou no Nakama-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -45921,7 +48215,8 @@ SCPS-45504:
     multitap: false
     linkCable: false
 SLPM-86500:
-  name: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 1)"
+  name: "Dragon Quest VII - Eden no Senshi-tachi (Disc 1)"
+  saveName: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 1)"
   discSet:
     name: "Dragon Quest VII - Eden no Senshi-tachi (Japan)"
     serials:
@@ -45949,7 +48244,8 @@ SLPM-86500:
     multitap: false
     linkCable: false
 SLPM-87352:
-  name: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 1) (Rev 1)"
+  name: "Dragon Quest VII - Eden no Senshi-tachi (Disc 1)"
+  saveName: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 1) (Rev 1)"
   discSet:
     name: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Rev 1)"
     serials:
@@ -45976,7 +48272,8 @@ SLPM-87352:
     multitap: false
     linkCable: false
 SLPM-86501:
-  name: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 2)"
+  name: "Dragon Quest VII - Eden no Senshi-tachi (Disc 2)"
+  saveName: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 2)"
   discSet:
     name: "Dragon Quest VII - Eden no Senshi-tachi (Japan)"
     serials:
@@ -46000,7 +48297,8 @@ SLPM-86501:
     multitap: false
     linkCable: false
 SLPM-87353:
-  name: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 2) (Rev 1)"
+  name: "Dragon Quest VII - Eden no Senshi-tachi (Disc 2)"
+  saveName: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Disc 2) (Rev 1)"
   discSet:
     name: "Dragon Quest VII - Eden no Senshi-tachi (Japan) (Rev 1)"
     serials:
@@ -46027,7 +48325,8 @@ SLPM-87353:
     multitap: false
     linkCable: false
 SLUS-00734:
-  name: "Dragon Seeds (USA)"
+  name: "Dragon Seeds"
+  saveName: "Dragon Seeds (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46046,7 +48345,8 @@ SLUS-00734:
     multitap: false
     linkCable: false
 SLPS-01514:
-  name: "Dragon Seeds - Saishuu Shinka Keitai (Japan)"
+  name: "Dragon Seeds - Saishuu Shinka Keitai"
+  saveName: "Dragon Seeds - Saishuu Shinka Keitai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46065,7 +48365,8 @@ SLPS-01514:
     multitap: false
     linkCable: false
 SLES-03183:
-  name: "Dragon Tales - Dragonseek (Europe)"
+  name: "Dragon Tales - Dragonseek"
+  saveName: "Dragon Tales - Dragonseek (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46084,7 +48385,8 @@ SLES-03183:
     multitap: false
     linkCable: false
 SLUS-01176:
-  name: "Dragon Tales - Dragonseek (USA)"
+  name: "Dragon Tales - Dragonseek"
+  saveName: "Dragon Tales - Dragonseek (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46125,7 +48427,8 @@ SCPS-45459:
     multitap: false
     linkCable: false
 SCES-01705:
-  name: "Dragon Valor (Europe) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (Europe) (Disc 1)"
   discSet:
     name: "Dragon Valor (Europe)"
     serials:
@@ -46152,7 +48455,8 @@ SCES-01705:
     multitap: false
     linkCable: false
 SCES-11705:
-  name: "Dragon Valor (Europe) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (Europe) (Disc 2)"
   discSet:
     name: "Dragon Valor (Europe)"
     serials:
@@ -46179,7 +48483,8 @@ SCES-11705:
     multitap: false
     linkCable: false
 SCES-02565:
-  name: "Dragon Valor (France) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (France) (Disc 1)"
   discSet:
     name: "Dragon Valor (France)"
     serials:
@@ -46206,7 +48511,8 @@ SCES-02565:
     multitap: false
     linkCable: false
 SCES-12565:
-  name: "Dragon Valor (France) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (France) (Disc 2)"
   discSet:
     name: "Dragon Valor (France)"
     serials:
@@ -46233,7 +48539,8 @@ SCES-12565:
     multitap: false
     linkCable: false
 SCES-02566:
-  name: "Dragon Valor (Germany) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (Germany) (Disc 1)"
   discSet:
     name: "Dragon Valor (Germany)"
     serials:
@@ -46260,7 +48567,8 @@ SCES-02566:
     multitap: false
     linkCable: false
 SCES-12566:
-  name: "Dragon Valor (Germany) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (Germany) (Disc 2)"
   discSet:
     name: "Dragon Valor (Germany)"
     serials:
@@ -46287,7 +48595,8 @@ SCES-12566:
     multitap: false
     linkCable: false
 SCES-02567:
-  name: "Dragon Valor (Italy) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (Italy) (Disc 1)"
   discSet:
     name: "Dragon Valor (Italy)"
     serials:
@@ -46314,7 +48623,8 @@ SCES-02567:
     multitap: false
     linkCable: false
 SCES-12567:
-  name: "Dragon Valor (Italy) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (Italy) (Disc 2)"
   discSet:
     name: "Dragon Valor (Italy)"
     serials:
@@ -46341,7 +48651,8 @@ SCES-12567:
     multitap: false
     linkCable: false
 SLPS-02190:
-  name: "Dragon Valor (Japan) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (Japan) (Disc 1)"
   discSet:
     name: "Dragon Valor (Japan)"
     serials:
@@ -46368,7 +48679,8 @@ SLPS-02190:
     multitap: false
     linkCable: false
 SLPS-02191:
-  name: "Dragon Valor (Japan) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (Japan) (Disc 2)"
   discSet:
     name: "Dragon Valor (Japan)"
     serials:
@@ -46395,7 +48707,8 @@ SLPS-02191:
     multitap: false
     linkCable: false
 SCES-02568:
-  name: "Dragon Valor (Spain) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (Spain) (Disc 1)"
   discSet:
     name: "Dragon Valor (Spain)"
     serials:
@@ -46422,7 +48735,8 @@ SCES-02568:
     multitap: false
     linkCable: false
 SCES-12568:
-  name: "Dragon Valor (Spain) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (Spain) (Disc 2)"
   discSet:
     name: "Dragon Valor (Spain)"
     serials:
@@ -46449,7 +48763,8 @@ SCES-12568:
     multitap: false
     linkCable: false
 SLUS-01092:
-  name: "Dragon Valor (USA) (Disc 1)"
+  name: "Dragon Valor (Disc 1)"
+  saveName: "Dragon Valor (USA) (Disc 1)"
   discSet:
     name: "Dragon Valor (USA)"
     serials:
@@ -46479,7 +48794,8 @@ SLUS-01092:
     multitap: false
     linkCable: false
 SLUS-01164:
-  name: "Dragon Valor (USA) (Disc 2)"
+  name: "Dragon Valor (Disc 2)"
+  saveName: "Dragon Valor (USA) (Disc 2)"
   discSet:
     name: "Dragon Valor (USA)"
     serials:
@@ -46506,7 +48822,8 @@ SLUS-01164:
     multitap: false
     linkCable: false
 SLUS-01206:
-  name: "Dragon Warrior VII (USA) (Disc 1)"
+  name: "Dragon Warrior VII (Disc 1)"
+  saveName: "Dragon Warrior VII (USA) (Disc 1)"
   discSet:
     name: "Dragon Warrior VII (USA)"
     serials:
@@ -46535,7 +48852,8 @@ SLUS-01206:
     multitap: false
     linkCable: false
 SLUS-01346:
-  name: "Dragon Warrior VII (USA) (Disc 2)"
+  name: "Dragon Warrior VII (Disc 2)"
+  saveName: "Dragon Warrior VII (USA) (Disc 2)"
   discSet:
     name: "Dragon Warrior VII (USA)"
     serials:
@@ -46564,7 +48882,8 @@ SLUS-01346:
     multitap: false
     linkCable: false
 SLES-00300:
-  name: "DragonHeart - Fire & Steel (Europe) (En,Fr,De)"
+  name: "DragonHeart - Fire & Steel"
+  saveName: "DragonHeart - Fire & Steel (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -46584,7 +48903,8 @@ SLES-00300:
     multitap: false
     linkCable: false
 SLUS-00226:
-  name: "DragonHeart - Fire & Steel (USA)"
+  name: "DragonHeart - Fire & Steel"
+  saveName: "DragonHeart - Fire & Steel (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -46602,7 +48922,8 @@ SLUS-00226:
     multitap: false
     linkCable: false
 SLPS-01067:
-  name: "Dragonbeat - Legend of Pinball (Japan)"
+  name: "Dragonbeat - Legend of Pinball"
+  saveName: "Dragonbeat - Legend of Pinball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -46620,7 +48941,8 @@ SLPS-01067:
     multitap: false
     linkCable: false
 SLES-03525:
-  name: "Dragstars (Europe)"
+  name: "Dragstars"
+  saveName: "Dragstars (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46640,7 +48962,8 @@ SLES-03525:
     multitap: false
     linkCable: false
 SLPS-01836:
-  name: "Dream Circus (Japan)"
+  name: "Dream Circus"
+  saveName: "Dream Circus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -46676,7 +48999,8 @@ SLPS-01482:
     multitap: false
     linkCable: false
 SLPS-02270:
-  name: "Dream Generation - Koi ka Shigoto ka!... (Japan)"
+  name: "Dream Generation - Koi ka Shigoto ka!..."
+  saveName: "Dream Generation - Koi ka Shigoto ka!... (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -46694,7 +49018,8 @@ SLPS-02270:
     multitap: false
     linkCable: false
 SLES-01938:
-  name: "Dream Story - Les Aventures de Tim et Lola (France)"
+  name: "Dream Story - Les Aventures de Tim et Lola"
+  saveName: "Dream Story - Les Aventures de Tim et Lola (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46713,7 +49038,8 @@ SLES-01938:
     multitap: false
     linkCable: false
 SLES-00714:
-  name: "Dreams (Europe) (En,Fr,De,Es,It)"
+  name: "Dreams"
+  saveName: "Dreams (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46736,7 +49062,8 @@ SLES-00714:
     multitap: false
     linkCable: false
 SLPS-00250:
-  name: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki (Japan)"
+  name: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki"
+  saveName: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -46760,11 +49087,13 @@ SLPS-00250:
     multitap: false
     linkCable: false
 SLPM-80037:
-  name: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki (Japan) (Demo)"
+  name: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki (Demo)"
+  saveName: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01816:
-  name: "Driver (Europe)"
+  name: "Driver"
+  saveName: "Driver (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46786,13 +49115,15 @@ SLES-01816:
     multitap: false
     linkCable: false
 SLED-01817:
-  name: "Driver (Europe) (Demo)"
+  name: "Driver (Demo)"
+  saveName: "Driver (Europe) (Demo)"
   settings:
     cdromMaxReadSpeedupCycles: 45000 # Stops crash on load.
   metadata:
     genre: "** DEMO **"
 SLES-01976:
-  name: "Driver (France)"
+  name: "Driver"
+  saveName: "Driver (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -46817,7 +49148,8 @@ SLES-01976:
     multitap: false
     linkCable: false
 SLES-01975:
-  name: "Driver (Germany)"
+  name: "Driver"
+  saveName: "Driver (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46839,7 +49171,8 @@ SLES-01975:
     multitap: false
     linkCable: false
 SLES-01977:
-  name: "Driver (Italy)"
+  name: "Driver"
+  saveName: "Driver (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46861,7 +49194,8 @@ SLES-01977:
     multitap: false
     linkCable: false
 SLES-01978:
-  name: "Driver (Spain)"
+  name: "Driver"
+  saveName: "Driver (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4416-g24b4be51"
@@ -46886,7 +49220,8 @@ SLES-01978:
     multitap: false
     linkCable: false
 SLPS-02613:
-  name: "Driver - Sennyuu! Car Chase Daisakusen (Japan)"
+  name: "Driver - Sennyuu! Car Chase Daisakusen"
+  saveName: "Driver - Sennyuu! Car Chase Daisakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -46911,7 +49246,8 @@ SLPS-02613:
     multitap: false
     linkCable: false
 SLUS-00842:
-  name: "Driver - You Are the Wheelman (USA)"
+  name: "Driver - You Are the Wheelman"
+  saveName: "Driver - You Are the Wheelman (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -46936,7 +49272,8 @@ SLUS-00842:
     multitap: false
     linkCable: false
 SLUS-90053:
-  name: "Driver - You Are the Wheelman (USA) (Demo)"
+  name: "Driver - You Are the Wheelman (Demo)"
+  saveName: "Driver - You Are the Wheelman (USA) (Demo)"
   settings:
     cdromMaxReadSpeedupCycles: 45000 # Stops crash on load.
   metadata:
@@ -46944,7 +49281,8 @@ SLUS-90053:
     languages:
       - English
 SLUS-90093:
-  name: "Driver 2 (USA) (Demo)"
+  name: "Driver 2 (Demo)"
+  saveName: "Driver 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
@@ -46956,7 +49294,8 @@ SLUS-90093:
     gpuPGXPTolerance: 3 # Fixes car shadows with CPU mode active.
     cdromMaxReadSpeedupCycles: 55000 # Stops crash on load.
 SLUS-01161:
-  name: "Driver 2 (USA) (Disc 1)"
+  name: "Driver 2 (Disc 1)"
+  saveName: "Driver 2 (USA) (Disc 1)"
   discSet:
     name: "Driver 2 (USA)"
     serials:
@@ -46989,7 +49328,8 @@ SLUS-01161:
     multitap: false
     linkCable: false
 SLUS-01318:
-  name: "Driver 2 (USA) (Disc 2)"
+  name: "Driver 2 (Disc 2)"
+  saveName: "Driver 2 (USA) (Disc 2)"
   discSet:
     name: "Driver 2 (USA)"
     serials:
@@ -47022,7 +49362,8 @@ SLUS-01318:
     multitap: false
     linkCable: false
 SLES-02993:
-  name: "Driver 2 - Back on the Streets (Europe) (Disc 1)"
+  name: "Driver 2 - Back on the Streets (Disc 1)"
+  saveName: "Driver 2 - Back on the Streets (Europe) (Disc 1)"
   discSet:
     name: "Driver 2 - Back on the Streets (Europe)"
     serials:
@@ -47052,7 +49393,8 @@ SLES-02993:
     multitap: false
     linkCable: false
 SLES-12993:
-  name: "Driver 2 - Back on the Streets (Europe) (Disc 2)"
+  name: "Driver 2 - Back on the Streets (Disc 2)"
+  saveName: "Driver 2 - Back on the Streets (Europe) (Disc 2)"
   discSet:
     name: "Driver 2 - Back on the Streets (Europe)"
     serials:
@@ -47082,7 +49424,8 @@ SLES-12993:
     multitap: false
     linkCable: false
 SLES-02994:
-  name: "Driver 2 - Back on the Streets (France) (Disc 1)"
+  name: "Driver 2 - Back on the Streets (Disc 1)"
+  saveName: "Driver 2 - Back on the Streets (France) (Disc 1)"
   discSet:
     name: "Driver 2 - Back on the Streets (France)"
     serials:
@@ -47115,7 +49458,8 @@ SLES-02994:
     multitap: false
     linkCable: false
 SLES-12994:
-  name: "Driver 2 - Back on the Streets (France) (Disc 2)"
+  name: "Driver 2 - Back on the Streets (Disc 2)"
+  saveName: "Driver 2 - Back on the Streets (France) (Disc 2)"
   discSet:
     name: "Driver 2 - Back on the Streets (France)"
     serials:
@@ -47145,7 +49489,8 @@ SLES-12994:
     multitap: false
     linkCable: false
 SLES-02995:
-  name: "Driver 2 - Back on the Streets (Germany) (Disc 1)"
+  name: "Driver 2 - Back on the Streets (Disc 1)"
+  saveName: "Driver 2 - Back on the Streets (Germany) (Disc 1)"
   discSet:
     name: "Driver 2 - Back on the Streets (Germany)"
     serials:
@@ -47175,7 +49520,8 @@ SLES-02995:
     multitap: false
     linkCable: false
 SLES-12995:
-  name: "Driver 2 - Back on the Streets (Germany) (Disc 2)"
+  name: "Driver 2 - Back on the Streets (Disc 2)"
+  saveName: "Driver 2 - Back on the Streets (Germany) (Disc 2)"
   discSet:
     name: "Driver 2 - Back on the Streets (Germany)"
     serials:
@@ -47205,7 +49551,8 @@ SLES-12995:
     multitap: false
     linkCable: false
 SLES-02996:
-  name: "Driver 2 - Back on the Streets (Italy) (Disc 1)"
+  name: "Driver 2 - Back on the Streets (Disc 1)"
+  saveName: "Driver 2 - Back on the Streets (Italy) (Disc 1)"
   discSet:
     name: "Driver 2 - Back on the Streets (Italy)"
     serials:
@@ -47235,7 +49582,8 @@ SLES-02996:
     multitap: false
     linkCable: false
 SLES-12996:
-  name: "Driver 2 - Back on the Streets (Italy) (Disc 2)"
+  name: "Driver 2 - Back on the Streets (Disc 2)"
+  saveName: "Driver 2 - Back on the Streets (Italy) (Disc 2)"
   discSet:
     name: "Driver 2 - Back on the Streets (Italy)"
     serials:
@@ -47265,7 +49613,8 @@ SLES-12996:
     multitap: false
     linkCable: false
 SLES-02997:
-  name: "Driver 2 - Back on the Streets (Spain) (Disc 1)"
+  name: "Driver 2 - Back on the Streets (Disc 1)"
+  saveName: "Driver 2 - Back on the Streets (Spain) (Disc 1)"
   discSet:
     name: "Driver 2 - Back on the Streets (Spain)"
     serials:
@@ -47299,7 +49648,8 @@ SLES-02997:
     multitap: false
     linkCable: false
 SLES-12997:
-  name: "Driver 2 - Back on the Streets (Spain) (Disc 2)"
+  name: "Driver 2 - Back on the Streets (Disc 2)"
+  saveName: "Driver 2 - Back on the Streets (Spain) (Disc 2)"
   discSet:
     name: "Driver 2 - Back on the Streets (Spain)"
     serials:
@@ -47333,7 +49683,8 @@ SLES-12997:
     multitap: false
     linkCable: false
 SLED-03110:
-  name: "Driver 2 - Back on the Streets (UK) (Demo)"
+  name: "Driver 2 - Back on the Streets (Demo)"
+  saveName: "Driver 2 - Back on the Streets (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -47342,7 +49693,8 @@ SLED-03110:
     gpuPGXPTolerance: 3 # Fixes car shadows with CPU mode active.
     cdromMaxReadSpeedupCycles: 55000 # Stops crash on load.
 SLPM-86678:
-  name: "Drug Store, The (Japan)"
+  name: "Drug Store, The"
+  saveName: "Drug Store, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -47360,7 +49712,8 @@ SLPM-86678:
     multitap: false
     linkCable: false
 SLPS-01516:
-  name: "Drug Store, The - MatsumotoKiyoshi de Okaimono! (Japan)"
+  name: "Drug Store, The - MatsumotoKiyoshi de Okaimono!"
+  saveName: "Drug Store, The - MatsumotoKiyoshi de Okaimono! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -47378,7 +49731,8 @@ SLPS-01516:
     multitap: false
     linkCable: false
 SLPS-01246:
-  name: "Druid - Yami e no Tsuisekisha (Japan)"
+  name: "Druid - Yami e no Tsuisekisha"
+  saveName: "Druid - Yami e no Tsuisekisha (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -47396,15 +49750,18 @@ SLPS-01246:
     multitap: false
     linkCable: false
 SCED-03358:
-  name: "Dschungelbuch, Das - Groove Party (Germany) (Demo)"
+  name: "Dschungelbuch, Das - Groove Party (Demo)"
+  saveName: "Dschungelbuch, Das - Groove Party (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-01386:
-  name: "Dual Shock Demo (Australia)"
+  name: "Dual Shock Demo"
+  saveName: "Dual Shock Demo (Australia)"
   metadata:
     genre: "** DEMO **"
 SLES-02821:
-  name: "Ducati World (Europe)"
+  name: "Ducati World"
+  saveName: "Ducati World (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -47427,7 +49784,8 @@ SLES-02821:
     multitap: false
     linkCable: false
 SLES-03377:
-  name: "Ducati World (Europe) (Fr,De,It)"
+  name: "Ducati World"
+  saveName: "Ducati World (Europe) (Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47449,7 +49807,8 @@ SLES-03377:
     multitap: false
     linkCable: false
 SLUS-01025:
-  name: "Ducati World - Racing Challenge (USA)"
+  name: "Ducati World - Racing Challenge"
+  saveName: "Ducati World - Racing Challenge (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47469,7 +49828,8 @@ SLUS-01025:
     multitap: false
     linkCable: false
 SLES-00703:
-  name: "Duke Nukem (Europe)"
+  name: "Duke Nukem"
+  saveName: "Duke Nukem (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47493,7 +49853,8 @@ SLES-00703:
     multitap: false
     linkCable: false
 SLES-00987:
-  name: "Duke Nukem (France)"
+  name: "Duke Nukem"
+  saveName: "Duke Nukem (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47517,7 +49878,8 @@ SLES-00987:
     multitap: false
     linkCable: false
 SLED-01027:
-  name: "Duke Nukem (France) (Demo)"
+  name: "Duke Nukem (Demo)"
+  saveName: "Duke Nukem (France) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -47526,7 +49888,8 @@ SLED-01027:
   settings:
     gpuLineDetectMode: AggressiveTriangles # Fixes upscaled rendering.
 SLES-03405:
-  name: "Duke Nukem - Land of the Babes (Europe) (En,Fr,De,Es,It)"
+  name: "Duke Nukem - Land of the Babes"
+  saveName: "Duke Nukem - Land of the Babes (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47551,7 +49914,8 @@ SLES-03405:
     multitap: false
     linkCable: false
 SLES-03440:
-  name: "Duke Nukem - Land of the Babes (France)"
+  name: "Duke Nukem - Land of the Babes"
+  saveName: "Duke Nukem - Land of the Babes (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47572,7 +49936,8 @@ SLES-03440:
     multitap: false
     linkCable: false
 SLUS-01002:
-  name: "Duke Nukem - Land of the Babes (USA)"
+  name: "Duke Nukem - Land of the Babes"
+  saveName: "Duke Nukem - Land of the Babes (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -47596,7 +49961,8 @@ SLUS-01002:
     multitap: false
     linkCable: false
 SLES-01515:
-  name: "Duke Nukem - Time to Kill (Europe)"
+  name: "Duke Nukem - Time to Kill"
+  saveName: "Duke Nukem - Time to Kill (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47617,7 +49983,8 @@ SLES-01515:
     multitap: false
     linkCable: false
 SLES-03517:
-  name: "Duke Nukem - Time to Kill (Europe) (Rerelease)"
+  name: "Duke Nukem - Time to Kill (Rerelease)"
+  saveName: "Duke Nukem - Time to Kill (Europe) (Rerelease)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47638,7 +50005,8 @@ SLES-03517:
     multitap: false
     linkCable: false
 SLES-01619:
-  name: "Duke Nukem - Time to Kill (France)"
+  name: "Duke Nukem - Time to Kill"
+  saveName: "Duke Nukem - Time to Kill (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47659,7 +50027,8 @@ SLES-01619:
     multitap: false
     linkCable: false
 SLES-03518:
-  name: "Duke Nukem - Time to Kill (France) (Rerelease)"
+  name: "Duke Nukem - Time to Kill (Rerelease)"
+  saveName: "Duke Nukem - Time to Kill (France) (Rerelease)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47680,7 +50049,8 @@ SLES-03518:
     multitap: false
     linkCable: false
 SLUS-00583:
-  name: "Duke Nukem - Time to Kill (USA)"
+  name: "Duke Nukem - Time to Kill"
+  saveName: "Duke Nukem - Time to Kill (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -47704,19 +50074,22 @@ SLUS-00583:
     multitap: false
     linkCable: false
 SLUS-80583:
-  name: "Duke Nukem - Time to Kill (USA) (Demo 1)"
+  name: "Duke Nukem - Time to Kill (Demo 1)"
+  saveName: "Duke Nukem - Time to Kill (USA) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Improves wall texture wobble.
 SLUS-90036:
-  name: "Duke Nukem - Time to Kill (USA) (Demo 2)"
+  name: "Duke Nukem - Time to Kill (Demo 2)"
+  saveName: "Duke Nukem - Time to Kill (USA) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Improves wall texture wobble.
 SLPS-01557:
-  name: "Duke Nukem - Total Meltdown (Japan)"
+  name: "Duke Nukem - Total Meltdown"
+  saveName: "Duke Nukem - Total Meltdown (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47740,7 +50113,8 @@ SLPS-01557:
     multitap: false
     linkCable: false
 SLUS-00355:
-  name: "Duke Nukem - Total Meltdown (USA)"
+  name: "Duke Nukem - Total Meltdown"
+  saveName: "Duke Nukem - Total Meltdown (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -47767,7 +50141,8 @@ SLUS-00355:
     multitap: false
     linkCable: false
 SLES-03393:
-  name: "Dukes of Hazzard II, The - Daisy Dukes It Out (Europe)"
+  name: "Dukes of Hazzard II, The - Daisy Dukes It Out"
+  saveName: "Dukes of Hazzard II, The - Daisy Dukes It Out (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47786,7 +50161,8 @@ SLES-03393:
     multitap: false
     linkCable: false
 SLUS-01243:
-  name: "Dukes of Hazzard II, The - Daisy Dukes It Out (USA)"
+  name: "Dukes of Hazzard II, The - Daisy Dukes It Out"
+  saveName: "Dukes of Hazzard II, The - Daisy Dukes It Out (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47805,7 +50181,8 @@ SLUS-01243:
     multitap: false
     linkCable: false
 SLES-02343:
-  name: "Dukes of Hazzard, The - Racing for Home (Europe)"
+  name: "Dukes of Hazzard, The - Racing for Home"
+  saveName: "Dukes of Hazzard, The - Racing for Home (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47825,7 +50202,8 @@ SLES-02343:
     multitap: false
     linkCable: false
 SLUS-00859:
-  name: "Dukes of Hazzard, The - Racing for Home (USA)"
+  name: "Dukes of Hazzard, The - Racing for Home"
+  saveName: "Dukes of Hazzard, The - Racing for Home (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -47848,7 +50226,8 @@ SLUS-00859:
     multitap: false
     linkCable: false
 SLES-02250:
-  name: "Dune (Spain)"
+  name: "Dune"
+  saveName: "Dune (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47867,7 +50246,8 @@ SLES-02250:
     multitap: false
     linkCable: true
 SLES-02247:
-  name: "Dune 2000 (Europe)"
+  name: "Dune 2000"
+  saveName: "Dune 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47887,7 +50267,8 @@ SLES-02247:
     multitap: false
     linkCable: true
 SLES-02248:
-  name: "Dune 2000 (France)"
+  name: "Dune 2000"
+  saveName: "Dune 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47907,7 +50288,8 @@ SLES-02248:
     multitap: false
     linkCable: true
 SLES-02249:
-  name: "Dune 2000 (Germany)"
+  name: "Dune 2000"
+  saveName: "Dune 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47927,7 +50309,8 @@ SLES-02249:
     multitap: false
     linkCable: true
 SLUS-00973:
-  name: "Dune 2000 (USA)"
+  name: "Dune 2000"
+  saveName: "Dune 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -47947,7 +50330,8 @@ SLUS-00973:
     multitap: false
     linkCable: true
 SLPS-00349:
-  name: "Dungeon Creator (Japan)"
+  name: "Dungeon Creator"
+  saveName: "Dungeon Creator (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -47965,7 +50349,8 @@ SLPS-00349:
     multitap: false
     linkCable: false
 SLPS-00370:
-  name: "Dungeon Creator (Japan) (Disc 1)"
+  name: "Dungeon Creator (Disc 1)"
+  saveName: "Dungeon Creator (Japan) (Disc 1)"
   discSet:
     name: "Dungeon Creator (Japan)"
     serials:
@@ -47988,7 +50373,8 @@ SLPS-00370:
     multitap: false
     linkCable: false
 SLPS-00371:
-  name: "Dungeon Creator (Japan) (Disc 2) (Memory Bank Disc)"
+  name: "Dungeon Creator (Disc 2) (Memory Bank Disc)"
+  saveName: "Dungeon Creator (Japan) (Disc 2) (Memory Bank Disc)"
   discSet:
     name: "Dungeon Creator (Japan)"
     serials:
@@ -48011,7 +50397,8 @@ SLPS-00371:
     multitap: false
     linkCable: false
 SLPS-01650:
-  name: "Dungeon Shoutenkai - Densetsu no Ken Hajime mashita (Japan)"
+  name: "Dungeon Shoutenkai - Densetsu no Ken Hajime mashita"
+  saveName: "Dungeon Shoutenkai - Densetsu no Ken Hajime mashita (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48029,7 +50416,8 @@ SLPS-01650:
     multitap: false
     linkCable: false
 SLPS-01387:
-  name: "Dynamite Boxing (Japan)"
+  name: "Dynamite Boxing"
+  saveName: "Dynamite Boxing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48048,9 +50436,11 @@ SLPS-01387:
     multitap: false
     linkCable: false
 SLPM-80234:
-  name: "Dynamite Boxing (Japan) (Taikenban)"
+  name: "Dynamite Boxing (Taikenban)"
+  saveName: "Dynamite Boxing (Japan) (Taikenban)"
 SLPS-02554:
-  name: "Dynamite Soccer 2000 (Japan)"
+  name: "Dynamite Soccer 2000"
+  saveName: "Dynamite Soccer 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48069,7 +50459,8 @@ SLPS-02554:
     multitap: true
     linkCable: false
 SLPS-03436:
-  name: "Dynamite Soccer 2002 (Japan)"
+  name: "Dynamite Soccer 2002"
+  saveName: "Dynamite Soccer 2002 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48088,7 +50479,8 @@ SLPS-03436:
     multitap: true
     linkCable: false
 SLPS-03575:
-  name: "Dynamite Soccer 2004 Final (Japan)"
+  name: "Dynamite Soccer 2004 Final"
+  saveName: "Dynamite Soccer 2004 Final (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48107,7 +50499,8 @@ SLPS-03575:
     multitap: true
     linkCable: false
 SLPS-01414:
-  name: "Dynamite Soccer 98 (Japan)"
+  name: "Dynamite Soccer 98"
+  saveName: "Dynamite Soccer 98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48126,11 +50519,13 @@ SLPS-01414:
     multitap: true
     linkCable: false
 PAPX-90043:
-  name: "Dynamite Soccer 98 (Japan) (Demo)"
+  name: "Dynamite Soccer 98 (Demo)"
+  saveName: "Dynamite Soccer 98 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00885:
-  name: "Dynasty Warriors (Europe)"
+  name: "Dynasty Warriors"
+  saveName: "Dynasty Warriors (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -48148,7 +50543,8 @@ SLES-00885:
     multitap: false
     linkCable: false
 SLUS-00438:
-  name: "Dynasty Warriors (USA)"
+  name: "Dynasty Warriors"
+  saveName: "Dynasty Warriors (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -48166,7 +50562,8 @@ SLUS-00438:
     multitap: false
     linkCable: false
 SLES-03805:
-  name: "E.T. the Extra-Terrestrial - Interplanetary Mission (Europe) (En,Fr,De,Es,It)"
+  name: "E.T. the Extra-Terrestrial - Interplanetary Mission"
+  saveName: "E.T. the Extra-Terrestrial - Interplanetary Mission (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48189,7 +50586,8 @@ SLES-03805:
     multitap: false
     linkCable: false
 SLUS-01385:
-  name: "E.T. the Extra-Terrestrial - Interplanetary Mission (USA)"
+  name: "E.T. the Extra-Terrestrial - Interplanetary Mission"
+  saveName: "E.T. the Extra-Terrestrial - Interplanetary Mission (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -48211,11 +50609,13 @@ SLUS-01385:
     multitap: false
     linkCable: false
 SCED-03914:
-  name: "E3 Demo 2002 (Europe)"
+  name: "E3 Demo 2002"
+  saveName: "E3 Demo 2002 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-02538:
-  name: "EA Sports Superbike 2000 (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "EA Sports Superbike 2000"
+  saveName: "EA Sports Superbike 2000 (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48241,7 +50641,8 @@ SLES-02538:
     multitap: false
     linkCable: false
 SLUS-01052:
-  name: "EA Sports Superbike 2000 (USA)"
+  name: "EA Sports Superbike 2000"
+  saveName: "EA Sports Superbike 2000 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1520-g0aefdf47"
@@ -48264,7 +50665,8 @@ SLUS-01052:
     multitap: false
     linkCable: false
 SLES-03399:
-  name: "EA Sports Supercross (Europe)"
+  name: "EA Sports Supercross"
+  saveName: "EA Sports Supercross (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48284,7 +50686,8 @@ SLES-03399:
     multitap: false
     linkCable: false
 SLUS-01319:
-  name: "EA Sports Supercross (USA)"
+  name: "EA Sports Supercross"
+  saveName: "EA Sports Supercross (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48304,7 +50707,8 @@ SLUS-01319:
     multitap: false
     linkCable: false
 SLES-02373:
-  name: "EA Sports Supercross 2000 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  name: "EA Sports Supercross 2000"
+  saveName: "EA Sports Supercross 2000 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -48331,7 +50735,8 @@ SLES-02373:
     multitap: false
     linkCable: false
 SLUS-01005:
-  name: "EA Sports Supercross 2000 (USA)"
+  name: "EA Sports Supercross 2000"
+  saveName: "EA Sports Supercross 2000 (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -48352,7 +50757,8 @@ SLUS-01005:
     multitap: false
     linkCable: false
 SLES-02823:
-  name: "ECW Anarchy Rulz (Europe)"
+  name: "ECW Anarchy Rulz"
+  saveName: "ECW Anarchy Rulz (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48371,7 +50777,8 @@ SLES-02823:
     multitap: true
     linkCable: false
 SLES-03069:
-  name: "ECW Anarchy Rulz (Germany)"
+  name: "ECW Anarchy Rulz"
+  saveName: "ECW Anarchy Rulz (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48390,7 +50797,8 @@ SLES-03069:
     multitap: true
     linkCable: false
 SLUS-01169:
-  name: "ECW Anarchy Rulz (USA)"
+  name: "ECW Anarchy Rulz"
+  saveName: "ECW Anarchy Rulz (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48409,7 +50817,8 @@ SLUS-01169:
     multitap: true
     linkCable: false
 SLES-02535:
-  name: "ECW Hardcore Revolution (Europe)"
+  name: "ECW Hardcore Revolution"
+  saveName: "ECW Hardcore Revolution (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48428,7 +50837,8 @@ SLES-02535:
     multitap: true
     linkCable: false
 SLES-02536:
-  name: "ECW Hardcore Revolution (Germany)"
+  name: "ECW Hardcore Revolution"
+  saveName: "ECW Hardcore Revolution (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48447,7 +50857,8 @@ SLES-02536:
     multitap: true
     linkCable: false
 SLUS-01045:
-  name: "ECW Hardcore Revolution (USA)"
+  name: "ECW Hardcore Revolution"
+  saveName: "ECW Hardcore Revolution (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48466,13 +50877,16 @@ SLUS-01045:
     multitap: true
     linkCable: false
 SLUS-81045:
-  name: "ECW Hardcore Revolution (USA) (Demo)"
+  name: "ECW Hardcore Revolution (Demo)"
+  saveName: "ECW Hardcore Revolution (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80159:
-  name: "EGWord Ver 2.00 (Japan)"
+  name: "EGWord Ver 2.00"
+  saveName: "EGWord Ver 2.00 (Japan)"
 SLPS-00820:
-  name: "EOS - Edge of Skyhigh (Japan)"
+  name: "EOS - Edge of Skyhigh"
+  saveName: "EOS - Edge of Skyhigh (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48490,7 +50904,8 @@ SLPS-00820:
     multitap: false
     linkCable: false
 SCPS-40001:
-  name: "EPS Series Vol. 1 - Because I Love You - Yukiko Morikawa (Japan)"
+  name: "EPS Series Vol. 1 - Because I Love You - Yukiko Morikawa"
+  saveName: "EPS Series Vol. 1 - Because I Love You - Yukiko Morikawa (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48508,7 +50923,8 @@ SCPS-40001:
     multitap: false
     linkCable: false
 SCPS-40002:
-  name: "EPS Series Vol. 2 - Moonlight to Daybreak - Yukie Nakama (Japan)"
+  name: "EPS Series Vol. 2 - Moonlight to Daybreak - Yukie Nakama"
+  saveName: "EPS Series Vol. 2 - Moonlight to Daybreak - Yukie Nakama (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48526,7 +50942,8 @@ SCPS-40002:
     multitap: false
     linkCable: false
 SCPS-40003:
-  name: "EPS Series Vol. 3 - Come and Kiss Me - Tomomi Tsunoda (Japan)"
+  name: "EPS Series Vol. 3 - Come and Kiss Me - Tomomi Tsunoda"
+  saveName: "EPS Series Vol. 3 - Come and Kiss Me - Tomomi Tsunoda (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48544,7 +50961,8 @@ SCPS-40003:
     multitap: false
     linkCable: false
 SCPS-40004:
-  name: "EPS Series Vol. 4 - Noise Reduction - Tomoa Yamamoto (Japan)"
+  name: "EPS Series Vol. 4 - Noise Reduction - Tomoa Yamamoto"
+  saveName: "EPS Series Vol. 4 - Noise Reduction - Tomoa Yamamoto (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48562,7 +50980,8 @@ SCPS-40004:
     multitap: false
     linkCable: false
 SCPS-40005:
-  name: "EPS Series Vol. 5 - Believer Dreamer - Junko Mizutani (Japan)"
+  name: "EPS Series Vol. 5 - Believer Dreamer - Junko Mizutani"
+  saveName: "EPS Series Vol. 5 - Believer Dreamer - Junko Mizutani (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48580,7 +50999,8 @@ SCPS-40005:
     multitap: false
     linkCable: false
 SCES-00063:
-  name: "ESPN Extreme Games (Europe)"
+  name: "ESPN Extreme Games"
+  saveName: "ESPN Extreme Games (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -48598,7 +51018,8 @@ SCES-00063:
     multitap: false
     linkCable: false
 SLUS-01186:
-  name: "ESPN MLS Gamenight (USA)"
+  name: "ESPN MLS Gamenight"
+  saveName: "ESPN MLS Gamenight (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48617,7 +51038,8 @@ SLUS-01186:
     multitap: true
     linkCable: false
 SIPS-60004:
-  name: "ESPN Street Games (Japan)"
+  name: "ESPN Street Games"
+  saveName: "ESPN Street Games (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48635,7 +51057,8 @@ SIPS-60004:
     multitap: false
     linkCable: false
 SLES-01715:
-  name: "Eagle One - Harrier Attack (Europe) (En,Fr,De,Es,It)"
+  name: "Eagle One - Harrier Attack"
+  saveName: "Eagle One - Harrier Attack (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48659,7 +51082,8 @@ SLES-01715:
     multitap: false
     linkCable: false
 SLUS-00943:
-  name: "Eagle One - Harrier Attack (USA) (En,Fr,Es)"
+  name: "Eagle One - Harrier Attack"
+  saveName: "Eagle One - Harrier Attack (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48678,7 +51102,8 @@ SLUS-00943:
     multitap: false
     linkCable: false
 SLES-00343:
-  name: "Earthworm Jim 2 (Europe)"
+  name: "Earthworm Jim 2"
+  saveName: "Earthworm Jim 2 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-896-gc8a00c5"
@@ -48699,7 +51124,8 @@ SLES-00343:
     multitap: false
     linkCable: false
 SLPS-00525:
-  name: "East End x Yuri - Eexy Life (Japan)"
+  name: "East End x Yuri - Eexy Life"
+  saveName: "East End x Yuri - Eexy Life (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48717,7 +51143,8 @@ SLPS-00525:
     multitap: false
     linkCable: false
 SLUS-01551:
-  name: "Easter Bunny's Big Day (USA)"
+  name: "Easter Bunny's Big Day"
+  saveName: "Easter Bunny's Big Day (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48736,7 +51163,8 @@ SLUS-01551:
     multitap: false
     linkCable: false
 SLPS-00844:
-  name: "Eberouge (Japan) (Disc 1)"
+  name: "Eberouge (Disc 1)"
+  saveName: "Eberouge (Japan) (Disc 1)"
   discSet:
     name: "Eberouge (Japan)"
     serials:
@@ -48759,7 +51187,8 @@ SLPS-00844:
     multitap: false
     linkCable: false
 SLPS-00845:
-  name: "Eberouge (Japan) (Disc 2)"
+  name: "Eberouge (Disc 2)"
+  saveName: "Eberouge (Japan) (Disc 2)"
   discSet:
     name: "Eberouge (Japan)"
     serials:
@@ -48782,7 +51211,8 @@ SLPS-00845:
     multitap: false
     linkCable: false
 SLPS-01905:
-  name: "Eberouge 2 (Japan)"
+  name: "Eberouge 2"
+  saveName: "Eberouge 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48801,7 +51231,8 @@ SLPS-01905:
     multitap: false
     linkCable: false
 SLPS-01412:
-  name: "Eberouge Special - Koi to Mahou no Gakuen Seikatsu (Japan)"
+  name: "Eberouge Special - Koi to Mahou no Gakuen Seikatsu"
+  saveName: "Eberouge Special - Koi to Mahou no Gakuen Seikatsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48819,7 +51250,8 @@ SLPS-01412:
     multitap: false
     linkCable: false
 SLPS-00366:
-  name: "Ebisu Yoshikazu no Ooana Kyoutei (Japan)"
+  name: "Ebisu Yoshikazu no Ooana Kyoutei"
+  saveName: "Ebisu Yoshikazu no Ooana Kyoutei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48837,7 +51269,8 @@ SLPS-00366:
     multitap: false
     linkCable: false
 SLPS-01518:
-  name: "Echo Night (Japan)"
+  name: "Echo Night"
+  saveName: "Echo Night (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48862,7 +51295,8 @@ SLPS-01518:
     multitap: false
     linkCable: false
 SLUS-00820:
-  name: "Echo Night (USA)"
+  name: "Echo Night"
+  saveName: "Echo Night (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-9510-g4c349ffd4"
@@ -48886,7 +51320,8 @@ SLUS-00820:
     multitap: false
     linkCable: false
 SLPS-02167:
-  name: "Echo Night 2 - Nemuri no Shihaisha (Japan)"
+  name: "Echo Night 2 - Nemuri no Shihaisha"
+  saveName: "Echo Night 2 - Nemuri no Shihaisha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48908,11 +51343,13 @@ SLPS-02167:
     multitap: false
     linkCable: false
 SLPM-80468:
-  name: "Echo Night 2 - Nemuri no Shihaisha (Japan) (Demo)"
+  name: "Echo Night 2 - Nemuri no Shihaisha (Demo)"
+  saveName: "Echo Night 2 - Nemuri no Shihaisha (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00648:
-  name: "Econo Kids - Ta ga Tame ni Kane wa Naru (Japan)"
+  name: "Econo Kids - Ta ga Tame ni Kane wa Naru"
+  saveName: "Econo Kids - Ta ga Tame ni Kane wa Naru (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -48931,7 +51368,8 @@ SLPS-00648:
     multitap: true
     linkCable: false
 SLPS-01791:
-  name: "Ecsaform (Japan) (Disc 1)"
+  name: "Ecsaform (Disc 1)"
+  saveName: "Ecsaform (Japan) (Disc 1)"
   discSet:
     name: "Ecsaform (Japan)"
     serials:
@@ -48954,7 +51392,8 @@ SLPS-01791:
     multitap: false
     linkCable: false
 SLPS-01792:
-  name: "Ecsaform (Japan) (Disc 2)"
+  name: "Ecsaform (Disc 2)"
+  saveName: "Ecsaform (Japan) (Disc 2)"
   discSet:
     name: "Ecsaform (Japan)"
     serials:
@@ -48977,7 +51416,8 @@ SLPS-01792:
     multitap: false
     linkCable: false
 SLPS-01549:
-  name: "Efficus - Kono Omoi wo Kimi ni... (Japan)"
+  name: "Efficus - Kono Omoi wo Kimi ni..."
+  saveName: "Efficus - Kono Omoi wo Kimi ni... (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -48995,7 +51435,8 @@ SLPS-01549:
     multitap: false
     linkCable: false
 SLPS-01121:
-  name: "Egg (Japan)"
+  name: "Egg"
+  saveName: "Egg (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49013,7 +51454,8 @@ SLPS-01121:
     multitap: true
     linkCable: false
 SLPM-86543:
-  name: "Egg (Japan) (Major Wave)"
+  name: "Egg (Major Wave)"
+  saveName: "Egg (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -49031,7 +51473,8 @@ SLPM-86543:
     multitap: true
     linkCable: false
 SLUS-00751:
-  name: "Eggs of Steel - Charlie's Eggcellent Adventure (USA)"
+  name: "Eggs of Steel - Charlie's Eggcellent Adventure"
+  saveName: "Eggs of Steel - Charlie's Eggcellent Adventure (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -49049,7 +51492,8 @@ SLUS-00751:
     multitap: false
     linkCable: false
 SLES-03491:
-  name: "Egipto II - La Profecia de Heliopolis (Spain)"
+  name: "Egipto II - La Profecia de Heliopolis"
+  saveName: "Egipto II - La Profecia de Heliopolis (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -49067,7 +51511,8 @@ SLES-03491:
     multitap: false
     linkCable: false
 SLES-01599:
-  name: "Egypt 1156 A.C. - L'Enigma della Tomba Reale (Italy)"
+  name: "Egypt 1156 A.C. - L'Enigma della Tomba Reale"
+  saveName: "Egypt 1156 A.C. - L'Enigma della Tomba Reale (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -49085,7 +51530,8 @@ SLES-01599:
     multitap: false
     linkCable: false
 SLES-01600:
-  name: "Egypt 1156 B.C. - Tomb of the Pharaoh (Europe) (En,Es,Nl,Sv)"
+  name: "Egypt 1156 B.C. - Tomb of the Pharaoh"
+  saveName: "Egypt 1156 B.C. - Tomb of the Pharaoh (Europe) (En,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -49106,7 +51552,8 @@ SLES-01600:
     multitap: false
     linkCable: false
 SLES-03374:
-  name: "Egypt II - Die Prophezeiung von Helipolis (Germany)"
+  name: "Egypt II - Die Prophezeiung von Helipolis"
+  saveName: "Egypt II - Die Prophezeiung von Helipolis (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -49124,7 +51571,8 @@ SLES-03374:
     multitap: false
     linkCable: false
 SLES-03490:
-  name: "Egypt II - La Profezia di Heliopolis (Italy)"
+  name: "Egypt II - La Profezia di Heliopolis"
+  saveName: "Egypt II - La Profezia di Heliopolis (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -49142,7 +51590,8 @@ SLES-03490:
     multitap: false
     linkCable: false
 SLES-03372:
-  name: "Egypt II - La Prophetie d'Heliopolis (France)"
+  name: "Egypt II - La Prophetie d'Heliopolis"
+  saveName: "Egypt II - La Prophetie d'Heliopolis (France)"
   controllers:
     - DigitalController
   metadata:
@@ -49160,7 +51609,8 @@ SLES-03372:
     multitap: false
     linkCable: false
 SLES-03373:
-  name: "Egypt II - The Heliopolis Prophecy (Europe)"
+  name: "Egypt II - The Heliopolis Prophecy"
+  saveName: "Egypt II - The Heliopolis Prophecy (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -49178,7 +51628,8 @@ SLES-03373:
     multitap: false
     linkCable: false
 SLES-01597:
-  name: "Egypte 1156 AV. J.-C. - L'Enigme de la Tombe Royale (France)"
+  name: "Egypte 1156 AV. J.-C. - L'Enigme de la Tombe Royale"
+  saveName: "Egypte 1156 AV. J.-C. - L'Enigme de la Tombe Royale (France)"
   controllers:
     - DigitalController
   metadata:
@@ -49215,7 +51666,8 @@ SCPS-45364:
     multitap: false
     linkCable: false
 SLES-02111:
-  name: "Ehrgeiz - God Bless the Ring (Europe)"
+  name: "Ehrgeiz - God Bless the Ring"
+  saveName: "Ehrgeiz - God Bless the Ring (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49234,7 +51686,8 @@ SLES-02111:
     multitap: false
     linkCable: false
 SLPS-01750:
-  name: "Ehrgeiz - God Bless the Ring (Japan)"
+  name: "Ehrgeiz - God Bless the Ring"
+  saveName: "Ehrgeiz - God Bless the Ring (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49257,15 +51710,18 @@ SLPS-01750:
     multitap: false
     linkCable: false
 SLPM-80332:
-  name: "Ehrgeiz - God Bless the Ring (Japan) (Demo 1)"
+  name: "Ehrgeiz - God Bless the Ring (Demo 1)"
+  saveName: "Ehrgeiz - God Bless the Ring (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80333:
-  name: "Ehrgeiz - God Bless the Ring (Japan) (Demo 2)"
+  name: "Ehrgeiz - God Bless the Ring (Demo 2)"
+  saveName: "Ehrgeiz - God Bless the Ring (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLUS-00809:
-  name: "Ehrgeiz - God Bless the Ring (USA)"
+  name: "Ehrgeiz - God Bless the Ring"
+  saveName: "Ehrgeiz - God Bless the Ring (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -49287,33 +51743,41 @@ SLUS-00809:
     multitap: false
     linkCable: false
 SLED-02411:
-  name: "Eidos (France)"
+  name: "Eidos"
+  saveName: "Eidos (France)"
 SLUS-90040:
-  name: "Eidos Demo CD (USA)"
+  name: "Eidos Demo CD"
+  saveName: "Eidos Demo CD (USA)"
   metadata:
     genre: "** DEMO **"
 SLUS-90047:
-  name: "Eidos Demo CD Volume 3 (USA)"
+  name: "Eidos Demo CD Volume 3"
+  saveName: "Eidos Demo CD Volume 3 (USA)"
   metadata:
     genre: "** DEMO **"
 SLUS-90051:
-  name: "Eidos Demo CD Volume 4 (USA)"
+  name: "Eidos Demo CD Volume 4"
+  saveName: "Eidos Demo CD Volume 4 (USA)"
   metadata:
     genre: "** DEMO **"
 SLUS-90074:
-  name: "Eidos Demo CD Volume 6 (USA)"
+  name: "Eidos Demo CD Volume 6"
+  saveName: "Eidos Demo CD Volume 6 (USA)"
   metadata:
     genre: "** DEMO **"
 SLUS-90065:
-  name: "Eidos Demo Disc Volume 5 (USA)"
+  name: "Eidos Demo Disc Volume 5"
+  saveName: "Eidos Demo Disc Volume 5 (USA)"
   metadata:
     genre: "** DEMO **"
 SLUS-90076:
-  name: "Eidos Demo Disc Volume 7 (USA)"
+  name: "Eidos Demo Disc Volume 7"
+  saveName: "Eidos Demo Disc Volume 7 (USA)"
   metadata:
     genre: "** DEMO **"
 SLPS-02173:
-  name: "Eikan wa Kimi ni 4 (Japan)"
+  name: "Eikan wa Kimi ni 4"
+  saveName: "Eikan wa Kimi ni 4 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -49334,7 +51798,8 @@ SLPS-02173:
     multitap: false
     linkCable: false
 SLPM-86003:
-  name: "Eikou no Fairway - Virtual Golf Simulation (Japan)"
+  name: "Eikou no Fairway - Virtual Golf Simulation"
+  saveName: "Eikou no Fairway - Virtual Golf Simulation (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49352,7 +51817,8 @@ SLPM-86003:
     multitap: false
     linkCable: false
 SLPS-01008:
-  name: "Einhaender (Japan)"
+  name: "Einhaender"
+  saveName: "Einhaender (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49370,11 +51836,13 @@ SLPS-01008:
     multitap: false
     linkCable: false
 SLPM-80164:
-  name: "Einhaender (Japan) (Demo)"
+  name: "Einhaender (Demo)"
+  saveName: "Einhaender (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94243:
-  name: "Einhaender (USA)"
+  name: "Einhaender"
+  saveName: "Einhaender (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -49413,7 +51881,8 @@ SCPS-45125:
     multitap: false
     linkCable: false
 SLPS-00090:
-  name: "Eisei Meijin (Japan) (Rev 1)"
+  name: "Eisei Meijin"
+  saveName: "Eisei Meijin (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -49431,7 +51900,8 @@ SLPS-00090:
     multitap: false
     linkCable: false
 SLPM-86014:
-  name: "Eisei Meijin II (Japan)"
+  name: "Eisei Meijin II"
+  saveName: "Eisei Meijin II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49449,7 +51919,8 @@ SLPM-86014:
     multitap: false
     linkCable: false
 SLPM-86199:
-  name: "Eisei Meijin III - Game Creator Yoshimura Nobuhiro no Zunou (Japan)"
+  name: "Eisei Meijin III - Game Creator Yoshimura Nobuhiro no Zunou"
+  saveName: "Eisei Meijin III - Game Creator Yoshimura Nobuhiro no Zunou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49467,7 +51938,8 @@ SLPM-86199:
     multitap: false
     linkCable: false
 SLPS-03058:
-  name: "Eithea (Japan) (Disc 1)"
+  name: "Eithea (Disc 1)"
+  saveName: "Eithea (Japan) (Disc 1)"
   discSet:
     name: "Eithea (Japan)"
     serials:
@@ -49491,7 +51963,8 @@ SLPS-03058:
     multitap: false
     linkCable: false
 SLPM-87091:
-  name: "Eithea (Japan) (Disc 1) (Rev 1)"
+  name: "Eithea (Disc 1)"
+  saveName: "Eithea (Japan) (Disc 1) (Rev 1)"
   discSet:
     name: "Eithea (Japan) (Rev 1)"
     serials:
@@ -49518,7 +51991,8 @@ SLPM-87091:
     multitap: false
     linkCable: false
 SLPS-03059:
-  name: "Eithea (Japan) (Disc 2)"
+  name: "Eithea (Disc 2)"
+  saveName: "Eithea (Japan) (Disc 2)"
   discSet:
     name: "Eithea (Japan)"
     serials:
@@ -49542,7 +52016,8 @@ SLPS-03059:
     multitap: false
     linkCable: false
 SLPM-87092:
-  name: "Eithea (Japan) (Disc 2) (Rev 1)"
+  name: "Eithea (Disc 2)"
+  saveName: "Eithea (Japan) (Disc 2) (Rev 1)"
   discSet:
     name: "Eithea (Japan) (Rev 1)"
     serials:
@@ -49569,7 +52044,8 @@ SLPM-87092:
     multitap: false
     linkCable: false
 SLPS-00181:
-  name: "Eko Eko Azarak - Wizard of Darkness (Japan)"
+  name: "Eko Eko Azarak - Wizard of Darkness"
+  saveName: "Eko Eko Azarak - Wizard of Darkness (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49587,7 +52063,8 @@ SLPS-00181:
     multitap: false
     linkCable: false
 SCES-02177:
-  name: "El Tetris Un Magico Desafio (Spain)"
+  name: "El Tetris Un Magico Desafio"
+  saveName: "El Tetris Un Magico Desafio (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49606,7 +52083,8 @@ SCES-02177:
     multitap: false
     linkCable: false
 SLPS-01925:
-  name: "Elan (Japan)"
+  name: "Elan"
+  saveName: "Elan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49625,7 +52103,8 @@ SLPS-01925:
     multitap: false
     linkCable: false
 SLPS-02759:
-  name: "Elan Plus (Japan)"
+  name: "Elan Plus"
+  saveName: "Elan Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49644,7 +52123,8 @@ SLPS-02759:
     multitap: false
     linkCable: false
 SLPM-86494:
-  name: "Elder Gate (Japan)"
+  name: "Elder Gate"
+  saveName: "Elder Gate (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -49665,9 +52145,11 @@ SLPM-86494:
     multitap: false
     linkCable: false
 SLPM-80560:
-  name: "Elder Gate (Japan) (Taikenban)"
+  name: "Elder Gate (Taikenban)"
+  saveName: "Elder Gate (Japan) (Taikenban)"
 SLUS-00654:
-  name: "Elemental Gearbolt (USA)"
+  name: "Elemental Gearbolt"
+  saveName: "Elemental Gearbolt (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -49692,7 +52174,8 @@ SLUS-00654:
     multitap: false
     linkCable: false
 SLES-04038:
-  name: "Elemental Pinball (Europe)"
+  name: "Elemental Pinball"
+  saveName: "Elemental Pinball (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49711,9 +52194,11 @@ SLES-04038:
     multitap: false
     linkCable: false
 SLES-00960:
-  name: "Elf Masters presente Formula Karts - Special Edition (France)"
+  name: "Elf Masters presente Formula Karts - Special Edition"
+  saveName: "Elf Masters presente Formula Karts - Special Edition (France)"
 SLPS-00904:
-  name: "Elf o Karu Monotachi - Hanafuda-hen (Japan)"
+  name: "Elf o Karu Monotachi - Hanafuda-hen"
+  saveName: "Elf o Karu Monotachi - Hanafuda-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49731,7 +52216,8 @@ SLPS-00904:
     multitap: false
     linkCable: false
 SLPS-00973:
-  name: "Elf o Karu Monotachi - Kanzenban (Japan) (Disc 1)"
+  name: "Elf o Karu Monotachi - Kanzenban (Disc 1)"
+  saveName: "Elf o Karu Monotachi - Kanzenban (Japan) (Disc 1)"
   discSet:
     name: "Elf o Karu Monotachi - Kanzenban (Japan)"
     serials:
@@ -49754,7 +52240,8 @@ SLPS-00973:
     multitap: false
     linkCable: false
 SLPS-00974:
-  name: "Elf o Karu Monotachi - Kanzenban (Japan) (Disc 2)"
+  name: "Elf o Karu Monotachi - Kanzenban (Disc 2)"
+  saveName: "Elf o Karu Monotachi - Kanzenban (Japan) (Disc 2)"
   discSet:
     name: "Elf o Karu Monotachi - Kanzenban (Japan)"
     serials:
@@ -49777,7 +52264,8 @@ SLPS-00974:
     multitap: false
     linkCable: false
 SLPS-01456:
-  name: "Elf wo Karu Monotachi II (Japan) (Disc 1)"
+  name: "Elf wo Karu Monotachi II (Disc 1)"
+  saveName: "Elf wo Karu Monotachi II (Japan) (Disc 1)"
   discSet:
     name: "Elf wo Karu Monotachi II (Japan)"
     serials:
@@ -49801,7 +52289,8 @@ SLPS-01456:
     multitap: false
     linkCable: false
 SLPS-01457:
-  name: "Elf wo Karu Monotachi II (Japan) (Disc 2)"
+  name: "Elf wo Karu Monotachi II (Disc 2)"
+  saveName: "Elf wo Karu Monotachi II (Japan) (Disc 2)"
   discSet:
     name: "Elf wo Karu Monotachi II (Japan)"
     serials:
@@ -49825,7 +52314,8 @@ SLPS-01457:
     multitap: false
     linkCable: false
 SLPS-01458:
-  name: "Elf wo Karu Monotachi II (Japan) (Disc 3)"
+  name: "Elf wo Karu Monotachi II (Disc 3)"
+  saveName: "Elf wo Karu Monotachi II (Japan) (Disc 3)"
   discSet:
     name: "Elf wo Karu Monotachi II (Japan)"
     serials:
@@ -49849,7 +52339,8 @@ SLPS-01458:
     multitap: false
     linkCable: false
 SLPS-00778:
-  name: "Elfin Paradise (Japan)"
+  name: "Elfin Paradise"
+  saveName: "Elfin Paradise (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -49867,7 +52358,8 @@ SLPS-00778:
     multitap: false
     linkCable: false
 SLES-01364:
-  name: "Eliminator (Europe) (En,Fr,De,Es,It)"
+  name: "Eliminator"
+  saveName: "Eliminator (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -49890,7 +52382,8 @@ SLES-01364:
     multitap: false
     linkCable: false
 SLUS-00699:
-  name: "Eliminator (USA)"
+  name: "Eliminator"
+  saveName: "Eliminator (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -49912,7 +52405,8 @@ SLUS-00699:
     multitap: false
     linkCable: false
 SLPS-00117:
-  name: "Emit Value Pack (Japan) (Disc 1) (Vol. 1 - Toki no Maigo)"
+  name: "Emit Value Pack (Disc 1) (Vol. 1 - Toki no Maigo)"
+  saveName: "Emit Value Pack (Japan) (Disc 1) (Vol. 1 - Toki no Maigo)"
   discSet:
     name: "Emit Value Pack (Japan)"
     serials:
@@ -49937,7 +52431,8 @@ SLPS-00117:
     multitap: false
     linkCable: false
 SLPS-00118:
-  name: "Emit Value Pack (Japan) (Disc 2) (Vol. 2 - Inochigake no Tabi)"
+  name: "Emit Value Pack (Disc 2) (Vol. 2 - Inochigake no Tabi)"
+  saveName: "Emit Value Pack (Japan) (Disc 2) (Vol. 2 - Inochigake no Tabi)"
   discSet:
     name: "Emit Value Pack (Japan)"
     serials:
@@ -49962,7 +52457,8 @@ SLPS-00118:
     multitap: false
     linkCable: false
 SLPS-00119:
-  name: "Emit Value Pack (Japan) (Disc 3) (Vol. 3 - Watashi ni Sayonara wo)"
+  name: "Emit Value Pack (Disc 3) (Vol. 3 - Watashi ni Sayonara wo)"
+  saveName: "Emit Value Pack (Japan) (Disc 3) (Vol. 3 - Watashi ni Sayonara wo)"
   discSet:
     name: "Emit Value Pack (Japan)"
     serials:
@@ -49987,7 +52483,8 @@ SLPS-00119:
     multitap: false
     linkCable: false
 SLPS-03216:
-  name: "Emmyrea (Japan)"
+  name: "Emmyrea"
+  saveName: "Emmyrea (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50006,7 +52503,8 @@ SLPS-03216:
     multitap: false
     linkCable: false
 SLES-02985:
-  name: "En Busca del Valle Encantado - El Retorno al Gran Valle (Spain)"
+  name: "En Busca del Valle Encantado - El Retorno al Gran Valle"
+  saveName: "En Busca del Valle Encantado - El Retorno al Gran Valle (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50025,7 +52523,8 @@ SLES-02985:
     multitap: false
     linkCable: false
 SLPS-01584:
-  name: "End Sector (Japan)"
+  name: "End Sector"
+  saveName: "End Sector (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50063,7 +52562,8 @@ SLPS-02972:
     multitap: false
     linkCable: false
 SLPM-86537:
-  name: "Enen Angel (Japan)"
+  name: "Enen Angel"
+  saveName: "Enen Angel (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -50084,7 +52584,8 @@ SLPM-86537:
     multitap: false
     linkCable: false
 SLPS-02263:
-  name: "Engacho! (Japan)"
+  name: "Engacho!"
+  saveName: "Engacho! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50103,7 +52604,8 @@ SLPS-02263:
     multitap: false
     linkCable: false
 SLPS-01351:
-  name: "Enigma (Japan) (Disc 1)"
+  name: "Enigma (Disc 1)"
+  saveName: "Enigma (Japan) (Disc 1)"
   discSet:
     name: "Enigma (Japan)"
     serials:
@@ -50126,7 +52628,8 @@ SLPS-01351:
     multitap: false
     linkCable: false
 SLPS-01352:
-  name: "Enigma (Japan) (Disc 2)"
+  name: "Enigma (Disc 2)"
+  saveName: "Enigma (Japan) (Disc 2)"
   discSet:
     name: "Enigma (Japan)"
     serials:
@@ -50149,7 +52652,8 @@ SLPS-01352:
     multitap: false
     linkCable: false
 SLPS-01937:
-  name: "Enomoto Kanako no Boke Shindan Game (Japan)"
+  name: "Enomoto Kanako no Boke Shindan Game"
+  saveName: "Enomoto Kanako no Boke Shindan Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50168,7 +52672,8 @@ SLPS-01937:
     multitap: true
     linkCable: false
 SLPS-00051:
-  name: "Entertainment Jansou - That's Pon! (Japan)"
+  name: "Entertainment Jansou - That's Pon!"
+  saveName: "Entertainment Jansou - That's Pon! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -50186,7 +52691,8 @@ SLPS-00051:
     multitap: false
     linkCable: false
 SLPS-01465:
-  name: "Epica Stella (Japan)"
+  name: "Epica Stella"
+  saveName: "Epica Stella (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50205,7 +52711,8 @@ SLPS-01465:
     multitap: false
     linkCable: false
 SCES-00393:
-  name: "Epidemic (Europe)"
+  name: "Epidemic"
+  saveName: "Epidemic (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -50223,7 +52730,8 @@ SCES-00393:
     multitap: false
     linkCable: false
 SCUS-94152:
-  name: "Epidemic (USA)"
+  name: "Epidemic"
+  saveName: "Epidemic (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -50244,7 +52752,8 @@ SCUS-94152:
     multitap: false
     linkCable: false
 SLES-02943:
-  name: "Equestriad 2001 (Europe) (En,De,Es)"
+  name: "Equestriad 2001"
+  saveName: "Equestriad 2001 (Europe) (En,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50265,7 +52774,8 @@ SLES-02943:
     multitap: false
     linkCable: false
 SLUS-01462:
-  name: "Equestrian Showcase (USA)"
+  name: "Equestrian Showcase"
+  saveName: "Equestrian Showcase (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50286,55 +52796,68 @@ SLUS-01462:
     multitap: false
     linkCable: false
 SCED-00502:
-  name: "Essential PlayStation 1 (Europe)"
+  name: "Essential PlayStation 1"
+  saveName: "Essential PlayStation 1 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01141:
-  name: "Essential PlayStation 10 (Europe)"
+  name: "Essential PlayStation 10"
+  saveName: "Essential PlayStation 10 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01142:
-  name: "Essential PlayStation 11 (Europe)"
+  name: "Essential PlayStation 11"
+  saveName: "Essential PlayStation 11 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01143:
-  name: "Essential PlayStation 12 (Europe)"
+  name: "Essential PlayStation 12"
+  saveName: "Essential PlayStation 12 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00572:
-  name: "Essential PlayStation 2 (Europe)"
+  name: "Essential PlayStation 2"
+  saveName: "Essential PlayStation 2 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00636:
-  name: "Essential PlayStation 3 (Europe)"
+  name: "Essential PlayStation 3"
+  saveName: "Essential PlayStation 3 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00938:
-  name: "Essential PlayStation 4 (Europe)"
+  name: "Essential PlayStation 4"
+  saveName: "Essential PlayStation 4 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01004:
-  name: "Essential PlayStation 5 (Europe)"
+  name: "Essential PlayStation 5"
+  saveName: "Essential PlayStation 5 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00751:
-  name: "Essential PlayStation 6 (Europe)"
+  name: "Essential PlayStation 6"
+  saveName: "Essential PlayStation 6 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01110:
-  name: "Essential PlayStation 7 (Europe)"
+  name: "Essential PlayStation 7"
+  saveName: "Essential PlayStation 7 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01139:
-  name: "Essential PlayStation 8 (Europe)"
+  name: "Essential PlayStation 8"
+  saveName: "Essential PlayStation 8 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01140:
-  name: "Essential PlayStation 9 (Europe, Australia)"
+  name: "Essential PlayStation 9"
+  saveName: "Essential PlayStation 9 (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCES-01704:
-  name: "Esto Es Futbol (Spain)"
+  name: "Esto Es Futbol"
+  saveName: "Esto Es Futbol (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50354,7 +52877,8 @@ SCES-01704:
     multitap: true
     linkCable: false
 SCES-03076:
-  name: "Esto Es Futbol 2 (Spain)"
+  name: "Esto Es Futbol 2"
+  saveName: "Esto Es Futbol 2 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50373,11 +52897,13 @@ SCES-03076:
     multitap: true
     linkCable: false
 SCED-03205:
-  name: "Esto Es Futbol 2 (Spain) (Demo)"
+  name: "Esto Es Futbol 2 (Demo)"
+  saveName: "Esto Es Futbol 2 (Spain) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02270:
-  name: "Eternal Eyes (Europe) (En,Fr,De,Es,It)"
+  name: "Eternal Eyes"
+  saveName: "Eternal Eyes (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50400,7 +52926,8 @@ SLES-02270:
     multitap: false
     linkCable: false
 SLUS-01034:
-  name: "Eternal Eyes (USA)"
+  name: "Eternal Eyes"
+  saveName: "Eternal Eyes (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -50419,7 +52946,8 @@ SLUS-01034:
     multitap: false
     linkCable: false
 SLPS-00584:
-  name: "Eternal Melody (Japan)"
+  name: "Eternal Melody"
+  saveName: "Eternal Melody (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -50437,11 +52965,13 @@ SLPS-00584:
     multitap: false
     linkCable: false
 SLPM-80336:
-  name: "Eurasia Express Satsujin Jiken (Japan) (Demo)"
+  name: "Eurasia Express Satsujin Jiken (Demo)"
+  saveName: "Eurasia Express Satsujin Jiken (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86135:
-  name: "Eurasia Express Satsujin Jiken (Japan) (Disc 1)"
+  name: "Eurasia Express Satsujin Jiken (Disc 1)"
+  saveName: "Eurasia Express Satsujin Jiken (Japan) (Disc 1)"
   discSet:
     name: "Eurasia Express Satsujin Jiken (Japan)"
     serials:
@@ -50467,7 +52997,8 @@ SLPM-86135:
     multitap: false
     linkCable: false
 SLPM-86136:
-  name: "Eurasia Express Satsujin Jiken (Japan) (Disc 2)"
+  name: "Eurasia Express Satsujin Jiken (Disc 2)"
+  saveName: "Eurasia Express Satsujin Jiken (Japan) (Disc 2)"
   discSet:
     name: "Eurasia Express Satsujin Jiken (Japan)"
     serials:
@@ -50493,7 +53024,8 @@ SLPM-86136:
     multitap: false
     linkCable: false
 SLPM-86137:
-  name: "Eurasia Express Satsujin Jiken (Japan) (Disc 3)"
+  name: "Eurasia Express Satsujin Jiken (Disc 3)"
+  saveName: "Eurasia Express Satsujin Jiken (Japan) (Disc 3)"
   discSet:
     name: "Eurasia Express Satsujin Jiken (Japan)"
     serials:
@@ -50519,7 +53051,8 @@ SLPM-86137:
     multitap: false
     linkCable: false
 SLPM-86138:
-  name: "Eurasia Express Satsujin Jiken (Japan) (Disc 4)"
+  name: "Eurasia Express Satsujin Jiken (Disc 4)"
+  saveName: "Eurasia Express Satsujin Jiken (Japan) (Disc 4)"
   discSet:
     name: "Eurasia Express Satsujin Jiken (Japan)"
     serials:
@@ -50545,67 +53078,83 @@ SLPM-86138:
     multitap: false
     linkCable: false
 SCED-04079:
-  name: "Euro Demo (Future) 100 (Europe)"
+  name: "Euro Demo (Future) 100"
+  saveName: "Euro Demo (Future) 100 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04080:
-  name: "Euro Demo (Future) 101 (Europe)"
+  name: "Euro Demo (Future) 101"
+  saveName: "Euro Demo (Future) 101 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04081:
-  name: "Euro Demo (Future) 102 (Europe)"
+  name: "Euro Demo (Future) 102"
+  saveName: "Euro Demo (Future) 102 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04082:
-  name: "Euro Demo (Future) 103 (Europe)"
+  name: "Euro Demo (Future) 103"
+  saveName: "Euro Demo (Future) 103 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04083:
-  name: "Euro Demo (Future) 104 (Europe)"
+  name: "Euro Demo (Future) 104"
+  saveName: "Euro Demo (Future) 104 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04084:
-  name: "Euro Demo (Future) 105 (Europe)"
+  name: "Euro Demo (Future) 105"
+  saveName: "Euro Demo (Future) 105 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04085:
-  name: "Euro Demo (Future) 106 (Europe)"
+  name: "Euro Demo (Future) 106"
+  saveName: "Euro Demo (Future) 106 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04133:
-  name: "Euro Demo (Future) 107 (Europe)"
+  name: "Euro Demo (Future) 107"
+  saveName: "Euro Demo (Future) 107 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04134:
-  name: "Euro Demo (Future) 108 (Europe)"
+  name: "Euro Demo (Future) 108"
+  saveName: "Euro Demo (Future) 108 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04056:
-  name: "Euro Demo (Future) 94 (Europe)"
+  name: "Euro Demo (Future) 94"
+  saveName: "Euro Demo (Future) 94 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04074:
-  name: "Euro Demo (Future) 95 (Europe)"
+  name: "Euro Demo (Future) 95"
+  saveName: "Euro Demo (Future) 95 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04075:
-  name: "Euro Demo (Future) 96 (Europe)"
+  name: "Euro Demo (Future) 96"
+  saveName: "Euro Demo (Future) 96 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04076:
-  name: "Euro Demo (Future) 97 (Europe)"
+  name: "Euro Demo (Future) 97"
+  saveName: "Euro Demo (Future) 97 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04077:
-  name: "Euro Demo (Future) 98 (Europe)"
+  name: "Euro Demo (Future) 98"
+  saveName: "Euro Demo (Future) 98 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04078:
-  name: "Euro Demo (Future) 99 (Europe)"
+  name: "Euro Demo (Future) 99"
+  saveName: "Euro Demo (Future) 99 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-00107-2:
-  name: "Euro Demo 01 (Europe)"
+  name: "Euro Demo 01"
+  saveName: "Euro Demo 01 (Europe)"
   controllers:
     - DigitalController
   codes:
@@ -50626,885 +53175,1104 @@ SLES-00107-2:
     multitap: false
     linkCable: false
 SCED-01844:
-  name: "Euro Demo 01-00 (Germany)"
+  name: "Euro Demo 01-00"
+  saveName: "Euro Demo 01-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02666:
-  name: "Euro Demo 01-01 (Germany)"
+  name: "Euro Demo 01-01"
+  saveName: "Euro Demo 01-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03476:
-  name: "Euro Demo 01-02 (Germany)"
+  name: "Euro Demo 01-02"
+  saveName: "Euro Demo 01-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03903:
-  name: "Euro Demo 01-03 (Germany)"
+  name: "Euro Demo 01-03"
+  saveName: "Euro Demo 01-03 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLES-00150:
-  name: "Euro Demo 02 (Europe)"
+  name: "Euro Demo 02"
+  saveName: "Euro Demo 02 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00583:
-  name: "Euro Demo 02 (Germany)"
+  name: "Euro Demo 02"
+  saveName: "Euro Demo 02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01845:
-  name: "Euro Demo 02-00 (Germany)"
+  name: "Euro Demo 02-00"
+  saveName: "Euro Demo 02-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02667:
-  name: "Euro Demo 02-01 (Germany)"
+  name: "Euro Demo 02-01"
+  saveName: "Euro Demo 02-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03477:
-  name: "Euro Demo 02-02 (Germany)"
+  name: "Euro Demo 02-02"
+  saveName: "Euro Demo 02-02 (Germany)"
   metadata:
     genre: "** DEMO **"
   codes:
     - SCED-03477
     - SCED-03809
 SLES-00181:
-  name: "Euro Demo 03 (Europe)"
+  name: "Euro Demo 03"
+  saveName: "Euro Demo 03 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00622:
-  name: "Euro Demo 03 (Germany)"
+  name: "Euro Demo 03"
+  saveName: "Euro Demo 03 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01846:
-  name: "Euro Demo 03-00 (Germany)"
+  name: "Euro Demo 03-00"
+  saveName: "Euro Demo 03-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02668:
-  name: "Euro Demo 03-01 (Germany)"
+  name: "Euro Demo 03-01"
+  saveName: "Euro Demo 03-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03478:
-  name: "Euro Demo 03-02 (Germany)"
+  name: "Euro Demo 03-02"
+  saveName: "Euro Demo 03-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03905:
-  name: "Euro Demo 03-04-2003 (Germany)"
+  name: "Euro Demo 03-04-2003"
+  saveName: "Euro Demo 03-04-2003 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCES-00182:
-  name: "Euro Demo 04 (Europe)"
+  name: "Euro Demo 04"
+  saveName: "Euro Demo 04 (Europe)"
   metadata:
     genre: "** DEMO **"
   codes:
     - SCES-00182
     - SLES-00182
 SCED-00669:
-  name: "Euro Demo 04 (Germany)"
+  name: "Euro Demo 04"
+  saveName: "Euro Demo 04 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01847:
-  name: "Euro Demo 04-00 (Germany)"
+  name: "Euro Demo 04-00"
+  saveName: "Euro Demo 04-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02669:
-  name: "Euro Demo 04-01 (Germany)"
+  name: "Euro Demo 04-01"
+  saveName: "Euro Demo 04-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03479:
-  name: "Euro Demo 04-02 (Germany)"
+  name: "Euro Demo 04-02"
+  saveName: "Euro Demo 04-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01995:
-  name: "Euro Demo 04-99 'Action Special' (Germany)"
+  name: "Euro Demo 04-99 'Action Special'"
+  saveName: "Euro Demo 04-99 'Action Special' (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01835:
-  name: "Euro Demo 04-99 (Germany)"
+  name: "Euro Demo 04-99"
+  saveName: "Euro Demo 04-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCES-00183:
-  name: "Euro Demo 05 (Europe)"
+  name: "Euro Demo 05"
+  saveName: "Euro Demo 05 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00670:
-  name: "Euro Demo 05 (Germany)"
+  name: "Euro Demo 05"
+  saveName: "Euro Demo 05 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01848:
-  name: "Euro Demo 05-00 (Germany)"
+  name: "Euro Demo 05-00"
+  saveName: "Euro Demo 05-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03468:
-  name: "Euro Demo 05-01 (Germany)"
+  name: "Euro Demo 05-01"
+  saveName: "Euro Demo 05-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03887:
-  name: "Euro Demo 05-02 (Germany)"
+  name: "Euro Demo 05-02"
+  saveName: "Euro Demo 05-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01836:
-  name: "Euro Demo 05-99 (Germany)"
+  name: "Euro Demo 05-99"
+  saveName: "Euro Demo 05-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCES-00184:
-  name: "Euro Demo 06 (Europe)"
+  name: "Euro Demo 06"
+  saveName: "Euro Demo 06 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00610:
-  name: "Euro Demo 06 (France)"
+  name: "Euro Demo 06"
+  saveName: "Euro Demo 06 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00671:
-  name: "Euro Demo 06 (Germany)"
+  name: "Euro Demo 06"
+  saveName: "Euro Demo 06 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02659:
-  name: "Euro Demo 06-00 (Germany)"
+  name: "Euro Demo 06-00"
+  saveName: "Euro Demo 06-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03469:
-  name: "Euro Demo 06-01 (Germany)"
+  name: "Euro Demo 06-01"
+  saveName: "Euro Demo 06-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03892:
-  name: "Euro Demo 06-02 (Germany)"
+  name: "Euro Demo 06-02"
+  saveName: "Euro Demo 06-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02050:
-  name: "Euro Demo 06-99 'Special' (Germany)"
+  name: "Euro Demo 06-99 'Special'"
+  saveName: "Euro Demo 06-99 'Special' (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01837:
-  name: "Euro Demo 06-99 (Germany)"
+  name: "Euro Demo 06-99"
+  saveName: "Euro Demo 06-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCES-00185:
-  name: "Euro Demo 07 (Europe)"
+  name: "Euro Demo 07"
+  saveName: "Euro Demo 07 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00668:
-  name: "Euro Demo 07 (France)"
+  name: "Euro Demo 07"
+  saveName: "Euro Demo 07 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00672:
-  name: "Euro Demo 07 (Germany)"
+  name: "Euro Demo 07"
+  saveName: "Euro Demo 07 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02660:
-  name: "Euro Demo 07-00 (Germany)"
+  name: "Euro Demo 07-00"
+  saveName: "Euro Demo 07-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03470:
-  name: "Euro Demo 07-01 (Germany)"
+  name: "Euro Demo 07-01"
+  saveName: "Euro Demo 07-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03893:
-  name: "Euro Demo 07-02 (Germany)"
+  name: "Euro Demo 07-02"
+  saveName: "Euro Demo 07-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01838:
-  name: "Euro Demo 07-99 (Germany)"
+  name: "Euro Demo 07-99"
+  saveName: "Euro Demo 07-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00360:
-  name: "Euro Demo 08 (Europe) (SCED-00360)"
+  name: "Euro Demo 08 (SCED-00360)"
+  saveName: "Euro Demo 08 (Europe) (SCED-00360)"
   metadata:
     genre: "** DEMO **"
 SCES-00186:
-  name: "Euro Demo 08 (Europe) (SCES-00186)"
+  name: "Euro Demo 08 (SCES-00186)"
+  saveName: "Euro Demo 08 (Europe) (SCES-00186)"
   metadata:
     genre: "** DEMO **"
 SCED-00673:
-  name: "Euro Demo 08 (Germany)"
+  name: "Euro Demo 08"
+  saveName: "Euro Demo 08 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02661:
-  name: "Euro Demo 08-00 (Germany)"
+  name: "Euro Demo 08-00"
+  saveName: "Euro Demo 08-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03471:
-  name: "Euro Demo 08-01 (Germany)"
+  name: "Euro Demo 08-01"
+  saveName: "Euro Demo 08-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03894:
-  name: "Euro Demo 08-02 (Germany)"
+  name: "Euro Demo 08-02"
+  saveName: "Euro Demo 08-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01839:
-  name: "Euro Demo 08-99 (Germany)"
+  name: "Euro Demo 08-99"
+  saveName: "Euro Demo 08-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00890:
-  name: "Euro Demo 08b (Germany)"
+  name: "Euro Demo 08b"
+  saveName: "Euro Demo 08b (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00361:
-  name: "Euro Demo 09 (Europe)"
+  name: "Euro Demo 09"
+  saveName: "Euro Demo 09 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00772:
-  name: "Euro Demo 09 (France)"
+  name: "Euro Demo 09"
+  saveName: "Euro Demo 09 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00674:
-  name: "Euro Demo 09 (Germany)"
+  name: "Euro Demo 09"
+  saveName: "Euro Demo 09 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02662:
-  name: "Euro Demo 09-00 (Germany)"
+  name: "Euro Demo 09-00"
+  saveName: "Euro Demo 09-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03472:
-  name: "Euro Demo 09-01 (Germany)"
+  name: "Euro Demo 09-01"
+  saveName: "Euro Demo 09-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03895:
-  name: "Euro Demo 09-02 (Germany)"
+  name: "Euro Demo 09-02"
+  saveName: "Euro Demo 09-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01840:
-  name: "Euro Demo 09-99 (Germany)"
+  name: "Euro Demo 09-99"
+  saveName: "Euro Demo 09-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00362:
-  name: "Euro Demo 10 (Europe)"
+  name: "Euro Demo 10"
+  saveName: "Euro Demo 10 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00773:
-  name: "Euro Demo 10 (France)"
+  name: "Euro Demo 10"
+  saveName: "Euro Demo 10 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00675:
-  name: "Euro Demo 10 (Germany)"
+  name: "Euro Demo 10"
+  saveName: "Euro Demo 10 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02663:
-  name: "Euro Demo 10-00 (Germany)"
+  name: "Euro Demo 10-00"
+  saveName: "Euro Demo 10-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03473:
-  name: "Euro Demo 10-01 (Germany)"
+  name: "Euro Demo 10-01"
+  saveName: "Euro Demo 10-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03896:
-  name: "Euro Demo 10-02 (Germany)"
+  name: "Euro Demo 10-02"
+  saveName: "Euro Demo 10-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01841:
-  name: "Euro Demo 10-99 (Germany)"
+  name: "Euro Demo 10-99"
+  saveName: "Euro Demo 10-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00363:
-  name: "Euro Demo 11 (Europe)"
+  name: "Euro Demo 11"
+  saveName: "Euro Demo 11 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00774:
-  name: "Euro Demo 11 (France)"
+  name: "Euro Demo 11"
+  saveName: "Euro Demo 11 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00676:
-  name: "Euro Demo 11 (Germany)"
+  name: "Euro Demo 11"
+  saveName: "Euro Demo 11 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02664:
-  name: "Euro Demo 11-00 (Germany)"
+  name: "Euro Demo 11-00"
+  saveName: "Euro Demo 11-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03474:
-  name: "Euro Demo 11-01 (Germany)"
+  name: "Euro Demo 11-01"
+  saveName: "Euro Demo 11-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03897:
-  name: "Euro Demo 11-02 (Germany)"
+  name: "Euro Demo 11-02"
+  saveName: "Euro Demo 11-02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01842:
-  name: "Euro Demo 11-99 (Germany)"
+  name: "Euro Demo 11-99"
+  saveName: "Euro Demo 11-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00364:
-  name: "Euro Demo 12 (Europe)"
+  name: "Euro Demo 12"
+  saveName: "Euro Demo 12 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00775:
-  name: "Euro Demo 12 (France)"
+  name: "Euro Demo 12"
+  saveName: "Euro Demo 12 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00677:
-  name: "Euro Demo 12 (Germany)"
+  name: "Euro Demo 12"
+  saveName: "Euro Demo 12 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-02665:
-  name: "Euro Demo 12-00 (Germany)"
+  name: "Euro Demo 12-00"
+  saveName: "Euro Demo 12-00 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-03475:
-  name: "Euro Demo 12-01 (Germany)"
+  name: "Euro Demo 12-01"
+  saveName: "Euro Demo 12-01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01843:
-  name: "Euro Demo 12-99 (Germany)"
+  name: "Euro Demo 12-99"
+  saveName: "Euro Demo 12-99 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00365:
-  name: "Euro Demo 13 (Europe)"
+  name: "Euro Demo 13"
+  saveName: "Euro Demo 13 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00776:
-  name: "Euro Demo 13 (France)"
+  name: "Euro Demo 13"
+  saveName: "Euro Demo 13 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00678:
-  name: "Euro Demo 13 (Germany)"
+  name: "Euro Demo 13"
+  saveName: "Euro Demo 13 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00366:
-  name: "Euro Demo 14 (Europe)"
+  name: "Euro Demo 14"
+  saveName: "Euro Demo 14 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00777:
-  name: "Euro Demo 14 (France)"
+  name: "Euro Demo 14"
+  saveName: "Euro Demo 14 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00679:
-  name: "Euro Demo 14 (Germany)"
+  name: "Euro Demo 14"
+  saveName: "Euro Demo 14 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00367:
-  name: "Euro Demo 15 (Europe)"
+  name: "Euro Demo 15"
+  saveName: "Euro Demo 15 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00778:
-  name: "Euro Demo 15 (France)"
+  name: "Euro Demo 15"
+  saveName: "Euro Demo 15 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00680:
-  name: "Euro Demo 15 (Germany)"
+  name: "Euro Demo 15"
+  saveName: "Euro Demo 15 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00368:
-  name: "Euro Demo 16 (Europe)"
+  name: "Euro Demo 16"
+  saveName: "Euro Demo 16 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00779:
-  name: "Euro Demo 16 (France)"
+  name: "Euro Demo 16"
+  saveName: "Euro Demo 16 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01121:
-  name: "Euro Demo 16 (Germany)"
+  name: "Euro Demo 16"
+  saveName: "Euro Demo 16 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00369:
-  name: "Euro Demo 17 (Europe)"
+  name: "Euro Demo 17"
+  saveName: "Euro Demo 17 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00780:
-  name: "Euro Demo 17 (France)"
+  name: "Euro Demo 17"
+  saveName: "Euro Demo 17 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01122:
-  name: "Euro Demo 17 (Germany)"
+  name: "Euro Demo 17"
+  saveName: "Euro Demo 17 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00370:
-  name: "Euro Demo 18 (Europe)"
+  name: "Euro Demo 18"
+  saveName: "Euro Demo 18 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00781:
-  name: "Euro Demo 18 (France)"
+  name: "Euro Demo 18"
+  saveName: "Euro Demo 18 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01123:
-  name: "Euro Demo 18 (Germany)"
+  name: "Euro Demo 18"
+  saveName: "Euro Demo 18 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00371:
-  name: "Euro Demo 19 (Europe)"
+  name: "Euro Demo 19"
+  saveName: "Euro Demo 19 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01124:
-  name: "Euro Demo 19 (Germany)"
+  name: "Euro Demo 19"
+  saveName: "Euro Demo 19 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00372:
-  name: "Euro Demo 20 (Europe)"
+  name: "Euro Demo 20"
+  saveName: "Euro Demo 20 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00782:
-  name: "Euro Demo 20 (France)"
+  name: "Euro Demo 20"
+  saveName: "Euro Demo 20 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01125:
-  name: "Euro Demo 20 (Germany)"
+  name: "Euro Demo 20"
+  saveName: "Euro Demo 20 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00817:
-  name: "Euro Demo 21 (Europe)"
+  name: "Euro Demo 21"
+  saveName: "Euro Demo 21 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01114:
-  name: "Euro Demo 21 (France)"
+  name: "Euro Demo 21"
+  saveName: "Euro Demo 21 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01126:
-  name: "Euro Demo 21 (Germany)"
+  name: "Euro Demo 21"
+  saveName: "Euro Demo 21 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00818:
-  name: "Euro Demo 22 (Europe)"
+  name: "Euro Demo 22"
+  saveName: "Euro Demo 22 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01115:
-  name: "Euro Demo 22 (France)"
+  name: "Euro Demo 22"
+  saveName: "Euro Demo 22 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01127:
-  name: "Euro Demo 22 (Germany)"
+  name: "Euro Demo 22"
+  saveName: "Euro Demo 22 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00819:
-  name: "Euro Demo 23 (Europe)"
+  name: "Euro Demo 23"
+  saveName: "Euro Demo 23 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01116:
-  name: "Euro Demo 23 (France)"
+  name: "Euro Demo 23"
+  saveName: "Euro Demo 23 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01128:
-  name: "Euro Demo 23 (Germany)"
+  name: "Euro Demo 23"
+  saveName: "Euro Demo 23 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00820:
-  name: "Euro Demo 24 (Europe)"
+  name: "Euro Demo 24"
+  saveName: "Euro Demo 24 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01117:
-  name: "Euro Demo 24 (France)"
+  name: "Euro Demo 24"
+  saveName: "Euro Demo 24 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01129:
-  name: "Euro Demo 24 (Germany)"
+  name: "Euro Demo 24"
+  saveName: "Euro Demo 24 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00821:
-  name: "Euro Demo 25 (Europe)"
+  name: "Euro Demo 25"
+  saveName: "Euro Demo 25 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01118:
-  name: "Euro Demo 25 (France)"
+  name: "Euro Demo 25"
+  saveName: "Euro Demo 25 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01130:
-  name: "Euro Demo 25 (Germany)"
+  name: "Euro Demo 25"
+  saveName: "Euro Demo 25 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00822:
-  name: "Euro Demo 26 (Europe)"
+  name: "Euro Demo 26"
+  saveName: "Euro Demo 26 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01119:
-  name: "Euro Demo 26 (France)"
+  name: "Euro Demo 26"
+  saveName: "Euro Demo 26 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00823:
-  name: "Euro Demo 27 (Europe)"
+  name: "Euro Demo 27"
+  saveName: "Euro Demo 27 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01120:
-  name: "Euro Demo 27 (France)"
+  name: "Euro Demo 27"
+  saveName: "Euro Demo 27 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01777:
-  name: "Euro Demo 27 (Germany)"
+  name: "Euro Demo 27"
+  saveName: "Euro Demo 27 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00824:
-  name: "Euro Demo 28 (Europe)"
+  name: "Euro Demo 28"
+  saveName: "Euro Demo 28 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01785:
-  name: "Euro Demo 28 (France)"
+  name: "Euro Demo 28"
+  saveName: "Euro Demo 28 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01786:
-  name: "Euro Demo 28 (Germany)"
+  name: "Euro Demo 28"
+  saveName: "Euro Demo 28 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00825:
-  name: "Euro Demo 29 (Europe)"
+  name: "Euro Demo 29"
+  saveName: "Euro Demo 29 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01849:
-  name: "Euro Demo 29 (France)"
+  name: "Euro Demo 29"
+  saveName: "Euro Demo 29 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01834:
-  name: "Euro Demo 29 (Germany)"
+  name: "Euro Demo 29"
+  saveName: "Euro Demo 29 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-00826:
-  name: "Euro Demo 30 (Europe)"
+  name: "Euro Demo 30"
+  saveName: "Euro Demo 30 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01850:
-  name: "Euro Demo 30 (France)"
+  name: "Euro Demo 30"
+  saveName: "Euro Demo 30 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00827:
-  name: "Euro Demo 31 (Europe)"
+  name: "Euro Demo 31"
+  saveName: "Euro Demo 31 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01851:
-  name: "Euro Demo 31 (France)"
+  name: "Euro Demo 31"
+  saveName: "Euro Demo 31 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00828:
-  name: "Euro Demo 32 (Europe)"
+  name: "Euro Demo 32"
+  saveName: "Euro Demo 32 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01852:
-  name: "Euro Demo 32 (France)"
+  name: "Euro Demo 32"
+  saveName: "Euro Demo 32 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-00829:
-  name: "Euro Demo 33 (Europe)"
+  name: "Euro Demo 33"
+  saveName: "Euro Demo 33 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01853:
-  name: "Euro Demo 33 (France)"
+  name: "Euro Demo 33"
+  saveName: "Euro Demo 33 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01144:
-  name: "Euro Demo 34 (Europe)"
+  name: "Euro Demo 34"
+  saveName: "Euro Demo 34 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01854:
-  name: "Euro Demo 34 (France)"
+  name: "Euro Demo 34"
+  saveName: "Euro Demo 34 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01145:
-  name: "Euro Demo 35 (Europe)"
+  name: "Euro Demo 35"
+  saveName: "Euro Demo 35 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01855:
-  name: "Euro Demo 35 (France)"
+  name: "Euro Demo 35"
+  saveName: "Euro Demo 35 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01856:
-  name: "Euro Demo 36 (France)"
+  name: "Euro Demo 36"
+  saveName: "Euro Demo 36 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01147:
-  name: "Euro Demo 37 (Europe)"
+  name: "Euro Demo 37"
+  saveName: "Euro Demo 37 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01857:
-  name: "Euro Demo 37 (France)"
+  name: "Euro Demo 37"
+  saveName: "Euro Demo 37 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01148:
-  name: "Euro Demo 38 (Europe)"
+  name: "Euro Demo 38"
+  saveName: "Euro Demo 38 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01858:
-  name: "Euro Demo 38 (France)"
+  name: "Euro Demo 38"
+  saveName: "Euro Demo 38 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01149:
-  name: "Euro Demo 39 (Europe)"
+  name: "Euro Demo 39"
+  saveName: "Euro Demo 39 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01859:
-  name: "Euro Demo 39 (France)"
+  name: "Euro Demo 39"
+  saveName: "Euro Demo 39 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01150:
-  name: "Euro Demo 40 (Europe)"
+  name: "Euro Demo 40"
+  saveName: "Euro Demo 40 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01860:
-  name: "Euro Demo 40 (France)"
+  name: "Euro Demo 40"
+  saveName: "Euro Demo 40 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01151:
-  name: "Euro Demo 41 (Europe)"
+  name: "Euro Demo 41"
+  saveName: "Euro Demo 41 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01861:
-  name: "Euro Demo 41 (France)"
+  name: "Euro Demo 41"
+  saveName: "Euro Demo 41 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01152:
-  name: "Euro Demo 42 (Europe)"
+  name: "Euro Demo 42"
+  saveName: "Euro Demo 42 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01862:
-  name: "Euro Demo 42 (France)"
+  name: "Euro Demo 42"
+  saveName: "Euro Demo 42 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01153:
-  name: "Euro Demo 43 (Europe)"
+  name: "Euro Demo 43"
+  saveName: "Euro Demo 43 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02647:
-  name: "Euro Demo 43 (France)"
+  name: "Euro Demo 43"
+  saveName: "Euro Demo 43 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01818:
-  name: "Euro Demo 44 (Europe)"
+  name: "Euro Demo 44"
+  saveName: "Euro Demo 44 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02648:
-  name: "Euro Demo 44 (France)"
+  name: "Euro Demo 44"
+  saveName: "Euro Demo 44 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01819:
-  name: "Euro Demo 45 (Europe)"
+  name: "Euro Demo 45"
+  saveName: "Euro Demo 45 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02649:
-  name: "Euro Demo 45 (France)"
+  name: "Euro Demo 45"
+  saveName: "Euro Demo 45 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01820:
-  name: "Euro Demo 46 (Europe)"
+  name: "Euro Demo 46"
+  saveName: "Euro Demo 46 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02650:
-  name: "Euro Demo 46 (France)"
+  name: "Euro Demo 46"
+  saveName: "Euro Demo 46 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01821:
-  name: "Euro Demo 47 (Europe)"
+  name: "Euro Demo 47"
+  saveName: "Euro Demo 47 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02651:
-  name: "Euro Demo 47 (France)"
+  name: "Euro Demo 47"
+  saveName: "Euro Demo 47 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01822:
-  name: "Euro Demo 48 (Europe)"
+  name: "Euro Demo 48"
+  saveName: "Euro Demo 48 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02652:
-  name: "Euro Demo 48 (France)"
+  name: "Euro Demo 48"
+  saveName: "Euro Demo 48 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01823:
-  name: "Euro Demo 49 (Europe)"
+  name: "Euro Demo 49"
+  saveName: "Euro Demo 49 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02653:
-  name: "Euro Demo 49 (France)"
+  name: "Euro Demo 49"
+  saveName: "Euro Demo 49 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-02229:
-  name: "Euro Demo 49 (Italy)"
+  name: "Euro Demo 49"
+  saveName: "Euro Demo 49 (Italy)"
   metadata:
     genre: "** DEMO **"
 SCED-02230:
-  name: "Euro Demo 49 (Spain)"
+  name: "Euro Demo 49"
+  saveName: "Euro Demo 49 (Spain)"
   metadata:
     genre: "** DEMO **"
 SCED-01824:
-  name: "Euro Demo 50 (Europe)"
+  name: "Euro Demo 50"
+  saveName: "Euro Demo 50 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02654:
-  name: "Euro Demo 50 (France)"
+  name: "Euro Demo 50"
+  saveName: "Euro Demo 50 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01825:
-  name: "Euro Demo 51 (Europe)"
+  name: "Euro Demo 51"
+  saveName: "Euro Demo 51 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02655:
-  name: "Euro Demo 51 (France)"
+  name: "Euro Demo 51"
+  saveName: "Euro Demo 51 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01826:
-  name: "Euro Demo 52 (Europe)"
+  name: "Euro Demo 52"
+  saveName: "Euro Demo 52 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02656:
-  name: "Euro Demo 52 (France)"
+  name: "Euro Demo 52"
+  saveName: "Euro Demo 52 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01827:
-  name: "Euro Demo 53 (Europe)"
+  name: "Euro Demo 53"
+  saveName: "Euro Demo 53 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02657:
-  name: "Euro Demo 53 (France)"
+  name: "Euro Demo 53"
+  saveName: "Euro Demo 53 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01828:
-  name: "Euro Demo 54 (Europe)"
+  name: "Euro Demo 54"
+  saveName: "Euro Demo 54 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01829:
-  name: "Euro Demo 55 (Europe)"
+  name: "Euro Demo 55"
+  saveName: "Euro Demo 55 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03461:
-  name: "Euro Demo 55 (France)"
+  name: "Euro Demo 55"
+  saveName: "Euro Demo 55 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-01830:
-  name: "Euro Demo 56 (Europe)"
+  name: "Euro Demo 56"
+  saveName: "Euro Demo 56 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01831:
-  name: "Euro Demo 57 (Europe)"
+  name: "Euro Demo 57"
+  saveName: "Euro Demo 57 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02632:
-  name: "Euro Demo 58 (Europe)"
+  name: "Euro Demo 58"
+  saveName: "Euro Demo 58 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02633:
-  name: "Euro Demo 59 (Europe)"
+  name: "Euro Demo 59"
+  saveName: "Euro Demo 59 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02634:
-  name: "Euro Demo 60 (Europe)"
+  name: "Euro Demo 60"
+  saveName: "Euro Demo 60 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02635:
-  name: "Euro Demo 61 (Europe)"
+  name: "Euro Demo 61"
+  saveName: "Euro Demo 61 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02636:
-  name: "Euro Demo 62 (Europe)"
+  name: "Euro Demo 62"
+  saveName: "Euro Demo 62 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02637:
-  name: "Euro Demo 63 (Europe)"
+  name: "Euro Demo 63"
+  saveName: "Euro Demo 63 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02638:
-  name: "Euro Demo 64 (Europe)"
+  name: "Euro Demo 64"
+  saveName: "Euro Demo 64 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02639:
-  name: "Euro Demo 65 (Europe)"
+  name: "Euro Demo 65"
+  saveName: "Euro Demo 65 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02640:
-  name: "Euro Demo 66 (Europe)"
+  name: "Euro Demo 66"
+  saveName: "Euro Demo 66 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02641:
-  name: "Euro Demo 67 (Europe)"
+  name: "Euro Demo 67"
+  saveName: "Euro Demo 67 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02642:
-  name: "Euro Demo 68 (Europe)"
+  name: "Euro Demo 68"
+  saveName: "Euro Demo 68 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02643:
-  name: "Euro Demo 69 (Europe)"
+  name: "Euro Demo 69"
+  saveName: "Euro Demo 69 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02644:
-  name: "Euro Demo 70 (Europe)"
+  name: "Euro Demo 70"
+  saveName: "Euro Demo 70 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02645:
-  name: "Euro Demo 71 (Europe)"
+  name: "Euro Demo 71"
+  saveName: "Euro Demo 71 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02646:
-  name: "Euro Demo 72 (Europe)"
+  name: "Euro Demo 72"
+  saveName: "Euro Demo 72 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03450:
-  name: "Euro Demo 73 (Europe)"
+  name: "Euro Demo 73"
+  saveName: "Euro Demo 73 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03451:
-  name: "Euro Demo 74 (Europe)"
+  name: "Euro Demo 74"
+  saveName: "Euro Demo 74 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03452:
-  name: "Euro Demo 75 (Europe, Australia)"
+  name: "Euro Demo 75"
+  saveName: "Euro Demo 75 (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCED-03453:
-  name: "Euro Demo 76 (Europe)"
+  name: "Euro Demo 76"
+  saveName: "Euro Demo 76 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03454:
-  name: "Euro Demo 77 (Europe)"
+  name: "Euro Demo 77"
+  saveName: "Euro Demo 77 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03455:
-  name: "Euro Demo 78 (Europe)"
+  name: "Euro Demo 78"
+  saveName: "Euro Demo 78 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03456:
-  name: "Euro Demo 79 (Europe)"
+  name: "Euro Demo 79"
+  saveName: "Euro Demo 79 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03457:
-  name: "Euro Demo 80 (Europe)"
+  name: "Euro Demo 80"
+  saveName: "Euro Demo 80 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03458:
-  name: "Euro Demo 81 (Europe)"
+  name: "Euro Demo 81"
+  saveName: "Euro Demo 81 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03785:
-  name: "Euro Demo 82 (Europe)"
+  name: "Euro Demo 82"
+  saveName: "Euro Demo 82 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03786:
-  name: "Euro Demo 83 (Europe)"
+  name: "Euro Demo 83"
+  saveName: "Euro Demo 83 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03787:
-  name: "Euro Demo 84 (Europe)"
+  name: "Euro Demo 84"
+  saveName: "Euro Demo 84 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03788:
-  name: "Euro Demo 85 (Europe)"
+  name: "Euro Demo 85"
+  saveName: "Euro Demo 85 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03789:
-  name: "Euro Demo 86 (Europe)"
+  name: "Euro Demo 86"
+  saveName: "Euro Demo 86 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03790:
-  name: "Euro Demo 87 (Europe)"
+  name: "Euro Demo 87"
+  saveName: "Euro Demo 87 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03791:
-  name: "Euro Demo 88 (Europe)"
+  name: "Euro Demo 88"
+  saveName: "Euro Demo 88 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03792:
-  name: "Euro Demo 89 (Europe)"
+  name: "Euro Demo 89"
+  saveName: "Euro Demo 89 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03793:
-  name: "Euro Demo 90 (Europe)"
+  name: "Euro Demo 90"
+  saveName: "Euro Demo 90 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03794:
-  name: "Euro Demo 91 (Europe)"
+  name: "Euro Demo 91"
+  saveName: "Euro Demo 91 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-04016:
-  name: "Euro Demo 92 (Europe)"
+  name: "Euro Demo 92"
+  saveName: "Euro Demo 92 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00994:
-  name: "Euro Demo Classics Special (Germany)"
+  name: "Euro Demo Classics Special"
+  saveName: "Euro Demo Classics Special (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-04035:
-  name: "Euro Demo Future 93 (Europe)"
+  name: "Euro Demo Future 93"
+  saveName: "Euro Demo Future 93 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-03415:
-  name: "Europe Racer (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Europe Racer"
+  saveName: "Europe Racer (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -51532,7 +54300,8 @@ SLES-03415:
     multitap: false
     linkCable: false
 SLES-03082:
-  name: "European Super League (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "European Super League"
+  saveName: "European Super League (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -51556,7 +54325,8 @@ SLES-03082:
     multitap: true
     linkCable: false
 SLPM-86826:
-  name: "Eve - The Fatal Attraction (Japan) (Disc 1)"
+  name: "Eve - The Fatal Attraction (Disc 1)"
+  saveName: "Eve - The Fatal Attraction (Japan) (Disc 1)"
   discSet:
     name: "Eve - The Fatal Attraction (Japan)"
     serials:
@@ -51581,7 +54351,8 @@ SLPM-86826:
     multitap: false
     linkCable: false
 SLPM-86821:
-  name: "Eve - The Fatal Attraction (Japan) (Disc 1) (Premium Box)"
+  name: "Eve - The Fatal Attraction (Disc 1) (Premium Box)"
+  saveName: "Eve - The Fatal Attraction (Japan) (Disc 1) (Premium Box)"
   discSet:
     name: "Eve - The Fatal Attraction (Japan) (Premium Box)"
     serials:
@@ -51606,7 +54377,8 @@ SLPM-86821:
     multitap: false
     linkCable: false
 SLPM-86827:
-  name: "Eve - The Fatal Attraction (Japan) (Disc 2)"
+  name: "Eve - The Fatal Attraction (Disc 2)"
+  saveName: "Eve - The Fatal Attraction (Japan) (Disc 2)"
   discSet:
     name: "Eve - The Fatal Attraction (Japan)"
     serials:
@@ -51631,7 +54403,8 @@ SLPM-86827:
     multitap: false
     linkCable: false
 SLPM-86822:
-  name: "Eve - The Fatal Attraction (Japan) (Disc 2) (Premium Box)"
+  name: "Eve - The Fatal Attraction (Disc 2) (Premium Box)"
+  saveName: "Eve - The Fatal Attraction (Japan) (Disc 2) (Premium Box)"
   discSet:
     name: "Eve - The Fatal Attraction (Japan) (Premium Box)"
     serials:
@@ -51656,7 +54429,8 @@ SLPM-86822:
     multitap: false
     linkCable: false
 SLPM-86828:
-  name: "Eve - The Fatal Attraction (Japan) (Disc 3)"
+  name: "Eve - The Fatal Attraction (Disc 3)"
+  saveName: "Eve - The Fatal Attraction (Japan) (Disc 3)"
   discSet:
     name: "Eve - The Fatal Attraction (Japan)"
     serials:
@@ -51681,7 +54455,8 @@ SLPM-86828:
     multitap: false
     linkCable: false
 SLPM-86823:
-  name: "Eve - The Fatal Attraction (Japan) (Disc 3) (Premium Box)"
+  name: "Eve - The Fatal Attraction (Disc 3) (Premium Box)"
+  saveName: "Eve - The Fatal Attraction (Japan) (Disc 3) (Premium Box)"
   discSet:
     name: "Eve - The Fatal Attraction (Japan) (Premium Box)"
     serials:
@@ -51729,7 +54504,8 @@ SLPM-87221:
     multitap: false
     linkCable: false
 SLPS-01805:
-  name: "Eve - The Lost One (Japan) (Disc 1) (Kyoko Disc)"
+  name: "Eve - The Lost One (Disc 1) (Kyoko Disc)"
+  saveName: "Eve - The Lost One (Japan) (Disc 1) (Kyoko Disc)"
   discSet:
     name: "Eve - The Lost One (Japan)"
     serials:
@@ -51754,7 +54530,8 @@ SLPS-01805:
     multitap: false
     linkCable: false
 SLPM-87246:
-  name: "Eve - The Lost One (Japan) (Disc 1) (Kyoko Disc) (GameVillage The Best)"
+  name: "Eve - The Lost One (Disc 1) (Kyoko Disc) (GameVillage The Best)"
+  saveName: "Eve - The Lost One (Japan) (Disc 1) (Kyoko Disc) (GameVillage The Best)"
   discSet:
     name: "Eve - The Lost One (Japan) (GameVillage The Best)"
     serials:
@@ -51778,7 +54555,8 @@ SLPM-87246:
     multitap: false
     linkCable: false
 SLPS-01806:
-  name: "Eve - The Lost One (Japan) (Disc 2) (Snake Disc)"
+  name: "Eve - The Lost One (Disc 2) (Snake Disc)"
+  saveName: "Eve - The Lost One (Japan) (Disc 2) (Snake Disc)"
   discSet:
     name: "Eve - The Lost One (Japan)"
     serials:
@@ -51803,7 +54581,8 @@ SLPS-01806:
     multitap: false
     linkCable: false
 SLPM-87247:
-  name: "Eve - The Lost One (Japan) (Disc 2) (Snake Disc) (GameVillage The Best)"
+  name: "Eve - The Lost One (Disc 2) (Snake Disc) (GameVillage The Best)"
+  saveName: "Eve - The Lost One (Japan) (Disc 2) (Snake Disc) (GameVillage The Best)"
   discSet:
     name: "Eve - The Lost One (Japan) (GameVillage The Best)"
     serials:
@@ -51827,7 +54606,8 @@ SLPM-87247:
     multitap: false
     linkCable: false
 SLPS-01807:
-  name: "Eve - The Lost One (Japan) (Disc 3) (Lost One Disc)"
+  name: "Eve - The Lost One (Disc 3) (Lost One Disc)"
+  saveName: "Eve - The Lost One (Japan) (Disc 3) (Lost One Disc)"
   discSet:
     name: "Eve - The Lost One (Japan)"
     serials:
@@ -51852,7 +54632,8 @@ SLPS-01807:
     multitap: false
     linkCable: false
 SLPM-87248:
-  name: "Eve - The Lost One (Japan) (Disc 3) (Lost One Disc) (GameVillage The Best)"
+  name: "Eve - The Lost One (Disc 3) (Lost One Disc) (GameVillage The Best)"
+  saveName: "Eve - The Lost One (Japan) (Disc 3) (Lost One Disc) (GameVillage The Best)"
   discSet:
     name: "Eve - The Lost One (Japan) (GameVillage The Best)"
     serials:
@@ -51876,7 +54657,8 @@ SLPM-87248:
     multitap: false
     linkCable: false
 SLPS-01808:
-  name: "Eve - The Lost One (Japan) (Disc 4) (Premium Disc)"
+  name: "Eve - The Lost One (Disc 4) (Premium Disc)"
+  saveName: "Eve - The Lost One (Japan) (Disc 4) (Premium Disc)"
   discSet:
     name: "Eve - The Lost One (Japan)"
     serials:
@@ -51901,7 +54683,8 @@ SLPS-01808:
     multitap: false
     linkCable: false
 SLPM-86478:
-  name: "Eve Zero (Japan) (Disc 1)"
+  name: "Eve Zero (Disc 1)"
+  saveName: "Eve Zero (Japan) (Disc 1)"
   discSet:
     name: "Eve Zero (Japan)"
     serials:
@@ -51926,7 +54709,8 @@ SLPM-86478:
     multitap: false
     linkCable: false
 SLPM-86475:
-  name: "Eve Zero (Japan) (Disc 1) (Premium Box)"
+  name: "Eve Zero (Disc 1) (Premium Box)"
+  saveName: "Eve Zero (Japan) (Disc 1) (Premium Box)"
   discSet:
     name: "Eve Zero (Japan) (Premium Box)"
     serials:
@@ -51954,7 +54738,8 @@ SLPM-86475:
     multitap: false
     linkCable: false
 SLPM-86479:
-  name: "Eve Zero (Japan) (Disc 2)"
+  name: "Eve Zero (Disc 2)"
+  saveName: "Eve Zero (Japan) (Disc 2)"
   discSet:
     name: "Eve Zero (Japan)"
     serials:
@@ -51979,7 +54764,8 @@ SLPM-86479:
     multitap: false
     linkCable: false
 SLPM-86476:
-  name: "Eve Zero (Japan) (Disc 2) (Premium Box)"
+  name: "Eve Zero (Disc 2) (Premium Box)"
+  saveName: "Eve Zero (Japan) (Disc 2) (Premium Box)"
   discSet:
     name: "Eve Zero (Japan) (Premium Box)"
     serials:
@@ -52007,7 +54793,8 @@ SLPM-86476:
     multitap: false
     linkCable: false
 SLPM-86480:
-  name: "Eve Zero (Japan) (Disc 3)"
+  name: "Eve Zero (Disc 3)"
+  saveName: "Eve Zero (Japan) (Disc 3)"
   discSet:
     name: "Eve Zero (Japan)"
     serials:
@@ -52032,7 +54819,8 @@ SLPM-86480:
     multitap: false
     linkCable: false
 SLPM-86477:
-  name: "Eve Zero (Japan) (Disc 3) (Premium Box)"
+  name: "Eve Zero (Disc 3) (Premium Box)"
+  saveName: "Eve Zero (Japan) (Disc 3) (Premium Box)"
   discSet:
     name: "Eve Zero (Japan) (Premium Box)"
     serials:
@@ -52060,7 +54848,8 @@ SLPM-86477:
     multitap: false
     linkCable: false
 SLPS-03278:
-  name: "Evergreen Avenue (Japan)"
+  name: "Evergreen Avenue"
+  saveName: "Evergreen Avenue (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52079,7 +54868,8 @@ SLPS-03278:
     multitap: false
     linkCable: false
 LSP-99019101:
-  name: "Every Child Can Succeed 1 (USA)"
+  name: "Every Child Can Succeed 1"
+  saveName: "Every Child Can Succeed 1 (USA)"
   codes:
     - LSP99019101
   metadata:
@@ -52089,7 +54879,8 @@ LSP-99019101:
     languages:
       - English
 LSP-99019201:
-  name: "Every Child Can Succeed 2 (USA)"
+  name: "Every Child Can Succeed 2"
+  saveName: "Every Child Can Succeed 2 (USA)"
   codes:
     - LSP99019201
   metadata:
@@ -52099,7 +54890,8 @@ LSP-99019201:
     languages:
       - English
 LSP-99019301:
-  name: "Every Child Can Succeed 3 (USA)"
+  name: "Every Child Can Succeed 3"
+  saveName: "Every Child Can Succeed 3 (USA)"
   codes:
     - LSP99019301
   metadata:
@@ -52109,7 +54901,8 @@ LSP-99019301:
     languages:
       - English
 LSP-99019401:
-  name: "Every Child Can Succeed 4 (USA)"
+  name: "Every Child Can Succeed 4"
+  saveName: "Every Child Can Succeed 4 (USA)"
   codes:
     - LSP99019401
   metadata:
@@ -52119,7 +54912,8 @@ LSP-99019401:
     languages:
       - English
 LSP-99019501:
-  name: "Every Child Can Succeed 5 (USA)"
+  name: "Every Child Can Succeed 5"
+  saveName: "Every Child Can Succeed 5 (USA)"
   codes:
     - LSP99019501
   metadata:
@@ -52129,7 +54923,8 @@ LSP-99019501:
     languages:
       - English
 LSP-99019601:
-  name: "Every Child Can Succeed 6 (USA)"
+  name: "Every Child Can Succeed 6"
+  saveName: "Every Child Can Succeed 6 (USA)"
   codes:
     - LSP99019601
   metadata:
@@ -52139,7 +54934,8 @@ LSP-99019601:
     languages:
       - English
 LSP-99019701:
-  name: "Every Child Can Succeed 7 (USA)"
+  name: "Every Child Can Succeed 7"
+  saveName: "Every Child Can Succeed 7 (USA)"
   codes:
     - LSP99019701
   metadata:
@@ -52149,7 +54945,8 @@ LSP-99019701:
     languages:
       - English
 SCES-00983:
-  name: "Everybody's Golf (Europe) (En,Fr,De,Es,It)"
+  name: "Everybody's Golf"
+  saveName: "Everybody's Golf (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -52171,7 +54968,8 @@ SCES-00983:
     multitap: true
     linkCable: false
 SCES-02146:
-  name: "Everybody's Golf 2 (Europe)"
+  name: "Everybody's Golf 2"
+  saveName: "Everybody's Golf 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52190,7 +54988,8 @@ SCES-02146:
     multitap: true
     linkCable: false
 SLES-03428:
-  name: "Evil Dead - Hail to the King (Europe) (Disc 1)"
+  name: "Evil Dead - Hail to the King (Disc 1)"
+  saveName: "Evil Dead - Hail to the King (Europe) (Disc 1)"
   discSet:
     name: "Evil Dead - Hail to the King (Europe)"
     serials:
@@ -52214,7 +55013,8 @@ SLES-03428:
     multitap: false
     linkCable: false
 SLES-13428:
-  name: "Evil Dead - Hail to the King (Europe) (Disc 2)"
+  name: "Evil Dead - Hail to the King (Disc 2)"
+  saveName: "Evil Dead - Hail to the King (Europe) (Disc 2)"
   discSet:
     name: "Evil Dead - Hail to the King (Europe)"
     serials:
@@ -52238,7 +55038,8 @@ SLES-13428:
     multitap: false
     linkCable: false
 SLUS-01072:
-  name: "Evil Dead - Hail to the King (USA) (Disc 1)"
+  name: "Evil Dead - Hail to the King (Disc 1)"
+  saveName: "Evil Dead - Hail to the King (USA) (Disc 1)"
   discSet:
     name: "Evil Dead - Hail to the King (USA)"
     serials:
@@ -52265,7 +55066,8 @@ SLUS-01072:
     multitap: false
     linkCable: false
 SLUS-01326:
-  name: "Evil Dead - Hail to the King (USA) (Disc 2)"
+  name: "Evil Dead - Hail to the King (Disc 2)"
+  saveName: "Evil Dead - Hail to the King (USA) (Disc 2)"
   discSet:
     name: "Evil Dead - Hail to the King (USA)"
     serials:
@@ -52289,7 +55091,8 @@ SLUS-01326:
     multitap: false
     linkCable: false
 SLES-01903:
-  name: "Evil Zone (Europe)"
+  name: "Evil Zone"
+  saveName: "Evil Zone (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -52307,7 +55110,8 @@ SLES-01903:
     multitap: false
     linkCable: false
 SLUS-00855:
-  name: "Evil Zone (USA)"
+  name: "Evil Zone"
+  saveName: "Evil Zone (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -52325,7 +55129,8 @@ SLUS-00855:
     multitap: false
     linkCable: false
 SLES-01871:
-  name: "Evo's Space Adventures (Europe) (En,Fr,De,Es,It)"
+  name: "Evo's Space Adventures"
+  saveName: "Evo's Space Adventures (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52348,7 +55153,8 @@ SLES-01871:
     multitap: false
     linkCable: false
 SLPS-01117:
-  name: "Exalegiuse (Japan)"
+  name: "Exalegiuse"
+  saveName: "Exalegiuse (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -52366,11 +55172,13 @@ SLPS-01117:
     multitap: false
     linkCable: false
 SLED-00797:
-  name: "Excalibur 2555 A.D. (Europe) (Demo)"
+  name: "Excalibur 2555 A.D. (Demo)"
+  saveName: "Excalibur 2555 A.D. (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00478:
-  name: "Excalibur 2555 A.D. (Europe) (En,Fr,De,Es)"
+  name: "Excalibur 2555 A.D."
+  saveName: "Excalibur 2555 A.D. (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -52391,7 +55199,8 @@ SLES-00478:
     multitap: false
     linkCable: false
 SLES-00693:
-  name: "Excalibur 2555 A.D. (Italy)"
+  name: "Excalibur 2555 A.D."
+  saveName: "Excalibur 2555 A.D. (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -52409,7 +55218,8 @@ SLES-00693:
     multitap: false
     linkCable: false
 SLUS-00541:
-  name: "Excalibur 2555 A.D. (USA)"
+  name: "Excalibur 2555 A.D."
+  saveName: "Excalibur 2555 A.D. (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -52427,7 +55237,8 @@ SLUS-00541:
     multitap: false
     linkCable: false
 SLPM-86124:
-  name: "Exciting Bass (Japan)"
+  name: "Exciting Bass"
+  saveName: "Exciting Bass (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52446,7 +55257,8 @@ SLPM-86124:
     multitap: false
     linkCable: false
 SLPM-86295:
-  name: "Exciting Bass 2 (Japan)"
+  name: "Exciting Bass 2"
+  saveName: "Exciting Bass 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52465,7 +55277,8 @@ SLPM-86295:
     multitap: false
     linkCable: false
 SLPM-86729:
-  name: "Exciting Bass 3 (Japan)"
+  name: "Exciting Bass 3"
+  saveName: "Exciting Bass 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52503,7 +55316,8 @@ SLPM-86949:
     multitap: false
     linkCable: false
 SLPS-02885:
-  name: "Exciting Pro Wres (Japan)"
+  name: "Exciting Pro Wres"
+  saveName: "Exciting Pro Wres (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52522,7 +55336,8 @@ SLPS-02885:
     multitap: true
     linkCable: false
 SLPS-03122:
-  name: "Exciting Pro Wres 2 (Japan)"
+  name: "Exciting Pro Wres 2"
+  saveName: "Exciting Pro Wres 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52544,15 +55359,18 @@ SLPS-03122:
     multitap: true
     linkCable: false
 SLPM-80601:
-  name: "Exciting Pro Wres 2 (Japan) (Demo)"
+  name: "Exciting Pro Wres 2 (Demo)"
+  saveName: "Exciting Pro Wres 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-02043:
-  name: "Exclusive PlayStation Racing Demos (Europe)"
+  name: "Exclusive PlayStation Racing Demos"
+  saveName: "Exclusive PlayStation Racing Demos (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-00091:
-  name: "Exector (Japan)"
+  name: "Exector"
+  saveName: "Exector (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -52570,7 +55388,8 @@ SLPS-00091:
     multitap: false
     linkCable: false
 SLES-00097:
-  name: "Exhumed (Europe) (En,Fr,De,Es)"
+  name: "Exhumed"
+  saveName: "Exhumed (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -52591,7 +55410,8 @@ SLES-00097:
     multitap: false
     linkCable: false
 SLPS-01707:
-  name: "Exodus Guilty (Japan)"
+  name: "Exodus Guilty"
+  saveName: "Exodus Guilty (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -52612,7 +55432,8 @@ SLPS-01707:
     multitap: false
     linkCable: false
 SLUS-01075:
-  name: "Expendable (USA)"
+  name: "Expendable"
+  saveName: "Expendable (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52631,9 +55452,11 @@ SLUS-01075:
     multitap: false
     linkCable: false
 SCED-03923:
-  name: "Experience the Magic of Disney on PlayStation (Europe)"
+  name: "Experience the Magic of Disney on PlayStation"
+  saveName: "Experience the Magic of Disney on PlayStation (Europe)"
 SLPS-00342:
-  name: "Expert (Japan)"
+  name: "Expert"
+  saveName: "Expert (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -52651,7 +55474,8 @@ SLPS-00342:
     multitap: false
     linkCable: false
 SLES-00716:
-  name: "Explosive Racing (Europe)"
+  name: "Explosive Racing"
+  saveName: "Explosive Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52671,11 +55495,13 @@ SLES-00716:
     multitap: false
     linkCable: true
 SLED-00956:
-  name: "Explosive Racing (France) (Demo)"
+  name: "Explosive Racing (Demo)"
+  saveName: "Explosive Racing (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00625:
-  name: "Extra Bright (Japan)"
+  name: "Extra Bright"
+  saveName: "Extra Bright (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -52693,7 +55519,8 @@ SLPS-00625:
     multitap: false
     linkCable: false
 SLES-02220:
-  name: "Extreme 500 (Europe) (En,De)"
+  name: "Extreme 500"
+  saveName: "Extreme 500 (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52714,7 +55541,8 @@ SLES-02220:
     multitap: false
     linkCable: false
 SLES-03990:
-  name: "Extreme Ghostbusters - The Ultimate Invasion (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Extreme Ghostbusters - The Ultimate Invasion"
+  saveName: "Extreme Ghostbusters - The Ultimate Invasion (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52739,7 +55567,8 @@ SLES-03990:
     multitap: false
     linkCable: false
 SLUS-01530:
-  name: "Extreme Go-Kart Racing (USA)"
+  name: "Extreme Go-Kart Racing"
+  saveName: "Extreme Go-Kart Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52759,7 +55588,8 @@ SLUS-01530:
     multitap: false
     linkCable: false
 SLES-00206:
-  name: "Extreme Pinball (Europe)"
+  name: "Extreme Pinball"
+  saveName: "Extreme Pinball (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -52777,7 +55607,8 @@ SLES-00206:
     multitap: false
     linkCable: false
 SLUS-00200:
-  name: "Extreme Pinball (USA)"
+  name: "Extreme Pinball"
+  saveName: "Extreme Pinball (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -52795,7 +55626,8 @@ SLUS-00200:
     multitap: false
     linkCable: false
 SLPS-00329:
-  name: "Extreme Power (Japan)"
+  name: "Extreme Power"
+  saveName: "Extreme Power (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -52813,7 +55645,8 @@ SLPS-00329:
     multitap: false
     linkCable: false
 SLES-00501:
-  name: "Extreme Snow Break (Europe)"
+  name: "Extreme Snow Break"
+  saveName: "Extreme Snow Break (Europe)"
   controllers:
     - DigitalController
   settings:
@@ -52834,28 +55667,32 @@ SLES-00501:
     multitap: false
     linkCable: false
 SLED-01193:
-  name: "Extreme Snow Break (Europe) (Demo)"
+  name: "Extreme Snow Break (Demo)"
+  saveName: "Extreme Snow Break (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 10 # Very sensitive to DMA timing, otherwise polygon flicker.
     dmaHaltTicks: 100 # CPU needs to run significantly faster than DMA.
 PCPX-96178:
-  name: "e-Jump (Japan) (Disc 1)"
+  name: "e-Jump (Disc 1)"
+  saveName: "e-Jump (Japan) (Disc 1)"
   discSet:
     name: "e-Jump (Japan)"
     serials:
       - PCPX-96178
       - PCPX-96179
 PCPX-96179:
-  name: "e-Jump (Japan) (Disc 2)"
+  name: "e-Jump (Disc 2)"
+  saveName: "e-Jump (Japan) (Disc 2)"
   discSet:
     name: "e-Jump (Japan)"
     serials:
       - PCPX-96178
       - PCPX-96179
 SLPS-00677:
-  name: "F-1 Grand Prix 1996 - Team Un'ei Simulation (Japan)"
+  name: "F-1 Grand Prix 1996 - Team Un'ei Simulation"
+  saveName: "F-1 Grand Prix 1996 - Team Un'ei Simulation (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -52873,7 +55710,8 @@ SLPS-00677:
     multitap: false
     linkCable: false
 SLES-00416:
-  name: "F.A. Manager (Europe)"
+  name: "F.A. Manager"
+  saveName: "F.A. Manager (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -52891,7 +55729,8 @@ SLES-00416:
     multitap: false
     linkCable: false
 SLES-02254:
-  name: "F.A. Premier League Football Manager 2000, The (Europe)"
+  name: "F.A. Premier League Football Manager 2000, The"
+  saveName: "F.A. Premier League Football Manager 2000, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52910,7 +55749,8 @@ SLES-02254:
     multitap: false
     linkCable: false
 SLES-03061:
-  name: "F.A. Premier League Football Manager 2001, The (Europe)"
+  name: "F.A. Premier League Football Manager 2001, The"
+  saveName: "F.A. Premier League Football Manager 2001, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52930,7 +55770,8 @@ SLES-03061:
     multitap: false
     linkCable: false
 SLES-03063:
-  name: "F.A. Premier League Stars 2001, The (Europe)"
+  name: "F.A. Premier League Stars 2001, The"
+  saveName: "F.A. Premier League Stars 2001, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52949,7 +55790,8 @@ SLES-03063:
     multitap: true
     linkCable: false
 SLES-02142:
-  name: "F.A. Premier League Stars, The (Europe)"
+  name: "F.A. Premier League Stars, The"
+  saveName: "F.A. Premier League Stars, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52968,7 +55810,8 @@ SLES-02142:
     multitap: true
     linkCable: false
 SLES-02723:
-  name: "F1 2000 (Europe) (En,Es,Sv,Da,Fi)"
+  name: "F1 2000"
+  saveName: "F1 2000 (Europe) (En,Es,Sv,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -52993,7 +55836,8 @@ SLES-02723:
     multitap: false
     linkCable: false
 SLES-02722:
-  name: "F1 2000 (Europe) (En,Fr,De,Nl)"
+  name: "F1 2000"
+  saveName: "F1 2000 (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53017,7 +55861,8 @@ SLES-02722:
     multitap: false
     linkCable: false
 SLES-02724:
-  name: "F1 2000 (Italy)"
+  name: "F1 2000"
+  saveName: "F1 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53038,7 +55883,8 @@ SLES-02724:
     multitap: false
     linkCable: false
 SLPS-02758:
-  name: "F1 2000 (Japan)"
+  name: "F1 2000"
+  saveName: "F1 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53058,7 +55904,8 @@ SLPS-02758:
     multitap: false
     linkCable: false
 SLUS-01120:
-  name: "F1 2000 (USA) (En,Fr,Es)"
+  name: "F1 2000"
+  saveName: "F1 2000 (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53078,7 +55925,8 @@ SLUS-01120:
     multitap: false
     linkCable: false
 SLES-03119:
-  name: "F1 Championship Season 2000 (Europe) (En,Es,Sv,Fi)"
+  name: "F1 Championship Season 2000"
+  saveName: "F1 Championship Season 2000 (Europe) (En,Es,Sv,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53101,7 +55949,8 @@ SLES-03119:
     multitap: false
     linkCable: false
 SLES-03117:
-  name: "F1 Championship Season 2000 (Europe) (En,Fr,De,Nl)"
+  name: "F1 Championship Season 2000"
+  saveName: "F1 Championship Season 2000 (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53123,7 +55972,8 @@ SLES-03117:
     multitap: false
     linkCable: false
 SLES-03118:
-  name: "F1 Championship Season 2000 (Italy)"
+  name: "F1 Championship Season 2000"
+  saveName: "F1 Championship Season 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53144,7 +55994,8 @@ SLES-03118:
     multitap: false
     linkCable: false
 SLUS-01290:
-  name: "F1 Championship Season 2000 (USA)"
+  name: "F1 Championship Season 2000"
+  saveName: "F1 Championship Season 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53164,7 +56015,8 @@ SLUS-01290:
     multitap: false
     linkCable: false
 SLPS-00519:
-  name: "F1 GP Nippon no Chousen - Dome no Yabou (Japan)"
+  name: "F1 GP Nippon no Chousen - Dome no Yabou"
+  saveName: "F1 GP Nippon no Chousen - Dome no Yabou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -53182,7 +56034,8 @@ SLPS-00519:
     multitap: false
     linkCable: false
 SLES-02501:
-  name: "F1 Racing Championship (Europe) (En,Fr,De,Es,It)"
+  name: "F1 Racing Championship"
+  saveName: "F1 Racing Championship (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53206,7 +56059,8 @@ SLES-02501:
     multitap: false
     linkCable: false
 SLUS-01088:
-  name: "F1 Racing Championship (USA) (En,Fr)"
+  name: "F1 Racing Championship"
+  saveName: "F1 Racing Championship (USA) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53226,7 +56080,8 @@ SLUS-01088:
     multitap: false
     linkCable: false
 SLES-03102:
-  name: "F1 World Grand Prix (Europe)"
+  name: "F1 World Grand Prix"
+  saveName: "F1 World Grand Prix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53246,7 +56101,8 @@ SLES-03102:
     multitap: false
     linkCable: false
 SLES-03346:
-  name: "F1 World Grand Prix (Germany)"
+  name: "F1 World Grand Prix"
+  saveName: "F1 World Grand Prix (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53266,9 +56122,11 @@ SLES-03346:
     multitap: false
     linkCable: false
 SLES-03347:
-  name: "F1 World Grand Prix (Italy)"
+  name: "F1 World Grand Prix"
+  saveName: "F1 World Grand Prix (Italy)"
 SLUS-01344:
-  name: "F1 World Grand Prix (USA)"
+  name: "F1 World Grand Prix"
+  saveName: "F1 World Grand Prix (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53288,7 +56146,8 @@ SLUS-01344:
     multitap: false
     linkCable: false
 SLES-00887:
-  name: "F1 World Grand Prix - 1999 Season (Europe) (En,Fr,De,Es,It)"
+  name: "F1 World Grand Prix - 1999 Season"
+  saveName: "F1 World Grand Prix - 1999 Season (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53312,7 +56171,8 @@ SLES-00887:
     multitap: false
     linkCable: false
 SLUS-01036:
-  name: "F1 World Grand Prix - 1999 Season (USA) (En,Fr,De,Es,It)"
+  name: "F1 World Grand Prix - 1999 Season"
+  saveName: "F1 World Grand Prix - 1999 Season (USA) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53332,7 +56192,8 @@ SLUS-01036:
     multitap: false
     linkCable: false
 SLES-03345:
-  name: "F1 World Grand Prix - Saison 2000 (France)"
+  name: "F1 World Grand Prix - Saison 2000"
+  saveName: "F1 World Grand Prix - Saison 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53352,7 +56213,8 @@ SLES-03345:
     multitap: false
     linkCable: false
 SLPS-00723:
-  name: "FEDA 2 - White Surge the Platoon (Japan)"
+  name: "FEDA 2 - White Surge the Platoon"
+  saveName: "FEDA 2 - White Surge the Platoon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -53370,7 +56232,8 @@ SLPS-00723:
     multitap: false
     linkCable: false
 SLES-00916:
-  name: "FIFA - Die WM-Qualifikation 98 (Germany) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA - Die WM-Qualifikation 98"
+  saveName: "FIFA - Die WM-Qualifikation 98 (Germany) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53388,7 +56251,8 @@ SLES-00916:
     multitap: true
     linkCable: false
 SLES-00915:
-  name: "FIFA - En Route pour la Coupe du Monde 98 (France) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA - En Route pour la Coupe du Monde 98"
+  saveName: "FIFA - En Route pour la Coupe du Monde 98 (France) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53411,7 +56275,8 @@ SLES-00915:
     multitap: true
     linkCable: false
 SLES-00914:
-  name: "FIFA - Road to World Cup 98 (Europe) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA - Road to World Cup 98"
+  saveName: "FIFA - Road to World Cup 98 (Europe) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53434,7 +56299,8 @@ SLES-00914:
     multitap: true
     linkCable: false
 SLES-00917:
-  name: "FIFA - Road to World Cup 98 (Italy)"
+  name: "FIFA - Road to World Cup 98"
+  saveName: "FIFA - Road to World Cup 98 (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -53452,7 +56318,8 @@ SLES-00917:
     multitap: true
     linkCable: false
 SLPS-01383:
-  name: "FIFA - Road to World Cup 98 (Japan)"
+  name: "FIFA - Road to World Cup 98"
+  saveName: "FIFA - Road to World Cup 98 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -53470,11 +56337,13 @@ SLPS-01383:
     multitap: true
     linkCable: false
 SLPM-80236:
-  name: "FIFA - Road to World Cup 98 (Japan) (Demo)"
+  name: "FIFA - Road to World Cup 98 (Demo)"
+  saveName: "FIFA - Road to World Cup 98 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00520:
-  name: "FIFA - Road to World Cup 98 (USA) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA - Road to World Cup 98"
+  saveName: "FIFA - Road to World Cup 98 (USA) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53515,7 +56384,8 @@ SLPS-91150:
     multitap: true
     linkCable: false
 SLES-00918:
-  name: "FIFA - Rumbo al Mundial 98 (Spain) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA - Rumbo al Mundial 98"
+  saveName: "FIFA - Rumbo al Mundial 98 (Spain) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53538,7 +56408,8 @@ SLES-00918:
     multitap: true
     linkCable: false
 SLES-02315:
-  name: "FIFA 2000 (Europe) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (Europe) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53561,7 +56432,8 @@ SLES-02315:
     multitap: true
     linkCable: false
 SLES-02316:
-  name: "FIFA 2000 (France)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53580,7 +56452,8 @@ SLES-02316:
     multitap: true
     linkCable: false
 SLES-02317:
-  name: "FIFA 2000 (Germany) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (Germany) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53599,7 +56472,8 @@ SLES-02317:
     multitap: true
     linkCable: false
 SLES-02320:
-  name: "FIFA 2000 (Greece)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (Greece)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53618,7 +56492,8 @@ SLES-02320:
     multitap: true
     linkCable: false
 SLES-02321:
-  name: "FIFA 2000 (Israel)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (Israel)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53637,7 +56512,8 @@ SLES-02321:
     multitap: true
     linkCable: false
 SLES-02319:
-  name: "FIFA 2000 (Italy)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53656,7 +56532,8 @@ SLES-02319:
     multitap: true
     linkCable: false
 SLES-02318:
-  name: "FIFA 2000 (Spain) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2000"
+  saveName: "FIFA 2000 (Spain) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53680,7 +56557,8 @@ SLES-02318:
     multitap: true
     linkCable: false
 SLPS-02675:
-  name: "FIFA 2000 - Europe League Soccer (Japan)"
+  name: "FIFA 2000 - Europe League Soccer"
+  saveName: "FIFA 2000 - Europe League Soccer (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53699,7 +56577,8 @@ SLPS-02675:
     multitap: true
     linkCable: false
 SLUS-00994:
-  name: "FIFA 2000 - Major League Soccer (USA) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2000 - Major League Soccer"
+  saveName: "FIFA 2000 - Major League Soccer (USA) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53722,7 +56601,8 @@ SLUS-00994:
     multitap: true
     linkCable: false
 SLES-03140:
-  name: "FIFA 2001 (Europe) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (Europe) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53745,7 +56625,8 @@ SLES-03140:
     multitap: true
     linkCable: false
 SLES-03141:
-  name: "FIFA 2001 (France)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53764,7 +56645,8 @@ SLES-03141:
     multitap: true
     linkCable: false
 SLES-03142:
-  name: "FIFA 2001 (Germany) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (Germany) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53787,7 +56669,8 @@ SLES-03142:
     multitap: true
     linkCable: false
 SLES-03143:
-  name: "FIFA 2001 (Greece)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (Greece)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53806,7 +56689,8 @@ SLES-03143:
     multitap: true
     linkCable: false
 SLES-03144:
-  name: "FIFA 2001 (Israel)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (Israel)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53825,7 +56709,8 @@ SLES-03144:
     multitap: true
     linkCable: false
 SLES-03145:
-  name: "FIFA 2001 (Italy)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53844,7 +56729,8 @@ SLES-03145:
     multitap: true
     linkCable: false
 SLES-03146:
-  name: "FIFA 2001 (Spain) (En,De,Es,Nl,Sv)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (Spain) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53867,7 +56753,8 @@ SLES-03146:
     multitap: true
     linkCable: false
 SLUS-01262:
-  name: "FIFA 2001 (USA)"
+  name: "FIFA 2001"
+  saveName: "FIFA 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53890,7 +56777,8 @@ SLUS-01262:
     multitap: true
     linkCable: false
 SLES-00504:
-  name: "FIFA 97 (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "FIFA 97"
+  saveName: "FIFA 97 (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53913,7 +56801,8 @@ SLES-00504:
     multitap: true
     linkCable: false
 SLES-00505:
-  name: "FIFA 97 (France) (En,Fr,De,Es,It,Sv)"
+  name: "FIFA 97"
+  saveName: "FIFA 97 (France) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53931,7 +56820,8 @@ SLES-00505:
     multitap: true
     linkCable: false
 SLES-00506:
-  name: "FIFA 97 (Germany) (En,Fr,De,Es,It,Sv)"
+  name: "FIFA 97"
+  saveName: "FIFA 97 (Germany) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -53949,7 +56839,8 @@ SLES-00506:
     multitap: true
     linkCable: false
 SLES-01584:
-  name: "FIFA 99 (Europe) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA 99"
+  saveName: "FIFA 99 (Europe) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53973,7 +56864,8 @@ SLES-01584:
     multitap: true
     linkCable: false
 SLES-01585:
-  name: "FIFA 99 (France) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA 99"
+  saveName: "FIFA 99 (France) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -53997,7 +56889,8 @@ SLES-01585:
     multitap: true
     linkCable: false
 SLES-01586:
-  name: "FIFA 99 (Germany) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA 99"
+  saveName: "FIFA 99 (Germany) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54021,7 +56914,8 @@ SLES-01586:
     multitap: true
     linkCable: false
 SLES-01587:
-  name: "FIFA 99 (Italy)"
+  name: "FIFA 99"
+  saveName: "FIFA 99 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54040,7 +56934,8 @@ SLES-01587:
     multitap: true
     linkCable: false
 SLES-01588:
-  name: "FIFA 99 (Spain) (En,Fr,De,Es,Nl,Sv)"
+  name: "FIFA 99"
+  saveName: "FIFA 99 (Spain) (En,Fr,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54064,7 +56959,8 @@ SLES-01588:
     multitap: true
     linkCable: false
 SLUS-00782:
-  name: "FIFA 99 (USA)"
+  name: "FIFA 99"
+  saveName: "FIFA 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54083,7 +56979,8 @@ SLUS-00782:
     multitap: true
     linkCable: false
 SLPS-02309:
-  name: "FIFA 99 - Europe League Soccer (Japan)"
+  name: "FIFA 99 - Europe League Soccer"
+  saveName: "FIFA 99 - Europe League Soccer (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54102,7 +56999,8 @@ SLPS-02309:
     multitap: true
     linkCable: false
 SLES-03666:
-  name: "FIFA Football 2002 (Europe) (En,De,Es,Nl,Sv)"
+  name: "FIFA Football 2002"
+  saveName: "FIFA Football 2002 (Europe) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54125,7 +57023,8 @@ SLES-03666:
     multitap: true
     linkCable: false
 SLES-03668:
-  name: "FIFA Football 2002 (France)"
+  name: "FIFA Football 2002"
+  saveName: "FIFA Football 2002 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54144,7 +57043,8 @@ SLES-03668:
     multitap: true
     linkCable: false
 SLES-03669:
-  name: "FIFA Football 2002 (Germany) (En,De,Es,Nl,Sv)"
+  name: "FIFA Football 2002"
+  saveName: "FIFA Football 2002 (Germany) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54167,7 +57067,8 @@ SLES-03669:
     multitap: true
     linkCable: false
 SLES-03671:
-  name: "FIFA Football 2002 (Italy)"
+  name: "FIFA Football 2002"
+  saveName: "FIFA Football 2002 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54186,7 +57087,8 @@ SLES-03671:
     multitap: true
     linkCable: false
 SLES-03672:
-  name: "FIFA Football 2002 (Spain) (En,De,Es,Nl,Sv)"
+  name: "FIFA Football 2002"
+  saveName: "FIFA Football 2002 (Spain) (En,De,Es,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54209,7 +57111,8 @@ SLES-03672:
     multitap: true
     linkCable: false
 SLES-03977:
-  name: "FIFA Football 2003 (Europe) (En,Nl,Sv)"
+  name: "FIFA Football 2003"
+  saveName: "FIFA Football 2003 (Europe) (En,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54230,7 +57133,8 @@ SLES-03977:
     multitap: true
     linkCable: false
 SLES-03978:
-  name: "FIFA Football 2003 (France)"
+  name: "FIFA Football 2003"
+  saveName: "FIFA Football 2003 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54249,7 +57153,8 @@ SLES-03978:
     multitap: true
     linkCable: false
 SLES-03979:
-  name: "FIFA Football 2003 (Germany)"
+  name: "FIFA Football 2003"
+  saveName: "FIFA Football 2003 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54268,7 +57173,8 @@ SLES-03979:
     multitap: true
     linkCable: false
 SLES-03980:
-  name: "FIFA Football 2003 (Italy)"
+  name: "FIFA Football 2003"
+  saveName: "FIFA Football 2003 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54287,7 +57193,8 @@ SLES-03980:
     multitap: true
     linkCable: false
 SLES-03981:
-  name: "FIFA Football 2003 (Spain)"
+  name: "FIFA Football 2003"
+  saveName: "FIFA Football 2003 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54310,7 +57217,8 @@ SLES-03981:
     multitap: true
     linkCable: false
 SLES-04115:
-  name: "FIFA Football 2004 (Europe) (En,Nl,Sv)"
+  name: "FIFA Football 2004"
+  saveName: "FIFA Football 2004 (Europe) (En,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54329,7 +57237,8 @@ SLES-04115:
     multitap: true
     linkCable: false
 SLES-04116:
-  name: "FIFA Football 2004 (France)"
+  name: "FIFA Football 2004"
+  saveName: "FIFA Football 2004 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54348,7 +57257,8 @@ SLES-04116:
     multitap: true
     linkCable: false
 SLES-04117:
-  name: "FIFA Football 2004 (Germany)"
+  name: "FIFA Football 2004"
+  saveName: "FIFA Football 2004 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54367,7 +57277,8 @@ SLES-04117:
     multitap: true
     linkCable: false
 SLES-04119:
-  name: "FIFA Football 2004 (Italy)"
+  name: "FIFA Football 2004"
+  saveName: "FIFA Football 2004 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54386,7 +57297,8 @@ SLES-04119:
     multitap: true
     linkCable: false
 SLES-04118:
-  name: "FIFA Football 2004 (Spain)"
+  name: "FIFA Football 2004"
+  saveName: "FIFA Football 2004 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54405,7 +57317,8 @@ SLES-04118:
     multitap: true
     linkCable: false
 SLES-04165:
-  name: "FIFA Football 2005 (Europe) (En,Nl)"
+  name: "FIFA Football 2005"
+  saveName: "FIFA Football 2005 (Europe) (En,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54425,7 +57338,8 @@ SLES-04165:
     multitap: true
     linkCable: false
 SLES-04166:
-  name: "FIFA Football 2005 (France)"
+  name: "FIFA Football 2005"
+  saveName: "FIFA Football 2005 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54444,7 +57358,8 @@ SLES-04166:
     multitap: true
     linkCable: false
 SLES-04168:
-  name: "FIFA Football 2005 (Germany)"
+  name: "FIFA Football 2005"
+  saveName: "FIFA Football 2005 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54463,7 +57378,8 @@ SLES-04168:
     multitap: true
     linkCable: false
 SLES-04167:
-  name: "FIFA Football 2005 (Italy)"
+  name: "FIFA Football 2005"
+  saveName: "FIFA Football 2005 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54482,7 +57398,8 @@ SLES-04167:
     multitap: true
     linkCable: false
 SLES-04169:
-  name: "FIFA Football 2005 (Spain)"
+  name: "FIFA Football 2005"
+  saveName: "FIFA Football 2005 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54501,7 +57418,8 @@ SLES-04169:
     multitap: true
     linkCable: false
 SLUS-01408:
-  name: "FIFA Soccer 2002 (USA) (En,Es)"
+  name: "FIFA Soccer 2002"
+  saveName: "FIFA Soccer 2002 (USA) (En,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54520,7 +57438,8 @@ SLUS-01408:
     multitap: true
     linkCable: false
 SLUS-01504:
-  name: "FIFA Soccer 2003 (USA)"
+  name: "FIFA Soccer 2003"
+  saveName: "FIFA Soccer 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54540,7 +57459,8 @@ SLUS-01504:
     multitap: true
     linkCable: false
 SLUS-01578:
-  name: "FIFA Soccer 2004 (USA) (En,Es)"
+  name: "FIFA Soccer 2004"
+  saveName: "FIFA Soccer 2004 (USA) (En,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54559,7 +57479,8 @@ SLUS-01578:
     multitap: true
     linkCable: false
 SLUS-01585:
-  name: "FIFA Soccer 2005 (USA) (En,Es)"
+  name: "FIFA Soccer 2005"
+  saveName: "FIFA Soccer 2005 (USA) (En,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-941-g2e64f77"
@@ -54581,7 +57502,8 @@ SLUS-01585:
     multitap: true
     linkCable: false
 SLES-00116:
-  name: "FIFA Soccer 96 (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "FIFA Soccer 96"
+  saveName: "FIFA Soccer 96 (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -54604,7 +57526,8 @@ SLES-00116:
     multitap: true
     linkCable: false
 SLUS-00038:
-  name: "FIFA Soccer 96 (USA)"
+  name: "FIFA Soccer 96"
+  saveName: "FIFA Soccer 96 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -54622,7 +57545,8 @@ SLUS-00038:
     multitap: true
     linkCable: false
 SLPS-00878:
-  name: "FIFA Soccer 97 (Japan)"
+  name: "FIFA Soccer 97"
+  saveName: "FIFA Soccer 97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -54640,7 +57564,8 @@ SLPS-00878:
     multitap: true
     linkCable: false
 SLUS-00269:
-  name: "FIFA Soccer 97 (USA)"
+  name: "FIFA Soccer 97"
+  saveName: "FIFA Soccer 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -54663,7 +57588,8 @@ SLUS-00269:
     multitap: true
     linkCable: false
 SLPS-01719:
-  name: "FIFA World Cup 98 - France 98 Soushuuhen (Japan)"
+  name: "FIFA World Cup 98 - France 98 Soushuuhen"
+  saveName: "FIFA World Cup 98 - France 98 Soushuuhen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54682,7 +57608,8 @@ SLPS-01719:
     multitap: true
     linkCable: false
 SLUS-00636:
-  name: "FOX Sports Golf '99 (USA)"
+  name: "FOX Sports Golf '99"
+  saveName: "FOX Sports Golf '99 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -54700,7 +57627,8 @@ SLUS-00636:
     multitap: true
     linkCable: false
 SLUS-00635:
-  name: "FOX Sports Soccer '99 (USA) (En,Es)"
+  name: "FOX Sports Soccer '99"
+  saveName: "FOX Sports Soccer '99 (USA) (En,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54720,7 +57648,8 @@ SLUS-00635:
     multitap: true
     linkCable: false
 SLES-00209:
-  name: "Fade to Black (Europe) (En,Fr,De,Es,It)"
+  name: "Fade to Black"
+  saveName: "Fade to Black (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -54742,7 +57671,8 @@ SLES-00209:
     multitap: false
     linkCable: false
 SLES-00339:
-  name: "Fade to Black (Europe) (En,Fr,De,Es,It) (SLES-00339)"
+  name: "Fade to Black (SLES-00339)"
+  saveName: "Fade to Black (Europe) (En,Fr,De,Es,It) (SLES-00339)"
   controllers:
     - DigitalController
   metadata:
@@ -54764,7 +57694,8 @@ SLES-00339:
     multitap: false
     linkCable: false
 SLPS-00812:
-  name: "Fade to Black (Japan) (En,Ja)"
+  name: "Fade to Black"
+  saveName: "Fade to Black (Japan) (En,Ja)"
   controllers:
     - DigitalController
   metadata:
@@ -54782,11 +57713,13 @@ SLPS-00812:
     multitap: false
     linkCable: false
 SLPM-80092:
-  name: "Fade to Black (Japan) (En,Ja) (Demo)"
+  name: "Fade to Black (Demo)"
+  saveName: "Fade to Black (Japan) (En,Ja) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00236:
-  name: "Fade to Black (USA) (En,Fr,De,Es,It)"
+  name: "Fade to Black"
+  saveName: "Fade to Black (USA) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -54812,7 +57745,8 @@ SLUS-00236:
     multitap: false
     linkCable: false
 LSP-080130:
-  name: "Faire Games - Language Arts (USA)"
+  name: "Faire Games - Language Arts"
+  saveName: "Faire Games - Language Arts (USA)"
   controllers:
     - DigitalController
   codes:
@@ -54834,7 +57768,8 @@ LSP-080130:
     multitap: false
     linkCable: false
 LSP-080140:
-  name: "Faire Games - Mathematics (USA)"
+  name: "Faire Games - Mathematics"
+  saveName: "Faire Games - Mathematics (USA)"
   controllers:
     - DigitalController
   codes:
@@ -54847,7 +57782,8 @@ LSP-080140:
     languages:
       - English
 SLPS-00010:
-  name: "Falcata - Astran Pardma no Monshou (Japan)"
+  name: "Falcata - Astran Pardma no Monshou"
+  saveName: "Falcata - Astran Pardma no Monshou (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -54867,7 +57803,8 @@ SLPS-00010:
     multitap: false
     linkCable: false
 SLPS-03487:
-  name: "Family 1500 Series - Mahjong (Japan)"
+  name: "Family 1500 Series - Mahjong"
+  saveName: "Family 1500 Series - Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54886,7 +57823,8 @@ SLPS-03487:
     multitap: false
     linkCable: false
 SLPS-01523:
-  name: "Family Bowling (Japan)"
+  name: "Family Bowling"
+  saveName: "Family Bowling (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -54907,7 +57845,8 @@ SLPS-01523:
     multitap: false
     linkCable: false
 SLUS-01454:
-  name: "Family Card Games Fun Pack (USA)"
+  name: "Family Card Games Fun Pack"
+  saveName: "Family Card Games Fun Pack (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -54925,7 +57864,8 @@ SLUS-01454:
     multitap: true
     linkCable: false
 SLPS-03392:
-  name: "Family Chess (Japan)"
+  name: "Family Chess"
+  saveName: "Family Chess (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -54943,7 +57883,8 @@ SLPS-03392:
     multitap: false
     linkCable: false
 LSP-150200:
-  name: "Family Connection - A Guide to Lightspan (USA)"
+  name: "Family Connection - A Guide to Lightspan"
+  saveName: "Family Connection - A Guide to Lightspan (USA)"
   controllers:
     - DigitalController
   codes:
@@ -54956,7 +57897,8 @@ LSP-150200:
     languages:
       - English
 SLPS-03348:
-  name: "Family Diamond (Japan)"
+  name: "Family Diamond"
+  saveName: "Family Diamond (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -54974,7 +57916,8 @@ SLPS-03348:
     multitap: false
     linkCable: false
 SLUS-01171:
-  name: "Family Feud (USA)"
+  name: "Family Feud"
+  saveName: "Family Feud (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -54993,7 +57936,8 @@ SLUS-01171:
     multitap: false
     linkCable: false
 SLUS-01049:
-  name: "Family Game Pack (USA)"
+  name: "Family Game Pack"
+  saveName: "Family Game Pack (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -55012,7 +57956,8 @@ SLUS-01049:
     multitap: false
     linkCable: false
 SLES-03485:
-  name: "Family Games Compendium (Europe) (Disc 1)"
+  name: "Family Games Compendium (Disc 1)"
+  saveName: "Family Games Compendium (Europe) (Disc 1)"
   discSet:
     name: "Family Games Compendium (Europe)"
     serials:
@@ -55036,7 +57981,8 @@ SLES-03485:
     multitap: false
     linkCable: false
 SLES-13485:
-  name: "Family Games Compendium (Europe) (Disc 2)"
+  name: "Family Games Compendium (Disc 2)"
+  saveName: "Family Games Compendium (Europe) (Disc 2)"
   discSet:
     name: "Family Games Compendium (Europe)"
     serials:
@@ -55060,7 +58006,8 @@ SLES-13485:
     multitap: false
     linkCable: false
 SLES-23485:
-  name: "Family Games Compendium (Europe) (En,Fr,De,It) (Disc 3)"
+  name: "Family Games Compendium (Disc 3)"
+  saveName: "Family Games Compendium (Europe) (En,Fr,De,It) (Disc 3)"
   controllers:
     - AnalogController
     - DigitalController
@@ -55079,11 +58026,14 @@ SLES-23485:
     multitap: false
     linkCable: false
 SLPS-03379:
-  name: "Family Gunjin Shougi (Japan)"
+  name: "Family Gunjin Shougi"
+  saveName: "Family Gunjin Shougi (Japan)"
 SLPS-03378:
-  name: "Family Igo - Super Strong (Japan)"
+  name: "Family Igo - Super Strong"
+  saveName: "Family Igo - Super Strong (Japan)"
 SLPS-03488:
-  name: "Family Igo 2 (Japan)"
+  name: "Family Igo 2"
+  saveName: "Family Igo 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55101,9 +58051,11 @@ SLPS-03488:
     multitap: false
     linkCable: false
 SLPS-03377:
-  name: "Family Shougi - Super Strong (Japan)"
+  name: "Family Shougi - Super Strong"
+  saveName: "Family Shougi - Super Strong (Japan)"
 SLPS-03489:
-  name: "Family Shougi 2 (Japan)"
+  name: "Family Shougi 2"
+  saveName: "Family Shougi 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55121,7 +58073,8 @@ SLPS-03489:
     multitap: false
     linkCable: false
 SLPS-01665:
-  name: "Famires e Youkoso! (Japan)"
+  name: "Famires e Youkoso!"
+  saveName: "Famires e Youkoso! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55139,7 +58092,8 @@ SLPS-01665:
     multitap: false
     linkCable: false
 SLPS-01736:
-  name: "Famires, The (Japan)"
+  name: "Famires, The"
+  saveName: "Famires, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55157,7 +58111,8 @@ SLPS-01736:
     multitap: false
     linkCable: false
 SLPS-01763:
-  name: "Famires, The - Shijou Saikyou no Menu (Japan)"
+  name: "Famires, The - Shijou Saikyou no Menu"
+  saveName: "Famires, The - Shijou Saikyou no Menu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55175,7 +58130,8 @@ SLPS-01763:
     multitap: false
     linkCable: false
 SLPM-87254:
-  name: "Famires, The - Shijou Saikyou no Menu (Japan) (Major Wave)"
+  name: "Famires, The - Shijou Saikyou no Menu (Major Wave)"
+  saveName: "Famires, The - Shijou Saikyou no Menu (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -55193,47 +58149,68 @@ SLPM-87254:
     multitap: false
     linkCable: false
 SLPM-80483:
-  name: "Famitsuu Wave 10gatsu-gou Vol. 15 (Japan)"
+  name: "Famitsuu Wave 10gatsu-gou Vol. 15"
+  saveName: "Famitsuu Wave 10gatsu-gou Vol. 15 (Japan)"
 SLPM-80498:
-  name: "Famitsuu Wave 11gatsu-gou Vol. 16 (Japan)"
+  name: "Famitsuu Wave 11gatsu-gou Vol. 16"
+  saveName: "Famitsuu Wave 11gatsu-gou Vol. 16 (Japan)"
 SLPM-80312:
-  name: "Famitsuu Wave 11gatsu-gou Vol. 4 (Japan)"
+  name: "Famitsuu Wave 11gatsu-gou Vol. 4"
+  saveName: "Famitsuu Wave 11gatsu-gou Vol. 4 (Japan)"
 SLPM-80502:
-  name: "Famitsuu Wave 12gatsu-gou Vol. 17 (Japan)"
+  name: "Famitsuu Wave 12gatsu-gou Vol. 17"
+  saveName: "Famitsuu Wave 12gatsu-gou Vol. 17 (Japan)"
 SLPM-80339:
-  name: "Famitsuu Wave 12gatsu-gou Vol. 5 (Japan)"
+  name: "Famitsuu Wave 12gatsu-gou Vol. 5"
+  saveName: "Famitsuu Wave 12gatsu-gou Vol. 5 (Japan)"
 SLPM-80518:
-  name: "Famitsuu Wave 1gatsu-gou Vol. 18 (Japan)"
+  name: "Famitsuu Wave 1gatsu-gou Vol. 18"
+  saveName: "Famitsuu Wave 1gatsu-gou Vol. 18 (Japan)"
 SLPM-80352:
-  name: "Famitsuu Wave 1gatsu-gou Vol. 6 (Japan)"
+  name: "Famitsuu Wave 1gatsu-gou Vol. 6"
+  saveName: "Famitsuu Wave 1gatsu-gou Vol. 6 (Japan)"
 SLPM-80530:
-  name: "Famitsuu Wave 2gatsu-gou Vol. 19 (Japan)"
+  name: "Famitsuu Wave 2gatsu-gou Vol. 19"
+  saveName: "Famitsuu Wave 2gatsu-gou Vol. 19 (Japan)"
 SLPM-80366:
-  name: "Famitsuu Wave 2gatsu-gou Vol. 7 (Japan)"
+  name: "Famitsuu Wave 2gatsu-gou Vol. 7"
+  saveName: "Famitsuu Wave 2gatsu-gou Vol. 7 (Japan)"
 SLPM-80543:
-  name: "Famitsuu Wave 3gatsu-gou Vol. 20 (Japan)"
+  name: "Famitsuu Wave 3gatsu-gou Vol. 20"
+  saveName: "Famitsuu Wave 3gatsu-gou Vol. 20 (Japan)"
 SLPM-80383:
-  name: "Famitsuu Wave 3gatsu-gou Vol. 8 (Japan)"
+  name: "Famitsuu Wave 3gatsu-gou Vol. 8"
+  saveName: "Famitsuu Wave 3gatsu-gou Vol. 8 (Japan)"
 SLPM-80394:
-  name: "Famitsuu Wave 4gatsu-gou Vol. 9 (Japan)"
+  name: "Famitsuu Wave 4gatsu-gou Vol. 9"
+  saveName: "Famitsuu Wave 4gatsu-gou Vol. 9 (Japan)"
 SLPM-80411:
-  name: "Famitsuu Wave 5gatsu-gou Vol. 10 (Japan)"
+  name: "Famitsuu Wave 5gatsu-gou Vol. 10"
+  saveName: "Famitsuu Wave 5gatsu-gou Vol. 10 (Japan)"
 SLPM-80423:
-  name: "Famitsuu Wave 6gatsu-gou Vol. 11 (Japan)"
+  name: "Famitsuu Wave 6gatsu-gou Vol. 11"
+  saveName: "Famitsuu Wave 6gatsu-gou Vol. 11 (Japan)"
 SLPM-80434:
-  name: "Famitsuu Wave 7gatsu-gou Vol. 12 (Japan)"
+  name: "Famitsuu Wave 7gatsu-gou Vol. 12"
+  saveName: "Famitsuu Wave 7gatsu-gou Vol. 12 (Japan)"
 SLPM-80450:
-  name: "Famitsuu Wave 8gatsu-gou Vol. 13 (Japan)"
+  name: "Famitsuu Wave 8gatsu-gou Vol. 13"
+  saveName: "Famitsuu Wave 8gatsu-gou Vol. 13 (Japan)"
 SLPM-80465:
-  name: "Famitsuu Wave 9gatsu-gou Vol. 14 (Japan)"
+  name: "Famitsuu Wave 9gatsu-gou Vol. 14"
+  saveName: "Famitsuu Wave 9gatsu-gou Vol. 14 (Japan)"
 SLPM-80256:
-  name: "Famitsuu Wave Soukangou Vol. 1 (Japan)"
+  name: "Famitsuu Wave Soukangou Vol. 1"
+  saveName: "Famitsuu Wave Soukangou Vol. 1 (Japan)"
 SLPM-80277:
-  name: "Famitsuu Wave Soukangou Vol. 2 (Japan)"
+  name: "Famitsuu Wave Soukangou Vol. 2"
+  saveName: "Famitsuu Wave Soukangou Vol. 2 (Japan)"
 SLPM-80290:
-  name: "Famitsuu Wave Soukangou Vol. 3 (Japan)"
+  name: "Famitsuu Wave Soukangou Vol. 3"
+  saveName: "Famitsuu Wave Soukangou Vol. 3 (Japan)"
 SLPS-03214:
-  name: "Fantastic Fortune (Japan)"
+  name: "Fantastic Fortune"
+  saveName: "Fantastic Fortune (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -55252,7 +58229,8 @@ SLPS-03214:
     multitap: false
     linkCable: false
 SLES-00548:
-  name: "Fantastic Four (Europe) (En,Fr,De,Es,It)"
+  name: "Fantastic Four"
+  saveName: "Fantastic Four (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -55274,7 +58252,8 @@ SLES-00548:
     multitap: true
     linkCable: false
 SLPS-01034:
-  name: "Fantastic Four (Japan)"
+  name: "Fantastic Four"
+  saveName: "Fantastic Four (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55292,7 +58271,8 @@ SLPS-01034:
     multitap: true
     linkCable: false
 SLUS-00395:
-  name: "Fantastic Four (USA)"
+  name: "Fantastic Four"
+  saveName: "Fantastic Four (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -55313,7 +58293,8 @@ SLUS-00395:
     multitap: true
     linkCable: false
 SLPS-02034:
-  name: "Fantastic Night Dreams - Cotton Original (Japan)"
+  name: "Fantastic Night Dreams - Cotton Original"
+  saveName: "Fantastic Night Dreams - Cotton Original (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -55334,7 +58315,8 @@ SLPS-02034:
     multitap: false
     linkCable: false
 SLPS-00781:
-  name: "Fantasy Tap (Japan)"
+  name: "Fantasy Tap"
+  saveName: "Fantasy Tap (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55352,7 +58334,8 @@ SLPS-00781:
     multitap: false
     linkCable: false
 SLPS-01903:
-  name: "Farland Saga - Toki no Michishirube (Japan)"
+  name: "Farland Saga - Toki no Michishirube"
+  saveName: "Farland Saga - Toki no Michishirube (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55370,7 +58353,8 @@ SLPS-01903:
     multitap: false
     linkCable: false
 SLPS-00797:
-  name: "Farland Story - Yottsu no Fuuin (Japan)"
+  name: "Farland Story - Yottsu no Fuuin"
+  saveName: "Farland Story - Yottsu no Fuuin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55388,7 +58372,8 @@ SLPS-00797:
     multitap: false
     linkCable: false
 SLUS-01001:
-  name: "Fatal Fury - Wild Ambition (USA)"
+  name: "Fatal Fury - Wild Ambition"
+  saveName: "Fatal Fury - Wild Ambition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -55407,7 +58392,8 @@ SLUS-01001:
     multitap: false
     linkCable: false
 SLPS-01759:
-  name: "Favorite Dear (Japan)"
+  name: "Favorite Dear"
+  saveName: "Favorite Dear (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55425,7 +58411,8 @@ SLPS-01759:
     multitap: false
     linkCable: false
 SLPS-03286:
-  name: "Favorite Dear - Enkan no Monogatari (Japan)"
+  name: "Favorite Dear - Enkan no Monogatari"
+  saveName: "Favorite Dear - Enkan no Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -55461,7 +58448,8 @@ SLPS-03566:
     multitap: false
     linkCable: false
 SLPS-02754:
-  name: "Favorite Dear - Junpaku no Yogensha (Japan)"
+  name: "Favorite Dear - Junpaku no Yogensha"
+  saveName: "Favorite Dear - Junpaku no Yogensha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -55480,7 +58468,8 @@ SLPS-02754:
     multitap: false
     linkCable: false
 SLES-02166:
-  name: "Fear Effect (Europe) (En,Es,It) (Disc 1)"
+  name: "Fear Effect (Disc 1)"
+  saveName: "Fear Effect (Europe) (En,Es,It) (Disc 1)"
   discSet:
     name: "Fear Effect (Europe) (En,Es,It)"
     serials:
@@ -55511,7 +58500,8 @@ SLES-02166:
     multitap: false
     linkCable: false
 SLES-12166:
-  name: "Fear Effect (Europe) (En,Es,It) (Disc 2)"
+  name: "Fear Effect (Disc 2)"
+  saveName: "Fear Effect (Europe) (En,Es,It) (Disc 2)"
   discSet:
     name: "Fear Effect (Europe) (En,Es,It)"
     serials:
@@ -55542,7 +58532,8 @@ SLES-12166:
     multitap: false
     linkCable: false
 SLES-22166:
-  name: "Fear Effect (Europe) (En,Es,It) (Disc 3)"
+  name: "Fear Effect (Disc 3)"
+  saveName: "Fear Effect (Europe) (En,Es,It) (Disc 3)"
   discSet:
     name: "Fear Effect (Europe) (En,Es,It)"
     serials:
@@ -55573,7 +58564,8 @@ SLES-22166:
     multitap: false
     linkCable: false
 SLES-32166:
-  name: "Fear Effect (Europe) (En,Es,It) (Disc 4)"
+  name: "Fear Effect (Disc 4)"
+  saveName: "Fear Effect (Europe) (En,Es,It) (Disc 4)"
   discSet:
     name: "Fear Effect (Europe) (En,Es,It)"
     serials:
@@ -55604,7 +58596,8 @@ SLES-32166:
     multitap: false
     linkCable: false
 SLES-02167:
-  name: "Fear Effect (France) (Disc 1)"
+  name: "Fear Effect (Disc 1)"
+  saveName: "Fear Effect (France) (Disc 1)"
   discSet:
     name: "Fear Effect (France)"
     serials:
@@ -55633,7 +58626,8 @@ SLES-02167:
     multitap: false
     linkCable: false
 SLES-12167:
-  name: "Fear Effect (France) (Disc 2)"
+  name: "Fear Effect (Disc 2)"
+  saveName: "Fear Effect (France) (Disc 2)"
   discSet:
     name: "Fear Effect (France)"
     serials:
@@ -55662,7 +58656,8 @@ SLES-12167:
     multitap: false
     linkCable: false
 SLES-22167:
-  name: "Fear Effect (France) (Disc 3)"
+  name: "Fear Effect (Disc 3)"
+  saveName: "Fear Effect (France) (Disc 3)"
   discSet:
     name: "Fear Effect (France)"
     serials:
@@ -55691,7 +58686,8 @@ SLES-22167:
     multitap: false
     linkCable: false
 SLES-32167:
-  name: "Fear Effect (France) (Disc 4)"
+  name: "Fear Effect (Disc 4)"
+  saveName: "Fear Effect (France) (Disc 4)"
   discSet:
     name: "Fear Effect (France)"
     serials:
@@ -55720,7 +58716,8 @@ SLES-32167:
     multitap: false
     linkCable: false
 SLES-02168:
-  name: "Fear Effect (Germany) (Disc 1)"
+  name: "Fear Effect (Disc 1)"
+  saveName: "Fear Effect (Germany) (Disc 1)"
   discSet:
     name: "Fear Effect (Germany)"
     serials:
@@ -55749,7 +58746,8 @@ SLES-02168:
     multitap: false
     linkCable: false
 SLES-12168:
-  name: "Fear Effect (Germany) (Disc 2)"
+  name: "Fear Effect (Disc 2)"
+  saveName: "Fear Effect (Germany) (Disc 2)"
   discSet:
     name: "Fear Effect (Germany)"
     serials:
@@ -55778,7 +58776,8 @@ SLES-12168:
     multitap: false
     linkCable: false
 SLES-22168:
-  name: "Fear Effect (Germany) (Disc 3)"
+  name: "Fear Effect (Disc 3)"
+  saveName: "Fear Effect (Germany) (Disc 3)"
   discSet:
     name: "Fear Effect (Germany)"
     serials:
@@ -55807,7 +58806,8 @@ SLES-22168:
     multitap: false
     linkCable: false
 SLES-32168:
-  name: "Fear Effect (Germany) (Disc 4)"
+  name: "Fear Effect (Disc 4)"
+  saveName: "Fear Effect (Germany) (Disc 4)"
   discSet:
     name: "Fear Effect (Germany)"
     serials:
@@ -55836,7 +58836,8 @@ SLES-32168:
     multitap: false
     linkCable: false
 SLUS-00920:
-  name: "Fear Effect (USA) (Disc 1)"
+  name: "Fear Effect (Disc 1)"
+  saveName: "Fear Effect (USA) (Disc 1)"
   discSet:
     name: "Fear Effect (USA)"
     serials:
@@ -55873,7 +58874,8 @@ SLUS-00920:
     multitap: false
     linkCable: false
 SLUS-01056:
-  name: "Fear Effect (USA) (Disc 2)"
+  name: "Fear Effect (Disc 2)"
+  saveName: "Fear Effect (USA) (Disc 2)"
   discSet:
     name: "Fear Effect (USA)"
     serials:
@@ -55906,7 +58908,8 @@ SLUS-01056:
     multitap: false
     linkCable: false
 SLUS-01057:
-  name: "Fear Effect (USA) (Disc 3)"
+  name: "Fear Effect (Disc 3)"
+  saveName: "Fear Effect (USA) (Disc 3)"
   discSet:
     name: "Fear Effect (USA)"
     serials:
@@ -55939,7 +58942,8 @@ SLUS-01057:
     multitap: false
     linkCable: false
 SLUS-01058:
-  name: "Fear Effect (USA) (Disc 4)"
+  name: "Fear Effect (Disc 4)"
+  saveName: "Fear Effect (USA) (Disc 4)"
   discSet:
     name: "Fear Effect (USA)"
     serials:
@@ -55972,7 +58976,8 @@ SLUS-01058:
     multitap: false
     linkCable: false
 SLES-03386:
-  name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 1)"
+  name: "Fear Effect 2 - Retro Helix (Disc 1)"
+  saveName: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 1)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De)"
     serials:
@@ -56003,7 +59008,8 @@ SLES-03386:
     multitap: false
     linkCable: false
 SLES-13386:
-  name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 2)"
+  name: "Fear Effect 2 - Retro Helix (Disc 2)"
+  saveName: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 2)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De)"
     serials:
@@ -56034,7 +59040,8 @@ SLES-13386:
     multitap: false
     linkCable: false
 SLES-23386:
-  name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 3)"
+  name: "Fear Effect 2 - Retro Helix (Disc 3)"
+  saveName: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 3)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De)"
     serials:
@@ -56065,7 +59072,8 @@ SLES-23386:
     multitap: false
     linkCable: false
 SLES-33386:
-  name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 4)"
+  name: "Fear Effect 2 - Retro Helix (Disc 4)"
+  saveName: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De) (Disc 4)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (Europe) (En,Fr,De)"
     serials:
@@ -56096,7 +59104,8 @@ SLES-33386:
     multitap: false
     linkCable: false
 SLUS-01266:
-  name: "Fear Effect 2 - Retro Helix (USA) (Disc 1)"
+  name: "Fear Effect 2 - Retro Helix (Disc 1)"
+  saveName: "Fear Effect 2 - Retro Helix (USA) (Disc 1)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (USA)"
     serials:
@@ -56128,7 +59137,8 @@ SLUS-01266:
     multitap: false
     linkCable: false
 SLUS-01275:
-  name: "Fear Effect 2 - Retro Helix (USA) (Disc 2)"
+  name: "Fear Effect 2 - Retro Helix (Disc 2)"
+  saveName: "Fear Effect 2 - Retro Helix (USA) (Disc 2)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (USA)"
     serials:
@@ -56157,7 +59167,8 @@ SLUS-01275:
     multitap: false
     linkCable: false
 SLUS-01276:
-  name: "Fear Effect 2 - Retro Helix (USA) (Disc 3)"
+  name: "Fear Effect 2 - Retro Helix (Disc 3)"
+  saveName: "Fear Effect 2 - Retro Helix (USA) (Disc 3)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (USA)"
     serials:
@@ -56186,7 +59197,8 @@ SLUS-01276:
     multitap: false
     linkCable: false
 SLUS-01277:
-  name: "Fear Effect 2 - Retro Helix (USA) (Disc 4)"
+  name: "Fear Effect 2 - Retro Helix (Disc 4)"
+  saveName: "Fear Effect 2 - Retro Helix (USA) (Disc 4)"
   discSet:
     name: "Fear Effect 2 - Retro Helix (USA)"
     serials:
@@ -56233,7 +59245,8 @@ SLPM-86874:
     multitap: false
     linkCable: false
 SLES-00940:
-  name: "Felony 11-79 (Europe) (En,Fr,De)"
+  name: "Felony 11-79"
+  saveName: "Felony 11-79 (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -56253,7 +59266,8 @@ SLES-00940:
     multitap: false
     linkCable: false
 SLUS-00533:
-  name: "Felony 11-79 (USA)"
+  name: "Felony 11-79"
+  saveName: "Felony 11-79 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -56271,7 +59285,8 @@ SLUS-00533:
     multitap: false
     linkCable: false
 SLPS-02371:
-  name: "Fever - Sankyo Koushiki Pachinko Simulation (Japan)"
+  name: "Fever - Sankyo Koushiki Pachinko Simulation"
+  saveName: "Fever - Sankyo Koushiki Pachinko Simulation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56309,7 +59324,8 @@ SLPS-91473:
     multitap: false
     linkCable: false
 SLPS-02760:
-  name: "Fever 2 - Sankyo Koushiki Pachinko Simulation (Japan)"
+  name: "Fever 2 - Sankyo Koushiki Pachinko Simulation"
+  saveName: "Fever 2 - Sankyo Koushiki Pachinko Simulation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56347,7 +59363,8 @@ SLPS-91474:
     multitap: false
     linkCable: false
 SLPS-02994:
-  name: "Fever 3 - Sankyo Koushiki Pachinko Simulation (Japan)"
+  name: "Fever 3 - Sankyo Koushiki Pachinko Simulation"
+  saveName: "Fever 3 - Sankyo Koushiki Pachinko Simulation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56369,7 +59386,8 @@ SLPS-02994:
     multitap: false
     linkCable: false
 SLPS-03166:
-  name: "Fever 4 - Sankyo Koushiki Pachinko Simulation (Japan)"
+  name: "Fever 4 - Sankyo Koushiki Pachinko Simulation"
+  saveName: "Fever 4 - Sankyo Koushiki Pachinko Simulation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56388,7 +59406,8 @@ SLPS-03166:
     multitap: false
     linkCable: false
 SLPS-03277:
-  name: "Fever 5 - Sankyo Koushiki Pachinko Simulation (Japan)"
+  name: "Fever 5 - Sankyo Koushiki Pachinko Simulation"
+  saveName: "Fever 5 - Sankyo Koushiki Pachinko Simulation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56410,7 +59429,8 @@ SLPS-03277:
     multitap: false
     linkCable: false
 SCES-01285:
-  name: "Fifth Element, The (Europe) (En,Fr,De,Es,It)"
+  name: "Fifth Element, The"
+  saveName: "Fifth Element, The (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -56436,7 +59456,8 @@ SCES-01285:
     multitap: false
     linkCable: false
 SLPS-01555:
-  name: "Fifth Element, The (Japan)"
+  name: "Fifth Element, The"
+  saveName: "Fifth Element, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56455,7 +59476,8 @@ SLPS-01555:
     multitap: false
     linkCable: false
 SLUS-00711:
-  name: "Fifth Element, The (USA)"
+  name: "Fifth Element, The"
+  saveName: "Fifth Element, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -56477,7 +59499,8 @@ SLUS-00711:
     multitap: false
     linkCable: false
 SLES-02515:
-  name: "Fighter Maker (Europe)"
+  name: "Fighter Maker"
+  saveName: "Fighter Maker (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -56495,7 +59518,8 @@ SLES-02515:
     multitap: false
     linkCable: false
 SLUS-00641:
-  name: "Fighter Maker (USA)"
+  name: "Fighter Maker"
+  saveName: "Fighter Maker (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -56516,7 +59540,8 @@ SLUS-00641:
     multitap: false
     linkCable: false
 SLPS-00822:
-  name: "Fighters' Impact (Japan)"
+  name: "Fighters' Impact"
+  saveName: "Fighters' Impact (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -56534,7 +59559,8 @@ SLPS-00822:
     multitap: false
     linkCable: false
 SLPS-01313:
-  name: "Fighting Eyes (Japan)"
+  name: "Fighting Eyes"
+  saveName: "Fighting Eyes (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56553,11 +59579,13 @@ SLPS-01313:
     multitap: false
     linkCable: false
 SLED-01098:
-  name: "Fighting Force & Tomb Raider II (Europe) (En,Fr,De) (Demo)"
+  name: "Fighting Force & Tomb Raider II (Demo)"
+  saveName: "Fighting Force & Tomb Raider II (Europe) (En,Fr,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00731:
-  name: "Fighting Force (Europe) (En,Fr,De)"
+  name: "Fighting Force"
+  saveName: "Fighting Force (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -56577,11 +59605,13 @@ SLES-00731:
     multitap: false
     linkCable: false
 SLED-00881:
-  name: "Fighting Force (Europe) (En,Fr,De) (Demo)"
+  name: "Fighting Force (Demo)"
+  saveName: "Fighting Force (Europe) (En,Fr,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00433:
-  name: "Fighting Force (USA)"
+  name: "Fighting Force"
+  saveName: "Fighting Force (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -56602,11 +59632,13 @@ SLUS-00433:
     multitap: false
     linkCable: false
 SLED-02314:
-  name: "Fighting Force 2 (Europe) (Demo)"
+  name: "Fighting Force 2 (Demo)"
+  saveName: "Fighting Force 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02233:
-  name: "Fighting Force 2 (Europe) (En,Fr)"
+  name: "Fighting Force 2"
+  saveName: "Fighting Force 2 (Europe) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56626,7 +59658,8 @@ SLES-02233:
     multitap: false
     linkCable: false
 SLES-02237:
-  name: "Fighting Force 2 (Europe) (Es,It)"
+  name: "Fighting Force 2"
+  saveName: "Fighting Force 2 (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56646,7 +59679,8 @@ SLES-02237:
     multitap: false
     linkCable: false
 SLES-02235:
-  name: "Fighting Force 2 (Germany)"
+  name: "Fighting Force 2"
+  saveName: "Fighting Force 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56665,7 +59699,8 @@ SLES-02235:
     multitap: false
     linkCable: false
 SLUS-00934:
-  name: "Fighting Force 2 (USA)"
+  name: "Fighting Force 2"
+  saveName: "Fighting Force 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -56687,7 +59722,8 @@ SLUS-00934:
     multitap: false
     linkCable: false
 SLPS-02985:
-  name: "Fighting Illusion - K-1 GP 2000 (Japan)"
+  name: "Fighting Illusion - K-1 GP 2000"
+  saveName: "Fighting Illusion - K-1 GP 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56706,7 +59742,8 @@ SLPS-02985:
     multitap: false
     linkCable: false
 SLPS-01696:
-  name: "Fighting Illusion - K-1 Grand Prix '98 (Japan)"
+  name: "Fighting Illusion - K-1 Grand Prix '98"
+  saveName: "Fighting Illusion - K-1 Grand Prix '98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56725,11 +59762,13 @@ SLPS-01696:
     multitap: false
     linkCable: false
 SLPM-80341:
-  name: "Fighting Illusion - K-1 Grand Prix '98 (Japan) (Demo)"
+  name: "Fighting Illusion - K-1 Grand Prix '98 (Demo)"
+  saveName: "Fighting Illusion - K-1 Grand Prix '98 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00340:
-  name: "Fighting Illusion - K-1 Grand Prix (Japan)"
+  name: "Fighting Illusion - K-1 Grand Prix"
+  saveName: "Fighting Illusion - K-1 Grand Prix (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -56747,7 +59786,8 @@ SLPS-00340:
     multitap: false
     linkCable: false
 SLPS-00978:
-  name: "Fighting Illusion - K-1 Revenge (Japan)"
+  name: "Fighting Illusion - K-1 Revenge"
+  saveName: "Fighting Illusion - K-1 Revenge (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -56820,7 +59860,8 @@ SLPS-91090:
     multitap: false
     linkCable: false
 SLPS-02304:
-  name: "Fighting Illusion V - K-1 Grand Prix '99 (Japan)"
+  name: "Fighting Illusion V - K-1 Grand Prix '99"
+  saveName: "Fighting Illusion V - K-1 Grand Prix '99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56839,7 +59880,8 @@ SLPS-02304:
     multitap: false
     linkCable: false
 SLPS-00631:
-  name: "Fighting Network Rings (Japan)"
+  name: "Fighting Network Rings"
+  saveName: "Fighting Network Rings (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -56857,7 +59899,8 @@ SLPS-00631:
     multitap: false
     linkCable: false
 SLES-00487:
-  name: "Final Doom (Europe)"
+  name: "Final Doom"
+  saveName: "Final Doom (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -56881,7 +59924,8 @@ SLES-00487:
     multitap: false
     linkCable: true
 SLPS-00727:
-  name: "Final Doom (Japan)"
+  name: "Final Doom"
+  saveName: "Final Doom (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -56905,7 +59949,8 @@ SLPS-00727:
     multitap: false
     linkCable: true
 SLUS-00331:
-  name: "Final Doom (USA)"
+  name: "Final Doom"
+  saveName: "Final Doom (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -56932,7 +59977,8 @@ SLUS-00331:
     multitap: false
     linkCable: true
 SLPS-03430:
-  name: "Final Fantasy (Japan)"
+  name: "Final Fantasy"
+  saveName: "Final Fantasy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56954,7 +60000,8 @@ SLPS-03430:
     multitap: false
     linkCable: false
 SLPS-03500:
-  name: "Final Fantasy (Japan) (Premium Package)"
+  name: "Final Fantasy (Premium Package)"
+  saveName: "Final Fantasy (Japan) (Premium Package)"
   controllers:
     - AnalogController
     - DigitalController
@@ -56976,7 +60023,8 @@ SLPS-03500:
     multitap: false
     linkCable: false
 SCES-03840:
-  name: "Final Fantasy Anthology - European Edition - Final Fantasy IV (Europe, Australia)"
+  name: "Final Fantasy Anthology - European Edition - Final Fantasy IV"
+  saveName: "Final Fantasy Anthology - European Edition - Final Fantasy IV (Europe, Australia)"
   controllers:
     - DigitalController
   traits:
@@ -56997,7 +60045,8 @@ SCES-03840:
     multitap: false
     linkCable: false
 SCES-13840:
-  name: "Final Fantasy Anthology - European Edition - Final Fantasy V (Europe, Australia)"
+  name: "Final Fantasy Anthology - European Edition - Final Fantasy V"
+  saveName: "Final Fantasy Anthology - European Edition - Final Fantasy V (Europe, Australia)"
   controllers:
     - DigitalController
   traits:
@@ -57018,7 +60067,8 @@ SCES-13840:
     multitap: false
     linkCable: false
 SLUS-00879:
-  name: "Final Fantasy Anthology - Final Fantasy V (USA)"
+  name: "Final Fantasy Anthology - Final Fantasy V"
+  saveName: "Final Fantasy Anthology - Final Fantasy V (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -57042,7 +60092,8 @@ SLUS-00879:
     multitap: false
     linkCable: false
 SLUS-00900:
-  name: "Final Fantasy Anthology - Final Fantasy VI (USA)"
+  name: "Final Fantasy Anthology - Final Fantasy VI"
+  saveName: "Final Fantasy Anthology - Final Fantasy VI (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1580-g136a9d60"
@@ -57066,7 +60117,8 @@ SLUS-00900:
     multitap: false
     linkCable: false
 SLUS-01363:
-  name: "Final Fantasy Chronicles - Chrono Trigger (USA)"
+  name: "Final Fantasy Chronicles - Chrono Trigger"
+  saveName: "Final Fantasy Chronicles - Chrono Trigger (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-9510-g4c349ffd4"
@@ -57091,7 +60143,8 @@ SLUS-01363:
     multitap: false
     linkCable: false
 SLUS-01360:
-  name: "Final Fantasy Chronicles - Final Fantasy IV (USA)"
+  name: "Final Fantasy Chronicles - Final Fantasy IV"
+  saveName: "Final Fantasy Chronicles - Final Fantasy IV (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-9510-g4c349ffd4"
@@ -57162,9 +60215,11 @@ SLPS-01945:
     multitap: false
     linkCable: false
 SLPM-80073:
-  name: "Final Fantasy Extra Collection (Japan)"
+  name: "Final Fantasy Extra Collection"
+  saveName: "Final Fantasy Extra Collection (Japan)"
 SLPS-03502:
-  name: "Final Fantasy II (Japan)"
+  name: "Final Fantasy II"
+  saveName: "Final Fantasy II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -57186,7 +60241,8 @@ SLPS-03502:
     multitap: false
     linkCable: false
 SLPS-03501:
-  name: "Final Fantasy II (Japan) (Premium Package)"
+  name: "Final Fantasy II (Premium Package)"
+  saveName: "Final Fantasy II (Japan) (Premium Package)"
   controllers:
     - AnalogController
     - DigitalController
@@ -57208,7 +60264,8 @@ SLPS-03501:
     multitap: false
     linkCable: false
 SLPM-86028:
-  name: "Final Fantasy IV (Japan)"
+  name: "Final Fantasy IV"
+  saveName: "Final Fantasy IV (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -57253,7 +60310,8 @@ SCPS-45029:
     multitap: false
     linkCable: false
 SLES-02965:
-  name: "Final Fantasy IX (Europe) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (Europe) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (Europe)"
     serials:
@@ -57285,7 +60343,8 @@ SLES-02965:
     multitap: false
     linkCable: false
 SLES-12965:
-  name: "Final Fantasy IX (Europe) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (Europe) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (Europe)"
     serials:
@@ -57317,7 +60376,8 @@ SLES-12965:
     multitap: false
     linkCable: false
 SLES-22965:
-  name: "Final Fantasy IX (Europe) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (Europe) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (Europe)"
     serials:
@@ -57349,7 +60409,8 @@ SLES-22965:
     multitap: false
     linkCable: false
 SLES-32965:
-  name: "Final Fantasy IX (Europe) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (Europe) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (Europe)"
     serials:
@@ -57381,7 +60442,8 @@ SLES-32965:
     multitap: false
     linkCable: false
 SLES-02966:
-  name: "Final Fantasy IX (France) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (France) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (France)"
     serials:
@@ -57413,7 +60475,8 @@ SLES-02966:
     multitap: false
     linkCable: false
 SLES-12966:
-  name: "Final Fantasy IX (France) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (France) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (France)"
     serials:
@@ -57445,7 +60508,8 @@ SLES-12966:
     multitap: false
     linkCable: false
 SLES-22966:
-  name: "Final Fantasy IX (France) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (France) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (France)"
     serials:
@@ -57477,7 +60541,8 @@ SLES-22966:
     multitap: false
     linkCable: false
 SLES-32966:
-  name: "Final Fantasy IX (France) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (France) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (France)"
     serials:
@@ -57509,7 +60574,8 @@ SLES-32966:
     multitap: false
     linkCable: false
 SLES-02967:
-  name: "Final Fantasy IX (Germany) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (Germany) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (Germany)"
     serials:
@@ -57538,7 +60604,8 @@ SLES-02967:
     multitap: false
     linkCable: false
 SLES-12967:
-  name: "Final Fantasy IX (Germany) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (Germany) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (Germany)"
     serials:
@@ -57567,7 +60634,8 @@ SLES-12967:
     multitap: false
     linkCable: false
 SLES-22967:
-  name: "Final Fantasy IX (Germany) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (Germany) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (Germany)"
     serials:
@@ -57596,7 +60664,8 @@ SLES-22967:
     multitap: false
     linkCable: false
 SLES-32967:
-  name: "Final Fantasy IX (Germany) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (Germany) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (Germany)"
     serials:
@@ -57625,7 +60694,8 @@ SLES-32967:
     multitap: false
     linkCable: false
 SLES-02968:
-  name: "Final Fantasy IX (Italy) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (Italy) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (Italy)"
     serials:
@@ -57654,7 +60724,8 @@ SLES-02968:
     multitap: false
     linkCable: false
 SLES-12968:
-  name: "Final Fantasy IX (Italy) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (Italy) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (Italy)"
     serials:
@@ -57683,7 +60754,8 @@ SLES-12968:
     multitap: false
     linkCable: false
 SLES-22968:
-  name: "Final Fantasy IX (Italy) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (Italy) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (Italy)"
     serials:
@@ -57712,7 +60784,8 @@ SLES-22968:
     multitap: false
     linkCable: false
 SLES-32968:
-  name: "Final Fantasy IX (Italy) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (Italy) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (Italy)"
     serials:
@@ -57741,7 +60814,8 @@ SLES-32968:
     multitap: false
     linkCable: false
 SCPS-45500:
-  name: "Final Fantasy IX (Japan, Asia) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (Japan, Asia) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (Japan, Asia)"
     serials:
@@ -57773,7 +60847,8 @@ SCPS-45500:
     multitap: false
     linkCable: false
 SCPS-45501:
-  name: "Final Fantasy IX (Japan, Asia) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (Japan, Asia) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (Japan, Asia)"
     serials:
@@ -57805,7 +60880,8 @@ SCPS-45501:
     multitap: false
     linkCable: false
 SCPS-45502:
-  name: "Final Fantasy IX (Japan, Asia) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (Japan, Asia) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (Japan, Asia)"
     serials:
@@ -57837,7 +60913,8 @@ SCPS-45502:
     multitap: false
     linkCable: false
 SCPS-45503:
-  name: "Final Fantasy IX (Japan, Asia) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (Japan, Asia) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (Japan, Asia)"
     serials:
@@ -57869,7 +60946,8 @@ SCPS-45503:
     multitap: false
     linkCable: false
 SLES-02969:
-  name: "Final Fantasy IX (Spain) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (Spain) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (Spain)"
     serials:
@@ -57901,7 +60979,8 @@ SLES-02969:
     multitap: false
     linkCable: false
 SLES-12969:
-  name: "Final Fantasy IX (Spain) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (Spain) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (Spain)"
     serials:
@@ -57933,7 +61012,8 @@ SLES-12969:
     multitap: false
     linkCable: false
 SLES-22969:
-  name: "Final Fantasy IX (Spain) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (Spain) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (Spain)"
     serials:
@@ -57965,7 +61045,8 @@ SLES-22969:
     multitap: false
     linkCable: false
 SLES-32969:
-  name: "Final Fantasy IX (Spain) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (Spain) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (Spain)"
     serials:
@@ -57997,7 +61078,8 @@ SLES-32969:
     multitap: false
     linkCable: false
 SLUS-01251:
-  name: "Final Fantasy IX (USA) (Disc 1)"
+  name: "Final Fantasy IX (Disc 1)"
+  saveName: "Final Fantasy IX (USA) (Disc 1)"
   discSet:
     name: "Final Fantasy IX (USA)"
     serials:
@@ -58028,7 +61110,8 @@ SLUS-01251:
     multitap: false
     linkCable: false
 SLUS-01295:
-  name: "Final Fantasy IX (USA) (Disc 2)"
+  name: "Final Fantasy IX (Disc 2)"
+  saveName: "Final Fantasy IX (USA) (Disc 2)"
   discSet:
     name: "Final Fantasy IX (USA)"
     serials:
@@ -58059,7 +61142,8 @@ SLUS-01295:
     multitap: false
     linkCable: false
 SLUS-01296:
-  name: "Final Fantasy IX (USA) (Disc 3)"
+  name: "Final Fantasy IX (Disc 3)"
+  saveName: "Final Fantasy IX (USA) (Disc 3)"
   discSet:
     name: "Final Fantasy IX (USA)"
     serials:
@@ -58090,7 +61174,8 @@ SLUS-01296:
     multitap: false
     linkCable: false
 SLUS-01297:
-  name: "Final Fantasy IX (USA) (Disc 4)"
+  name: "Final Fantasy IX (Disc 4)"
+  saveName: "Final Fantasy IX (USA) (Disc 4)"
   discSet:
     name: "Final Fantasy IX (USA)"
     serials:
@@ -58121,7 +61206,8 @@ SLUS-01297:
     multitap: false
     linkCable: false
 SLUS-01541:
-  name: "Final Fantasy Origins (USA)"
+  name: "Final Fantasy Origins"
+  saveName: "Final Fantasy Origins (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -58145,7 +61231,8 @@ SLUS-01541:
     multitap: false
     linkCable: false
 SLES-04034:
-  name: "Final Fantasy Origins - Final Fantasy (Europe)"
+  name: "Final Fantasy Origins - Final Fantasy"
+  saveName: "Final Fantasy Origins - Final Fantasy (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -58166,7 +61253,8 @@ SLES-04034:
     multitap: false
     linkCable: false
 SLES-14034:
-  name: "Final Fantasy Origins - Final Fantasy II (Europe)"
+  name: "Final Fantasy Origins - Final Fantasy II"
+  saveName: "Final Fantasy Origins - Final Fantasy II (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -58210,7 +61298,8 @@ SCPS-45087:
     multitap: false
     linkCable: false
 SLPS-00770:
-  name: "Final Fantasy Tactics (Japan)"
+  name: "Final Fantasy Tactics"
+  saveName: "Final Fantasy Tactics (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -58230,7 +61319,8 @@ SLPS-00770:
     multitap: false
     linkCable: false
 SLPM-87392:
-  name: "Final Fantasy Tactics (Japan) (Rev 1)"
+  name: "Final Fantasy Tactics"
+  saveName: "Final Fantasy Tactics (Japan) (Rev 1)"
   controllers:
     - DigitalController
   traits:
@@ -58254,7 +61344,8 @@ SLPM-87392:
     multitap: false
     linkCable: false
 SCUS-94221:
-  name: "Final Fantasy Tactics (USA)"
+  name: "Final Fantasy Tactics"
+  saveName: "Final Fantasy Tactics (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1031-g47138aa"
@@ -58277,7 +61368,8 @@ SCUS-94221:
     multitap: false
     linkCable: false
 SCPS-45214:
-  name: "Final Fantasy V (Japan, Asia)"
+  name: "Final Fantasy V"
+  saveName: "Final Fantasy V (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -58299,7 +61391,8 @@ SCPS-45214:
     multitap: false
     linkCable: false
 SCES-03828:
-  name: "Final Fantasy VI (Europe, Australia)"
+  name: "Final Fantasy VI"
+  saveName: "Final Fantasy VI (Europe, Australia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4416-g24b4be51"
@@ -58320,7 +61413,8 @@ SCES-03828:
     multitap: false
     linkCable: false
 SCPS-45387:
-  name: "Final Fantasy VI (Japan, Asia)"
+  name: "Final Fantasy VI"
+  saveName: "Final Fantasy VI (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -58344,7 +61438,8 @@ SCPS-45387:
     multitap: false
     linkCable: false
 SCES-00867:
-  name: "Final Fantasy VII (Europe) (Disc 1)"
+  name: "Final Fantasy VII (Disc 1)"
+  saveName: "Final Fantasy VII (Europe) (Disc 1)"
   discSet:
     name: "Final Fantasy VII (Europe)"
     serials:
@@ -58376,7 +61471,8 @@ SCES-00867:
     multitap: false
     linkCable: false
 SCES-10867:
-  name: "Final Fantasy VII (Europe) (Disc 2)"
+  name: "Final Fantasy VII (Disc 2)"
+  saveName: "Final Fantasy VII (Europe) (Disc 2)"
   discSet:
     name: "Final Fantasy VII (Europe)"
     serials:
@@ -58408,7 +61504,8 @@ SCES-10867:
     multitap: false
     linkCable: false
 SCES-20867:
-  name: "Final Fantasy VII (Europe) (Disc 3)"
+  name: "Final Fantasy VII (Disc 3)"
+  saveName: "Final Fantasy VII (Europe) (Disc 3)"
   discSet:
     name: "Final Fantasy VII (Europe)"
     serials:
@@ -58440,7 +61537,8 @@ SCES-20867:
     multitap: false
     linkCable: false
 SCES-00868:
-  name: "Final Fantasy VII (France) (Disc 1)"
+  name: "Final Fantasy VII (Disc 1)"
+  saveName: "Final Fantasy VII (France) (Disc 1)"
   discSet:
     name: "Final Fantasy VII (France)"
     serials:
@@ -58472,7 +61570,8 @@ SCES-00868:
     multitap: false
     linkCable: false
 SCES-10868:
-  name: "Final Fantasy VII (France) (Disc 2)"
+  name: "Final Fantasy VII (Disc 2)"
+  saveName: "Final Fantasy VII (France) (Disc 2)"
   discSet:
     name: "Final Fantasy VII (France)"
     serials:
@@ -58504,7 +61603,8 @@ SCES-10868:
     multitap: false
     linkCable: false
 SCES-20868:
-  name: "Final Fantasy VII (France) (Disc 3)"
+  name: "Final Fantasy VII (Disc 3)"
+  saveName: "Final Fantasy VII (France) (Disc 3)"
   discSet:
     name: "Final Fantasy VII (France)"
     serials:
@@ -58536,7 +61636,8 @@ SCES-20868:
     multitap: false
     linkCable: false
 SCES-00869:
-  name: "Final Fantasy VII (Germany) (Disc 1)"
+  name: "Final Fantasy VII (Disc 1)"
+  saveName: "Final Fantasy VII (Germany) (Disc 1)"
   discSet:
     name: "Final Fantasy VII (Germany)"
     serials:
@@ -58568,7 +61669,8 @@ SCES-00869:
     multitap: false
     linkCable: false
 SCES-10869:
-  name: "Final Fantasy VII (Germany) (Disc 2)"
+  name: "Final Fantasy VII (Disc 2)"
+  saveName: "Final Fantasy VII (Germany) (Disc 2)"
   discSet:
     name: "Final Fantasy VII (Germany)"
     serials:
@@ -58600,7 +61702,8 @@ SCES-10869:
     multitap: false
     linkCable: false
 SCES-20869:
-  name: "Final Fantasy VII (Germany) (Disc 3)"
+  name: "Final Fantasy VII (Disc 3)"
+  saveName: "Final Fantasy VII (Germany) (Disc 3)"
   discSet:
     name: "Final Fantasy VII (Germany)"
     serials:
@@ -58632,7 +61735,8 @@ SCES-20869:
     multitap: false
     linkCable: false
 SLPS-00700:
-  name: "Final Fantasy VII (Japan) (Disc 1)"
+  name: "Final Fantasy VII (Disc 1)"
+  saveName: "Final Fantasy VII (Japan) (Disc 1)"
   discSet:
     name: "Final Fantasy VII (Japan)"
     serials:
@@ -58662,7 +61766,8 @@ SLPS-00700:
     multitap: false
     linkCable: false
 SLPS-00701:
-  name: "Final Fantasy VII (Japan) (Disc 2)"
+  name: "Final Fantasy VII (Disc 2)"
+  saveName: "Final Fantasy VII (Japan) (Disc 2)"
   discSet:
     name: "Final Fantasy VII (Japan)"
     serials:
@@ -58692,7 +61797,8 @@ SLPS-00701:
     multitap: false
     linkCable: false
 SLPS-00702:
-  name: "Final Fantasy VII (Japan) (Disc 3)"
+  name: "Final Fantasy VII (Disc 3)"
+  saveName: "Final Fantasy VII (Japan) (Disc 3)"
   discSet:
     name: "Final Fantasy VII (Japan)"
     serials:
@@ -58722,7 +61828,8 @@ SLPS-00702:
     multitap: false
     linkCable: false
 SCES-00900:
-  name: "Final Fantasy VII (Spain) (Disc 1)"
+  name: "Final Fantasy VII (Disc 1)"
+  saveName: "Final Fantasy VII (Spain) (Disc 1)"
   discSet:
     name: "Final Fantasy VII (Spain)"
     serials:
@@ -58754,7 +61861,8 @@ SCES-00900:
     multitap: false
     linkCable: false
 SCES-10900:
-  name: "Final Fantasy VII (Spain) (Disc 2)"
+  name: "Final Fantasy VII (Disc 2)"
+  saveName: "Final Fantasy VII (Spain) (Disc 2)"
   discSet:
     name: "Final Fantasy VII (Spain)"
     serials:
@@ -58786,7 +61894,8 @@ SCES-10900:
     multitap: false
     linkCable: false
 SCES-20900:
-  name: "Final Fantasy VII (Spain) (Disc 3)"
+  name: "Final Fantasy VII (Disc 3)"
+  saveName: "Final Fantasy VII (Spain) (Disc 3)"
   discSet:
     name: "Final Fantasy VII (Spain)"
     serials:
@@ -58818,7 +61927,8 @@ SCES-20900:
     multitap: false
     linkCable: false
 SCUS-94163:
-  name: "Final Fantasy VII (USA) (Disc 1)"
+  name: "Final Fantasy VII (Disc 1)"
+  saveName: "Final Fantasy VII (USA) (Disc 1)"
   discSet:
     name: "Final Fantasy VII (USA)"
     serials:
@@ -58848,7 +61958,8 @@ SCUS-94163:
     multitap: false
     linkCable: false
 SCUS-94164:
-  name: "Final Fantasy VII (USA) (Disc 2)"
+  name: "Final Fantasy VII (Disc 2)"
+  saveName: "Final Fantasy VII (USA) (Disc 2)"
   discSet:
     name: "Final Fantasy VII (USA)"
     serials:
@@ -58878,7 +61989,8 @@ SCUS-94164:
     multitap: false
     linkCable: false
 SCUS-94165:
-  name: "Final Fantasy VII (USA) (Disc 3)"
+  name: "Final Fantasy VII (Disc 3)"
+  saveName: "Final Fantasy VII (USA) (Disc 3)"
   discSet:
     name: "Final Fantasy VII (USA)"
     serials:
@@ -58908,14 +62020,16 @@ SCUS-94165:
     multitap: false
     linkCable: false
 SCUS-94961:
-  name: "Final Fantasy VII (USA) (Interactive Sampler CD)"
+  name: "Final Fantasy VII (Interactive Sampler CD)"
+  saveName: "Final Fantasy VII (USA) (Interactive Sampler CD)"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
   metadata:
     genre: "** DEMO **"
 SCUS-94179:
-  name: "Final Fantasy VII (USA) (Square Soft on PlayStation Previews)"
+  name: "Final Fantasy VII (Square Soft on PlayStation Previews)"
+  saveName: "Final Fantasy VII (USA) (Square Soft on PlayStation Previews)"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
@@ -58947,7 +62061,8 @@ SCPS-45007:
     multitap: false
     linkCable: false
 SLPM-84020:
-  name: "Final Fantasy VII International (Japan) (Disc 1)"
+  name: "Final Fantasy VII International (Disc 1)"
+  saveName: "Final Fantasy VII International (Japan) (Disc 1)"
   discSet:
     name: "Final Fantasy VII International (Japan)"
     serials:
@@ -58980,7 +62095,8 @@ SLPM-84020:
     multitap: false
     linkCable: false
 SLPM-84021:
-  name: "Final Fantasy VII International (Japan) (Disc 2)"
+  name: "Final Fantasy VII International (Disc 2)"
+  saveName: "Final Fantasy VII International (Japan) (Disc 2)"
   discSet:
     name: "Final Fantasy VII International (Japan)"
     serials:
@@ -59013,7 +62129,8 @@ SLPM-84021:
     multitap: false
     linkCable: false
 SLPM-84022:
-  name: "Final Fantasy VII International (Japan) (Disc 3)"
+  name: "Final Fantasy VII International (Disc 3)"
+  saveName: "Final Fantasy VII International (Japan) (Disc 3)"
   discSet:
     name: "Final Fantasy VII International (Japan)"
     serials:
@@ -59046,7 +62163,8 @@ SLPM-84022:
     multitap: false
     linkCable: false
 SLPM-87383:
-  name: "Final Fantasy VII International (Japan) (Disc 4) (Perfect Guide)"
+  name: "Final Fantasy VII International (Disc 4) (Perfect Guide)"
+  saveName: "Final Fantasy VII International (Japan) (Disc 4) (Perfect Guide)"
   discSet:
     name: "Final Fantasy VII International (Japan)"
     serials:
@@ -59078,7 +62196,8 @@ SLPM-87383:
     multitap: false
     linkCable: false
 SCED-02062:
-  name: "Final Fantasy VIII (Europe) (Demo 1)"
+  name: "Final Fantasy VIII (Demo 1)"
+  saveName: "Final Fantasy VIII (Europe) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -59088,7 +62207,8 @@ SCED-02062:
   settings:
     cdromMaxReadSpeedupCycles: 40000 # Stops FMVs breaking.
 SLED-02258:
-  name: "Final Fantasy VIII (Europe) (Demo 2)"
+  name: "Final Fantasy VIII (Demo 2)"
+  saveName: "Final Fantasy VIII (Europe) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -59098,7 +62218,8 @@ SLED-02258:
   settings:
     cdromMaxReadSpeedupCycles: 40000 # Stops FMVs breaking.
 SCES-02080:
-  name: "Final Fantasy VIII (Europe, Australia) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (Europe, Australia) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (Europe, Australia)"
     serials:
@@ -59137,7 +62258,8 @@ SCES-02080:
     multitap: false
     linkCable: false
 SCES-12080:
-  name: "Final Fantasy VIII (Europe, Australia) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (Europe, Australia) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (Europe, Australia)"
     serials:
@@ -59176,7 +62298,8 @@ SCES-12080:
     multitap: false
     linkCable: false
 SCES-22080:
-  name: "Final Fantasy VIII (Europe, Australia) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (Europe, Australia) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (Europe, Australia)"
     serials:
@@ -59215,7 +62338,8 @@ SCES-22080:
     multitap: false
     linkCable: false
 SCES-32080:
-  name: "Final Fantasy VIII (Europe, Australia) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (Europe, Australia) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (Europe, Australia)"
     serials:
@@ -59254,7 +62378,8 @@ SCES-32080:
     multitap: false
     linkCable: false
 SLED-02259:
-  name: "Final Fantasy VIII (France) (Demo)"
+  name: "Final Fantasy VIII (Demo)"
+  saveName: "Final Fantasy VIII (France) (Demo)"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableScaledInterlacing # Breaks intro rendering.
@@ -59262,7 +62387,8 @@ SLED-02259:
   settings:
     cdromMaxReadSpeedupCycles: 40000 # Stops FMVs breaking.
 SLES-02081:
-  name: "Final Fantasy VIII (France) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (France) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (France)"
     serials:
@@ -59295,7 +62421,8 @@ SLES-02081:
     multitap: false
     linkCable: false
 SLES-12081:
-  name: "Final Fantasy VIII (France) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (France) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (France)"
     serials:
@@ -59328,7 +62455,8 @@ SLES-12081:
     multitap: false
     linkCable: false
 SLES-22081:
-  name: "Final Fantasy VIII (France) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (France) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (France)"
     serials:
@@ -59361,7 +62489,8 @@ SLES-22081:
     multitap: false
     linkCable: false
 SLES-32081:
-  name: "Final Fantasy VIII (France) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (France) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (France)"
     serials:
@@ -59394,7 +62523,8 @@ SLES-32081:
     multitap: false
     linkCable: false
 SLES-02082:
-  name: "Final Fantasy VIII (Germany) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (Germany) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (Germany)"
     serials:
@@ -59427,7 +62557,8 @@ SLES-02082:
     multitap: false
     linkCable: false
 SLES-12082:
-  name: "Final Fantasy VIII (Germany) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (Germany) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (Germany)"
     serials:
@@ -59460,7 +62591,8 @@ SLES-12082:
     multitap: false
     linkCable: false
 SLES-22082:
-  name: "Final Fantasy VIII (Germany) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (Germany) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (Germany)"
     serials:
@@ -59493,7 +62625,8 @@ SLES-22082:
     multitap: false
     linkCable: false
 SLES-32082:
-  name: "Final Fantasy VIII (Germany) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (Germany) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (Germany)"
     serials:
@@ -59526,7 +62659,8 @@ SLES-32082:
     multitap: false
     linkCable: false
 SLES-02083:
-  name: "Final Fantasy VIII (Italy) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (Italy) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (Italy)"
     serials:
@@ -59559,7 +62693,8 @@ SLES-02083:
     multitap: false
     linkCable: false
 SLES-12083:
-  name: "Final Fantasy VIII (Italy) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (Italy) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (Italy)"
     serials:
@@ -59592,7 +62727,8 @@ SLES-12083:
     multitap: false
     linkCable: false
 SLES-22083:
-  name: "Final Fantasy VIII (Italy) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (Italy) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (Italy)"
     serials:
@@ -59625,7 +62761,8 @@ SLES-22083:
     multitap: false
     linkCable: false
 SLES-32083:
-  name: "Final Fantasy VIII (Italy) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (Italy) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (Italy)"
     serials:
@@ -59658,7 +62795,8 @@ SLES-32083:
     multitap: false
     linkCable: false
 SLPM-87384:
-  name: "Final Fantasy VIII (Japan) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (Japan) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (Japan)"
     serials:
@@ -59695,7 +62833,8 @@ SLPM-87384:
     multitap: false
     linkCable: false
 SLPM-87385:
-  name: "Final Fantasy VIII (Japan) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (Japan) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (Japan)"
     serials:
@@ -59730,7 +62869,8 @@ SLPM-87385:
     multitap: false
     linkCable: false
 SLPM-87386:
-  name: "Final Fantasy VIII (Japan) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (Japan) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (Japan)"
     serials:
@@ -59765,7 +62905,8 @@ SLPM-87386:
     multitap: false
     linkCable: false
 SLPM-87387:
-  name: "Final Fantasy VIII (Japan) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (Japan) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (Japan)"
     serials:
@@ -59800,7 +62941,8 @@ SLPM-87387:
     multitap: false
     linkCable: false
 SLPM-80269:
-  name: "Final Fantasy VIII (Japan) (Square's Preview Extra) (Demo)"
+  name: "Final Fantasy VIII (Square's Preview Extra) (Demo)"
+  saveName: "Final Fantasy VIII (Japan) (Square's Preview Extra) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -59810,7 +62952,8 @@ SLPM-80269:
   settings:
     cdromMaxReadSpeedupCycles: 40000 # Stops FMVs breaking.
 SLED-02262:
-  name: "Final Fantasy VIII (Spain) (Demo)"
+  name: "Final Fantasy VIII (Demo)"
+  saveName: "Final Fantasy VIII (Spain) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -59820,7 +62963,8 @@ SLED-02262:
   settings:
     cdromMaxReadSpeedupCycles: 40000 # Stops FMVs breaking.
 SLES-02084:
-  name: "Final Fantasy VIII (Spain) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (Spain) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (Spain)"
     serials:
@@ -59856,7 +63000,8 @@ SLES-02084:
     multitap: false
     linkCable: false
 SLES-12084:
-  name: "Final Fantasy VIII (Spain) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (Spain) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (Spain)"
     serials:
@@ -59892,7 +63037,8 @@ SLES-12084:
     multitap: false
     linkCable: false
 SLES-22084:
-  name: "Final Fantasy VIII (Spain) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (Spain) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (Spain)"
     serials:
@@ -59928,7 +63074,8 @@ SLES-22084:
     multitap: false
     linkCable: false
 SLES-32084:
-  name: "Final Fantasy VIII (Spain) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (Spain) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (Spain)"
     serials:
@@ -59964,7 +63111,8 @@ SLES-32084:
     multitap: false
     linkCable: false
 SLUS-00892:
-  name: "Final Fantasy VIII (USA) (Disc 1)"
+  name: "Final Fantasy VIII (Disc 1)"
+  saveName: "Final Fantasy VIII (USA) (Disc 1)"
   discSet:
     name: "Final Fantasy VIII (USA)"
     serials:
@@ -59999,7 +63147,8 @@ SLUS-00892:
     multitap: false
     linkCable: false
 SLUS-00908:
-  name: "Final Fantasy VIII (USA) (Disc 2)"
+  name: "Final Fantasy VIII (Disc 2)"
+  saveName: "Final Fantasy VIII (USA) (Disc 2)"
   discSet:
     name: "Final Fantasy VIII (USA)"
     serials:
@@ -60034,7 +63183,8 @@ SLUS-00908:
     multitap: false
     linkCable: false
 SLUS-00909:
-  name: "Final Fantasy VIII (USA) (Disc 3)"
+  name: "Final Fantasy VIII (Disc 3)"
+  saveName: "Final Fantasy VIII (USA) (Disc 3)"
   discSet:
     name: "Final Fantasy VIII (USA)"
     serials:
@@ -60069,7 +63219,8 @@ SLUS-00909:
     multitap: false
     linkCable: false
 SLUS-00910:
-  name: "Final Fantasy VIII (USA) (Disc 4)"
+  name: "Final Fantasy VIII (Disc 4)"
+  saveName: "Final Fantasy VIII (USA) (Disc 4)"
   discSet:
     name: "Final Fantasy VIII (USA)"
     serials:
@@ -60134,7 +63285,8 @@ SCPS-45375:
     multitap: false
     linkCable: false
 SLPS-01266:
-  name: "Final Round (Japan)"
+  name: "Final Round"
+  saveName: "Final Round (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60152,7 +63304,8 @@ SLPS-01266:
     multitap: false
     linkCable: false
 SLUS-00064:
-  name: "Final Round, The (USA)"
+  name: "Final Round, The"
+  saveName: "Final Round, The (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -60170,7 +63323,8 @@ SLUS-00064:
     multitap: false
     linkCable: false
 SLPS-02158:
-  name: "Finger Flashing (Japan)"
+  name: "Finger Flashing"
+  saveName: "Finger Flashing (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -60192,7 +63346,8 @@ SLPS-02158:
     multitap: false
     linkCable: false
 SCPS-10055:
-  name: "Fire Panic - Mack no Rescue Daisakusen (Japan)"
+  name: "Fire Panic - Mack no Rescue Daisakusen"
+  saveName: "Fire Panic - Mack no Rescue Daisakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60211,7 +63366,8 @@ SCPS-10055:
     multitap: false
     linkCable: false
 SLPS-00277:
-  name: "Fire Pro Wrestling - Iron Slam '96 (Japan)"
+  name: "Fire Pro Wrestling - Iron Slam '96"
+  saveName: "Fire Pro Wrestling - Iron Slam '96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60229,7 +63385,8 @@ SLPS-00277:
     multitap: false
     linkCable: false
 SLPS-02065:
-  name: "Fire Pro Wrestling G (Japan)"
+  name: "Fire Pro Wrestling G"
+  saveName: "Fire Pro Wrestling G (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60248,7 +63405,8 @@ SLPS-02065:
     multitap: true
     linkCable: false
 SLPS-02817:
-  name: "Fire Pro Wrestling G (Japan) (Spike Library)"
+  name: "Fire Pro Wrestling G (Spike Library)"
+  saveName: "Fire Pro Wrestling G (Japan) (Spike Library)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60267,7 +63425,8 @@ SLPS-02817:
     multitap: true
     linkCable: false
 SLPS-01315:
-  name: "Fire Woman Matoigumi (Japan)"
+  name: "Fire Woman Matoigumi"
+  saveName: "Fire Woman Matoigumi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60285,7 +63444,8 @@ SLPS-01315:
     multitap: false
     linkCable: false
 SCES-03884:
-  name: "Firebugs (Europe) (En,Fr,De,Es,It,Nl,Pt,Sv,No,Da,Fi)"
+  name: "Firebugs"
+  saveName: "Firebugs (Europe) (En,Fr,De,Es,It,Nl,Pt,Sv,No,Da,Fi)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -60320,7 +63480,8 @@ SCES-03884:
     multitap: false
     linkCable: false
 SLPS-00148:
-  name: "Firemen 2, The - Pete & Danny (Japan)"
+  name: "Firemen 2, The - Pete & Danny"
+  saveName: "Firemen 2, The - Pete & Danny (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-7272-g143acca03"
@@ -60344,7 +63505,8 @@ SLPS-00148:
     multitap: false
     linkCable: false
 SLES-00145:
-  name: "Firestorm - Thunderhawk 2 (Europe) (En,Fr)"
+  name: "Firestorm - Thunderhawk 2"
+  saveName: "Firestorm - Thunderhawk 2 (Europe) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -60363,7 +63525,8 @@ SLES-00145:
     multitap: false
     linkCable: false
 SLES-00144:
-  name: "Firestorm - Thunderhawk 2 (Germany)"
+  name: "Firestorm - Thunderhawk 2"
+  saveName: "Firestorm - Thunderhawk 2 (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -60381,7 +63544,8 @@ SLES-00144:
     multitap: false
     linkCable: false
 SLES-00094:
-  name: "Firo & Klawd (Europe)"
+  name: "Firo & Klawd"
+  saveName: "Firo & Klawd (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -60399,7 +63563,8 @@ SLES-00094:
     multitap: false
     linkCable: false
 SLES-00252:
-  name: "Firo & Klawd (France)"
+  name: "Firo & Klawd"
+  saveName: "Firo & Klawd (France)"
   controllers:
     - DigitalController
   metadata:
@@ -60417,7 +63582,8 @@ SLES-00252:
     multitap: false
     linkCable: false
 SLES-00253:
-  name: "Firo & Klawd (Germany)"
+  name: "Firo & Klawd"
+  saveName: "Firo & Klawd (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -60435,7 +63601,8 @@ SLES-00253:
     multitap: false
     linkCable: false
 SLPS-00803:
-  name: "Firo & Klawd (Japan)"
+  name: "Firo & Klawd"
+  saveName: "Firo & Klawd (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60453,7 +63620,8 @@ SLPS-00803:
     multitap: false
     linkCable: false
 SLES-00254:
-  name: "Firo & Klawd (Spain)"
+  name: "Firo & Klawd"
+  saveName: "Firo & Klawd (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -60471,7 +63639,8 @@ SLES-00254:
     multitap: false
     linkCable: false
 SLPS-01708:
-  name: "First Kiss Story (Japan) (Disc 1)"
+  name: "First Kiss Story (Disc 1)"
+  saveName: "First Kiss Story (Japan) (Disc 1)"
   discSet:
     name: "First Kiss Story (Japan)"
     serials:
@@ -60495,7 +63664,8 @@ SLPS-01708:
     multitap: false
     linkCable: false
 SLPS-01709:
-  name: "First Kiss Story (Japan) (Disc 2)"
+  name: "First Kiss Story (Disc 2)"
+  saveName: "First Kiss Story (Japan) (Disc 2)"
   discSet:
     name: "First Kiss Story (Japan)"
     serials:
@@ -60519,7 +63689,8 @@ SLPS-01709:
     multitap: false
     linkCable: false
 SLPS-00604:
-  name: "First Queen IV - Varcia Senki (Japan)"
+  name: "First Queen IV - Varcia Senki"
+  saveName: "First Queen IV - Varcia Senki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60537,7 +63708,8 @@ SLPS-00604:
     multitap: false
     linkCable: false
 SLPS-00463:
-  name: "Fish Eyes (Japan)"
+  name: "Fish Eyes"
+  saveName: "Fish Eyes (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -60559,7 +63731,8 @@ SLPS-00463:
     multitap: false
     linkCable: false
 SLPS-02383:
-  name: "Fish Eyes II (Japan)"
+  name: "Fish Eyes II"
+  saveName: "Fish Eyes II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60578,7 +63751,8 @@ SLPS-02383:
     multitap: false
     linkCable: false
 SLPM-80523:
-  name: "Fish Eyes II (Japan) (Demo)"
+  name: "Fish Eyes II (Demo)"
+  saveName: "Fish Eyes II (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91526:
@@ -60620,7 +63794,8 @@ SLPS-03417:
     multitap: false
     linkCable: false
 SLPS-02288:
-  name: "Fish On! Bass (Japan)"
+  name: "Fish On! Bass"
+  saveName: "Fish On! Bass (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60639,7 +63814,8 @@ SLPS-02288:
     multitap: false
     linkCable: false
 SLPS-01943:
-  name: "Fisher's Road (Japan)"
+  name: "Fisher's Road"
+  saveName: "Fisher's Road (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60658,7 +63834,8 @@ SLPS-01943:
     multitap: false
     linkCable: false
 SLUS-00802:
-  name: "Fisherman's Bait - A Bass Challenge (USA)"
+  name: "Fisherman's Bait - A Bass Challenge"
+  saveName: "Fisherman's Bait - A Bass Challenge (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60677,7 +63854,8 @@ SLUS-00802:
     multitap: false
     linkCable: false
 SLES-02085:
-  name: "Fisherman's Bait - Bass Challenge (Europe)"
+  name: "Fisherman's Bait - Bass Challenge"
+  saveName: "Fisherman's Bait - Bass Challenge (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60696,7 +63874,8 @@ SLES-02085:
     multitap: false
     linkCable: false
 SLES-02596:
-  name: "Fisherman's Bait 2 - Big Ol' Bass (Europe)"
+  name: "Fisherman's Bait 2 - Big Ol' Bass"
+  saveName: "Fisherman's Bait 2 - Big Ol' Bass (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60715,7 +63894,8 @@ SLES-02596:
     multitap: false
     linkCable: false
 SLUS-00999:
-  name: "Fisherman's Bait 2 - Big Ol' Bass (USA)"
+  name: "Fisherman's Bait 2 - Big Ol' Bass"
+  saveName: "Fisherman's Bait 2 - Big Ol' Bass (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60734,7 +63914,8 @@ SLUS-00999:
     multitap: false
     linkCable: false
 SLES-03295:
-  name: "Fisherman's Bait 3 (Europe)"
+  name: "Fisherman's Bait 3"
+  saveName: "Fisherman's Bait 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60753,7 +63934,8 @@ SLES-03295:
     multitap: false
     linkCable: false
 SLPS-01931:
-  name: "Fishing Freaks - BassRise (Japan)"
+  name: "Fishing Freaks - BassRise"
+  saveName: "Fishing Freaks - BassRise (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60772,14 +63954,16 @@ SLPS-01931:
     multitap: false
     linkCable: false
 SLPM-80374:
-  name: "Fishing Freaks - BassRise (Japan) (Demo)"
+  name: "Fishing Freaks - BassRise (Demo)"
+  saveName: "Fishing Freaks - BassRise (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
     - SLPM-80374
     - SLPM-80404
 SLPS-01930:
-  name: "Fishing Freaks - BassRise (Japan) (Doukon Pack)"
+  name: "Fishing Freaks - BassRise (Doukon Pack)"
+  saveName: "Fishing Freaks - BassRise (Japan) (Doukon Pack)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60798,7 +63982,8 @@ SLPS-01930:
     multitap: false
     linkCable: false
 SLPS-02572:
-  name: "Fishing Freaks - BassRise Plus (Japan)"
+  name: "Fishing Freaks - BassRise Plus"
+  saveName: "Fishing Freaks - BassRise Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60817,7 +64002,8 @@ SLPS-02572:
     multitap: false
     linkCable: false
 SLPS-00749:
-  name: "Fishing Koshien II (Japan)"
+  name: "Fishing Koshien II"
+  saveName: "Fishing Koshien II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60835,7 +64021,8 @@ SLPS-00749:
     multitap: false
     linkCable: false
 SLPS-00538:
-  name: "Fist (Japan)"
+  name: "Fist"
+  saveName: "Fist (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60853,7 +64040,8 @@ SLPS-00538:
     multitap: false
     linkCable: false
 SLPS-02719:
-  name: "Flamberge no Seirei (Japan)"
+  name: "Flamberge no Seirei"
+  saveName: "Flamberge no Seirei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60872,7 +64060,8 @@ SLPS-02719:
     multitap: false
     linkCable: false
 SLES-03320:
-  name: "Flintstones, Die - Bedrock Bowling (Germany)"
+  name: "Flintstones, Die - Bedrock Bowling"
+  saveName: "Flintstones, Die - Bedrock Bowling (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60891,7 +64080,8 @@ SLES-03320:
     multitap: false
     linkCable: false
 SLES-02345:
-  name: "Flintstones, The - Bedrock Bowling (Europe)"
+  name: "Flintstones, The - Bedrock Bowling"
+  saveName: "Flintstones, The - Bedrock Bowling (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60910,7 +64100,8 @@ SLES-02345:
     multitap: false
     linkCable: false
 SLUS-00931:
-  name: "Flintstones, The - Bedrock Bowling (USA)"
+  name: "Flintstones, The - Bedrock Bowling"
+  saveName: "Flintstones, The - Bedrock Bowling (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -60929,7 +64120,8 @@ SLUS-00931:
     multitap: false
     linkCable: false
 SLES-00453:
-  name: "Floating Runner (Europe)"
+  name: "Floating Runner"
+  saveName: "Floating Runner (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -60947,7 +64139,8 @@ SLES-00453:
     multitap: false
     linkCable: false
 SLPS-00147:
-  name: "Floating Runner - 7-tsu no Suishou no Monogatari (Japan)"
+  name: "Floating Runner - 7-tsu no Suishou no Monogatari"
+  saveName: "Floating Runner - 7-tsu no Suishou no Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -60965,7 +64158,8 @@ SLPS-00147:
     multitap: false
     linkCable: false
 SLUS-00231:
-  name: "Floating Runner - Quest for the 7 Crystals (USA)"
+  name: "Floating Runner - Quest for the 7 Crystals"
+  saveName: "Floating Runner - Quest for the 7 Crystals (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -60983,7 +64177,8 @@ SLUS-00231:
     multitap: false
     linkCable: false
 SCES-00985:
-  name: "Fluid (Europe)"
+  name: "Fluid"
+  saveName: "Fluid (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -61003,11 +64198,13 @@ SCES-00985:
     multitap: false
     linkCable: false
 SCED-01572:
-  name: "Fluid (Germany) (Demo)"
+  name: "Fluid (Demo)"
+  saveName: "Fluid (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-04156:
-  name: "Flying Squadron (Europe)"
+  name: "Flying Squadron"
+  saveName: "Flying Squadron (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61026,7 +64223,8 @@ SLES-04156:
     multitap: false
     linkCable: false
 SLES-03546:
-  name: "Folles Poursuites (France)"
+  name: "Folles Poursuites"
+  saveName: "Folles Poursuites (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61045,7 +64243,8 @@ SLES-03546:
     multitap: false
     linkCable: false
 SLES-04047:
-  name: "Football Madness (Europe)"
+  name: "Football Madness"
+  saveName: "Football Madness (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61064,7 +64263,8 @@ SLES-04047:
     multitap: true
     linkCable: false
 SLES-02978:
-  name: "Football Manager Campionato 2001 (Italy)"
+  name: "Football Manager Campionato 2001"
+  saveName: "Football Manager Campionato 2001 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61084,7 +64284,8 @@ SLES-02978:
     multitap: false
     linkCable: false
 SLES-03606:
-  name: "Football Manager Campionato 2002 (Italy)"
+  name: "Football Manager Campionato 2002"
+  saveName: "Football Manager Campionato 2002 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61104,9 +64305,11 @@ SLES-03606:
     multitap: false
     linkCable: false
 SCED-01387:
-  name: "Football Special (Europe)"
+  name: "Football Special"
+  saveName: "Football Special (Europe)"
 SLES-03276:
-  name: "Ford Racing (Europe)"
+  name: "Ford Racing"
+  saveName: "Ford Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61126,7 +64329,8 @@ SLES-03276:
     multitap: false
     linkCable: false
 SLUS-01301:
-  name: "Ford Racing (USA)"
+  name: "Ford Racing"
+  saveName: "Ford Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61146,7 +64350,8 @@ SLUS-01301:
     multitap: false
     linkCable: false
 SLES-04109:
-  name: "Ford Truck Mania (Europe) (En,Fr,De,Es)"
+  name: "Ford Truck Mania"
+  saveName: "Ford Truck Mania (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61169,7 +64374,8 @@ SLES-04109:
     multitap: false
     linkCable: false
 SLUS-01540:
-  name: "Ford Truck Mania (USA)"
+  name: "Ford Truck Mania"
+  saveName: "Ford Truck Mania (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61189,7 +64395,8 @@ SLUS-01540:
     multitap: false
     linkCable: false
 SLPS-03191:
-  name: "Forget Me Not - Pallete (Japan)"
+  name: "Forget Me Not - Pallete"
+  saveName: "Forget Me Not - Pallete (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61208,7 +64415,8 @@ SLPS-03191:
     multitap: false
     linkCable: false
 SLPS-00762:
-  name: "Formation Soccer '97 - The Road to France (Japan)"
+  name: "Formation Soccer '97 - The Road to France"
+  saveName: "Formation Soccer '97 - The Road to France (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -61226,7 +64434,8 @@ SLPS-00762:
     multitap: false
     linkCable: false
 SLPM-86640:
-  name: "Formation Soccer '98 (Japan)"
+  name: "Formation Soccer '98"
+  saveName: "Formation Soccer '98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61245,7 +64454,8 @@ SLPM-86640:
     multitap: false
     linkCable: false
 SLPS-01419:
-  name: "Formation Soccer '98 - Ganbare Nippon in France (Japan)"
+  name: "Formation Soccer '98 - Ganbare Nippon in France"
+  saveName: "Formation Soccer '98 - Ganbare Nippon in France (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61285,7 +64495,8 @@ SCPS-45077:
     multitap: false
     linkCable: true
 SLES-00298:
-  name: "Formula 1 (Europe) (En,Fr,De,Es,It)"
+  name: "Formula 1"
+  saveName: "Formula 1 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - NeGcon
@@ -61310,7 +64521,8 @@ SLES-00298:
     multitap: false
     linkCable: true
 SIPS-60011:
-  name: "Formula 1 (Japan)"
+  name: "Formula 1"
+  saveName: "Formula 1 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -61331,7 +64543,8 @@ SIPS-60011:
     multitap: false
     linkCable: true
 SCUS-94353:
-  name: "Formula 1 (USA)"
+  name: "Formula 1"
+  saveName: "Formula 1 (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -61352,7 +64565,8 @@ SCUS-94353:
     multitap: false
     linkCable: true
 SLES-00859:
-  name: "Formula 1 97 (Europe) (En,Fr,De,Es,It)"
+  name: "Formula 1 97"
+  saveName: "Formula 1 97 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61376,7 +64590,8 @@ SLES-00859:
     multitap: false
     linkCable: false
 SIPS-60023:
-  name: "Formula 1 97 (Japan) (En,Ja,Fr,De,Es,It)"
+  name: "Formula 1 97"
+  saveName: "Formula 1 97 (Japan) (En,Ja,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61396,7 +64611,8 @@ SIPS-60023:
     multitap: false
     linkCable: false
 SLES-01421:
-  name: "Formula 1 98 (Europe) (En,Fr,De,Es,It,Fi)"
+  name: "Formula 1 98"
+  saveName: "Formula 1 98 (Europe) (En,Fr,De,Es,It,Fi)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -61422,7 +64638,8 @@ SLES-01421:
     multitap: false
     linkCable: true
 SLUS-00744:
-  name: "Formula 1 98 (USA) (En,Fr,De,Es,It,Fi)"
+  name: "Formula 1 98"
+  saveName: "Formula 1 98 (USA) (En,Fr,De,Es,It,Fi)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -61448,7 +64665,8 @@ SLUS-00744:
     multitap: false
     linkCable: true
 SLUS-00546:
-  name: "Formula 1 Championship Edition (USA) (En,Fr,De,Es,It)"
+  name: "Formula 1 Championship Edition"
+  saveName: "Formula 1 Championship Edition (USA) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -61471,7 +64689,8 @@ SLUS-00546:
     multitap: false
     linkCable: false
 SLPS-00358:
-  name: "Formula Circus (Japan)"
+  name: "Formula Circus"
+  saveName: "Formula Circus (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -61490,7 +64709,8 @@ SLPS-00358:
     multitap: false
     linkCable: false
 SLES-03994:
-  name: "Formula GP (Europe)"
+  name: "Formula GP"
+  saveName: "Formula GP (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61510,7 +64730,8 @@ SLES-03994:
     multitap: false
     linkCable: false
 SLPS-01154:
-  name: "Formula Grand Prix - Team Un'ei Simulation 2 - 1997-nenban (Japan)"
+  name: "Formula Grand Prix - Team Un'ei Simulation 2 - 1997-nenban"
+  saveName: "Formula Grand Prix - Team Un'ei Simulation 2 - 1997-nenban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -61528,11 +64749,13 @@ SLPS-01154:
     multitap: false
     linkCable: false
 SLED-00447:
-  name: "Formula Karts - Special Edition (Europe) (Demo)"
+  name: "Formula Karts - Special Edition (Demo)"
+  saveName: "Formula Karts - Special Edition (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00726:
-  name: "Formula Karts - Special Edition (Europe) (En,De,Es,It)"
+  name: "Formula Karts - Special Edition"
+  saveName: "Formula Karts - Special Edition (Europe) (En,De,Es,It)"
   controllers:
     - DigitalController
     - NeGcon
@@ -61554,7 +64777,8 @@ SLES-00726:
     multitap: false
     linkCable: false
 SLPS-02259:
-  name: "Formula Nippon '99 - Racing Driver ni Narou! (Japan)"
+  name: "Formula Nippon '99 - Racing Driver ni Narou!"
+  saveName: "Formula Nippon '99 - Racing Driver ni Narou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61574,7 +64798,8 @@ SLPS-02259:
     multitap: false
     linkCable: false
 SLES-02526:
-  name: "Formula Nippon (Europe) (En,Es,It)"
+  name: "Formula Nippon"
+  saveName: "Formula Nippon (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61596,7 +64821,8 @@ SLES-02526:
     multitap: false
     linkCable: false
 SLES-02527:
-  name: "Formula Nippon (Europe) (Fr,De)"
+  name: "Formula Nippon"
+  saveName: "Formula Nippon (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61617,18 +64843,21 @@ SLES-02527:
     multitap: false
     linkCable: false
 SCED-01979:
-  name: "Formula One '99 (Europe) (En,Fr,De,It) (Beta)"
+  name: "Formula One '99 (Beta)"
+  saveName: "Formula One '99 (Europe) (En,Fr,De,It) (Beta)"
   traits:
     - ForceInterpreter
   libcrypt: true
 SLED-00491:
-  name: "Formula One (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Formula One (Demo)"
+  saveName: "Formula One (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceInterpreter
 SCES-02777:
-  name: "Formula One 2000 (Europe) (En,Fi)"
+  name: "Formula One 2000"
+  saveName: "Formula One 2000 (Europe) (En,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61651,7 +64880,8 @@ SCES-02777:
     multitap: false
     linkCable: false
 SCES-02779:
-  name: "Formula One 2000 (Europe) (Es,It)"
+  name: "Formula One 2000"
+  saveName: "Formula One 2000 (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61674,7 +64904,8 @@ SCES-02779:
     multitap: false
     linkCable: false
 SCES-02778:
-  name: "Formula One 2000 (Europe) (Fr,De)"
+  name: "Formula One 2000"
+  saveName: "Formula One 2000 (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61697,7 +64928,8 @@ SCES-02778:
     multitap: false
     linkCable: false
 SLUS-01134:
-  name: "Formula One 2000 (USA)"
+  name: "Formula One 2000"
+  saveName: "Formula One 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61719,7 +64951,8 @@ SLUS-01134:
     multitap: false
     linkCable: false
 SCES-03404:
-  name: "Formula One 2001 (Europe) (En,Fi)"
+  name: "Formula One 2001"
+  saveName: "Formula One 2001 (Europe) (En,Fi)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -61744,7 +64977,8 @@ SCES-03404:
     multitap: false
     linkCable: false
 SCES-03424:
-  name: "Formula One 2001 (Europe) (Es,It)"
+  name: "Formula One 2001"
+  saveName: "Formula One 2001 (Europe) (Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -61769,7 +65003,8 @@ SCES-03424:
     multitap: false
     linkCable: false
 SCES-03423:
-  name: "Formula One 2001 (Europe) (Fr,De)"
+  name: "Formula One 2001"
+  saveName: "Formula One 2001 (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61792,7 +65027,8 @@ SCES-03423:
     multitap: false
     linkCable: false
 SCES-03524:
-  name: "Formula One 2001 (Russia)"
+  name: "Formula One 2001"
+  saveName: "Formula One 2001 (Russia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61814,7 +65050,8 @@ SCES-03524:
     multitap: false
     linkCable: false
 SCES-02222:
-  name: "Formula One 99 (Europe) (En,Es,Fi)"
+  name: "Formula One 99"
+  saveName: "Formula One 99 (Europe) (En,Es,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61839,7 +65076,8 @@ SCES-02222:
     multitap: false
     linkCable: false
 SCES-01979:
-  name: "Formula One 99 (Europe) (En,Fr,De,It)"
+  name: "Formula One 99"
+  saveName: "Formula One 99 (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61865,7 +65103,8 @@ SCES-01979:
     multitap: false
     linkCable: false
 SCPS-10101:
-  name: "Formula One 99 (Japan)"
+  name: "Formula One 99"
+  saveName: "Formula One 99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61889,7 +65128,8 @@ SCPS-10101:
     multitap: false
     linkCable: false
 SLUS-00870:
-  name: "Formula One 99 (USA) (En,Fr,Es)"
+  name: "Formula One 99"
+  saveName: "Formula One 99 (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1638-g0af22825"
@@ -61916,7 +65156,8 @@ SLUS-00870:
     multitap: false
     linkCable: false
 SCES-03886:
-  name: "Formula One Arcade (Europe) (En,Fr,De,Es,It)"
+  name: "Formula One Arcade"
+  saveName: "Formula One Arcade (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61942,7 +65183,8 @@ SCES-03886:
     multitap: false
     linkCable: false
 SLES-00745:
-  name: "Forsaken (Europe)"
+  name: "Forsaken"
+  saveName: "Forsaken (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61961,11 +65203,13 @@ SLES-00745:
     multitap: false
     linkCable: false
 SLED-01263:
-  name: "Forsaken (Europe) (Demo)"
+  name: "Forsaken (Demo)"
+  saveName: "Forsaken (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01086:
-  name: "Forsaken (France)"
+  name: "Forsaken"
+  saveName: "Forsaken (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -61984,7 +65228,8 @@ SLES-01086:
     multitap: false
     linkCable: false
 SLES-01087:
-  name: "Forsaken (Germany)"
+  name: "Forsaken"
+  saveName: "Forsaken (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62003,7 +65248,8 @@ SLES-01087:
     multitap: false
     linkCable: false
 SLES-01088:
-  name: "Forsaken (Italy)"
+  name: "Forsaken"
+  saveName: "Forsaken (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62022,7 +65268,8 @@ SLES-01088:
     multitap: false
     linkCable: false
 SLPM-86307:
-  name: "Forsaken (Japan)"
+  name: "Forsaken"
+  saveName: "Forsaken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62041,7 +65288,8 @@ SLPM-86307:
     multitap: false
     linkCable: false
 SLES-01089:
-  name: "Forsaken (Spain)"
+  name: "Forsaken"
+  saveName: "Forsaken (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62060,7 +65308,8 @@ SLES-01089:
     multitap: false
     linkCable: false
 SLUS-00458:
-  name: "Forsaken (USA)"
+  name: "Forsaken"
+  saveName: "Forsaken (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1969-g671033fd"
@@ -62082,7 +65331,8 @@ SLUS-00458:
     multitap: false
     linkCable: false
 SLUS-00101:
-  name: "Fox Hunt (USA) (Disc 1)"
+  name: "Fox Hunt (Disc 1)"
+  saveName: "Fox Hunt (USA) (Disc 1)"
   discSet:
     name: "Fox Hunt (USA)"
     serials:
@@ -62106,7 +65356,8 @@ SLUS-00101:
     multitap: false
     linkCable: false
 SLUS-00175:
-  name: "Fox Hunt (USA) (Disc 2)"
+  name: "Fox Hunt (Disc 2)"
+  saveName: "Fox Hunt (USA) (Disc 2)"
   discSet:
     name: "Fox Hunt (USA)"
     serials:
@@ -62130,7 +65381,8 @@ SLUS-00175:
     multitap: false
     linkCable: false
 SLUS-00176:
-  name: "Fox Hunt (USA) (Disc 3)"
+  name: "Fox Hunt (Disc 3)"
+  saveName: "Fox Hunt (USA) (Disc 3)"
   discSet:
     name: "Fox Hunt (USA)"
     serials:
@@ -62154,7 +65406,8 @@ SLUS-00176:
     multitap: false
     linkCable: false
 SLPS-01355:
-  name: "Fox Junction (Japan)"
+  name: "Fox Junction"
+  saveName: "Fox Junction (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62173,7 +65426,8 @@ SLPS-01355:
     multitap: false
     linkCable: false
 SLUS-01129:
-  name: "FoxKids.com - Micro Maniacs Racing (USA)"
+  name: "FoxKids.com - Micro Maniacs Racing"
+  saveName: "FoxKids.com - Micro Maniacs Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -62196,7 +65450,8 @@ SLUS-01129:
     multitap: true
     linkCable: false
 SLES-00100:
-  name: "Frank Thomas Big Hurt Baseball (Europe)"
+  name: "Frank Thomas Big Hurt Baseball"
+  saveName: "Frank Thomas Big Hurt Baseball (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -62214,7 +65469,8 @@ SLES-00100:
     multitap: false
     linkCable: false
 SLPS-00453:
-  name: "Frank Thomas Big Hurt Baseball (Japan)"
+  name: "Frank Thomas Big Hurt Baseball"
+  saveName: "Frank Thomas Big Hurt Baseball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -62232,7 +65488,8 @@ SLPS-00453:
     multitap: false
     linkCable: false
 SLUS-00010:
-  name: "Frank Thomas Big Hurt Baseball (USA)"
+  name: "Frank Thomas Big Hurt Baseball"
+  saveName: "Frank Thomas Big Hurt Baseball (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -62250,7 +65507,8 @@ SLUS-00010:
     multitap: false
     linkCable: false
 SLES-01267:
-  name: "Frankreich 98 - Die Fussball-WM (Germany) (En,Fr,De,Es,Nl,Sv,Da)"
+  name: "Frankreich 98 - Die Fussball-WM"
+  saveName: "Frankreich 98 - Die Fussball-WM (Germany) (En,Fr,De,Es,Nl,Sv,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62269,11 +65527,13 @@ SLES-01267:
     multitap: true
     linkCable: false
 SCED-04009:
-  name: "Free Spin Demo Disc! (Europe)"
+  name: "Free Spin Demo Disc!"
+  saveName: "Free Spin Demo Disc! (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-00985:
-  name: "Free Talk Studio - Mari no Kimamana Oshaberi (Japan)"
+  name: "Free Talk Studio - Mari no Kimamana Oshaberi"
+  saveName: "Free Talk Studio - Mari no Kimamana Oshaberi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -62309,7 +65569,8 @@ SLPS-02655:
     multitap: false
     linkCable: false
 SLUS-00767:
-  name: "Freestyle Boardin' '99 (USA)"
+  name: "Freestyle Boardin' '99"
+  saveName: "Freestyle Boardin' '99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62328,7 +65589,8 @@ SLUS-00767:
     multitap: false
     linkCable: false
 SLES-02820:
-  name: "Freestyle Motocross - McGrath vs. Pastrana (Europe)"
+  name: "Freestyle Motocross - McGrath vs. Pastrana"
+  saveName: "Freestyle Motocross - McGrath vs. Pastrana (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62350,7 +65612,8 @@ SLES-02820:
     multitap: false
     linkCable: false
 SLUS-00122:
-  name: "Freestyle Motocross - McGrath vs. Pastrana (USA)"
+  name: "Freestyle Motocross - McGrath vs. Pastrana"
+  saveName: "Freestyle Motocross - McGrath vs. Pastrana (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62372,7 +65635,8 @@ SLUS-00122:
     multitap: false
     linkCable: false
 SLES-03363:
-  name: "Freestyle Scooter (Europe)"
+  name: "Freestyle Scooter"
+  saveName: "Freestyle Scooter (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62394,7 +65658,8 @@ SLES-03363:
     multitap: false
     linkCable: false
 SLES-00784:
-  name: "Frenzy! (Europe)"
+  name: "Frenzy!"
+  saveName: "Frenzy! (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62433,7 +65698,8 @@ SLUS-01122:
     multitap: false
     linkCable: false
 SLES-00704:
-  name: "Frogger (Europe) (En,Fr,De,Es,It)"
+  name: "Frogger"
+  saveName: "Frogger (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -62455,7 +65721,8 @@ SLES-00704:
     multitap: true
     linkCable: false
 SLPS-01399:
-  name: "Frogger (Japan)"
+  name: "Frogger"
+  saveName: "Frogger (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -62473,7 +65740,8 @@ SLPS-01399:
     multitap: true
     linkCable: false
 SLUS-00506:
-  name: "Frogger (USA)"
+  name: "Frogger"
+  saveName: "Frogger (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -62494,7 +65762,8 @@ SLUS-00506:
     multitap: true
     linkCable: false
 SLES-02853:
-  name: "Frogger 2 - Swampy's Revenge (Europe) (En,Fr,De,It)"
+  name: "Frogger 2 - Swampy's Revenge"
+  saveName: "Frogger 2 - Swampy's Revenge (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62516,7 +65785,8 @@ SLES-02853:
     multitap: true
     linkCable: false
 SLUS-01172:
-  name: "Frogger 2 - Swampy's Revenge (USA)"
+  name: "Frogger 2 - Swampy's Revenge"
+  saveName: "Frogger 2 - Swampy's Revenge (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -62539,7 +65809,8 @@ SLUS-01172:
     multitap: true
     linkCable: false
 SLPM-80268:
-  name: "From Software 1998 Summer Preview Movies (Japan)"
+  name: "From Software 1998 Summer Preview Movies"
+  saveName: "From Software 1998 Summer Preview Movies (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-03555:
@@ -62562,7 +65833,8 @@ SLPS-03555:
     multitap: false
     linkCable: false
 SLPS-03164:
-  name: "From TV Animation One Piece - Grand Battle! (Japan)"
+  name: "From TV Animation One Piece - Grand Battle!"
+  saveName: "From TV Animation One Piece - Grand Battle! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62581,7 +65853,8 @@ SLPS-03164:
     multitap: false
     linkCable: false
 SLPS-03408:
-  name: "From TV Animation One Piece - Grand Battle! 2 (Japan)"
+  name: "From TV Animation One Piece - Grand Battle! 2"
+  saveName: "From TV Animation One Piece - Grand Battle! 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62600,7 +65873,8 @@ SLPS-03408:
     multitap: false
     linkCable: false
 SLPS-03550:
-  name: "From TV Animation One Piece - Oceans of Dreams! (Japan)"
+  name: "From TV Animation One Piece - Oceans of Dreams!"
+  saveName: "From TV Animation One Piece - Oceans of Dreams! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62619,7 +65893,8 @@ SLPS-03550:
     multitap: false
     linkCable: false
 SLPS-03252:
-  name: "From TV Animation One Piece - Tobidase Kaizokudan! (Japan)"
+  name: "From TV Animation One Piece - Tobidase Kaizokudan!"
+  saveName: "From TV Animation One Piece - Tobidase Kaizokudan! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62638,7 +65913,8 @@ SLPS-03252:
     multitap: false
     linkCable: false
 SLPS-03251:
-  name: "From TV Animation One Piece - Tobidase Kaizokudan! (Japan) (PocketStation Doukon)"
+  name: "From TV Animation One Piece - Tobidase Kaizokudan! (PocketStation Doukon)"
+  saveName: "From TV Animation One Piece - Tobidase Kaizokudan! (Japan) (PocketStation Doukon)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62657,7 +65933,8 @@ SLPS-03251:
     multitap: false
     linkCable: false
 SLPM-87317:
-  name: "Front Mission 1st (Japan)"
+  name: "Front Mission 1st"
+  saveName: "Front Mission 1st (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62676,7 +65953,8 @@ SLPM-87317:
     multitap: false
     linkCable: false
 SLPM-87330:
-  name: "Front Mission 1st (Japan) (Front Mission History)"
+  name: "Front Mission 1st (Front Mission History)"
+  saveName: "Front Mission 1st (Japan) (Front Mission History)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62695,7 +65973,8 @@ SLPM-87330:
     multitap: false
     linkCable: false
 SLPM-87331:
-  name: "Front Mission 2 (Japan) (Front Mission History)"
+  name: "Front Mission 2 (Front Mission History)"
+  saveName: "Front Mission 2 (Japan) (Front Mission History)"
   controllers:
     - DigitalController
   traits:
@@ -62717,7 +65996,8 @@ SLPM-87331:
     multitap: false
     linkCable: false
 SLPS-01000:
-  name: "Front Mission 2 (Japan, Asia)"
+  name: "Front Mission 2"
+  saveName: "Front Mission 2 (Japan, Asia)"
   controllers:
     - DigitalController
   traits:
@@ -62742,7 +66022,8 @@ SLPS-01000:
     multitap: false
     linkCable: false
 SLES-02423:
-  name: "Front Mission 3 (Europe)"
+  name: "Front Mission 3"
+  saveName: "Front Mission 3 (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -62763,7 +66044,8 @@ SLES-02423:
     multitap: false
     linkCable: false
 SLPS-02222:
-  name: "Front Mission 3 (Japan)"
+  name: "Front Mission 3"
+  saveName: "Front Mission 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62788,9 +66070,11 @@ SLPS-02222:
     multitap: false
     linkCable: false
 SLPM-80467:
-  name: "Front Mission 3 (Japan) (Taikenban)"
+  name: "Front Mission 3 (Taikenban)"
+  saveName: "Front Mission 3 (Japan) (Taikenban)"
 SLUS-01011:
-  name: "Front Mission 3 (USA)"
+  name: "Front Mission 3"
+  saveName: "Front Mission 3 (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -62830,7 +66114,8 @@ SCPS-45090:
     multitap: false
     linkCable: false
 SLPM-87398:
-  name: "Front Mission Alternative (Japan)"
+  name: "Front Mission Alternative"
+  saveName: "Front Mission Alternative (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -62852,7 +66137,8 @@ SLPM-87398:
     multitap: false
     linkCable: false
 SLES-02767:
-  name: "Frontschweine (Germany)"
+  name: "Frontschweine"
+  saveName: "Frontschweine (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62872,7 +66158,8 @@ SLES-02767:
     multitap: true
     linkCable: false
 SLPS-02307:
-  name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan)"
+  name: "Fun! Fun! Pingu - Youkoso! Nankyoku e"
+  saveName: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62891,11 +66178,13 @@ SLPS-02307:
     multitap: false
     linkCable: false
 SLPM-80486:
-  name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan) (Demo)"
+  name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Demo)"
+  saveName: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02306:
-  name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan) (Shokai Suuryou Genteiban)"
+  name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Shokai Suuryou Genteiban)"
+  saveName: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan) (Shokai Suuryou Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62914,7 +66203,8 @@ SLPS-02306:
     multitap: false
     linkCable: false
 SLPS-03496:
-  name: "Funky Boxers (Japan)"
+  name: "Funky Boxers"
+  saveName: "Funky Boxers (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62933,7 +66223,8 @@ SLPS-03496:
     multitap: false
     linkCable: false
 SLPM-86808:
-  name: "Furimukeba Tonari ni (Japan)"
+  name: "Furimukeba Tonari ni"
+  saveName: "Furimukeba Tonari ni (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -62951,7 +66242,8 @@ SLPM-86808:
     multitap: false
     linkCable: false
 SLPM-86642:
-  name: "Fushigi Deka (Japan)"
+  name: "Fushigi Deka"
+  saveName: "Fushigi Deka (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -62970,7 +66262,8 @@ SLPM-86642:
     multitap: false
     linkCable: false
 SLPS-01235:
-  name: "Fushigi na Data Disc (Japan)"
+  name: "Fushigi na Data Disc"
+  saveName: "Fushigi na Data Disc (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -62988,7 +66281,8 @@ SLPS-01235:
     multitap: false
     linkCable: false
 SCPS-45372:
-  name: "Fushigi na Data Disc (Japan, Asia) (Disc 2)"
+  name: "Fushigi na Data Disc (Disc 2)"
+  saveName: "Fushigi na Data Disc (Japan, Asia) (Disc 2)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63010,7 +66304,8 @@ SCPS-45372:
     multitap: false
     linkCable: false
 SLPM-86507:
-  name: "Fushigi no Kuni no Angelique (Japan)"
+  name: "Fushigi no Kuni no Angelique"
+  saveName: "Fushigi no Kuni no Angelique (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -63067,7 +66362,8 @@ SLPM-86430:
     multitap: false
     linkCable: false
 SCES-01702:
-  name: "Fussball Live (Germany)"
+  name: "Fussball Live"
+  saveName: "Fussball Live (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63087,7 +66383,8 @@ SCES-01702:
     multitap: true
     linkCable: false
 SCES-03074:
-  name: "Fussball Live 2 (Germany)"
+  name: "Fussball Live 2"
+  saveName: "Fussball Live 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63106,11 +66403,13 @@ SCES-03074:
     multitap: true
     linkCable: false
 SCED-03203:
-  name: "Fussball Live 2 (Germany) (Demo)"
+  name: "Fussball Live 2 (Demo)"
+  saveName: "Fussball Live 2 (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03062:
-  name: "Fussball Manager 2001 (Germany)"
+  name: "Fussball Manager 2001"
+  saveName: "Fussball Manager 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63130,9 +66429,11 @@ SLES-03062:
     multitap: false
     linkCable: false
 SCED-01307:
-  name: "Fussball Spezial 01 (Germany)"
+  name: "Fussball Spezial 01"
+  saveName: "Fussball Spezial 01 (Germany)"
 SLES-01449:
-  name: "Future Cop - L.A.P.D. (Europe) (En,Fr)"
+  name: "Future Cop - L.A.P.D."
+  saveName: "Future Cop - L.A.P.D. (Europe) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63152,11 +66453,13 @@ SLES-01449:
     multitap: false
     linkCable: false
 SLED-01509:
-  name: "Future Cop - L.A.P.D. (Europe) (En,Fr) (Demo)"
+  name: "Future Cop - L.A.P.D. (Demo)"
+  saveName: "Future Cop - L.A.P.D. (Europe) (En,Fr) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01482:
-  name: "Future Cop - L.A.P.D. (Germany)"
+  name: "Future Cop - L.A.P.D."
+  saveName: "Future Cop - L.A.P.D. (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63175,7 +66478,8 @@ SLES-01482:
     multitap: false
     linkCable: false
 SLUS-00739:
-  name: "Future Cop - L.A.P.D. (USA)"
+  name: "Future Cop - L.A.P.D."
+  saveName: "Future Cop - L.A.P.D. (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -63197,11 +66501,13 @@ SLUS-00739:
     multitap: false
     linkCable: false
 SLUS-90034:
-  name: "Future Cop - L.A.P.D. (USA) (Demo)"
+  name: "Future Cop - L.A.P.D. (Demo)"
+  saveName: "Future Cop - L.A.P.D. (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03508:
-  name: "Future Racer (Europe)"
+  name: "Future Racer"
+  saveName: "Future Racer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63221,7 +66527,8 @@ SLES-03508:
     multitap: false
     linkCable: false
 SLPS-01790:
-  name: "Fuujin Ryouiki Eretzvaju (Japan)"
+  name: "Fuujin Ryouiki Eretzvaju"
+  saveName: "Fuujin Ryouiki Eretzvaju (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -63239,11 +66546,13 @@ SLPS-01790:
     multitap: false
     linkCable: false
 SLPM-80364:
-  name: "Fuujin Ryouiki Eretzvaju (Japan) (Demo)"
+  name: "Fuujin Ryouiki Eretzvaju (Demo)"
+  saveName: "Fuujin Ryouiki Eretzvaju (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03094:
-  name: "Fuuraiki (Japan)"
+  name: "Fuuraiki"
+  saveName: "Fuuraiki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63262,7 +66571,8 @@ SLPS-03094:
     multitap: false
     linkCable: false
 SLPS-00441:
-  name: "Fuuun Gokuu Ninden (Japan)"
+  name: "Fuuun Gokuu Ninden"
+  saveName: "Fuuun Gokuu Ninden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -63280,13 +66590,15 @@ SLPS-00441:
     multitap: false
     linkCable: false
 SLPM-80205:
-  name: "G Darius (Japan) (Demo)"
+  name: "G Darius (Demo)"
+  saveName: "G Darius (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SCPS-45202:
-  name: "G Darius (Japan, Asia)"
+  name: "G Darius"
+  saveName: "G Darius (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63309,7 +66621,8 @@ SCPS-45202:
     multitap: false
     linkCable: false
 SLES-00082:
-  name: "G-Police (Europe) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (Europe) (Disc 1)"
   discSet:
     name: "G-Police (Europe)"
     serials:
@@ -63333,7 +66646,8 @@ SLES-00082:
     multitap: false
     linkCable: false
 SLES-10082:
-  name: "G-Police (Europe) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (Europe) (Disc 2)"
   discSet:
     name: "G-Police (Europe)"
     serials:
@@ -63357,11 +66671,13 @@ SLES-10082:
     multitap: false
     linkCable: false
 SLED-01034:
-  name: "G-Police (France) (Demo)"
+  name: "G-Police (Demo)"
+  saveName: "G-Police (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00853:
-  name: "G-Police (France) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (France) (Disc 1)"
   discSet:
     name: "G-Police (France)"
     serials:
@@ -63385,7 +66701,8 @@ SLES-00853:
     multitap: false
     linkCable: false
 SLES-10853:
-  name: "G-Police (France) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (France) (Disc 2)"
   discSet:
     name: "G-Police (France)"
     serials:
@@ -63409,7 +66726,8 @@ SLES-10853:
     multitap: false
     linkCable: false
 SLES-00854:
-  name: "G-Police (Germany) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (Germany) (Disc 1)"
   discSet:
     name: "G-Police (Germany)"
     serials:
@@ -63433,7 +66751,8 @@ SLES-00854:
     multitap: false
     linkCable: false
 SLES-10854:
-  name: "G-Police (Germany) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (Germany) (Disc 2)"
   discSet:
     name: "G-Police (Germany)"
     serials:
@@ -63457,7 +66776,8 @@ SLES-10854:
     multitap: false
     linkCable: false
 SLES-00855:
-  name: "G-Police (Italy) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (Italy) (Disc 1)"
   discSet:
     name: "G-Police (Italy)"
     serials:
@@ -63481,7 +66801,8 @@ SLES-00855:
     multitap: false
     linkCable: false
 SLES-10855:
-  name: "G-Police (Italy) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (Italy) (Disc 2)"
   discSet:
     name: "G-Police (Italy)"
     serials:
@@ -63505,11 +66826,13 @@ SLES-10855:
     multitap: false
     linkCable: false
 PCPX-96125:
-  name: "G-Police (Japan) (Demo)"
+  name: "G-Police (Demo)"
+  saveName: "G-Police (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10065:
-  name: "G-Police (Japan) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (Japan) (Disc 1)"
   discSet:
     name: "G-Police (Japan)"
     serials:
@@ -63533,7 +66856,8 @@ SCPS-10065:
     multitap: false
     linkCable: false
 SCPS-10066:
-  name: "G-Police (Japan) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (Japan) (Disc 2)"
   discSet:
     name: "G-Police (Japan)"
     serials:
@@ -63557,7 +66881,8 @@ SCPS-10066:
     multitap: false
     linkCable: false
 SLES-00856:
-  name: "G-Police (Spain) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (Spain) (Disc 1)"
   discSet:
     name: "G-Police (Spain)"
     serials:
@@ -63581,7 +66906,8 @@ SLES-00856:
     multitap: false
     linkCable: false
 SLES-10856:
-  name: "G-Police (Spain) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (Spain) (Disc 2)"
   discSet:
     name: "G-Police (Spain)"
     serials:
@@ -63605,7 +66931,8 @@ SLES-10856:
     multitap: false
     linkCable: false
 SLUS-00544:
-  name: "G-Police (USA) (Disc 1)"
+  name: "G-Police (Disc 1)"
+  saveName: "G-Police (USA) (Disc 1)"
   discSet:
     name: "G-Police (USA)"
     serials:
@@ -63632,7 +66959,8 @@ SLUS-00544:
     multitap: false
     linkCable: false
 SLUS-00556:
-  name: "G-Police (USA) (Disc 2)"
+  name: "G-Police (Disc 2)"
+  saveName: "G-Police (USA) (Disc 2)"
   discSet:
     name: "G-Police (USA)"
     serials:
@@ -63656,7 +66984,8 @@ SLUS-00556:
     multitap: false
     linkCable: false
 SCES-01625:
-  name: "G-Police - Weapons of Justice (Europe)"
+  name: "G-Police - Weapons of Justice"
+  saveName: "G-Police - Weapons of Justice (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63675,7 +67004,8 @@ SCES-01625:
     multitap: false
     linkCable: false
 SCES-01917:
-  name: "G-Police - Weapons of Justice (France)"
+  name: "G-Police - Weapons of Justice"
+  saveName: "G-Police - Weapons of Justice (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63694,7 +67024,8 @@ SCES-01917:
     multitap: false
     linkCable: false
 SCES-01918:
-  name: "G-Police - Weapons of Justice (Germany)"
+  name: "G-Police - Weapons of Justice"
+  saveName: "G-Police - Weapons of Justice (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63713,7 +67044,8 @@ SCES-01918:
     multitap: false
     linkCable: false
 SCES-01920:
-  name: "G-Police - Weapons of Justice (Italy)"
+  name: "G-Police - Weapons of Justice"
+  saveName: "G-Police - Weapons of Justice (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63732,7 +67064,8 @@ SCES-01920:
     multitap: false
     linkCable: false
 SCES-01919:
-  name: "G-Police - Weapons of Justice (Spain)"
+  name: "G-Police - Weapons of Justice"
+  saveName: "G-Police - Weapons of Justice (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63751,7 +67084,8 @@ SCES-01919:
     multitap: false
     linkCable: false
 SLUS-00798:
-  name: "G-Police - Weapons of Justice (USA)"
+  name: "G-Police - Weapons of Justice"
+  saveName: "G-Police - Weapons of Justice (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2799-g0d281538"
@@ -63773,7 +67107,8 @@ SLUS-00798:
     multitap: false
     linkCable: false
 SLES-01314:
-  name: "G. Darius (Europe)"
+  name: "G. Darius"
+  saveName: "G. Darius (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63794,11 +67129,13 @@ SLES-01314:
     multitap: false
     linkCable: false
 SLED-01439:
-  name: "G. Darius (Europe) (Demo)"
+  name: "G. Darius (Demo)"
+  saveName: "G. Darius (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00690:
-  name: "G. Darius (USA)"
+  name: "G. Darius"
+  saveName: "G. Darius (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -63822,11 +67159,13 @@ SLUS-00690:
     multitap: false
     linkCable: false
 SLUS-80690:
-  name: "G. Darius + Devil Dice + Brunswick Circuit Pro Bowling (USA)"
+  name: "G. Darius + Devil Dice + Brunswick Circuit Pro Bowling"
+  saveName: "G. Darius + Devil Dice + Brunswick Circuit Pro Bowling (USA)"
   metadata:
     genre: "** DEMO **"
 SLPS-00944:
-  name: "G.O.D pure (Japan)"
+  name: "G.O.D pure"
+  saveName: "G.O.D pure (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -63844,7 +67183,8 @@ SLPS-00944:
     multitap: false
     linkCable: false
 SLPM-87007:
-  name: "G.T.A - Grand Theft Auto (Japan)"
+  name: "G.T.A - Grand Theft Auto"
+  saveName: "G.T.A - Grand Theft Auto (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -63884,7 +67224,8 @@ SLPM-86858:
     multitap: false
     linkCable: false
 SLPM-86195:
-  name: "GI Jockey (Japan)"
+  name: "GI Jockey"
+  saveName: "GI Jockey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63903,11 +67244,13 @@ SLPM-86195:
     multitap: false
     linkCable: false
 SLPM-80409:
-  name: "GI Jockey (Japan) (Demo)"
+  name: "GI Jockey (Demo)"
+  saveName: "GI Jockey (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86213:
-  name: "GI Jockey (Japan) (Shokai Genteiban)"
+  name: "GI Jockey (Shokai Genteiban)"
+  saveName: "GI Jockey (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63926,7 +67269,8 @@ SLPM-86213:
     multitap: false
     linkCable: false
 SLPM-86413:
-  name: "GI Jockey 2000 (Japan)"
+  name: "GI Jockey 2000"
+  saveName: "GI Jockey 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63945,7 +67289,8 @@ SLPM-86413:
     multitap: false
     linkCable: false
 SLES-03207:
-  name: "GP Challenge (Europe) (En,Fr,De,It)"
+  name: "GP Challenge"
+  saveName: "GP Challenge (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63968,9 +67313,11 @@ SLES-03207:
     multitap: false
     linkCable: false
 SLPM-84010:
-  name: "GRV 2000 (Japan)"
+  name: "GRV 2000"
+  saveName: "GRV 2000 (Japan)"
 SLES-02693:
-  name: "GZSZ Quiz (Germany)"
+  name: "GZSZ Quiz"
+  saveName: "GZSZ Quiz (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -63989,7 +67336,8 @@ SLES-02693:
     multitap: true
     linkCable: false
 SLES-02441:
-  name: "GZSZ Vol. 2 (Germany) (Disc 1)"
+  name: "GZSZ Vol. 2 (Disc 1)"
+  saveName: "GZSZ Vol. 2 (Germany) (Disc 1)"
   discSet:
     name: "GZSZ Vol. 2 (Germany)"
     serials:
@@ -64013,7 +67361,8 @@ SLES-02441:
     multitap: false
     linkCable: false
 SLES-12441:
-  name: "GZSZ Vol. 2 (Germany) (Disc 2)"
+  name: "GZSZ Vol. 2 (Disc 2)"
+  saveName: "GZSZ Vol. 2 (Germany) (Disc 2)"
   discSet:
     name: "GZSZ Vol. 2 (Germany)"
     serials:
@@ -64037,7 +67386,8 @@ SLES-12441:
     multitap: false
     linkCable: false
 SLES-02980:
-  name: "GZSZ Vol. 3 (Germany)"
+  name: "GZSZ Vol. 3"
+  saveName: "GZSZ Vol. 3 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64056,7 +67406,8 @@ SLES-02980:
     multitap: false
     linkCable: false
 SLPS-01082:
-  name: "Gadget - Past as Future (Japan) (Disc 1)"
+  name: "Gadget - Past as Future (Disc 1)"
+  saveName: "Gadget - Past as Future (Japan) (Disc 1)"
   discSet:
     name: "Gadget - Past as Future (Japan)"
     serials:
@@ -64082,7 +67433,8 @@ SLPS-01082:
     multitap: false
     linkCable: false
 SLPS-01083:
-  name: "Gadget - Past as Future (Japan) (Disc 2)"
+  name: "Gadget - Past as Future (Disc 2)"
+  saveName: "Gadget - Past as Future (Japan) (Disc 2)"
   discSet:
     name: "Gadget - Past as Future (Japan)"
     serials:
@@ -64108,7 +67460,8 @@ SLPS-01083:
     multitap: false
     linkCable: false
 SLPS-01084:
-  name: "Gadget - Past as Future (Japan) (Disc 3)"
+  name: "Gadget - Past as Future (Disc 3)"
+  saveName: "Gadget - Past as Future (Japan) (Disc 3)"
   discSet:
     name: "Gadget - Past as Future (Japan)"
     serials:
@@ -64134,7 +67487,8 @@ SLPS-01084:
     multitap: false
     linkCable: false
 SLPS-01085:
-  name: "Gadget - Past as Future (Japan) (Disc 4)"
+  name: "Gadget - Past as Future (Disc 4)"
+  saveName: "Gadget - Past as Future (Japan) (Disc 4)"
   discSet:
     name: "Gadget - Past as Future (Japan)"
     serials:
@@ -64160,7 +67514,8 @@ SLPS-01085:
     multitap: false
     linkCable: false
 SLPS-02075:
-  name: "GaiaMaster - Kamigami no Board Game (Japan)"
+  name: "GaiaMaster - Kamigami no Board Game"
+  saveName: "GaiaMaster - Kamigami no Board Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64179,11 +67534,13 @@ SLPS-02075:
     multitap: true
     linkCable: false
 SLPM-80524:
-  name: "GaiaMaster - Kamigami no Board Game (Japan) (Demo)"
+  name: "GaiaMaster - Kamigami no Board Game (Demo)"
+  saveName: "GaiaMaster - Kamigami no Board Game (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00624:
-  name: "GaiaSeed - Project Seed Trap (Japan)"
+  name: "GaiaSeed - Project Seed Trap"
+  saveName: "GaiaSeed - Project Seed Trap (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -64203,7 +67560,8 @@ SLPS-00624:
     multitap: false
     linkCable: false
 SLPS-00404:
-  name: "Gakkou de Atta Kowai Hanashi S (Japan)"
+  name: "Gakkou de Atta Kowai Hanashi S"
+  saveName: "Gakkou de Atta Kowai Hanashi S (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -64221,7 +67579,8 @@ SLPS-00404:
     multitap: false
     linkCable: false
 SLPS-00078:
-  name: "Gakkou no Kowai Uwasa - Hanako-san ga Kita!! (Japan)"
+  name: "Gakkou no Kowai Uwasa - Hanako-san ga Kita!!"
+  saveName: "Gakkou no Kowai Uwasa - Hanako-san ga Kita!! (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -64243,7 +67602,8 @@ SLPS-00078:
     multitap: false
     linkCable: false
 SLPS-01660:
-  name: "Gakkou o Tsukurou!! 2 (Japan)"
+  name: "Gakkou o Tsukurou!! 2"
+  saveName: "Gakkou o Tsukurou!! 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64265,7 +67625,8 @@ SLPS-01660:
     multitap: false
     linkCable: false
 SLPS-02998:
-  name: "Gakkou o Tsukurou!! Kouchou Sensei Monogatari (Japan)"
+  name: "Gakkou o Tsukurou!! Kouchou Sensei Monogatari"
+  saveName: "Gakkou o Tsukurou!! Kouchou Sensei Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64287,7 +67648,8 @@ SLPS-02998:
     multitap: false
     linkCable: false
 SLPS-01103:
-  name: "Gakkou o Tsukurou!! Let's Make a School!! (Japan)"
+  name: "Gakkou o Tsukurou!! Let's Make a School!!"
+  saveName: "Gakkou o Tsukurou!! Let's Make a School!! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -64326,7 +67688,8 @@ SLPS-91508:
     multitap: false
     linkCable: false
 SLPS-01852:
-  name: "Gakuen Sentai Solblast (Japan)"
+  name: "Gakuen Sentai Solblast"
+  saveName: "Gakuen Sentai Solblast (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -64344,7 +67707,8 @@ SLPS-01852:
     multitap: false
     linkCable: false
 SLES-02212:
-  name: "Galaga - Destination Earth (Europe) (En,Fr,De,It)"
+  name: "Galaga - Destination Earth"
+  saveName: "Galaga - Destination Earth (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64366,7 +67730,8 @@ SLES-02212:
     multitap: false
     linkCable: false
 SLUS-01258:
-  name: "Galaga - Destination Earth (USA)"
+  name: "Galaga - Destination Earth"
+  saveName: "Galaga - Destination Earth (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -64388,7 +67753,8 @@ SLUS-01258:
     multitap: false
     linkCable: false
 SCES-00269:
-  name: "Galaxian^3 (Europe)"
+  name: "Galaxian^3"
+  saveName: "Galaxian^3 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3712-ge94c68e8"
@@ -64411,7 +67777,8 @@ SCES-00269:
     multitap: true
     linkCable: false
 SLPS-00270:
-  name: "Galaxian^3 (Japan)"
+  name: "Galaxian^3"
+  saveName: "Galaxian^3 (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -64431,7 +67798,8 @@ SLPS-00270:
     multitap: true
     linkCable: false
 SLES-00197:
-  name: "Galaxy Fight (Europe)"
+  name: "Galaxy Fight"
+  saveName: "Galaxy Fight (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -64449,7 +67817,8 @@ SLES-00197:
     multitap: false
     linkCable: false
 SLPS-00138:
-  name: "Galaxy Fight - Universal Warriors (Japan)"
+  name: "Galaxy Fight - Universal Warriors"
+  saveName: "Galaxy Fight - Universal Warriors (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -64467,7 +67836,8 @@ SLPS-00138:
     multitap: false
     linkCable: false
 SLPS-02596:
-  name: "Gale Gunner (Japan)"
+  name: "Gale Gunner"
+  saveName: "Gale Gunner (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64489,7 +67859,8 @@ SLPS-02596:
     multitap: false
     linkCable: false
 SLPS-00621:
-  name: "Galeoz (Japan)"
+  name: "Galeoz"
+  saveName: "Galeoz (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -64507,7 +67878,8 @@ SLPS-00621:
     multitap: false
     linkCable: false
 SLES-02328:
-  name: "Galerians (Europe) (Disc 1)"
+  name: "Galerians (Disc 1)"
+  saveName: "Galerians (Europe) (Disc 1)"
   discSet:
     name: "Galerians (Europe)"
     serials:
@@ -64535,7 +67907,8 @@ SLES-02328:
     multitap: false
     linkCable: false
 SLES-12328:
-  name: "Galerians (Europe) (Disc 2)"
+  name: "Galerians (Disc 2)"
+  saveName: "Galerians (Europe) (Disc 2)"
   discSet:
     name: "Galerians (Europe)"
     serials:
@@ -64563,7 +67936,8 @@ SLES-12328:
     multitap: false
     linkCable: false
 SLES-22328:
-  name: "Galerians (Europe) (Disc 3)"
+  name: "Galerians (Disc 3)"
+  saveName: "Galerians (Europe) (Disc 3)"
   discSet:
     name: "Galerians (Europe)"
     serials:
@@ -64591,7 +67965,8 @@ SLES-22328:
     multitap: false
     linkCable: false
 SLES-02329:
-  name: "Galerians (France) (Disc 1)"
+  name: "Galerians (Disc 1)"
+  saveName: "Galerians (France) (Disc 1)"
   discSet:
     name: "Galerians (France)"
     serials:
@@ -64619,7 +67994,8 @@ SLES-02329:
     multitap: false
     linkCable: false
 SLES-12329:
-  name: "Galerians (France) (Disc 2)"
+  name: "Galerians (Disc 2)"
+  saveName: "Galerians (France) (Disc 2)"
   discSet:
     name: "Galerians (France)"
     serials:
@@ -64647,7 +68023,8 @@ SLES-12329:
     multitap: false
     linkCable: false
 SLES-22329:
-  name: "Galerians (France) (Disc 3)"
+  name: "Galerians (Disc 3)"
+  saveName: "Galerians (France) (Disc 3)"
   discSet:
     name: "Galerians (France)"
     serials:
@@ -64675,7 +68052,8 @@ SLES-22329:
     multitap: false
     linkCable: false
 SLES-02330:
-  name: "Galerians (Germany) (Disc 1)"
+  name: "Galerians (Disc 1)"
+  saveName: "Galerians (Germany) (Disc 1)"
   discSet:
     name: "Galerians (Germany)"
     serials:
@@ -64703,7 +68081,8 @@ SLES-02330:
     multitap: false
     linkCable: false
 SLES-12330:
-  name: "Galerians (Germany) (Disc 2)"
+  name: "Galerians (Disc 2)"
+  saveName: "Galerians (Germany) (Disc 2)"
   discSet:
     name: "Galerians (Germany)"
     serials:
@@ -64731,7 +68110,8 @@ SLES-12330:
     multitap: false
     linkCable: false
 SLES-22330:
-  name: "Galerians (Germany) (Disc 3)"
+  name: "Galerians (Disc 3)"
+  saveName: "Galerians (Germany) (Disc 3)"
   discSet:
     name: "Galerians (Germany)"
     serials:
@@ -64759,7 +68139,8 @@ SLES-22330:
     multitap: false
     linkCable: false
 SLPS-02192:
-  name: "Galerians (Japan) (Disc 1)"
+  name: "Galerians (Disc 1)"
+  saveName: "Galerians (Japan) (Disc 1)"
   discSet:
     name: "Galerians (Japan)"
     serials:
@@ -64786,7 +68167,8 @@ SLPS-02192:
     multitap: false
     linkCable: false
 SLPS-02193:
-  name: "Galerians (Japan) (Disc 2)"
+  name: "Galerians (Disc 2)"
+  saveName: "Galerians (Japan) (Disc 2)"
   discSet:
     name: "Galerians (Japan)"
     serials:
@@ -64813,7 +68195,8 @@ SLPS-02193:
     multitap: false
     linkCable: false
 SLPS-02194:
-  name: "Galerians (Japan) (Disc 3)"
+  name: "Galerians (Disc 3)"
+  saveName: "Galerians (Japan) (Disc 3)"
   discSet:
     name: "Galerians (Japan)"
     serials:
@@ -64840,15 +68223,18 @@ SLPS-02194:
     multitap: false
     linkCable: false
 SLED-02869:
-  name: "Galerians (UK) (Demo)"
+  name: "Galerians (Demo)"
+  saveName: "Galerians (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-90077:
-  name: "Galerians (USA) (Demo)"
+  name: "Galerians (Demo)"
+  saveName: "Galerians (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00986:
-  name: "Galerians (USA) (Disc 1)"
+  name: "Galerians (Disc 1)"
+  saveName: "Galerians (USA) (Disc 1)"
   discSet:
     name: "Galerians (USA)"
     serials:
@@ -64878,7 +68264,8 @@ SLUS-00986:
     multitap: false
     linkCable: false
 SLUS-01098:
-  name: "Galerians (USA) (Disc 2)"
+  name: "Galerians (Disc 2)"
+  saveName: "Galerians (USA) (Disc 2)"
   discSet:
     name: "Galerians (USA)"
     serials:
@@ -64908,7 +68295,8 @@ SLUS-01098:
     multitap: false
     linkCable: false
 SLUS-01099:
-  name: "Galerians (USA) (Disc 3)"
+  name: "Galerians (Disc 3)"
+  saveName: "Galerians (USA) (Disc 3)"
   discSet:
     name: "Galerians (USA)"
     serials:
@@ -64938,7 +68326,8 @@ SLUS-01099:
     multitap: false
     linkCable: false
 SLPS-00507:
-  name: "Gallop Racer (Japan)"
+  name: "Gallop Racer"
+  saveName: "Gallop Racer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -64956,7 +68345,8 @@ SLPS-00507:
     multitap: false
     linkCable: false
 SLUS-00942:
-  name: "Gallop Racer (USA)"
+  name: "Gallop Racer"
+  saveName: "Gallop Racer (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -64975,7 +68365,8 @@ SLUS-00942:
     multitap: false
     linkCable: false
 SLPS-01077:
-  name: "Gallop Racer 2 (Japan)"
+  name: "Gallop Racer 2"
+  saveName: "Gallop Racer 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -64996,7 +68387,8 @@ SLPS-01077:
     multitap: false
     linkCable: false
 SLPS-02623:
-  name: "Gallop Racer 2000 (Japan)"
+  name: "Gallop Racer 2000"
+  saveName: "Gallop Racer 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65034,7 +68426,8 @@ SLPS-91234:
     multitap: false
     linkCable: false
 SLPS-01981:
-  name: "Gallop Racer 3 (Japan)"
+  name: "Gallop Racer 3"
+  saveName: "Gallop Racer 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65056,7 +68449,8 @@ SLPS-01981:
     multitap: false
     linkCable: false
 SLPS-01583:
-  name: "Game Maker, The - Ureyuki 100-manbon Get da ze! (Japan)"
+  name: "Game Maker, The - Ureyuki 100-manbon Get da ze!"
+  saveName: "Game Maker, The - Ureyuki 100-manbon Get da ze! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65074,7 +68468,8 @@ SLPS-01583:
     multitap: false
     linkCable: false
 SLPS-00774:
-  name: "Game Nihonshi - Kakumeiji Oda Nobunaga (Japan)"
+  name: "Game Nihonshi - Kakumeiji Oda Nobunaga"
+  saveName: "Game Nihonshi - Kakumeiji Oda Nobunaga (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65092,7 +68487,8 @@ SLPS-00774:
     multitap: false
     linkCable: false
 SLPS-01607:
-  name: "Game Soft o Tsukurou - Let's Be a Super Game Creator!! (Japan)"
+  name: "Game Soft o Tsukurou - Let's Be a Super Game Creator!!"
+  saveName: "Game Soft o Tsukurou - Let's Be a Super Game Creator!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65110,7 +68506,8 @@ SLPS-01607:
     multitap: false
     linkCable: false
 SLPS-03549:
-  name: "Game de Hajimeru TOEIC Test - Mazu wa Nyuumon-hen 1500 (Japan)"
+  name: "Game de Hajimeru TOEIC Test - Mazu wa Nyuumon-hen 1500"
+  saveName: "Game de Hajimeru TOEIC Test - Mazu wa Nyuumon-hen 1500 (Japan)"
 SLPS-01306:
   name: "Game de Seishun"
   controllers:
@@ -65130,7 +68527,8 @@ SLPS-01306:
     multitap: true
     linkCable: false
 SLPS-00030:
-  name: "Game no Tatsujin (Japan)"
+  name: "Game no Tatsujin"
+  saveName: "Game no Tatsujin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65148,7 +68546,8 @@ SLPS-00030:
     multitap: false
     linkCable: false
 SLPS-02052:
-  name: "Game no Tatsujin (Japan) (Rev 1)"
+  name: "Game no Tatsujin"
+  saveName: "Game no Tatsujin (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -65166,7 +68565,8 @@ SLPS-02052:
     multitap: false
     linkCable: false
 SLPS-00213:
-  name: "Game no Tatsujin 2 (Japan)"
+  name: "Game no Tatsujin 2"
+  saveName: "Game no Tatsujin 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -65205,7 +68605,8 @@ SLPS-03298:
     multitap: false
     linkCable: false
 SLPS-00096:
-  name: "Game no Tetsujin - The Shanghai (Japan)"
+  name: "Game no Tetsujin - The Shanghai"
+  saveName: "Game no Tetsujin - The Shanghai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65223,7 +68624,8 @@ SLPS-00096:
     multitap: false
     linkCable: false
 SLUS-00769:
-  name: "Game of Life, The (USA)"
+  name: "Game of Life, The"
+  saveName: "Game of Life, The (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65242,7 +68644,8 @@ SLUS-00769:
     multitap: true
     linkCable: false
 SLPS-00155:
-  name: "Game of Life, The - DX Jinsei Game (Japan)"
+  name: "Game of Life, The - DX Jinsei Game"
+  saveName: "Game of Life, The - DX Jinsei Game (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -65263,7 +68666,8 @@ SLPS-00155:
     multitap: true
     linkCable: false
 SLPS-00918:
-  name: "Game of Life, The - DX Jinsei Game II (Japan)"
+  name: "Game of Life, The - DX Jinsei Game II"
+  saveName: "Game of Life, The - DX Jinsei Game II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65281,7 +68685,8 @@ SLPS-00918:
     multitap: true
     linkCable: false
 SLPM-87098:
-  name: "Game of Life, The - DX Jinsei Game III (Japan)"
+  name: "Game of Life, The - DX Jinsei Game III"
+  saveName: "Game of Life, The - DX Jinsei Game III (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65303,7 +68708,8 @@ SLPM-87098:
     multitap: true
     linkCable: false
 SLPM-86963:
-  name: "Game of Life, The - DX Jinsei Game IV (Japan)"
+  name: "Game of Life, The - DX Jinsei Game IV"
+  saveName: "Game of Life, The - DX Jinsei Game IV (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65322,7 +68728,8 @@ SLPM-86963:
     multitap: true
     linkCable: false
 SLPM-87187:
-  name: "Game of Life, The - DX Jinsei Game V (Japan)"
+  name: "Game of Life, The - DX Jinsei Game V"
+  saveName: "Game of Life, The - DX Jinsei Game V (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65341,11 +68748,13 @@ SLPM-87187:
     multitap: true
     linkCable: false
 SLPM-80093:
-  name: "Gamera 2000 (Japan) (Demo)"
+  name: "Gamera 2000 (Demo)"
+  saveName: "Gamera 2000 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00833:
-  name: "Gamera 2000 (Japan) (En,Ja)"
+  name: "Gamera 2000"
+  saveName: "Gamera 2000 (Japan) (En,Ja)"
   controllers:
     - DigitalController
   metadata:
@@ -65383,7 +68792,8 @@ SLPM-86890:
     multitap: false
     linkCable: false
 SLPM-86155:
-  name: "Ganbare Goemon - Kuru nara Koi! Ayashige Ikka no Kuroi Kage (Japan)"
+  name: "Ganbare Goemon - Kuru nara Koi! Ayashige Ikka no Kuroi Kage"
+  saveName: "Ganbare Goemon - Kuru nara Koi! Ayashige Ikka no Kuroi Kage (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -65407,7 +68817,8 @@ SLPM-86155:
     multitap: false
     linkCable: false
 SLPM-86774:
-  name: "Ganbare Goemon - Ooedo Daikaiten (Japan)"
+  name: "Ganbare Goemon - Ooedo Daikaiten"
+  saveName: "Ganbare Goemon - Ooedo Daikaiten (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -65431,7 +68842,8 @@ SLPM-86774:
     multitap: false
     linkCable: false
 SLPS-00217:
-  name: "Ganbare Goemon - Uchuu Kaizoku Akogingu (Japan)"
+  name: "Ganbare Goemon - Uchuu Kaizoku Akogingu"
+  saveName: "Ganbare Goemon - Uchuu Kaizoku Akogingu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65449,7 +68861,8 @@ SLPS-00217:
     multitap: false
     linkCable: false
 SLPM-86030:
-  name: "Ganbare Goemon - Uchuu Kaizoku Akogingu (Japan) (Rev 1)"
+  name: "Ganbare Goemon - Uchuu Kaizoku Akogingu"
+  saveName: "Ganbare Goemon - Uchuu Kaizoku Akogingu (Japan) (Rev 1)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -65487,7 +68900,8 @@ SLPM-87327:
     multitap: false
     linkCable: false
 SCPS-10036:
-  name: "Ganbare Morikawa-kun 2-gou (Japan)"
+  name: "Ganbare Morikawa-kun 2-gou"
+  saveName: "Ganbare Morikawa-kun 2-gou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65505,7 +68919,8 @@ SCPS-10036:
     multitap: false
     linkCable: false
 SCPS-10033:
-  name: "Ganbare Morikawa-kun 2-gou (Japan) (Genteiban)"
+  name: "Ganbare Morikawa-kun 2-gou (Genteiban)"
+  saveName: "Ganbare Morikawa-kun 2-gou (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -65541,7 +68956,8 @@ SCPS-45070:
     multitap: false
     linkCable: false
 SLPM-86482:
-  name: "Ganbare! Nippon! Olympic 2000 (Japan)"
+  name: "Ganbare! Nippon! Olympic 2000"
+  saveName: "Ganbare! Nippon! Olympic 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65560,7 +68976,8 @@ SLPM-86482:
     multitap: true
     linkCable: false
 SLPS-01468:
-  name: "Gangway Monsters (Japan)"
+  name: "Gangway Monsters"
+  saveName: "Gangway Monsters (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65579,7 +68996,8 @@ SLPS-01468:
     multitap: false
     linkCable: false
 SLPS-01373:
-  name: "Ganso Family Mahjong (Japan)"
+  name: "Ganso Family Mahjong"
+  saveName: "Ganso Family Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -65597,7 +69015,8 @@ SLPS-01373:
     multitap: false
     linkCable: false
 SLPS-02094:
-  name: "Ganso Family Mahjong 2 (Japan)"
+  name: "Ganso Family Mahjong 2"
+  saveName: "Ganso Family Mahjong 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65653,11 +69072,13 @@ SLPS-02787:
     multitap: false
     linkCable: false
 SLPM-80446:
-  name: "Garou Densetsu - Wild Ambition (Japan) (Demo)"
+  name: "Garou Densetsu - Wild Ambition (Demo)"
+  saveName: "Garou Densetsu - Wild Ambition (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45409:
-  name: "Garou Densetsu - Wild Ambition (Japan, Asia)"
+  name: "Garou Densetsu - Wild Ambition"
+  saveName: "Garou Densetsu - Wild Ambition (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65698,7 +69119,8 @@ SLPM-86576:
     multitap: false
     linkCable: false
 SLPS-02246:
-  name: "Gate Keepers (Japan) (Disc 1)"
+  name: "Gate Keepers (Disc 1)"
+  saveName: "Gate Keepers (Japan) (Disc 1)"
   discSet:
     name: "Gate Keepers (Japan)"
     serials:
@@ -65722,7 +69144,8 @@ SLPS-02246:
     multitap: false
     linkCable: false
 SLPS-02247:
-  name: "Gate Keepers (Japan) (Disc 2)"
+  name: "Gate Keepers (Disc 2)"
+  saveName: "Gate Keepers (Japan) (Disc 2)"
   discSet:
     name: "Gate Keepers (Japan)"
     serials:
@@ -65746,7 +69169,8 @@ SLPS-02247:
     multitap: false
     linkCable: false
 SLES-02791:
-  name: "Gauntlet Legends (Europe)"
+  name: "Gauntlet Legends"
+  saveName: "Gauntlet Legends (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65765,7 +69189,8 @@ SLES-02791:
     multitap: false
     linkCable: false
 SLES-02931:
-  name: "Gauntlet Legends (France)"
+  name: "Gauntlet Legends"
+  saveName: "Gauntlet Legends (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65784,7 +69209,8 @@ SLES-02931:
     multitap: false
     linkCable: false
 SLES-02932:
-  name: "Gauntlet Legends (Germany)"
+  name: "Gauntlet Legends"
+  saveName: "Gauntlet Legends (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65803,7 +69229,8 @@ SLES-02932:
     multitap: false
     linkCable: false
 SLUS-00624:
-  name: "Gauntlet Legends (USA)"
+  name: "Gauntlet Legends"
+  saveName: "Gauntlet Legends (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -65825,11 +69252,13 @@ SLUS-00624:
     multitap: false
     linkCable: false
 SLUS-80624:
-  name: "Gauntlet Legends (USA) (Demo)"
+  name: "Gauntlet Legends (Demo)"
+  saveName: "Gauntlet Legends (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00644:
-  name: "GeGeGe no Kitarou (Japan)"
+  name: "GeGeGe no Kitarou"
+  saveName: "GeGeGe no Kitarou (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -65849,7 +69278,8 @@ SLPS-00644:
     multitap: false
     linkCable: false
 SLPM-87286:
-  name: "GeGeGe no Kitarou - Gyakushuu! Youma Daikessen (Japan)"
+  name: "GeGeGe no Kitarou - Gyakushuu! Youma Daikessen"
+  saveName: "GeGeGe no Kitarou - Gyakushuu! Youma Daikessen (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -65873,7 +69303,8 @@ SLPM-87286:
     multitap: false
     linkCable: false
 SLPS-03189:
-  name: "Gear Fighter Dendoh (Japan)"
+  name: "Gear Fighter Dendoh"
+  saveName: "Gear Fighter Dendoh (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65892,7 +69323,8 @@ SLPS-03189:
     multitap: false
     linkCable: false
 SLPS-02056:
-  name: "Geki-Oh - Shienryuu (Japan)"
+  name: "Geki-Oh - Shienryuu"
+  saveName: "Geki-Oh - Shienryuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65911,7 +69343,8 @@ SLPS-02056:
     multitap: false
     linkCable: false
 SLES-01241:
-  name: "Gekido - Urban Fighters (Europe) (En,Fr,De,Es,It)"
+  name: "Gekido - Urban Fighters"
+  saveName: "Gekido - Urban Fighters (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65935,7 +69368,8 @@ SLES-01241:
     multitap: true
     linkCable: false
 SLUS-00970:
-  name: "Gekido - Urban Fighters (USA)"
+  name: "Gekido - Urban Fighters"
+  saveName: "Gekido - Urban Fighters (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -65957,7 +69391,8 @@ SLUS-00970:
     multitap: true
     linkCable: false
 SLES-04004:
-  name: "Gekioh - Shooting King (Europe)"
+  name: "Gekioh - Shooting King"
+  saveName: "Gekioh - Shooting King (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65978,7 +69413,8 @@ SLES-04004:
     multitap: false
     linkCable: false
 SLUS-01498:
-  name: "Gekioh - Shooting King (USA)"
+  name: "Gekioh - Shooting King"
+  saveName: "Gekioh - Shooting King (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -65999,9 +69435,11 @@ SLUS-01498:
     multitap: false
     linkCable: false
 SLPS-00696:
-  name: "Gekiretsu Pachinkers (Japan)"
+  name: "Gekiretsu Pachinkers"
+  saveName: "Gekiretsu Pachinkers (Japan)"
 SCPS-10087:
-  name: "Gekisou Tomarunner (Japan)"
+  name: "Gekisou Tomarunner"
+  saveName: "Gekisou Tomarunner (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66020,11 +69458,13 @@ SCPS-10087:
     multitap: false
     linkCable: false
 PCPX-96164:
-  name: "Gekisou Tomarunner (Japan) (Demo)"
+  name: "Gekisou Tomarunner (Demo)"
+  saveName: "Gekisou Tomarunner (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01346:
-  name: "Gekisou!! Grand Racing - Total Drivin' (Japan)"
+  name: "Gekisou!! Grand Racing - Total Drivin'"
+  saveName: "Gekisou!! Grand Racing - Total Drivin' (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -66062,7 +69502,8 @@ SCPS-91320:
     multitap: false
     linkCable: false
 SCPS-10134:
-  name: "Gekitotsu Toma L'Arc - Tomarunner vs L'Arc-en-Ciel (Japan)"
+  name: "Gekitotsu Toma L'Arc - Tomarunner vs L'Arc-en-Ciel"
+  saveName: "Gekitotsu Toma L'Arc - Tomarunner vs L'Arc-en-Ciel (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66081,7 +69522,8 @@ SCPS-10134:
     multitap: false
     linkCable: false
 SLPS-00926:
-  name: "Gekitotsu! Yonku Battle 4WD (Japan)"
+  name: "Gekitotsu! Yonku Battle 4WD"
+  saveName: "Gekitotsu! Yonku Battle 4WD (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66099,7 +69541,8 @@ SLPS-00926:
     multitap: false
     linkCable: false
 SLPS-03453:
-  name: "Gekitou! Crush Gear Turbo (Japan)"
+  name: "Gekitou! Crush Gear Turbo"
+  saveName: "Gekitou! Crush Gear Turbo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66118,7 +69561,8 @@ SLPS-03453:
     multitap: false
     linkCable: false
 SLPS-00421:
-  name: "Gekka no Kishi - Ouryuu-sen (Japan)"
+  name: "Gekka no Kishi - Ouryuu-sen"
+  saveName: "Gekka no Kishi - Ouryuu-sen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66136,7 +69580,8 @@ SLPS-00421:
     multitap: false
     linkCable: false
 SLPS-00491:
-  name: "Gen'ei Tougi - Shadow Struggle (Japan)"
+  name: "Gen'ei Tougi - Shadow Struggle"
+  saveName: "Gen'ei Tougi - Shadow Struggle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66155,7 +69600,8 @@ SLPS-00491:
     multitap: false
     linkCable: false
 SLPM-86175:
-  name: "Genghis Khan - Aoki Ookami to Shiroki Mejika IV (Japan)"
+  name: "Genghis Khan - Aoki Ookami to Shiroki Mejika IV"
+  saveName: "Genghis Khan - Aoki Ookami to Shiroki Mejika IV (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66227,7 +69673,8 @@ SLPM-86593:
     multitap: false
     linkCable: false
 SCPS-10038:
-  name: "Gensei Kyokou Seirei Kidoudan - Elemental Gearbolt (Japan)"
+  name: "Gensei Kyokou Seirei Kidoudan - Elemental Gearbolt"
+  saveName: "Gensei Kyokou Seirei Kidoudan - Elemental Gearbolt (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66304,7 +69751,8 @@ SLPM-87100:
     multitap: false
     linkCable: false
 SLPM-86986:
-  name: "Gensou Maden Saiyuuki - Haruka naru Nishi e (Japan)"
+  name: "Gensou Maden Saiyuuki - Haruka naru Nishi e"
+  saveName: "Gensou Maden Saiyuuki - Haruka naru Nishi e (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66323,7 +69771,8 @@ SLPM-86986:
     multitap: false
     linkCable: false
 SLPM-86637:
-  name: "Gensou Suiko Gaiden Vol. 1 - Harmonia no Kenshi (Japan)"
+  name: "Gensou Suiko Gaiden Vol. 1 - Harmonia no Kenshi"
+  saveName: "Gensou Suiko Gaiden Vol. 1 - Harmonia no Kenshi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66346,7 +69795,8 @@ SLPM-86637:
     multitap: false
     linkCable: false
 SLPM-86663:
-  name: "Gensou Suiko Gaiden Vol. 2 - Crystal Valley no Kettou (Japan)"
+  name: "Gensou Suiko Gaiden Vol. 2 - Crystal Valley no Kettou"
+  saveName: "Gensou Suiko Gaiden Vol. 2 - Crystal Valley no Kettou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66368,7 +69818,8 @@ SLPM-86663:
     multitap: false
     linkCable: false
 SLPM-87099:
-  name: "Gensou Suikoden (Japan)"
+  name: "Gensou Suikoden"
+  saveName: "Gensou Suikoden (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -66389,7 +69840,8 @@ SLPM-87099:
     multitap: false
     linkCable: false
 SLPM-86017:
-  name: "Gensou Suikoden (Japan) (PlayStation the Best)"
+  name: "Gensou Suikoden (PlayStation the Best)"
+  saveName: "Gensou Suikoden (Japan) (PlayStation the Best)"
   controllers:
     - DigitalController
   metadata:
@@ -66407,11 +69859,13 @@ SLPM-86017:
     multitap: false
     linkCable: false
 SCPS-45319:
-  name: "Gensou Suikoden II (Asia) (Demo)"
+  name: "Gensou Suikoden II (Demo)"
+  saveName: "Gensou Suikoden II (Asia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86168:
-  name: "Gensou Suikoden II (Japan)"
+  name: "Gensou Suikoden II"
+  saveName: "Gensou Suikoden II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66429,7 +69883,8 @@ SLPM-86168:
     multitap: false
     linkCable: false
 SLPM-86116:
-  name: "Gensou Suikoden II (Japan) (Demo)"
+  name: "Gensou Suikoden II (Demo)"
+  saveName: "Gensou Suikoden II (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66448,7 +69903,8 @@ SLPM-86116:
     multitap: false
     linkCable: false
 SLPM-86389:
-  name: "Gensou Suikoden II (Japan) (Rev 1)"
+  name: "Gensou Suikoden II"
+  saveName: "Gensou Suikoden II (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -66466,7 +69922,8 @@ SLPM-86389:
     multitap: false
     linkCable: false
 SLPS-02563:
-  name: "Gensou no Artemis (Japan)"
+  name: "Gensou no Artemis"
+  saveName: "Gensou no Artemis (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66485,7 +69942,8 @@ SLPS-02563:
     multitap: false
     linkCable: false
 SLPS-00007:
-  name: "Geom Cube (Japan)"
+  name: "Geom Cube"
+  saveName: "Geom Cube (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66503,7 +69961,8 @@ SLPS-00007:
     multitap: false
     linkCable: false
 SLUS-00024:
-  name: "Geom Cube (USA)"
+  name: "Geom Cube"
+  saveName: "Geom Cube (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -66524,7 +69983,8 @@ SLUS-00024:
     multitap: false
     linkCable: false
 SLPS-01575:
-  name: "Geometry Duel (Japan)"
+  name: "Geometry Duel"
+  saveName: "Geometry Duel (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66543,9 +70003,11 @@ SLPS-01575:
     multitap: false
     linkCable: false
 SCED-02383:
-  name: "Germany Speziale 11-99 (Germany)"
+  name: "Germany Speziale 11-99"
+  saveName: "Germany Speziale 11-99 (Germany)"
 SLPS-02107:
-  name: "Germs - Nerawareta Machi (Japan)"
+  name: "Germs - Nerawareta Machi"
+  saveName: "Germs - Nerawareta Machi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66563,7 +70025,8 @@ SLPS-02107:
     multitap: false
     linkCable: false
 SLPM-86848:
-  name: "GetBackers - Dakkan'ya (Japan)"
+  name: "GetBackers - Dakkan'ya"
+  saveName: "GetBackers - Dakkan'ya (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66585,7 +70048,8 @@ SLPM-86848:
     multitap: false
     linkCable: false
 SLPS-02232:
-  name: "Getter Robo Daikessen! (Japan)"
+  name: "Getter Robo Daikessen!"
+  saveName: "Getter Robo Daikessen! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66623,7 +70087,8 @@ SLPS-03017:
     multitap: false
     linkCable: false
 SLES-00133:
-  name: "Gex (Europe)"
+  name: "Gex"
+  saveName: "Gex (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -66641,7 +70106,8 @@ SLES-00133:
     multitap: false
     linkCable: false
 SLPS-00244:
-  name: "Gex (Japan)"
+  name: "Gex"
+  saveName: "Gex (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66659,7 +70125,8 @@ SLPS-00244:
     multitap: false
     linkCable: false
 SLUS-00042:
-  name: "Gex (USA)"
+  name: "Gex"
+  saveName: "Gex (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -66680,11 +70147,13 @@ SLUS-00042:
     multitap: false
     linkCable: false
 SLED-01954:
-  name: "Gex - Deep Cover Gecko (Europe) (Demo)"
+  name: "Gex - Deep Cover Gecko (Demo)"
+  saveName: "Gex - Deep Cover Gecko (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01299:
-  name: "Gex - Deep Cover Gecko (Europe) (En,Es,It)"
+  name: "Gex - Deep Cover Gecko"
+  saveName: "Gex - Deep Cover Gecko (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66707,7 +70176,8 @@ SLES-01299:
     multitap: false
     linkCable: false
 SLES-01908:
-  name: "Gex - Deep Cover Gecko (Europe) (Fr,De)"
+  name: "Gex - Deep Cover Gecko"
+  saveName: "Gex - Deep Cover Gecko (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66729,7 +70199,8 @@ SLES-01908:
     multitap: false
     linkCable: false
 SLUS-00598:
-  name: "Gex - Enter the Gecko (USA)"
+  name: "Gex - Enter the Gecko"
+  saveName: "Gex - Enter the Gecko (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -66751,7 +70222,8 @@ SLUS-00598:
     multitap: false
     linkCable: false
 SLUS-00806:
-  name: "Gex 3 - Deep Cover Gecko (USA)"
+  name: "Gex 3 - Deep Cover Gecko"
+  saveName: "Gex 3 - Deep Cover Gecko (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -66773,7 +70245,8 @@ SLUS-00806:
     multitap: false
     linkCable: false
 SLES-00596:
-  name: "Gex 3D - Enter the Gecko (Europe)"
+  name: "Gex 3D - Enter the Gecko"
+  saveName: "Gex 3D - Enter the Gecko (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66792,11 +70265,13 @@ SLES-00596:
     multitap: false
     linkCable: false
 SLED-01112:
-  name: "Gex 3D - Enter the Gecko (Europe) (Demo)"
+  name: "Gex 3D - Enter the Gecko (Demo)"
+  saveName: "Gex 3D - Enter the Gecko (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01050:
-  name: "Ghost in the Shell (Europe)"
+  name: "Ghost in the Shell"
+  saveName: "Ghost in the Shell (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66817,7 +70292,8 @@ SCES-01050:
     multitap: false
     linkCable: false
 SCES-01074:
-  name: "Ghost in the Shell (France)"
+  name: "Ghost in the Shell"
+  saveName: "Ghost in the Shell (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66838,7 +70314,8 @@ SCES-01074:
     multitap: false
     linkCable: false
 SCES-01075:
-  name: "Ghost in the Shell (Germany)"
+  name: "Ghost in the Shell"
+  saveName: "Ghost in the Shell (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66859,7 +70336,8 @@ SCES-01075:
     multitap: false
     linkCable: false
 SLUS-00552:
-  name: "Ghost in the Shell (USA)"
+  name: "Ghost in the Shell"
+  saveName: "Ghost in the Shell (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -66883,7 +70361,8 @@ SLUS-00552:
     multitap: false
     linkCable: false
 SCPS-45092:
-  name: "Ghost in the Shell (Asia)"
+  name: "Ghost in the Shell"
+  saveName: "Ghost in the Shell (Asia)"
   controllers:
     - DigitalController
   settings:
@@ -66903,7 +70382,8 @@ SCPS-45092:
     multitap: false
     linkCable: false
 SCES-02543:
-  name: "Ghoul Panic (Europe) (En,Fr,De,Es,It)"
+  name: "Ghoul Panic"
+  saveName: "Ghoul Panic (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -66946,7 +70426,8 @@ SCPS-45229:
     multitap: false
     linkCable: false
 SLPS-01358:
-  name: "Ginga Eiyuu Densetsu (Japan)"
+  name: "Ginga Eiyuu Densetsu"
+  saveName: "Ginga Eiyuu Densetsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66964,7 +70445,8 @@ SLPS-01358:
     multitap: false
     linkCable: false
 SLPS-01451:
-  name: "Ginga Ojousama Densetsu Yuna - Final Edition (Japan)"
+  name: "Ginga Ojousama Densetsu Yuna - Final Edition"
+  saveName: "Ginga Ojousama Densetsu Yuna - Final Edition (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -66982,7 +70464,8 @@ SLPS-01451:
     multitap: false
     linkCable: false
 SLES-03170:
-  name: "Gioca con i Teletubbies (Italy)"
+  name: "Gioca con i Teletubbies"
+  saveName: "Gioca con i Teletubbies (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67001,7 +70484,8 @@ SLES-03170:
     multitap: false
     linkCable: false
 SLPS-00132:
-  name: "Gionbana (Japan)"
+  name: "Gionbana"
+  saveName: "Gionbana (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -67019,7 +70503,8 @@ SLPS-00132:
     multitap: false
     linkCable: false
 SLPS-01858:
-  name: "Gionbana 2 - Kanazawa Bunko-hen (Japan)"
+  name: "Gionbana 2 - Kanazawa Bunko-hen"
+  saveName: "Gionbana 2 - Kanazawa Bunko-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67038,7 +70523,8 @@ SLPS-01858:
     multitap: false
     linkCable: false
 SLPM-86226:
-  name: "Glay - Complete Works (Japan) (Disc 1)"
+  name: "Glay - Complete Works (Disc 1)"
+  saveName: "Glay - Complete Works (Japan) (Disc 1)"
   discSet:
     name: "Glay - Complete Works (Japan)"
     serials:
@@ -67061,7 +70547,8 @@ SLPM-86226:
     multitap: false
     linkCable: false
 SLPM-86227:
-  name: "Glay - Complete Works (Japan) (Disc 2)"
+  name: "Glay - Complete Works (Disc 2)"
+  saveName: "Glay - Complete Works (Japan) (Disc 2)"
   discSet:
     name: "Glay - Complete Works (Japan)"
     serials:
@@ -67084,7 +70571,8 @@ SLPM-86227:
     multitap: false
     linkCable: false
 SLPM-86200:
-  name: "Glint Glitters (Japan)"
+  name: "Glint Glitters"
+  saveName: "Glint Glitters (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67103,7 +70591,8 @@ SLPM-86200:
     multitap: false
     linkCable: false
 SLES-01419:
-  name: "Global Domination (Europe)"
+  name: "Global Domination"
+  saveName: "Global Domination (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -67121,7 +70610,8 @@ SLES-01419:
     multitap: false
     linkCable: false
 SLES-01422:
-  name: "Global Domination (France)"
+  name: "Global Domination"
+  saveName: "Global Domination (France)"
   controllers:
     - DigitalController
   metadata:
@@ -67139,7 +70629,8 @@ SLES-01422:
     multitap: false
     linkCable: false
 SLES-01423:
-  name: "Global Domination (Germany)"
+  name: "Global Domination"
+  saveName: "Global Domination (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -67157,7 +70648,8 @@ SLES-01423:
     multitap: false
     linkCable: false
 SLES-01424:
-  name: "Global Domination (Italy)"
+  name: "Global Domination"
+  saveName: "Global Domination (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -67175,7 +70667,8 @@ SLES-01424:
     multitap: false
     linkCable: false
 SLES-01425:
-  name: "Global Domination (Spain)"
+  name: "Global Domination"
+  saveName: "Global Domination (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -67196,9 +70689,11 @@ SLES-01425:
     multitap: false
     linkCable: false
 SLUS-00721:
-  name: "Global Domination (USA) (Beta 2)"
+  name: "Global Domination (Beta 2)"
+  saveName: "Global Domination (USA) (Beta 2)"
 SCPS-10082:
-  name: "Global Force - Shin Sentou Kokka (Japan)"
+  name: "Global Force - Shin Sentou Kokka"
+  saveName: "Global Force - Shin Sentou Kokka (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67217,11 +70712,13 @@ SCPS-10082:
     multitap: false
     linkCable: false
 PCPX-96146:
-  name: "Global Force - Shin Sentou Kokka (Japan) (Demo)"
+  name: "Global Force - Shin Sentou Kokka (Demo)"
+  saveName: "Global Force - Shin Sentou Kokka (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02425:
-  name: "Glocal Hexcite (Japan)"
+  name: "Glocal Hexcite"
+  saveName: "Glocal Hexcite (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -67239,7 +70736,8 @@ SLPS-02425:
     multitap: false
     linkCable: false
 SLES-02213:
-  name: "Glover (Europe) (En,Fr,De,It)"
+  name: "Glover"
+  saveName: "Glover (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67261,7 +70759,8 @@ SLES-02213:
     multitap: false
     linkCable: false
 SLUS-00890:
-  name: "Glover (USA)"
+  name: "Glover"
+  saveName: "Glover (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -67283,7 +70782,8 @@ SLUS-00890:
     multitap: false
     linkCable: false
 SLPS-03061:
-  name: "Go Go I Land (Japan) (Disc 1)"
+  name: "Go Go I Land (Disc 1)"
+  saveName: "Go Go I Land (Japan) (Disc 1)"
   discSet:
     name: "Go Go I Land (Japan)"
     serials:
@@ -67307,7 +70807,8 @@ SLPS-03061:
     multitap: false
     linkCable: false
 SLPS-03062:
-  name: "Go Go I Land (Japan) (Disc 2)"
+  name: "Go Go I Land (Disc 2)"
+  saveName: "Go Go I Land (Japan) (Disc 2)"
   discSet:
     name: "Go Go I Land (Japan)"
     serials:
@@ -67331,7 +70832,8 @@ SLPS-03062:
     multitap: false
     linkCable: false
 SLPS-00528:
-  name: "Go II Professional - Taikyoku Igo (Japan)"
+  name: "Go II Professional - Taikyoku Igo"
+  saveName: "Go II Professional - Taikyoku Igo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -67349,7 +70851,8 @@ SLPS-00528:
     multitap: false
     linkCable: false
 SCPS-45165:
-  name: "Goal Storm '97 (Asia)"
+  name: "Goal Storm '97"
+  saveName: "Goal Storm '97 (Asia)"
   controllers:
     - DigitalController
   metadata:
@@ -67367,7 +70870,8 @@ SCPS-45165:
     multitap: false
     linkCable: false
 SLUS-00295:
-  name: "Goal Storm '97 (USA)"
+  name: "Goal Storm '97"
+  saveName: "Goal Storm '97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -67385,7 +70889,8 @@ SLUS-00295:
     multitap: false
     linkCable: false
 SLES-00069:
-  name: "Goal Storm (Europe)"
+  name: "Goal Storm"
+  saveName: "Goal Storm (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -67403,7 +70908,8 @@ SLES-00069:
     multitap: false
     linkCable: false
 SLUS-00055:
-  name: "Goal Storm (USA)"
+  name: "Goal Storm"
+  saveName: "Goal Storm (USA)"
   codes:
     - SLUS-00055
     - SLUS-00069
@@ -67443,7 +70949,8 @@ SLPS-02945:
     multitap: false
     linkCable: false
 SLPS-01470:
-  name: "Godzilla - Trading Battle (Japan)"
+  name: "Godzilla - Trading Battle"
+  saveName: "Godzilla - Trading Battle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -67479,7 +70986,8 @@ SLPM-86997:
     multitap: false
     linkCable: false
 SLPM-87196:
-  name: "Goemon - Shin Sedai Shuumei (Japan)"
+  name: "Goemon - Shin Sedai Shuumei"
+  saveName: "Goemon - Shin Sedai Shuumei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -67497,7 +71005,8 @@ SLPM-87196:
     multitap: false
     linkCable: false
 SLPS-01542:
-  name: "Goiken Muyou II (Japan) (En,Ja)"
+  name: "Goiken Muyou II"
+  saveName: "Goiken Muyou II (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67516,7 +71025,8 @@ SLPS-01542:
     multitap: false
     linkCable: false
 SLPM-86031:
-  name: "Gokujou Parodius Da! Deluxe Pack (Japan)"
+  name: "Gokujou Parodius Da! Deluxe Pack"
+  saveName: "Gokujou Parodius Da! Deluxe Pack (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -67539,7 +71049,8 @@ SLPM-86031:
     multitap: false
     linkCable: false
 SLPS-00048:
-  name: "Gokuu Densetsu - Magic Beast Warriors (Japan)"
+  name: "Gokuu Densetsu - Magic Beast Warriors"
+  saveName: "Gokuu Densetsu - Magic Beast Warriors (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -67559,7 +71070,8 @@ SLPS-00048:
     multitap: false
     linkCable: false
 SLES-02934:
-  name: "Gold and Glory - The Road to El Dorado (Europe)"
+  name: "Gold and Glory - The Road to El Dorado"
+  saveName: "Gold and Glory - The Road to El Dorado (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67578,7 +71090,8 @@ SLES-02934:
     multitap: false
     linkCable: false
 SLUS-01312:
-  name: "Gold and Glory - The Road to El Dorado (USA)"
+  name: "Gold and Glory - The Road to El Dorado"
+  saveName: "Gold and Glory - The Road to El Dorado (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67597,7 +71110,8 @@ SLUS-01312:
     multitap: false
     linkCable: false
 SLES-03185:
-  name: "Gold und Ruhm - Der Weg nach El Dorado (Germany)"
+  name: "Gold und Ruhm - Der Weg nach El Dorado"
+  saveName: "Gold und Ruhm - Der Weg nach El Dorado (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67616,7 +71130,8 @@ SLES-03185:
     multitap: false
     linkCable: false
 SLES-01222:
-  name: "Golden Goal 98 (Europe) (En,Fr,De,Es,It)"
+  name: "Golden Goal 98"
+  saveName: "Golden Goal 98 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67639,7 +71154,8 @@ SLES-01222:
     multitap: false
     linkCable: false
 SLUS-00319:
-  name: "Golden Nugget (USA) (Disc 1)"
+  name: "Golden Nugget (Disc 1)"
+  saveName: "Golden Nugget (USA) (Disc 1)"
   discSet:
     name: "Golden Nugget (USA)"
     serials:
@@ -67662,7 +71178,8 @@ SLUS-00319:
     multitap: false
     linkCable: false
 SLUS-00555:
-  name: "Golden Nugget (USA) (Disc 2)"
+  name: "Golden Nugget (Disc 2)"
+  saveName: "Golden Nugget (USA) (Disc 2)"
   discSet:
     name: "Golden Nugget (USA)"
     serials:
@@ -67685,7 +71202,8 @@ SLUS-00555:
     multitap: false
     linkCable: false
 SLES-02952:
-  name: "Goldie (Europe) (En,Fr,De,Nl)"
+  name: "Goldie"
+  saveName: "Goldie (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67708,7 +71226,8 @@ SLES-02952:
     multitap: false
     linkCable: false
 SLPS-01712:
-  name: "Golgo 13 Vol. 1 - Carlyle no Yabou (Japan) (En,Ja)"
+  name: "Golgo 13 Vol. 1 - Carlyle no Yabou"
+  saveName: "Golgo 13 Vol. 1 - Carlyle no Yabou (Japan) (En,Ja)"
   controllers:
     - DigitalController
   metadata:
@@ -67727,7 +71246,8 @@ SLPS-01712:
     multitap: false
     linkCable: false
 SLPS-01713:
-  name: "Golgo 13 Vol. 2 - Mienai Guntai (Japan) (En,Ja)"
+  name: "Golgo 13 Vol. 2 - Mienai Guntai"
+  saveName: "Golgo 13 Vol. 2 - Mienai Guntai (Japan) (En,Ja)"
   controllers:
     - DigitalController
   metadata:
@@ -67765,7 +71285,8 @@ SCPS-45434:
     multitap: false
     linkCable: false
 SLPM-86250:
-  name: "Goo! Goo! Soundy (Japan)"
+  name: "Goo! Goo! Soundy"
+  saveName: "Goo! Goo! Soundy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67784,7 +71305,8 @@ SLPM-86250:
     multitap: false
     linkCable: false
 SLPS-00626:
-  name: "Goo-Cho de Park - Theme Park Monogatari (Japan)"
+  name: "Goo-Cho de Park - Theme Park Monogatari"
+  saveName: "Goo-Cho de Park - Theme Park Monogatari (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -67805,11 +71327,13 @@ SLPS-00626:
     multitap: true
     linkCable: false
 SLPM-80061:
-  name: "Goo-Cho de Park - Theme Park Monogatari (Japan) (Demo)"
+  name: "Goo-Cho de Park - Theme Park Monogatari (Demo)"
+  saveName: "Goo-Cho de Park - Theme Park Monogatari (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01620:
-  name: "Goryuujin Electro (Japan)"
+  name: "Goryuujin Electro"
+  saveName: "Goryuujin Electro (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -67831,7 +71355,8 @@ SLPS-01620:
     multitap: false
     linkCable: false
 SLPS-00422:
-  name: "Gotha II - Tenkuu no Kishi (Japan)"
+  name: "Gotha II - Tenkuu no Kishi"
+  saveName: "Gotha II - Tenkuu no Kishi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -67849,7 +71374,8 @@ SLPS-00422:
     multitap: false
     linkCable: false
 SLPS-03552:
-  name: "Gotouchi Hello Kitty Sugoroku Monogatari (Japan)"
+  name: "Gotouchi Hello Kitty Sugoroku Monogatari"
+  saveName: "Gotouchi Hello Kitty Sugoroku Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67868,7 +71394,8 @@ SLPS-03552:
     multitap: false
     linkCable: false
 SLPS-01471:
-  name: "Goujin Senki (Japan)"
+  name: "Goujin Senki"
+  saveName: "Goujin Senki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67890,7 +71417,8 @@ SLPS-01471:
     multitap: false
     linkCable: false
 SLPS-00104:
-  name: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu (Japan)"
+  name: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu"
+  saveName: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -67910,11 +71438,13 @@ SLPS-00104:
     multitap: false
     linkCable: false
 SLPM-80009:
-  name: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu (Japan) (Demo)"
+  name: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu (Demo)"
+  saveName: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03381:
-  name: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Japan)"
+  name: "Gourmet Action Game - Manpuku!! Nabe Kazoku"
+  saveName: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -67933,7 +71463,8 @@ SLPS-03381:
     multitap: false
     linkCable: false
 SLES-01598:
-  name: "Grab des Pharao, Das (Germany)"
+  name: "Grab des Pharao, Das"
+  saveName: "Grab des Pharao, Das (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -67951,7 +71482,8 @@ SLES-01598:
     multitap: false
     linkCable: false
 SLPS-00303:
-  name: "Gradius Deluxe Pack (Japan)"
+  name: "Gradius Deluxe Pack"
+  saveName: "Gradius Deluxe Pack (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-987-g003203e7"
@@ -67973,7 +71505,8 @@ SLPS-00303:
     multitap: false
     linkCable: false
 SLPM-86042:
-  name: "Gradius Gaiden (Japan)"
+  name: "Gradius Gaiden"
+  saveName: "Gradius Gaiden (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -67993,7 +71526,8 @@ SLPM-86042:
     multitap: false
     linkCable: false
 SLPM-86103:
-  name: "Gradius Gaiden (Japan) (Rev 1)"
+  name: "Gradius Gaiden"
+  saveName: "Gradius Gaiden (Japan) (Rev 1)"
   controllers:
     - DigitalController
   codes:
@@ -68014,7 +71548,8 @@ SLPM-86103:
     multitap: false
     linkCable: false
 SCES-00984:
-  name: "Gran Turismo (Europe) (En,Fr,De,Es,It)"
+  name: "Gran Turismo"
+  saveName: "Gran Turismo (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -68042,22 +71577,26 @@ SCES-00984:
     multitap: false
     linkCable: false
 SCED-01279:
-  name: "Gran Turismo (France) (Demo)"
+  name: "Gran Turismo (Demo)"
+  saveName: "Gran Turismo (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96085:
-  name: "Gran Turismo (Japan) (Demo 1)"
+  name: "Gran Turismo (Demo 1)"
+  saveName: "Gran Turismo (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   codes:
     - PCPX-96085
     - PCPX-96088
 PAPX-90026:
-  name: "Gran Turismo (Japan) (Demo 2)"
+  name: "Gran Turismo (Demo 2)"
+  saveName: "Gran Turismo (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-10045:
-  name: "Gran Turismo (Japan, Asia)"
+  name: "Gran Turismo"
+  saveName: "Gran Turismo (Japan, Asia)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -68083,7 +71622,8 @@ SCPS-10045:
     multitap: false
     linkCable: false
 SCUS-94194:
-  name: "Gran Turismo (USA)"
+  name: "Gran Turismo"
+  saveName: "Gran Turismo (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -68107,11 +71647,13 @@ SCUS-94194:
     multitap: false
     linkCable: false
 SCUS-94257:
-  name: "Gran Turismo (USA) (Demo)"
+  name: "Gran Turismo (Demo)"
+  saveName: "Gran Turismo (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02380:
-  name: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It) (Disc 1) (Arcade Mode)"
+  name: "Gran Turismo 2 (Disc 1) (Arcade Mode)"
+  saveName: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It) (Disc 1) (Arcade Mode)"
   discSet:
     name: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It)"
     serials:
@@ -68144,7 +71686,8 @@ SCES-02380:
     multitap: false
     linkCable: false
 SCES-12380:
-  name: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It) (Disc 2) (Gran Turismo Mode)"
+  name: "Gran Turismo 2 (Disc 2) (Gran Turismo Mode)"
+  saveName: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It) (Disc 2) (Gran Turismo Mode)"
   discSet:
     name: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It)"
     serials:
@@ -68177,13 +71720,16 @@ SCES-12380:
     multitap: false
     linkCable: false
 SCED-02904:
-  name: "Gran Turismo 2 (France) (Un CD Bonus)"
+  name: "Gran Turismo 2 (Un CD Bonus)"
+  saveName: "Gran Turismo 2 (France) (Un CD Bonus)"
 PAPX-90054:
-  name: "Gran Turismo 2 (Japan) (Demo)"
+  name: "Gran Turismo 2 (Demo)"
+  saveName: "Gran Turismo 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-91327:
-  name: "Gran Turismo 2 (Japan) (Disc 2) (Gran Turismo) (Rev 1)"
+  name: "Gran Turismo 2 (Disc 2) (Gran Turismo)"
+  saveName: "Gran Turismo 2 (Japan) (Disc 2) (Gran Turismo) (Rev 1)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -68204,7 +71750,8 @@ SCPS-91327:
     multitap: false
     linkCable: false
 SCPS-10116:
-  name: "Gran Turismo 2 (Japan, Asia) (Disc 1) (Arcade)"
+  name: "Gran Turismo 2 (Disc 1) (Arcade)"
+  saveName: "Gran Turismo 2 (Japan, Asia) (Disc 1) (Arcade)"
   discSet:
     name: "Gran Turismo 2 (Japan, Asia)"
     serials:
@@ -68234,7 +71781,8 @@ SCPS-10116:
     multitap: false
     linkCable: false
 SCPS-10117:
-  name: "Gran Turismo 2 (Japan, Asia) (Disc 2) (Gran Turismo)"
+  name: "Gran Turismo 2 (Disc 2) (Gran Turismo)"
+  saveName: "Gran Turismo 2 (Japan, Asia) (Disc 2) (Gran Turismo)"
   discSet:
     name: "Gran Turismo 2 (Japan, Asia)"
     serials:
@@ -68263,7 +71811,8 @@ SCPS-10117:
     multitap: false
     linkCable: false
 SCUS-94455:
-  name: "Gran Turismo 2 (USA) (Arcade Mode)"
+  name: "Gran Turismo 2 (Arcade Mode)"
+  saveName: "Gran Turismo 2 (USA) (Arcade Mode)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -68287,7 +71836,8 @@ SCUS-94455:
     multitap: false
     linkCable: false
 SCUS-94488:
-  name: "Gran Turismo 2 (USA) (Simulation Mode)"
+  name: "Gran Turismo 2 (Simulation Mode)"
+  saveName: "Gran Turismo 2 (USA) (Simulation Mode)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -68311,7 +71861,8 @@ SCUS-94488:
     multitap: false
     linkCable: false
 SCUS-94588:
-  name: "Gran Turismo 2 - Music at the Speed of Sound - The Album (USA) (Bonus PlayStation Disc)"
+  name: "Gran Turismo 2 - Music at the Speed of Sound - The Album (Bonus PlayStation Disc)"
+  saveName: "Gran Turismo 2 - Music at the Speed of Sound - The Album (USA) (Bonus PlayStation Disc)"
 SCAJ-01001:
   name: "Gran Turismo 2 - The Real Driving Simulator [PSOne Books]"
   controllers:
@@ -68336,7 +71887,8 @@ SCAJ-01001:
     multitap: false
     linkCable: false
 SLUS-00127:
-  name: "Grand Slam (USA)"
+  name: "Grand Slam"
+  saveName: "Grand Slam (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -68357,7 +71909,8 @@ SLUS-00127:
     multitap: false
     linkCable: false
 SLES-00032:
-  name: "Grand Theft Auto (Europe) (En,Fr,De,It)"
+  name: "Grand Theft Auto"
+  saveName: "Grand Theft Auto (Europe) (En,Fr,De,It)"
   discSet:
     name: "Grand Theft Auto (Europe) (En,Fr,De,It)"
     serials:
@@ -68383,7 +71936,8 @@ SLES-00032:
     multitap: false
     linkCable: false
 SLUS-00106:
-  name: "Grand Theft Auto (USA)"
+  name: "Grand Theft Auto"
+  saveName: "Grand Theft Auto (USA)"
   discSet:
     name: "Grand Theft Auto (USA)"
     serials:
@@ -68409,7 +71963,8 @@ SLUS-00106:
     multitap: false
     linkCable: false
 SLES-03389:
-  name: "Grand Theft Auto - London 1969 (Europe) (En,Fr,De,It)"
+  name: "Grand Theft Auto - London 1969"
+  saveName: "Grand Theft Auto - London 1969 (Europe) (En,Fr,De,It)"
   controllers:
     - DigitalController
   metadata:
@@ -68430,7 +71985,8 @@ SLES-03389:
     multitap: false
     linkCable: false
 SLES-01714:
-  name: "Grand Theft Auto - Mission Pack 1 - London 1969 (Europe) (En,De,It)"
+  name: "Grand Theft Auto - Mission Pack 1 - London 1969"
+  saveName: "Grand Theft Auto - Mission Pack 1 - London 1969 (Europe) (En,De,It)"
   discSet:
     name: "Grand Theft Auto (Europe) (En,Fr,De,It)"
     serials:
@@ -68455,7 +72011,8 @@ SLES-01714:
     multitap: false
     linkCable: false
 SLUS-00846:
-  name: "Grand Theft Auto - Mission Pack 1 - London 1969 (USA)"
+  name: "Grand Theft Auto - Mission Pack 1 - London 1969"
+  saveName: "Grand Theft Auto - Mission Pack 1 - London 1969 (USA)"
   discSet:
     name: "Grand Theft Auto (USA)"
     serials:
@@ -68478,7 +72035,8 @@ SLUS-00846:
     multitap: false
     linkCable: false
 SLES-01404:
-  name: "Grand Theft Auto 2 (Europe) (En,Fr,De,Es,It)"
+  name: "Grand Theft Auto 2"
+  saveName: "Grand Theft Auto 2 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -68500,9 +72058,11 @@ SLES-01404:
     multitap: false
     linkCable: false
 SLES-02453:
-  name: "Grand Theft Auto 2 (France)"
+  name: "Grand Theft Auto 2"
+  saveName: "Grand Theft Auto 2 (France)"
 SLUS-00789:
-  name: "Grand Theft Auto 2 (USA)"
+  name: "Grand Theft Auto 2"
+  saveName: "Grand Theft Auto 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -68545,7 +72105,8 @@ SLES-02458:
     multitap: false
     linkCable: false
 SCES-04090:
-  name: "Grande Fratello - Il Gioco (Italy)"
+  name: "Grande Fratello - Il Gioco"
+  saveName: "Grande Fratello - Il Gioco (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -68564,7 +72125,8 @@ SCES-04090:
     multitap: false
     linkCable: false
 SLES-02397:
-  name: "Grandia (Europe) (Disc 1)"
+  name: "Grandia (Disc 1)"
+  saveName: "Grandia (Europe) (Disc 1)"
   discSet:
     name: "Grandia (Europe)"
     serials:
@@ -68590,7 +72152,8 @@ SLES-02397:
     multitap: false
     linkCable: false
 SLES-12397:
-  name: "Grandia (Europe) (Disc 2)"
+  name: "Grandia (Disc 2)"
+  saveName: "Grandia (Europe) (Disc 2)"
   discSet:
     name: "Grandia (Europe)"
     serials:
@@ -68616,7 +72179,8 @@ SLES-12397:
     multitap: false
     linkCable: false
 SLES-02398:
-  name: "Grandia (France) (Disc 1)"
+  name: "Grandia (Disc 1)"
+  saveName: "Grandia (France) (Disc 1)"
   discSet:
     name: "Grandia (France)"
     serials:
@@ -68642,7 +72206,8 @@ SLES-02398:
     multitap: false
     linkCable: false
 SLES-12398:
-  name: "Grandia (France) (Disc 2)"
+  name: "Grandia (Disc 2)"
+  saveName: "Grandia (France) (Disc 2)"
   discSet:
     name: "Grandia (France)"
     serials:
@@ -68668,7 +72233,8 @@ SLES-12398:
     multitap: false
     linkCable: false
 SLES-02399:
-  name: "Grandia (Germany) (Disc 1)"
+  name: "Grandia (Disc 1)"
+  saveName: "Grandia (Germany) (Disc 1)"
   discSet:
     name: "Grandia (Germany)"
     serials:
@@ -68694,7 +72260,8 @@ SLES-02399:
     multitap: false
     linkCable: false
 SLES-12399:
-  name: "Grandia (Germany) (Disc 2)"
+  name: "Grandia (Disc 2)"
+  saveName: "Grandia (Germany) (Disc 2)"
   discSet:
     name: "Grandia (Germany)"
     serials:
@@ -68720,7 +72287,8 @@ SLES-12399:
     multitap: false
     linkCable: false
 SLPS-02124:
-  name: "Grandia (Japan) (Disc 1)"
+  name: "Grandia (Disc 1)"
+  saveName: "Grandia (Japan) (Disc 1)"
   discSet:
     name: "Grandia (Japan)"
     serials:
@@ -68749,7 +72317,8 @@ SLPS-02124:
     multitap: false
     linkCable: false
 SLPS-02125:
-  name: "Grandia (Japan) (Disc 2)"
+  name: "Grandia (Disc 2)"
+  saveName: "Grandia (Japan) (Disc 2)"
   discSet:
     name: "Grandia (Japan)"
     serials:
@@ -68778,7 +72347,8 @@ SLPS-02125:
     multitap: false
     linkCable: false
 SCUS-94457:
-  name: "Grandia (USA) (Disc 1)"
+  name: "Grandia (Disc 1)"
+  saveName: "Grandia (USA) (Disc 1)"
   discSet:
     name: "Grandia (USA)"
     serials:
@@ -68808,7 +72378,8 @@ SCUS-94457:
     multitap: false
     linkCable: false
 SCUS-94465:
-  name: "Grandia (USA) (Disc 2)"
+  name: "Grandia (Disc 2)"
+  saveName: "Grandia (USA) (Disc 2)"
   discSet:
     name: "Grandia (USA)"
     serials:
@@ -68838,13 +72409,15 @@ SCUS-94465:
     multitap: false
     linkCable: false
 SLPM-80297:
-  name: "Grandia - Prologue (Japan) (Demo)"
+  name: "Grandia - Prologue (Demo)"
+  saveName: "Grandia - Prologue (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPS-01624:
-  name: "Granew-tou! Daibouken (Japan)"
+  name: "Granew-tou! Daibouken"
+  saveName: "Granew-tou! Daibouken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -68863,7 +72436,8 @@ SLPS-01624:
     multitap: true
     linkCable: false
 SCPS-10046:
-  name: "Granstream Denki - The Granstream Saga (Japan)"
+  name: "Granstream Denki - The Granstream Saga"
+  saveName: "Granstream Denki - The Granstream Saga (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -68881,11 +72455,13 @@ SCPS-10046:
     multitap: false
     linkCable: false
 PCPX-96087:
-  name: "Granstream Denki - The Granstream Saga (Japan) (Demo)"
+  name: "Granstream Denki - The Granstream Saga (Demo)"
+  saveName: "Granstream Denki - The Granstream Saga (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01107:
-  name: "Granstream Saga, The (Europe)"
+  name: "Granstream Saga, The"
+  saveName: "Granstream Saga, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -68904,7 +72480,8 @@ SCES-01107:
     multitap: false
     linkCable: false
 SCES-01321:
-  name: "Granstream Saga, The (France)"
+  name: "Granstream Saga, The"
+  saveName: "Granstream Saga, The (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -68923,7 +72500,8 @@ SCES-01321:
     multitap: false
     linkCable: false
 SCES-01322:
-  name: "Granstream Saga, The (Germany)"
+  name: "Granstream Saga, The"
+  saveName: "Granstream Saga, The (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -68942,7 +72520,8 @@ SCES-01322:
     multitap: false
     linkCable: false
 SLUS-00597:
-  name: "Granstream Saga, The (USA)"
+  name: "Granstream Saga, The"
+  saveName: "Granstream Saga, The (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -68960,7 +72539,8 @@ SLUS-00597:
     multitap: false
     linkCable: false
 SLPS-00719:
-  name: "Great Battle VI, The (Japan)"
+  name: "Great Battle VI, The"
+  saveName: "Great Battle VI, The (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -68978,11 +72558,13 @@ SLPS-00719:
     multitap: false
     linkCable: false
 SLPM-80313:
-  name: "Great Hits (Japan) (Demo)"
+  name: "Great Hits (Demo)"
+  saveName: "Great Hits (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86125:
-  name: "Great Hits - Get Down with the Beat (Japan)"
+  name: "Great Hits - Get Down with the Beat"
+  saveName: "Great Hits - Get Down with the Beat (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -69000,7 +72582,8 @@ SLPM-86125:
     multitap: false
     linkCable: false
 SLPS-01268:
-  name: "Great Rugby Jikkyou '98 - World Cup e no Michi (Japan)"
+  name: "Great Rugby Jikkyou '98 - World Cup e no Michi"
+  saveName: "Great Rugby Jikkyou '98 - World Cup e no Michi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69023,7 +72606,8 @@ SLPS-01268:
     multitap: true
     linkCable: false
 SLES-00381:
-  name: "Grid Run (Europe)"
+  name: "Grid Run"
+  saveName: "Grid Run (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -69041,7 +72625,8 @@ SLES-00381:
     multitap: false
     linkCable: false
 SLPS-00659:
-  name: "Grid Runner (Japan)"
+  name: "Grid Runner"
+  saveName: "Grid Runner (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -69059,7 +72644,8 @@ SLPS-00659:
     multitap: false
     linkCable: false
 SLUS-00323:
-  name: "Grid Runner (USA)"
+  name: "Grid Runner"
+  saveName: "Grid Runner (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -69077,7 +72663,8 @@ SLUS-00323:
     multitap: false
     linkCable: false
 SLPS-00211:
-  name: "Grille Logic (Japan)"
+  name: "Grille Logic"
+  saveName: "Grille Logic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -69095,7 +72682,8 @@ SLPS-00211:
     multitap: false
     linkCable: false
 SLES-02974:
-  name: "Grinch, The (Europe) (En,Fr,De,Es,It)"
+  name: "Grinch, The"
+  saveName: "Grinch, The (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69118,7 +72706,8 @@ SLES-02974:
     multitap: false
     linkCable: false
 SLUS-01197:
-  name: "Grinch, The (USA) (En,Fr,Es)"
+  name: "Grinch, The"
+  saveName: "Grinch, The (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -69142,7 +72731,8 @@ SLUS-01197:
     multitap: false
     linkCable: false
 SCES-02885:
-  name: "Grind Session (Europe, Australia) (En,Fr,De,Es,It,Nl,Pt)"
+  name: "Grind Session"
+  saveName: "Grind Session (Europe, Australia) (En,Fr,De,Es,It,Nl,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69167,9 +72757,11 @@ SCES-02885:
     multitap: false
     linkCable: false
 SCES-03114:
-  name: "Grind Session (Scandinavia) (Sv,No,Da,Fi)"
+  name: "Grind Session"
+  saveName: "Grind Session (Scandinavia) (Sv,No,Da,Fi)"
 SCUS-94568:
-  name: "Grind Session (USA)"
+  name: "Grind Session"
+  saveName: "Grind Session (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -69191,11 +72783,13 @@ SCUS-94568:
     multitap: false
     linkCable: false
 SCUS-94598:
-  name: "Grind Session (USA) (Demo)"
+  name: "Grind Session (Demo)"
+  saveName: "Grind Session (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00615:
-  name: "Gritz - The Pyramid Adventure (Japan)"
+  name: "Gritz - The Pyramid Adventure"
+  saveName: "Gritz - The Pyramid Adventure (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -69213,7 +72807,8 @@ SLPS-00615:
     multitap: true
     linkCable: false
 SLPM-87138:
-  name: "Groove Adventure Rave - Mikan no Hiseki (Japan)"
+  name: "Groove Adventure Rave - Mikan no Hiseki"
+  saveName: "Groove Adventure Rave - Mikan no Hiseki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69270,7 +72865,8 @@ SLPM-87289:
     multitap: false
     linkCable: false
 SLPM-87011:
-  name: "Groove Adventure Rave - Yuukyuu no Kizuna (Japan)"
+  name: "Groove Adventure Rave - Yuukyuu no Kizuna"
+  saveName: "Groove Adventure Rave - Yuukyuu no Kizuna (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69292,7 +72888,8 @@ SLPM-87011:
     multitap: false
     linkCable: false
 SLPS-01205:
-  name: "Groove Jigoku V - SweepStation Version (Japan)"
+  name: "Groove Jigoku V - SweepStation Version"
+  saveName: "Groove Jigoku V - SweepStation Version (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69311,7 +72908,8 @@ SLPS-01205:
     multitap: false
     linkCable: false
 SLPS-00088:
-  name: "Ground Stroke - Advanced Tennis Game (Japan)"
+  name: "Ground Stroke - Advanced Tennis Game"
+  saveName: "Ground Stroke - Advanced Tennis Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -69329,7 +72927,8 @@ SLPS-00088:
     multitap: false
     linkCable: false
 SLPM-87333:
-  name: "Growlanser (Japan) (Disc 1)"
+  name: "Growlanser (Disc 1)"
+  saveName: "Growlanser (Japan) (Disc 1)"
   discSet:
     name: "Growlanser (Japan)"
     serials:
@@ -69357,7 +72956,8 @@ SLPM-87333:
     multitap: false
     linkCable: false
 SLPM-87334:
-  name: "Growlanser (Japan) (Disc 2)"
+  name: "Growlanser (Disc 2)"
+  saveName: "Growlanser (Japan) (Disc 2)"
   discSet:
     name: "Growlanser (Japan)"
     serials:
@@ -69385,7 +72985,8 @@ SLPM-87334:
     multitap: false
     linkCable: false
 SLES-02223:
-  name: "Grudge Warriors (Europe) (En,Fr,De,Es,It)"
+  name: "Grudge Warriors"
+  saveName: "Grudge Warriors (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69408,7 +73009,8 @@ SLES-02223:
     multitap: false
     linkCable: false
 SLUS-01150:
-  name: "Grudge Warriors (USA)"
+  name: "Grudge Warriors"
+  saveName: "Grudge Warriors (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69427,7 +73029,8 @@ SLUS-01150:
     multitap: false
     linkCable: false
 SLPS-01297:
-  name: "Guardian Recall - Shugojuu Shoukan (Japan) (Disc 1)"
+  name: "Guardian Recall - Shugojuu Shoukan (Disc 1)"
+  saveName: "Guardian Recall - Shugojuu Shoukan (Japan) (Disc 1)"
   discSet:
     name: "Guardian Recall - Shugojuu Shoukan (Japan)"
     serials:
@@ -69451,7 +73054,8 @@ SLPS-01297:
     multitap: false
     linkCable: false
 SLPS-01298:
-  name: "Guardian Recall - Shugojuu Shoukan (Japan) (Disc 2)"
+  name: "Guardian Recall - Shugojuu Shoukan (Disc 2)"
+  saveName: "Guardian Recall - Shugojuu Shoukan (Japan) (Disc 2)"
   discSet:
     name: "Guardian Recall - Shugojuu Shoukan (Japan)"
     serials:
@@ -69475,7 +73079,8 @@ SLPS-01298:
     multitap: false
     linkCable: false
 SLES-01776:
-  name: "Guardian of Darkness, The (Europe) (En,Fr,De,Es,It)"
+  name: "Guardian of Darkness, The"
+  saveName: "Guardian of Darkness, The (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69498,7 +73103,8 @@ SLES-01776:
     multitap: false
     linkCable: false
 SLES-01793:
-  name: "Guardian's Crusade (Europe)"
+  name: "Guardian's Crusade"
+  saveName: "Guardian's Crusade (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -69516,7 +73122,8 @@ SLES-01793:
     multitap: false
     linkCable: false
 SLES-01799:
-  name: "Guardian's Crusade (France)"
+  name: "Guardian's Crusade"
+  saveName: "Guardian's Crusade (France)"
   controllers:
     - DigitalController
   metadata:
@@ -69534,7 +73141,8 @@ SLES-01799:
     multitap: false
     linkCable: false
 SLES-01800:
-  name: "Guardian's Crusade (Germany)"
+  name: "Guardian's Crusade"
+  saveName: "Guardian's Crusade (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -69552,7 +73160,8 @@ SLES-01800:
     multitap: false
     linkCable: false
 SLES-01801:
-  name: "Guardian's Crusade (Italy)"
+  name: "Guardian's Crusade"
+  saveName: "Guardian's Crusade (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -69570,7 +73179,8 @@ SLES-01801:
     multitap: false
     linkCable: false
 SLUS-00811:
-  name: "Guardian's Crusade (USA)"
+  name: "Guardian's Crusade"
+  saveName: "Guardian's Crusade (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -69588,7 +73198,8 @@ SLUS-00811:
     multitap: false
     linkCable: false
 SLES-03208:
-  name: "Gubble (Europe)"
+  name: "Gubble"
+  saveName: "Gubble (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69607,7 +73218,8 @@ SLES-03208:
     multitap: false
     linkCable: false
 SLPS-01537:
-  name: "Gubble (Japan)"
+  name: "Gubble"
+  saveName: "Gubble (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69626,7 +73238,8 @@ SLPS-01537:
     multitap: false
     linkCable: false
 SLUS-01466:
-  name: "Gubble (USA)"
+  name: "Gubble"
+  saveName: "Gubble (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -69648,7 +73261,8 @@ SLUS-01466:
     multitap: false
     linkCable: false
 SLES-02494:
-  name: "Guilty Gear (Europe)"
+  name: "Guilty Gear"
+  saveName: "Guilty Gear (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -69666,7 +73280,8 @@ SLES-02494:
     multitap: false
     linkCable: false
 SLPS-01357:
-  name: "Guilty Gear (Japan)"
+  name: "Guilty Gear"
+  saveName: "Guilty Gear (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -69686,11 +73301,13 @@ SLPS-01357:
     multitap: false
     linkCable: false
 SLPM-80302:
-  name: "Guilty Gear (Japan) (Demo)"
+  name: "Guilty Gear (Demo)"
+  saveName: "Guilty Gear (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02273:
-  name: "Guilty Gear (Japan) (Rev 1)"
+  name: "Guilty Gear"
+  saveName: "Guilty Gear (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -69708,7 +73325,8 @@ SLPS-02273:
     multitap: false
     linkCable: false
 SLUS-00772:
-  name: "Guilty Gear (USA)"
+  name: "Guilty Gear"
+  saveName: "Guilty Gear (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -69745,7 +73363,8 @@ SCPS-45422:
     multitap: false
     linkCable: false
 SLPM-86265:
-  name: "Guitar Freaks (Japan)"
+  name: "Guitar Freaks"
+  saveName: "Guitar Freaks (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69767,7 +73386,8 @@ SLPM-86265:
     multitap: false
     linkCable: false
 SLPM-86446:
-  name: "Guitar Freaks Append 2nd Mix (Japan)"
+  name: "Guitar Freaks Append 2nd Mix"
+  saveName: "Guitar Freaks Append 2nd Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69786,7 +73406,8 @@ SLPM-86446:
     multitap: false
     linkCable: false
 SLPS-00930:
-  name: "GunBullet (Japan)"
+  name: "GunBullet"
+  saveName: "GunBullet (Japan)"
   controllers:
     - DigitalController
     - GunCon
@@ -69805,7 +73426,8 @@ SLPS-00930:
     multitap: false
     linkCable: false
 SLPS-00929:
-  name: "GunBullet (Japan) (GunBullet + GunCon)"
+  name: "GunBullet (GunBullet + GunCon)"
+  saveName: "GunBullet (Japan) (GunBullet + GunCon)"
   controllers:
     - DigitalController
     - GunCon
@@ -69824,7 +73446,8 @@ SLPS-00929:
     multitap: false
     linkCable: false
 SLPS-03100:
-  name: "Gunbalina (Japan)"
+  name: "Gunbalina"
+  saveName: "Gunbalina (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69844,7 +73467,8 @@ SLPS-03100:
     multitap: false
     linkCable: false
 SLPS-01322:
-  name: "Gunbare! Game Tengoku - The Game Paradise 2 (Japan)"
+  name: "Gunbare! Game Tengoku - The Game Paradise 2"
+  saveName: "Gunbare! Game Tengoku - The Game Paradise 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69864,11 +73488,13 @@ SLPS-01322:
     multitap: false
     linkCable: false
 SLPM-80303:
-  name: "Gunbare! Game Tengoku - The Game Paradise 2 (Japan) (Demo)"
+  name: "Gunbare! Game Tengoku - The Game Paradise 2 (Demo)"
+  saveName: "Gunbare! Game Tengoku - The Game Paradise 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45299:
-  name: "Gunbarl (Japan, Asia)"
+  name: "Gunbarl"
+  saveName: "Gunbarl (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69911,7 +73537,8 @@ SLPS-91195:
     multitap: false
     linkCable: false
 SLPS-00157:
-  name: "Gunbird (Japan)"
+  name: "Gunbird"
+  saveName: "Gunbird (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -69933,7 +73560,8 @@ SLPS-00157:
     multitap: false
     linkCable: false
 SLPS-00883:
-  name: "Gundam - The Battle Master (Japan)"
+  name: "Gundam - The Battle Master"
+  saveName: "Gundam - The Battle Master (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -69951,9 +73579,11 @@ SLPS-00883:
     multitap: false
     linkCable: false
 SLPM-80098:
-  name: "Gundam - The Battle Master (Japan) (Taikenban)"
+  name: "Gundam - The Battle Master (Taikenban)"
+  saveName: "Gundam - The Battle Master (Japan) (Taikenban)"
 SLPS-01286:
-  name: "Gundam - The Battle Master 2 (Japan)"
+  name: "Gundam - The Battle Master 2"
+  saveName: "Gundam - The Battle Master 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -69972,7 +73602,8 @@ SLPS-01286:
     multitap: false
     linkCable: false
 SLPS-00815:
-  name: "Gundam 0079 - The War for Earth (Japan) (Disc 1)"
+  name: "Gundam 0079 - The War for Earth (Disc 1)"
+  saveName: "Gundam 0079 - The War for Earth (Japan) (Disc 1)"
   discSet:
     name: "Gundam 0079 - The War for Earth (Japan)"
     serials:
@@ -69995,7 +73626,8 @@ SLPS-00815:
     multitap: false
     linkCable: false
 SLPS-00816:
-  name: "Gundam 0079 - The War for Earth (Japan) (Disc 2)"
+  name: "Gundam 0079 - The War for Earth (Disc 2)"
+  saveName: "Gundam 0079 - The War for Earth (Japan) (Disc 2)"
   discSet:
     name: "Gundam 0079 - The War for Earth (Japan)"
     serials:
@@ -70018,7 +73650,8 @@ SLPS-00816:
     multitap: false
     linkCable: false
 SLES-03650:
-  name: "Gundam Battle Assault (Europe) (En,Fr,De,Es,It)"
+  name: "Gundam Battle Assault"
+  saveName: "Gundam Battle Assault (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70041,7 +73674,8 @@ SLES-03650:
     multitap: false
     linkCable: false
 SLPM-86746:
-  name: "Gundam Battle Assault (Japan)"
+  name: "Gundam Battle Assault"
+  saveName: "Gundam Battle Assault (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70060,7 +73694,8 @@ SLPM-86746:
     multitap: false
     linkCable: false
 SLUS-01226:
-  name: "Gundam Battle Assault (USA)"
+  name: "Gundam Battle Assault"
+  saveName: "Gundam Battle Assault (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70079,7 +73714,8 @@ SLUS-01226:
     multitap: false
     linkCable: false
 SLES-03934:
-  name: "Gundam Battle Assault 2 (Europe) (En,Fr,De,Es,It)"
+  name: "Gundam Battle Assault 2"
+  saveName: "Gundam Battle Assault 2 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70102,7 +73738,8 @@ SLES-03934:
     multitap: false
     linkCable: false
 SLUS-01418:
-  name: "Gundam Battle Assault 2 (USA)"
+  name: "Gundam Battle Assault 2"
+  saveName: "Gundam Battle Assault 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70140,7 +73777,8 @@ SCPS-45172:
     multitap: false
     linkCable: false
 SLPS-02512:
-  name: "Gundress (Japan)"
+  name: "Gundress"
+  saveName: "Gundress (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70159,7 +73797,8 @@ SLPS-02512:
     multitap: false
     linkCable: false
 SLPS-02513:
-  name: "Gundress Data-shuu (Japan)"
+  name: "Gundress Data-shuu"
+  saveName: "Gundress Data-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70178,7 +73817,8 @@ SLPS-02513:
     multitap: false
     linkCable: false
 SLES-03689:
-  name: "Gunfighter - The Legend of Jesse James (Europe) (En,Fr,De,Es,It)"
+  name: "Gunfighter - The Legend of Jesse James"
+  saveName: "Gunfighter - The Legend of Jesse James (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70202,7 +73842,8 @@ SLES-03689:
     multitap: false
     linkCable: false
 SLUS-01398:
-  name: "Gunfighter - The Legend of Jesse James (USA)"
+  name: "Gunfighter - The Legend of Jesse James"
+  saveName: "Gunfighter - The Legend of Jesse James (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -70244,7 +73885,8 @@ SCPS-45408:
     multitap: false
     linkCable: false
 SLES-02069:
-  name: "Gungage (Europe)"
+  name: "Gungage"
+  saveName: "Gungage (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70263,7 +73905,8 @@ SLES-02069:
     multitap: false
     linkCable: false
 SLPM-86233:
-  name: "Gungage (Japan)"
+  name: "Gungage"
+  saveName: "Gungage (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70282,7 +73925,8 @@ SLPM-86233:
     multitap: false
     linkCable: false
 SLPS-01902:
-  name: "Gungho Brigade (Japan)"
+  name: "Gungho Brigade"
+  saveName: "Gungho Brigade (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70301,11 +73945,13 @@ SLPS-01902:
     multitap: false
     linkCable: false
 SLPM-80324:
-  name: "Gungho Brigade (Japan) (Demo)"
+  name: "Gungho Brigade (Demo)"
+  saveName: "Gungho Brigade (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10006:
-  name: "Gunners Heaven (Japan)"
+  name: "Gunners Heaven"
+  saveName: "Gunners Heaven (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -70330,7 +73976,8 @@ SCPS-10006:
     multitap: false
     linkCable: false
 SLPS-01408:
-  name: "Gunnm - Kasei no Kioku (Japan)"
+  name: "Gunnm - Kasei no Kioku"
+  saveName: "Gunnm - Kasei no Kioku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70349,7 +73996,8 @@ SLPS-01408:
     multitap: false
     linkCable: false
 SLPS-02485:
-  name: "Gunpey (Japan)"
+  name: "Gunpey"
+  saveName: "Gunpey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70368,7 +74016,8 @@ SLPS-02485:
     multitap: false
     linkCable: false
 SLES-00027:
-  name: "Gunship (Europe) (En,Fr,De,Es,It)"
+  name: "Gunship"
+  saveName: "Gunship (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -70390,7 +74039,8 @@ SLES-00027:
     multitap: false
     linkCable: false
 SLPS-00495:
-  name: "Gunship (Japan)"
+  name: "Gunship"
+  saveName: "Gunship (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70408,7 +74058,8 @@ SLPS-00495:
     multitap: false
     linkCable: false
 SLUS-00313:
-  name: "Gunship (USA)"
+  name: "Gunship"
+  saveName: "Gunship (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -70426,7 +74077,8 @@ SLUS-00313:
     multitap: false
     linkCable: false
 SLPS-01106:
-  name: "Guntu - Western Front June, 1944 - Tetsu no Kioku (Japan)"
+  name: "Guntu - Western Front June, 1944 - Tetsu no Kioku"
+  saveName: "Guntu - Western Front June, 1944 - Tetsu no Kioku (Japan)"
   controllers:
     - DigitalController
     - GunCon
@@ -70445,7 +74097,8 @@ SLPS-01106:
     multitap: false
     linkCable: false
 SLPS-00041:
-  name: "Gussun Oyoyo (Japan)"
+  name: "Gussun Oyoyo"
+  saveName: "Gussun Oyoyo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70481,7 +74134,8 @@ SLPS-02723:
     multitap: false
     linkCable: false
 SLPS-00588:
-  name: "Gussun Paradise (Japan)"
+  name: "Gussun Paradise"
+  saveName: "Gussun Paradise (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70517,7 +74171,8 @@ SLPS-91476:
     multitap: true
     linkCable: false
 SLPM-86148:
-  name: "Guuguuthropus (Japan)"
+  name: "Guuguuthropus"
+  saveName: "Guuguuthropus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70535,11 +74190,13 @@ SLPM-86148:
     multitap: false
     linkCable: false
 SLPM-80365:
-  name: "Guuguuthropus (Japan) (Demo)"
+  name: "Guuguuthropus (Demo)"
+  saveName: "Guuguuthropus (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01360:
-  name: "Guy Roux Football Manager Saison 97-98 (France)"
+  name: "Guy Roux Football Manager Saison 97-98"
+  saveName: "Guy Roux Football Manager Saison 97-98 (France)"
   controllers:
     - DigitalController
   metadata:
@@ -70557,7 +74214,8 @@ SLES-01360:
     multitap: false
     linkCable: false
 SLES-01934:
-  name: "Guy Roux Manager '99 (France)"
+  name: "Guy Roux Manager '99"
+  saveName: "Guy Roux Manager '99 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70576,7 +74234,8 @@ SLES-01934:
     multitap: false
     linkCable: false
 SLES-02612:
-  name: "Guy Roux Manager 2000 (France)"
+  name: "Guy Roux Manager 2000"
+  saveName: "Guy Roux Manager 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70595,7 +74254,8 @@ SLES-02612:
     multitap: false
     linkCable: false
 SLES-03403:
-  name: "Guy Roux Manager 2001 (France)"
+  name: "Guy Roux Manager 2001"
+  saveName: "Guy Roux Manager 2001 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70614,7 +74274,8 @@ SLES-03403:
     multitap: false
     linkCable: false
 SLPS-02509:
-  name: "Gyuwambler Jiko Chuushinha - Ippatsu Shoubu! (Japan)"
+  name: "Gyuwambler Jiko Chuushinha - Ippatsu Shoubu!"
+  saveName: "Gyuwambler Jiko Chuushinha - Ippatsu Shoubu! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70632,7 +74293,8 @@ SLPS-02509:
     multitap: false
     linkCable: false
 SLES-02738:
-  name: "HBO Boxing (Europe) (En,De)"
+  name: "HBO Boxing"
+  saveName: "HBO Boxing (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70652,7 +74314,8 @@ SLES-02738:
     multitap: false
     linkCable: false
 SLUS-01027:
-  name: "HBO Boxing (USA)"
+  name: "HBO Boxing"
+  saveName: "HBO Boxing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3187-gf580dbc6"
@@ -70674,7 +74337,8 @@ SLUS-01027:
     multitap: false
     linkCable: false
 SLPM-80196:
-  name: "Hacha Mecha Pon! (Japan)"
+  name: "Hacha Mecha Pon!"
+  saveName: "Hacha Mecha Pon! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70692,7 +74356,8 @@ SLPM-80196:
     multitap: false
     linkCable: false
 SLPM-86066:
-  name: "Hai-Shin 2 (Japan)"
+  name: "Hai-Shin 2"
+  saveName: "Hai-Shin 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70711,7 +74376,8 @@ SLPM-86066:
     multitap: false
     linkCable: false
 SLPS-02432:
-  name: "Hai-Shin 2 (Japan) (DigiCube Best Selection)"
+  name: "Hai-Shin 2 (DigiCube Best Selection)"
+  saveName: "Hai-Shin 2 (Japan) (DigiCube Best Selection)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70749,7 +74415,8 @@ SLPS-91496:
     multitap: false
     linkCable: false
 SLPS-00945:
-  name: "Hajime no Ippo - The Fighting! (Japan)"
+  name: "Hajime no Ippo - The Fighting!"
+  saveName: "Hajime no Ippo - The Fighting! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -70770,7 +74437,8 @@ SLPS-00945:
     multitap: false
     linkCable: false
 SLPS-01677:
-  name: "Hakai-ou - King of Crusher (Japan)"
+  name: "Hakai-ou - King of Crusher"
+  saveName: "Hakai-ou - King of Crusher (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70789,7 +74457,8 @@ SLPS-01677:
     multitap: false
     linkCable: false
 SLES-03584:
-  name: "Haluatko Miljonaariksi (Finland)"
+  name: "Haluatko Miljonaariksi"
+  saveName: "Haluatko Miljonaariksi (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70808,7 +74477,8 @@ SLES-03584:
     multitap: true
     linkCable: false
 SLPS-03266:
-  name: "Hamster Club-i (Japan)"
+  name: "Hamster Club-i"
+  saveName: "Hamster Club-i (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70827,7 +74497,8 @@ SLPS-03266:
     multitap: true
     linkCable: false
 SLPS-02724:
-  name: "Hamster Monogatari (Japan)"
+  name: "Hamster Monogatari"
+  saveName: "Hamster Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70865,7 +74536,8 @@ SLPS-03527:
     multitap: false
     linkCable: false
 SLPS-03103:
-  name: "Hamster no Odekake (Japan)"
+  name: "Hamster no Odekake"
+  saveName: "Hamster no Odekake (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70883,7 +74555,8 @@ SLPS-03103:
     multitap: false
     linkCable: false
 SLPM-86662:
-  name: "Hamunaptra - Ushinawareta Sabaku no Miyako (Japan)"
+  name: "Hamunaptra - Ushinawareta Sabaku no Miyako"
+  saveName: "Hamunaptra - Ushinawareta Sabaku no Miyako (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70902,7 +74575,8 @@ SLPM-86662:
     multitap: false
     linkCable: false
 SLPS-01532:
-  name: "Hana to Ryuu (Japan)"
+  name: "Hana to Ryuu"
+  saveName: "Hana to Ryuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -70920,7 +74594,8 @@ SLPS-01532:
     multitap: false
     linkCable: false
 SLPM-87062:
-  name: "Hana to Ryuu - Hanafuda, Mahjong (Japan) (Major Wave)"
+  name: "Hana to Ryuu - Hanafuda, Mahjong (Major Wave)"
+  saveName: "Hana to Ryuu - Hanafuda, Mahjong (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -70938,7 +74613,8 @@ SLPM-87062:
     multitap: false
     linkCable: false
 SLPS-01439:
-  name: "Hanabi - Fantast (Japan)"
+  name: "Hanabi - Fantast"
+  saveName: "Hanabi - Fantast (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -70957,7 +74633,8 @@ SLPS-01439:
     multitap: false
     linkCable: false
 PAPX-90048:
-  name: "Hanabi - Fantast (Japan) (Demo)"
+  name: "Hanabi - Fantast (Demo)"
+  saveName: "Hanabi - Fantast (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
@@ -70983,7 +74660,8 @@ SLPS-03080:
     multitap: false
     linkCable: false
 SLPS-00367:
-  name: "Hanafuda Graffiti - Koi Koi Monogatari (Japan)"
+  name: "Hanafuda Graffiti - Koi Koi Monogatari"
+  saveName: "Hanafuda Graffiti - Koi Koi Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71001,7 +74679,8 @@ SLPS-00367:
     multitap: false
     linkCable: false
 SLPM-87083:
-  name: "Hanafuda Graffiti - Koi Koi Monogatari (Japan) (Major Wave)"
+  name: "Hanafuda Graffiti - Koi Koi Monogatari (Major Wave)"
+  saveName: "Hanafuda Graffiti - Koi Koi Monogatari (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -71019,7 +74698,8 @@ SLPM-87083:
     multitap: false
     linkCable: false
 SLPS-01747:
-  name: "Hanafuda Real 3D (Japan)"
+  name: "Hanafuda Real 3D"
+  saveName: "Hanafuda Real 3D (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71037,7 +74717,8 @@ SLPS-01747:
     multitap: false
     linkCable: false
 SLPS-03182:
-  name: "Happy Diet (Japan)"
+  name: "Happy Diet"
+  saveName: "Happy Diet (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71074,7 +74755,8 @@ SCPS-45145:
     multitap: false
     linkCable: false
 SLPS-01110:
-  name: "Happy Hotel (Japan)"
+  name: "Happy Hotel"
+  saveName: "Happy Hotel (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71092,7 +74774,8 @@ SLPS-01110:
     multitap: false
     linkCable: false
 SLPS-03306:
-  name: "Happy Jogging in Hawaii (Japan)"
+  name: "Happy Jogging in Hawaii"
+  saveName: "Happy Jogging in Hawaii (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71111,7 +74794,8 @@ SLPS-03306:
     multitap: false
     linkCable: false
 SLPS-02821:
-  name: "Happy Salvage (Japan)"
+  name: "Happy Salvage"
+  saveName: "Happy Salvage (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71130,7 +74814,8 @@ SLPS-02821:
     multitap: false
     linkCable: false
 SLPS-02822:
-  name: "Happy Salvage - Otakara Disc (Japan)"
+  name: "Happy Salvage - Otakara Disc"
+  saveName: "Happy Salvage - Otakara Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71149,7 +74834,8 @@ SLPS-02822:
     multitap: false
     linkCable: false
 SLPM-86043:
-  name: "Hard Blow (Japan)"
+  name: "Hard Blow"
+  saveName: "Hard Blow (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71167,7 +74853,8 @@ SLPM-86043:
     multitap: false
     linkCable: false
 SLES-00033:
-  name: "Hard Boiled (Europe)"
+  name: "Hard Boiled"
+  saveName: "Hard Boiled (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71186,7 +74873,8 @@ SLES-00033:
     multitap: false
     linkCable: false
 SLES-00851:
-  name: "Hard Boiled (France)"
+  name: "Hard Boiled"
+  saveName: "Hard Boiled (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71205,7 +74893,8 @@ SLES-00851:
     multitap: false
     linkCable: false
 SLES-00852:
-  name: "Hard Boiled (Germany)"
+  name: "Hard Boiled"
+  saveName: "Hard Boiled (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71224,7 +74913,8 @@ SLES-00852:
     multitap: false
     linkCable: false
 SLPS-01484:
-  name: "Hard Boiled - Neuro Tower o Hakai Seyo (Japan)"
+  name: "Hard Boiled - Neuro Tower o Hakai Seyo"
+  saveName: "Hard Boiled - Neuro Tower o Hakai Seyo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71244,7 +74934,8 @@ SLPS-01484:
     multitap: false
     linkCable: false
 SLES-01539:
-  name: "Hard Edge (Europe) (En,Fr,De)"
+  name: "Hard Edge"
+  saveName: "Hard Edge (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71267,7 +74958,8 @@ SLES-01539:
     multitap: false
     linkCable: false
 SLPS-01733:
-  name: "Hard Edge (Japan)"
+  name: "Hard Edge"
+  saveName: "Hard Edge (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71330,7 +75022,8 @@ SLPS-03270:
     multitap: false
     linkCable: false
 SLPS-00224:
-  name: "Hard Rock Cab (Japan)"
+  name: "Hard Rock Cab"
+  saveName: "Hard Rock Cab (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71348,7 +75041,8 @@ SLPS-00224:
     multitap: false
     linkCable: false
 SLUS-00651:
-  name: "HardBall '99 (USA)"
+  name: "HardBall '99"
+  saveName: "HardBall '99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71367,7 +75061,8 @@ SLUS-00651:
     multitap: false
     linkCable: false
 SLPS-00571:
-  name: "HardBall 5 (Japan)"
+  name: "HardBall 5"
+  saveName: "HardBall 5 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71385,7 +75080,8 @@ SLPS-00571:
     multitap: false
     linkCable: false
 SLUS-00108:
-  name: "HardBall 5 (USA)"
+  name: "HardBall 5"
+  saveName: "HardBall 5 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -71403,7 +75099,8 @@ SLUS-00108:
     multitap: false
     linkCable: false
 SLES-00261:
-  name: "Hardcore 4x4 (Europe) (En,Fr,De)"
+  name: "Hardcore 4x4"
+  saveName: "Hardcore 4x4 (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
     - NeGcon
@@ -71424,7 +75121,8 @@ SLES-00261:
     multitap: false
     linkCable: false
 SLPM-86329:
-  name: "Harlem Beat - You're the One (Japan)"
+  name: "Harlem Beat - You're the One"
+  saveName: "Harlem Beat - You're the One (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -71442,7 +75140,8 @@ SLPM-86329:
     multitap: false
     linkCable: false
 SLPS-00498:
-  name: "Harmful Park (Japan)"
+  name: "Harmful Park"
+  saveName: "Harmful Park (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1031-g47138aa"
@@ -71463,7 +75162,8 @@ SLPS-00498:
     multitap: false
     linkCable: false
 SLES-03972:
-  name: "Harry Potter and the Chamber of Secrets (Europe) (En,Fr,De)"
+  name: "Harry Potter and the Chamber of Secrets"
+  saveName: "Harry Potter and the Chamber of Secrets (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71486,7 +75186,8 @@ SLES-03972:
     multitap: false
     linkCable: false
 SLES-03974:
-  name: "Harry Potter and the Chamber of Secrets (Europe) (En,Nl,Da)"
+  name: "Harry Potter and the Chamber of Secrets"
+  saveName: "Harry Potter and the Chamber of Secrets (Europe) (En,Nl,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71509,7 +75210,8 @@ SLES-03974:
     multitap: false
     linkCable: false
 SLES-03973:
-  name: "Harry Potter and the Chamber of Secrets (Europe) (Es,It,Pt)"
+  name: "Harry Potter and the Chamber of Secrets"
+  saveName: "Harry Potter and the Chamber of Secrets (Europe) (Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71532,7 +75234,8 @@ SLES-03973:
     multitap: false
     linkCable: false
 SLES-03975:
-  name: "Harry Potter and the Chamber of Secrets (Scandinavia) (En,Sv,No)"
+  name: "Harry Potter and the Chamber of Secrets"
+  saveName: "Harry Potter and the Chamber of Secrets (Scandinavia) (En,Sv,No)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71555,7 +75258,8 @@ SLES-03975:
     multitap: false
     linkCable: false
 SLUS-01503:
-  name: "Harry Potter and the Chamber of Secrets (USA) (En,Fr,Es)"
+  name: "Harry Potter and the Chamber of Secrets"
+  saveName: "Harry Potter and the Chamber of Secrets (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1520-g0aefdf47"
@@ -71581,11 +75285,13 @@ SLUS-01503:
     multitap: false
     linkCable: false
 SLUS-01417:
-  name: "Harry Potter and the Philosopher's Stone (Canada) (En,Fr,De)"
+  name: "Harry Potter and the Philosopher's Stone"
+  saveName: "Harry Potter and the Philosopher's Stone (Canada) (En,Fr,De)"
   traits:
     - ForcePGXPCPUMode
 SLES-03662:
-  name: "Harry Potter and the Philosopher's Stone (Europe) (En,Fr,De)"
+  name: "Harry Potter and the Philosopher's Stone"
+  saveName: "Harry Potter and the Philosopher's Stone (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71608,7 +75314,8 @@ SLES-03662:
     multitap: false
     linkCable: false
 SLES-03665:
-  name: "Harry Potter and the Philosopher's Stone (Europe) (En,Nl,Da)"
+  name: "Harry Potter and the Philosopher's Stone"
+  saveName: "Harry Potter and the Philosopher's Stone (Europe) (En,Nl,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71631,7 +75338,8 @@ SLES-03665:
     multitap: false
     linkCable: false
 SLES-03663:
-  name: "Harry Potter and the Philosopher's Stone (Europe) (Es,It,Pt)"
+  name: "Harry Potter and the Philosopher's Stone"
+  saveName: "Harry Potter and the Philosopher's Stone (Europe) (Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71654,7 +75362,8 @@ SLES-03663:
     multitap: false
     linkCable: false
 SLES-03664:
-  name: "Harry Potter and the Philosopher's Stone (Scandinavia) (Sv,No,Fi)"
+  name: "Harry Potter and the Philosopher's Stone"
+  saveName: "Harry Potter and the Philosopher's Stone (Scandinavia) (Sv,No,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71677,7 +75386,8 @@ SLES-03664:
     multitap: false
     linkCable: false
 SLUS-01415:
-  name: "Harry Potter and the Sorcerer's Stone (USA) (En,Fr,Es)"
+  name: "Harry Potter and the Sorcerer's Stone"
+  saveName: "Harry Potter and the Sorcerer's Stone (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1520-g0aefdf47"
@@ -71703,7 +75413,8 @@ SLUS-01415:
     multitap: false
     linkCable: false
 SLES-03976:
-  name: "Harry Potter ja Salaisuuksien Kammio (Finland) (En,Fi)"
+  name: "Harry Potter ja Salaisuuksien Kammio"
+  saveName: "Harry Potter ja Salaisuuksien Kammio (Finland) (En,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71724,7 +75435,8 @@ SLES-03976:
     multitap: false
     linkCable: false
 SLPS-03492:
-  name: "Harry Potter to Himitsu no Heya (Japan)"
+  name: "Harry Potter to Himitsu no Heya"
+  saveName: "Harry Potter to Himitsu no Heya (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71745,7 +75457,8 @@ SLPS-03492:
     multitap: false
     linkCable: false
 SLPS-03355:
-  name: "Harry Potter to Kenja no Ishi (Japan)"
+  name: "Harry Potter to Kenja no Ishi"
+  saveName: "Harry Potter to Kenja no Ishi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71766,13 +75479,16 @@ SLPS-03355:
     multitap: false
     linkCable: false
 SLPM-84013:
-  name: "Harry Potter to Kenja no Ishi (Japan) (Coca-Cola Kenshouhin)"
+  name: "Harry Potter to Kenja no Ishi (Coca-Cola Kenshouhin)"
+  saveName: "Harry Potter to Kenja no Ishi (Japan) (Coca-Cola Kenshouhin)"
   traits:
     - ForcePGXPCPUMode
 PCPX-96110:
-  name: "Haru no BuruBuru (Japan) (Taikenban)"
+  name: "Haru no BuruBuru (Taikenban)"
+  saveName: "Haru no BuruBuru (Japan) (Taikenban)"
 SLPM-86466:
-  name: "Harukanaru Toki no Naka de (Japan)"
+  name: "Harukanaru Toki no Naka de"
+  saveName: "Harukanaru Toki no Naka de (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71791,7 +75507,8 @@ SLPM-86466:
     multitap: false
     linkCable: false
 SLPM-86465:
-  name: "Harukanaru Toki no Naka de (Japan) (Premium Box)"
+  name: "Harukanaru Toki no Naka de (Premium Box)"
+  saveName: "Harukanaru Toki no Naka de (Japan) (Premium Box)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71810,7 +75527,8 @@ SLPM-86465:
     multitap: false
     linkCable: false
 SLPM-87242:
-  name: "Harukanaru Toki no Naka de - Banjou Yuugi (Japan)"
+  name: "Harukanaru Toki no Naka de - Banjou Yuugi"
+  saveName: "Harukanaru Toki no Naka de - Banjou Yuugi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71829,7 +75547,8 @@ SLPM-87242:
     multitap: true
     linkCable: false
 SLPM-87241:
-  name: "Harukanaru Toki no Naka de - Banjou Yuugi (Japan) (Premium Box)"
+  name: "Harukanaru Toki no Naka de - Banjou Yuugi (Premium Box)"
+  saveName: "Harukanaru Toki no Naka de - Banjou Yuugi (Japan) (Premium Box)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71889,7 +75608,8 @@ SLPM-87349:
     multitap: false
     linkCable: false
 SLPS-00578:
-  name: "Harukaze Sentai V-Force (Japan) (Disc 1)"
+  name: "Harukaze Sentai V-Force (Disc 1)"
+  saveName: "Harukaze Sentai V-Force (Japan) (Disc 1)"
   discSet:
     name: "Harukaze Sentai V-Force (Japan)"
     serials:
@@ -71916,7 +75636,8 @@ SLPS-00578:
     multitap: false
     linkCable: false
 SLPS-00579:
-  name: "Harukaze Sentai V-Force (Japan) (Disc 2)"
+  name: "Harukaze Sentai V-Force (Disc 2)"
+  saveName: "Harukaze Sentai V-Force (Japan) (Disc 2)"
   discSet:
     name: "Harukaze Sentai V-Force (Japan)"
     serials:
@@ -71943,7 +75664,8 @@ SLPS-00579:
     multitap: false
     linkCable: false
 SLPS-00580:
-  name: "Harukaze Sentai V-Force (Japan) (Disc 3)"
+  name: "Harukaze Sentai V-Force (Disc 3)"
+  saveName: "Harukaze Sentai V-Force (Japan) (Disc 3)"
   discSet:
     name: "Harukaze Sentai V-Force (Japan)"
     serials:
@@ -71970,7 +75692,8 @@ SLPS-00580:
     multitap: false
     linkCable: false
 SLES-02781:
-  name: "Harvest Moon - Back to Nature (Europe) (En,De)"
+  name: "Harvest Moon - Back to Nature"
+  saveName: "Harvest Moon - Back to Nature (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -71989,7 +75712,8 @@ SLES-02781:
     multitap: false
     linkCable: false
 SLUS-01115:
-  name: "Harvest Moon - Back to Nature (USA)"
+  name: "Harvest Moon - Back to Nature"
+  saveName: "Harvest Moon - Back to Nature (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -72011,11 +75735,13 @@ SLUS-01115:
     multitap: false
     linkCable: false
 SLUS-81115:
-  name: "Harvest Moon - Back to Nature (USA) (Demo)"
+  name: "Harvest Moon - Back to Nature (Demo)"
+  saveName: "Harvest Moon - Back to Nature (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00704:
-  name: "Hashiriya - Ookami-tachi no Densetsu (Japan)"
+  name: "Hashiriya - Ookami-tachi no Densetsu"
+  saveName: "Hashiriya - Ookami-tachi no Densetsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72033,7 +75759,8 @@ SLPS-00704:
     multitap: false
     linkCable: false
 SLPS-00831:
-  name: "Hatsukoi Valentine (Japan)"
+  name: "Hatsukoi Valentine"
+  saveName: "Hatsukoi Valentine (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72052,7 +75779,8 @@ SLPS-00831:
     multitap: false
     linkCable: false
 SLPS-01452:
-  name: "Hatsukoi Valentine Special (Japan)"
+  name: "Hatsukoi Valentine Special"
+  saveName: "Hatsukoi Valentine Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72071,7 +75799,8 @@ SLPS-01452:
     multitap: false
     linkCable: false
 SLPS-00668:
-  name: "Haunted Junction - Seitokai Badge wo Oe! (Japan)"
+  name: "Haunted Junction - Seitokai Badge wo Oe!"
+  saveName: "Haunted Junction - Seitokai Badge wo Oe! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72089,7 +75818,8 @@ SLPS-00668:
     multitap: false
     linkCable: false
 LSP-99013201:
-  name: "Head to Toe 2 (USA)"
+  name: "Head to Toe 2"
+  saveName: "Head to Toe 2 (USA)"
   codes:
     - LSP99013201
   metadata:
@@ -72099,7 +75829,8 @@ LSP-99013201:
     languages:
       - English
 LSP-99013301:
-  name: "Head to Toe 3 (USA)"
+  name: "Head to Toe 3"
+  saveName: "Head to Toe 3 (USA)"
   codes:
     - LSP99013301
   metadata:
@@ -72109,7 +75840,8 @@ LSP-99013301:
     languages:
       - English
 LSP-99013401:
-  name: "Head to Toe 4 (USA)"
+  name: "Head to Toe 4"
+  saveName: "Head to Toe 4 (USA)"
   codes:
     - LSP99013401
   metadata:
@@ -72139,7 +75871,8 @@ SLPS-01908:
     multitap: false
     linkCable: false
 SLES-00461:
-  name: "Heart of Darkness (Europe) (Disc 1)"
+  name: "Heart of Darkness (Disc 1)"
+  saveName: "Heart of Darkness (Europe) (Disc 1)"
   discSet:
     name: "Heart of Darkness (Europe)"
     serials:
@@ -72162,7 +75895,8 @@ SLES-00461:
     multitap: false
     linkCable: false
 SLES-10461:
-  name: "Heart of Darkness (Europe) (Disc 2)"
+  name: "Heart of Darkness (Disc 2)"
+  saveName: "Heart of Darkness (Europe) (Disc 2)"
   discSet:
     name: "Heart of Darkness (Europe)"
     serials:
@@ -72185,11 +75919,13 @@ SLES-10461:
     multitap: false
     linkCable: false
 SLED-01351:
-  name: "Heart of Darkness (France) (Demo)"
+  name: "Heart of Darkness (Demo)"
+  saveName: "Heart of Darkness (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00462:
-  name: "Heart of Darkness (France) (Disc 1)"
+  name: "Heart of Darkness (Disc 1)"
+  saveName: "Heart of Darkness (France) (Disc 1)"
   discSet:
     name: "Heart of Darkness (France)"
     serials:
@@ -72212,7 +75948,8 @@ SLES-00462:
     multitap: false
     linkCable: false
 SLES-10462:
-  name: "Heart of Darkness (France) (Disc 2)"
+  name: "Heart of Darkness (Disc 2)"
+  saveName: "Heart of Darkness (France) (Disc 2)"
   discSet:
     name: "Heart of Darkness (France)"
     serials:
@@ -72235,7 +75972,8 @@ SLES-10462:
     multitap: false
     linkCable: false
 SLES-00463:
-  name: "Heart of Darkness (Germany) (Disc 1)"
+  name: "Heart of Darkness (Disc 1)"
+  saveName: "Heart of Darkness (Germany) (Disc 1)"
   discSet:
     name: "Heart of Darkness (Germany)"
     serials:
@@ -72258,7 +75996,8 @@ SLES-00463:
     multitap: false
     linkCable: false
 SLES-10463:
-  name: "Heart of Darkness (Germany) (Disc 2)"
+  name: "Heart of Darkness (Disc 2)"
+  saveName: "Heart of Darkness (Germany) (Disc 2)"
   discSet:
     name: "Heart of Darkness (Germany)"
     serials:
@@ -72281,7 +76020,8 @@ SLES-10463:
     multitap: false
     linkCable: false
 SLES-00464:
-  name: "Heart of Darkness (Italy) (Disc 1)"
+  name: "Heart of Darkness (Disc 1)"
+  saveName: "Heart of Darkness (Italy) (Disc 1)"
   discSet:
     name: "Heart of Darkness (Italy)"
     serials:
@@ -72304,7 +76044,8 @@ SLES-00464:
     multitap: false
     linkCable: false
 SLES-10464:
-  name: "Heart of Darkness (Italy) (Disc 2)"
+  name: "Heart of Darkness (Disc 2)"
+  saveName: "Heart of Darkness (Italy) (Disc 2)"
   discSet:
     name: "Heart of Darkness (Italy)"
     serials:
@@ -72327,7 +76068,8 @@ SLES-10464:
     multitap: false
     linkCable: false
 SLES-00465:
-  name: "Heart of Darkness (Spain) (Disc 1)"
+  name: "Heart of Darkness (Disc 1)"
+  saveName: "Heart of Darkness (Spain) (Disc 1)"
   discSet:
     name: "Heart of Darkness (Spain)"
     serials:
@@ -72353,7 +76095,8 @@ SLES-00465:
     multitap: false
     linkCable: false
 SLES-10465:
-  name: "Heart of Darkness (Spain) (Disc 2)"
+  name: "Heart of Darkness (Disc 2)"
+  saveName: "Heart of Darkness (Spain) (Disc 2)"
   discSet:
     name: "Heart of Darkness (Spain)"
     serials:
@@ -72379,7 +76122,8 @@ SLES-10465:
     multitap: false
     linkCable: false
 SLUS-00696:
-  name: "Heart of Darkness (USA) (Disc 1)"
+  name: "Heart of Darkness (Disc 1)"
+  saveName: "Heart of Darkness (USA) (Disc 1)"
   discSet:
     name: "Heart of Darkness (USA)"
     serials:
@@ -72405,7 +76149,8 @@ SLUS-00696:
     multitap: false
     linkCable: false
 SLUS-00741:
-  name: "Heart of Darkness (USA) (Disc 2)"
+  name: "Heart of Darkness (Disc 2)"
+  saveName: "Heart of Darkness (USA) (Disc 2)"
   discSet:
     name: "Heart of Darkness (USA)"
     serials:
@@ -72428,7 +76173,8 @@ SLUS-00741:
     multitap: false
     linkCable: false
 SLPS-00667:
-  name: "Heaven's Gate (Japan)"
+  name: "Heaven's Gate"
+  saveName: "Heaven's Gate (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72446,7 +76192,8 @@ SLPS-00667:
     multitap: false
     linkCable: false
 SLPS-00044:
-  name: "Hebereke Station Popoitto (Japan)"
+  name: "Hebereke Station Popoitto"
+  saveName: "Hebereke Station Popoitto (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72500,7 +76247,8 @@ SLPS-03299:
     multitap: false
     linkCable: false
 SLES-00156:
-  name: "Hebereke's Popoitto (Europe)"
+  name: "Hebereke's Popoitto"
+  saveName: "Hebereke's Popoitto (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -72518,7 +76266,8 @@ SLES-00156:
     multitap: false
     linkCable: false
 SLPS-02714:
-  name: "Heisa Byouin (Japan)"
+  name: "Heisa Byouin"
+  saveName: "Heisa Byouin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72540,9 +76289,11 @@ SLPS-02714:
     multitap: false
     linkCable: false
 SLPS-00413:
-  name: "Heiwa Pachinko Daisuki (Japan)"
+  name: "Heiwa Pachinko Daisuki"
+  saveName: "Heiwa Pachinko Daisuki (Japan)"
 SLPS-02374:
-  name: "Heiwa Pachinko Graffiti Vol. 1 (Japan)"
+  name: "Heiwa Pachinko Graffiti Vol. 1"
+  saveName: "Heiwa Pachinko Graffiti Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72560,9 +76311,11 @@ SLPS-02374:
     multitap: false
     linkCable: false
 SLPS-02495:
-  name: "Heiwa Pachinko Graffiti Vol. 2 (Japan)"
+  name: "Heiwa Pachinko Graffiti Vol. 2"
+  saveName: "Heiwa Pachinko Graffiti Vol. 2 (Japan)"
 SLPS-03373:
-  name: "Heiwa Parlor! Pro - BunDori King SP (Japan)"
+  name: "Heiwa Parlor! Pro - BunDori King SP"
+  saveName: "Heiwa Parlor! Pro - BunDori King SP (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72581,7 +76334,8 @@ SLPS-03373:
     multitap: false
     linkCable: false
 SLPS-02689:
-  name: "Heiwa Parlor! Pro - Dolphin Ring Special (Japan)"
+  name: "Heiwa Parlor! Pro - Dolphin Ring Special"
+  saveName: "Heiwa Parlor! Pro - Dolphin Ring Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72600,7 +76354,8 @@ SLPS-02689:
     multitap: false
     linkCable: false
 SLPS-03105:
-  name: "Heiwa Parlor! Pro - Fujiko ni O-Ma-Ka-Se Special (Japan)"
+  name: "Heiwa Parlor! Pro - Fujiko ni O-Ma-Ka-Se Special"
+  saveName: "Heiwa Parlor! Pro - Fujiko ni O-Ma-Ka-Se Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72619,7 +76374,8 @@ SLPS-03105:
     multitap: false
     linkCable: false
 SLPS-02870:
-  name: "Heiwa Parlor! Pro - Inakappe Taishou Special (Japan)"
+  name: "Heiwa Parlor! Pro - Inakappe Taishou Special"
+  saveName: "Heiwa Parlor! Pro - Inakappe Taishou Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72638,7 +76394,8 @@ SLPS-02870:
     multitap: false
     linkCable: false
 SLPS-02541:
-  name: "Heiwa Parlor! Pro - Lupin the IIIrd Special (Japan)"
+  name: "Heiwa Parlor! Pro - Lupin the IIIrd Special"
+  saveName: "Heiwa Parlor! Pro - Lupin the IIIrd Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72657,7 +76414,8 @@ SLPS-02541:
     multitap: false
     linkCable: false
 SLPS-03370:
-  name: "Heiwa Parlor! Pro - Tsunatori Special (Japan)"
+  name: "Heiwa Parlor! Pro - Tsunatori Special"
+  saveName: "Heiwa Parlor! Pro - Tsunatori Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72676,7 +76434,8 @@ SLPS-03370:
     multitap: false
     linkCable: false
 SLPS-02574:
-  name: "Heiwa Parlor! Pro - Western Special (Japan)"
+  name: "Heiwa Parlor! Pro - Western Special"
+  saveName: "Heiwa Parlor! Pro - Western Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72695,7 +76454,8 @@ SLPS-02574:
     multitap: false
     linkCable: false
 SLPS-03178:
-  name: "Heiwa, The - Otenki Studio (Japan)"
+  name: "Heiwa, The - Otenki Studio"
+  saveName: "Heiwa, The - Otenki Studio (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72714,7 +76474,8 @@ SLPS-03178:
     multitap: false
     linkCable: false
 SLPS-03340:
-  name: "Helix - Fear Effect (Japan) (Disc 1)"
+  name: "Helix - Fear Effect (Disc 1)"
+  saveName: "Helix - Fear Effect (Japan) (Disc 1)"
   discSet:
     name: "Helix - Fear Effect (Japan)"
     serials:
@@ -72742,7 +76503,8 @@ SLPS-03340:
     multitap: false
     linkCable: false
 SLPS-03341:
-  name: "Helix - Fear Effect (Japan) (Disc 2)"
+  name: "Helix - Fear Effect (Disc 2)"
+  saveName: "Helix - Fear Effect (Japan) (Disc 2)"
   discSet:
     name: "Helix - Fear Effect (Japan)"
     serials:
@@ -72770,7 +76532,8 @@ SLPS-03341:
     multitap: false
     linkCable: false
 SLPS-03342:
-  name: "Helix - Fear Effect (Japan) (Disc 3)"
+  name: "Helix - Fear Effect (Disc 3)"
+  saveName: "Helix - Fear Effect (Japan) (Disc 3)"
   discSet:
     name: "Helix - Fear Effect (Japan)"
     serials:
@@ -72798,7 +76561,8 @@ SLPS-03342:
     multitap: false
     linkCable: false
 SLPS-03343:
-  name: "Helix - Fear Effect (Japan) (Disc 4)"
+  name: "Helix - Fear Effect (Disc 4)"
+  saveName: "Helix - Fear Effect (Japan) (Disc 4)"
   discSet:
     name: "Helix - Fear Effect (Japan)"
     serials:
@@ -72826,7 +76590,8 @@ SLPS-03343:
     multitap: false
     linkCable: false
 SLUS-01414:
-  name: "Hellboy - Asylum Seeker (USA)"
+  name: "Hellboy - Asylum Seeker"
+  saveName: "Hellboy - Asylum Seeker (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72845,7 +76610,8 @@ SLUS-01414:
     multitap: false
     linkCable: false
 SLES-01562:
-  name: "Hellnight (Europe) (En,Fr,De)"
+  name: "Hellnight"
+  saveName: "Hellnight (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72866,7 +76632,8 @@ SLES-01562:
     multitap: false
     linkCable: false
 SLPM-86083:
-  name: "Hello Charlie!! (Japan)"
+  name: "Hello Charlie!!"
+  saveName: "Hello Charlie!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72884,7 +76651,8 @@ SLPM-86083:
     multitap: false
     linkCable: false
 SLUS-00778:
-  name: "Hello Kitty - Cube Frenzy (USA)"
+  name: "Hello Kitty - Cube Frenzy"
+  saveName: "Hello Kitty - Cube Frenzy (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72922,7 +76690,8 @@ SLPM-86140:
     multitap: false
     linkCable: false
 SLPS-01766:
-  name: "Hello Kitty - White Present (Japan)"
+  name: "Hello Kitty - White Present"
+  saveName: "Hello Kitty - White Present (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -72940,7 +76709,8 @@ SLPS-01766:
     multitap: false
     linkCable: false
 SLPS-01427:
-  name: "Hello Kitty no Cube de Cute (Japan)"
+  name: "Hello Kitty no Cube de Cute"
+  saveName: "Hello Kitty no Cube de Cute (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -72978,7 +76748,8 @@ SLPS-02455:
     multitap: false
     linkCable: false
 SLPM-86021:
-  name: "Henry Explorers (Japan)"
+  name: "Henry Explorers"
+  saveName: "Henry Explorers (Japan)"
   controllers:
     - DigitalController
     - Justifier
@@ -72997,7 +76768,8 @@ SLPM-86021:
     multitap: false
     linkCable: false
 SLES-00653:
-  name: "Herc's Adventures (Europe)"
+  name: "Herc's Adventures"
+  saveName: "Herc's Adventures (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -73015,7 +76787,8 @@ SLES-00653:
     multitap: false
     linkCable: false
 SLES-00655:
-  name: "Herc's Adventures (France)"
+  name: "Herc's Adventures"
+  saveName: "Herc's Adventures (France)"
   controllers:
     - DigitalController
   metadata:
@@ -73033,7 +76806,8 @@ SLES-00655:
     multitap: false
     linkCable: false
 SLES-00586:
-  name: "Herc's Adventures (Germany)"
+  name: "Herc's Adventures"
+  saveName: "Herc's Adventures (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -73051,7 +76825,8 @@ SLES-00586:
     multitap: false
     linkCable: false
 SLES-00642:
-  name: "Herc's Adventures (Italy)"
+  name: "Herc's Adventures"
+  saveName: "Herc's Adventures (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -73069,7 +76844,8 @@ SLES-00642:
     multitap: false
     linkCable: false
 SLES-00645:
-  name: "Herc's Adventures (Spain)"
+  name: "Herc's Adventures"
+  saveName: "Herc's Adventures (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -73087,7 +76863,8 @@ SLES-00645:
     multitap: false
     linkCable: false
 SLUS-00298:
-  name: "Herc's Adventures (USA)"
+  name: "Herc's Adventures"
+  saveName: "Herc's Adventures (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -73108,7 +76885,8 @@ SLUS-00298:
     multitap: false
     linkCable: false
 SLPS-01061:
-  name: "Herc's Adventures - Hercules no Daibouken (Japan)"
+  name: "Herc's Adventures - Hercules no Daibouken"
+  saveName: "Herc's Adventures - Hercules no Daibouken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -73126,7 +76904,8 @@ SLPS-01061:
     multitap: false
     linkCable: false
 SLES-04124:
-  name: "Herkules (Europe) (En,De)"
+  name: "Herkules"
+  saveName: "Herkules (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73146,7 +76925,8 @@ SLES-04124:
     multitap: false
     linkCable: false
 SCPS-10012:
-  name: "Hermie Hopperhead - Scrap Panic (Japan)"
+  name: "Hermie Hopperhead - Scrap Panic"
+  saveName: "Hermie Hopperhead - Scrap Panic (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -73166,7 +76946,8 @@ SCPS-10012:
     multitap: false
     linkCable: false
 SLPM-80431:
-  name: "Herohero-kun to Ralph no Daibouken (Japan)"
+  name: "Herohero-kun to Ralph no Daibouken"
+  saveName: "Herohero-kun to Ralph no Daibouken (Japan)"
   controllers:
     - DigitalController
 SLPS-00471:
@@ -73188,7 +76969,8 @@ SLPS-00471:
     multitap: false
     linkCable: false
 SLPS-00470:
-  name: "Heroine Dream (Japan)"
+  name: "Heroine Dream"
+  saveName: "Heroine Dream (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -73206,7 +76988,8 @@ SLPS-00470:
     multitap: false
     linkCable: false
 SLPS-01376:
-  name: "Heroine Dream 2 (Japan)"
+  name: "Heroine Dream 2"
+  saveName: "Heroine Dream 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -73260,7 +77043,8 @@ SLPS-02264:
     multitap: false
     linkCable: false
 SLPS-02641:
-  name: "Hexamoon Guardians (Japan) (Disc 1)"
+  name: "Hexamoon Guardians (Disc 1)"
+  saveName: "Hexamoon Guardians (Japan) (Disc 1)"
   discSet:
     name: "Hexamoon Guardians (Japan)"
     serials:
@@ -73284,7 +77068,8 @@ SLPS-02641:
     multitap: false
     linkCable: false
 SLPS-02642:
-  name: "Hexamoon Guardians (Japan) (Disc 2)"
+  name: "Hexamoon Guardians (Disc 2)"
+  saveName: "Hexamoon Guardians (Japan) (Disc 2)"
   discSet:
     name: "Hexamoon Guardians (Japan)"
     serials:
@@ -73308,7 +77093,8 @@ SLPS-02642:
     multitap: false
     linkCable: false
 SLES-00555:
-  name: "Hexen (Europe)"
+  name: "Hexen"
+  saveName: "Hexen (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -73331,7 +77117,8 @@ SLES-00555:
     multitap: false
     linkCable: false
 SLUS-00348:
-  name: "Hexen (USA)"
+  name: "Hexen"
+  saveName: "Hexen (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1031-g47138aa"
@@ -73357,7 +77144,8 @@ SLUS-00348:
     multitap: false
     linkCable: false
 SLPS-00972:
-  name: "Hexen - Beyond Heretic (Japan)"
+  name: "Hexen - Beyond Heretic"
+  saveName: "Hexen - Beyond Heretic (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -73380,7 +77168,8 @@ SLPS-00972:
     multitap: false
     linkCable: false
 SLPS-00821:
-  name: "Hi-Hou-Ou - Mou Omae to wa Kuchi Kikan!! (Japan)"
+  name: "Hi-Hou-Ou - Mou Omae to wa Kuchi Kikan!!"
+  saveName: "Hi-Hou-Ou - Mou Omae to wa Kuchi Kikan!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -73398,7 +77187,8 @@ SLPS-00821:
     multitap: true
     linkCable: false
 SLES-00115:
-  name: "Hi-Octane (Europe) (En,Fr,De,Es)"
+  name: "Hi-Octane"
+  saveName: "Hi-Octane (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
     - NeGcon
@@ -73420,7 +77210,8 @@ SLES-00115:
     multitap: false
     linkCable: false
 SLPS-00171:
-  name: "Hi-Octane (Japan)"
+  name: "Hi-Octane"
+  saveName: "Hi-Octane (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -73439,9 +77230,11 @@ SLPS-00171:
     multitap: false
     linkCable: false
 SCES-00231:
-  name: "Hi-Octane + Ridge Racer + Mortal Kombat 3 + Evolva (France)"
+  name: "Hi-Octane + Ridge Racer + Mortal Kombat 3 + Evolva"
+  saveName: "Hi-Octane + Ridge Racer + Mortal Kombat 3 + Evolva (France)"
 SLUS-00157:
-  name: "Hi-Octane - The Track Fights Back! (USA) (En,Fr,De,Es)"
+  name: "Hi-Octane - The Track Fights Back!"
+  saveName: "Hi-Octane - The Track Fights Back! (USA) (En,Fr,De,Es)"
   controllers:
     - DigitalController
     - NeGcon
@@ -73460,7 +77253,8 @@ SLUS-00157:
     multitap: false
     linkCable: false
 SLES-03602:
-  name: "Hidden & Dangerous (Europe) (En,Fr,De,Es,It)"
+  name: "Hidden & Dangerous"
+  saveName: "Hidden & Dangerous (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73483,7 +77277,8 @@ SLES-03602:
     multitap: false
     linkCable: false
 SLUS-00830:
-  name: "High Heat Baseball 2000 (USA)"
+  name: "High Heat Baseball 2000"
+  saveName: "High Heat Baseball 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73502,7 +77297,8 @@ SLUS-00830:
     multitap: false
     linkCable: false
 SLUS-01244:
-  name: "High Heat Major League Baseball 2002 (USA)"
+  name: "High Heat Major League Baseball 2002"
+  saveName: "High Heat Major League Baseball 2002 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-7272-g143acca03"
@@ -73527,7 +77323,8 @@ SLUS-01244:
     multitap: false
     linkCable: false
 SLPS-02351:
-  name: "High School of Blitz (Japan)"
+  name: "High School of Blitz"
+  saveName: "High School of Blitz (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73546,7 +77343,8 @@ SLPS-02351:
     multitap: false
     linkCable: false
 SLPS-02305:
-  name: "Hikari no Shima - Seven Lithographs in Shining Island (Japan)"
+  name: "Hikari no Shima - Seven Lithographs in Shining Island"
+  saveName: "Hikari no Shima - Seven Lithographs in Shining Island (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73565,7 +77363,8 @@ SLPS-02305:
     multitap: false
     linkCable: false
 SLPM-87059:
-  name: "Hikaru no Go - Heian Gensou Ibunroku (Japan)"
+  name: "Hikaru no Go - Heian Gensou Ibunroku"
+  saveName: "Hikaru no Go - Heian Gensou Ibunroku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73603,7 +77402,8 @@ SLPM-87273:
     multitap: false
     linkCable: false
 SLPM-87199:
-  name: "Hikaru no Go - Insei Choujou Kessen (Japan)"
+  name: "Hikaru no Go - Insei Choujou Kessen"
+  saveName: "Hikaru no Go - Insei Choujou Kessen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73641,11 +77441,13 @@ SLPM-87321:
     multitap: false
     linkCable: false
 SLPM-80390:
-  name: "Himiko-den - Renge (Japan) (Demo)"
+  name: "Himiko-den - Renge (Demo)"
+  saveName: "Himiko-den - Renge (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01890:
-  name: "Himiko-den - Renge (Japan) (Disc 1)"
+  name: "Himiko-den - Renge (Disc 1)"
+  saveName: "Himiko-den - Renge (Japan) (Disc 1)"
   discSet:
     name: "Himiko-den - Renge (Japan)"
     serials:
@@ -73670,7 +77472,8 @@ SLPS-01890:
     multitap: false
     linkCable: false
 SLPS-01891:
-  name: "Himiko-den - Renge (Japan) (Disc 2)"
+  name: "Himiko-den - Renge (Disc 2)"
+  saveName: "Himiko-den - Renge (Japan) (Disc 2)"
   discSet:
     name: "Himiko-den - Renge (Japan)"
     serials:
@@ -73695,7 +77498,8 @@ SLPS-01891:
     multitap: false
     linkCable: false
 SLPS-01892:
-  name: "Himiko-den - Renge (Japan) (Disc 3)"
+  name: "Himiko-den - Renge (Disc 3)"
+  saveName: "Himiko-den - Renge (Japan) (Disc 3)"
   discSet:
     name: "Himiko-den - Renge (Japan)"
     serials:
@@ -73720,7 +77524,8 @@ SLPS-01892:
     multitap: false
     linkCable: false
 SLPS-01334:
-  name: "Himitsu Kessha Q (Japan)"
+  name: "Himitsu Kessha Q"
+  saveName: "Himitsu Kessha Q (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -73738,7 +77543,8 @@ SLPS-01334:
     multitap: false
     linkCable: false
 SLPS-01626:
-  name: "Himitsu Sentai Metamor V Deluxe (Japan) (Disc 1)"
+  name: "Himitsu Sentai Metamor V Deluxe (Disc 1)"
+  saveName: "Himitsu Sentai Metamor V Deluxe (Japan) (Disc 1)"
   discSet:
     name: "Himitsu Sentai Metamor V Deluxe (Japan)"
     serials:
@@ -73762,7 +77568,8 @@ SLPS-01626:
     multitap: false
     linkCable: false
 SLPS-01627:
-  name: "Himitsu Sentai Metamor V Deluxe (Japan) (Disc 2)"
+  name: "Himitsu Sentai Metamor V Deluxe (Disc 2)"
+  saveName: "Himitsu Sentai Metamor V Deluxe (Japan) (Disc 2)"
   discSet:
     name: "Himitsu Sentai Metamor V Deluxe (Japan)"
     serials:
@@ -73786,7 +77593,8 @@ SLPS-01627:
     multitap: false
     linkCable: false
 SLPS-01551:
-  name: "Hissatsu Pachi-Slot Station - Jikki Simulation (Japan)"
+  name: "Hissatsu Pachi-Slot Station - Jikki Simulation"
+  saveName: "Hissatsu Pachi-Slot Station - Jikki Simulation (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -73807,7 +77615,8 @@ SLPS-01551:
     multitap: false
     linkCable: false
 SLPS-02355:
-  name: "Hissatsu Pachi-Slot Station 2 (Japan)"
+  name: "Hissatsu Pachi-Slot Station 2"
+  saveName: "Hissatsu Pachi-Slot Station 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73826,7 +77635,8 @@ SLPS-02355:
     multitap: false
     linkCable: false
 SLPS-02683:
-  name: "Hissatsu Pachi-Slot Station 3 (Japan)"
+  name: "Hissatsu Pachi-Slot Station 3"
+  saveName: "Hissatsu Pachi-Slot Station 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73845,7 +77655,8 @@ SLPS-02683:
     multitap: false
     linkCable: false
 SLPS-02799:
-  name: "Hissatsu Pachi-Slot Station 4 - New Pulsar R & Hot Rod Queen (Japan)"
+  name: "Hissatsu Pachi-Slot Station 4 - New Pulsar R & Hot Rod Queen"
+  saveName: "Hissatsu Pachi-Slot Station 4 - New Pulsar R & Hot Rod Queen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73864,7 +77675,8 @@ SLPS-02799:
     multitap: false
     linkCable: false
 SLPS-03030:
-  name: "Hissatsu Pachi-Slot Station 5 - Invaders 2000 (Japan)"
+  name: "Hissatsu Pachi-Slot Station 5 - Invaders 2000"
+  saveName: "Hissatsu Pachi-Slot Station 5 - Invaders 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73883,7 +77695,8 @@ SLPS-03030:
     multitap: false
     linkCable: false
 SLPS-02494:
-  name: "Hissatsu Pachi-Slot Station SP - Yamasa Best Choice (Japan)"
+  name: "Hissatsu Pachi-Slot Station SP - Yamasa Best Choice"
+  saveName: "Hissatsu Pachi-Slot Station SP - Yamasa Best Choice (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73902,7 +77715,8 @@ SLPS-02494:
     multitap: false
     linkCable: false
 SLPS-02948:
-  name: "Hissatsu Pachi-Slot Station Special 2 - The Tetra (Japan)"
+  name: "Hissatsu Pachi-Slot Station Special 2 - The Tetra"
+  saveName: "Hissatsu Pachi-Slot Station Special 2 - The Tetra (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73921,7 +77735,8 @@ SLPS-02948:
     multitap: false
     linkCable: false
 SLPS-00112:
-  name: "Hissatsu Pachinko Station (Japan)"
+  name: "Hissatsu Pachinko Station"
+  saveName: "Hissatsu Pachinko Station (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -73942,7 +77757,8 @@ SLPS-00112:
     multitap: false
     linkCable: false
 SLPS-01577:
-  name: "Hissatsu Pachinko Station - Monster House Special (Japan)"
+  name: "Hissatsu Pachinko Station - Monster House Special"
+  saveName: "Hissatsu Pachinko Station - Monster House Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73961,7 +77777,8 @@ SLPS-01577:
     multitap: false
     linkCable: false
 SLPS-02984:
-  name: "Hissatsu Pachinko Station - Toyomaru Special (Japan)"
+  name: "Hissatsu Pachinko Station - Toyomaru Special"
+  saveName: "Hissatsu Pachinko Station - Toyomaru Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73980,7 +77797,8 @@ SLPS-02984:
     multitap: false
     linkCable: false
 SLPS-02990:
-  name: "Hissatsu Pachinko Station 10 - EX Jack 2000 & Super Dragon (Japan)"
+  name: "Hissatsu Pachinko Station 10 - EX Jack 2000 & Super Dragon"
+  saveName: "Hissatsu Pachinko Station 10 - EX Jack 2000 & Super Dragon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -73999,7 +77817,8 @@ SLPS-02990:
     multitap: false
     linkCable: false
 SLPS-01185:
-  name: "Hissatsu Pachinko Station 2 (Japan)"
+  name: "Hissatsu Pachinko Station 2"
+  saveName: "Hissatsu Pachinko Station 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74017,7 +77836,8 @@ SLPS-01185:
     multitap: false
     linkCable: false
 SLPS-01741:
-  name: "Hissatsu Pachinko Station 3 - Genshijin ga Ippai (Japan)"
+  name: "Hissatsu Pachinko Station 3 - Genshijin ga Ippai"
+  saveName: "Hissatsu Pachinko Station 3 - Genshijin ga Ippai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74036,7 +77856,8 @@ SLPS-01741:
     multitap: false
     linkCable: false
 SLPS-01702:
-  name: "Hissatsu Pachinko Station 3 - Genshijin ga Ippai (Japan) (Genteiban)"
+  name: "Hissatsu Pachinko Station 3 - Genshijin ga Ippai (Genteiban)"
+  saveName: "Hissatsu Pachinko Station 3 - Genshijin ga Ippai (Japan) (Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74055,7 +77876,8 @@ SLPS-01702:
     multitap: false
     linkCable: false
 SLPS-01907:
-  name: "Hissatsu Pachinko Station 4 - Hero Tachi no Chousen (Japan)"
+  name: "Hissatsu Pachinko Station 4 - Hero Tachi no Chousen"
+  saveName: "Hissatsu Pachinko Station 4 - Hero Tachi no Chousen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74074,7 +77896,8 @@ SLPS-01907:
     multitap: false
     linkCable: false
 SLPS-03077:
-  name: "Hissatsu Pachinko Station 4 - Hero Tachi no Chousen (Japan) (Rev 1)"
+  name: "Hissatsu Pachinko Station 4 - Hero Tachi no Chousen"
+  saveName: "Hissatsu Pachinko Station 4 - Hero Tachi no Chousen (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74093,7 +77916,8 @@ SLPS-03077:
     multitap: false
     linkCable: false
 SLPS-02097:
-  name: "Hissatsu Pachinko Station 5 - Deramaitta & Irete Nanbo (Japan)"
+  name: "Hissatsu Pachinko Station 5 - Deramaitta & Irete Nanbo"
+  saveName: "Hissatsu Pachinko Station 5 - Deramaitta & Irete Nanbo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74112,7 +77936,8 @@ SLPS-02097:
     multitap: false
     linkCable: false
 SLPS-02144:
-  name: "Hissatsu Pachinko Station 6 - Gakideka & Jamaica (Japan)"
+  name: "Hissatsu Pachinko Station 6 - Gakideka & Jamaica"
+  saveName: "Hissatsu Pachinko Station 6 - Gakideka & Jamaica (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74131,7 +77956,8 @@ SLPS-02144:
     multitap: false
     linkCable: false
 SLPS-02408:
-  name: "Hissatsu Pachinko Station 7 - CR Chumy House XL & CR Battle Hero V & Fine Play (Japan)"
+  name: "Hissatsu Pachinko Station 7 - CR Chumy House XL & CR Battle Hero V & Fine Play"
+  saveName: "Hissatsu Pachinko Station 7 - CR Chumy House XL & CR Battle Hero V & Fine Play (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74150,7 +77976,8 @@ SLPS-02408:
     multitap: false
     linkCable: false
 SLPS-02677:
-  name: "Hissatsu Pachinko Station 8 - Kamashi no Kin-chan & Soreyuke Hama-chan (Japan)"
+  name: "Hissatsu Pachinko Station 8 - Kamashi no Kin-chan & Soreyuke Hama-chan"
+  saveName: "Hissatsu Pachinko Station 8 - Kamashi no Kin-chan & Soreyuke Hama-chan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74169,7 +77996,8 @@ SLPS-02677:
     multitap: false
     linkCable: false
 SLPS-02765:
-  name: "Hissatsu Pachinko Station 9 - Ushiwaka to Lemi (Japan)"
+  name: "Hissatsu Pachinko Station 9 - Ushiwaka to Lemi"
+  saveName: "Hissatsu Pachinko Station 9 - Ushiwaka to Lemi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74188,7 +78016,8 @@ SLPS-02765:
     multitap: false
     linkCable: false
 SLPS-01963:
-  name: "Hissatsu Pachinko Station Classic - Fukkatsu! Natsukashi no Meiki-tachi (Japan)"
+  name: "Hissatsu Pachinko Station Classic - Fukkatsu! Natsukashi no Meiki-tachi"
+  saveName: "Hissatsu Pachinko Station Classic - Fukkatsu! Natsukashi no Meiki-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74207,9 +78036,11 @@ SLPS-01963:
     multitap: false
     linkCable: false
 SLPS-02678:
-  name: "Hissatsu Pachinko Station Classic 2 - Tsui ni yomigaeru!! Bakuretsu Meiki Fukkatsu (Japan)"
+  name: "Hissatsu Pachinko Station Classic 2 - Tsui ni yomigaeru!! Bakuretsu Meiki Fukkatsu"
+  saveName: "Hissatsu Pachinko Station Classic 2 - Tsui ni yomigaeru!! Bakuretsu Meiki Fukkatsu (Japan)"
 SLPS-02284:
-  name: "Hissatsu Pachinko Station Now - Kore ga Ichiban!! Shin Pikaichi Tengoku (Japan)"
+  name: "Hissatsu Pachinko Station Now - Kore ga Ichiban!! Shin Pikaichi Tengoku"
+  saveName: "Hissatsu Pachinko Station Now - Kore ga Ichiban!! Shin Pikaichi Tengoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74228,7 +78059,8 @@ SLPS-02284:
     multitap: false
     linkCable: false
 SLPS-02511:
-  name: "Hissatsu Pachinko Station Now 2 - Yattaze Ippatsu Tsumo Tsumo Tengoku (Japan)"
+  name: "Hissatsu Pachinko Station Now 2 - Yattaze Ippatsu Tsumo Tsumo Tengoku"
+  saveName: "Hissatsu Pachinko Station Now 2 - Yattaze Ippatsu Tsumo Tsumo Tengoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74247,7 +78079,8 @@ SLPS-02511:
     multitap: false
     linkCable: false
 SLPS-02558:
-  name: "Hissatsu Pachinko Station Now 3 - Youkai Engei (Japan)"
+  name: "Hissatsu Pachinko Station Now 3 - Youkai Engei"
+  saveName: "Hissatsu Pachinko Station Now 3 - Youkai Engei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74266,7 +78099,8 @@ SLPS-02558:
     multitap: false
     linkCable: false
 SLPS-02721:
-  name: "Hissatsu Pachinko Station Now 4 - Ore wa Nekketsu Bouken Ou da!! (Japan)"
+  name: "Hissatsu Pachinko Station Now 4 - Ore wa Nekketsu Bouken Ou da!!"
+  saveName: "Hissatsu Pachinko Station Now 4 - Ore wa Nekketsu Bouken Ou da!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74285,7 +78119,8 @@ SLPS-02721:
     multitap: false
     linkCable: false
 SLPS-02856:
-  name: "Hissatsu Pachinko Station Now 5 - GeGeGe no Kitarou (Japan)"
+  name: "Hissatsu Pachinko Station Now 5 - GeGeGe no Kitarou"
+  saveName: "Hissatsu Pachinko Station Now 5 - GeGeGe no Kitarou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74304,7 +78139,8 @@ SLPS-02856:
     multitap: false
     linkCable: false
 SLPS-02999:
-  name: "Hissatsu Pachinko Station Now 6 - Shinsei!! Areddin 21 (Japan)"
+  name: "Hissatsu Pachinko Station Now 6 - Shinsei!! Areddin 21"
+  saveName: "Hissatsu Pachinko Station Now 6 - Shinsei!! Areddin 21 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74323,7 +78159,8 @@ SLPS-02999:
     multitap: false
     linkCable: false
 SLPS-03107:
-  name: "Hissatsu Pachinko Station Now 7 - Magical Circus (Japan)"
+  name: "Hissatsu Pachinko Station Now 7 - Magical Circus"
+  saveName: "Hissatsu Pachinko Station Now 7 - Magical Circus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74342,7 +78179,8 @@ SLPS-03107:
     multitap: false
     linkCable: false
 SLPS-03129:
-  name: "Hissatsu Pachinko Station Now 8 - Jarinko Chie (Japan)"
+  name: "Hissatsu Pachinko Station Now 8 - Jarinko Chie"
+  saveName: "Hissatsu Pachinko Station Now 8 - Jarinko Chie (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74361,7 +78199,8 @@ SLPS-03129:
     multitap: false
     linkCable: false
 SLPS-03365:
-  name: "Hissatsu Pachinko Station Now 9 - Dirty Pair (Japan)"
+  name: "Hissatsu Pachinko Station Now 9 - Dirty Pair"
+  saveName: "Hissatsu Pachinko Station Now 9 - Dirty Pair (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74380,7 +78219,8 @@ SLPS-03365:
     multitap: false
     linkCable: false
 SLPS-02283:
-  name: "Hissatsu Pachinko Station Puchi - Nanasy tte Nani (Japan)"
+  name: "Hissatsu Pachinko Station Puchi - Nanasy tte Nani"
+  saveName: "Hissatsu Pachinko Station Puchi - Nanasy tte Nani (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74399,7 +78239,8 @@ SLPS-02283:
     multitap: false
     linkCable: false
 SLPS-02493:
-  name: "Hissatsu Pachinko Station Puchi 2 - Areddin tte Great! (Japan)"
+  name: "Hissatsu Pachinko Station Puchi 2 - Areddin tte Great!"
+  saveName: "Hissatsu Pachinko Station Puchi 2 - Areddin tte Great! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74418,11 +78259,14 @@ SLPS-02493:
     multitap: false
     linkCable: false
 SLPS-03339:
-  name: "Hissatsu Pachinko Station SP3 (Japan)"
+  name: "Hissatsu Pachinko Station SP3"
+  saveName: "Hissatsu Pachinko Station SP3 (Japan)"
 SLPS-03126:
-  name: "History of Kita Denshi (Japan)"
+  name: "History of Kita Denshi"
+  saveName: "History of Kita Denshi (Japan)"
 SLPS-01361:
-  name: "Hit Back (Japan)"
+  name: "Hit Back"
+  saveName: "Hit Back (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74441,7 +78285,8 @@ SLPS-01361:
     multitap: true
     linkCable: false
 SLPS-00325:
-  name: "Hive Wars, The (Japan) (Disc 1)"
+  name: "Hive Wars, The (Disc 1)"
+  saveName: "Hive Wars, The (Japan) (Disc 1)"
   discSet:
     name: "Hive Wars, The (Japan)"
     serials:
@@ -74464,7 +78309,8 @@ SLPS-00325:
     multitap: false
     linkCable: false
 SLPS-00326:
-  name: "Hive Wars, The (Japan) (Disc 2)"
+  name: "Hive Wars, The (Disc 2)"
+  saveName: "Hive Wars, The (Japan) (Disc 2)"
   discSet:
     name: "Hive Wars, The (Japan)"
     serials:
@@ -74487,7 +78333,8 @@ SLPS-00326:
     multitap: false
     linkCable: false
 SLUS-00120:
-  name: "Hive, The (USA) (Disc 1)"
+  name: "Hive, The (Disc 1)"
+  saveName: "Hive, The (USA) (Disc 1)"
   discSet:
     name: "Hive, The (USA)"
     serials:
@@ -74510,7 +78357,8 @@ SLUS-00120:
     multitap: false
     linkCable: false
 SLUS-00182:
-  name: "Hive, The (USA) (Disc 2)"
+  name: "Hive, The (Disc 2)"
+  saveName: "Hive, The (USA) (Disc 2)"
   discSet:
     name: "Hive, The (USA)"
     serials:
@@ -74533,7 +78381,8 @@ SLUS-00182:
     multitap: false
     linkCable: false
 SLPS-01302:
-  name: "Hiza no Ue no Partner - Kitty on Your Lap (Japan)"
+  name: "Hiza no Ue no Partner - Kitty on Your Lap"
+  saveName: "Hiza no Ue no Partner - Kitty on Your Lap (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -74554,7 +78403,8 @@ SLPS-01302:
     multitap: false
     linkCable: false
 SLES-01041:
-  name: "Hogs of War (Europe)"
+  name: "Hogs of War"
+  saveName: "Hogs of War (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74576,13 +78426,15 @@ SLES-01041:
     multitap: true
     linkCable: false
 SLED-03054:
-  name: "Hogs of War (Europe) (Demo)"
+  name: "Hogs of War (Demo)"
+  saveName: "Hogs of War (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Fixes wobble in minimap.
 SLUS-01195:
-  name: "Hogs of War (USA)"
+  name: "Hogs of War"
+  saveName: "Hogs of War (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -74606,7 +78458,8 @@ SLUS-01195:
     multitap: true
     linkCable: false
 SLES-02769:
-  name: "Hogs of War - Nati per Soffritto (Italy)"
+  name: "Hogs of War - Nati per Soffritto"
+  saveName: "Hogs of War - Nati per Soffritto (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74628,7 +78481,8 @@ SLES-02769:
     multitap: true
     linkCable: false
 SLPS-00369:
-  name: "Hokuto no Ken (Japan)"
+  name: "Hokuto no Ken"
+  saveName: "Hokuto no Ken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74646,7 +78500,8 @@ SLPS-00369:
     multitap: false
     linkCable: false
 SLPS-02993:
-  name: "Hokuto no Ken - Seikimatsu Kyuuseishu Densetsu (Japan)"
+  name: "Hokuto no Ken - Seikimatsu Kyuuseishu Densetsu"
+  saveName: "Hokuto no Ken - Seikimatsu Kyuuseishu Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74665,9 +78520,11 @@ SLPS-02993:
     multitap: false
     linkCable: false
 PBPX-95005:
-  name: "Holiday Special (Japan)"
+  name: "Holiday Special"
+  saveName: "Holiday Special (Japan)"
 SLPS-01075:
-  name: "Home Doctor (Japan)"
+  name: "Home Doctor"
+  saveName: "Home Doctor (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74685,7 +78542,8 @@ SLPS-01075:
     multitap: false
     linkCable: false
 SLPS-00434:
-  name: "Honkaku 4-nin Uchi - Geinoujin Taikyoku Mahjong - The Wareme de Pon (Japan)"
+  name: "Honkaku 4-nin Uchi - Geinoujin Taikyoku Mahjong - The Wareme de Pon"
+  saveName: "Honkaku 4-nin Uchi - Geinoujin Taikyoku Mahjong - The Wareme de Pon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74703,7 +78561,8 @@ SLPS-00434:
     multitap: false
     linkCable: false
 SLPS-01656:
-  name: "Honkaku Hanafuda (Japan)"
+  name: "Honkaku Hanafuda"
+  saveName: "Honkaku Hanafuda (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74739,7 +78598,8 @@ SLPS-03119:
     multitap: false
     linkCable: false
 SLPS-00986:
-  name: "Honkaku Igo (Japan)"
+  name: "Honkaku Igo"
+  saveName: "Honkaku Igo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74757,7 +78617,8 @@ SLPS-00986:
     multitap: false
     linkCable: false
 SLPS-00238:
-  name: "Honkaku Mahjong - Tetsuman Special (Japan)"
+  name: "Honkaku Mahjong - Tetsuman Special"
+  saveName: "Honkaku Mahjong - Tetsuman Special (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74775,7 +78636,8 @@ SLPS-00238:
     multitap: false
     linkCable: false
 SLPS-01594:
-  name: "Honkaku Shougi - Shougi-ou (Japan)"
+  name: "Honkaku Shougi - Shougi-ou"
+  saveName: "Honkaku Shougi - Shougi-ou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74793,7 +78655,8 @@ SLPS-01594:
     multitap: false
     linkCable: false
 SLPS-02741:
-  name: "Honkaku Yonin Uchi Pro Mahjong - Mahjong Ou (Japan)"
+  name: "Honkaku Yonin Uchi Pro Mahjong - Mahjong Ou"
+  saveName: "Honkaku Yonin Uchi Pro Mahjong - Mahjong Ou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74812,7 +78675,8 @@ SLPS-02741:
     multitap: false
     linkCable: false
 SLPM-86082:
-  name: "Honkakuha Yonin Uchi - Mahjong Club (Japan)"
+  name: "Honkakuha Yonin Uchi - Mahjong Club"
+  saveName: "Honkakuha Yonin Uchi - Mahjong Club (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74830,7 +78694,8 @@ SLPM-86082:
     multitap: false
     linkCable: false
 SLPS-02080:
-  name: "Honkakuha Yonin Uchi - Mahjong Club (Japan) (Honkakuha de 1300)"
+  name: "Honkakuha Yonin Uchi - Mahjong Club (Honkakuha de 1300)"
+  saveName: "Honkakuha Yonin Uchi - Mahjong Club (Japan) (Honkakuha de 1300)"
   controllers:
     - DigitalController
   codes:
@@ -74851,7 +78716,8 @@ SLPS-02080:
     multitap: false
     linkCable: false
 SLPS-00465:
-  name: "Honoo no 15 Shumoku - Atlanta Olympics (Japan)"
+  name: "Honoo no 15 Shumoku - Atlanta Olympics"
+  saveName: "Honoo no 15 Shumoku - Atlanta Olympics (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74869,7 +78735,8 @@ SLPS-00465:
     multitap: true
     linkCable: false
 SLPS-01382:
-  name: "Honoo no Ryourinin - Cooking Fighter Hao (Japan)"
+  name: "Honoo no Ryourinin - Cooking Fighter Hao"
+  saveName: "Honoo no Ryourinin - Cooking Fighter Hao (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74888,7 +78755,8 @@ SLPS-01382:
     multitap: false
     linkCable: false
 SLUS-01394:
-  name: "Hooters - Road Trip (USA)"
+  name: "Hooters - Road Trip"
+  saveName: "Hooters - Road Trip (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74908,7 +78776,8 @@ SLUS-01394:
     multitap: false
     linkCable: false
 SCPS-10016:
-  name: "Horned Owl (Japan)"
+  name: "Horned Owl"
+  saveName: "Horned Owl (Japan)"
   controllers:
     - DigitalController
     - Justifier
@@ -74949,7 +78818,8 @@ SCPS-45189:
     multitap: false
     linkCable: false
 SLPS-01250:
-  name: "Hoshi de Hakken!! Tamagotchi (Japan)"
+  name: "Hoshi de Hakken!! Tamagotchi"
+  saveName: "Hoshi de Hakken!! Tamagotchi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -74967,7 +78837,8 @@ SLPS-01250:
     multitap: false
     linkCable: false
 SLPS-03267:
-  name: "Hoshi no Mahoroba (Japan)"
+  name: "Hoshi no Mahoroba"
+  saveName: "Hoshi no Mahoroba (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -74986,7 +78857,8 @@ SLPS-03267:
     multitap: false
     linkCable: false
 SLPS-01638:
-  name: "Hoshi no Oka Gakuen Monogatari - Gakuensai (Japan)"
+  name: "Hoshi no Oka Gakuen Monogatari - Gakuensai"
+  saveName: "Hoshi no Oka Gakuen Monogatari - Gakuensai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75005,7 +78877,8 @@ SLPS-01638:
     multitap: false
     linkCable: false
 SLUS-01375:
-  name: "Hoshigami - Ruining Blue Earth (USA)"
+  name: "Hoshigami - Ruining Blue Earth"
+  saveName: "Hoshigami - Ruining Blue Earth (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -75029,7 +78902,8 @@ SLUS-01375:
     multitap: false
     linkCable: false
 SLPS-02904:
-  name: "Hoshigami - Shizumiyuku Aoki Daichi (Japan)"
+  name: "Hoshigami - Shizumiyuku Aoki Daichi"
+  saveName: "Hoshigami - Shizumiyuku Aoki Daichi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75050,7 +78924,8 @@ SLPS-02904:
     multitap: false
     linkCable: false
 SLES-04050:
-  name: "Hot Shot (Europe)"
+  name: "Hot Shot"
+  saveName: "Hot Shot (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75069,7 +78944,8 @@ SLES-04050:
     multitap: false
     linkCable: false
 SCUS-94188:
-  name: "Hot Shots Golf (USA)"
+  name: "Hot Shots Golf"
+  saveName: "Hot Shots Golf (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -75087,11 +78963,13 @@ SCUS-94188:
     multitap: true
     linkCable: false
 SCUS-94253:
-  name: "Hot Shots Golf (USA) (Demo)"
+  name: "Hot Shots Golf (Demo)"
+  saveName: "Hot Shots Golf (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94476:
-  name: "Hot Shots Golf 2 (USA)"
+  name: "Hot Shots Golf 2"
+  saveName: "Hot Shots Golf 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -75113,11 +78991,13 @@ SCUS-94476:
     multitap: true
     linkCable: false
 SCUS-94495:
-  name: "Hot Shots Golf 2 (USA) (Demo)"
+  name: "Hot Shots Golf 2 (Demo)"
+  saveName: "Hot Shots Golf 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03595:
-  name: "Hot Wheels - Extreme Racing (Europe)"
+  name: "Hot Wheels - Extreme Racing"
+  saveName: "Hot Wheels - Extreme Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75137,7 +79017,8 @@ SLES-03595:
     multitap: true
     linkCable: false
 SLUS-01293:
-  name: "Hot Wheels - Extreme Racing (USA)"
+  name: "Hot Wheels - Extreme Racing"
+  saveName: "Hot Wheels - Extreme Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75157,7 +79038,8 @@ SLUS-01293:
     multitap: true
     linkCable: false
 SLES-02198:
-  name: "Hot Wheels - Turbo Racing (Europe) (En,Fr,De)"
+  name: "Hot Wheels - Turbo Racing"
+  saveName: "Hot Wheels - Turbo Racing (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75180,7 +79062,8 @@ SLES-02198:
     multitap: false
     linkCable: false
 SLUS-00964:
-  name: "Hot Wheels - Turbo Racing (USA)"
+  name: "Hot Wheels - Turbo Racing"
+  saveName: "Hot Wheels - Turbo Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -75206,7 +79089,8 @@ SLUS-00964:
     multitap: false
     linkCable: false
 SLPS-00020:
-  name: "Houma Hunter Lime Special Collection Vol. 1 (Japan)"
+  name: "Houma Hunter Lime Special Collection Vol. 1"
+  saveName: "Houma Hunter Lime Special Collection Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -75224,7 +79108,8 @@ SLPS-00020:
     multitap: false
     linkCable: false
 SLPS-00085:
-  name: "Houma Hunter Lime Special Collection Vol. 2 (Japan)"
+  name: "Houma Hunter Lime Special Collection Vol. 2"
+  saveName: "Houma Hunter Lime Special Collection Vol. 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -75242,7 +79127,8 @@ SLPS-00085:
     multitap: false
     linkCable: false
 SLPM-86377:
-  name: "Houshin Engi (Japan)"
+  name: "Houshin Engi"
+  saveName: "Houshin Engi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75264,7 +79150,8 @@ SLPM-86377:
     multitap: false
     linkCable: false
 SLPM-86209:
-  name: "Houshin Engi - Aizouban (Japan)"
+  name: "Houshin Engi - Aizouban"
+  saveName: "Houshin Engi - Aizouban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75321,7 +79208,8 @@ SLPM-87128:
     multitap: false
     linkCable: false
 SLPM-86961:
-  name: "Housoukyoku, The - SatelliTV (Japan)"
+  name: "Housoukyoku, The - SatelliTV"
+  saveName: "Housoukyoku, The - SatelliTV (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -75339,9 +79227,11 @@ SLPM-86961:
     multitap: false
     linkCable: false
 SLPM-80216:
-  name: "Hudson Spring Collection '98 (Japan)"
+  name: "Hudson Spring Collection '98"
+  saveName: "Hudson Spring Collection '98 (Japan)"
 SLES-01666:
-  name: "Hugo (Europe)"
+  name: "Hugo"
+  saveName: "Hugo (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -75359,7 +79249,8 @@ SLES-01666:
     multitap: false
     linkCable: false
 SLES-01591:
-  name: "Hugo (Europe) (Nl,Pt)"
+  name: "Hugo"
+  saveName: "Hugo (Europe) (Nl,Pt)"
   controllers:
     - DigitalController
   metadata:
@@ -75378,7 +79269,8 @@ SLES-01591:
     multitap: false
     linkCable: false
 SLES-01590:
-  name: "Hugo (France)"
+  name: "Hugo"
+  saveName: "Hugo (France)"
   controllers:
     - DigitalController
   metadata:
@@ -75396,7 +79288,8 @@ SLES-01590:
     multitap: false
     linkCable: false
 SLES-01164:
-  name: "Hugo (Germany)"
+  name: "Hugo"
+  saveName: "Hugo (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -75414,7 +79307,8 @@ SLES-01164:
     multitap: false
     linkCable: false
 SLES-01667:
-  name: "Hugo (Italy)"
+  name: "Hugo"
+  saveName: "Hugo (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -75432,7 +79326,8 @@ SLES-01667:
     multitap: false
     linkCable: false
 SLES-01592:
-  name: "Hugo (Scandinavia) (Da,Fi)"
+  name: "Hugo"
+  saveName: "Hugo (Scandinavia) (Da,Fi)"
   controllers:
     - DigitalController
   metadata:
@@ -75451,7 +79346,8 @@ SLES-01592:
     multitap: false
     linkCable: false
 SLES-01593:
-  name: "Hugo (Scandinavia) (Sv,No)"
+  name: "Hugo"
+  saveName: "Hugo (Scandinavia) (Sv,No)"
   controllers:
     - DigitalController
   metadata:
@@ -75470,7 +79366,8 @@ SLES-01593:
     multitap: false
     linkCable: false
 SLES-01668:
-  name: "Hugo (Spain)"
+  name: "Hugo"
+  saveName: "Hugo (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -75488,7 +79385,8 @@ SLES-01668:
     multitap: false
     linkCable: false
 SLES-03487:
-  name: "Hugo - Black Diamond Fever (Europe) (En,Sv,Fi)"
+  name: "Hugo - Black Diamond Fever"
+  saveName: "Hugo - Black Diamond Fever (Europe) (En,Sv,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75509,7 +79407,8 @@ SLES-03487:
     multitap: false
     linkCable: false
 SLES-03514:
-  name: "Hugo - Black Diamond Fever (Europe) (Es,It,Pt)"
+  name: "Hugo - Black Diamond Fever"
+  saveName: "Hugo - Black Diamond Fever (Europe) (Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75530,7 +79429,8 @@ SLES-03514:
     multitap: false
     linkCable: false
 SLES-03513:
-  name: "Hugo - Black Diamond Fever (Europe) (Fr,De,Nl)"
+  name: "Hugo - Black Diamond Fever"
+  saveName: "Hugo - Black Diamond Fever (Europe) (Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75551,9 +79451,11 @@ SLES-03513:
     multitap: false
     linkCable: false
 SLES-03512:
-  name: "Hugo - Black Diamond Fever (Scandinavia) (Sv,No,Da)"
+  name: "Hugo - Black Diamond Fever"
+  saveName: "Hugo - Black Diamond Fever (Scandinavia) (Sv,No,Da)"
 SLES-03686:
-  name: "Hugo - Frog Fighter (Europe) (En,Fr,De,Es,It,Nl,Pt,Sv,No,Da,Fi)"
+  name: "Hugo - Frog Fighter"
+  saveName: "Hugo - Frog Fighter (Europe) (En,Fr,De,Es,It,Nl,Pt,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75582,7 +79484,8 @@ SLES-03686:
     multitap: false
     linkCable: false
 SLES-03744:
-  name: "Hugo - Frog Fighter (France)"
+  name: "Hugo - Frog Fighter"
+  saveName: "Hugo - Frog Fighter (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75601,7 +79504,8 @@ SLES-03744:
     multitap: false
     linkCable: false
 SLES-03836:
-  name: "Hugo - The Evil Mirror (Europe) (En,Da,Pl)"
+  name: "Hugo - The Evil Mirror"
+  saveName: "Hugo - The Evil Mirror (Europe) (En,Da,Pl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75622,7 +79526,8 @@ SLES-03836:
     multitap: false
     linkCable: false
 SLES-03839:
-  name: "Hugo - The Evil Mirror (Europe) (Es,It,Pt)"
+  name: "Hugo - The Evil Mirror"
+  saveName: "Hugo - The Evil Mirror (Europe) (Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75643,7 +79548,8 @@ SLES-03839:
     multitap: false
     linkCable: false
 SLES-03838:
-  name: "Hugo - The Evil Mirror (Europe) (Fr,De,Nl)"
+  name: "Hugo - The Evil Mirror"
+  saveName: "Hugo - The Evil Mirror (Europe) (Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75664,7 +79570,8 @@ SLES-03838:
     multitap: false
     linkCable: false
 SLES-03837:
-  name: "Hugo - The Evil Mirror (Scandinavia) (Sv,No,Fi)"
+  name: "Hugo - The Evil Mirror"
+  saveName: "Hugo - The Evil Mirror (Scandinavia) (Sv,No,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75685,7 +79592,8 @@ SLES-03837:
     multitap: false
     linkCable: false
 SLUS-01559:
-  name: "Hugo - The Evil Mirror (USA) (En,Es)"
+  name: "Hugo - The Evil Mirror"
+  saveName: "Hugo - The Evil Mirror (USA) (En,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -75708,7 +79616,8 @@ SLUS-01559:
     multitap: false
     linkCable: false
 SLES-02590:
-  name: "Hugo - The Quest for the Sunstones (Europe) (En,Fr,De,Es,It,Pt,Sv,No,Da,Fi)"
+  name: "Hugo - The Quest for the Sunstones"
+  saveName: "Hugo - The Quest for the Sunstones (Europe) (En,Fr,De,Es,It,Pt,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75736,7 +79645,8 @@ SLES-02590:
     multitap: false
     linkCable: false
 SLES-03573:
-  name: "Hugo - The Quest for the Sunstones (Europe) (Fr,Nl,Pl)"
+  name: "Hugo - The Quest for the Sunstones"
+  saveName: "Hugo - The Quest for the Sunstones (Europe) (Fr,Nl,Pl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -75757,7 +79667,8 @@ SLES-03573:
     multitap: false
     linkCable: false
 SLES-01810:
-  name: "Hugo 2 (Denmark)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Denmark)"
   controllers:
     - DigitalController
   metadata:
@@ -75775,7 +79686,8 @@ SLES-01810:
     multitap: false
     linkCable: false
 SLES-01805:
-  name: "Hugo 2 (Europe)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -75793,7 +79705,8 @@ SLES-01805:
     multitap: false
     linkCable: false
 SLES-02163:
-  name: "Hugo 2 (Finland)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Finland)"
   controllers:
     - DigitalController
   metadata:
@@ -75811,7 +79724,8 @@ SLES-02163:
     multitap: false
     linkCable: false
 SLES-01806:
-  name: "Hugo 2 (France)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (France)"
   controllers:
     - DigitalController
   metadata:
@@ -75829,7 +79743,8 @@ SLES-01806:
     multitap: false
     linkCable: false
 SLES-01807:
-  name: "Hugo 2 (Germany)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -75847,7 +79762,8 @@ SLES-01807:
     multitap: false
     linkCable: false
 SLES-01808:
-  name: "Hugo 2 (Italy)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -75865,7 +79781,8 @@ SLES-01808:
     multitap: false
     linkCable: false
 SLES-01815:
-  name: "Hugo 2 (Netherlands)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Netherlands)"
   controllers:
     - DigitalController
   metadata:
@@ -75883,7 +79800,8 @@ SLES-01815:
     multitap: false
     linkCable: false
 SLES-01812:
-  name: "Hugo 2 (Norway)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Norway)"
   controllers:
     - DigitalController
   metadata:
@@ -75901,7 +79819,8 @@ SLES-01812:
     multitap: false
     linkCable: false
 SLES-01813:
-  name: "Hugo 2 (Portugal)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Portugal)"
   controllers:
     - DigitalController
   metadata:
@@ -75919,7 +79838,8 @@ SLES-01813:
     multitap: false
     linkCable: false
 SLES-01809:
-  name: "Hugo 2 (Spain)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -75937,7 +79857,8 @@ SLES-01809:
     multitap: false
     linkCable: false
 SLES-01811:
-  name: "Hugo 2 (Sweden)"
+  name: "Hugo 2"
+  saveName: "Hugo 2 (Sweden)"
   controllers:
     - DigitalController
   metadata:
@@ -75955,7 +79876,8 @@ SLES-01811:
     multitap: false
     linkCable: false
 SLES-02958:
-  name: "Hunchback of Notredame (Europe)"
+  name: "Hunchback of Notredame"
+  saveName: "Hunchback of Notredame (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76033,7 +79955,8 @@ SLPM-87204:
     multitap: false
     linkCable: false
 SLPM-86651:
-  name: "Hunter x Hunter - Maboroshi no Greed Island (Japan)"
+  name: "Hunter x Hunter - Maboroshi no Greed Island"
+  saveName: "Hunter x Hunter - Maboroshi no Greed Island (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76052,7 +79975,8 @@ SLPM-86651:
     multitap: true
     linkCable: false
 SLPM-86895:
-  name: "Hunter x Hunter - Ubawareta Aura Stone (Japan)"
+  name: "Hunter x Hunter - Ubawareta Aura Stone"
+  saveName: "Hunter x Hunter - Ubawareta Aura Stone (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76071,7 +79995,8 @@ SLPM-86895:
     multitap: false
     linkCable: false
 SLES-03210:
-  name: "Hunter, The (Europe)"
+  name: "Hunter, The"
+  saveName: "Hunter, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76090,7 +80015,8 @@ SLES-03210:
     multitap: true
     linkCable: false
 SLES-03482:
-  name: "Hvem Vil Vaere Millionaer (Denmark)"
+  name: "Hvem Vil Vaere Millionaer"
+  saveName: "Hvem Vil Vaere Millionaer (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76109,7 +80035,8 @@ SLES-03482:
     multitap: true
     linkCable: false
 SLPS-03353:
-  name: "Hyakujuu Sentai GaoRanger (Japan)"
+  name: "Hyakujuu Sentai GaoRanger"
+  saveName: "Hyakujuu Sentai GaoRanger (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76147,7 +80074,8 @@ SLPS-03530:
     multitap: false
     linkCable: false
 SLES-03531:
-  name: "Hybrid (Europe)"
+  name: "Hybrid"
+  saveName: "Hybrid (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -76165,7 +80093,8 @@ SLES-03531:
     multitap: false
     linkCable: false
 SLPS-01102:
-  name: "Hybrid (Japan)"
+  name: "Hybrid"
+  saveName: "Hybrid (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76183,7 +80112,8 @@ SLPS-01102:
     multitap: false
     linkCable: false
 SLES-02337:
-  name: "Hydro Thunder (Europe) (En,Fr)"
+  name: "Hydro Thunder"
+  saveName: "Hydro Thunder (Europe) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76204,7 +80134,8 @@ SLES-02337:
     multitap: false
     linkCable: false
 SLUS-00847:
-  name: "Hydro Thunder (USA)"
+  name: "Hydro Thunder"
+  saveName: "Hydro Thunder (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -76227,7 +80158,8 @@ SLUS-00847:
     multitap: false
     linkCable: false
 SLPS-02358:
-  name: "Hyouryuuki - The Reportage Beyond the Sea (Japan)"
+  name: "Hyouryuuki - The Reportage Beyond the Sea"
+  saveName: "Hyouryuuki - The Reportage Beyond the Sea (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76246,7 +80178,8 @@ SLPS-02358:
     multitap: false
     linkCable: false
 SLPM-87229:
-  name: "Hyouryuuki - The Reportage Beyond the Sea (Japan) (Major Wave)"
+  name: "Hyouryuuki - The Reportage Beyond the Sea (Major Wave)"
+  saveName: "Hyouryuuki - The Reportage Beyond the Sea (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76265,7 +80198,8 @@ SLPM-87229:
     multitap: false
     linkCable: false
 SLPS-00395:
-  name: "Hyper 3D Pinball (Japan)"
+  name: "Hyper 3D Pinball"
+  saveName: "Hyper 3D Pinball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76283,7 +80217,8 @@ SLPS-00395:
     multitap: false
     linkCable: false
 SLPS-00248:
-  name: "Hyper Crazy Climber (Japan)"
+  name: "Hyper Crazy Climber"
+  saveName: "Hyper Crazy Climber (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76301,7 +80236,8 @@ SLPS-00248:
     multitap: false
     linkCable: false
 SLPS-00278:
-  name: "Hyper Final Match Tennis (Japan)"
+  name: "Hyper Final Match Tennis"
+  saveName: "Hyper Final Match Tennis (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76319,7 +80255,8 @@ SLPS-00278:
     multitap: true
     linkCable: false
 SLPS-00062:
-  name: "Hyper Formation Soccer (Japan)"
+  name: "Hyper Formation Soccer"
+  saveName: "Hyper Formation Soccer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76337,7 +80274,8 @@ SLPS-00062:
     multitap: false
     linkCable: false
 SLPM-86002:
-  name: "Hyper Olympic in Atlanta (Japan)"
+  name: "Hyper Olympic in Atlanta"
+  saveName: "Hyper Olympic in Atlanta (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76355,7 +80293,8 @@ SLPM-86002:
     multitap: true
     linkCable: false
 SLPM-86056:
-  name: "Hyper Olympic in Nagano (Japan)"
+  name: "Hyper Olympic in Nagano"
+  saveName: "Hyper Olympic in Nagano (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76377,15 +80316,18 @@ SLPM-86056:
     multitap: true
     linkCable: false
 SLPM-80183:
-  name: "Hyper PlayStation Re-mix 1998 No. 1 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 1"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 1 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80292:
-  name: "Hyper PlayStation Re-mix 1998 No. 10 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 10"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 10 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80317:
-  name: "Hyper PlayStation Re-mix 1998 No. 11 (Japan) (Disc 1)"
+  name: "Hyper PlayStation Re-mix 1998 No. 11 (Disc 1)"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 11 (Japan) (Disc 1)"
   discSet:
     name: "Hyper PlayStation Re-mix 1998 No. 11 (Japan)"
     serials:
@@ -76394,7 +80336,8 @@ SLPM-80317:
   metadata:
     genre: "** DEMO **"
 PAPX-90059:
-  name: "Hyper PlayStation Re-mix 1998 No. 11 (Japan) (Disc 2)"
+  name: "Hyper PlayStation Re-mix 1998 No. 11 (Disc 2)"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 11 (Japan) (Disc 2)"
   discSet:
     name: "Hyper PlayStation Re-mix 1998 No. 11 (Japan)"
     serials:
@@ -76403,31 +80346,38 @@ PAPX-90059:
   metadata:
     genre: "** DEMO **"
 SLPM-80337:
-  name: "Hyper PlayStation Re-mix 1998 No. 12 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 12"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 12 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80199:
-  name: "Hyper PlayStation Re-mix 1998 No. 2 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 2"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 2 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80217:
-  name: "Hyper PlayStation Re-mix 1998 No. 3 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 3"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 3 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80228:
-  name: "Hyper PlayStation Re-mix 1998 No. 4 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 4"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 4 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80308:
-  name: "Hyper PlayStation Re-mix 1998 No. 5 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 5"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 5 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80237:
-  name: "Hyper PlayStation Re-mix 1998 No. 6 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 6"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 6 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80248:
-  name: "Hyper PlayStation Re-mix 1998 No. 7 (Japan) (Disc 1)"
+  name: "Hyper PlayStation Re-mix 1998 No. 7 (Disc 1)"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 7 (Japan) (Disc 1)"
   discSet:
     name: "Hyper PlayStation Re-mix 1998 No. 7 (Japan)"
     serials:
@@ -76436,7 +80386,8 @@ SLPM-80248:
   metadata:
     genre: "** DEMO **"
 PCPX-96115:
-  name: "Hyper PlayStation Re-mix 1998 No. 7 (Japan) (Disc 2) (Yarudora Series Vol. 1 - Double Cast)"
+  name: "Hyper PlayStation Re-mix 1998 No. 7 (Disc 2) (Yarudora Series Vol. 1 - Double Cast)"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 7 (Japan) (Disc 2) (Yarudora Series Vol. 1 - Double Cast)"
   discSet:
     name: "Hyper PlayStation Re-mix 1998 No. 7 (Japan)"
     serials:
@@ -76445,59 +80396,73 @@ PCPX-96115:
   metadata:
     genre: "** DEMO **"
 SLPM-80264:
-  name: "Hyper PlayStation Re-mix 1998 No. 8 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 8"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 8 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80279:
-  name: "Hyper PlayStation Re-mix 1998 No. 9 (Japan)"
+  name: "Hyper PlayStation Re-mix 1998 No. 9"
+  saveName: "Hyper PlayStation Re-mix 1998 No. 9 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80357:
-  name: "Hyper PlayStation Re-mix 1999 No. 1 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 1"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 1 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80480:
-  name: "Hyper PlayStation Re-mix 1999 No. 10 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 10"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 10 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80495:
-  name: "Hyper PlayStation Re-mix 1999 No. 11 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 11"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 11 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80504:
-  name: "Hyper PlayStation Re-mix 1999 No. 12 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 12"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 12 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80369:
-  name: "Hyper PlayStation Re-mix 1999 No. 2 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 2"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 2 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80384:
-  name: "Hyper PlayStation Re-mix 1999 No. 3 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 3"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 3 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80400:
-  name: "Hyper PlayStation Re-mix 1999 No. 4 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 4"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 4 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80416:
-  name: "Hyper PlayStation Re-mix 1999 No. 5 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 5"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 5 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80424:
-  name: "Hyper PlayStation Re-mix 1999 No. 6 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 6"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 6 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80439:
-  name: "Hyper PlayStation Re-mix 1999 No. 7 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 7"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 7 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80456:
-  name: "Hyper PlayStation Re-mix 1999 No. 8 (Japan)"
+  name: "Hyper PlayStation Re-mix 1999 No. 8"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 8 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80470:
-  name: "Hyper PlayStation Re-mix 1999 No. 9 (Japan) (Disc 1)"
+  name: "Hyper PlayStation Re-mix 1999 No. 9 (Disc 1)"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 9 (Japan) (Disc 1)"
   discSet:
     name: "Hyper PlayStation Re-mix 1999 No. 9 (Japan)"
     serials:
@@ -76506,7 +80471,8 @@ SLPM-80470:
   metadata:
     genre: "** DEMO **"
 PCPX-96170:
-  name: "Hyper PlayStation Re-mix 1999 No. 9 (Japan) (Disc 2) (Sony Computer Entertainment Special)"
+  name: "Hyper PlayStation Re-mix 1999 No. 9 (Disc 2) (Sony Computer Entertainment Special)"
+  saveName: "Hyper PlayStation Re-mix 1999 No. 9 (Japan) (Disc 2) (Sony Computer Entertainment Special)"
   discSet:
     name: "Hyper PlayStation Re-mix 1999 No. 9 (Japan)"
     serials:
@@ -76515,51 +80481,63 @@ PCPX-96170:
   metadata:
     genre: "** DEMO **"
 SLPM-80514:
-  name: "Hyper PlayStation Re-mix 2000 No. 1 (Japan)"
+  name: "Hyper PlayStation Re-mix 2000 No. 1"
+  saveName: "Hyper PlayStation Re-mix 2000 No. 1 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80525:
-  name: "Hyper PlayStation Re-mix 2000 No. 2 (Japan)"
+  name: "Hyper PlayStation Re-mix 2000 No. 2"
+  saveName: "Hyper PlayStation Re-mix 2000 No. 2 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80050:
-  name: "Hyper PlayStation Re-mix No. 1 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 1"
+  saveName: "Hyper PlayStation Re-mix No. 1 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80146:
-  name: "Hyper PlayStation Re-mix No. 10 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 10"
+  saveName: "Hyper PlayStation Re-mix No. 10 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80152:
-  name: "Hyper PlayStation Re-mix No. 11 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 11"
+  saveName: "Hyper PlayStation Re-mix No. 11 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80167:
-  name: "Hyper PlayStation Re-mix No. 12 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 12"
+  saveName: "Hyper PlayStation Re-mix No. 12 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80058:
-  name: "Hyper PlayStation Re-mix No. 2 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 2"
+  saveName: "Hyper PlayStation Re-mix No. 2 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80072:
-  name: "Hyper PlayStation Re-mix No. 3 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 3"
+  saveName: "Hyper PlayStation Re-mix No. 3 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80090:
-  name: "Hyper PlayStation Re-mix No. 4 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 4"
+  saveName: "Hyper PlayStation Re-mix No. 4 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80099:
-  name: "Hyper PlayStation Re-mix No. 5 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 5"
+  saveName: "Hyper PlayStation Re-mix No. 5 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80106:
-  name: "Hyper PlayStation Re-mix No. 6 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 6"
+  saveName: "Hyper PlayStation Re-mix No. 6 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80113:
-  name: "Hyper PlayStation Re-mix No. 7 (Japan) (Disc 1)"
+  name: "Hyper PlayStation Re-mix No. 7 (Disc 1)"
+  saveName: "Hyper PlayStation Re-mix No. 7 (Japan) (Disc 1)"
   discSet:
     name: "Hyper PlayStation Re-mix No. 7 (Japan)"
     serials:
@@ -76568,7 +80546,8 @@ SLPM-80113:
   metadata:
     genre: "** DEMO **"
 SLPM-80114:
-  name: "Hyper PlayStation Re-mix No. 7 (Japan) (Disc 2)"
+  name: "Hyper PlayStation Re-mix No. 7 (Disc 2)"
+  saveName: "Hyper PlayStation Re-mix No. 7 (Japan) (Disc 2)"
   discSet:
     name: "Hyper PlayStation Re-mix No. 7 (Japan)"
     serials:
@@ -76577,15 +80556,18 @@ SLPM-80114:
   metadata:
     genre: "** DEMO **"
 SLPM-80122:
-  name: "Hyper PlayStation Re-mix No. 8 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 8"
+  saveName: "Hyper PlayStation Re-mix No. 8 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80134:
-  name: "Hyper PlayStation Re-mix No. 9 (Japan)"
+  name: "Hyper PlayStation Re-mix No. 9"
+  saveName: "Hyper PlayStation Re-mix No. 9 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-01417:
-  name: "Hyper Securities 2 (Japan)"
+  name: "Hyper Securities 2"
+  saveName: "Hyper Securities 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76603,7 +80585,8 @@ SLPS-01417:
     multitap: false
     linkCable: false
 SLES-00309:
-  name: "Hyper Tennis - Final Match (Europe)"
+  name: "Hyper Tennis - Final Match"
+  saveName: "Hyper Tennis - Final Match (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -76621,7 +80604,8 @@ SLES-00309:
     multitap: true
     linkCable: false
 SLPM-86417:
-  name: "Hyper Value 2800 - Hanafuda (Japan)"
+  name: "Hyper Value 2800 - Hanafuda"
+  saveName: "Hyper Value 2800 - Hanafuda (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76640,7 +80624,8 @@ SLPM-86417:
     multitap: false
     linkCable: false
 SLPM-86418:
-  name: "Hyper Value 2800 - Hyper Pachinko (Japan)"
+  name: "Hyper Value 2800 - Hyper Pachinko"
+  saveName: "Hyper Value 2800 - Hyper Pachinko (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76659,7 +80644,8 @@ SLPM-86418:
     multitap: false
     linkCable: false
 SLPM-86292:
-  name: "Hyper Value 2800 - Mahjong (Japan)"
+  name: "Hyper Value 2800 - Mahjong"
+  saveName: "Hyper Value 2800 - Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76678,7 +80664,8 @@ SLPM-86292:
     multitap: false
     linkCable: false
 SLPS-01029:
-  name: "I'Max Shougi II (Japan)"
+  name: "I'Max Shougi II"
+  saveName: "I'Max Shougi II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76696,7 +80683,8 @@ SLPS-01029:
     multitap: false
     linkCable: false
 SCPS-10029:
-  name: "I.Q - Intelligent Qube (Japan)"
+  name: "I.Q - Intelligent Qube"
+  saveName: "I.Q - Intelligent Qube (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -76717,13 +80705,15 @@ SCPS-10029:
     multitap: false
     linkCable: false
 PCPX-96058:
-  name: "I.Q - Intelligent Qube (Japan) (Demo)"
+  name: "I.Q - Intelligent Qube (Demo)"
+  saveName: "I.Q - Intelligent Qube (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SCUS-94181:
-  name: "I.Q - Intelligent Qube (USA)"
+  name: "I.Q - Intelligent Qube"
+  saveName: "I.Q - Intelligent Qube (USA)"
   compatibility:
     rating: NoIssues
     comments: "Play field occasionally jerks with PGXP switched on"
@@ -76744,7 +80734,8 @@ SCUS-94181:
     multitap: false
     linkCable: false
 SCUS-94196:
-  name: "I.Q - Intelligent Qube (USA) (Demo)"
+  name: "I.Q - Intelligent Qube (Demo)"
+  saveName: "I.Q - Intelligent Qube (USA) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -76768,7 +80759,8 @@ SCPS-45036:
     multitap: false
     linkCable: false
 SCPS-10071:
-  name: "I.Q Final (Japan)"
+  name: "I.Q Final"
+  saveName: "I.Q Final (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76790,11 +80782,13 @@ SCPS-10071:
     multitap: false
     linkCable: false
 PCPX-96137:
-  name: "I.Q Final (Japan) (Demo 1)"
+  name: "I.Q Final (Demo 1)"
+  saveName: "I.Q Final (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PAPX-90063:
-  name: "I.Q Final (Japan) (Demo 2)"
+  name: "I.Q Final (Demo 2)"
+  saveName: "I.Q Final (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-91227:
@@ -76817,7 +80811,8 @@ SCPS-91227:
     multitap: false
     linkCable: false
 SLUS-01097:
-  name: "IHRA Drag Racing (USA)"
+  name: "IHRA Drag Racing"
+  saveName: "IHRA Drag Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76837,9 +80832,11 @@ SLUS-01097:
     multitap: false
     linkCable: false
 SCPS-45497:
-  name: "ISS Pro Evolution (Asia)"
+  name: "ISS Pro Evolution"
+  saveName: "ISS Pro Evolution (Asia)"
 SLES-02095:
-  name: "ISS Pro Evolution (Europe) (En,Fr,De)"
+  name: "ISS Pro Evolution"
+  saveName: "ISS Pro Evolution (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76860,7 +80857,8 @@ SLES-02095:
     multitap: true
     linkCable: false
 SLES-02424:
-  name: "ISS Pro Evolution (Europe) (Es,It)"
+  name: "ISS Pro Evolution"
+  saveName: "ISS Pro Evolution (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76880,7 +80878,8 @@ SLES-02424:
     multitap: true
     linkCable: false
 SLUS-01014:
-  name: "ISS Pro Evolution (USA)"
+  name: "ISS Pro Evolution"
+  saveName: "ISS Pro Evolution (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76899,7 +80898,8 @@ SLUS-01014:
     multitap: true
     linkCable: false
 SLES-03321:
-  name: "ISS Pro Evolution 2 (Europe) (En,Fr,De)"
+  name: "ISS Pro Evolution 2"
+  saveName: "ISS Pro Evolution 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76920,7 +80920,8 @@ SLES-03321:
     multitap: true
     linkCable: false
 SLES-03322:
-  name: "ISS Pro Evolution 2 (Europe) (Es,It)"
+  name: "ISS Pro Evolution 2"
+  saveName: "ISS Pro Evolution 2 (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -76940,7 +80941,8 @@ SLES-03322:
     multitap: true
     linkCable: false
 SLES-00746:
-  name: "Ian Livingstone's Deathtrap Dungeon (Europe) (En,Fr,De,Es,It)"
+  name: "Ian Livingstone's Deathtrap Dungeon"
+  saveName: "Ian Livingstone's Deathtrap Dungeon (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -76962,7 +80964,8 @@ SLES-00746:
     multitap: false
     linkCable: false
 SLUS-00566:
-  name: "Ian Livingstone's Deathtrap Dungeon (USA)"
+  name: "Ian Livingstone's Deathtrap Dungeon"
+  saveName: "Ian Livingstone's Deathtrap Dungeon (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -76980,7 +80983,8 @@ SLUS-00566:
     multitap: false
     linkCable: false
 SLPS-01027:
-  name: "Iblard - Laputa no Kaeru Machi (Japan)"
+  name: "Iblard - Laputa no Kaeru Machi"
+  saveName: "Iblard - Laputa no Kaeru Machi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -76998,7 +81002,8 @@ SLPS-01027:
     multitap: false
     linkCable: false
 ESPM-70001:
-  name: "Iceman - Digital PlayStage (Japan)"
+  name: "Iceman - Digital PlayStage"
+  saveName: "Iceman - Digital PlayStage (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -77016,7 +81021,8 @@ ESPM-70001:
     multitap: false
     linkCable: false
 SLPS-02199:
-  name: "Ichigeki - Hagane no Hito (Japan)"
+  name: "Ichigeki - Hagane no Hito"
+  saveName: "Ichigeki - Hagane no Hito (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77035,7 +81041,8 @@ SLPS-02199:
     multitap: false
     linkCable: false
 SLPS-00328:
-  name: "Ide Yousuke Meijin no Shin Jissen Mahjong (Japan)"
+  name: "Ide Yousuke Meijin no Shin Jissen Mahjong"
+  saveName: "Ide Yousuke Meijin no Shin Jissen Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -77053,7 +81060,8 @@ SLPS-00328:
     multitap: false
     linkCable: false
 SLPS-00058:
-  name: "Ide Yousuke no Mahjong Kazoku (Japan)"
+  name: "Ide Yousuke no Mahjong Kazoku"
+  saveName: "Ide Yousuke no Mahjong Kazoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -77071,7 +81079,8 @@ SLPS-00058:
     multitap: false
     linkCable: false
 SLPS-02272:
-  name: "Ide Yousuke no Mahjong Kyoushitsu (Japan)"
+  name: "Ide Yousuke no Mahjong Kyoushitsu"
+  saveName: "Ide Yousuke no Mahjong Kyoushitsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77093,7 +81102,8 @@ SLPS-02272:
     multitap: false
     linkCable: false
 SLPS-00290:
-  name: "Idol Janshi Suchie-Pai II Limited (Japan) (Disc 1)"
+  name: "Idol Janshi Suchie-Pai II Limited (Disc 1)"
+  saveName: "Idol Janshi Suchie-Pai II Limited (Japan) (Disc 1)"
   discSet:
     name: "Idol Janshi Suchie-Pai II Limited (Japan)"
     serials:
@@ -77117,7 +81127,8 @@ SLPS-00290:
     multitap: false
     linkCable: false
 SLPS-00291:
-  name: "Idol Janshi Suchie-Pai II Limited (Japan) (Disc 2) (Bonus Disc Part 1)"
+  name: "Idol Janshi Suchie-Pai II Limited (Disc 2) (Bonus Disc Part 1)"
+  saveName: "Idol Janshi Suchie-Pai II Limited (Japan) (Disc 2) (Bonus Disc Part 1)"
   discSet:
     name: "Idol Janshi Suchie-Pai II Limited (Japan)"
     serials:
@@ -77141,7 +81152,8 @@ SLPS-00291:
     multitap: false
     linkCable: false
 SLPS-00292:
-  name: "Idol Janshi Suchie-Pai II Limited (Japan) (Disc 3) (Bonus Disc Part 2)"
+  name: "Idol Janshi Suchie-Pai II Limited (Disc 3) (Bonus Disc Part 2)"
+  saveName: "Idol Janshi Suchie-Pai II Limited (Japan) (Disc 3) (Bonus Disc Part 2)"
   discSet:
     name: "Idol Janshi Suchie-Pai II Limited (Japan)"
     serials:
@@ -77187,7 +81199,8 @@ SLPS-03516:
     multitap: false
     linkCable: false
 SLPS-00029:
-  name: "Idol Janshi Suchie-Pai Limited (Japan)"
+  name: "Idol Janshi Suchie-Pai Limited"
+  saveName: "Idol Janshi Suchie-Pai Limited (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -77208,7 +81221,8 @@ SLPS-00029:
     multitap: false
     linkCable: false
 SLPS-00343:
-  name: "Idol Promotion - Suzuki Yumie (Japan)"
+  name: "Idol Promotion - Suzuki Yumie"
+  saveName: "Idol Promotion - Suzuki Yumie (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -77226,7 +81240,8 @@ SLPS-00343:
     multitap: false
     linkCable: false
 SLPS-00344:
-  name: "Idol Promotion - Suzuki Yumie (Japan) (Yumie Island)"
+  name: "Idol Promotion - Suzuki Yumie (Yumie Island)"
+  saveName: "Idol Promotion - Suzuki Yumie (Japan) (Yumie Island)"
   controllers:
     - DigitalController
   metadata:
@@ -77244,7 +81259,8 @@ SLPS-00344:
     multitap: false
     linkCable: false
 SLPS-02606:
-  name: "Ikasama Mahjong (Japan)"
+  name: "Ikasama Mahjong"
+  saveName: "Ikasama Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77266,7 +81282,8 @@ SLPS-02606:
     multitap: false
     linkCable: false
 SLPS-00526:
-  name: "Imadoki no Vampire - Bloody Bride (Japan)"
+  name: "Imadoki no Vampire - Bloody Bride"
+  saveName: "Imadoki no Vampire - Bloody Bride (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -77284,7 +81301,8 @@ SLPS-00526:
     multitap: false
     linkCable: false
 SLES-00235:
-  name: "Impact Racing (Europe)"
+  name: "Impact Racing"
+  saveName: "Impact Racing (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -77303,7 +81321,8 @@ SLES-00235:
     multitap: false
     linkCable: false
 SLPS-00836:
-  name: "Impact Racing (Japan)"
+  name: "Impact Racing"
+  saveName: "Impact Racing (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -77322,7 +81341,8 @@ SLPS-00836:
     multitap: false
     linkCable: false
 SLUS-00225:
-  name: "Impact Racing (USA)"
+  name: "Impact Racing"
+  saveName: "Impact Racing (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -77359,7 +81379,8 @@ SLPM-86402:
     multitap: false
     linkCable: false
 SCES-02149:
-  name: "In Cold Blood (Europe) (Disc 1)"
+  name: "In Cold Blood (Disc 1)"
+  saveName: "In Cold Blood (Europe) (Disc 1)"
   discSet:
     name: "In Cold Blood (Europe)"
     serials:
@@ -77383,7 +81404,8 @@ SCES-02149:
     multitap: false
     linkCable: false
 SCES-12149:
-  name: "In Cold Blood (Europe) (Disc 2)"
+  name: "In Cold Blood (Disc 2)"
+  saveName: "In Cold Blood (Europe) (Disc 2)"
   discSet:
     name: "In Cold Blood (Europe)"
     serials:
@@ -77407,7 +81429,8 @@ SCES-12149:
     multitap: false
     linkCable: false
 SLUS-01294:
-  name: "In Cold Blood (USA) (Disc 1)"
+  name: "In Cold Blood (Disc 1)"
+  saveName: "In Cold Blood (USA) (Disc 1)"
   discSet:
     name: "In Cold Blood (USA)"
     serials:
@@ -77431,7 +81454,8 @@ SLUS-01294:
     multitap: false
     linkCable: false
 SLUS-01314:
-  name: "In Cold Blood (USA) (Disc 2)"
+  name: "In Cold Blood (Disc 2)"
+  saveName: "In Cold Blood (USA) (Disc 2)"
   discSet:
     name: "In Cold Blood (USA)"
     serials:
@@ -77455,7 +81479,8 @@ SLUS-01314:
     multitap: false
     linkCable: false
 SLES-02983:
-  name: "In einem Land vor unserer Zeit - Die Rueckkehr ins Grosse Tal (Germany)"
+  name: "In einem Land vor unserer Zeit - Die Rueckkehr ins Grosse Tal"
+  saveName: "In einem Land vor unserer Zeit - Die Rueckkehr ins Grosse Tal (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77474,7 +81499,8 @@ SLES-02983:
     multitap: false
     linkCable: false
 SLES-00342:
-  name: "In the Hunt (Europe)"
+  name: "In the Hunt"
+  saveName: "In the Hunt (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -77495,7 +81521,8 @@ SLES-00342:
     multitap: false
     linkCable: false
 SLUS-00172:
-  name: "In the Hunt (USA)"
+  name: "In the Hunt"
+  saveName: "In the Hunt (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -77518,7 +81545,8 @@ SLUS-00172:
     multitap: false
     linkCable: false
 SLPS-02142:
-  name: "Inagawa Junji - Kyoufu no Yashiki (Japan)"
+  name: "Inagawa Junji - Kyoufu no Yashiki"
+  saveName: "Inagawa Junji - Kyoufu no Yashiki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77575,7 +81603,8 @@ SLPS-02838:
     multitap: false
     linkCable: false
 SLPS-03244:
-  name: "Inagawa Junji - Mayonaka no Taxi (Japan)"
+  name: "Inagawa Junji - Mayonaka no Taxi"
+  saveName: "Inagawa Junji - Mayonaka no Taxi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77594,7 +81623,8 @@ SLPS-03244:
     multitap: false
     linkCable: false
 SLES-02933:
-  name: "Incredible Crisis (Europe) (En,Fr,De,Es,It)"
+  name: "Incredible Crisis"
+  saveName: "Incredible Crisis (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -77620,11 +81650,13 @@ SLES-02933:
     multitap: false
     linkCable: false
 SLED-03212:
-  name: "Incredible Crisis (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Incredible Crisis (Demo)"
+  saveName: "Incredible Crisis (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01225:
-  name: "Incredible Crisis (USA)"
+  name: "Incredible Crisis"
+  saveName: "Incredible Crisis (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -77646,7 +81678,8 @@ SLUS-01225:
     multitap: false
     linkCable: false
 SLES-00109:
-  name: "Incredible Hulk, The - The Pantheon Saga (Europe) (En,Fr,De,Es,It)"
+  name: "Incredible Hulk, The - The Pantheon Saga"
+  saveName: "Incredible Hulk, The - The Pantheon Saga (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -77668,7 +81701,8 @@ SLES-00109:
     multitap: false
     linkCable: false
 SLUS-00150:
-  name: "Incredible Hulk, The - The Pantheon Saga (USA)"
+  name: "Incredible Hulk, The - The Pantheon Saga"
+  saveName: "Incredible Hulk, The - The Pantheon Saga (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1580-g136a9d60"
@@ -77689,7 +81723,8 @@ SLUS-00150:
     multitap: false
     linkCable: false
 SLUS-00221:
-  name: "Independence Day (USA)"
+  name: "Independence Day"
+  saveName: "Independence Day (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -77707,7 +81742,8 @@ SLUS-00221:
     multitap: false
     linkCable: true
 SLES-00607:
-  name: "Independence Day - The Game (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Independence Day - The Game"
+  saveName: "Independence Day - The Game (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -77730,7 +81766,8 @@ SLES-00607:
     multitap: false
     linkCable: true
 SLES-00135:
-  name: "Indy 500 (Europe)"
+  name: "Indy 500"
+  saveName: "Indy 500 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -77749,7 +81786,8 @@ SLES-00135:
     multitap: false
     linkCable: false
 SLPS-00860:
-  name: "Indy 500 (Japan)"
+  name: "Indy 500"
+  saveName: "Indy 500 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -77768,11 +81806,13 @@ SLPS-00860:
     multitap: false
     linkCable: false
 SLPM-80103:
-  name: "Indy 500 (Japan) (Demo)"
+  name: "Indy 500 (Demo)"
+  saveName: "Indy 500 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01870:
-  name: "Infestation (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Infestation"
+  saveName: "Infestation (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -77798,7 +81838,8 @@ SLES-01870:
     multitap: false
     linkCable: false
 SLPS-02669:
-  name: "Infinity (Japan)"
+  name: "Infinity"
+  saveName: "Infinity (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77817,7 +81858,8 @@ SLPS-02669:
     multitap: false
     linkCable: false
 SLPS-01793:
-  name: "Initial D (Japan)"
+  name: "Initial D"
+  saveName: "Initial D (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -77843,7 +81885,8 @@ SLPS-01793:
     multitap: false
     linkCable: false
 SLES-03084:
-  name: "Inspector Gadget - Gadget's Crazy Maze (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Inspector Gadget - Gadget's Crazy Maze"
+  saveName: "Inspector Gadget - Gadget's Crazy Maze (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77867,7 +81910,8 @@ SLES-03084:
     multitap: true
     linkCable: false
 SLUS-01267:
-  name: "Inspector Gadget - Gadget's Crazy Maze (USA) (En,Fr,De,Es,It,Nl)"
+  name: "Inspector Gadget - Gadget's Crazy Maze"
+  saveName: "Inspector Gadget - Gadget's Crazy Maze (USA) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -77891,7 +81935,8 @@ SLUS-01267:
     multitap: true
     linkCable: false
 SLUS-00906:
-  name: "Intellivision Classic Games (USA)"
+  name: "Intellivision Classic Games"
+  saveName: "Intellivision Classic Games (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -77913,7 +81958,8 @@ SLUS-00906:
     multitap: false
     linkCable: false
 PBPX-95004:
-  name: "Interactive CD Sampler Disc 6 (USA)"
+  name: "Interactive CD Sampler Disc 6"
+  saveName: "Interactive CD Sampler Disc 6 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -77925,7 +81971,8 @@ PBPX-95004:
   metadata:
     genre: "** DEMO **"
 PBPX-95011:
-  name: "Interactive CD Sampler Disc Vol. 10 (USA)"
+  name: "Interactive CD Sampler Disc Vol. 10"
+  saveName: "Interactive CD Sampler Disc Vol. 10 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
@@ -77935,21 +81982,24 @@ PBPX-95011:
   metadata:
     genre: "** DEMO **"
 SCUS-94463:
-  name: "Interactive CD Sampler Disc Vol. 11 (USA)"
+  name: "Interactive CD Sampler Disc Vol. 11"
+  saveName: "Interactive CD Sampler Disc Vol. 11 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
   metadata:
     genre: "** DEMO **"
 SCUS-94295:
-  name: "Interactive CD Sampler Disc Vol. 9 (USA) (SCUS-94295)"
+  name: "Interactive CD Sampler Disc Vol. 9 (SCUS-94295)"
+  saveName: "Interactive CD Sampler Disc Vol. 9 (USA) (SCUS-94295)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
   metadata:
     genre: "** DEMO **"
 PBPX-95002:
-  name: "Interactive CD Sampler Disc Volume 4 (USA)"
+  name: "Interactive CD Sampler Disc Volume 4"
+  saveName: "Interactive CD Sampler Disc Volume 4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -77959,7 +82009,8 @@ PBPX-95002:
   metadata:
     genre: "** DEMO **"
 PBPX-95006:
-  name: "Interactive CD Sampler Disc Volume 7 (USA)"
+  name: "Interactive CD Sampler Disc Volume 7"
+  saveName: "Interactive CD Sampler Disc Volume 7 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
@@ -77970,7 +82021,8 @@ PBPX-95006:
   metadata:
     genre: "** DEMO **"
 PBPX-95009:
-  name: "Interactive CD Sampler Disc Volume 8 (USA)"
+  name: "Interactive CD Sampler Disc Volume 8"
+  saveName: "Interactive CD Sampler Disc Volume 8 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
@@ -77981,7 +82033,8 @@ PBPX-95009:
   metadata:
     genre: "** DEMO **"
 PBPX-95003:
-  name: "Interactive CD Sampler Disk Volume 5 (USA)"
+  name: "Interactive CD Sampler Disk Volume 5"
+  saveName: "Interactive CD Sampler Disk Volume 5 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
@@ -77991,54 +82044,63 @@ PBPX-95003:
   metadata:
     genre: "** DEMO **"
 SCUS-94222:
-  name: "Interactive CD Sampler Disk Volume 5 (USA) (Rev 1)"
+  name: "Interactive CD Sampler Disk Volume 5"
+  saveName: "Interactive CD Sampler Disk Volume 5 (USA) (Rev 1)"
   metadata:
     genre: "** DEMO **"
 SCUS-94224:
-  name: "Interactive CD Sampler Disk Volume 5 (USA) (SCUS-94224)"
+  name: "Interactive CD Sampler Disk Volume 5 (SCUS-94224)"
+  saveName: "Interactive CD Sampler Disk Volume 5 (USA) (SCUS-94224)"
   metadata:
     genre: "** DEMO **"
 SCUS-94957:
-  name: "Interactive CD Sampler Pack Volume 2 (USA)"
+  name: "Interactive CD Sampler Pack Volume 2"
+  saveName: "Interactive CD Sampler Pack Volume 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
   metadata:
     genre: "** DEMO **"
 SCUS-94959:
-  name: "Interactive CD Sampler Pack Volume 3 (USA)"
+  name: "Interactive CD Sampler Pack Volume 3"
+  saveName: "Interactive CD Sampler Pack Volume 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
   metadata:
     genre: "** DEMO **"
 SCUS-94966:
-  name: "Interactive CD Sampler Pack Volume 3.5 (USA)"
+  name: "Interactive CD Sampler Pack Volume 3.5"
+  saveName: "Interactive CD Sampler Pack Volume 3.5 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
   metadata:
     genre: "** DEMO **"
 SCUS-94177:
-  name: "Interactive CD Sampler Pack Volume 3.5 (USA) (Rev 1) (SCUS-94177)"
+  name: "Interactive CD Sampler Pack Volume 3.5 (SCUS-94177)"
+  saveName: "Interactive CD Sampler Pack Volume 3.5 (USA) (Rev 1) (SCUS-94177)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
   metadata:
     genre: "** DEMO **"
 SCUS-94955:
-  name: "Interactive CD Sampler Volume 1 (USA)"
+  name: "Interactive CD Sampler Volume 1"
+  saveName: "Interactive CD Sampler Volume 1 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
   metadata:
     genre: "** DEMO **"
 SCUS-94956:
-  name: "Interactive CD Sampler Volume 1 (USA) (SCUS-94956)"
+  name: "Interactive CD Sampler Volume 1 (SCUS-94956)"
+  saveName: "Interactive CD Sampler Volume 1 (USA) (SCUS-94956)"
   metadata:
     genre: "** DEMO **"
 SLES-02404:
-  name: "International Cricket Captain 2000 (Europe)"
+  name: "International Cricket Captain 2000"
+  saveName: "International Cricket Captain 2000 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -78056,7 +82118,8 @@ SLES-02404:
     multitap: false
     linkCable: false
 SLES-03596:
-  name: "International Cricket Captain 2001 - Ashes Edition (Europe)"
+  name: "International Cricket Captain 2001 - Ashes Edition"
+  saveName: "International Cricket Captain 2001 - Ashes Edition (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -78074,7 +82137,8 @@ SLES-03596:
     multitap: false
     linkCable: false
 SLES-03881:
-  name: "International Cricket Captain 2002 (Europe)"
+  name: "International Cricket Captain 2002"
+  saveName: "International Cricket Captain 2002 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -78092,7 +82156,8 @@ SLES-03881:
     multitap: false
     linkCable: false
 SLES-04040:
-  name: "International Karate + (Europe)"
+  name: "International Karate +"
+  saveName: "International Karate + (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78111,7 +82176,8 @@ SLES-04040:
     multitap: false
     linkCable: false
 SLES-00099:
-  name: "International Moto X (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "International Moto X"
+  saveName: "International Moto X (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - DigitalController
     - NeGcon
@@ -78134,7 +82200,8 @@ SLES-00099:
     multitap: false
     linkCable: false
 SLPS-00433:
-  name: "International Moto-X (Japan)"
+  name: "International Moto-X"
+  saveName: "International Moto-X (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2498-gd7de578d"
@@ -78156,7 +82223,8 @@ SLPS-00433:
     multitap: false
     linkCable: false
 SLPS-02868:
-  name: "International Soccer - Excite Stage 2000 (Japan)"
+  name: "International Soccer - Excite Stage 2000"
+  saveName: "International Soccer - Excite Stage 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78175,7 +82243,8 @@ SLPS-02868:
     multitap: false
     linkCable: false
 SLES-02550:
-  name: "International Superstar Soccer (Europe) (En,De)"
+  name: "International Superstar Soccer"
+  saveName: "International Superstar Soccer (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78195,7 +82264,8 @@ SLES-02550:
     multitap: true
     linkCable: false
 SLES-03149:
-  name: "International Superstar Soccer (Europe) (Fr,Es,It)"
+  name: "International Superstar Soccer"
+  saveName: "International Superstar Soccer (Europe) (Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78216,7 +82286,8 @@ SLES-03149:
     multitap: true
     linkCable: false
 SLES-00511:
-  name: "International Superstar Soccer Deluxe (Europe)"
+  name: "International Superstar Soccer Deluxe"
+  saveName: "International Superstar Soccer Deluxe (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -78234,11 +82305,13 @@ SLES-00511:
     multitap: true
     linkCable: false
 SCPS-45294:
-  name: "International Superstar Soccer Pro '98 (Asia)"
+  name: "International Superstar Soccer Pro '98"
+  saveName: "International Superstar Soccer Pro '98 (Asia)"
   traits:
     - ForceRecompilerICache
 SLES-01218:
-  name: "International Superstar Soccer Pro '98 (Europe) (En,Fr,De,Es)"
+  name: "International Superstar Soccer Pro '98"
+  saveName: "International Superstar Soccer Pro '98 (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78262,19 +82335,22 @@ SLES-01218:
     multitap: false
     linkCable: false
 SLED-01401:
-  name: "International Superstar Soccer Pro '98 (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "International Superstar Soccer Pro '98 (Demo)"
+  saveName: "International Superstar Soccer Pro '98 (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceRecompilerICache
 SLED-01513:
-  name: "International Superstar Soccer Pro '98 (France) (Demo)"
+  name: "International Superstar Soccer Pro '98 (Demo)"
+  saveName: "International Superstar Soccer Pro '98 (France) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceRecompilerICache
 SLES-01264:
-  name: "International Superstar Soccer Pro '98 (Italy)"
+  name: "International Superstar Soccer Pro '98"
+  saveName: "International Superstar Soccer Pro '98 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78295,7 +82371,8 @@ SLES-01264:
     multitap: false
     linkCable: false
 SLUS-00674:
-  name: "International Superstar Soccer Pro '98 (USA) (En,Fr,De,Es,It)"
+  name: "International Superstar Soccer Pro '98"
+  saveName: "International Superstar Soccer Pro '98 (USA) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78320,7 +82397,8 @@ SLUS-00674:
     multitap: false
     linkCable: false
 SLES-00559:
-  name: "International Superstar Soccer Pro (Europe)"
+  name: "International Superstar Soccer Pro"
+  saveName: "International Superstar Soccer Pro (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -78338,7 +82416,8 @@ SLES-00559:
     multitap: false
     linkCable: false
 SLED-00796:
-  name: "International Superstar Soccer Pro (Europe) (Demo)"
+  name: "International Superstar Soccer Pro (Demo)"
+  saveName: "International Superstar Soccer Pro (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45197:
@@ -78360,7 +82439,8 @@ SCPS-45197:
     multitap: true
     linkCable: false
 SLES-00333:
-  name: "International Track & Field (Europe)"
+  name: "International Track & Field"
+  saveName: "International Track & Field (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -78378,7 +82458,8 @@ SLES-00333:
     multitap: true
     linkCable: false
 SLUS-00238:
-  name: "International Track & Field (USA)"
+  name: "International Track & Field"
+  saveName: "International Track & Field (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -78396,7 +82477,8 @@ SLUS-00238:
     multitap: true
     linkCable: false
 SLES-02448:
-  name: "International Track & Field 2 (Europe)"
+  name: "International Track & Field 2"
+  saveName: "International Track & Field 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78415,7 +82497,8 @@ SLES-02448:
     multitap: true
     linkCable: false
 SLUS-00987:
-  name: "International Track & Field 2000 (USA)"
+  name: "International Track & Field 2000"
+  saveName: "International Track & Field 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78434,7 +82517,8 @@ SLUS-00987:
     multitap: true
     linkCable: false
 SLES-01935:
-  name: "Interplay Sports Baseball 2000 (Europe)"
+  name: "Interplay Sports Baseball 2000"
+  saveName: "Interplay Sports Baseball 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78453,7 +82537,8 @@ SLES-01935:
     multitap: false
     linkCable: false
 SLUS-00850:
-  name: "Interplay Sports Baseball 2000 (USA)"
+  name: "Interplay Sports Baseball 2000"
+  saveName: "Interplay Sports Baseball 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78472,7 +82557,8 @@ SLUS-00850:
     multitap: false
     linkCable: false
 SLPS-03374:
-  name: "Inuyasha (Japan)"
+  name: "Inuyasha"
+  saveName: "Inuyasha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78491,7 +82577,8 @@ SLPS-03374:
     multitap: false
     linkCable: false
 SLPS-03361:
-  name: "Inuyasha (Japan) (Shokai Seisanban)"
+  name: "Inuyasha (Shokai Seisanban)"
+  saveName: "Inuyasha (Japan) (Shokai Seisanban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78510,7 +82597,8 @@ SLPS-03361:
     multitap: false
     linkCable: false
 SLUS-01534:
-  name: "Inuyasha - A Feudal Fairy Tale (USA)"
+  name: "Inuyasha - A Feudal Fairy Tale"
+  saveName: "Inuyasha - A Feudal Fairy Tale (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78529,7 +82617,8 @@ SLUS-01534:
     multitap: false
     linkCable: false
 SLPS-03503:
-  name: "Inuyasha - Sengoku Otogi Gassen (Japan)"
+  name: "Inuyasha - Sengoku Otogi Gassen"
+  saveName: "Inuyasha - Sengoku Otogi Gassen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78567,7 +82656,8 @@ SLPS-03504:
     multitap: false
     linkCable: false
 SLES-00443:
-  name: "Invasion (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Invasion"
+  saveName: "Invasion (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78591,7 +82681,8 @@ SLES-00443:
     multitap: false
     linkCable: false
 SLES-01573:
-  name: "Invasion Vient de l'Espace, L' (France)"
+  name: "Invasion Vient de l'Espace, L'"
+  saveName: "Invasion Vient de l'Espace, L' (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78610,7 +82701,8 @@ SLES-01573:
     multitap: false
     linkCable: false
 SLUS-00709:
-  name: "Invasion from Beyond (USA)"
+  name: "Invasion from Beyond"
+  saveName: "Invasion from Beyond (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -78632,7 +82724,8 @@ SLUS-00709:
     multitap: false
     linkCable: false
 SLPS-00551:
-  name: "Ippatsu Gyakuten - Gamble King Densetsu (Japan)"
+  name: "Ippatsu Gyakuten - Gamble King Densetsu"
+  saveName: "Ippatsu Gyakuten - Gamble King Densetsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -78650,7 +82743,8 @@ SLPS-00551:
     multitap: false
     linkCable: false
 SLPS-00341:
-  name: "Irem Arcade Classics (Japan)"
+  name: "Irem Arcade Classics"
+  saveName: "Irem Arcade Classics (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -78670,7 +82764,8 @@ SLPS-00341:
     multitap: false
     linkCable: false
 SLES-00281:
-  name: "Iron Man & X-O Manowar in Heavy Metal (Europe) (En,Fr,De)"
+  name: "Iron Man & X-O Manowar in Heavy Metal"
+  saveName: "Iron Man & X-O Manowar in Heavy Metal (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -78690,7 +82785,8 @@ SLES-00281:
     multitap: false
     linkCable: false
 SLPS-00455:
-  name: "Iron Man & X-O Manowar in Heavy Metal (Japan)"
+  name: "Iron Man & X-O Manowar in Heavy Metal"
+  saveName: "Iron Man & X-O Manowar in Heavy Metal (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -78708,7 +82804,8 @@ SLPS-00455:
     multitap: false
     linkCable: false
 SLUS-00235:
-  name: "Iron Man & X-O Manowar in Heavy Metal (USA)"
+  name: "Iron Man & X-O Manowar in Heavy Metal"
+  saveName: "Iron Man & X-O Manowar in Heavy Metal (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -78729,7 +82826,8 @@ SLUS-00235:
     multitap: false
     linkCable: false
 SLES-03250:
-  name: "Iron Soldier 3 (Europe) (En,Fr,De)"
+  name: "Iron Soldier 3"
+  saveName: "Iron Soldier 3 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78750,7 +82848,8 @@ SLES-03250:
     multitap: false
     linkCable: false
 SLUS-01061:
-  name: "Iron Soldier 3 (USA)"
+  name: "Iron Soldier 3"
+  saveName: "Iron Soldier 3 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78769,7 +82868,8 @@ SLUS-01061:
     multitap: false
     linkCable: false
 SLUS-00775:
-  name: "Irritating Stick (USA)"
+  name: "Irritating Stick"
+  saveName: "Irritating Stick (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -78792,7 +82892,8 @@ SLUS-00775:
     multitap: false
     linkCable: false
 SLPS-01158:
-  name: "Ishin no Arashi (Japan)"
+  name: "Ishin no Arashi"
+  saveName: "Ishin no Arashi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -78810,7 +82911,8 @@ SLPS-01158:
     multitap: false
     linkCable: false
 SLPM-86144:
-  name: "Ishin no Arashi - Bakumatsu Shishiden (Japan)"
+  name: "Ishin no Arashi - Bakumatsu Shishiden"
+  saveName: "Ishin no Arashi - Bakumatsu Shishiden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78906,7 +83008,8 @@ SLPM-86235:
     multitap: false
     linkCable: false
 SLPM-86120:
-  name: "Itadaki Street - Gorgeous King (Japan)"
+  name: "Itadaki Street - Gorgeous King"
+  saveName: "Itadaki Street - Gorgeous King (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -78924,11 +83027,13 @@ SLPM-86120:
     multitap: true
     linkCable: false
 SLPM-80287:
-  name: "Itadaki Street - Gorgeous King (Japan) (Demo)"
+  name: "Itadaki Street - Gorgeous King (Demo)"
+  saveName: "Itadaki Street - Gorgeous King (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86089:
-  name: "Itadaki Street - Gorgeous King (Japan) (Disc 2) (Demo)"
+  name: "Itadaki Street - Gorgeous King (Disc 2) (Demo)"
+  saveName: "Itadaki Street - Gorgeous King (Japan) (Disc 2) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -78946,7 +83051,8 @@ SLPM-86089:
     multitap: false
     linkCable: false
 SLES-03489:
-  name: "Italian Job, The (Europe)"
+  name: "Italian Job, The"
+  saveName: "Italian Job, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78967,7 +83073,8 @@ SLES-03489:
     multitap: false
     linkCable: false
 SLES-03626:
-  name: "Italian Job, The (Europe) (Fr,De,Es)"
+  name: "Italian Job, The"
+  saveName: "Italian Job, The (Europe) (Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -78990,7 +83097,8 @@ SLES-03626:
     multitap: false
     linkCable: false
 SLES-03648:
-  name: "Italian Job, The (Italy)"
+  name: "Italian Job, The"
+  saveName: "Italian Job, The (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79011,11 +83119,13 @@ SLES-03648:
     multitap: false
     linkCable: false
 SLED-03679:
-  name: "Italian Job, The (UK) (Demo)"
+  name: "Italian Job, The (Demo)"
+  saveName: "Italian Job, The (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01457:
-  name: "Italian Job, The (USA)"
+  name: "Italian Job, The"
+  saveName: "Italian Job, The (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79035,7 +83145,8 @@ SLUS-01457:
     multitap: false
     linkCable: false
 SLPS-01982:
-  name: "Itsuka, Kasanariau Ashita e - Sayuri Hen (Japan)"
+  name: "Itsuka, Kasanariau Ashita e - Sayuri Hen"
+  saveName: "Itsuka, Kasanariau Ashita e - Sayuri Hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79054,7 +83165,8 @@ SLPS-01982:
     multitap: false
     linkCable: false
 SLPS-01957:
-  name: "Itsuka, Kasanariau Ashita e - Shirou Hen (Japan)"
+  name: "Itsuka, Kasanariau Ashita e - Shirou Hen"
+  saveName: "Itsuka, Kasanariau Ashita e - Shirou Hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79073,7 +83185,8 @@ SLPS-01957:
     multitap: false
     linkCable: false
 SLPS-00832:
-  name: "Iwatobi Penguin Rocky x Hopper (Japan)"
+  name: "Iwatobi Penguin Rocky x Hopper"
+  saveName: "Iwatobi Penguin Rocky x Hopper (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -79094,11 +83207,13 @@ SLPS-00832:
     multitap: true
     linkCable: false
 SLPM-80105:
-  name: "Iwatobi Penguin Rocky x Hopper (Japan) (Demo)"
+  name: "Iwatobi Penguin Rocky x Hopper (Demo)"
+  saveName: "Iwatobi Penguin Rocky x Hopper (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01283:
-  name: "Iwatobi Penguin Rocky x Hopper 2 - Tantei Monogatari (Japan)"
+  name: "Iwatobi Penguin Rocky x Hopper 2 - Tantei Monogatari"
+  saveName: "Iwatobi Penguin Rocky x Hopper 2 - Tantei Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79116,7 +83231,8 @@ SLPS-01283:
     multitap: true
     linkCable: false
 SLES-00480:
-  name: "Iznogoud (Europe) (En,Fr,De,It,Nl)"
+  name: "Iznogoud"
+  saveName: "Iznogoud (Europe) (En,Fr,De,It,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -79138,7 +83254,8 @@ SLES-00480:
     multitap: false
     linkCable: false
 SCPS-10141:
-  name: "i-mode mo Issho - Doko Demo Issho Tsuika Disc (Japan)"
+  name: "i-mode mo Issho - Doko Demo Issho Tsuika Disc"
+  saveName: "i-mode mo Issho - Doko Demo Issho Tsuika Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79161,7 +83278,8 @@ SCPS-10141:
     multitap: false
     linkCable: false
 SLPS-01868:
-  name: "iS - Internal Section (Japan)"
+  name: "iS - Internal Section"
+  saveName: "iS - Internal Section (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79180,7 +83298,8 @@ SLPS-01868:
     multitap: false
     linkCable: false
 SLPS-01007:
-  name: "J's Racin' (Japan)"
+  name: "J's Racin'"
+  saveName: "J's Racin' (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -79199,7 +83318,8 @@ SLPS-01007:
     multitap: false
     linkCable: false
 SLPS-00144:
-  name: "J. B. Harold - Blue Chicago Blues (Japan) (Disc 1)"
+  name: "J. B. Harold - Blue Chicago Blues (Disc 1)"
+  saveName: "J. B. Harold - Blue Chicago Blues (Japan) (Disc 1)"
   discSet:
     name: "J. B. Harold - Blue Chicago Blues (Japan)"
     serials:
@@ -79225,7 +83345,8 @@ SLPS-00144:
     multitap: false
     linkCable: false
 SLPS-00145:
-  name: "J. B. Harold - Blue Chicago Blues (Japan) (Disc 2)"
+  name: "J. B. Harold - Blue Chicago Blues (Disc 2)"
+  saveName: "J. B. Harold - Blue Chicago Blues (Japan) (Disc 2)"
   discSet:
     name: "J. B. Harold - Blue Chicago Blues (Japan)"
     serials:
@@ -79251,7 +83372,8 @@ SLPS-00145:
     multitap: false
     linkCable: false
 SLPM-86010:
-  name: "J.League Jikkyou Winning Eleven '97 (Japan)"
+  name: "J.League Jikkyou Winning Eleven '97"
+  saveName: "J.League Jikkyou Winning Eleven '97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79269,7 +83391,8 @@ SLPM-86010:
     multitap: false
     linkCable: false
 SLPM-86154:
-  name: "J.League Jikkyou Winning Eleven '98-'99 (Japan)"
+  name: "J.League Jikkyou Winning Eleven '98-'99"
+  saveName: "J.League Jikkyou Winning Eleven '98-'99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79288,7 +83411,8 @@ SLPM-86154:
     multitap: false
     linkCable: false
 SLPS-00068:
-  name: "J.League Jikkyou Winning Eleven (Japan)"
+  name: "J.League Jikkyou Winning Eleven"
+  saveName: "J.League Jikkyou Winning Eleven (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79306,7 +83430,8 @@ SLPS-00068:
     multitap: false
     linkCable: false
 SLPM-86538:
-  name: "J.League Jikkyou Winning Eleven 2000 (Japan)"
+  name: "J.League Jikkyou Winning Eleven 2000"
+  saveName: "J.League Jikkyou Winning Eleven 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79325,7 +83450,8 @@ SLPM-86538:
     multitap: true
     linkCable: false
 SLPM-86668:
-  name: "J.League Jikkyou Winning Eleven 2000 2nd (Japan)"
+  name: "J.League Jikkyou Winning Eleven 2000 2nd"
+  saveName: "J.League Jikkyou Winning Eleven 2000 2nd (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79344,7 +83470,8 @@ SLPM-86668:
     multitap: true
     linkCable: false
 SLPM-86835:
-  name: "J.League Jikkyou Winning Eleven 2001 (Japan)"
+  name: "J.League Jikkyou Winning Eleven 2001"
+  saveName: "J.League Jikkyou Winning Eleven 2001 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79363,7 +83490,8 @@ SLPM-86835:
     multitap: true
     linkCable: false
 SLPM-86055:
-  name: "J.League Jikkyou Winning Eleven 3 (Japan)"
+  name: "J.League Jikkyou Winning Eleven 3"
+  saveName: "J.League Jikkyou Winning Eleven 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79382,7 +83510,8 @@ SLPM-86055:
     multitap: false
     linkCable: false
 SLPS-02436:
-  name: "J.League Soccer - Jikkyou Survival League (Japan)"
+  name: "J.League Soccer - Jikkyou Survival League"
+  saveName: "J.League Soccer - Jikkyou Survival League (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79401,7 +83530,8 @@ SLPS-02436:
     multitap: false
     linkCable: false
 SLPS-00079:
-  name: "J.League Soccer - Prime Goal EX (Japan)"
+  name: "J.League Soccer - Prime Goal EX"
+  saveName: "J.League Soccer - Prime Goal EX (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -79420,7 +83550,8 @@ SLPS-00079:
     multitap: false
     linkCable: false
 SLPS-00301:
-  name: "J.League Virtual Stadium '96 (Japan)"
+  name: "J.League Virtual Stadium '96"
+  saveName: "J.League Virtual Stadium '96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79438,7 +83569,8 @@ SLPS-00301:
     multitap: true
     linkCable: false
 SLPS-01428:
-  name: "JGTC - All Japan Grand Touring Car Championship (Japan)"
+  name: "JGTC - All Japan Grand Touring Car Championship"
+  saveName: "JGTC - All Japan Grand Touring Car Championship (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79458,7 +83590,8 @@ SLPS-01428:
     multitap: false
     linkCable: false
 SCES-01444:
-  name: "Jackie Chan Stuntmaster (Europe)"
+  name: "Jackie Chan Stuntmaster"
+  saveName: "Jackie Chan Stuntmaster (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79478,7 +83611,8 @@ SCES-01444:
     multitap: false
     linkCable: false
 SLUS-00684:
-  name: "Jackie Chan Stuntmaster (USA)"
+  name: "Jackie Chan Stuntmaster"
+  saveName: "Jackie Chan Stuntmaster (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -79499,7 +83633,8 @@ SLUS-00684:
     multitap: false
     linkCable: false
 SLES-02203:
-  name: "Jade Cocoon - Die Tamamayu Legende (Germany)"
+  name: "Jade Cocoon - Die Tamamayu Legende"
+  saveName: "Jade Cocoon - Die Tamamayu Legende (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79518,7 +83653,8 @@ SLES-02203:
     multitap: false
     linkCable: false
 SLES-02206:
-  name: "Jade Cocoon - La Leggenda del Tamamayu (Italy)"
+  name: "Jade Cocoon - La Leggenda del Tamamayu"
+  saveName: "Jade Cocoon - La Leggenda del Tamamayu (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79537,7 +83673,8 @@ SLES-02206:
     multitap: false
     linkCable: false
 SLES-02205:
-  name: "Jade Cocoon - La Leyenda de Tamamayu (Spain)"
+  name: "Jade Cocoon - La Leyenda de Tamamayu"
+  saveName: "Jade Cocoon - La Leyenda de Tamamayu (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79556,7 +83693,8 @@ SLES-02205:
     multitap: false
     linkCable: false
 SLES-02201:
-  name: "Jade Cocoon - Story of the Tamamayu (Europe)"
+  name: "Jade Cocoon - Story of the Tamamayu"
+  saveName: "Jade Cocoon - Story of the Tamamayu (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79575,7 +83713,8 @@ SLES-02201:
     multitap: false
     linkCable: false
 SLES-02202:
-  name: "Jade Cocoon - Story of the Tamamayu (France)"
+  name: "Jade Cocoon - Story of the Tamamayu"
+  saveName: "Jade Cocoon - Story of the Tamamayu (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79594,7 +83733,8 @@ SLES-02202:
     multitap: false
     linkCable: false
 SLUS-00854:
-  name: "Jade Cocoon - Story of the Tamamayu (USA)"
+  name: "Jade Cocoon - Story of the Tamamayu"
+  saveName: "Jade Cocoon - Story of the Tamamayu (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -79616,11 +83756,13 @@ SLUS-00854:
     multitap: false
     linkCable: false
 SLUS-90054:
-  name: "Jade Cocoon - Story of the Tamamayu (USA) (Demo)"
+  name: "Jade Cocoon - Story of the Tamamayu (Demo)"
+  saveName: "Jade Cocoon - Story of the Tamamayu (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02076:
-  name: "JailBreaker (Japan) (Disc 1)"
+  name: "JailBreaker (Disc 1)"
+  saveName: "JailBreaker (Japan) (Disc 1)"
   discSet:
     name: "JailBreaker (Japan)"
     serials:
@@ -79644,7 +83786,8 @@ SLPS-02076:
     multitap: false
     linkCable: false
 SLPS-02077:
-  name: "JailBreaker (Japan) (Disc 2)"
+  name: "JailBreaker (Disc 2)"
+  saveName: "JailBreaker (Japan) (Disc 2)"
   discSet:
     name: "JailBreaker (Japan)"
     serials:
@@ -79668,7 +83811,8 @@ SLPS-02077:
     multitap: false
     linkCable: false
 SLPS-03562:
-  name: "Jaleco Collection Vol. 1 (Japan)"
+  name: "Jaleco Collection Vol. 1"
+  saveName: "Jaleco Collection Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79686,13 +83830,17 @@ SLPS-03562:
     multitap: false
     linkCable: false
 SLPM-80276:
-  name: "Jaleco Taikenban Special (Japan)"
+  name: "Jaleco Taikenban Special"
+  saveName: "Jaleco Taikenban Special (Japan)"
 SCUS-94176:
-  name: "Jampack Vol. 1 (USA)"
+  name: "Jampack Vol. 1"
+  saveName: "Jampack Vol. 1 (USA)"
 SCUS-94197:
-  name: "Jampack Vol. 2 (USA)"
+  name: "Jampack Vol. 2"
+  saveName: "Jampack Vol. 2 (USA)"
 SLPS-01134:
-  name: "Jan Jan Koi Shimasho - Lovely Pop 2 in 1 (Japan)"
+  name: "Jan Jan Koi Shimasho - Lovely Pop 2 in 1"
+  saveName: "Jan Jan Koi Shimasho - Lovely Pop 2 in 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79710,7 +83858,8 @@ SLPS-01134:
     multitap: false
     linkCable: false
 SLPS-02708:
-  name: "Jang Jang Koi Shimashow Separate 1 - Jang Jang Shimashow (Japan)"
+  name: "Jang Jang Koi Shimashow Separate 1 - Jang Jang Shimashow"
+  saveName: "Jang Jang Koi Shimashow Separate 1 - Jang Jang Shimashow (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79728,7 +83877,8 @@ SLPS-02708:
     multitap: false
     linkCable: false
 SLPS-02709:
-  name: "Jang Jang Koi Shimashow Separate 2 - Koi Koi Shimashow (Japan)"
+  name: "Jang Jang Koi Shimashow Separate 2 - Koi Koi Shimashow"
+  saveName: "Jang Jang Koi Shimashow Separate 2 - Koi Koi Shimashow (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -79746,7 +83896,8 @@ SLPS-02709:
     multitap: false
     linkCable: false
 SLPS-01760:
-  name: "Janhai Yuugi '99 - Tanuki no Kawazanyou (Japan)"
+  name: "Janhai Yuugi '99 - Tanuki no Kawazanyou"
+  saveName: "Janhai Yuugi '99 - Tanuki no Kawazanyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79768,7 +83919,8 @@ SLPS-01760:
     multitap: false
     linkCable: false
 SLUS-01139:
-  name: "Jarrett & Labonte Stock Car Racing (USA)"
+  name: "Jarrett & Labonte Stock Car Racing"
+  saveName: "Jarrett & Labonte Stock Car Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1915-gf071497b"
@@ -79791,7 +83943,8 @@ SLUS-01139:
     multitap: true
     linkCable: false
 SLES-01983:
-  name: "Jeff Wayne's La Guerre des Mondes (France)"
+  name: "Jeff Wayne's La Guerre des Mondes"
+  saveName: "Jeff Wayne's La Guerre des Mondes (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79810,7 +83963,8 @@ SLES-01983:
     multitap: false
     linkCable: false
 SLES-00230:
-  name: "Jeff Wayne's The War of the Worlds (Europe)"
+  name: "Jeff Wayne's The War of the Worlds"
+  saveName: "Jeff Wayne's The War of the Worlds (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79829,7 +83983,8 @@ SLES-00230:
     multitap: false
     linkCable: false
 SLES-01984:
-  name: "Jeff Wayne's The War of the Worlds (Germany)"
+  name: "Jeff Wayne's The War of the Worlds"
+  saveName: "Jeff Wayne's The War of the Worlds (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79848,7 +84003,8 @@ SLES-01984:
     multitap: false
     linkCable: false
 SLES-01985:
-  name: "Jeff Wayne's The War of the Worlds (Italy)"
+  name: "Jeff Wayne's The War of the Worlds"
+  saveName: "Jeff Wayne's The War of the Worlds (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79867,7 +84023,8 @@ SLES-01985:
     multitap: false
     linkCable: false
 SLES-01986:
-  name: "Jeff Wayne's The War of the Worlds (Spain)"
+  name: "Jeff Wayne's The War of the Worlds"
+  saveName: "Jeff Wayne's The War of the Worlds (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79886,7 +84043,8 @@ SLES-01986:
     multitap: false
     linkCable: false
 SLPS-02892:
-  name: "Jellyfish - The Healing Friend (Japan)"
+  name: "Jellyfish - The Healing Friend"
+  saveName: "Jellyfish - The Healing Friend (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79924,7 +84082,8 @@ SLPS-03288:
     multitap: false
     linkCable: false
 SLUS-00682:
-  name: "Jeopardy! (USA)"
+  name: "Jeopardy!"
+  saveName: "Jeopardy! (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79943,7 +84102,8 @@ SLUS-00682:
     multitap: true
     linkCable: false
 SLUS-01173:
-  name: "Jeopardy! 2nd Edition (USA)"
+  name: "Jeopardy! 2nd Edition"
+  saveName: "Jeopardy! 2nd Edition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -79962,7 +84122,8 @@ SLUS-01173:
     multitap: true
     linkCable: false
 SLES-01981:
-  name: "Jeremy McGrath Supercross 2000 (Europe) (En,Fr,De)"
+  name: "Jeremy McGrath Supercross 2000"
+  saveName: "Jeremy McGrath Supercross 2000 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -79985,7 +84146,8 @@ SLES-01981:
     multitap: false
     linkCable: false
 SLUS-00832:
-  name: "Jeremy McGrath Supercross 2000 (USA)"
+  name: "Jeremy McGrath Supercross 2000"
+  saveName: "Jeremy McGrath Supercross 2000 (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -80006,7 +84168,8 @@ SLUS-00832:
     multitap: false
     linkCable: false
 SLES-01281:
-  name: "Jeremy McGrath Supercross 98 (Europe)"
+  name: "Jeremy McGrath Supercross 98"
+  saveName: "Jeremy McGrath Supercross 98 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80026,7 +84189,8 @@ SLES-01281:
     multitap: false
     linkCable: false
 SLPM-86306:
-  name: "Jeremy McGrath Supercross 98 (Japan)"
+  name: "Jeremy McGrath Supercross 98"
+  saveName: "Jeremy McGrath Supercross 98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80046,7 +84210,8 @@ SLPM-86306:
     multitap: false
     linkCable: false
 SLUS-00479:
-  name: "Jeremy McGrath Supercross 98 (USA)"
+  name: "Jeremy McGrath Supercross 98"
+  saveName: "Jeremy McGrath Supercross 98 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80066,7 +84231,8 @@ SLUS-00479:
     multitap: false
     linkCable: false
 SLES-00598:
-  name: "Jersey Devil (Europe) (En,Fr,De)"
+  name: "Jersey Devil"
+  saveName: "Jersey Devil (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80087,7 +84253,8 @@ SLES-00598:
     multitap: false
     linkCable: false
 SCUS-94907:
-  name: "Jersey Devil (USA)"
+  name: "Jersey Devil"
+  saveName: "Jersey Devil (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -80109,7 +84276,8 @@ SCUS-94907:
     multitap: false
     linkCable: false
 SLPM-86075:
-  name: "Jersey Devil no Daibouken (Japan)"
+  name: "Jersey Devil no Daibouken"
+  saveName: "Jersey Devil no Daibouken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80128,7 +84296,8 @@ SLPM-86075:
     multitap: false
     linkCable: false
 SLES-04125:
-  name: "Jet Ace (Europe)"
+  name: "Jet Ace"
+  saveName: "Jet Ace (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80147,7 +84316,8 @@ SLES-04125:
     multitap: false
     linkCable: false
 SLPM-86894:
-  name: "Jet Copter X (Japan)"
+  name: "Jet Copter X"
+  saveName: "Jet Copter X (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80166,7 +84336,8 @@ SLPM-86894:
     multitap: false
     linkCable: false
 SCPS-10063:
-  name: "Jet Moto '98 (Japan)"
+  name: "Jet Moto '98"
+  saveName: "Jet Moto '98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80186,7 +84357,8 @@ SCPS-10063:
     multitap: false
     linkCable: false
 SCUS-94309:
-  name: "Jet Moto (USA)"
+  name: "Jet Moto"
+  saveName: "Jet Moto (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -80210,7 +84382,8 @@ SCUS-94309:
     multitap: false
     linkCable: false
 SCUS-94167:
-  name: "Jet Moto 2 (USA)"
+  name: "Jet Moto 2"
+  saveName: "Jet Moto 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -80233,7 +84406,8 @@ SCUS-94167:
     multitap: false
     linkCable: false
 SCUS-94555:
-  name: "Jet Moto 3 (USA)"
+  name: "Jet Moto 3"
+  saveName: "Jet Moto 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -80256,11 +84430,13 @@ SCUS-94555:
     multitap: false
     linkCable: false
 SCUS-94384:
-  name: "Jet Moto 3 (USA) (Demo)"
+  name: "Jet Moto 3 (Demo)"
+  saveName: "Jet Moto 3 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00566:
-  name: "Jet Rider (Europe)"
+  name: "Jet Rider"
+  saveName: "Jet Rider (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -80279,7 +84455,8 @@ SCES-00566:
     multitap: false
     linkCable: false
 SCES-01045:
-  name: "Jet Rider 2 (Europe)"
+  name: "Jet Rider 2"
+  saveName: "Jet Rider 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80299,7 +84476,8 @@ SCES-01045:
     multitap: false
     linkCable: false
 SLPM-86323:
-  name: "Jet de Go! Let's Go by Airliner (Japan)"
+  name: "Jet de Go! Let's Go by Airliner"
+  saveName: "Jet de Go! Let's Go by Airliner (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -80323,11 +84501,13 @@ SLPM-86323:
     multitap: false
     linkCable: false
 SLPM-80515:
-  name: "Jet de Go! Let's Go by Airliner (Japan) (Demo)"
+  name: "Jet de Go! Let's Go by Airliner (Demo)"
+  saveName: "Jet de Go! Let's Go by Airliner (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86324:
-  name: "Jet de Go! Let's Go by Airliner (Japan) (JAL Kinai Hanbai Gentei)"
+  name: "Jet de Go! Let's Go by Airliner (JAL Kinai Hanbai Gentei)"
+  saveName: "Jet de Go! Let's Go by Airliner (Japan) (JAL Kinai Hanbai Gentei)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80365,7 +84545,8 @@ SCPS-45435:
     multitap: false
     linkCable: false
 PCPX-96080:
-  name: "JetMoto (Japan)"
+  name: "JetMoto"
+  saveName: "JetMoto (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -80387,7 +84568,8 @@ PCPX-96080:
     multitap: false
     linkCable: false
 SLES-03328:
-  name: "Jetracer (Europe) (En,Fr,De)"
+  name: "Jetracer"
+  saveName: "Jetracer (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80408,7 +84590,8 @@ SLES-03328:
     multitap: true
     linkCable: false
 SLPS-00589:
-  name: "Jewel Bem Hunter Lime with Paint Maker (Japan)"
+  name: "Jewel Bem Hunter Lime with Paint Maker"
+  saveName: "Jewel Bem Hunter Lime with Paint Maker (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80426,7 +84609,8 @@ SLPS-00589:
     multitap: false
     linkCable: false
 SLPS-00802:
-  name: "Jigoku Sensei Nube (Japan)"
+  name: "Jigoku Sensei Nube"
+  saveName: "Jigoku Sensei Nube (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80444,7 +84628,8 @@ SLPS-00802:
     multitap: false
     linkCable: false
 SLPS-00473:
-  name: "Jigsaw Island - Japan Graffiti (Japan)"
+  name: "Jigsaw Island - Japan Graffiti"
+  saveName: "Jigsaw Island - Japan Graffiti (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80462,7 +84647,8 @@ SLPS-00473:
     multitap: false
     linkCable: false
 SLPM-86918:
-  name: "Jigsaw Island - Japan Graffiti (Japan) (Major Wave)"
+  name: "Jigsaw Island - Japan Graffiti (Major Wave)"
+  saveName: "Jigsaw Island - Japan Graffiti (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -80480,7 +84666,8 @@ SLPM-86918:
     multitap: false
     linkCable: false
 SLES-04089:
-  name: "Jigsaw Madness (Europe) (En,Fr,De,Es,It)"
+  name: "Jigsaw Madness"
+  saveName: "Jigsaw Madness (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80503,7 +84690,8 @@ SLES-04089:
     multitap: false
     linkCable: false
 SLUS-01509:
-  name: "Jigsaw Madness (USA)"
+  name: "Jigsaw Madness"
+  saveName: "Jigsaw Madness (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80522,7 +84710,8 @@ SLUS-01509:
     multitap: false
     linkCable: false
 SLPS-00028:
-  name: "Jigsaw World (Japan)"
+  name: "Jigsaw World"
+  saveName: "Jigsaw World (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80541,7 +84730,8 @@ SLPS-00028:
     multitap: false
     linkCable: false
 SLPS-02251:
-  name: "Jigsaw World (Japan) (Honkakuha de 1300)"
+  name: "Jigsaw World (Honkakuha de 1300)"
+  saveName: "Jigsaw World (Japan) (Honkakuha de 1300)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80560,7 +84750,8 @@ SLPS-02251:
     multitap: false
     linkCable: false
 SLPS-01538:
-  name: "Jikki Pachi-Slot Tettei Kouryaku - Speed-CR Kinkakuji 3 (Japan)"
+  name: "Jikki Pachi-Slot Tettei Kouryaku - Speed-CR Kinkakuji 3"
+  saveName: "Jikki Pachi-Slot Tettei Kouryaku - Speed-CR Kinkakuji 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80578,7 +84769,8 @@ SLPS-01538:
     multitap: false
     linkCable: false
 SLPS-01339:
-  name: "Jikki Pachi-Slot Tettei Kouryaku - Yamasa Collection (Japan)"
+  name: "Jikki Pachi-Slot Tettei Kouryaku - Yamasa Collection"
+  saveName: "Jikki Pachi-Slot Tettei Kouryaku - Yamasa Collection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80596,7 +84788,8 @@ SLPS-01339:
     multitap: false
     linkCable: false
 SLPM-86046:
-  name: "Jikkyou American Baseball (Japan)"
+  name: "Jikkyou American Baseball"
+  saveName: "Jikkyou American Baseball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80614,7 +84807,8 @@ SLPM-86046:
     multitap: false
     linkCable: false
 SLPM-86119:
-  name: "Jikkyou American Baseball 2 (Japan)"
+  name: "Jikkyou American Baseball 2"
+  saveName: "Jikkyou American Baseball 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80632,7 +84826,8 @@ SLPM-86119:
     multitap: false
     linkCable: false
 SLPM-86464:
-  name: "Jikkyou Golf Master 2000 (Japan)"
+  name: "Jikkyou Golf Master 2000"
+  saveName: "Jikkyou Golf Master 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80651,7 +84846,8 @@ SLPM-86464:
     multitap: true
     linkCable: false
 SLPM-86736:
-  name: "Jikkyou Golf Master 2000 (Japan) (Rev 1)"
+  name: "Jikkyou Golf Master 2000"
+  saveName: "Jikkyou Golf Master 2000 (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80670,7 +84866,8 @@ SLPM-86736:
     multitap: true
     linkCable: false
 SLPM-86317:
-  name: "Jikkyou J.League 1999 - Perfect Striker (Japan)"
+  name: "Jikkyou J.League 1999 - Perfect Striker"
+  saveName: "Jikkyou J.League 1999 - Perfect Striker (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80689,7 +84886,8 @@ SLPM-86317:
     multitap: true
     linkCable: false
 SLPM-86316:
-  name: "Jikkyou Kyousouba Ikusei Simulation Game - Breeding Stud '99 (Japan)"
+  name: "Jikkyou Kyousouba Ikusei Simulation Game - Breeding Stud '99"
+  saveName: "Jikkyou Kyousouba Ikusei Simulation Game - Breeding Stud '99 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80707,7 +84905,8 @@ SLPM-86316:
     multitap: false
     linkCable: false
 SLPM-86008:
-  name: "Jikkyou Oshaberi Parodius - Forever with Me (Japan)"
+  name: "Jikkyou Oshaberi Parodius - Forever with Me"
+  saveName: "Jikkyou Oshaberi Parodius - Forever with Me (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -80727,7 +84926,8 @@ SLPM-86008:
     multitap: false
     linkCable: false
 SLPS-00016:
-  name: "Jikkyou Powerful Pro Yakyuu '95 (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '95"
+  saveName: "Jikkyou Powerful Pro Yakyuu '95 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80745,7 +84945,8 @@ SLPS-00016:
     multitap: false
     linkCable: false
 SLPS-00067:
-  name: "Jikkyou Powerful Pro Yakyuu '95 - Kaimakuban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '95 - Kaimakuban"
+  saveName: "Jikkyou Powerful Pro Yakyuu '95 - Kaimakuban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80763,7 +84964,8 @@ SLPS-00067:
     multitap: false
     linkCable: false
 SLPM-86024:
-  name: "Jikkyou Powerful Pro Yakyuu '97 - Kaimakuban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '97 - Kaimakuban"
+  saveName: "Jikkyou Powerful Pro Yakyuu '97 - Kaimakuban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -80781,7 +84983,8 @@ SLPM-86024:
     multitap: false
     linkCable: false
 SLPM-86097:
-  name: "Jikkyou Powerful Pro Yakyuu '98 - Kaimakuban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '98 - Kaimakuban"
+  saveName: "Jikkyou Powerful Pro Yakyuu '98 - Kaimakuban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80800,7 +85003,8 @@ SLPM-86097:
     multitap: false
     linkCable: false
 SLPM-86149:
-  name: "Jikkyou Powerful Pro Yakyuu '98 - Ketteiban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '98 - Ketteiban"
+  saveName: "Jikkyou Powerful Pro Yakyuu '98 - Ketteiban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80819,7 +85023,8 @@ SLPM-86149:
     multitap: false
     linkCable: false
 SLPM-86253:
-  name: "Jikkyou Powerful Pro Yakyuu '99 - Kaimakuban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '99 - Kaimakuban"
+  saveName: "Jikkyou Powerful Pro Yakyuu '99 - Kaimakuban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80838,7 +85043,8 @@ SLPM-86253:
     multitap: false
     linkCable: false
 SLPM-86433:
-  name: "Jikkyou Powerful Pro Yakyuu '99 - Ketteiban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu '99 - Ketteiban"
+  saveName: "Jikkyou Powerful Pro Yakyuu '99 - Ketteiban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80857,7 +85063,8 @@ SLPM-86433:
     multitap: false
     linkCable: false
 SLPM-87216:
-  name: "Jikkyou Powerful Pro Yakyuu - Premium-ban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu - Premium-ban"
+  saveName: "Jikkyou Powerful Pro Yakyuu - Premium-ban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80876,7 +85083,8 @@ SLPM-87216:
     multitap: false
     linkCable: false
 SLPM-86578:
-  name: "Jikkyou Powerful Pro Yakyuu 2000 - Kaimakuban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu 2000 - Kaimakuban"
+  saveName: "Jikkyou Powerful Pro Yakyuu 2000 - Kaimakuban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80895,7 +85103,8 @@ SLPM-86578:
     multitap: false
     linkCable: false
 SLPM-86694:
-  name: "Jikkyou Powerful Pro Yakyuu 2000 - Ketteiban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu 2000 - Ketteiban"
+  saveName: "Jikkyou Powerful Pro Yakyuu 2000 - Ketteiban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80914,7 +85123,8 @@ SLPM-86694:
     multitap: false
     linkCable: false
 SLPM-86807:
-  name: "Jikkyou Powerful Pro Yakyuu 2001 (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu 2001"
+  saveName: "Jikkyou Powerful Pro Yakyuu 2001 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80933,7 +85143,8 @@ SLPM-86807:
     multitap: false
     linkCable: false
 SLPM-86990:
-  name: "Jikkyou Powerful Pro Yakyuu 2001 - Ketteiban (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu 2001 - Ketteiban"
+  saveName: "Jikkyou Powerful Pro Yakyuu 2001 - Ketteiban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80952,7 +85163,8 @@ SLPM-86990:
     multitap: false
     linkCable: false
 SLPM-87033:
-  name: "Jikkyou Powerful Pro Yakyuu 2002 - Haru (Japan)"
+  name: "Jikkyou Powerful Pro Yakyuu 2002 - Haru"
+  saveName: "Jikkyou Powerful Pro Yakyuu 2002 - Haru (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -80971,11 +85183,13 @@ SLPM-87033:
     multitap: false
     linkCable: false
 SLPM-80039:
-  name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Demo)"
+  name: "Jikuu Tantei DD - Maboroshi no Lorelei (Demo)"
+  saveName: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00397:
-  name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Disc 1)"
+  name: "Jikuu Tantei DD - Maboroshi no Lorelei (Disc 1)"
+  saveName: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Disc 1)"
   discSet:
     name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan)"
     serials:
@@ -80998,7 +85212,8 @@ SLPS-00397:
     multitap: false
     linkCable: false
 SLPS-00398:
-  name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Disc 2)"
+  name: "Jikuu Tantei DD - Maboroshi no Lorelei (Disc 2)"
+  saveName: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Disc 2)"
   discSet:
     name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan)"
     serials:
@@ -81021,7 +85236,8 @@ SLPS-00398:
     multitap: false
     linkCable: false
 SLPS-01533:
-  name: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Japan) (Disc 1)"
+  name: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Disc 1)"
+  saveName: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Japan) (Disc 1)"
   discSet:
     name: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Japan)"
     serials:
@@ -81044,7 +85260,8 @@ SLPS-01533:
     multitap: false
     linkCable: false
 SLPS-01534:
-  name: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Japan) (Disc 2)"
+  name: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Disc 2)"
+  saveName: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Japan) (Disc 2)"
   discSet:
     name: "Jikuu Tantei DD 2 - Hangyaku no Apusararu (Japan)"
     serials:
@@ -81067,7 +85284,8 @@ SLPS-01534:
     multitap: false
     linkCable: false
 SLES-03598:
-  name: "Jim Henson's Bear in the Big Blue House (Europe)"
+  name: "Jim Henson's Bear in the Big Blue House"
+  saveName: "Jim Henson's Bear in the Big Blue House (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81086,7 +85304,8 @@ SLES-03598:
     multitap: false
     linkCable: false
 SLUS-01524:
-  name: "Jim Henson's Bear in the Big Blue House (USA)"
+  name: "Jim Henson's Bear in the Big Blue House"
+  saveName: "Jim Henson's Bear in the Big Blue House (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81105,7 +85324,8 @@ SLUS-01524:
     multitap: false
     linkCable: false
 SCES-03755:
-  name: "Jim Henson's The Hoobs (Europe)"
+  name: "Jim Henson's The Hoobs"
+  saveName: "Jim Henson's The Hoobs (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81124,7 +85344,8 @@ SCES-03755:
     multitap: false
     linkCable: false
 SCES-03756:
-  name: "Jim Henson's The Hoobs (France)"
+  name: "Jim Henson's The Hoobs"
+  saveName: "Jim Henson's The Hoobs (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81143,7 +85364,8 @@ SCES-03756:
     multitap: false
     linkCable: false
 SCES-03757:
-  name: "Jim Henson's The Hoobs (Germany)"
+  name: "Jim Henson's The Hoobs"
+  saveName: "Jim Henson's The Hoobs (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81162,7 +85384,8 @@ SCES-03757:
     multitap: false
     linkCable: false
 SCES-03758:
-  name: "Jim Henson's The Hoobs (Spain)"
+  name: "Jim Henson's The Hoobs"
+  saveName: "Jim Henson's The Hoobs (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81181,7 +85404,8 @@ SCES-03758:
     multitap: false
     linkCable: false
 SLUS-00500:
-  name: "Jimmy Johnson's VR Football '98 (USA)"
+  name: "Jimmy Johnson's VR Football '98"
+  saveName: "Jimmy Johnson's VR Football '98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -81199,7 +85423,8 @@ SLUS-00500:
     multitap: true
     linkCable: false
 SLES-01334:
-  name: "Jimmy White's 2 - Cueball (Europe) (En,Fr,De,Es,It)"
+  name: "Jimmy White's 2 - Cueball"
+  saveName: "Jimmy White's 2 - Cueball (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81222,7 +85447,8 @@ SLES-01334:
     multitap: false
     linkCable: false
 SLUS-01313:
-  name: "Jimmy White's 2 - Cueball (USA)"
+  name: "Jimmy White's 2 - Cueball"
+  saveName: "Jimmy White's 2 - Cueball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81241,7 +85467,8 @@ SLUS-01313:
     multitap: false
     linkCable: false
 PAPX-90049:
-  name: "Jingle Cats - Love-Para Daisakusen no Maki (Japan) (Demo)"
+  name: "Jingle Cats - Love-Para Daisakusen no Maki (Demo)"
+  saveName: "Jingle Cats - Love-Para Daisakusen no Maki (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81249,7 +85476,8 @@ PAPX-90049:
   metadata:
     genre: "** DEMO **"
 SCES-03908:
-  name: "Jinx (Europe) (En,Fr,De,Es,It)"
+  name: "Jinx"
+  saveName: "Jinx (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81291,7 +85519,8 @@ SLPS-91504:
     multitap: false
     linkCable: false
 SLPS-02648:
-  name: "Jishaku de Tonjau! Phix no Daibouken (Japan)"
+  name: "Jishaku de Tonjau! Phix no Daibouken"
+  saveName: "Jishaku de Tonjau! Phix no Daibouken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81310,7 +85539,8 @@ SLPS-02648:
     multitap: false
     linkCable: false
 SLPS-00794:
-  name: "Jissen Pachi-Slot Hisshouhou! 5 (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! 5"
+  saveName: "Jissen Pachi-Slot Hisshouhou! 5 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81328,7 +85558,8 @@ SLPS-00794:
     multitap: false
     linkCable: false
 SLPS-03171:
-  name: "Jissen Pachi-Slot Hisshouhou! Disc Up (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Disc Up"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Disc Up (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81347,7 +85578,8 @@ SLPS-03171:
     multitap: false
     linkCable: false
 SLPS-01437:
-  name: "Jissen Pachi-Slot Hisshouhou! Sammy Revolution (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Sammy Revolution"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Sammy Revolution (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81365,7 +85597,8 @@ SLPS-01437:
     multitap: false
     linkCable: false
 SLPS-01936:
-  name: "Jissen Pachi-Slot Hisshouhou! Sammy Revolution 2 (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Sammy Revolution 2"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Sammy Revolution 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81384,7 +85617,8 @@ SLPS-01936:
     multitap: false
     linkCable: false
 SLPM-86333:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Epsilon R (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Epsilon R"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Epsilon R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81403,7 +85637,8 @@ SLPM-86333:
     multitap: false
     linkCable: false
 SLPM-86342:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Japan) (Disc 1) (Kamen Rider)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Disc 1) (Kamen Rider)"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Japan) (Disc 1) (Kamen Rider)"
   discSet:
     name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Japan)"
     serials:
@@ -81427,7 +85662,8 @@ SLPM-86342:
     multitap: false
     linkCable: false
 SLPM-86343:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Japan) (Disc 2) (Gallop)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Disc 2) (Gallop)"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Japan) (Disc 2) (Gallop)"
   discSet:
     name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider & Gallop (Japan)"
     serials:
@@ -81451,7 +85687,8 @@ SLPM-86343:
     multitap: false
     linkCable: false
 SLPM-86335:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider V3 (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider V3"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Kamen Rider V3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81470,7 +85707,8 @@ SLPM-86335:
     multitap: false
     linkCable: false
 SLPM-86434:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Kung-Fu Lady (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Kung-Fu Lady"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Kung-Fu Lady (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81489,7 +85727,8 @@ SLPM-86434:
     multitap: false
     linkCable: false
 SLPM-86349:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Sea Master X (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Sea Master X"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Sea Master X (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81508,7 +85747,8 @@ SLPM-86349:
     multitap: false
     linkCable: false
 SLPM-86420:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - Super Star Dust 2 (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - Super Star Dust 2"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - Super Star Dust 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81527,7 +85767,8 @@ SLPM-86420:
     multitap: false
     linkCable: false
 SLPM-86444:
-  name: "Jissen Pachi-Slot Hisshouhou! Single - The Kongdom (Japan)"
+  name: "Jissen Pachi-Slot Hisshouhou! Single - The Kongdom"
+  saveName: "Jissen Pachi-Slot Hisshouhou! Single - The Kongdom (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81546,7 +85787,8 @@ SLPM-86444:
     multitap: false
     linkCable: false
 SLPS-02727:
-  name: "Jitsumei Jikkyou Keiba - Dream Classic (Japan)"
+  name: "Jitsumei Jikkyou Keiba - Dream Classic"
+  saveName: "Jitsumei Jikkyou Keiba - Dream Classic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81564,7 +85806,8 @@ SLPS-02727:
     multitap: false
     linkCable: false
 SLES-02599:
-  name: "JoJo's Bizarre Adventure (Europe)"
+  name: "JoJo's Bizarre Adventure"
+  saveName: "JoJo's Bizarre Adventure (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81583,7 +85826,8 @@ SLES-02599:
     multitap: false
     linkCable: false
 SLUS-01060:
-  name: "JoJo's Bizarre Adventure (USA)"
+  name: "JoJo's Bizarre Adventure"
+  saveName: "JoJo's Bizarre Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81602,7 +85846,8 @@ SLUS-01060:
     multitap: false
     linkCable: false
 SLPS-00429:
-  name: "Jockey Zero (Japan)"
+  name: "Jockey Zero"
+  saveName: "Jockey Zero (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81620,7 +85865,8 @@ SLPS-00429:
     multitap: false
     linkCable: false
 SLPS-00339:
-  name: "Johnny Bazooka (Japan)"
+  name: "Johnny Bazooka"
+  saveName: "Johnny Bazooka (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81638,7 +85884,8 @@ SLPS-00339:
     multitap: false
     linkCable: false
 SLES-00112:
-  name: "Johnny Bazookatone (Europe)"
+  name: "Johnny Bazookatone"
+  saveName: "Johnny Bazookatone (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -81656,7 +85903,8 @@ SLES-00112:
     multitap: false
     linkCable: false
 SLUS-00194:
-  name: "Johnny Bazookatone (USA)"
+  name: "Johnny Bazookatone"
+  saveName: "Johnny Bazookatone (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -81677,7 +85925,8 @@ SLUS-00194:
     multitap: false
     linkCable: false
 SLPM-86721:
-  name: "Jojo no Kimyou na Bouken (Japan)"
+  name: "Jojo no Kimyou na Bouken"
+  saveName: "Jojo no Kimyou na Bouken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81699,7 +85948,8 @@ SLPM-86721:
     multitap: false
     linkCable: false
 SLES-00377:
-  name: "Jonah Lomu Rugby (Europe) (En,De,Es,It)"
+  name: "Jonah Lomu Rugby"
+  saveName: "Jonah Lomu Rugby (Europe) (En,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81721,7 +85971,8 @@ SLES-00377:
     multitap: true
     linkCable: false
 SLES-00611:
-  name: "Jonah Lomu Rugby (France)"
+  name: "Jonah Lomu Rugby"
+  saveName: "Jonah Lomu Rugby (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81740,7 +85991,8 @@ SLES-00611:
     multitap: true
     linkCable: false
 SLPS-00409:
-  name: "Joshikousei no Houkago... Pukunpa (Japan)"
+  name: "Joshikousei no Houkago... Pukunpa"
+  saveName: "Joshikousei no Houkago... Pukunpa (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81758,7 +86010,8 @@ SLPS-00409:
     multitap: false
     linkCable: false
 SLES-02772:
-  name: "Joue avec les Teletubbies (France)"
+  name: "Joue avec les Teletubbies"
+  saveName: "Joue avec les Teletubbies (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81777,7 +86030,8 @@ SLES-02772:
     multitap: false
     linkCable: false
 SLPS-01739:
-  name: "Jouki Kikansha Unten Simulation - SL de Ikou! (Japan)"
+  name: "Jouki Kikansha Unten Simulation - SL de Ikou!"
+  saveName: "Jouki Kikansha Unten Simulation - SL de Ikou! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81795,7 +86049,8 @@ SLPS-01739:
     multitap: false
     linkCable: false
 SLPS-02478:
-  name: "Jouki Kikansha Unten Simulation - SL de Ikou! II (Japan)"
+  name: "Jouki Kikansha Unten Simulation - SL de Ikou! II"
+  saveName: "Jouki Kikansha Unten Simulation - SL de Ikou! II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81814,7 +86069,8 @@ SLPS-02478:
     multitap: false
     linkCable: false
 SLPS-00936:
-  name: "Jounetsu Nekketsu Athletes - Nakimushi Coach no Diary (Japan)"
+  name: "Jounetsu Nekketsu Athletes - Nakimushi Coach no Diary"
+  saveName: "Jounetsu Nekketsu Athletes - Nakimushi Coach no Diary (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -81832,11 +86088,13 @@ SLPS-00936:
     multitap: false
     linkCable: false
 SCED-01138:
-  name: "Joypad Demo 01 (France) (En,Fr)"
+  name: "Joypad Demo 01"
+  saveName: "Joypad Demo 01 (France) (En,Fr)"
   metadata:
     genre: "** DEMO **"
 SLES-00755:
-  name: "Judge Dredd (Europe)"
+  name: "Judge Dredd"
+  saveName: "Judge Dredd (Europe)"
   controllers:
     - DigitalController
     - GunCon
@@ -81856,7 +86114,8 @@ SLES-00755:
     multitap: false
     linkCable: false
 SLUS-00630:
-  name: "Judge Dredd (USA)"
+  name: "Judge Dredd"
+  saveName: "Judge Dredd (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -81879,7 +86138,8 @@ SLUS-00630:
     multitap: false
     linkCable: false
 SLES-03171:
-  name: "Juega con los Teletubbies (Spain)"
+  name: "Juega con los Teletubbies"
+  saveName: "Juega con los Teletubbies (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -81898,7 +86158,8 @@ SLES-03171:
     multitap: false
     linkCable: false
 SLUS-00894:
-  name: "Juggernaut (USA) (Disc 1)"
+  name: "Juggernaut (Disc 1)"
+  saveName: "Juggernaut (USA) (Disc 1)"
   discSet:
     name: "Juggernaut (USA)"
     serials:
@@ -81923,7 +86184,8 @@ SLUS-00894:
     multitap: false
     linkCable: false
 SLUS-00988:
-  name: "Juggernaut (USA) (Disc 2)"
+  name: "Juggernaut (Disc 2)"
+  saveName: "Juggernaut (USA) (Disc 2)"
   discSet:
     name: "Juggernaut (USA)"
     serials:
@@ -81948,7 +86210,8 @@ SLUS-00988:
     multitap: false
     linkCable: false
 SLUS-00989:
-  name: "Juggernaut (USA) (Disc 3)"
+  name: "Juggernaut (Disc 3)"
+  saveName: "Juggernaut (USA) (Disc 3)"
   discSet:
     name: "Juggernaut (USA)"
     serials:
@@ -81973,7 +86236,8 @@ SLUS-00989:
     multitap: false
     linkCable: false
 SLPS-01671:
-  name: "Juggernaut - Senritsu no Tobira (Japan) (Disc 1)"
+  name: "Juggernaut - Senritsu no Tobira (Disc 1)"
+  saveName: "Juggernaut - Senritsu no Tobira (Japan) (Disc 1)"
   discSet:
     name: "Juggernaut - Senritsu no Tobira (Japan)"
     serials:
@@ -82001,7 +86265,8 @@ SLPS-01671:
     multitap: false
     linkCable: false
 SLPS-01672:
-  name: "Juggernaut - Senritsu no Tobira (Japan) (Disc 2)"
+  name: "Juggernaut - Senritsu no Tobira (Disc 2)"
+  saveName: "Juggernaut - Senritsu no Tobira (Japan) (Disc 2)"
   discSet:
     name: "Juggernaut - Senritsu no Tobira (Japan)"
     serials:
@@ -82029,7 +86294,8 @@ SLPS-01672:
     multitap: false
     linkCable: false
 SLPS-01673:
-  name: "Juggernaut - Senritsu no Tobira (Japan) (Disc 3)"
+  name: "Juggernaut - Senritsu no Tobira (Disc 3)"
+  saveName: "Juggernaut - Senritsu no Tobira (Japan) (Disc 3)"
   discSet:
     name: "Juggernaut - Senritsu no Tobira (Japan)"
     serials:
@@ -82057,7 +86323,8 @@ SLPS-01673:
     multitap: false
     linkCable: false
 SLUS-01383:
-  name: "JumpStart Wildlife Safari - Field Trip (USA)"
+  name: "JumpStart Wildlife Safari - Field Trip"
+  saveName: "JumpStart Wildlife Safari - Field Trip (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -82080,7 +86347,8 @@ SLUS-01383:
     multitap: false
     linkCable: false
 SCES-00003:
-  name: "Jumping Flash! (Europe)"
+  name: "Jumping Flash!"
+  saveName: "Jumping Flash! (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -82098,13 +86366,16 @@ SCES-00003:
     multitap: false
     linkCable: false
 SCPM-85001:
-  name: "Jumping Flash! (Japan) (Demo)"
+  name: "Jumping Flash! (Demo)"
+  saveName: "Jumping Flash! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10022:
-  name: "Jumping Flash! (Japan) (Europe-ban)"
+  name: "Jumping Flash! (Europe-ban)"
+  saveName: "Jumping Flash! (Japan) (Europe-ban)"
 SCUS-94103:
-  name: "Jumping Flash! (USA)"
+  name: "Jumping Flash!"
+  saveName: "Jumping Flash! (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -82122,7 +86393,8 @@ SCUS-94103:
     multitap: false
     linkCable: false
 SCES-00111:
-  name: "Jumping Flash! 2 (Europe)"
+  name: "Jumping Flash! 2"
+  saveName: "Jumping Flash! 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -82140,7 +86412,8 @@ SCES-00111:
     multitap: false
     linkCable: false
 SCUS-94108:
-  name: "Jumping Flash! 2 (USA)"
+  name: "Jumping Flash! 2"
+  saveName: "Jumping Flash! 2 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -82176,7 +86449,8 @@ SCPS-45052:
     multitap: false
     linkCable: false
 SCPS-10021:
-  name: "Jumping Flash! 2 - Aloha Danshaku Ooyowari no Maki (Japan)"
+  name: "Jumping Flash! 2 - Aloha Danshaku Ooyowari no Maki"
+  saveName: "Jumping Flash! 2 - Aloha Danshaku Ooyowari no Maki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82194,7 +86468,8 @@ SCPS-10021:
     multitap: false
     linkCable: false
 SCPS-10007:
-  name: "Jumping Flash! Aloha Danshaku Funky Daisakusen no Maki (Japan)"
+  name: "Jumping Flash! Aloha Danshaku Funky Daisakusen no Maki"
+  saveName: "Jumping Flash! Aloha Danshaku Funky Daisakusen no Maki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82212,7 +86487,8 @@ SCPS-10007:
     multitap: false
     linkCable: false
 SLPM-86080:
-  name: "Junclassic C.C. & Rope Club (Japan)"
+  name: "Junclassic C.C. & Rope Club"
+  saveName: "Junclassic C.C. & Rope Club (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82230,7 +86506,8 @@ SLPM-86080:
     multitap: true
     linkCable: false
 SLES-02750:
-  name: "Jungla de Cristal Trilogia 2 - Viva Las Vegas (Spain)"
+  name: "Jungla de Cristal Trilogia 2 - Viva Las Vegas"
+  saveName: "Jungla de Cristal Trilogia 2 - Viva Las Vegas (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -82253,7 +86530,8 @@ SLES-02750:
     multitap: false
     linkCable: false
 SLPS-01086:
-  name: "Jungle Park (Japan)"
+  name: "Jungle Park"
+  saveName: "Jungle Park (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82272,7 +86550,8 @@ SLPS-01086:
     multitap: false
     linkCable: false
 SLES-03579:
-  name: "Junior Sports Football (Europe)"
+  name: "Junior Sports Football"
+  saveName: "Junior Sports Football (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82291,7 +86570,8 @@ SLES-03579:
     multitap: true
     linkCable: false
 SLES-03580:
-  name: "Junior Sports Football (France)"
+  name: "Junior Sports Football"
+  saveName: "Junior Sports Football (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82310,7 +86590,8 @@ SLES-03580:
     multitap: true
     linkCable: false
 SLES-03581:
-  name: "Junior Sports Fussball (Germany)"
+  name: "Junior Sports Fussball"
+  saveName: "Junior Sports Fussball (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82329,7 +86610,8 @@ SLES-03581:
     multitap: true
     linkCable: false
 SLPS-02431:
-  name: "Junjou de Karen - Meymay Kishidan - Spectral Force Seishoujo Gaiden (Japan)"
+  name: "Junjou de Karen - Meymay Kishidan - Spectral Force Seishoujo Gaiden"
+  saveName: "Junjou de Karen - Meymay Kishidan - Spectral Force Seishoujo Gaiden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82351,7 +86633,8 @@ SLPS-02431:
     multitap: false
     linkCable: false
 SLES-00130:
-  name: "Jupiter Strike (Europe)"
+  name: "Jupiter Strike"
+  saveName: "Jupiter Strike (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -82373,7 +86656,8 @@ SLES-00130:
     multitap: false
     linkCable: false
 SLUS-00177:
-  name: "Jupiter Strike (USA)"
+  name: "Jupiter Strike"
+  saveName: "Jupiter Strike (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -82392,11 +86676,13 @@ SLUS-00177:
     multitap: false
     linkCable: false
 SLUS-80515:
-  name: "Jurassic Park - The Lost World (USA) (Demo)"
+  name: "Jurassic Park - The Lost World (Demo)"
+  saveName: "Jurassic Park - The Lost World (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02753:
-  name: "K-1 Grand Prix (Europe)"
+  name: "K-1 Grand Prix"
+  saveName: "K-1 Grand Prix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82415,7 +86701,8 @@ SLES-02753:
     multitap: false
     linkCable: false
 SLUS-00941:
-  name: "K-1 Grand Prix (USA)"
+  name: "K-1 Grand Prix"
+  saveName: "K-1 Grand Prix (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82434,7 +86721,8 @@ SLUS-00941:
     multitap: false
     linkCable: false
 SLPS-02602:
-  name: "K-1 Ouja ni Narou! King of Kings (Japan)"
+  name: "K-1 Ouja ni Narou! King of Kings"
+  saveName: "K-1 Ouja ni Narou! King of Kings (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82453,7 +86741,8 @@ SLPS-02602:
     multitap: false
     linkCable: false
 SLUS-00766:
-  name: "K-1 Revenge (USA)"
+  name: "K-1 Revenge"
+  saveName: "K-1 Revenge (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -82471,7 +86760,8 @@ SLUS-00766:
     multitap: false
     linkCable: false
 SLES-00767:
-  name: "K-1 The Arena Fighters (Europe)"
+  name: "K-1 The Arena Fighters"
+  saveName: "K-1 The Arena Fighters (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -82489,7 +86779,8 @@ SLES-00767:
     multitap: false
     linkCable: false
 SLUS-00414:
-  name: "K-1 The Arena Fighters (USA)"
+  name: "K-1 The Arena Fighters"
+  saveName: "K-1 The Arena Fighters (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -82507,7 +86798,8 @@ SLUS-00414:
     multitap: false
     linkCable: false
 SLPM-86763:
-  name: "K-1 World Grand Prix 2001 - Kaimakuban (Japan)"
+  name: "K-1 World Grand Prix 2001 - Kaimakuban"
+  saveName: "K-1 World Grand Prix 2001 - Kaimakuban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82526,7 +86818,8 @@ SLPM-86763:
     multitap: false
     linkCable: false
 SLPS-01413:
-  name: "K.O. - The Live Boxing (Japan)"
+  name: "K.O. - The Live Boxing"
+  saveName: "K.O. - The Live Boxing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82548,7 +86841,8 @@ SLPS-01413:
     multitap: false
     linkCable: false
 LSP-090110:
-  name: "K9.5 1 - Live in Airedale (USA)"
+  name: "K9.5 1 - Live in Airedale"
+  saveName: "K9.5 1 - Live in Airedale (USA)"
   codes:
     - LSP-090110
     - LSP-905062
@@ -82560,7 +86854,8 @@ LSP-090110:
     languages:
       - English
 LSP-090220:
-  name: "K9.5 2 - We Are the Dogs! (USA)"
+  name: "K9.5 2 - We Are the Dogs!"
+  saveName: "K9.5 2 - We Are the Dogs! (USA)"
   codes:
     - LSP-090220
     - LSP-905079
@@ -82572,7 +86867,8 @@ LSP-090220:
     languages:
       - English
 LSP-090330:
-  name: "K9.5 3 - WebTunes (USA)"
+  name: "K9.5 3 - WebTunes"
+  saveName: "K9.5 3 - WebTunes (USA)"
   codes:
     - LSP-090330
     - LSP-905086
@@ -82584,7 +86880,8 @@ LSP-090330:
     languages:
       - English
 LSP-090440:
-  name: "K9.5 4 - The Tail-Wag Tour (USA)"
+  name: "K9.5 4 - The Tail-Wag Tour"
+  saveName: "K9.5 4 - The Tail-Wag Tour (USA)"
   codes:
     - LSP-090440
     - LSP-905093
@@ -82596,7 +86893,8 @@ LSP-090440:
     languages:
       - English
 LSP-907103:
-  name: "K9.5 5 - The Howlywood Premiere (USA)"
+  name: "K9.5 5 - The Howlywood Premiere"
+  saveName: "K9.5 5 - The Howlywood Premiere (USA)"
   codes:
     - LSP-907103
     - LSP-90710301
@@ -82608,7 +86906,8 @@ LSP-907103:
     languages:
       - English
 SLES-03211:
-  name: "KISS Pinball (Europe) (En,Fr,De)"
+  name: "KISS Pinball"
+  saveName: "KISS Pinball (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -82626,7 +86925,8 @@ SLES-03211:
     multitap: false
     linkCable: false
 SLUS-01366:
-  name: "KISS Pinball (USA)"
+  name: "KISS Pinball"
+  saveName: "KISS Pinball (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -82647,7 +86947,8 @@ SLUS-01366:
     multitap: false
     linkCable: false
 SLES-01246:
-  name: "KKND Krossfire (Europe)"
+  name: "KKND Krossfire"
+  saveName: "KKND Krossfire (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82666,7 +86967,8 @@ SLES-01246:
     multitap: false
     linkCable: false
 SLES-01616:
-  name: "KKND Krossfire (France)"
+  name: "KKND Krossfire"
+  saveName: "KKND Krossfire (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82685,7 +86987,8 @@ SLES-01616:
     multitap: false
     linkCable: false
 SLES-01617:
-  name: "KKND Krossfire (Germany)"
+  name: "KKND Krossfire"
+  saveName: "KKND Krossfire (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82723,7 +87026,8 @@ SLPS-03032:
     multitap: false
     linkCable: false
 SLPS-02332:
-  name: "Kaeru no Ehon - Nakushita Kioku o Motomete (Japan)"
+  name: "Kaeru no Ehon - Nakushita Kioku o Motomete"
+  saveName: "Kaeru no Ehon - Nakushita Kioku o Motomete (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82742,11 +87046,13 @@ SLPS-02332:
     multitap: false
     linkCable: false
 SLPM-80460:
-  name: "Kaeru no Ehon - Nakushita Kioku o Motomete (Japan) (Demo)"
+  name: "Kaeru no Ehon - Nakushita Kioku o Motomete (Demo)"
+  saveName: "Kaeru no Ehon - Nakushita Kioku o Motomete (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-87174:
-  name: "Kaette Kita Cyborg Kuro-chan (Japan)"
+  name: "Kaette Kita Cyborg Kuro-chan"
+  saveName: "Kaette Kita Cyborg Kuro-chan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -82765,7 +87071,8 @@ SLPM-87174:
     multitap: false
     linkCable: false
 SLPS-01384:
-  name: "Kaette Kita Pachio-kun - Dream Collection (Japan)"
+  name: "Kaette Kita Pachio-kun - Dream Collection"
+  saveName: "Kaette Kita Pachio-kun - Dream Collection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82783,7 +87090,8 @@ SLPS-01384:
     multitap: false
     linkCable: false
 SLPS-01972:
-  name: "Kagayaku Kisetsu e (Japan) (Disc 1) (Genteiban)"
+  name: "Kagayaku Kisetsu e (Disc 1) (Genteiban)"
+  saveName: "Kagayaku Kisetsu e (Japan) (Disc 1) (Genteiban)"
   discSet:
     name: "Kagayaku Kisetsu e (Japan)"
     serials:
@@ -82807,7 +87115,8 @@ SLPS-01972:
     multitap: false
     linkCable: false
 SLPS-01973:
-  name: "Kagayaku Kisetsu e (Japan) (Disc 2) (Special Disc)"
+  name: "Kagayaku Kisetsu e (Disc 2) (Special Disc)"
+  saveName: "Kagayaku Kisetsu e (Japan) (Disc 2) (Special Disc)"
   discSet:
     name: "Kagayaku Kisetsu e (Japan)"
     serials:
@@ -82850,7 +87159,8 @@ SLPS-01975:
     multitap: false
     linkCable: false
 SLES-01967:
-  name: "Kagero - Deception II (Europe)"
+  name: "Kagero - Deception II"
+  saveName: "Kagero - Deception II (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -82868,7 +87178,8 @@ SLES-01967:
     multitap: false
     linkCable: false
 SLUS-00677:
-  name: "Kagero - Deception II (USA)"
+  name: "Kagero - Deception II"
+  saveName: "Kagero - Deception II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -82889,7 +87200,8 @@ SLUS-00677:
     multitap: false
     linkCable: false
 SLUS-90041:
-  name: "Kagero - Deception II (USA) (Demo)"
+  name: "Kagero - Deception II (Demo)"
+  saveName: "Kagero - Deception II (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91405:
@@ -82911,7 +87223,8 @@ SLPS-91405:
     multitap: false
     linkCable: false
 SLPS-01421:
-  name: "Kagerou - Kokumeikan Shinshou (Japan)"
+  name: "Kagerou - Kokumeikan Shinshou"
+  saveName: "Kagerou - Kokumeikan Shinshou (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -82932,9 +87245,11 @@ SLPS-01421:
     multitap: false
     linkCable: false
 SLPM-80273:
-  name: "Kagerou - Kokumeikan Shinshou (Japan) (Taikenban)"
+  name: "Kagerou - Kokumeikan Shinshou (Taikenban)"
+  saveName: "Kagerou - Kokumeikan Shinshou (Japan) (Taikenban)"
 SLPS-01066:
-  name: "Kahen Soukou Gunbike - Speed Power Gunbike (Japan)"
+  name: "Kahen Soukou Gunbike - Speed Power Gunbike"
+  saveName: "Kahen Soukou Gunbike - Speed Power Gunbike (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82952,7 +87267,8 @@ SLPS-01066:
     multitap: false
     linkCable: false
 SLPS-00915:
-  name: "Kaibutsu Para-Dice - Monster Paradise (Japan)"
+  name: "Kaibutsu Para-Dice - Monster Paradise"
+  saveName: "Kaibutsu Para-Dice - Monster Paradise (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82970,7 +87286,8 @@ SLPS-00915:
     multitap: true
     linkCable: false
 SLPS-00529:
-  name: "Kaijuu Senki (Japan)"
+  name: "Kaijuu Senki"
+  saveName: "Kaijuu Senki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -82988,7 +87305,8 @@ SLPS-00529:
     multitap: false
     linkCable: false
 SLPM-86438:
-  name: "Kaikan Phrase - Datenshi Kourin (Japan)"
+  name: "Kaikan Phrase - Datenshi Kourin"
+  saveName: "Kaikan Phrase - Datenshi Kourin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83006,7 +87324,8 @@ SLPM-86438:
     multitap: false
     linkCable: false
 SLPS-00743:
-  name: "Kain the Vampire (Japan)"
+  name: "Kain the Vampire"
+  saveName: "Kain the Vampire (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83024,7 +87343,8 @@ SLPS-00743:
     multitap: false
     linkCable: false
 SLPS-03079:
-  name: "Kaishin!! Derby Analyst (Japan)"
+  name: "Kaishin!! Derby Analyst"
+  saveName: "Kaishin!! Derby Analyst (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83042,7 +87362,8 @@ SLPS-03079:
     multitap: false
     linkCable: false
 SLPS-01553:
-  name: "Kaisoku Tenshi - The Rapid Angel (Japan)"
+  name: "Kaisoku Tenshi - The Rapid Angel"
+  saveName: "Kaisoku Tenshi - The Rapid Angel (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83061,7 +87382,8 @@ SLPS-01553:
     multitap: false
     linkCable: false
 SLPS-00086:
-  name: "Kaitei Daisensou - In the Hunt (Japan)"
+  name: "Kaitei Daisensou - In the Hunt"
+  saveName: "Kaitei Daisensou - In the Hunt (Japan)"
   controllers:
     - DigitalController
   settings:
@@ -83101,7 +87423,8 @@ SLPS-02790:
     multitap: false
     linkCable: false
 SLPS-03532:
-  name: "Kaitou Apricot (Japan)"
+  name: "Kaitou Apricot"
+  saveName: "Kaitou Apricot (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83119,7 +87442,8 @@ SLPS-03532:
     multitap: false
     linkCable: false
 SLPS-01824:
-  name: "Kaitou Ranma Miyabi (Japan)"
+  name: "Kaitou Ranma Miyabi"
+  saveName: "Kaitou Ranma Miyabi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83159,7 +87483,8 @@ SLPS-01344:
     multitap: false
     linkCable: false
 SLPS-00019:
-  name: "Kakinoki Shougi (Japan)"
+  name: "Kakinoki Shougi"
+  saveName: "Kakinoki Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83177,7 +87502,8 @@ SLPS-00019:
     multitap: false
     linkCable: false
 SLPS-02986:
-  name: "Kakinoki Shougi II (Japan)"
+  name: "Kakinoki Shougi II"
+  saveName: "Kakinoki Shougi II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83195,7 +87521,8 @@ SLPS-02986:
     multitap: false
     linkCable: false
 SLPS-02595:
-  name: "Kakuge Yarou - Fighting Game Creator (Japan)"
+  name: "Kakuge Yarou - Fighting Game Creator"
+  saveName: "Kakuge Yarou - Fighting Game Creator (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83214,7 +87541,8 @@ SLPS-02595:
     multitap: false
     linkCable: false
 SLPS-00799:
-  name: "Kakugo no Susume (Japan)"
+  name: "Kakugo no Susume"
+  saveName: "Kakugo no Susume (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83232,7 +87560,8 @@ SLPS-00799:
     multitap: false
     linkCable: false
 SLPS-01570:
-  name: "Kamen Rider (Japan)"
+  name: "Kamen Rider"
+  saveName: "Kamen Rider (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83254,11 +87583,13 @@ SLPS-01570:
     multitap: false
     linkCable: false
 SLPM-80326:
-  name: "Kamen Rider (Japan) (Demo)"
+  name: "Kamen Rider (Demo)"
+  saveName: "Kamen Rider (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03344:
-  name: "Kamen Rider Agito (Japan)"
+  name: "Kamen Rider Agito"
+  saveName: "Kamen Rider Agito (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83279,7 +87610,8 @@ SLPS-03344:
     multitap: false
     linkCable: false
 SLPM-80629:
-  name: "Kamen Rider Agito + Hyakujuu Sentai GaoRanger (Japan) (Demo)"
+  name: "Kamen Rider Agito + Hyakujuu Sentai GaoRanger (Demo)"
+  saveName: "Kamen Rider Agito + Hyakujuu Sentai GaoRanger (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03529:
@@ -83304,7 +87636,8 @@ SLPS-03529:
     multitap: false
     linkCable: false
 SLPS-03090:
-  name: "Kamen Rider Kuuga (Japan)"
+  name: "Kamen Rider Kuuga"
+  saveName: "Kamen Rider Kuuga (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83326,7 +87659,8 @@ SLPS-03090:
     multitap: false
     linkCable: false
 SLPS-03495:
-  name: "Kamen Rider Ryuuki (Japan)"
+  name: "Kamen Rider Ryuuki"
+  saveName: "Kamen Rider Ryuuki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83364,7 +87698,8 @@ SLPS-02964:
     multitap: false
     linkCable: false
 SLPS-03443:
-  name: "Kamen Rider V3 (Japan)"
+  name: "Kamen Rider V3"
+  saveName: "Kamen Rider V3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83383,7 +87718,8 @@ SLPS-03443:
     multitap: false
     linkCable: false
 SLPS-00052:
-  name: "Kanazawa Shougi '95 (Japan)"
+  name: "Kanazawa Shougi '95"
+  saveName: "Kanazawa Shougi '95 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83401,9 +87737,11 @@ SLPS-00052:
     multitap: false
     linkCable: false
 SLPS-02059:
-  name: "Kanazawa Shougi - Tsuki (Japan)"
+  name: "Kanazawa Shougi - Tsuki"
+  saveName: "Kanazawa Shougi - Tsuki (Japan)"
 SLES-03209:
-  name: "Kart Challenge (Europe) (En,Fr,De,It)"
+  name: "Kart Challenge"
+  saveName: "Kart Challenge (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83426,7 +87764,8 @@ SLES-03209:
     multitap: false
     linkCable: false
 SLPS-03041:
-  name: "Kart Race - Kimete wa Drift! (Japan)"
+  name: "Kart Race - Kimete wa Drift!"
+  saveName: "Kart Race - Kimete wa Drift! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83446,7 +87785,8 @@ SLPS-03041:
     multitap: false
     linkCable: false
 SLUS-00631:
-  name: "Kartia - The Word of Fate (USA)"
+  name: "Kartia - The Word of Fate"
+  saveName: "Kartia - The Word of Fate (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -83467,7 +87807,8 @@ SLUS-00631:
     multitap: false
     linkCable: false
 SLPS-00563:
-  name: "Karyuujou (Japan) (Disc 1) (Ryuu Hangan Hen)"
+  name: "Karyuujou (Disc 1) (Ryuu Hangan Hen)"
+  saveName: "Karyuujou (Japan) (Disc 1) (Ryuu Hangan Hen)"
   discSet:
     name: "Karyuujou (Japan)"
     serials:
@@ -83490,7 +87831,8 @@ SLPS-00563:
     multitap: false
     linkCable: false
 SLPS-00564:
-  name: "Karyuujou (Japan) (Disc 2) (Kou Yuukan Hen)"
+  name: "Karyuujou (Disc 2) (Kou Yuukan Hen)"
+  saveName: "Karyuujou (Japan) (Disc 2) (Kou Yuukan Hen)"
   discSet:
     name: "Karyuujou (Japan)"
     serials:
@@ -83513,7 +87855,8 @@ SLPS-00564:
     multitap: false
     linkCable: false
 SLPS-01630:
-  name: "Kasei Monogatari (Japan)"
+  name: "Kasei Monogatari"
+  saveName: "Kasei Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83531,7 +87874,8 @@ SLPS-01630:
     multitap: false
     linkCable: false
 SLPS-01629:
-  name: "Kasei Monogatari (Japan) (Genteiban)"
+  name: "Kasei Monogatari (Genteiban)"
+  saveName: "Kasei Monogatari (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -83549,7 +87893,8 @@ SLPS-01629:
     multitap: false
     linkCable: false
 SCED-01739:
-  name: "Katalog Spezial Demo (Germany)"
+  name: "Katalog Spezial Demo"
+  saveName: "Katalog Spezial Demo (Germany)"
   metadata:
     genre: "** DEMO **"
 SLPM-86045:
@@ -83571,7 +87916,8 @@ SLPM-86045:
     multitap: false
     linkCable: false
 SLPS-02078:
-  name: "Katou Hifumi Kudan - Shougi Club (Japan)"
+  name: "Katou Hifumi Kudan - Shougi Club"
+  saveName: "Katou Hifumi Kudan - Shougi Club (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -83612,7 +87958,8 @@ SCPS-45227:
     multitap: false
     linkCable: false
 SLPS-01253:
-  name: "Kattobi Tune (Japan)"
+  name: "Kattobi Tune"
+  saveName: "Kattobi Tune (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83632,7 +87979,8 @@ SLPS-01253:
     multitap: false
     linkCable: false
 SLPM-80223:
-  name: "Kattobi Tune (Japan) (Demo)"
+  name: "Kattobi Tune (Demo)"
+  saveName: "Kattobi Tune (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91502:
@@ -83655,7 +88003,8 @@ SLPS-91502:
     multitap: false
     linkCable: false
 SLPS-01536:
-  name: "Kawa no Nushi Tsuri - Hikyou wo Motomete (Japan)"
+  name: "Kawa no Nushi Tsuri - Hikyou wo Motomete"
+  saveName: "Kawa no Nushi Tsuri - Hikyou wo Motomete (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83677,7 +88026,8 @@ SLPS-01536:
     multitap: false
     linkCable: false
 LSP-070110:
-  name: "KazMania 1 - Trail of Gems (USA)"
+  name: "KazMania 1 - Trail of Gems"
+  saveName: "KazMania 1 - Trail of Gems (USA)"
   codes:
     - LSP-070110
     - LSP-905123
@@ -83689,7 +88039,8 @@ LSP-070110:
     languages:
       - English
 LSP-905130:
-  name: "KazMania 2 - Chaos in KazMania (USA)"
+  name: "KazMania 2 - Chaos in KazMania"
+  saveName: "KazMania 2 - Chaos in KazMania (USA)"
   codes:
     - LSP-905130
     - LSP-90513001
@@ -83701,7 +88052,8 @@ LSP-905130:
     languages:
       - English
 SLPS-01010:
-  name: "Kaze no Klonoa - Door to Phantomile (Japan)"
+  name: "Kaze no Klonoa - Door to Phantomile"
+  saveName: "Kaze no Klonoa - Door to Phantomile (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -83723,7 +88075,8 @@ SLPS-01010:
     multitap: false
     linkCable: false
 SLPS-91169:
-  name: "Kaze no Klonoa - Door to Phantomile (Japan) (Rev 1)"
+  name: "Kaze no Klonoa - Door to Phantomile"
+  saveName: "Kaze no Klonoa - Door to Phantomile (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -83741,7 +88094,8 @@ SLPS-91169:
     multitap: false
     linkCable: false
 SCPS-45111:
-  name: "Kaze no Notam - Notam of Wind (Japan, Asia)"
+  name: "Kaze no Notam - Notam of Wind"
+  saveName: "Kaze no Notam - Notam of Wind (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -83762,7 +88116,8 @@ SCPS-45111:
     multitap: false
     linkCable: false
 SLPS-01565:
-  name: "Kaze no Oka Kouen Nite (Japan)"
+  name: "Kaze no Oka Kouen Nite"
+  saveName: "Kaze no Oka Kouen Nite (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83781,7 +88136,8 @@ SLPS-01565:
     multitap: false
     linkCable: false
 SLPS-01640:
-  name: "Keiba Eight '98 Aki Fuyu (Japan)"
+  name: "Keiba Eight '98 Aki Fuyu"
+  saveName: "Keiba Eight '98 Aki Fuyu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83799,7 +88155,8 @@ SLPS-01640:
     multitap: false
     linkCable: false
 SLPS-01372:
-  name: "Keiba Eight '98 Haru Natsu (Japan)"
+  name: "Keiba Eight '98 Haru Natsu"
+  saveName: "Keiba Eight '98 Haru Natsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83817,7 +88174,8 @@ SLPS-01372:
     multitap: false
     linkCable: false
 SLPS-01929:
-  name: "Keiba Eight '99 Haru Natsu (Japan)"
+  name: "Keiba Eight '99 Haru Natsu"
+  saveName: "Keiba Eight '99 Haru Natsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83835,7 +88193,8 @@ SLPS-01929:
     multitap: false
     linkCable: false
 SLPS-00063:
-  name: "Keiba Saishou no Housoku '95 (Japan)"
+  name: "Keiba Saishou no Housoku '95"
+  saveName: "Keiba Saishou no Housoku '95 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83853,7 +88212,8 @@ SLPS-00063:
     multitap: false
     linkCable: false
 SLPS-00146:
-  name: "Keiba Saishou no Housoku '96 Vol. 1 (Japan)"
+  name: "Keiba Saishou no Housoku '96 Vol. 1"
+  saveName: "Keiba Saishou no Housoku '96 Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83871,7 +88231,8 @@ SLPS-00146:
     multitap: false
     linkCable: false
 SLPS-00605:
-  name: "Keiba Saishou no Housoku '96 Vol. 2 - GI-Road (Japan)"
+  name: "Keiba Saishou no Housoku '96 Vol. 2 - GI-Road"
+  saveName: "Keiba Saishou no Housoku '96 Vol. 2 - GI-Road (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83889,7 +88250,8 @@ SLPS-00605:
     multitap: false
     linkCable: false
 SLPS-00808:
-  name: "Keiba Saishou no Housoku '97 Vol. 1 - Nerae! Manbaken! (Japan)"
+  name: "Keiba Saishou no Housoku '97 Vol. 1 - Nerae! Manbaken!"
+  saveName: "Keiba Saishou no Housoku '97 Vol. 1 - Nerae! Manbaken! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83907,7 +88269,8 @@ SLPS-00808:
     multitap: false
     linkCable: false
 SLPS-01032:
-  name: "Keiba Saishou no Housoku '97 Vol. II - To Hit (Japan)"
+  name: "Keiba Saishou no Housoku '97 Vol. II - To Hit"
+  saveName: "Keiba Saishou no Housoku '97 Vol. II - To Hit (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83925,7 +88288,8 @@ SLPS-01032:
     multitap: false
     linkCable: false
 SLPS-02339:
-  name: "Keiba Saishou no Housoku '99 Aki Fuyu (Japan)"
+  name: "Keiba Saishou no Housoku '99 Aki Fuyu"
+  saveName: "Keiba Saishou no Housoku '99 Aki Fuyu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83943,7 +88307,8 @@ SLPS-02339:
     multitap: false
     linkCable: false
 SLPS-02717:
-  name: "Keitai Eddy (Japan)"
+  name: "Keitai Eddy"
+  saveName: "Keitai Eddy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -83962,9 +88327,11 @@ SLPS-02717:
     multitap: false
     linkCable: false
 PBPX-95013:
-  name: "Keitai Henshuu (Japan)"
+  name: "Keitai Henshuu"
+  saveName: "Keitai Henshuu (Japan)"
 SLPS-00496:
-  name: "Kekkon - Marriage (Japan)"
+  name: "Kekkon - Marriage"
+  saveName: "Kekkon - Marriage (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -83982,13 +88349,16 @@ SLPS-00496:
     multitap: false
     linkCable: false
 SLPM-84002:
-  name: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! (Japan)"
+  name: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou!"
+  saveName: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! (Japan)"
 SLPM-80512:
-  name: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Japan) (Demo)"
+  name: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Demo)"
+  saveName: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45466:
-  name: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Japan, Asia)"
+  name: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou"
+  saveName: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84012,7 +88382,8 @@ SCPS-45466:
     multitap: false
     linkCable: false
 SLPS-02831:
-  name: "Kenki Ippatsu! Crane Master ni Narou! (Japan)"
+  name: "Kenki Ippatsu! Crane Master ni Narou!"
+  saveName: "Kenki Ippatsu! Crane Master ni Narou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84031,7 +88402,8 @@ SLPS-02831:
     multitap: false
     linkCable: false
 SLPM-87150:
-  name: "Kenki Ippatsu! Crane Master ni Narou! (Japan) (Major Wave)"
+  name: "Kenki Ippatsu! Crane Master ni Narou! (Major Wave)"
+  saveName: "Kenki Ippatsu! Crane Master ni Narou! (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84069,7 +88441,8 @@ SLPS-91510:
     multitap: false
     linkCable: false
 SLPS-02830:
-  name: "Kenki Ippatsu! Shovel Master ni Narou! (Japan)"
+  name: "Kenki Ippatsu! Shovel Master ni Narou!"
+  saveName: "Kenki Ippatsu! Shovel Master ni Narou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84088,7 +88461,8 @@ SLPS-02830:
     multitap: false
     linkCable: false
 SLES-01081:
-  name: "Kensei - Sacred Fist (Europe)"
+  name: "Kensei - Sacred Fist"
+  saveName: "Kensei - Sacred Fist (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84107,7 +88481,8 @@ SLES-01081:
     multitap: false
     linkCable: false
 SLUS-00600:
-  name: "Kensei - Sacred Fist (USA)"
+  name: "Kensei - Sacred Fist"
+  saveName: "Kensei - Sacred Fist (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84126,7 +88501,8 @@ SLUS-00600:
     multitap: false
     linkCable: false
 SLPS-00502:
-  name: "Kensei - The King of Boxing (Japan)"
+  name: "Kensei - The King of Boxing"
+  saveName: "Kensei - The King of Boxing (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84144,7 +88520,8 @@ SLPS-00502:
     multitap: false
     linkCable: false
 SLPS-02605:
-  name: "Kensetsu Kikai Simulator - Kenki Ippai! (Japan)"
+  name: "Kensetsu Kikai Simulator - Kenki Ippai!"
+  saveName: "Kensetsu Kikai Simulator - Kenki Ippai! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84182,7 +88559,8 @@ SLPS-91236:
     multitap: false
     linkCable: false
 SLPS-01186:
-  name: "Kenshou Akou Jiken - Chuushingura - Rekishi Adventure (Japan)"
+  name: "Kenshou Akou Jiken - Chuushingura - Rekishi Adventure"
+  saveName: "Kenshou Akou Jiken - Chuushingura - Rekishi Adventure (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84200,7 +88578,8 @@ SLPS-01186:
     multitap: false
     linkCable: false
 SLPM-86621:
-  name: "Kero Kero King (Japan)"
+  name: "Kero Kero King"
+  saveName: "Kero Kero King (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84222,15 +88601,18 @@ SLPM-86621:
     multitap: true
     linkCable: false
 SLPM-80583:
-  name: "Kero Kero King (Japan) (Demo)"
+  name: "Kero Kero King (Demo)"
+  saveName: "Kero Kero King (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86432:
-  name: "Kessen - Demo Video CD-ROM (Japan)"
+  name: "Kessen - Demo Video CD-ROM"
+  saveName: "Kessen - Demo Video CD-ROM (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-02640:
-  name: "Khamrai (Japan)"
+  name: "Khamrai"
+  saveName: "Khamrai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84268,7 +88650,8 @@ SLES-01039:
     multitap: true
     linkCable: false
 SLES-01327:
-  name: "Kick Off World (Europe) (Es,Nl)"
+  name: "Kick Off World"
+  saveName: "Kick Off World (Europe) (Es,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84288,7 +88671,8 @@ SLES-01327:
     multitap: true
     linkCable: false
 SLES-01061:
-  name: "Kick Off World (Europe, Australia) (En,Fr)"
+  name: "Kick Off World"
+  saveName: "Kick Off World (Europe, Australia) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84308,7 +88692,8 @@ SLES-01061:
     multitap: true
     linkCable: false
 SLES-01062:
-  name: "Kick Off World (Germany)"
+  name: "Kick Off World"
+  saveName: "Kick Off World (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84327,7 +88712,8 @@ SLES-01062:
     multitap: true
     linkCable: false
 SLES-01328:
-  name: "Kick Off World (Greece)"
+  name: "Kick Off World"
+  saveName: "Kick Off World (Greece)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84346,9 +88732,11 @@ SLES-01328:
     multitap: true
     linkCable: false
 SLES-01063:
-  name: "Kick Off World Manager (Italy)"
+  name: "Kick Off World Manager"
+  saveName: "Kick Off World Manager (Italy)"
 SLUS-01412:
-  name: "Kickboxing (USA)"
+  name: "Kickboxing"
+  saveName: "Kickboxing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -84370,7 +88758,8 @@ SLUS-01412:
     multitap: false
     linkCable: false
 SLES-03959:
-  name: "Kickboxing Knockout (Europe)"
+  name: "Kickboxing Knockout"
+  saveName: "Kickboxing Knockout (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84389,7 +88778,8 @@ SLES-03959:
     multitap: false
     linkCable: false
 SLPS-00454:
-  name: "Kid Clown no Crazy Chase 2 - Love Love Honey Soudatsusen (Japan)"
+  name: "Kid Clown no Crazy Chase 2 - Love Love Honey Soudatsusen"
+  saveName: "Kid Clown no Crazy Chase 2 - Love Love Honey Soudatsusen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84407,7 +88797,8 @@ SLPS-00454:
     multitap: false
     linkCable: false
 SLPS-03236:
-  name: "Kid Mix Section - Character Collection (Japan)"
+  name: "Kid Mix Section - Character Collection"
+  saveName: "Kid Mix Section - Character Collection (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84426,7 +88817,8 @@ SLPS-03236:
     multitap: false
     linkCable: false
 SLPS-02570:
-  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Japan) (Disc 1) (Earth Federation Disc)"
+  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Disc 1) (Earth Federation Disc)"
+  saveName: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Japan) (Disc 1) (Earth Federation Disc)"
   discSet:
     name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Japan)"
     serials:
@@ -84450,7 +88842,8 @@ SLPS-02570:
     multitap: false
     linkCable: false
 SLPS-02571:
-  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Japan) (Disc 2) (Zeon Disc)"
+  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Disc 2) (Zeon Disc)"
+  saveName: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Japan) (Disc 2) (Zeon Disc)"
   discSet:
     name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu (Japan)"
     serials:
@@ -84474,7 +88867,8 @@ SLPS-02571:
     multitap: false
     linkCable: false
 SLPS-02202:
-  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu - Kimitsu Eizou Disc Tokubetsu-hen (Japan)"
+  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu - Kimitsu Eizou Disc Tokubetsu-hen"
+  saveName: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu - Kimitsu Eizou Disc Tokubetsu-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84493,7 +88887,8 @@ SLPS-02202:
     multitap: true
     linkCable: false
 SLPS-02820:
-  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu - Kouryaku Shireisho (Japan)"
+  name: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu - Kouryaku Shireisho"
+  saveName: "Kidou Senshi Gundam - Gihren no Yabou - Zeon no Keifu - Kouryaku Shireisho (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84533,11 +88928,13 @@ SCPS-45045:
     multitap: false
     linkCable: false
 SCED-02542:
-  name: "Kids Demo 01 (Europe) (En,Fr,De,Es,It)"
+  name: "Kids Demo 01"
+  saveName: "Kids Demo 01 (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SLPM-86907:
-  name: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun (Japan)"
+  name: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun"
+  saveName: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84555,7 +88952,8 @@ SLPM-86907:
     multitap: false
     linkCable: false
 SLPS-03057:
-  name: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun (Japan) (Controller Set)"
+  name: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun (Controller Set)"
+  saveName: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun (Japan) (Controller Set)"
   controllers:
     - DigitalController
   metadata:
@@ -84573,7 +88971,8 @@ SLPS-03057:
     multitap: false
     linkCable: false
 SLPS-03302:
-  name: "Kids Station - Barbapapa (Japan)"
+  name: "Kids Station - Barbapapa"
+  saveName: "Kids Station - Barbapapa (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84592,7 +88991,8 @@ SLPS-03302:
     multitap: false
     linkCable: false
 SLPS-03301:
-  name: "Kids Station - Barbapapa (Japan) (Controller Set)"
+  name: "Kids Station - Barbapapa (Controller Set)"
+  saveName: "Kids Station - Barbapapa (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84611,9 +89011,11 @@ SLPS-03301:
     multitap: false
     linkCable: false
 SLPM-84017:
-  name: "Kids Station - Basic Soft (Japan)"
+  name: "Kids Station - Basic Soft"
+  saveName: "Kids Station - Basic Soft (Japan)"
 SLPS-03318:
-  name: "Kids Station - Bishoujo Senshi Sailor Moon World - Chibiusa to Tanoshii Mainichi (Japan)"
+  name: "Kids Station - Bishoujo Senshi Sailor Moon World - Chibiusa to Tanoshii Mainichi"
+  saveName: "Kids Station - Bishoujo Senshi Sailor Moon World - Chibiusa to Tanoshii Mainichi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84632,7 +89034,8 @@ SLPS-03318:
     multitap: false
     linkCable: false
 SLPS-03317:
-  name: "Kids Station - Bishoujo Senshi Sailor Moon World - Chibiusa to Tanoshii Mainichi (Japan) (Controller Set)"
+  name: "Kids Station - Bishoujo Senshi Sailor Moon World - Chibiusa to Tanoshii Mainichi (Controller Set)"
+  saveName: "Kids Station - Bishoujo Senshi Sailor Moon World - Chibiusa to Tanoshii Mainichi (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84651,7 +89054,8 @@ SLPS-03317:
     multitap: false
     linkCable: false
 SLPS-02873:
-  name: "Kids Station - Bokura to Asobou! Ultraman TV (Japan)"
+  name: "Kids Station - Bokura to Asobou! Ultraman TV"
+  saveName: "Kids Station - Bokura to Asobou! Ultraman TV (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84669,7 +89073,8 @@ SLPS-02873:
     multitap: false
     linkCable: false
 SLPS-02872:
-  name: "Kids Station - Bokura to Asobou! Ultraman TV (Japan) (Controller Set)"
+  name: "Kids Station - Bokura to Asobou! Ultraman TV (Controller Set)"
+  saveName: "Kids Station - Bokura to Asobou! Ultraman TV (Japan) (Controller Set)"
   controllers:
     - DigitalController
   metadata:
@@ -84687,7 +89092,8 @@ SLPS-02872:
     multitap: false
     linkCable: false
 SLPS-03320:
-  name: "Kids Station - Crayon Shin-chan - Ora to Omoide Tsukuru zo! (Japan)"
+  name: "Kids Station - Crayon Shin-chan - Ora to Omoide Tsukuru zo!"
+  saveName: "Kids Station - Crayon Shin-chan - Ora to Omoide Tsukuru zo! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84706,7 +89112,8 @@ SLPS-03320:
     multitap: false
     linkCable: false
 SLPS-03319:
-  name: "Kids Station - Crayon Shin-chan - Ora to Omoide Tsukuru zo! (Japan) (Controller Set)"
+  name: "Kids Station - Crayon Shin-chan - Ora to Omoide Tsukuru zo! (Controller Set)"
+  saveName: "Kids Station - Crayon Shin-chan - Ora to Omoide Tsukuru zo! (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84725,7 +89132,8 @@ SLPS-03319:
     multitap: false
     linkCable: false
 SLPS-03249:
-  name: "Kids Station - Digimon Park (Japan)"
+  name: "Kids Station - Digimon Park"
+  saveName: "Kids Station - Digimon Park (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84744,7 +89152,8 @@ SLPS-03249:
     multitap: false
     linkCable: false
 SLPS-03248:
-  name: "Kids Station - Digimon Park (Japan) (Controller Set)"
+  name: "Kids Station - Digimon Park (Controller Set)"
+  saveName: "Kids Station - Digimon Park (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84763,7 +89172,8 @@ SLPS-03248:
     multitap: false
     linkCable: false
 SLPS-03323:
-  name: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Japan) (Controller Set)"
+  name: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Controller Set)"
+  saveName: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84782,7 +89192,8 @@ SLPS-03323:
     multitap: false
     linkCable: false
 SLPM-80624:
-  name: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Japan) (Demo)"
+  name: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Demo)"
+  saveName: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03324:
@@ -84805,7 +89216,8 @@ SLPS-03324:
     multitap: false
     linkCable: false
 SLPM-88511:
-  name: "Kids Station - Gomdoli Pooh Hakseup Series - Gomdoli Pooh Sinnaneun Yuagyosil (Korea)"
+  name: "Kids Station - Gomdoli Pooh Hakseup Series - Gomdoli Pooh Sinnaneun Yuagyosil"
+  saveName: "Kids Station - Gomdoli Pooh Hakseup Series - Gomdoli Pooh Sinnaneun Yuagyosil (Korea)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84824,7 +89236,8 @@ SLPM-88511:
     multitap: false
     linkCable: false
 SLPM-86905:
-  name: "Kids Station - Hello Kitty no Oshaberi ABC (Japan)"
+  name: "Kids Station - Hello Kitty no Oshaberi ABC"
+  saveName: "Kids Station - Hello Kitty no Oshaberi ABC (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84843,7 +89256,8 @@ SLPM-86905:
     multitap: false
     linkCable: false
 SLPM-86906:
-  name: "Kids Station - Hello Kitty no Oshaberi Town (Japan)"
+  name: "Kids Station - Hello Kitty no Oshaberi Town"
+  saveName: "Kids Station - Hello Kitty no Oshaberi Town (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84861,7 +89275,8 @@ SLPM-86906:
     multitap: false
     linkCable: false
 SLPS-03060:
-  name: "Kids Station - Hello Kitty no Oshaberi Town (Japan) (Controller Set)"
+  name: "Kids Station - Hello Kitty no Oshaberi Town (Controller Set)"
+  saveName: "Kids Station - Hello Kitty no Oshaberi Town (Japan) (Controller Set)"
   controllers:
     - DigitalController
   metadata:
@@ -84879,7 +89294,8 @@ SLPS-03060:
     multitap: false
     linkCable: false
 SLPS-03448:
-  name: "Kids Station - Hello Kitty no Ouchi e Oide yo! (Japan)"
+  name: "Kids Station - Hello Kitty no Ouchi e Oide yo!"
+  saveName: "Kids Station - Hello Kitty no Ouchi e Oide yo! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84897,7 +89313,8 @@ SLPS-03448:
     multitap: false
     linkCable: false
 SLPS-03447:
-  name: "Kids Station - Hello Kitty no Ouchi e Oide yo! (Japan) (Controller Set)"
+  name: "Kids Station - Hello Kitty no Ouchi e Oide yo! (Controller Set)"
+  saveName: "Kids Station - Hello Kitty no Ouchi e Oide yo! (Japan) (Controller Set)"
   controllers:
     - DigitalController
   metadata:
@@ -84934,7 +89351,8 @@ SLPM-86904:
     multitap: false
     linkCable: false
 SLPS-03544:
-  name: "Kids Station - Hello Kitty to Album Nikki o Tsukurimasho! (Japan)"
+  name: "Kids Station - Hello Kitty to Album Nikki o Tsukurimasho!"
+  saveName: "Kids Station - Hello Kitty to Album Nikki o Tsukurimasho! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84953,7 +89371,8 @@ SLPS-03544:
     multitap: false
     linkCable: false
 SLPS-03543:
-  name: "Kids Station - Hello Kitty to Album Nikki o Tsukurimasho! (Japan) (Controller Set)"
+  name: "Kids Station - Hello Kitty to Album Nikki o Tsukurimasho! (Controller Set)"
+  saveName: "Kids Station - Hello Kitty to Album Nikki o Tsukurimasho! (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -84972,7 +89391,8 @@ SLPS-03543:
     multitap: false
     linkCable: false
 SLPS-03185:
-  name: "Kids Station - Hitori de Dekiru mon! (Japan)"
+  name: "Kids Station - Hitori de Dekiru mon!"
+  saveName: "Kids Station - Hitori de Dekiru mon! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -84990,7 +89410,8 @@ SLPS-03185:
     multitap: false
     linkCable: false
 SLPS-03169:
-  name: "Kids Station - Hitori de Dekiru mon! (Japan) (Controller Set)"
+  name: "Kids Station - Hitori de Dekiru mon! (Controller Set)"
+  saveName: "Kids Station - Hitori de Dekiru mon! (Japan) (Controller Set)"
   controllers:
     - DigitalController
   metadata:
@@ -85008,7 +89429,8 @@ SLPS-03169:
     multitap: false
     linkCable: false
 SLPS-03403:
-  name: "Kids Station - Kamen Rider Heroes (Japan)"
+  name: "Kids Station - Kamen Rider Heroes"
+  saveName: "Kids Station - Kamen Rider Heroes (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85027,7 +89449,8 @@ SLPS-03403:
     multitap: false
     linkCable: false
 SLPS-03402:
-  name: "Kids Station - Kamen Rider Heroes (Japan) (Controller Set)"
+  name: "Kids Station - Kamen Rider Heroes (Controller Set)"
+  saveName: "Kids Station - Kamen Rider Heroes (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85065,7 +89488,8 @@ SLPS-02699:
     multitap: false
     linkCable: false
 SLPS-02874:
-  name: "Kids Station - Kikansha Thomas to Nakama-tachi (Japan)"
+  name: "Kids Station - Kikansha Thomas to Nakama-tachi"
+  saveName: "Kids Station - Kikansha Thomas to Nakama-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85084,7 +89508,8 @@ SLPS-02874:
     multitap: false
     linkCable: false
 SLPM-87001:
-  name: "Kids Station - Kuma no Pooh-san - Mori no Kyoushitsu (Japan)"
+  name: "Kids Station - Kuma no Pooh-san - Mori no Kyoushitsu"
+  saveName: "Kids Station - Kuma no Pooh-san - Mori no Kyoushitsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85103,7 +89528,8 @@ SLPM-87001:
     multitap: false
     linkCable: false
 SLPM-87000:
-  name: "Kids Station - Kuma no Pooh-san - Mori no Kyoushitsu (Japan) (Controller Set)"
+  name: "Kids Station - Kuma no Pooh-san - Mori no Kyoushitsu (Controller Set)"
+  saveName: "Kids Station - Kuma no Pooh-san - Mori no Kyoushitsu (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85122,7 +89548,8 @@ SLPM-87000:
     multitap: false
     linkCable: false
 SLPM-86933:
-  name: "Kids Station - Kuma no Pooh-san - Mori no Nakama to 1, 2, 3 (Japan)"
+  name: "Kids Station - Kuma no Pooh-san - Mori no Nakama to 1, 2, 3"
+  saveName: "Kids Station - Kuma no Pooh-san - Mori no Nakama to 1, 2, 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85141,7 +89568,8 @@ SLPM-86933:
     multitap: false
     linkCable: false
 SLPM-86932:
-  name: "Kids Station - Kuma no Pooh-san - Mori no Nakama to 1, 2, 3 (Japan) (Controller Set)"
+  name: "Kids Station - Kuma no Pooh-san - Mori no Nakama to 1, 2, 3 (Controller Set)"
+  saveName: "Kids Station - Kuma no Pooh-san - Mori no Nakama to 1, 2, 3 (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85160,7 +89588,8 @@ SLPM-86932:
     multitap: false
     linkCable: false
 SLPM-86999:
-  name: "Kids Station - Kuma no Pooh-san - Mori no Tomodachi (Japan)"
+  name: "Kids Station - Kuma no Pooh-san - Mori no Tomodachi"
+  saveName: "Kids Station - Kuma no Pooh-san - Mori no Tomodachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85179,7 +89608,8 @@ SLPM-86999:
     multitap: false
     linkCable: false
 SLPM-86979:
-  name: "Kids Station - Kuma no Pooh-san - Mori no Tomodachi (Japan) (Controller Set)"
+  name: "Kids Station - Kuma no Pooh-san - Mori no Tomodachi (Controller Set)"
+  saveName: "Kids Station - Kuma no Pooh-san - Mori no Tomodachi (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85198,7 +89628,8 @@ SLPM-86979:
     multitap: false
     linkCable: false
 SLPS-03322:
-  name: "Kids Station - LEGO no Sekai (Japan)"
+  name: "Kids Station - LEGO no Sekai"
+  saveName: "Kids Station - LEGO no Sekai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85217,7 +89648,8 @@ SLPS-03322:
     multitap: false
     linkCable: false
 SLPS-02876:
-  name: "Kids Station - Magical Music Eigo de One - Two - Three! (Japan) (En,Ja)"
+  name: "Kids Station - Magical Music Eigo de One - Two - Three!"
+  saveName: "Kids Station - Magical Music Eigo de One - Two - Three! (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85237,7 +89669,8 @@ SLPS-02876:
     multitap: false
     linkCable: false
 SLPM-87003:
-  name: "Kids Station - Mickey & Minnie no Magical Kitchen (Japan) (En,Ja)"
+  name: "Kids Station - Mickey & Minnie no Magical Kitchen"
+  saveName: "Kids Station - Mickey & Minnie no Magical Kitchen (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85256,7 +89689,8 @@ SLPM-87003:
     multitap: false
     linkCable: false
 SLPM-87002:
-  name: "Kids Station - Mickey & Minnie no Magical Kitchen (Japan) (En,Ja) (Controller Set)"
+  name: "Kids Station - Mickey & Minnie no Magical Kitchen (Controller Set)"
+  saveName: "Kids Station - Mickey & Minnie no Magical Kitchen (Japan) (En,Ja) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85275,7 +89709,8 @@ SLPM-87002:
     multitap: false
     linkCable: false
 SLPM-86931:
-  name: "Kids Station - Mickey to Nakama-tachi - Kazu Asobi Iro Iro (Japan)"
+  name: "Kids Station - Mickey to Nakama-tachi - Kazu Asobi Iro Iro"
+  saveName: "Kids Station - Mickey to Nakama-tachi - Kazu Asobi Iro Iro (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85294,7 +89729,8 @@ SLPM-86931:
     multitap: false
     linkCable: false
 SLPM-86930:
-  name: "Kids Station - Mickey to Nakama-tachi - Kazu Asobi Iro Iro (Japan) (Controller Set)"
+  name: "Kids Station - Mickey to Nakama-tachi - Kazu Asobi Iro Iro (Controller Set)"
+  saveName: "Kids Station - Mickey to Nakama-tachi - Kazu Asobi Iro Iro (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85313,7 +89749,8 @@ SLPM-86930:
     multitap: false
     linkCable: false
 SLPS-03463:
-  name: "Kids Station - Mini-Moni. ni Naru no da Pyon! (Japan)"
+  name: "Kids Station - Mini-Moni. ni Naru no da Pyon!"
+  saveName: "Kids Station - Mini-Moni. ni Naru no da Pyon! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85332,7 +89769,8 @@ SLPS-03463:
     multitap: false
     linkCable: false
 SLPS-03462:
-  name: "Kids Station - Mini-Moni. ni Naru no da Pyon! (Japan) (Controller Set)"
+  name: "Kids Station - Mini-Moni. ni Naru no da Pyon! (Controller Set)"
+  saveName: "Kids Station - Mini-Moni. ni Naru no da Pyon! (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85370,7 +89808,8 @@ SLPS-03406:
     multitap: false
     linkCable: false
 SLPS-03247:
-  name: "Kids Station - Motto! Oja Majo DoReMi - Maho-dou Smile Party (Japan)"
+  name: "Kids Station - Motto! Oja Majo DoReMi - Maho-dou Smile Party"
+  saveName: "Kids Station - Motto! Oja Majo DoReMi - Maho-dou Smile Party (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85389,7 +89828,8 @@ SLPS-03247:
     multitap: false
     linkCable: false
 SLPS-03246:
-  name: "Kids Station - Motto! Oja Majo DoReMi - Maho-dou Smile Party (Japan) (Controller Set)"
+  name: "Kids Station - Motto! Oja Majo DoReMi - Maho-dou Smile Party (Controller Set)"
+  saveName: "Kids Station - Motto! Oja Majo DoReMi - Maho-dou Smile Party (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85408,7 +89848,8 @@ SLPS-03246:
     multitap: false
     linkCable: false
 SLPS-02875:
-  name: "Kids Station - Oja Majo DoReMi - Maho-dou Dance Carnival! (Japan)"
+  name: "Kids Station - Oja Majo DoReMi - Maho-dou Dance Carnival!"
+  saveName: "Kids Station - Oja Majo DoReMi - Maho-dou Dance Carnival! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85427,7 +89868,8 @@ SLPS-02875:
     multitap: false
     linkCable: false
 SLPS-02718:
-  name: "Kids Station - Oja Majo DoReMi - Maho-dou Dance Carnival! (Japan) (Controller Set)"
+  name: "Kids Station - Oja Majo DoReMi - Maho-dou Dance Carnival! (Controller Set)"
+  saveName: "Kids Station - Oja Majo DoReMi - Maho-dou Dance Carnival! (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85446,7 +89888,8 @@ SLPS-02718:
     multitap: false
     linkCable: false
 SLPS-03407:
-  name: "Kids Station - Oja Majo DoReMi Dokkan! Maho-dou Eigo Festival (Japan)"
+  name: "Kids Station - Oja Majo DoReMi Dokkan! Maho-dou Eigo Festival"
+  saveName: "Kids Station - Oja Majo DoReMi Dokkan! Maho-dou Eigo Festival (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85465,7 +89908,8 @@ SLPS-03407:
     multitap: false
     linkCable: false
 SLPS-03513:
-  name: "Kids Station - Oshaberi Oekaki - Soreike! Anpanman (Japan)"
+  name: "Kids Station - Oshaberi Oekaki - Soreike! Anpanman"
+  saveName: "Kids Station - Oshaberi Oekaki - Soreike! Anpanman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85484,7 +89928,8 @@ SLPS-03513:
     multitap: false
     linkCable: false
 SLPS-03512:
-  name: "Kids Station - Oshaberi Oekaki - Soreike! Anpanman (Japan) (Controller Set)"
+  name: "Kids Station - Oshaberi Oekaki - Soreike! Anpanman (Controller Set)"
+  saveName: "Kids Station - Oshaberi Oekaki - Soreike! Anpanman (Japan) (Controller Set)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85503,7 +89948,8 @@ SLPS-03512:
     multitap: false
     linkCable: false
 SLPS-03515:
-  name: "Kids Station - Oshaberi Oekaki Kikansha Thomas to Nakamatachi (Japan)"
+  name: "Kids Station - Oshaberi Oekaki Kikansha Thomas to Nakamatachi"
+  saveName: "Kids Station - Oshaberi Oekaki Kikansha Thomas to Nakamatachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85541,7 +89987,8 @@ SLPS-03514:
     multitap: false
     linkCable: false
 SLPM-87166:
-  name: "Kids Station - Plarail - Tetsudou Monoshiri Hyakka (Japan)"
+  name: "Kids Station - Plarail - Tetsudou Monoshiri Hyakka"
+  saveName: "Kids Station - Plarail - Tetsudou Monoshiri Hyakka (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85563,7 +90010,8 @@ SLPM-87166:
     multitap: false
     linkCable: false
 SLPS-03359:
-  name: "Kids Station - Ponkickies 21 - Game no Omocha-bako (Japan)"
+  name: "Kids Station - Ponkickies 21 - Game no Omocha-bako"
+  saveName: "Kids Station - Ponkickies 21 - Game no Omocha-bako (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85639,7 +90087,8 @@ SLPS-02700:
     multitap: false
     linkCable: false
 SLPS-02848:
-  name: "Kids Station - Soreike! Anpanman (Japan)"
+  name: "Kids Station - Soreike! Anpanman"
+  saveName: "Kids Station - Soreike! Anpanman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85658,7 +90107,8 @@ SLPS-02848:
     multitap: false
     linkCable: false
 SLPS-03197:
-  name: "Kids Station - Soreike! Anpanman 2 - Anpanman to Daibouken! (Japan)"
+  name: "Kids Station - Soreike! Anpanman 2 - Anpanman to Daibouken!"
+  saveName: "Kids Station - Soreike! Anpanman 2 - Anpanman to Daibouken! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85677,11 +90127,14 @@ SLPS-03197:
     multitap: false
     linkCable: false
 SLPS-03405:
-  name: "Kids Station - Soreike! Anpanman 3 - Sugoroku Anpanman (Japan)"
+  name: "Kids Station - Soreike! Anpanman 3 - Sugoroku Anpanman"
+  saveName: "Kids Station - Soreike! Anpanman 3 - Sugoroku Anpanman (Japan)"
 SLPM-87169:
-  name: "Kids Station - Ugoku Tomika Zukan (Japan)"
+  name: "Kids Station - Ugoku Tomika Zukan"
+  saveName: "Kids Station - Ugoku Tomika Zukan (Japan)"
 SLPS-03316:
-  name: "Kids Station - Ultraman Cosmos (Japan)"
+  name: "Kids Station - Ultraman Cosmos"
+  saveName: "Kids Station - Ultraman Cosmos (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85719,7 +90172,8 @@ SLPS-03315:
     multitap: false
     linkCable: false
 SLPS-03337:
-  name: "Kids Station - Unten Daisuki - Doki Doki - Norimono Daibouken (Japan)"
+  name: "Kids Station - Unten Daisuki - Doki Doki - Norimono Daibouken"
+  saveName: "Kids Station - Unten Daisuki - Doki Doki - Norimono Daibouken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -85737,7 +90191,8 @@ SLPS-03337:
     multitap: false
     linkCable: false
 SLPS-03173:
-  name: "Kids Station - Yancharu Moncha (Japan)"
+  name: "Kids Station - Yancharu Moncha"
+  saveName: "Kids Station - Yancharu Moncha (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -85773,7 +90228,8 @@ SLPS-03172:
     multitap: false
     linkCable: false
 SLPS-02370:
-  name: "Kiganjou (Japan)"
+  name: "Kiganjou"
+  saveName: "Kiganjou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85792,7 +90248,8 @@ SLPS-02370:
     multitap: false
     linkCable: false
 SLPS-00021:
-  name: "Kikuni Masahiko Jirushi - Warau Fukei-san Pachi-Slot Hunter (Japan)"
+  name: "Kikuni Masahiko Jirushi - Warau Fukei-san Pachi-Slot Hunter"
+  saveName: "Kikuni Masahiko Jirushi - Warau Fukei-san Pachi-Slot Hunter (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -85810,7 +90267,8 @@ SLPS-00021:
     multitap: false
     linkCable: false
 SCES-00035:
-  name: "Kileak - The Blood (Europe)"
+  name: "Kileak - The Blood"
+  saveName: "Kileak - The Blood (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -85828,7 +90286,8 @@ SCES-00035:
     multitap: false
     linkCable: false
 SCUS-94102:
-  name: "Kileak - The DNA Imperative (USA)"
+  name: "Kileak - The DNA Imperative"
+  saveName: "Kileak - The DNA Imperative (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -85846,7 +90305,8 @@ SCUS-94102:
     multitap: false
     linkCable: false
 SLPS-00027:
-  name: "Kileak, The Blood (Japan)"
+  name: "Kileak, The Blood"
+  saveName: "Kileak, The Blood (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -85864,7 +90324,8 @@ SLPS-00027:
     multitap: false
     linkCable: false
 SLPS-00170:
-  name: "Kileak, The Blood 2 - Reason in Madness (Japan)"
+  name: "Kileak, The Blood 2 - Reason in Madness"
+  saveName: "Kileak, The Blood 2 - Reason in Madness (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -85882,7 +90343,8 @@ SLPS-00170:
     multitap: false
     linkCable: false
 SLPS-02747:
-  name: "Killer Bass (Japan)"
+  name: "Killer Bass"
+  saveName: "Killer Bass (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85904,7 +90366,8 @@ SLPS-02747:
     multitap: false
     linkCable: false
 SLES-01878:
-  name: "Killer Loop (Europe) (En,Fr,De,Es,It)"
+  name: "Killer Loop"
+  saveName: "Killer Loop (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -85928,7 +90391,8 @@ SLES-01878:
     multitap: false
     linkCable: false
 SLUS-00938:
-  name: "Killer Loop (USA)"
+  name: "Killer Loop"
+  saveName: "Killer Loop (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -85951,11 +90415,13 @@ SLUS-00938:
     multitap: false
     linkCable: false
 SLUS-00390:
-  name: "Killing Time (USA) (Beta)"
+  name: "Killing Time (Beta)"
+  saveName: "Killing Time (USA) (Beta)"
   controllers:
     - DigitalController
 SLES-00446:
-  name: "Killing Zone (Europe)"
+  name: "Killing Zone"
+  saveName: "Killing Zone (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -85973,7 +90439,8 @@ SLES-00446:
     multitap: false
     linkCable: false
 SLPS-00296:
-  name: "Killing Zone (Japan)"
+  name: "Killing Zone"
+  saveName: "Killing Zone (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -85991,7 +90458,8 @@ SLPS-00296:
     multitap: false
     linkCable: false
 SLUS-00369:
-  name: "Killing Zone (USA)"
+  name: "Killing Zone"
+  saveName: "Killing Zone (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -86012,7 +90480,8 @@ SLUS-00369:
     multitap: false
     linkCable: false
 SLPS-01177:
-  name: "Kimagure My Baby - Musume no Sugoroku Seichouki (Japan)"
+  name: "Kimagure My Baby - Musume no Sugoroku Seichouki"
+  saveName: "Kimagure My Baby - Musume no Sugoroku Seichouki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86031,7 +90500,8 @@ SLPS-01177:
     multitap: true
     linkCable: false
 SLPS-02545:
-  name: "Kimero!! Hero Gakuen - Eiyuu ni Kotae Nashi (Japan)"
+  name: "Kimero!! Hero Gakuen - Eiyuu ni Kotae Nashi"
+  saveName: "Kimero!! Hero Gakuen - Eiyuu ni Kotae Nashi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86049,7 +90519,8 @@ SLPS-02545:
     multitap: false
     linkCable: false
 SLPS-02965:
-  name: "Kimi ni Steady (Japan)"
+  name: "Kimi ni Steady"
+  saveName: "Kimi ni Steady (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86087,7 +90558,8 @@ SLPS-02271:
     multitap: false
     linkCable: false
 SLPS-03072:
-  name: "Kimi no Kimochi, Boku no Kokoro - I've Posessed Your Body! (Japan)"
+  name: "Kimi no Kimochi, Boku no Kokoro - I've Posessed Your Body!"
+  saveName: "Kimi no Kimochi, Boku no Kokoro - I've Posessed Your Body! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86106,7 +90578,8 @@ SLPS-03072:
     multitap: false
     linkCable: false
 SLPS-00601:
-  name: "Kindaichi Shounen no Jikenbo - Hihoutou Aratanaru Sangeki (Japan)"
+  name: "Kindaichi Shounen no Jikenbo - Hihoutou Aratanaru Sangeki"
+  saveName: "Kindaichi Shounen no Jikenbo - Hihoutou Aratanaru Sangeki (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -86127,7 +90600,8 @@ SLPS-00601:
     multitap: false
     linkCable: false
 SLPS-01340:
-  name: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Japan) (Disc 1)"
+  name: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Disc 1)"
+  saveName: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Japan) (Disc 1)"
   discSet:
     name: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Japan)"
     serials:
@@ -86150,7 +90624,8 @@ SLPS-01340:
     multitap: false
     linkCable: false
 SLPS-01341:
-  name: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Japan) (Disc 2)"
+  name: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Disc 2)"
+  saveName: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Japan) (Disc 2)"
   discSet:
     name: "Kindaichi Shounen no Jikenbo - Jigoku Yuuen Satsujin Jiken (Japan)"
     serials:
@@ -86173,7 +90648,8 @@ SLPS-01341:
     multitap: false
     linkCable: false
 SLPS-02223:
-  name: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Japan) (Disc 1)"
+  name: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Disc 1)"
+  saveName: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Japan) (Disc 1)"
   discSet:
     name: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Japan)"
     serials:
@@ -86197,7 +90673,8 @@ SLPS-02223:
     multitap: false
     linkCable: false
 SLPS-02224:
-  name: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Japan) (Disc 2)"
+  name: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Disc 2)"
+  saveName: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Japan) (Disc 2)"
   discSet:
     name: "Kindaichi Shounen no Jikenbo 3 - Seiryuu Densetsu Satsujin Jiken (Japan)"
     serials:
@@ -86221,7 +90698,8 @@ SLPS-02224:
     multitap: false
     linkCable: false
 SLPS-00092:
-  name: "King of Bowling (Japan)"
+  name: "King of Bowling"
+  saveName: "King of Bowling (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86239,7 +90717,8 @@ SLPS-00092:
     multitap: false
     linkCable: false
 SLES-02916:
-  name: "King of Bowling 2 (Europe)"
+  name: "King of Bowling 2"
+  saveName: "King of Bowling 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -86257,7 +90736,8 @@ SLES-02916:
     multitap: false
     linkCable: false
 SLPS-01541:
-  name: "King of Bowling 2 - Professional Hen (Japan)"
+  name: "King of Bowling 2 - Professional Hen"
+  saveName: "King of Bowling 2 - Professional Hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86293,7 +90773,8 @@ SLPS-02688:
     multitap: false
     linkCable: false
 SLES-04049:
-  name: "King of Bowling 3 (Europe)"
+  name: "King of Bowling 3"
+  saveName: "King of Bowling 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86312,7 +90793,8 @@ SLES-04049:
     multitap: false
     linkCable: false
 SCES-00562:
-  name: "King of Fighters '95, The (Europe)"
+  name: "King of Fighters '95, The"
+  saveName: "King of Fighters '95, The (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -86330,7 +90812,8 @@ SCES-00562:
     multitap: false
     linkCable: false
 SLPS-00351:
-  name: "King of Fighters '95, The (Japan)"
+  name: "King of Fighters '95, The"
+  saveName: "King of Fighters '95, The (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -86351,7 +90834,8 @@ SLPS-00351:
     multitap: false
     linkCable: false
 SCUS-94205:
-  name: "King of Fighters '95, The (USA)"
+  name: "King of Fighters '95, The"
+  saveName: "King of Fighters '95, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -86372,7 +90856,8 @@ SCUS-94205:
     multitap: false
     linkCable: false
 SLPM-86110:
-  name: "King of Fighters '96, The (Japan)"
+  name: "King of Fighters '96, The"
+  saveName: "King of Fighters '96, The (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -86399,7 +90884,8 @@ SLPM-86110:
     multitap: false
     linkCable: false
 SLPM-86084:
-  name: "King of Fighters '97, The (Japan)"
+  name: "King of Fighters '97, The"
+  saveName: "King of Fighters '97, The (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -86423,7 +90909,8 @@ SLPM-86084:
     multitap: false
     linkCable: false
 SLPM-86201:
-  name: "King of Fighters '98, The - Dream Match Never Ends (Japan)"
+  name: "King of Fighters '98, The - Dream Match Never Ends"
+  saveName: "King of Fighters '98, The - Dream Match Never Ends (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -86446,7 +90933,8 @@ SLPM-86201:
     multitap: false
     linkCable: false
 SLPM-86435:
-  name: "King of Fighters '98, The - Dream Match Never Ends (Japan) (Rev 1)"
+  name: "King of Fighters '98, The - Dream Match Never Ends"
+  saveName: "King of Fighters '98, The - Dream Match Never Ends (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86467,7 +90955,8 @@ SLPM-86435:
     multitap: false
     linkCable: false
 SLPM-86462:
-  name: "King of Fighters '99, The (Japan)"
+  name: "King of Fighters '99, The"
+  saveName: "King of Fighters '99, The (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -86493,7 +90982,8 @@ SLPM-86462:
     multitap: false
     linkCable: false
 SLUS-01332:
-  name: "King of Fighters '99, The (USA)"
+  name: "King of Fighters '99, The"
+  saveName: "King of Fighters '99, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -86517,7 +91007,8 @@ SLUS-01332:
     multitap: false
     linkCable: false
 SLPM-86095:
-  name: "King of Fighters Kyo, The (Japan)"
+  name: "King of Fighters Kyo, The"
+  saveName: "King of Fighters Kyo, The (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -86538,7 +91029,8 @@ SLPM-86095:
     multitap: false
     linkCable: false
 SLPS-00524:
-  name: "King of Parlor (Japan)"
+  name: "King of Parlor"
+  saveName: "King of Parlor (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86556,7 +91048,8 @@ SLPS-00524:
     multitap: false
     linkCable: false
 SLPS-01423:
-  name: "King of Parlor 2 (Japan)"
+  name: "King of Parlor 2"
+  saveName: "King of Parlor 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86574,7 +91067,8 @@ SLPS-01423:
     multitap: false
     linkCable: false
 SLPS-01124:
-  name: "King of Producer (Japan)"
+  name: "King of Producer"
+  saveName: "King of Producer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86592,7 +91086,8 @@ SLPS-01124:
     multitap: false
     linkCable: false
 SLPS-00247:
-  name: "King of Stallion (Japan)"
+  name: "King of Stallion"
+  saveName: "King of Stallion (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86610,7 +91105,8 @@ SLPS-00247:
     multitap: false
     linkCable: false
 SCES-00510:
-  name: "King's Field (Europe) (En,Fr,De)"
+  name: "King's Field"
+  saveName: "King's Field (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -86628,7 +91124,8 @@ SCES-00510:
     multitap: false
     linkCable: false
 SLPS-00017:
-  name: "King's Field (Japan)"
+  name: "King's Field"
+  saveName: "King's Field (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -86648,7 +91145,8 @@ SLPS-00017:
     multitap: false
     linkCable: false
 SLUS-00158:
-  name: "King's Field (USA)"
+  name: "King's Field"
+  saveName: "King's Field (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -86669,7 +91167,8 @@ SLUS-00158:
     multitap: false
     linkCable: false
 SLPS-00069:
-  name: "King's Field II (Japan)"
+  name: "King's Field II"
+  saveName: "King's Field II (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -86689,7 +91188,8 @@ SLPS-00069:
     multitap: false
     linkCable: false
 SLPS-91003:
-  name: "King's Field II (Japan) (PlayStation the Best)"
+  name: "King's Field II (PlayStation the Best)"
+  saveName: "King's Field II (Japan) (PlayStation the Best)"
   controllers:
     - DigitalController
   metadata:
@@ -86707,7 +91207,8 @@ SLPS-91003:
     multitap: false
     linkCable: false
 SLPS-03579:
-  name: "King's Field II (Japan) (PlayStation the Best) (Rev 1)"
+  name: "King's Field II (PlayStation the Best)"
+  saveName: "King's Field II (Japan) (PlayStation the Best) (Rev 1)"
   controllers:
     - DigitalController
   codes:
@@ -86728,7 +91229,8 @@ SLPS-03579:
     multitap: false
     linkCable: false
 SLUS-00255:
-  name: "King's Field II (USA)"
+  name: "King's Field II"
+  saveName: "King's Field II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -86749,7 +91251,8 @@ SLUS-00255:
     multitap: false
     linkCable: false
 SLPS-00377:
-  name: "King's Field III (Japan)"
+  name: "King's Field III"
+  saveName: "King's Field III (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -86767,7 +91270,8 @@ SLPS-00377:
     multitap: false
     linkCable: false
 SLPS-03580:
-  name: "King's Field III (Japan) (Rev 1)"
+  name: "King's Field III"
+  saveName: "King's Field III (Japan) (Rev 1)"
   controllers:
     - DigitalController
   codes:
@@ -86788,7 +91292,8 @@ SLPS-03580:
     multitap: false
     linkCable: false
 SLPM-80029:
-  name: "King's Field III - Pilot Style (Japan)"
+  name: "King's Field III - Pilot Style"
+  saveName: "King's Field III - Pilot Style (Japan)"
 SLPS-91426:
   name: "King's Field III - The Story of Verdite [PSOne Books]"
   controllers:
@@ -86826,7 +91331,8 @@ SLPS-91401:
     multitap: false
     linkCable: false
 SCES-01659:
-  name: "Kingsley's Adventure (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
+  name: "Kingsley's Adventure"
+  saveName: "Kingsley's Adventure (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86856,7 +91362,8 @@ SCES-01659:
     multitap: false
     linkCable: false
 SLUS-00801:
-  name: "Kingsley's Adventure (USA)"
+  name: "Kingsley's Adventure"
+  saveName: "Kingsley's Adventure (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -86880,7 +91387,8 @@ SLUS-00801:
     multitap: false
     linkCable: false
 SLPM-86490:
-  name: "Kinniku Banzuke - Road to Sasuke (Japan)"
+  name: "Kinniku Banzuke - Road to Sasuke"
+  saveName: "Kinniku Banzuke - Road to Sasuke (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86902,7 +91410,8 @@ SLPM-86490:
     multitap: false
     linkCable: false
 SLPM-86381:
-  name: "Kinniku Banzuke Vol. 1 - Ore ga Saikyou no Otoko da! (Japan)"
+  name: "Kinniku Banzuke Vol. 1 - Ore ga Saikyou no Otoko da!"
+  saveName: "Kinniku Banzuke Vol. 1 - Ore ga Saikyou no Otoko da! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86921,7 +91430,8 @@ SLPM-86381:
     multitap: false
     linkCable: false
 SLPM-86457:
-  name: "Kinniku Banzuke Vol. 2 - Arata naru Genkai e no Chousen! (Japan)"
+  name: "Kinniku Banzuke Vol. 2 - Arata naru Genkai e no Chousen!"
+  saveName: "Kinniku Banzuke Vol. 2 - Arata naru Genkai e no Chousen! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86943,7 +91453,8 @@ SLPM-86457:
     multitap: false
     linkCable: false
 SLPM-86950:
-  name: "Kinniku Banzuke Vol. 3 - Saikyou no Challenger Tanjou! (Japan)"
+  name: "Kinniku Banzuke Vol. 3 - Saikyou no Challenger Tanjou!"
+  saveName: "Kinniku Banzuke Vol. 3 - Saikyou no Challenger Tanjou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -86984,7 +91495,8 @@ SLPM-86628:
     multitap: false
     linkCable: false
 SLES-03676:
-  name: "Kirikou (Europe) (En,Fr,De)"
+  name: "Kirikou"
+  saveName: "Kirikou (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87005,7 +91517,8 @@ SLES-03676:
     multitap: false
     linkCable: false
 SLES-03677:
-  name: "Kirikou (Europe) (Es,It,Pt)"
+  name: "Kirikou"
+  saveName: "Kirikou (Europe) (Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87026,7 +91539,8 @@ SLES-03677:
     multitap: false
     linkCable: false
 SLPM-86449:
-  name: "Kisha de Go! (Japan)"
+  name: "Kisha de Go!"
+  saveName: "Kisha de Go! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87045,7 +91559,8 @@ SLPM-86449:
     multitap: false
     linkCable: false
 SLPS-01821:
-  name: "Kita Denshi - Virtua Pachi-Slot (Japan)"
+  name: "Kita Denshi - Virtua Pachi-Slot"
+  saveName: "Kita Denshi - Virtua Pachi-Slot (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87064,7 +91579,8 @@ SLPS-01821:
     multitap: false
     linkCable: false
 SLPS-02746:
-  name: "Kita Denshi - Virtua Pachi-Slot 2 (Japan)"
+  name: "Kita Denshi - Virtua Pachi-Slot 2"
+  saveName: "Kita Denshi - Virtua Pachi-Slot 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87083,7 +91599,8 @@ SLPS-02746:
     multitap: false
     linkCable: false
 SLPS-01395:
-  name: "Kitchen Panic (Japan)"
+  name: "Kitchen Panic"
+  saveName: "Kitchen Panic (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -87104,7 +91621,8 @@ SLPS-01395:
     multitap: false
     linkCable: false
 SLPS-01566:
-  name: "Kitty the Kool! Kabuki de Tanoshiku Odotte Ne!! (Japan)"
+  name: "Kitty the Kool! Kabuki de Tanoshiku Odotte Ne!!"
+  saveName: "Kitty the Kool! Kabuki de Tanoshiku Odotte Ne!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87123,7 +91641,8 @@ SLPS-01566:
     multitap: false
     linkCable: false
 SLPM-87019:
-  name: "Kiwame Daidougi (Japan) (Major Wave)"
+  name: "Kiwame Daidougi (Major Wave)"
+  saveName: "Kiwame Daidougi (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -87141,7 +91660,8 @@ SLPM-87019:
     multitap: false
     linkCable: false
 SLPS-00379:
-  name: "Kiwame Daidougi - Tsumuya Tsumazaruya (Japan)"
+  name: "Kiwame Daidougi - Tsumuya Tsumazaruya"
+  saveName: "Kiwame Daidougi - Tsumuya Tsumazaruya (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87180,7 +91700,8 @@ SLPS-03567:
     multitap: false
     linkCable: false
 SLPS-02681:
-  name: "Kizuna toyuu Na no Pendant with Toybox Stories (Japan) (Disc 1)"
+  name: "Kizuna toyuu Na no Pendant with Toybox Stories (Disc 1)"
+  saveName: "Kizuna toyuu Na no Pendant with Toybox Stories (Japan) (Disc 1)"
   discSet:
     name: "Kizuna toyuu Na no Pendant with Toybox Stories (Japan)"
     serials:
@@ -87203,7 +91724,8 @@ SLPS-02681:
     multitap: false
     linkCable: false
 SLPS-02682:
-  name: "Kizuna toyuu Na no Pendant with Toybox Stories (Japan) (Disc 2)"
+  name: "Kizuna toyuu Na no Pendant with Toybox Stories (Disc 2)"
+  saveName: "Kizuna toyuu Na no Pendant with Toybox Stories (Japan) (Disc 2)"
   discSet:
     name: "Kizuna toyuu Na no Pendant with Toybox Stories (Japan)"
     serials:
@@ -87226,7 +91748,8 @@ SLPS-02682:
     multitap: false
     linkCable: false
 SLPS-02424:
-  name: "Klaymen Gun-Hockey (Japan)"
+  name: "Klaymen Gun-Hockey"
+  saveName: "Klaymen Gun-Hockey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87245,7 +91768,8 @@ SLPS-02424:
     multitap: false
     linkCable: false
 SLPS-01365:
-  name: "Klaymen Klaymen - Neverhood no Nazo (Japan)"
+  name: "Klaymen Klaymen - Neverhood no Nazo"
+  saveName: "Klaymen Klaymen - Neverhood no Nazo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87288,7 +91812,8 @@ SCPS-45296:
     multitap: false
     linkCable: false
 SLPS-01501:
-  name: "Klaymen Klaymen 2 - Skullmonkey no Gyakushuu (Japan)"
+  name: "Klaymen Klaymen 2 - Skullmonkey no Gyakushuu"
+  saveName: "Klaymen Klaymen 2 - Skullmonkey no Gyakushuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87311,11 +91836,13 @@ SLPS-01501:
     multitap: false
     linkCable: false
 PAPX-90053:
-  name: "Klaymen Series (Japan) (Demo)"
+  name: "Klaymen Series (Demo)"
+  saveName: "Klaymen Series (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00942:
-  name: "Klonoa - Door to Phantomile (Europe)"
+  name: "Klonoa - Door to Phantomile"
+  saveName: "Klonoa - Door to Phantomile (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -87337,7 +91864,8 @@ SCES-00942:
     multitap: false
     linkCable: false
 SCES-01185:
-  name: "Klonoa - Door to Phantomile (France)"
+  name: "Klonoa - Door to Phantomile"
+  saveName: "Klonoa - Door to Phantomile (France)"
   controllers:
     - DigitalController
   metadata:
@@ -87355,7 +91883,8 @@ SCES-01185:
     multitap: false
     linkCable: false
 SCES-01186:
-  name: "Klonoa - Door to Phantomile (Germany)"
+  name: "Klonoa - Door to Phantomile"
+  saveName: "Klonoa - Door to Phantomile (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -87373,7 +91902,8 @@ SCES-01186:
     multitap: false
     linkCable: false
 SCES-01187:
-  name: "Klonoa - Door to Phantomile (Italy)"
+  name: "Klonoa - Door to Phantomile"
+  saveName: "Klonoa - Door to Phantomile (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -87391,7 +91921,8 @@ SCES-01187:
     multitap: false
     linkCable: false
 SCES-01188:
-  name: "Klonoa - Door to Phantomile (Spain)"
+  name: "Klonoa - Door to Phantomile"
+  saveName: "Klonoa - Door to Phantomile (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -87412,7 +91943,8 @@ SCES-01188:
     multitap: false
     linkCable: false
 SLUS-00585:
-  name: "Klonoa - Door to Phantomile (USA)"
+  name: "Klonoa - Door to Phantomile"
+  saveName: "Klonoa - Door to Phantomile (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -87453,7 +91985,8 @@ SCPS-45516:
     multitap: true
     linkCable: false
 SLPS-03433:
-  name: "Klonoa Beach Volley - Saikyou Team Kettei-sen! (Japan)"
+  name: "Klonoa Beach Volley - Saikyou Team Kettei-sen!"
+  saveName: "Klonoa Beach Volley - Saikyou Team Kettei-sen! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87472,7 +92005,8 @@ SLPS-03433:
     multitap: true
     linkCable: false
 SCES-03922:
-  name: "Klonoa Beach Volleyball (Europe) (En,Fr,De,Es,It)"
+  name: "Klonoa Beach Volleyball"
+  saveName: "Klonoa Beach Volleyball (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87495,7 +92029,8 @@ SCES-03922:
     multitap: true
     linkCable: false
 SLPS-01531:
-  name: "Knight & Baby (Japan)"
+  name: "Knight & Baby"
+  saveName: "Knight & Baby (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87514,7 +92049,8 @@ SLPS-01531:
     multitap: false
     linkCable: false
 SLUS-00737:
-  name: "Knockout Kings (USA)"
+  name: "Knockout Kings"
+  saveName: "Knockout Kings (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87533,7 +92069,8 @@ SLUS-00737:
     multitap: false
     linkCable: false
 SLES-02322:
-  name: "Knockout Kings 2000 (Europe)"
+  name: "Knockout Kings 2000"
+  saveName: "Knockout Kings 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87552,7 +92089,8 @@ SLES-02322:
     multitap: false
     linkCable: false
 SLES-02323:
-  name: "Knockout Kings 2000 (France)"
+  name: "Knockout Kings 2000"
+  saveName: "Knockout Kings 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87571,7 +92109,8 @@ SLES-02323:
     multitap: false
     linkCable: false
 SLUS-00993:
-  name: "Knockout Kings 2000 (USA)"
+  name: "Knockout Kings 2000"
+  saveName: "Knockout Kings 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87590,7 +92129,8 @@ SLUS-00993:
     multitap: false
     linkCable: false
 SLES-03121:
-  name: "Knockout Kings 2001 (Europe)"
+  name: "Knockout Kings 2001"
+  saveName: "Knockout Kings 2001 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87609,7 +92149,8 @@ SLES-03121:
     multitap: false
     linkCable: false
 SLES-03122:
-  name: "Knockout Kings 2001 (France)"
+  name: "Knockout Kings 2001"
+  saveName: "Knockout Kings 2001 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87628,7 +92169,8 @@ SLES-03122:
     multitap: false
     linkCable: false
 SLUS-01269:
-  name: "Knockout Kings 2001 (USA)"
+  name: "Knockout Kings 2001"
+  saveName: "Knockout Kings 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87647,7 +92189,8 @@ SLUS-01269:
     multitap: false
     linkCable: false
 SLES-01448:
-  name: "Knockout Kings 99 (Europe)"
+  name: "Knockout Kings 99"
+  saveName: "Knockout Kings 99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87666,7 +92209,8 @@ SLES-01448:
     multitap: false
     linkCable: false
 SLES-01450:
-  name: "Knockout Kings 99 (France)"
+  name: "Knockout Kings 99"
+  saveName: "Knockout Kings 99 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87685,7 +92229,8 @@ SLES-01450:
     multitap: false
     linkCable: false
 SLPS-00922:
-  name: "Kochira Katsushika-ku Kameari Kouen Mae Hashutsujo - High-Tech Buil Shinkou Soshi Sakusen! no Maki (Japan)"
+  name: "Kochira Katsushika-ku Kameari Kouen Mae Hashutsujo - High-Tech Buil Shinkou Soshi Sakusen! no Maki"
+  saveName: "Kochira Katsushika-ku Kameari Kouen Mae Hashutsujo - High-Tech Buil Shinkou Soshi Sakusen! no Maki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87703,7 +92248,8 @@ SLPS-00922:
     multitap: false
     linkCable: false
 SLPS-03499:
-  name: "Kogepan - Pan mo Game o Yarurashii... (Japan)"
+  name: "Kogepan - Pan mo Game o Yarurashii..."
+  saveName: "Kogepan - Pan mo Game o Yarurashii... (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87722,7 +92268,8 @@ SLPS-03499:
     multitap: false
     linkCable: false
 SLPM-80195:
-  name: "Koguma-chan no Daibouken (Japan)"
+  name: "Koguma-chan no Daibouken"
+  saveName: "Koguma-chan no Daibouken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87740,7 +92287,8 @@ SLPM-80195:
     multitap: false
     linkCable: false
 SLPM-86847:
-  name: "Koiyohou (Japan)"
+  name: "Koiyohou"
+  saveName: "Koiyohou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87758,7 +92306,8 @@ SLPM-86847:
     multitap: false
     linkCable: false
 SLPS-00362:
-  name: "Kojima Takeo - Mahjong Teiou (Japan)"
+  name: "Kojima Takeo - Mahjong Teiou"
+  saveName: "Kojima Takeo - Mahjong Teiou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87776,7 +92325,8 @@ SLPS-00362:
     multitap: false
     linkCable: false
 SLPS-01354:
-  name: "Kojin Kyouju - La Lecon Particuliere (Japan)"
+  name: "Kojin Kyouju - La Lecon Particuliere"
+  saveName: "Kojin Kyouju - La Lecon Particuliere (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87795,7 +92345,8 @@ SLPS-01354:
     multitap: false
     linkCable: false
 SLPM-80204:
-  name: "Kojin Kyouju - La Lecon Particuliere (Japan) (Demo)"
+  name: "Kojin Kyouju - La Lecon Particuliere (Demo)"
+  saveName: "Kojin Kyouju - La Lecon Particuliere (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03434:
@@ -87818,7 +92369,8 @@ SLPS-03434:
     multitap: false
     linkCable: false
 SCPS-10133:
-  name: "Koko Hore! Pukka (Japan)"
+  name: "Koko Hore! Pukka"
+  saveName: "Koko Hore! Pukka (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87837,7 +92389,8 @@ SCPS-10133:
     multitap: false
     linkCable: false
 SLPS-00249:
-  name: "Kokumeikan (Japan)"
+  name: "Kokumeikan"
+  saveName: "Kokumeikan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87855,7 +92408,8 @@ SLPS-00249:
     multitap: false
     linkCable: false
 SLPS-91033:
-  name: "Kokumeikan (Japan) (Rev 1)"
+  name: "Kokumeikan"
+  saveName: "Kokumeikan (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -87891,7 +92445,8 @@ SLPS-91406:
     multitap: false
     linkCable: false
 SLPS-03121:
-  name: "Komotchi (Japan)"
+  name: "Komotchi"
+  saveName: "Komotchi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87910,7 +92465,8 @@ SLPS-03121:
     multitap: false
     linkCable: false
 SLPS-01894:
-  name: "Kon'ya mo Dorubako!! (Japan)"
+  name: "Kon'ya mo Dorubako!!"
+  saveName: "Kon'ya mo Dorubako!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87929,9 +92485,11 @@ SLPS-01894:
     multitap: false
     linkCable: false
 SLPS-02547:
-  name: "Kon'ya mo Dorubako!! 2000 (Japan)"
+  name: "Kon'ya mo Dorubako!! 2000"
+  saveName: "Kon'ya mo Dorubako!! 2000 (Japan)"
 SLPS-03328:
-  name: "Kon'ya mo Dorubako!! 2001 (Japan)"
+  name: "Kon'ya mo Dorubako!! 2001"
+  saveName: "Kon'ya mo Dorubako!! 2001 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -87950,7 +92508,8 @@ SLPS-03328:
     multitap: false
     linkCable: false
 SLPM-86228:
-  name: "Konami 80's Arcade Gallery (Japan)"
+  name: "Konami 80's Arcade Gallery"
+  saveName: "Konami 80's Arcade Gallery (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -87971,7 +92530,8 @@ SLPM-86228:
     multitap: false
     linkCable: false
 SLPM-86052:
-  name: "Konami Antiques - MSX Collection Vol. 1 (Japan)"
+  name: "Konami Antiques - MSX Collection Vol. 1"
+  saveName: "Konami Antiques - MSX Collection Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -87989,7 +92549,8 @@ SLPM-86052:
     multitap: false
     linkCable: false
 SLPM-86062:
-  name: "Konami Antiques - MSX Collection Vol. 2 (Japan)"
+  name: "Konami Antiques - MSX Collection Vol. 2"
+  saveName: "Konami Antiques - MSX Collection Vol. 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -88007,7 +92568,8 @@ SLPM-86062:
     multitap: false
     linkCable: false
 SCPS-45205:
-  name: "Konami Antiques - MSX Collection Vol. 3 (Japan, Asia)"
+  name: "Konami Antiques - MSX Collection Vol. 3"
+  saveName: "Konami Antiques - MSX Collection Vol. 3 (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -88046,7 +92608,8 @@ SCPS-45155:
     multitap: false
     linkCable: false
 SLUS-00945:
-  name: "Konami Arcade Classics (USA)"
+  name: "Konami Arcade Classics"
+  saveName: "Konami Arcade Classics (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -88068,9 +92631,11 @@ SLUS-00945:
     multitap: false
     linkCable: false
 SLPM-80081:
-  name: "Konami Best Collection - '96 Fuyu-'97 Haru-ban (Japan)"
+  name: "Konami Best Collection - '96 Fuyu-'97 Haru-ban"
+  saveName: "Konami Best Collection - '96 Fuyu-'97 Haru-ban (Japan)"
 SLES-00337:
-  name: "Konami Open Golf (Europe)"
+  name: "Konami Open Golf"
+  saveName: "Konami Open Golf (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -88088,7 +92653,8 @@ SLES-00337:
     multitap: false
     linkCable: false
 SCPS-10127:
-  name: "Koneko mo Issho (Japan)"
+  name: "Koneko mo Issho"
+  saveName: "Koneko mo Issho (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -88107,7 +92673,8 @@ SCPS-10127:
     multitap: false
     linkCable: false
 SLPM-86791:
-  name: "Konohana - TrueReport (Japan)"
+  name: "Konohana - TrueReport"
+  saveName: "Konohana - TrueReport (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -88129,7 +92696,8 @@ SLPM-86791:
     multitap: false
     linkCable: false
 SLPS-03479:
-  name: "KoroKoro Post nin (Japan)"
+  name: "KoroKoro Post nin"
+  saveName: "KoroKoro Post nin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -88184,7 +92752,8 @@ SLPS-02565:
     multitap: false
     linkCable: false
 SLPS-01885:
-  name: "Kosodate Quiz Motto My Angel (Japan)"
+  name: "Kosodate Quiz Motto My Angel"
+  saveName: "Kosodate Quiz Motto My Angel (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -88203,7 +92772,8 @@ SLPS-01885:
     multitap: false
     linkCable: false
 SLPS-00970:
-  name: "Kosodate Quiz My Angel (Japan)"
+  name: "Kosodate Quiz My Angel"
+  saveName: "Kosodate Quiz My Angel (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -88221,7 +92791,8 @@ SLPS-00970:
     multitap: false
     linkCable: false
 SLPS-02593:
-  name: "Koten Tsumego Shuu - Shijin no Maki (Japan)"
+  name: "Koten Tsumego Shuu - Shijin no Maki"
+  saveName: "Koten Tsumego Shuu - Shijin no Maki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -88257,7 +92828,8 @@ SLPS-00159:
     multitap: false
     linkCable: false
 SLES-04007:
-  name: "Kotobuki Grand Prix (Europe)"
+  name: "Kotobuki Grand Prix"
+  saveName: "Kotobuki Grand Prix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -88277,7 +92849,8 @@ SLES-04007:
     multitap: false
     linkCable: false
 SLPM-86926:
-  name: "Kotobuki Grand Prix - Mezase! Genchari King (Japan)"
+  name: "Kotobuki Grand Prix - Mezase! Genchari King"
+  saveName: "Kotobuki Grand Prix - Mezase! Genchari King (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -88326,7 +92899,8 @@ SCPS-45441:
     multitap: false
     linkCable: false
 SLES-02897:
-  name: "Koudelka (Europe) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (Europe) (Disc 1)"
   discSet:
     name: "Koudelka (Europe)"
     serials:
@@ -88354,7 +92928,8 @@ SLES-02897:
     multitap: false
     linkCable: false
 SLES-12897:
-  name: "Koudelka (Europe) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (Europe) (Disc 2)"
   discSet:
     name: "Koudelka (Europe)"
     serials:
@@ -88379,7 +92954,8 @@ SLES-12897:
     multitap: false
     linkCable: false
 SLES-22897:
-  name: "Koudelka (Europe) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (Europe) (Disc 3)"
   discSet:
     name: "Koudelka (Europe)"
     serials:
@@ -88404,7 +92980,8 @@ SLES-22897:
     multitap: false
     linkCable: false
 SLES-32897:
-  name: "Koudelka (Europe) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (Europe) (Disc 4)"
   discSet:
     name: "Koudelka (Europe)"
     serials:
@@ -88429,7 +93006,8 @@ SLES-32897:
     multitap: false
     linkCable: false
 SLES-02898:
-  name: "Koudelka (France) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (France) (Disc 1)"
   discSet:
     name: "Koudelka (France)"
     serials:
@@ -88457,7 +93035,8 @@ SLES-02898:
     multitap: false
     linkCable: false
 SLES-12898:
-  name: "Koudelka (France) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (France) (Disc 2)"
   discSet:
     name: "Koudelka (France)"
     serials:
@@ -88482,7 +93061,8 @@ SLES-12898:
     multitap: false
     linkCable: false
 SLES-22898:
-  name: "Koudelka (France) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (France) (Disc 3)"
   discSet:
     name: "Koudelka (France)"
     serials:
@@ -88507,7 +93087,8 @@ SLES-22898:
     multitap: false
     linkCable: false
 SLES-32898:
-  name: "Koudelka (France) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (France) (Disc 4)"
   discSet:
     name: "Koudelka (France)"
     serials:
@@ -88532,7 +93113,8 @@ SLES-32898:
     multitap: false
     linkCable: false
 SLES-02899:
-  name: "Koudelka (Germany) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (Germany) (Disc 1)"
   discSet:
     name: "Koudelka (Germany)"
     serials:
@@ -88560,7 +93142,8 @@ SLES-02899:
     multitap: false
     linkCable: false
 SLES-12899:
-  name: "Koudelka (Germany) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (Germany) (Disc 2)"
   discSet:
     name: "Koudelka (Germany)"
     serials:
@@ -88585,7 +93168,8 @@ SLES-12899:
     multitap: false
     linkCable: false
 SLES-22899:
-  name: "Koudelka (Germany) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (Germany) (Disc 3)"
   discSet:
     name: "Koudelka (Germany)"
     serials:
@@ -88610,7 +93194,8 @@ SLES-22899:
     multitap: false
     linkCable: false
 SLES-32899:
-  name: "Koudelka (Germany) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (Germany) (Disc 4)"
   discSet:
     name: "Koudelka (Germany)"
     serials:
@@ -88635,7 +93220,8 @@ SLES-32899:
     multitap: false
     linkCable: false
 SLES-02900:
-  name: "Koudelka (Italy) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (Italy) (Disc 1)"
   discSet:
     name: "Koudelka (Italy)"
     serials:
@@ -88663,7 +93249,8 @@ SLES-02900:
     multitap: false
     linkCable: false
 SLES-12900:
-  name: "Koudelka (Italy) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (Italy) (Disc 2)"
   discSet:
     name: "Koudelka (Italy)"
     serials:
@@ -88688,7 +93275,8 @@ SLES-12900:
     multitap: false
     linkCable: false
 SLES-22900:
-  name: "Koudelka (Italy) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (Italy) (Disc 3)"
   discSet:
     name: "Koudelka (Italy)"
     serials:
@@ -88713,7 +93301,8 @@ SLES-22900:
     multitap: false
     linkCable: false
 SLES-32900:
-  name: "Koudelka (Italy) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (Italy) (Disc 4)"
   discSet:
     name: "Koudelka (Italy)"
     serials:
@@ -88738,7 +93327,8 @@ SLES-32900:
     multitap: false
     linkCable: false
 SLPS-02460:
-  name: "Koudelka (Japan) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (Japan) (Disc 1)"
   discSet:
     name: "Koudelka (Japan)"
     serials:
@@ -88766,7 +93356,8 @@ SLPS-02460:
     multitap: false
     linkCable: false
 SLPS-02461:
-  name: "Koudelka (Japan) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (Japan) (Disc 2)"
   discSet:
     name: "Koudelka (Japan)"
     serials:
@@ -88794,7 +93385,8 @@ SLPS-02461:
     multitap: false
     linkCable: false
 SLPS-02462:
-  name: "Koudelka (Japan) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (Japan) (Disc 3)"
   discSet:
     name: "Koudelka (Japan)"
     serials:
@@ -88822,7 +93414,8 @@ SLPS-02462:
     multitap: false
     linkCable: false
 SLPS-02463:
-  name: "Koudelka (Japan) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (Japan) (Disc 4)"
   discSet:
     name: "Koudelka (Japan)"
     serials:
@@ -88850,15 +93443,18 @@ SLPS-02463:
     multitap: false
     linkCable: false
 SLPM-80489:
-  name: "Koudelka (Japan) (Promotion-ban)"
+  name: "Koudelka (Promotion-ban)"
+  saveName: "Koudelka (Japan) (Promotion-ban)"
   traits:
     - DisableWidescreen
 SLPM-80490:
-  name: "Koudelka (Japan) (Taikenban)"
+  name: "Koudelka (Taikenban)"
+  saveName: "Koudelka (Japan) (Taikenban)"
   traits:
     - DisableWidescreen
 SLES-02901:
-  name: "Koudelka (Spain) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (Spain) (Disc 1)"
   discSet:
     name: "Koudelka (Spain)"
     serials:
@@ -88886,7 +93482,8 @@ SLES-02901:
     multitap: false
     linkCable: false
 SLES-12901:
-  name: "Koudelka (Spain) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (Spain) (Disc 2)"
   discSet:
     name: "Koudelka (Spain)"
     serials:
@@ -88911,7 +93508,8 @@ SLES-12901:
     multitap: false
     linkCable: false
 SLES-22901:
-  name: "Koudelka (Spain) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (Spain) (Disc 3)"
   discSet:
     name: "Koudelka (Spain)"
     serials:
@@ -88936,7 +93534,8 @@ SLES-22901:
     multitap: false
     linkCable: false
 SLES-32901:
-  name: "Koudelka (Spain) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (Spain) (Disc 4)"
   discSet:
     name: "Koudelka (Spain)"
     serials:
@@ -88961,7 +93560,8 @@ SLES-32901:
     multitap: false
     linkCable: false
 SLUS-01051:
-  name: "Koudelka (USA) (Disc 1)"
+  name: "Koudelka (Disc 1)"
+  saveName: "Koudelka (USA) (Disc 1)"
   discSet:
     name: "Koudelka (USA)"
     serials:
@@ -88991,7 +93591,8 @@ SLUS-01051:
     multitap: false
     linkCable: false
 SLUS-01100:
-  name: "Koudelka (USA) (Disc 2)"
+  name: "Koudelka (Disc 2)"
+  saveName: "Koudelka (USA) (Disc 2)"
   discSet:
     name: "Koudelka (USA)"
     serials:
@@ -89018,7 +93619,8 @@ SLUS-01100:
     multitap: false
     linkCable: false
 SLUS-01101:
-  name: "Koudelka (USA) (Disc 3)"
+  name: "Koudelka (Disc 3)"
+  saveName: "Koudelka (USA) (Disc 3)"
   discSet:
     name: "Koudelka (USA)"
     serials:
@@ -89045,7 +93647,8 @@ SLUS-01101:
     multitap: false
     linkCable: false
 SLUS-01102:
-  name: "Koudelka (USA) (Disc 4)"
+  name: "Koudelka (Disc 4)"
+  saveName: "Koudelka (USA) (Disc 4)"
   discSet:
     name: "Koudelka (USA)"
     serials:
@@ -89072,9 +93675,11 @@ SLUS-01102:
     multitap: false
     linkCable: false
 SLPM-80567:
-  name: "Kougien CD-ROM 2000-nen Natsu-ban (Japan)"
+  name: "Kougien CD-ROM 2000-nen Natsu-ban"
+  saveName: "Kougien CD-ROM 2000-nen Natsu-ban (Japan)"
 SLPS-00684:
-  name: "Koukai Sarenakatta Shuki (Japan)"
+  name: "Koukai Sarenakatta Shuki"
+  saveName: "Koukai Sarenakatta Shuki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89092,7 +93697,8 @@ SLPS-00684:
     multitap: false
     linkCable: false
 SCPS-10043:
-  name: "Koukaku Kidoutai - Ghost in the Shell (Japan)"
+  name: "Koukaku Kidoutai - Ghost in the Shell"
+  saveName: "Koukaku Kidoutai - Ghost in the Shell (Japan)"
   controllers:
     - DigitalController
   settings:
@@ -89112,19 +93718,22 @@ SCPS-10043:
     multitap: false
     linkCable: false
 PCPX-96068:
-  name: "Koukaku Kidoutai - Ghost in the Shell (Japan) (Demo 1)"
+  name: "Koukaku Kidoutai - Ghost in the Shell (Demo 1)"
+  saveName: "Koukaku Kidoutai - Ghost in the Shell (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   settings:
     gpuPGXPPreserveProjFP: true # Improves appearance of floor tiles.
 PAPX-90020:
-  name: "Koukaku Kidoutai - Ghost in the Shell (Japan) (Demo 2)"
+  name: "Koukaku Kidoutai - Ghost in the Shell (Demo 2)"
+  saveName: "Koukaku Kidoutai - Ghost in the Shell (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   settings:
     gpuPGXPPreserveProjFP: true # Improves appearance of floor tiles.
 SCPS-10136:
-  name: "Koukidou Gensou - Gunparade March (Japan)"
+  name: "Koukidou Gensou - Gunparade March"
+  saveName: "Koukidou Gensou - Gunparade March (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89143,7 +93752,8 @@ SCPS-10136:
     multitap: false
     linkCable: false
 SLPS-03283:
-  name: "Kouklotheatro - Yuukyuu no Hitomi (Japan)"
+  name: "Kouklotheatro - Yuukyuu no Hitomi"
+  saveName: "Kouklotheatro - Yuukyuu no Hitomi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89181,7 +93791,8 @@ SLPS-02385:
     multitap: false
     linkCable: false
 SCPS-10137:
-  name: "Koukyaku Kikou Shidan - Bein Panzer (Japan)"
+  name: "Koukyaku Kikou Shidan - Bein Panzer"
+  saveName: "Koukyaku Kikou Shidan - Bein Panzer (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89200,7 +93811,8 @@ SCPS-10137:
     multitap: false
     linkCable: false
 SLPS-02955:
-  name: "Kouni Shougun (Japan)"
+  name: "Kouni Shougun"
+  saveName: "Kouni Shougun (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89219,7 +93831,8 @@ SLPS-02955:
     multitap: false
     linkCable: false
 SLPS-00577:
-  name: "Kouryuu Sangoku Engi (Japan)"
+  name: "Kouryuu Sangoku Engi"
+  saveName: "Kouryuu Sangoku Engi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89255,7 +93868,8 @@ SLPS-02550:
     multitap: false
     linkCable: false
 SLPS-01338:
-  name: "Kouryuuki (Japan)"
+  name: "Kouryuuki"
+  saveName: "Kouryuuki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89291,7 +93905,8 @@ SLPM-87350:
     multitap: false
     linkCable: false
 SLPS-00729:
-  name: "Koushien V (Japan)"
+  name: "Koushien V"
+  saveName: "Koushien V (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89309,7 +93924,8 @@ SLPS-00729:
     multitap: false
     linkCable: false
 SLPS-00431:
-  name: "Koutetsu Reiiki - Steeldom (Japan)"
+  name: "Koutetsu Reiiki - Steeldom"
+  saveName: "Koutetsu Reiiki - Steeldom (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89327,7 +93943,8 @@ SLPS-00431:
     multitap: false
     linkCable: false
 SLPS-01775:
-  name: "Kouyasai - A Sherd of Youthful Memories (Japan)"
+  name: "Kouyasai - A Sherd of Youthful Memories"
+  saveName: "Kouyasai - A Sherd of Youthful Memories (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89345,11 +93962,13 @@ SLPS-01775:
     multitap: false
     linkCable: false
 SLPM-80420:
-  name: "Kouyasai - A Sherd of Youthful Memories (Japan) (Demo)"
+  name: "Kouyasai - A Sherd of Youthful Memories (Demo)"
+  saveName: "Kouyasai - A Sherd of Youthful Memories (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03454:
-  name: "Kowai Shashin - Shinrei Shashin Kitan (Japan)"
+  name: "Kowai Shashin - Shinrei Shashin Kitan"
+  saveName: "Kowai Shashin - Shinrei Shashin Kitan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89368,7 +93987,8 @@ SLPS-03454:
     multitap: false
     linkCable: false
 SLPM-80080:
-  name: "Kowloon's Gate (Japan) (Special Disc)"
+  name: "Kowloon's Gate (Special Disc)"
+  saveName: "Kowloon's Gate (Japan) (Special Disc)"
 SLPS-00706:
   name: "Kowloon's Gate - Kowloon Feng Shui Den"
   controllers:
@@ -89416,7 +94036,8 @@ SLPS-02975:
     multitap: false
     linkCable: false
 SCPS-45014:
-  name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 1) (Byakko)"
+  name: "Kowloon's Gate - Kowloon Fuusuiden (Disc 1) (Byakko)"
+  saveName: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 1) (Byakko)"
   discSet:
     name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia)"
     serials:
@@ -89444,7 +94065,8 @@ SCPS-45014:
     multitap: false
     linkCable: false
 SCPS-45015:
-  name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 2) (Genbu)"
+  name: "Kowloon's Gate - Kowloon Fuusuiden (Disc 2) (Genbu)"
+  saveName: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 2) (Genbu)"
   discSet:
     name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia)"
     serials:
@@ -89472,7 +94094,8 @@ SCPS-45015:
     multitap: false
     linkCable: false
 SCPS-45016:
-  name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 3) (Suzaku)"
+  name: "Kowloon's Gate - Kowloon Fuusuiden (Disc 3) (Suzaku)"
+  saveName: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 3) (Suzaku)"
   discSet:
     name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia)"
     serials:
@@ -89500,7 +94123,8 @@ SCPS-45016:
     multitap: false
     linkCable: false
 SCPS-45017:
-  name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 4) (Seiryuu)"
+  name: "Kowloon's Gate - Kowloon Fuusuiden (Disc 4) (Seiryuu)"
+  saveName: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia) (Disc 4) (Seiryuu)"
   discSet:
     name: "Kowloon's Gate - Kowloon Fuusuiden (Japan, Asia)"
     serials:
@@ -89528,7 +94152,8 @@ SCPS-45017:
     multitap: false
     linkCable: false
 SLPS-03063:
-  name: "Kowloon-jou (Japan)"
+  name: "Kowloon-jou"
+  saveName: "Kowloon-jou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89547,7 +94172,8 @@ SLPS-03063:
     multitap: false
     linkCable: false
 SLES-00084:
-  name: "Krazy Ivan (Europe)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -89565,7 +94191,8 @@ SLES-00084:
     multitap: false
     linkCable: true
 SLES-00128:
-  name: "Krazy Ivan (France)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (France)"
   controllers:
     - DigitalController
   metadata:
@@ -89583,7 +94210,8 @@ SLES-00128:
     multitap: false
     linkCable: true
 SLES-00127:
-  name: "Krazy Ivan (Germany)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -89601,7 +94229,8 @@ SLES-00127:
     multitap: false
     linkCable: true
 SLES-00125:
-  name: "Krazy Ivan (Italy)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -89619,7 +94248,8 @@ SLES-00125:
     multitap: false
     linkCable: true
 SLPS-00492:
-  name: "Krazy Ivan (Japan)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89637,7 +94267,8 @@ SLPS-00492:
     multitap: false
     linkCable: true
 SLES-00126:
-  name: "Krazy Ivan (Spain)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -89655,7 +94286,8 @@ SLES-00126:
     multitap: false
     linkCable: true
 SCUS-94303:
-  name: "Krazy Ivan (USA)"
+  name: "Krazy Ivan"
+  saveName: "Krazy Ivan (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -89673,7 +94305,8 @@ SCUS-94303:
     multitap: false
     linkCable: true
 SCES-01000:
-  name: "Kula World (Europe)"
+  name: "Kula World"
+  saveName: "Kula World (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -89695,7 +94328,8 @@ SCES-01000:
     multitap: false
     linkCable: false
 SCPS-10064:
-  name: "KulaQuest (Japan)"
+  name: "KulaQuest"
+  saveName: "KulaQuest (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -89717,13 +94351,15 @@ SCPS-10064:
     multitap: false
     linkCable: false
 PCPX-96121:
-  name: "KulaQuest (Japan) (Demo)"
+  name: "KulaQuest (Demo)"
+  saveName: "KulaQuest (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SLPS-00115:
-  name: "Kuma no Pooh-tarou - Sora wa Pink da! Zen'in Shuugou!! (Japan)"
+  name: "Kuma no Pooh-tarou - Sora wa Pink da! Zen'in Shuugou!!"
+  saveName: "Kuma no Pooh-tarou - Sora wa Pink da! Zen'in Shuugou!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89741,7 +94377,8 @@ SLPS-00115:
     multitap: true
     linkCable: false
 SLPS-01208:
-  name: "Kumitate Battle Kuttu Ketto (Japan)"
+  name: "Kumitate Battle Kuttu Ketto"
+  saveName: "Kumitate Battle Kuttu Ketto (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89759,7 +94396,8 @@ SLPS-01208:
     multitap: false
     linkCable: false
 SLPS-01773:
-  name: "Kunoichi Torimonochou (Japan)"
+  name: "Kunoichi Torimonochou"
+  saveName: "Kunoichi Torimonochou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89777,7 +94415,8 @@ SLPS-01773:
     multitap: false
     linkCable: false
 SLPS-01676:
-  name: "Kuon no Kizuna (Japan)"
+  name: "Kuon no Kizuna"
+  saveName: "Kuon no Kizuna (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89796,7 +94435,8 @@ SLPS-01676:
     multitap: false
     linkCable: false
 PAPX-90045:
-  name: "Kurashi Iki! Iki! PlayStation Welcome Disc (Japan)"
+  name: "Kurashi Iki! Iki! PlayStation Welcome Disc"
+  saveName: "Kurashi Iki! Iki! PlayStation Welcome Disc (Japan)"
 SLPS-02464:
   name: "Kuri Skunk [Reprint]"
   controllers:
@@ -89816,7 +94456,8 @@ SLPS-02464:
     multitap: false
     linkCable: false
 SLPS-00505:
-  name: "Kuro no Juusan (Japan)"
+  name: "Kuro no Juusan"
+  saveName: "Kuro no Juusan (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -89837,7 +94478,8 @@ SLPS-00505:
     multitap: false
     linkCable: false
 SLPS-01030:
-  name: "Kuro no Ken - Blade of the Darkness (Japan)"
+  name: "Kuro no Ken - Blade of the Darkness"
+  saveName: "Kuro no Ken - Blade of the Darkness (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89855,7 +94497,8 @@ SLPS-01030:
     multitap: false
     linkCable: false
 SLPS-01450:
-  name: "Kuroi Hitomi no Noir - Cielgris Fantasm (Japan)"
+  name: "Kuroi Hitomi no Noir - Cielgris Fantasm"
+  saveName: "Kuroi Hitomi no Noir - Cielgris Fantasm (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89874,7 +94517,8 @@ SLPS-01450:
     multitap: false
     linkCable: false
 SLUS-01125:
-  name: "Kurt Warner's Arena Football Unleashed (USA)"
+  name: "Kurt Warner's Arena Football Unleashed"
+  saveName: "Kurt Warner's Arena Football Unleashed (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89893,7 +94537,8 @@ SLUS-01125:
     multitap: true
     linkCable: true
 SLPM-86634:
-  name: "Kuru Kuru Cube (Japan)"
+  name: "Kuru Kuru Cube"
+  saveName: "Kuru Kuru Cube (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89911,7 +94556,8 @@ SLPM-86634:
     multitap: false
     linkCable: false
 SLPM-86785:
-  name: "Kuru Kuru Maru Maru (Japan)"
+  name: "Kuru Kuru Maru Maru"
+  saveName: "Kuru Kuru Maru Maru (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -89930,7 +94576,8 @@ SLPM-86785:
     multitap: false
     linkCable: false
 SLPS-00651:
-  name: "Kuru Kuru Panic (Japan)"
+  name: "Kuru Kuru Panic"
+  saveName: "Kuru Kuru Panic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89948,7 +94595,8 @@ SLPS-00651:
     multitap: false
     linkCable: false
 SLPS-00432:
-  name: "Kuru Kuru Twinkle - Onegai Ohoshi-sama (Japan)"
+  name: "Kuru Kuru Twinkle - Onegai Ohoshi-sama"
+  saveName: "Kuru Kuru Twinkle - Onegai Ohoshi-sama (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89966,7 +94614,8 @@ SLPS-00432:
     multitap: false
     linkCable: false
 SLPS-00786:
-  name: "Kurumi Miracle (Japan)"
+  name: "Kurumi Miracle"
+  saveName: "Kurumi Miracle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -89984,7 +94633,8 @@ SLPS-00786:
     multitap: false
     linkCable: false
 SLPS-00066:
-  name: "Kururin Pa! (Japan)"
+  name: "Kururin Pa!"
+  saveName: "Kururin Pa! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90002,7 +94652,8 @@ SLPS-00066:
     multitap: false
     linkCable: false
 SCES-00866:
-  name: "Kurushi (Europe) (En,Fr,De,Es,It)"
+  name: "Kurushi"
+  saveName: "Kurushi (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90025,7 +94676,8 @@ SCES-00866:
     multitap: false
     linkCable: false
 SCES-02009:
-  name: "Kurushi Final (Europe)"
+  name: "Kurushi Final"
+  saveName: "Kurushi Final (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90044,7 +94696,8 @@ SCES-02009:
     multitap: false
     linkCable: false
 SCES-02010:
-  name: "Kurushi Final (France)"
+  name: "Kurushi Final"
+  saveName: "Kurushi Final (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90063,7 +94716,8 @@ SCES-02010:
     multitap: false
     linkCable: false
 SCES-02011:
-  name: "Kurushi Final (Germany)"
+  name: "Kurushi Final"
+  saveName: "Kurushi Final (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90082,7 +94736,8 @@ SCES-02011:
     multitap: false
     linkCable: false
 SCES-02012:
-  name: "Kurushi Final (Italy)"
+  name: "Kurushi Final"
+  saveName: "Kurushi Final (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90101,7 +94756,8 @@ SCES-02012:
     multitap: false
     linkCable: false
 SCES-02013:
-  name: "Kurushi Final (Spain)"
+  name: "Kurushi Final"
+  saveName: "Kurushi Final (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90120,7 +94776,8 @@ SCES-02013:
     multitap: false
     linkCable: false
 SLPS-01854:
-  name: "Kuubo Senki (Japan)"
+  name: "Kuubo Senki"
+  saveName: "Kuubo Senki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90138,7 +94795,8 @@ SLPS-01854:
     multitap: false
     linkCable: false
 SLPM-86447:
-  name: "Kyaiin no Tanoshi Mail - PS. I Love You (Japan)"
+  name: "Kyaiin no Tanoshi Mail - PS. I Love You"
+  saveName: "Kyaiin no Tanoshi Mail - PS. I Love You (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90156,7 +94814,8 @@ SLPM-86447:
     multitap: false
     linkCable: false
 SLPS-01692:
-  name: "Kyoro-chan no Prikura Daisakusen (Japan)"
+  name: "Kyoro-chan no Prikura Daisakusen"
+  saveName: "Kyoro-chan no Prikura Daisakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90175,7 +94834,8 @@ SLPS-01692:
     multitap: false
     linkCable: false
 SLPS-03193:
-  name: "Kyoto Maiko Monogatari (Japan)"
+  name: "Kyoto Maiko Monogatari"
+  saveName: "Kyoto Maiko Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90193,7 +94853,8 @@ SLPS-03193:
     multitap: false
     linkCable: false
 SLPS-00503:
-  name: "Kyoufu Shinbun (Japan)"
+  name: "Kyoufu Shinbun"
+  saveName: "Kyoufu Shinbun (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90211,7 +94872,8 @@ SLPS-00503:
     multitap: false
     linkCable: false
 SLPS-00777:
-  name: "Kyousouba Ikusei Simulation - Derby Stallion (Japan)"
+  name: "Kyousouba Ikusei Simulation - Derby Stallion"
+  saveName: "Kyousouba Ikusei Simulation - Derby Stallion (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90229,7 +94891,8 @@ SLPS-00777:
     multitap: false
     linkCable: false
 SLPS-02299:
-  name: "Kyousouba Ikusei Simulation - Derby Stallion 99 (Japan)"
+  name: "Kyousouba Ikusei Simulation - Derby Stallion 99"
+  saveName: "Kyousouba Ikusei Simulation - Derby Stallion 99 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90247,7 +94910,8 @@ SLPS-02299:
     multitap: false
     linkCable: false
 SLPS-03451:
-  name: "Kyoutei Wars Makuru 6 (Japan)"
+  name: "Kyoutei Wars Makuru 6"
+  saveName: "Kyoutei Wars Makuru 6 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90267,7 +94931,8 @@ SLPS-03451:
     multitap: false
     linkCable: false
 SLPS-00214:
-  name: "Kyuiin (Japan)"
+  name: "Kyuiin"
+  saveName: "Kyuiin (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -90305,7 +94970,8 @@ SLPS-02628:
     multitap: false
     linkCable: false
 SLPS-00622:
-  name: "Kyuu Bakukku (Japan)"
+  name: "Kyuu Bakukku"
+  saveName: "Kyuu Bakukku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90323,7 +94989,8 @@ SLPS-00622:
     multitap: true
     linkCable: false
 SLPS-00475:
-  name: "Kyuukyoku no Soukoban (Japan)"
+  name: "Kyuukyoku no Soukoban"
+  saveName: "Kyuukyoku no Soukoban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -90341,7 +95008,8 @@ SLPS-00475:
     multitap: false
     linkCable: false
 SLPS-00031:
-  name: "Kyuutenkai (Japan)"
+  name: "Kyuutenkai"
+  saveName: "Kyuutenkai (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -90380,7 +95048,8 @@ SLPS-03222:
     multitap: false
     linkCable: false
 SLPS-02204:
-  name: "L no Kisetsu - A Piece of Memories (Japan)"
+  name: "L no Kisetsu - A Piece of Memories"
+  saveName: "L no Kisetsu - A Piece of Memories (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90399,7 +95068,8 @@ SLPS-02204:
     multitap: false
     linkCable: false
 SLPS-02203:
-  name: "L no Kisetsu - A Piece of Memories (Japan) (Shokai Genteiban)"
+  name: "L no Kisetsu - A Piece of Memories (Shokai Genteiban)"
+  saveName: "L no Kisetsu - A Piece of Memories (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90418,9 +95088,11 @@ SLPS-02203:
     multitap: false
     linkCable: false
 SLPM-80299:
-  name: "L'Arc-en-Ciel - Light my Fire (Japan)"
+  name: "L'Arc-en-Ciel - Light my Fire"
+  saveName: "L'Arc-en-Ciel - Light my Fire (Japan)"
 SLES-03303:
-  name: "L'ile LEGO 2 - La Revanche de Cassbrik (France)"
+  name: "L'ile LEGO 2 - La Revanche de Cassbrik"
+  saveName: "L'ile LEGO 2 - La Revanche de Cassbrik (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90439,7 +95111,8 @@ SLES-03303:
     multitap: false
     linkCable: false
 SLES-03301:
-  name: "LEGO Eiland 2 - De Wraak van Dondersteen (Netherlands)"
+  name: "LEGO Eiland 2 - De Wraak van Dondersteen"
+  saveName: "LEGO Eiland 2 - De Wraak van Dondersteen (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90458,7 +95131,8 @@ SLES-03301:
     multitap: false
     linkCable: false
 SLES-03304:
-  name: "LEGO Insel 2 - Der Steinbrecher kehrt zurueck (Germany)"
+  name: "LEGO Insel 2 - Der Steinbrecher kehrt zurueck"
+  saveName: "LEGO Insel 2 - Der Steinbrecher kehrt zurueck (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90477,7 +95151,8 @@ SLES-03304:
     multitap: false
     linkCable: false
 SLES-03299:
-  name: "LEGO Island 2 - The Brickster's Revenge (Europe)"
+  name: "LEGO Island 2 - The Brickster's Revenge"
+  saveName: "LEGO Island 2 - The Brickster's Revenge (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90496,7 +95171,8 @@ SLES-03299:
     multitap: false
     linkCable: false
 SLES-03306:
-  name: "LEGO Island 2 - The Brickster's Revenge (Norway)"
+  name: "LEGO Island 2 - The Brickster's Revenge"
+  saveName: "LEGO Island 2 - The Brickster's Revenge (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90515,9 +95191,11 @@ SLES-03306:
     multitap: false
     linkCable: false
 SLES-03309:
-  name: "LEGO Island 2 - The Brickster's Revenge (Portugal)"
+  name: "LEGO Island 2 - The Brickster's Revenge"
+  saveName: "LEGO Island 2 - The Brickster's Revenge (Portugal)"
 SLES-03307:
-  name: "LEGO Island 2 - The Brickster's Revenge (Spain)"
+  name: "LEGO Island 2 - The Brickster's Revenge"
+  saveName: "LEGO Island 2 - The Brickster's Revenge (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90536,7 +95214,8 @@ SLES-03307:
     multitap: false
     linkCable: false
 SLES-03308:
-  name: "LEGO Island 2 - The Brickster's Revenge (Sweden)"
+  name: "LEGO Island 2 - The Brickster's Revenge"
+  saveName: "LEGO Island 2 - The Brickster's Revenge (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90555,7 +95234,8 @@ SLES-03308:
     multitap: false
     linkCable: false
 SLUS-01246:
-  name: "LEGO Island 2 - The Brickster's Revenge (USA)"
+  name: "LEGO Island 2 - The Brickster's Revenge"
+  saveName: "LEGO Island 2 - The Brickster's Revenge (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -90577,7 +95257,8 @@ SLUS-01246:
     multitap: false
     linkCable: false
 SLES-03305:
-  name: "LEGO Isola 2 - La Rivincita del Briccone (Italy)"
+  name: "LEGO Isola 2 - La Rivincita del Briccone"
+  saveName: "LEGO Isola 2 - La Rivincita del Briccone (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90596,7 +95277,8 @@ SLES-03305:
     multitap: false
     linkCable: false
 SLES-03300:
-  name: "LEGO Oen 2 - Kim Cool's Haevn (Denmark)"
+  name: "LEGO Oen 2 - Kim Cool's Haevn"
+  saveName: "LEGO Oen 2 - Kim Cool's Haevn (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90615,7 +95297,8 @@ SLES-03300:
     multitap: false
     linkCable: false
 SLES-01207:
-  name: "LEGO Racers (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
+  name: "LEGO Racers"
+  saveName: "LEGO Racers (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -90649,7 +95332,8 @@ SLES-01207:
     multitap: false
     linkCable: false
 SLUS-00581:
-  name: "LEGO Racers (USA) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
+  name: "LEGO Racers"
+  saveName: "LEGO Racers (USA) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -90674,7 +95358,8 @@ SLUS-00581:
     multitap: false
     linkCable: false
 SLES-01690:
-  name: "LEGO Rock Raiders (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
+  name: "LEGO Rock Raiders"
+  saveName: "LEGO Rock Raiders (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90702,7 +95387,8 @@ SLES-01690:
     multitap: false
     linkCable: false
 SLUS-00937:
-  name: "LEGO Rock Raiders (USA)"
+  name: "LEGO Rock Raiders"
+  saveName: "LEGO Rock Raiders (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -90724,7 +95410,8 @@ SLUS-00937:
     multitap: false
     linkCable: false
 SLES-01016:
-  name: "LMA Manager (Europe)"
+  name: "LMA Manager"
+  saveName: "LMA Manager (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90743,7 +95430,8 @@ SLES-01016:
     multitap: false
     linkCable: false
 SLES-02975:
-  name: "LMA Manager 2001 (Europe)"
+  name: "LMA Manager 2001"
+  saveName: "LMA Manager 2001 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90763,7 +95451,8 @@ SLES-02975:
     multitap: false
     linkCable: false
 SLES-03603:
-  name: "LMA Manager 2002 (Europe)"
+  name: "LMA Manager 2002"
+  saveName: "LMA Manager 2002 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90783,7 +95472,8 @@ SLES-03603:
     multitap: false
     linkCable: false
 SLES-03064:
-  name: "LNF Stars 2001 (France)"
+  name: "LNF Stars 2001"
+  saveName: "LNF Stars 2001 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90820,7 +95510,8 @@ SLPS-01642:
     multitap: false
     linkCable: false
 SLPS-01556:
-  name: "LSD - Dream Emulator (Japan)"
+  name: "LSD - Dream Emulator"
+  saveName: "LSD - Dream Emulator (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1485-ge6156e2a"
@@ -90841,7 +95532,8 @@ SLPS-01556:
     multitap: false
     linkCable: false
 SLPM-87157:
-  name: "Lady Maid (Japan)"
+  name: "Lady Maid"
+  saveName: "Lady Maid (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90860,7 +95552,8 @@ SLPM-87157:
     multitap: false
     linkCable: false
 SLPS-02833:
-  name: "Lagnacure (Japan) (Artdink Best Choice)"
+  name: "Lagnacure (Artdink Best Choice)"
+  saveName: "Lagnacure (Japan) (Artdink Best Choice)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90879,7 +95572,8 @@ SLPS-02833:
     multitap: false
     linkCable: false
 SCPS-45120:
-  name: "Lagnacure (Japan, Asia)"
+  name: "Lagnacure"
+  saveName: "Lagnacure (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90901,7 +95595,8 @@ SCPS-45120:
     multitap: false
     linkCable: false
 SLPS-02832:
-  name: "Lagnacure Legend (Japan)"
+  name: "Lagnacure Legend"
+  saveName: "Lagnacure Legend (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90923,7 +95618,8 @@ SLPS-02832:
     multitap: false
     linkCable: false
 SLPS-00408:
-  name: "Lake Masters (Japan)"
+  name: "Lake Masters"
+  saveName: "Lake Masters (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -90944,7 +95640,8 @@ SLPS-00408:
     multitap: false
     linkCable: false
 SLPS-01342:
-  name: "Lake Masters 2 - Bass Fishing in Japan (Japan)"
+  name: "Lake Masters 2 - Bass Fishing in Japan"
+  saveName: "Lake Masters 2 - Bass Fishing in Japan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90963,7 +95660,8 @@ SLPS-01342:
     multitap: false
     linkCable: false
 SLPS-02069:
-  name: "Lake Masters 2 - Bass Fishing in Japan (Japan) (Fukkokuban)"
+  name: "Lake Masters 2 - Bass Fishing in Japan (Fukkokuban)"
+  saveName: "Lake Masters 2 - Bass Fishing in Japan (Japan) (Fukkokuban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -90982,7 +95680,8 @@ SLPS-02069:
     multitap: false
     linkCable: false
 SLPS-02177:
-  name: "Lake Masters Pro - Nihon Juudan Kuromasu Kikou (Japan)"
+  name: "Lake Masters Pro - Nihon Juudan Kuromasu Kikou"
+  saveName: "Lake Masters Pro - Nihon Juudan Kuromasu Kikou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91023,9 +95722,11 @@ SLPS-02869:
     multitap: false
     linkCable: false
 PAPX-90052:
-  name: "Lalala PlayStation Trial Disc - 1998 Summer (Japan)"
+  name: "Lalala PlayStation Trial Disc - 1998 Summer"
+  saveName: "Lalala PlayStation Trial Disc - 1998 Summer (Japan)"
 SLES-04055:
-  name: "Land Before Time, The - Big Water Adventure (Europe)"
+  name: "Land Before Time, The - Big Water Adventure"
+  saveName: "Land Before Time, The - Big Water Adventure (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91044,7 +95745,8 @@ SLES-04055:
     multitap: false
     linkCable: false
 SLUS-01481:
-  name: "Land Before Time, The - Big Water Adventure (USA)"
+  name: "Land Before Time, The - Big Water Adventure"
+  saveName: "Land Before Time, The - Big Water Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91063,7 +95765,8 @@ SLUS-01481:
     multitap: false
     linkCable: false
 SLUS-01213:
-  name: "Land Before Time, The - Great Valley Racing Adventure (USA)"
+  name: "Land Before Time, The - Great Valley Racing Adventure"
+  saveName: "Land Before Time, The - Great Valley Racing Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91083,7 +95786,8 @@ SLUS-01213:
     multitap: false
     linkCable: false
 SLES-03448:
-  name: "Land Before Time, The - Racing Adventure (Europe) (En,Fr,De,Es,It)"
+  name: "Land Before Time, The - Racing Adventure"
+  saveName: "Land Before Time, The - Racing Adventure (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91107,7 +95811,8 @@ SLES-03448:
     multitap: false
     linkCable: false
 SLES-02981:
-  name: "Land Before Time, The - Return to the Great Valley (Europe)"
+  name: "Land Before Time, The - Return to the Great Valley"
+  saveName: "Land Before Time, The - Return to the Great Valley (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91126,7 +95831,8 @@ SLES-02981:
     multitap: false
     linkCable: false
 SLUS-01043:
-  name: "Land Before Time, The - Return to the Great Valley (USA)"
+  name: "Land Before Time, The - Return to the Great Valley"
+  saveName: "Land Before Time, The - Return to the Great Valley (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91145,7 +95851,8 @@ SLUS-01043:
     multitap: false
     linkCable: false
 SLES-02682:
-  name: "Land Maker (Europe)"
+  name: "Land Maker"
+  saveName: "Land Maker (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91164,7 +95871,8 @@ SLES-02682:
     multitap: false
     linkCable: false
 SLPM-86394:
-  name: "Land Maker (Japan)"
+  name: "Land Maker"
+  saveName: "Land Maker (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91183,7 +95891,8 @@ SLPM-86394:
     multitap: false
     linkCable: false
 SLPM-86798:
-  name: "Langrisser I & II (Japan)"
+  name: "Langrisser I & II"
+  saveName: "Langrisser I & II (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -91205,7 +95914,8 @@ SLPM-86798:
     multitap: false
     linkCable: false
 SLPS-00896:
-  name: "Langrisser I & II (Japan) (Shokai Gentei Special Package)"
+  name: "Langrisser I & II (Shokai Gentei Special Package)"
+  saveName: "Langrisser I & II (Japan) (Shokai Gentei Special Package)"
   controllers:
     - DigitalController
   metadata:
@@ -91223,7 +95933,8 @@ SLPS-00896:
     multitap: false
     linkCable: false
 SLPS-01818:
-  name: "Langrisser IV & V - Final Edition (Japan) (Disc 1) (Langrisser IV Disc)"
+  name: "Langrisser IV & V - Final Edition (Disc 1) (Langrisser IV Disc)"
+  saveName: "Langrisser IV & V - Final Edition (Japan) (Disc 1) (Langrisser IV Disc)"
   discSet:
     name: "Langrisser IV & V - Final Edition (Japan)"
     serials:
@@ -91247,7 +95958,8 @@ SLPS-01818:
     multitap: false
     linkCable: false
 SLPS-01819:
-  name: "Langrisser IV & V - Final Edition (Japan) (Disc 2) (Langrisser V Disc)"
+  name: "Langrisser IV & V - Final Edition (Disc 2) (Langrisser V Disc)"
+  saveName: "Langrisser IV & V - Final Edition (Japan) (Disc 2) (Langrisser V Disc)"
   discSet:
     name: "Langrisser IV & V - Final Edition (Japan)"
     serials:
@@ -91271,7 +95983,8 @@ SLPS-01819:
     multitap: false
     linkCable: false
 SLES-03688:
-  name: "Largo Winch - Commando SAR (Europe) (En,De,Es,It)"
+  name: "Largo Winch - Commando SAR"
+  saveName: "Largo Winch - Commando SAR (Europe) (En,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91293,7 +96006,8 @@ SLES-03688:
     multitap: false
     linkCable: false
 SLES-03687:
-  name: "Largo Winch - Commando SAR (France)"
+  name: "Largo Winch - Commando SAR"
+  saveName: "Largo Winch - Commando SAR (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91312,7 +96026,8 @@ SLES-03687:
     multitap: false
     linkCable: false
 SLUS-01441:
-  name: "Largo Winch - Commando SAR (USA)"
+  name: "Largo Winch - Commando SAR"
+  saveName: "Largo Winch - Commando SAR (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91331,7 +96046,8 @@ SLUS-01441:
     multitap: false
     linkCable: false
 SLPS-00732:
-  name: "Las Vegas Dream 2 (Japan)"
+  name: "Las Vegas Dream 2"
+  saveName: "Las Vegas Dream 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -91349,7 +96065,8 @@ SLPS-00732:
     multitap: true
     linkCable: false
 SLES-00020:
-  name: "Last Report, The (Europe) (De,Nl)"
+  name: "Last Report, The"
+  saveName: "Last Report, The (Europe) (De,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -91368,11 +96085,13 @@ SLES-00020:
     multitap: false
     linkCable: false
 SLED-01365:
-  name: "Last Report, The (Europe) (En,De) (Demo)"
+  name: "Last Report, The (Demo)"
+  saveName: "Last Report, The (Europe) (En,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00889:
-  name: "Last Report, The (Europe) (En,Fr)"
+  name: "Last Report, The"
+  saveName: "Last Report, The (Europe) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -91391,7 +96110,8 @@ SLES-00889:
     multitap: false
     linkCable: false
 SLES-00029:
-  name: "Last Report, The (Europe) (Es,It)"
+  name: "Last Report, The"
+  saveName: "Last Report, The (Europe) (Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -91410,7 +96130,8 @@ SLES-00029:
     multitap: false
     linkCable: false
 SLPS-00923:
-  name: "Last Report, The (Japan)"
+  name: "Last Report, The"
+  saveName: "Last Report, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -91428,7 +96149,8 @@ SLPS-00923:
     multitap: false
     linkCable: false
 SLPM-86491:
-  name: "Lattice - 200EC7 (Japan)"
+  name: "Lattice - 200EC7"
+  saveName: "Lattice - 200EC7 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91447,7 +96169,8 @@ SLPM-86491:
     multitap: false
     linkCable: false
 SLPS-02344:
-  name: "Le Concert - ff - Fortissimo (Japan)"
+  name: "Le Concert - ff - Fortissimo"
+  saveName: "Le Concert - ff - Fortissimo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91469,7 +96192,8 @@ SLPS-02344:
     multitap: false
     linkCable: false
 SLPS-02343:
-  name: "Le Concert - pp - Pianissimo (Japan)"
+  name: "Le Concert - pp - Pianissimo"
+  saveName: "Le Concert - pp - Pianissimo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91491,7 +96215,8 @@ SLPS-02343:
     multitap: false
     linkCable: false
 SLES-01362:
-  name: "Le Mans 24 Hours (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Le Mans 24 Hours"
+  saveName: "Le Mans 24 Hours (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91517,11 +96242,13 @@ SLES-01362:
     multitap: false
     linkCable: false
 SCED-03202:
-  name: "Le Monde Des Bleus 2 (France) (Demo)"
+  name: "Le Monde Des Bleus 2 (Demo)"
+  saveName: "Le Monde Des Bleus 2 (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01886:
-  name: "Leading Jockey '99 (Japan)"
+  name: "Leading Jockey '99"
+  saveName: "Leading Jockey '99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91540,7 +96267,8 @@ SLPS-01886:
     multitap: false
     linkCable: false
 SLPS-00348:
-  name: "Leading Jockey Highbred (Japan)"
+  name: "Leading Jockey Highbred"
+  saveName: "Leading Jockey Highbred (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -91558,7 +96286,8 @@ SLPS-00348:
     multitap: false
     linkCable: false
 SLES-01301:
-  name: "Legacy of Kain - Soul Reaver (Europe)"
+  name: "Legacy of Kain - Soul Reaver"
+  saveName: "Legacy of Kain - Soul Reaver (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91578,11 +96307,13 @@ SLES-01301:
     multitap: false
     linkCable: false
 SLED-02252:
-  name: "Legacy of Kain - Soul Reaver (Europe) (Demo)"
+  name: "Legacy of Kain - Soul Reaver (Demo)"
+  saveName: "Legacy of Kain - Soul Reaver (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02024:
-  name: "Legacy of Kain - Soul Reaver (France)"
+  name: "Legacy of Kain - Soul Reaver"
+  saveName: "Legacy of Kain - Soul Reaver (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -91605,7 +96336,8 @@ SLES-02024:
     multitap: false
     linkCable: false
 SLES-02025:
-  name: "Legacy of Kain - Soul Reaver (Germany)"
+  name: "Legacy of Kain - Soul Reaver"
+  saveName: "Legacy of Kain - Soul Reaver (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91625,7 +96357,8 @@ SLES-02025:
     multitap: false
     linkCable: false
 SLES-02027:
-  name: "Legacy of Kain - Soul Reaver (Italy)"
+  name: "Legacy of Kain - Soul Reaver"
+  saveName: "Legacy of Kain - Soul Reaver (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91645,7 +96378,8 @@ SLES-02027:
     multitap: false
     linkCable: false
 SLES-02026:
-  name: "Legacy of Kain - Soul Reaver (Spain)"
+  name: "Legacy of Kain - Soul Reaver"
+  saveName: "Legacy of Kain - Soul Reaver (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -91668,7 +96402,8 @@ SLES-02026:
     multitap: false
     linkCable: false
 SLUS-00708:
-  name: "Legacy of Kain - Soul Reaver (USA)"
+  name: "Legacy of Kain - Soul Reaver"
+  saveName: "Legacy of Kain - Soul Reaver (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -91690,7 +96425,8 @@ SLUS-00708:
     multitap: false
     linkCable: false
 SCPS-10059:
-  name: "Legaia Densetsu (Japan)"
+  name: "Legaia Densetsu"
+  saveName: "Legaia Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -91711,7 +96447,8 @@ SCPS-10059:
     multitap: false
     linkCable: false
 PAPX-90055:
-  name: "Legaia Densetsu (Japan) (Demo)"
+  name: "Legaia Densetsu (Demo)"
+  saveName: "Legaia Densetsu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-91246:
@@ -91734,7 +96471,8 @@ SCPS-91246:
     multitap: false
     linkCable: false
 SLES-00730:
-  name: "Legend (Europe)"
+  name: "Legend"
+  saveName: "Legend (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -91752,7 +96490,8 @@ SLES-00730:
     multitap: false
     linkCable: false
 SCES-03043:
-  name: "Legend of Dragoon, The (Europe) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (Europe) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (Europe)"
     serials:
@@ -91781,7 +96520,8 @@ SCES-03043:
     multitap: false
     linkCable: false
 SCES-13043:
-  name: "Legend of Dragoon, The (Europe) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (Europe) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (Europe)"
     serials:
@@ -91810,7 +96550,8 @@ SCES-13043:
     multitap: false
     linkCable: false
 SCES-23043:
-  name: "Legend of Dragoon, The (Europe) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (Europe) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (Europe)"
     serials:
@@ -91839,7 +96580,8 @@ SCES-23043:
     multitap: false
     linkCable: false
 SCES-33043:
-  name: "Legend of Dragoon, The (Europe) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (Europe) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (Europe)"
     serials:
@@ -91868,7 +96610,8 @@ SCES-33043:
     multitap: false
     linkCable: false
 SCES-03044:
-  name: "Legend of Dragoon, The (France) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (France) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (France)"
     serials:
@@ -91897,7 +96640,8 @@ SCES-03044:
     multitap: false
     linkCable: false
 SCES-13044:
-  name: "Legend of Dragoon, The (France) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (France) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (France)"
     serials:
@@ -91926,7 +96670,8 @@ SCES-13044:
     multitap: false
     linkCable: false
 SCES-23044:
-  name: "Legend of Dragoon, The (France) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (France) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (France)"
     serials:
@@ -91955,7 +96700,8 @@ SCES-23044:
     multitap: false
     linkCable: false
 SCES-33044:
-  name: "Legend of Dragoon, The (France) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (France) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (France)"
     serials:
@@ -91984,7 +96730,8 @@ SCES-33044:
     multitap: false
     linkCable: false
 SCES-03045:
-  name: "Legend of Dragoon, The (Germany) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (Germany) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (Germany)"
     serials:
@@ -92013,7 +96760,8 @@ SCES-03045:
     multitap: false
     linkCable: false
 SCES-13045:
-  name: "Legend of Dragoon, The (Germany) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (Germany) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (Germany)"
     serials:
@@ -92042,7 +96790,8 @@ SCES-13045:
     multitap: false
     linkCable: false
 SCES-23045:
-  name: "Legend of Dragoon, The (Germany) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (Germany) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (Germany)"
     serials:
@@ -92071,7 +96820,8 @@ SCES-23045:
     multitap: false
     linkCable: false
 SCES-33045:
-  name: "Legend of Dragoon, The (Germany) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (Germany) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (Germany)"
     serials:
@@ -92100,7 +96850,8 @@ SCES-33045:
     multitap: false
     linkCable: false
 SCES-03046:
-  name: "Legend of Dragoon, The (Italy) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (Italy) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (Italy)"
     serials:
@@ -92129,7 +96880,8 @@ SCES-03046:
     multitap: false
     linkCable: false
 SCES-13046:
-  name: "Legend of Dragoon, The (Italy) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (Italy) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (Italy)"
     serials:
@@ -92158,7 +96910,8 @@ SCES-13046:
     multitap: false
     linkCable: false
 SCES-23046:
-  name: "Legend of Dragoon, The (Italy) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (Italy) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (Italy)"
     serials:
@@ -92187,7 +96940,8 @@ SCES-23046:
     multitap: false
     linkCable: false
 SCES-33046:
-  name: "Legend of Dragoon, The (Italy) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (Italy) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (Italy)"
     serials:
@@ -92216,21 +96970,24 @@ SCES-33046:
     multitap: false
     linkCable: false
 PAPX-90091:
-  name: "Legend of Dragoon, The (Japan) (Demo 1)"
+  name: "Legend of Dragoon, The (Demo 1)"
+  saveName: "Legend of Dragoon, The (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
 PAPX-90103:
-  name: "Legend of Dragoon, The (Japan) (Demo 2)"
+  name: "Legend of Dragoon, The (Demo 2)"
+  saveName: "Legend of Dragoon, The (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
 SCPS-10119:
-  name: "Legend of Dragoon, The (Japan) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (Japan) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (Japan)"
     serials:
@@ -92259,7 +97016,8 @@ SCPS-10119:
     multitap: false
     linkCable: false
 SCPS-10120:
-  name: "Legend of Dragoon, The (Japan) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (Japan) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (Japan)"
     serials:
@@ -92288,7 +97046,8 @@ SCPS-10120:
     multitap: false
     linkCable: false
 SCPS-10121:
-  name: "Legend of Dragoon, The (Japan) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (Japan) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (Japan)"
     serials:
@@ -92317,7 +97076,8 @@ SCPS-10121:
     multitap: false
     linkCable: false
 SCPS-10122:
-  name: "Legend of Dragoon, The (Japan) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (Japan) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (Japan)"
     serials:
@@ -92346,7 +97106,8 @@ SCPS-10122:
     multitap: false
     linkCable: false
 SCES-03047:
-  name: "Legend of Dragoon, The (Spain) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (Spain) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (Spain)"
     serials:
@@ -92378,7 +97139,8 @@ SCES-03047:
     multitap: false
     linkCable: false
 SCES-13047:
-  name: "Legend of Dragoon, The (Spain) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (Spain) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (Spain)"
     serials:
@@ -92410,7 +97172,8 @@ SCES-13047:
     multitap: false
     linkCable: false
 SCES-23047:
-  name: "Legend of Dragoon, The (Spain) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (Spain) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (Spain)"
     serials:
@@ -92442,7 +97205,8 @@ SCES-23047:
     multitap: false
     linkCable: false
 SCES-33047:
-  name: "Legend of Dragoon, The (Spain) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (Spain) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (Spain)"
     serials:
@@ -92474,7 +97238,8 @@ SCES-33047:
     multitap: false
     linkCable: false
 SCUS-94491:
-  name: "Legend of Dragoon, The (USA) (Disc 1)"
+  name: "Legend of Dragoon, The (Disc 1)"
+  saveName: "Legend of Dragoon, The (USA) (Disc 1)"
   discSet:
     name: "Legend of Dragoon, The (USA)"
     serials:
@@ -92506,7 +97271,8 @@ SCUS-94491:
     multitap: false
     linkCable: false
 SCUS-94584:
-  name: "Legend of Dragoon, The (USA) (Disc 2)"
+  name: "Legend of Dragoon, The (Disc 2)"
+  saveName: "Legend of Dragoon, The (USA) (Disc 2)"
   discSet:
     name: "Legend of Dragoon, The (USA)"
     serials:
@@ -92538,7 +97304,8 @@ SCUS-94584:
     multitap: false
     linkCable: false
 SCUS-94585:
-  name: "Legend of Dragoon, The (USA) (Disc 3)"
+  name: "Legend of Dragoon, The (Disc 3)"
+  saveName: "Legend of Dragoon, The (USA) (Disc 3)"
   discSet:
     name: "Legend of Dragoon, The (USA)"
     serials:
@@ -92570,7 +97337,8 @@ SCUS-94585:
     multitap: false
     linkCable: false
 SCUS-94586:
-  name: "Legend of Dragoon, The (USA) (Disc 4)"
+  name: "Legend of Dragoon, The (Disc 4)"
+  saveName: "Legend of Dragoon, The (USA) (Disc 4)"
   discSet:
     name: "Legend of Dragoon, The (USA)"
     serials:
@@ -92602,7 +97370,8 @@ SCUS-94586:
     multitap: false
     linkCable: false
 SLES-01273:
-  name: "Legend of Foresia - La Contree Interdite (France)"
+  name: "Legend of Foresia - La Contree Interdite"
+  saveName: "Legend of Foresia - La Contree Interdite (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92621,7 +97390,8 @@ SLES-01273:
     multitap: true
     linkCable: false
 SLPS-01323:
-  name: "Legend of Heroes I & II, The - Eiyuu Densetsu (Japan)"
+  name: "Legend of Heroes I & II, The - Eiyuu Densetsu"
+  saveName: "Legend of Heroes I & II, The - Eiyuu Densetsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -92639,7 +97409,8 @@ SLPS-01323:
     multitap: false
     linkCable: false
 SLPS-01201:
-  name: "Legend of Heroes III, The - Shiroki Majo - Mou Hitotsu no Eiyuu-tachi no Monogatari (Japan)"
+  name: "Legend of Heroes III, The - Shiroki Majo - Mou Hitotsu no Eiyuu-tachi no Monogatari"
+  saveName: "Legend of Heroes III, The - Shiroki Majo - Mou Hitotsu no Eiyuu-tachi no Monogatari (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -92657,7 +97428,8 @@ SLPS-01201:
     multitap: false
     linkCable: false
 SLPS-01540:
-  name: "Legend of Heroes IV, The - Akai Shizuku (Japan)"
+  name: "Legend of Heroes IV, The - Akai Shizuku"
+  saveName: "Legend of Heroes IV, The - Akai Shizuku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -92675,7 +97447,8 @@ SLPS-01540:
     multitap: false
     linkCable: false
 SLES-01710:
-  name: "Legend of Kartia (Europe) (En,Fr,De)"
+  name: "Legend of Kartia"
+  saveName: "Legend of Kartia (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -92695,7 +97468,8 @@ SLES-01710:
     multitap: false
     linkCable: false
 SCES-01752:
-  name: "Legend of Legaia (Europe)"
+  name: "Legend of Legaia"
+  saveName: "Legend of Legaia (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92716,7 +97490,8 @@ SCES-01752:
     multitap: false
     linkCable: false
 SCES-01944:
-  name: "Legend of Legaia (France)"
+  name: "Legend of Legaia"
+  saveName: "Legend of Legaia (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92737,7 +97512,8 @@ SCES-01944:
     multitap: false
     linkCable: false
 SCES-01945:
-  name: "Legend of Legaia (Germany)"
+  name: "Legend of Legaia"
+  saveName: "Legend of Legaia (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92758,7 +97534,8 @@ SCES-01945:
     multitap: false
     linkCable: false
 SCES-01946:
-  name: "Legend of Legaia (Italy)"
+  name: "Legend of Legaia"
+  saveName: "Legend of Legaia (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92779,7 +97556,8 @@ SCES-01946:
     multitap: false
     linkCable: false
 SCES-01947:
-  name: "Legend of Legaia (Spain)"
+  name: "Legend of Legaia"
+  saveName: "Legend of Legaia (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -92803,7 +97581,8 @@ SCES-01947:
     multitap: false
     linkCable: false
 SCUS-94254:
-  name: "Legend of Legaia (USA)"
+  name: "Legend of Legaia"
+  saveName: "Legend of Legaia (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -92827,11 +97606,13 @@ SCUS-94254:
     multitap: false
     linkCable: false
 SCUS-94366:
-  name: "Legend of Legaia (USA) (Demo)"
+  name: "Legend of Legaia (Demo)"
+  saveName: "Legend of Legaia (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01013:
-  name: "Legend of Mana (USA)"
+  name: "Legend of Mana"
+  saveName: "Legend of Mana (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -92855,7 +97636,8 @@ SLUS-01013:
     multitap: false
     linkCable: false
 SLES-04145:
-  name: "Legend of Mulan (Europe) (En,Fr,De)"
+  name: "Legend of Mulan"
+  saveName: "Legend of Mulan (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92876,7 +97658,8 @@ SLES-04145:
     multitap: false
     linkCable: false
 SLES-02955:
-  name: "Legend of Pocahontas (Europe) (En,De,Nl)"
+  name: "Legend of Pocahontas"
+  saveName: "Legend of Pocahontas (Europe) (En,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92916,7 +97699,8 @@ SLES-03302:
     multitap: false
     linkCable: false
 SLES-01461:
-  name: "Lemmings & Oh No! More Lemmings (Europe) (En,Fr,De,Es,It)"
+  name: "Lemmings & Oh No! More Lemmings"
+  saveName: "Lemmings & Oh No! More Lemmings (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1265-gdd9a419"
@@ -92943,7 +97727,8 @@ SLES-01461:
     multitap: false
     linkCable: false
 SLUS-00760:
-  name: "Lemmings & Oh No! More Lemmings (USA)"
+  name: "Lemmings & Oh No! More Lemmings"
+  saveName: "Lemmings & Oh No! More Lemmings (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -92963,7 +97748,8 @@ SLUS-00760:
     multitap: false
     linkCable: false
 SLES-00542:
-  name: "Lethal Enforcers (Europe)"
+  name: "Lethal Enforcers"
+  saveName: "Lethal Enforcers (Europe)"
   controllers:
     - DigitalController
     - Justifier
@@ -92982,7 +97768,8 @@ SLES-00542:
     multitap: false
     linkCable: false
 SLPM-86025:
-  name: "Lethal Enforcers Deluxe Pack (Japan)"
+  name: "Lethal Enforcers Deluxe Pack"
+  saveName: "Lethal Enforcers Deluxe Pack (Japan)"
   controllers:
     - DigitalController
     - Justifier
@@ -93001,7 +97788,8 @@ SLPM-86025:
     multitap: false
     linkCable: false
 SLUS-00293:
-  name: "Lethal Enforcers I & II (USA)"
+  name: "Lethal Enforcers I & II"
+  saveName: "Lethal Enforcers I & II (USA)"
   controllers:
     - DigitalController
     - Justifier
@@ -93039,7 +97827,8 @@ SCPS-45343:
     multitap: false
     linkCable: false
 SLPS-02950:
-  name: "Libero Grande 2 (Japan)"
+  name: "Libero Grande 2"
+  saveName: "Libero Grande 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93058,7 +97847,8 @@ SLPS-02950:
     multitap: false
     linkCable: false
 SCES-01430:
-  name: "LiberoGrande (Europe)"
+  name: "LiberoGrande"
+  saveName: "LiberoGrande (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93077,11 +97867,13 @@ SCES-01430:
     multitap: false
     linkCable: false
 SCED-01491:
-  name: "LiberoGrande (Europe) (Demo)"
+  name: "LiberoGrande (Demo)"
+  saveName: "LiberoGrande (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01681:
-  name: "LiberoGrande (Japan)"
+  name: "LiberoGrande"
+  saveName: "LiberoGrande (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93100,11 +97892,13 @@ SLPS-01681:
     multitap: false
     linkCable: false
 SLPM-80340:
-  name: "LiberoGrande (Japan) (Demo)"
+  name: "LiberoGrande (Demo)"
+  saveName: "LiberoGrande (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03254:
-  name: "Liberogrande International (Europe) (En,Fr,De,Es,It)"
+  name: "Liberogrande International"
+  saveName: "Liberogrande International (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93127,7 +97921,8 @@ SCES-03254:
     multitap: false
     linkCable: false
 SLPS-00185:
-  name: "LifeScape - Seimei 40-okunen Haruka na Tabi (Japan) (Disc 1) (Aquasphere)"
+  name: "LifeScape - Seimei 40-okunen Haruka na Tabi (Disc 1) (Aquasphere)"
+  saveName: "LifeScape - Seimei 40-okunen Haruka na Tabi (Japan) (Disc 1) (Aquasphere)"
   discSet:
     name: "LifeScape - Seimei 40-okunen Haruka na Tabi (Japan)"
     serials:
@@ -93150,7 +97945,8 @@ SLPS-00185:
     multitap: false
     linkCable: false
 SLPS-00186:
-  name: "LifeScape - Seimei 40-okunen Haruka na Tabi (Japan) (Disc 2) (Landsphere)"
+  name: "LifeScape - Seimei 40-okunen Haruka na Tabi (Disc 2) (Landsphere)"
+  saveName: "LifeScape - Seimei 40-okunen Haruka na Tabi (Japan) (Disc 2) (Landsphere)"
   discSet:
     name: "LifeScape - Seimei 40-okunen Haruka na Tabi (Japan)"
     serials:
@@ -93173,7 +97969,8 @@ SLPS-00186:
     multitap: false
     linkCable: false
 SLPS-00629:
-  name: "LifeScape 2 - Body Bionics - Kyoui no Shouuchuu Jintai (Japan)"
+  name: "LifeScape 2 - Body Bionics - Kyoui no Shouuchuu Jintai"
+  saveName: "LifeScape 2 - Body Bionics - Kyoui no Shouuchuu Jintai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -93191,7 +97988,8 @@ SLPS-00629:
     multitap: false
     linkCable: false
 SLES-00613:
-  name: "Lifeforce Tenka (Europe)"
+  name: "Lifeforce Tenka"
+  saveName: "Lifeforce Tenka (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -93214,13 +98012,15 @@ SLES-00613:
     multitap: false
     linkCable: false
 SLED-00690:
-  name: "Lifeforce Tenka (Europe) (Demo)"
+  name: "Lifeforce Tenka (Demo)"
+  saveName: "Lifeforce Tenka (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLES-00614:
-  name: "Lifeforce Tenka (France)"
+  name: "Lifeforce Tenka"
+  saveName: "Lifeforce Tenka (France)"
   controllers:
     - DigitalController
   traits:
@@ -93240,7 +98040,8 @@ SLES-00614:
     multitap: false
     linkCable: false
 SLES-00615:
-  name: "Lifeforce Tenka (Germany)"
+  name: "Lifeforce Tenka"
+  saveName: "Lifeforce Tenka (Germany)"
   controllers:
     - DigitalController
   traits:
@@ -93260,7 +98061,8 @@ SLES-00615:
     multitap: false
     linkCable: false
 SLES-00616:
-  name: "Lifeforce Tenka (Italy)"
+  name: "Lifeforce Tenka"
+  saveName: "Lifeforce Tenka (Italy)"
   controllers:
     - DigitalController
   traits:
@@ -93280,7 +98082,8 @@ SLES-00616:
     multitap: false
     linkCable: false
 SLES-00617:
-  name: "Lifeforce Tenka (Spain)"
+  name: "Lifeforce Tenka"
+  saveName: "Lifeforce Tenka (Spain)"
   controllers:
     - DigitalController
   traits:
@@ -93300,7 +98103,8 @@ SLES-00617:
     multitap: false
     linkCable: false
 SLPS-02336:
-  name: "Light Fantasy Gaiden - Nya Nyan ga Nyan (Japan)"
+  name: "Light Fantasy Gaiden - Nya Nyan ga Nyan"
+  saveName: "Light Fantasy Gaiden - Nya Nyan ga Nyan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93319,7 +98123,8 @@ SLPS-02336:
     multitap: false
     linkCable: false
 SLPM-86015:
-  name: "Lightning Legend - Daigo no Daibouken (Japan)"
+  name: "Lightning Legend - Daigo no Daibouken"
+  saveName: "Lightning Legend - Daigo no Daibouken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -93436,7 +98241,8 @@ SCPS-45118:
     multitap: false
     linkCable: false
 SCPS-10039:
-  name: "Linda^3 Again (Japan)"
+  name: "Linda^3 Again"
+  saveName: "Linda^3 Again (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93455,7 +98261,8 @@ SCPS-10039:
     multitap: false
     linkCable: false
 SLPS-01769:
-  name: "Ling Rise (Japan)"
+  name: "Ling Rise"
+  saveName: "Ling Rise (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93474,7 +98281,8 @@ SLPS-01769:
     multitap: false
     linkCable: false
 SLES-02953:
-  name: "Lion and the King (Europe) (En,Fr,De)"
+  name: "Lion and the King"
+  saveName: "Lion and the King (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93495,7 +98303,8 @@ SLES-02953:
     multitap: false
     linkCable: false
 SLES-04065:
-  name: "Lion and the King 2 (Europe) (En,Fr,De)"
+  name: "Lion and the King 2"
+  saveName: "Lion and the King 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93516,7 +98325,8 @@ SLES-04065:
     multitap: false
     linkCable: false
 LSP-010150:
-  name: "Liquid Books Adventure 1 - Lety's Favorite Stories (USA)"
+  name: "Liquid Books Adventure 1 - Lety's Favorite Stories"
+  saveName: "Liquid Books Adventure 1 - Lety's Favorite Stories (USA)"
   codes:
     - LSP-010150
     - LSP01015001
@@ -93527,7 +98337,8 @@ LSP-010150:
     languages:
       - English
 LSP-010250:
-  name: "Liquid Books Adventure 2 - Amrita's Trees & Cerdito and the Coyote (USA)"
+  name: "Liquid Books Adventure 2 - Amrita's Trees & Cerdito and the Coyote"
+  saveName: "Liquid Books Adventure 2 - Amrita's Trees & Cerdito and the Coyote (USA)"
   controllers:
     - DigitalController
   codes:
@@ -93549,7 +98360,8 @@ LSP-010250:
     multitap: false
     linkCable: false
 LSP-010350:
-  name: "Liquid Books Adventure 3 - Far-Fetched Frontier Tales (USA)"
+  name: "Liquid Books Adventure 3 - Far-Fetched Frontier Tales"
+  saveName: "Liquid Books Adventure 3 - Far-Fetched Frontier Tales (USA)"
   codes:
     - LSP-010350
     - LSP-903129
@@ -93561,7 +98373,8 @@ LSP-010350:
     languages:
       - English
 LSP-903136:
-  name: "Liquid Books Adventure 4 - The Adventures of Adelita and Bo (USA)"
+  name: "Liquid Books Adventure 4 - The Adventures of Adelita and Bo"
+  saveName: "Liquid Books Adventure 4 - The Adventures of Adelita and Bo (USA)"
   codes:
     - LSP-903136
     - LSP01035501
@@ -93572,7 +98385,8 @@ LSP-903136:
     languages:
       - English
 LSP-903143:
-  name: "Liquid Books Adventure 5 - Pop-Out Prose (USA)"
+  name: "Liquid Books Adventure 5 - Pop-Out Prose"
+  saveName: "Liquid Books Adventure 5 - Pop-Out Prose (USA)"
   codes:
     - LSP-903143
     - LSP-90314301
@@ -93584,7 +98398,8 @@ LSP-903143:
     languages:
       - English
 LSP-905147:
-  name: "Liquid Books Adventure 6 - The Wandering Path (USA)"
+  name: "Liquid Books Adventure 6 - The Wandering Path"
+  saveName: "Liquid Books Adventure 6 - The Wandering Path (USA)"
   codes:
     - LSP-905147
     - LSP-90514700
@@ -93596,7 +98411,8 @@ LSP-905147:
     languages:
       - English
 SLES-00698:
-  name: "Little Big Adventure (Europe) (En,Fr,De,Es,It)"
+  name: "Little Big Adventure"
+  saveName: "Little Big Adventure (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -93618,7 +98434,8 @@ SLES-00698:
     multitap: false
     linkCable: false
 SLPS-00376:
-  name: "Little Big Adventure (Japan)"
+  name: "Little Big Adventure"
+  saveName: "Little Big Adventure (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -93658,7 +98475,8 @@ SLPM-86269:
     multitap: true
     linkCable: false
 SLPM-86757:
-  name: "Little Lovers - She So Game (Japan) (Disc 1)"
+  name: "Little Lovers - She So Game (Disc 1)"
+  saveName: "Little Lovers - She So Game (Japan) (Disc 1)"
   discSet:
     name: "Little Lovers - She So Game (Japan)"
     serials:
@@ -93682,7 +98500,8 @@ SLPM-86757:
     multitap: true
     linkCable: false
 SLPM-86758:
-  name: "Little Lovers - She So Game (Japan) (Disc 2)"
+  name: "Little Lovers - She So Game (Disc 2)"
+  saveName: "Little Lovers - She So Game (Japan) (Disc 2)"
   discSet:
     name: "Little Lovers - She So Game (Japan)"
     serials:
@@ -93706,7 +98525,8 @@ SLPM-86758:
     multitap: true
     linkCable: false
 SLPS-02376:
-  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan)"
+  name: "Little Princess - Marl Oukoku no Ningyou-hime 2"
+  saveName: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-6598-g2b7de1f8e"
@@ -93730,7 +98550,8 @@ SLPS-02376:
     multitap: false
     linkCable: false
 SLPS-03012:
-  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Disc 1) (+1 Tasu Ichi)"
+  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Disc 1) (+1 Tasu Ichi)"
+  saveName: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Disc 1) (+1 Tasu Ichi)"
   discSet:
     name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan)"
     serials:
@@ -93760,7 +98581,8 @@ SLPS-03012:
     multitap: false
     linkCable: false
 SLPS-03013:
-  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Disc 2) (+1 Tasu Ichi)"
+  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Disc 2) (+1 Tasu Ichi)"
+  saveName: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Disc 2) (+1 Tasu Ichi)"
   discSet:
     name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan)"
     serials:
@@ -93787,11 +98609,13 @@ SLPS-03013:
     multitap: false
     linkCable: false
 SLED-01561:
-  name: "Live Wire! (Europe) (Demo)"
+  name: "Live Wire! (Demo)"
+  saveName: "Live Wire! (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01332:
-  name: "Live Wire! (Europe) (En,Fr,De,Es,It)"
+  name: "Live Wire!"
+  saveName: "Live Wire! (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93814,7 +98638,8 @@ SLES-01332:
     multitap: false
     linkCable: false
 SLES-00013:
-  name: "Loaded (Europe) (En,Fr,De)"
+  name: "Loaded"
+  saveName: "Loaded (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -93834,7 +98659,8 @@ SLES-00013:
     multitap: false
     linkCable: false
 SLUS-00076:
-  name: "Loaded (USA) (En,Fr)"
+  name: "Loaded"
+  saveName: "Loaded (USA) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -93853,7 +98679,8 @@ SLUS-00076:
     multitap: false
     linkCable: false
 SLUS-00557:
-  name: "Lode Runner (USA)"
+  name: "Lode Runner"
+  saveName: "Lode Runner (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -93874,7 +98701,8 @@ SLUS-00557:
     multitap: false
     linkCable: false
 SLPS-00182:
-  name: "Lode Runner - The Legend Returns (Japan)"
+  name: "Lode Runner - The Legend Returns"
+  saveName: "Lode Runner - The Legend Returns (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -93892,7 +98720,8 @@ SLPS-00182:
     multitap: false
     linkCable: false
 SLPS-00641:
-  name: "Lode Runner Extra (Japan)"
+  name: "Lode Runner Extra"
+  saveName: "Lode Runner Extra (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -93928,9 +98757,11 @@ SLPS-02036:
     multitap: false
     linkCable: false
 SLPS-02880:
-  name: "Logic Mahjong Souryuu - Yonin Uchi, Sannin Uchi (Japan)"
+  name: "Logic Mahjong Souryuu - Yonin Uchi, Sannin Uchi"
+  saveName: "Logic Mahjong Souryuu - Yonin Uchi, Sannin Uchi (Japan)"
 SLPS-03011:
-  name: "Logic Pro Adventure (Japan)"
+  name: "Logic Pro Adventure"
+  saveName: "Logic Pro Adventure (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -93949,7 +98780,8 @@ SLPS-03011:
     multitap: false
     linkCable: false
 SLPS-00268:
-  name: "Logic Puzzle Rainbow Town (Japan)"
+  name: "Logic Puzzle Rainbow Town"
+  saveName: "Logic Puzzle Rainbow Town (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -93967,7 +98799,8 @@ SLPS-00268:
     multitap: false
     linkCable: false
 SLES-00451:
-  name: "Lomax (Europe) (En,Fr,De,Es,It)"
+  name: "Lomax"
+  saveName: "Lomax (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -93994,7 +98827,8 @@ SLES-00451:
     multitap: false
     linkCable: false
 SLED-00516:
-  name: "Lomax (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Lomax (Demo)"
+  saveName: "Lomax (Europe) (En,Fr,De,Es,It) (Demo)"
   controllers:
     - DigitalController
   traits:
@@ -94002,7 +98836,8 @@ SLED-00516:
   metadata:
     genre: "** DEMO **"
 SLPS-00987:
-  name: "Lomax (Japan)"
+  name: "Lomax"
+  saveName: "Lomax (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -94025,7 +98860,8 @@ SLPS-00987:
     multitap: false
     linkCable: false
 SLES-02694:
-  name: "London Racer (Europe)"
+  name: "London Racer"
+  saveName: "London Racer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94045,7 +98881,8 @@ SLES-02694:
     multitap: false
     linkCable: false
 SLES-03822:
-  name: "London Racer II (Europe)"
+  name: "London Racer II"
+  saveName: "London Racer II (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94065,7 +98902,8 @@ SLES-03822:
     multitap: false
     linkCable: false
 SLPS-01787:
-  name: "London Seirei Tanteidan (Japan)"
+  name: "London Seirei Tanteidan"
+  saveName: "London Seirei Tanteidan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94083,7 +98921,8 @@ SLPS-01787:
     multitap: false
     linkCable: false
 SLES-00131:
-  name: "Lone Soldier (Europe)"
+  name: "Lone Soldier"
+  saveName: "Lone Soldier (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -94101,7 +98940,8 @@ SLES-00131:
     multitap: false
     linkCable: false
 SLES-00142:
-  name: "Lone Soldier (Germany)"
+  name: "Lone Soldier"
+  saveName: "Lone Soldier (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -94119,7 +98959,8 @@ SLES-00142:
     multitap: false
     linkCable: false
 SLPS-00322:
-  name: "Lone Soldier (Japan)"
+  name: "Lone Soldier"
+  saveName: "Lone Soldier (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94138,9 +98979,11 @@ SLPS-00322:
     multitap: false
     linkCable: false
 SCES-00277:
-  name: "Lone Soldier + Actua Soccer + Total NBA '96 + Mickey's Wild Adventure + Thunderhawk 2 + Assault Rigs (France)"
+  name: "Lone Soldier + Actua Soccer + Total NBA '96 + Mickey's Wild Adventure + Thunderhawk 2 + Assault Rigs"
+  saveName: "Lone Soldier + Actua Soccer + Total NBA '96 + Mickey's Wild Adventure + Thunderhawk 2 + Assault Rigs (France)"
 SLUS-01369:
-  name: "Looney Tunes - Sheep Raider (USA) (En,Fr,Es,Pt)"
+  name: "Looney Tunes - Sheep Raider"
+  saveName: "Looney Tunes - Sheep Raider (USA) (En,Fr,Es,Pt)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3771-g8df0496d"
@@ -94167,7 +99010,8 @@ SLUS-01369:
     multitap: false
     linkCable: false
 SLES-03127:
-  name: "Looney Tunes Racing (Europe) (En,Fr,De,Es,It)"
+  name: "Looney Tunes Racing"
+  saveName: "Looney Tunes Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94191,7 +99035,8 @@ SLES-03127:
     multitap: false
     linkCable: false
 SLUS-01145:
-  name: "Looney Tunes Racing (USA) (En,Fr,Es)"
+  name: "Looney Tunes Racing"
+  saveName: "Looney Tunes Racing (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94213,7 +99058,8 @@ SLUS-01145:
     multitap: false
     linkCable: false
 SLPS-01728:
-  name: "Lord Monarch - Shin Gaia Oukokuki (Japan)"
+  name: "Lord Monarch - Shin Gaia Oukokuki"
+  saveName: "Lord Monarch - Shin Gaia Oukokuki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94231,7 +99077,8 @@ SLPS-01728:
     multitap: false
     linkCable: false
 SLPM-86524:
-  name: "Lord Monarch - Shin Gaia Oukokuki (Japan) (Major Wave)"
+  name: "Lord Monarch - Shin Gaia Oukokuki (Major Wave)"
+  saveName: "Lord Monarch - Shin Gaia Oukokuki (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -94249,7 +99096,8 @@ SLPM-86524:
     multitap: false
     linkCable: false
 SLPS-02168:
-  name: "Lord of Fist (Japan)"
+  name: "Lord of Fist"
+  saveName: "Lord of Fist (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94268,7 +99116,8 @@ SLPS-02168:
     multitap: true
     linkCable: false
 SCPS-10086:
-  name: "Lord of Monsters (Japan)"
+  name: "Lord of Monsters"
+  saveName: "Lord of Monsters (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94287,11 +99136,13 @@ SCPS-10086:
     multitap: false
     linkCable: false
 PAPX-90081:
-  name: "Lord of Monsters (Japan) (Demo)"
+  name: "Lord of Monsters (Demo)"
+  saveName: "Lord of Monsters (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02951:
-  name: "Lord of the Jungle (Europe) (En,Fr,De,Nl)"
+  name: "Lord of the Jungle"
+  saveName: "Lord of the Jungle (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94313,7 +99164,8 @@ SLES-02951:
     multitap: false
     linkCable: false
 SLPS-00971:
-  name: "Lost Children - The City of Lost Children (Japan)"
+  name: "Lost Children - The City of Lost Children"
+  saveName: "Lost Children - The City of Lost Children (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94331,7 +99183,8 @@ SLPS-00971:
     multitap: false
     linkCable: false
 SLPS-01307:
-  name: "Lost Sword - Ushinawareta Seiken (Japan)"
+  name: "Lost Sword - Ushinawareta Seiken"
+  saveName: "Lost Sword - Ushinawareta Seiken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94349,7 +99202,8 @@ SLPS-01307:
     multitap: false
     linkCable: false
 SLES-00057:
-  name: "Lost Vikings 2 - Norse by Norsewest (Europe) (En,Fr,De)"
+  name: "Lost Vikings 2 - Norse by Norsewest"
+  saveName: "Lost Vikings 2 - Norse by Norsewest (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -94367,7 +99221,8 @@ SLES-00057:
     multitap: false
     linkCable: false
 SLES-00903:
-  name: "Lost World, The - Jurassic Park (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  name: "Lost World, The - Jurassic Park"
+  saveName: "Lost World, The - Jurassic Park (Europe) (En,Fr,De,Es,It,Nl,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -94391,7 +99246,8 @@ SLES-00903:
     multitap: false
     linkCable: false
 SLPS-01099:
-  name: "Lost World, The - Jurassic Park (Japan)"
+  name: "Lost World, The - Jurassic Park"
+  saveName: "Lost World, The - Jurassic Park (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94409,7 +99265,8 @@ SLPS-01099:
     multitap: false
     linkCable: false
 SLUS-00515:
-  name: "Lost World, The - Jurassic Park (USA)"
+  name: "Lost World, The - Jurassic Park"
+  saveName: "Lost World, The - Jurassic Park (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -94430,7 +99287,8 @@ SLUS-00515:
     multitap: false
     linkCable: false
 SLES-03159:
-  name: "Louvre - A Maldicao (Portugal) (Disc 1)"
+  name: "Louvre - A Maldicao (Disc 1)"
+  saveName: "Louvre - A Maldicao (Portugal) (Disc 1)"
   discSet:
     name: "Louvre - A Maldicao (Portugal)"
     serials:
@@ -94454,7 +99312,8 @@ SLES-03159:
     multitap: false
     linkCable: false
 SLES-13159:
-  name: "Louvre - A Maldicao (Portugal) (Disc 2)"
+  name: "Louvre - A Maldicao (Disc 2)"
+  saveName: "Louvre - A Maldicao (Portugal) (Disc 2)"
   discSet:
     name: "Louvre - A Maldicao (Portugal)"
     serials:
@@ -94478,7 +99337,8 @@ SLES-13159:
     multitap: false
     linkCable: false
 SLES-03174:
-  name: "Louvre - L'Ultime Malediction (France) (Disc 1)"
+  name: "Louvre - L'Ultime Malediction (Disc 1)"
+  saveName: "Louvre - L'Ultime Malediction (France) (Disc 1)"
   discSet:
     name: "Louvre - L'Ultime Malediction (France)"
     serials:
@@ -94502,7 +99362,8 @@ SLES-03174:
     multitap: false
     linkCable: false
 SLES-13174:
-  name: "Louvre - L'Ultime Malediction (France) (Disc 2)"
+  name: "Louvre - L'Ultime Malediction (Disc 2)"
+  saveName: "Louvre - L'Ultime Malediction (France) (Disc 2)"
   discSet:
     name: "Louvre - L'Ultime Malediction (France)"
     serials:
@@ -94526,7 +99387,8 @@ SLES-13174:
     multitap: false
     linkCable: false
 SLES-03160:
-  name: "Louvre - La Maledizione Finale (Italy) (Disc 1)"
+  name: "Louvre - La Maledizione Finale (Disc 1)"
+  saveName: "Louvre - La Maledizione Finale (Italy) (Disc 1)"
   discSet:
     name: "Louvre - La Maledizione Finale (Italy)"
     serials:
@@ -94550,7 +99412,8 @@ SLES-03160:
     multitap: false
     linkCable: false
 SLES-13160:
-  name: "Louvre - La Maledizione Finale (Italy) (Disc 2)"
+  name: "Louvre - La Maledizione Finale (Disc 2)"
+  saveName: "Louvre - La Maledizione Finale (Italy) (Disc 2)"
   discSet:
     name: "Louvre - La Maledizione Finale (Italy)"
     serials:
@@ -94574,7 +99437,8 @@ SLES-13160:
     multitap: false
     linkCable: false
 SLES-03161:
-  name: "Louvre - La maldicion final (Spain) (Disc 1)"
+  name: "Louvre - La maldicion final (Disc 1)"
+  saveName: "Louvre - La maldicion final (Spain) (Disc 1)"
   discSet:
     name: "Louvre - La maldicion final (Spain)"
     serials:
@@ -94598,7 +99462,8 @@ SLES-03161:
     multitap: false
     linkCable: false
 SLES-13161:
-  name: "Louvre - La maldicion final (Spain) (Disc 2)"
+  name: "Louvre - La maldicion final (Disc 2)"
+  saveName: "Louvre - La maldicion final (Spain) (Disc 2)"
   discSet:
     name: "Louvre - La maldicion final (Spain)"
     serials:
@@ -94622,7 +99487,8 @@ SLES-13161:
     multitap: false
     linkCable: false
 SLES-03158:
-  name: "Louvre - The Final Curse (Europe) (Disc 1)"
+  name: "Louvre - The Final Curse (Disc 1)"
+  saveName: "Louvre - The Final Curse (Europe) (Disc 1)"
   discSet:
     name: "Louvre - The Final Curse (Europe)"
     serials:
@@ -94646,7 +99512,8 @@ SLES-03158:
     multitap: false
     linkCable: false
 SLES-13158:
-  name: "Louvre - The Final Curse (Europe) (Disc 2)"
+  name: "Louvre - The Final Curse (Disc 2)"
+  saveName: "Louvre - The Final Curse (Europe) (Disc 2)"
   discSet:
     name: "Louvre - The Final Curse (Europe)"
     serials:
@@ -94670,7 +99537,8 @@ SLES-13158:
     multitap: false
     linkCable: false
 SCPS-10124:
-  name: "Love & Destroy (Japan)"
+  name: "Love & Destroy"
+  saveName: "Love & Destroy (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -94710,11 +99578,13 @@ SLPS-00686:
     multitap: true
     linkCable: false
 PAPX-90014:
-  name: "Love Game's - Wai Wai Tennis (Japan) (Demo)"
+  name: "Love Game's - Wai Wai Tennis (Demo)"
+  saveName: "Love Game's - Wai Wai Tennis (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86541:
-  name: "Love Game's - Wai Wai Tennis (Japan) (Major Wave)"
+  name: "Love Game's - Wai Wai Tennis (Major Wave)"
+  saveName: "Love Game's - Wai Wai Tennis (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -94732,7 +99602,8 @@ SLPM-86541:
     multitap: true
     linkCable: false
 SLPS-01647:
-  name: "Love Game's - Wai Wai Tennis (Japan) (Service Price-ban)"
+  name: "Love Game's - Wai Wai Tennis (Service Price-ban)"
+  saveName: "Love Game's - Wai Wai Tennis (Japan) (Service Price-ban)"
   controllers:
     - DigitalController
   metadata:
@@ -94750,7 +99621,8 @@ SLPS-01647:
     multitap: true
     linkCable: false
 SLPS-02510:
-  name: "Love Game's - Wai Wai Tennis 2 (Japan)"
+  name: "Love Game's - Wai Wai Tennis 2"
+  saveName: "Love Game's - Wai Wai Tennis 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94769,7 +99641,8 @@ SLPS-02510:
     multitap: true
     linkCable: false
 SLPS-02983:
-  name: "Love Game's - Wai Wai Tennis 2 (Japan) (Value 1500)"
+  name: "Love Game's - Wai Wai Tennis 2 (Value 1500)"
+  saveName: "Love Game's - Wai Wai Tennis 2 (Japan) (Value 1500)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94788,7 +99661,8 @@ SLPS-02983:
     multitap: true
     linkCable: false
 SLPM-86899:
-  name: "Love Game's - Wai Wai Tennis Plus (Japan)"
+  name: "Love Game's - Wai Wai Tennis Plus"
+  saveName: "Love Game's - Wai Wai Tennis Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94807,7 +99681,8 @@ SLPM-86899:
     multitap: true
     linkCable: false
 SLPM-86652:
-  name: "Love Hina - Ai wa Kotoba no Naka ni (Japan)"
+  name: "Love Hina - Ai wa Kotoba no Naka ni"
+  saveName: "Love Hina - Ai wa Kotoba no Naka ni (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94826,7 +99701,8 @@ SLPM-86652:
     multitap: false
     linkCable: false
 SLPM-86677:
-  name: "Love Hina 2 - Kotoba wa Konayuki no You ni (Japan)"
+  name: "Love Hina 2 - Kotoba wa Konayuki no You ni"
+  saveName: "Love Hina 2 - Kotoba wa Konayuki no You ni (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94845,7 +99721,8 @@ SLPM-86677:
     multitap: false
     linkCable: false
 SLPS-03097:
-  name: "Love Para - Lovely Tokyo Para-Para Musume (Japan)"
+  name: "Love Para - Lovely Tokyo Para-Para Musume"
+  saveName: "Love Para - Lovely Tokyo Para-Para Musume (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94864,7 +99741,8 @@ SLPS-03097:
     multitap: false
     linkCable: false
 SLPS-01370:
-  name: "Love Therapy (Japan)"
+  name: "Love Therapy"
+  saveName: "Love Therapy (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94882,7 +99760,8 @@ SLPS-01370:
     multitap: false
     linkCable: false
 SLPS-02112:
-  name: "Love^2 Torokko (Japan)"
+  name: "Love^2 Torokko"
+  saveName: "Love^2 Torokko (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94901,9 +99780,11 @@ SLPS-02112:
     multitap: false
     linkCable: false
 SLPM-80414:
-  name: "Love^2 Torokko (Japan) (Taikenban)"
+  name: "Love^2 Torokko (Taikenban)"
+  saveName: "Love^2 Torokko (Japan) (Taikenban)"
 SLPS-00560:
-  name: "LuLu - Un Conte Interactif de Romain Victor-Pujebet (Japan)"
+  name: "LuLu - Un Conte Interactif de Romain Victor-Pujebet"
+  saveName: "LuLu - Un Conte Interactif de Romain Victor-Pujebet (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94921,7 +99802,8 @@ SLPS-00560:
     multitap: false
     linkCable: false
 SLPS-01784:
-  name: "Lucifer Ring (Japan)"
+  name: "Lucifer Ring"
+  saveName: "Lucifer Ring (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -94940,7 +99822,8 @@ SLPS-01784:
     multitap: false
     linkCable: false
 SLPS-00811:
-  name: "Luciferd (Japan)"
+  name: "Luciferd"
+  saveName: "Luciferd (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94958,7 +99841,8 @@ SLPS-00811:
     multitap: false
     linkCable: false
 SLES-00943:
-  name: "Lucky Luke (Europe) (En,Fr,De,Es)"
+  name: "Lucky Luke"
+  saveName: "Lucky Luke (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -94979,7 +99863,8 @@ SLES-00943:
     multitap: false
     linkCable: false
 SLPS-01674:
-  name: "Lucky Luke (Japan)"
+  name: "Lucky Luke"
+  saveName: "Lucky Luke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -94997,7 +99882,8 @@ SLPS-01674:
     multitap: false
     linkCable: false
 SLUS-00719:
-  name: "Lucky Luke (USA)"
+  name: "Lucky Luke"
+  saveName: "Lucky Luke (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -95018,7 +99904,8 @@ SLUS-00719:
     multitap: false
     linkCable: false
 SLES-03530:
-  name: "Lucky Luke - Western Fever (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Lucky Luke - Western Fever"
+  saveName: "Lucky Luke - Western Fever (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -95045,7 +99932,8 @@ SLES-03530:
     multitap: false
     linkCable: false
 SLPS-01832:
-  name: "Luftwaffe - Deutsch Kuugun o Shiki seyo (Japan)"
+  name: "Luftwaffe - Deutsch Kuugun o Shiki seyo"
+  saveName: "Luftwaffe - Deutsch Kuugun o Shiki seyo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95064,9 +99952,11 @@ SLPS-01832:
     multitap: false
     linkCable: false
 SLPM-80250:
-  name: "Lunar - Silver Star Story (Japan) (Tentou Taikenban Disc)"
+  name: "Lunar - Silver Star Story (Tentou Taikenban Disc)"
+  saveName: "Lunar - Silver Star Story (Japan) (Tentou Taikenban Disc)"
 SCPS-45249:
-  name: "Lunar - Silver Star Story (Japan, Asia) (Disc 1)"
+  name: "Lunar - Silver Star Story (Disc 1)"
+  saveName: "Lunar - Silver Star Story (Japan, Asia) (Disc 1)"
   discSet:
     name: "Lunar - Silver Star Story (Japan, Asia)"
     serials:
@@ -95097,7 +99987,8 @@ SCPS-45249:
     multitap: false
     linkCable: false
 SCPS-45250:
-  name: "Lunar - Silver Star Story (Japan, Asia) (Disc 2)"
+  name: "Lunar - Silver Star Story (Disc 2)"
+  saveName: "Lunar - Silver Star Story (Japan, Asia) (Disc 2)"
   discSet:
     name: "Lunar - Silver Star Story (Japan, Asia)"
     serials:
@@ -95128,14 +100019,16 @@ SCPS-45250:
     multitap: false
     linkCable: false
 SLUS-90055:
-  name: "Lunar - Silver Star Story Complete (USA) (Demo)"
+  name: "Lunar - Silver Star Story Complete (Demo)"
+  saveName: "Lunar - Silver Star Story Complete (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisablePGXP # 2D, PGXP is not beneficial.
     - DisableWidescreen # No effect.
 SLUS-00628:
-  name: "Lunar - Silver Star Story Complete (USA) (Disc 1)"
+  name: "Lunar - Silver Star Story Complete (Disc 1)"
+  saveName: "Lunar - Silver Star Story Complete (USA) (Disc 1)"
   discSet:
     name: "Lunar - Silver Star Story Complete (USA)"
     serials:
@@ -95165,7 +100058,8 @@ SLUS-00628:
     multitap: false
     linkCable: false
 SLUS-00899:
-  name: "Lunar - Silver Star Story Complete (USA) (Disc 2)"
+  name: "Lunar - Silver Star Story Complete (Disc 2)"
+  saveName: "Lunar - Silver Star Story Complete (USA) (Disc 2)"
   discSet:
     name: "Lunar - Silver Star Story Complete (USA)"
     serials:
@@ -95195,7 +100089,8 @@ SLUS-00899:
     multitap: false
     linkCable: false
 SLUS-00921:
-  name: "Lunar - Silver Star Story Complete (USA) (The Making of)"
+  name: "Lunar - Silver Star Story Complete (The Making of)"
+  saveName: "Lunar - Silver Star Story Complete (USA) (The Making of)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -95217,7 +100112,8 @@ SLUS-00921:
     multitap: false
     linkCable: false
 SLPS-02081:
-  name: "Lunar 2 - Eternal Blue (Japan) (Disc 1)"
+  name: "Lunar 2 - Eternal Blue (Disc 1)"
+  saveName: "Lunar 2 - Eternal Blue (Japan) (Disc 1)"
   discSet:
     name: "Lunar 2 - Eternal Blue (Japan)"
     serials:
@@ -95248,7 +100144,8 @@ SLPS-02081:
     multitap: false
     linkCable: false
 SLPS-02082:
-  name: "Lunar 2 - Eternal Blue (Japan) (Disc 2)"
+  name: "Lunar 2 - Eternal Blue (Disc 2)"
+  saveName: "Lunar 2 - Eternal Blue (Japan) (Disc 2)"
   discSet:
     name: "Lunar 2 - Eternal Blue (Japan)"
     serials:
@@ -95276,7 +100173,8 @@ SLPS-02082:
     multitap: false
     linkCable: false
 SLPS-02083:
-  name: "Lunar 2 - Eternal Blue (Japan) (Disc 3)"
+  name: "Lunar 2 - Eternal Blue (Disc 3)"
+  saveName: "Lunar 2 - Eternal Blue (Japan) (Disc 3)"
   discSet:
     name: "Lunar 2 - Eternal Blue (Japan)"
     serials:
@@ -95304,7 +100202,8 @@ SLPS-02083:
     multitap: false
     linkCable: false
 SLUS-90083:
-  name: "Lunar 2 - Eternal Blue Complete (USA) (Demo)"
+  name: "Lunar 2 - Eternal Blue Complete (Demo)"
+  saveName: "Lunar 2 - Eternal Blue Complete (USA) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95326,7 +100225,8 @@ SLUS-90083:
     multitap: false
     linkCable: false
 SLUS-01071:
-  name: "Lunar 2 - Eternal Blue Complete (USA) (Disc 1)"
+  name: "Lunar 2 - Eternal Blue Complete (Disc 1)"
+  saveName: "Lunar 2 - Eternal Blue Complete (USA) (Disc 1)"
   discSet:
     name: "Lunar 2 - Eternal Blue Complete (USA)"
     serials:
@@ -95357,7 +100257,8 @@ SLUS-01071:
     multitap: false
     linkCable: false
 SLUS-01239:
-  name: "Lunar 2 - Eternal Blue Complete (USA) (Disc 2)"
+  name: "Lunar 2 - Eternal Blue Complete (Disc 2)"
+  saveName: "Lunar 2 - Eternal Blue Complete (USA) (Disc 2)"
   discSet:
     name: "Lunar 2 - Eternal Blue Complete (USA)"
     serials:
@@ -95388,7 +100289,8 @@ SLUS-01239:
     multitap: false
     linkCable: false
 SLUS-01240:
-  name: "Lunar 2 - Eternal Blue Complete (USA) (Disc 3)"
+  name: "Lunar 2 - Eternal Blue Complete (Disc 3)"
+  saveName: "Lunar 2 - Eternal Blue Complete (USA) (Disc 3)"
   discSet:
     name: "Lunar 2 - Eternal Blue Complete (USA)"
     serials:
@@ -95419,7 +100321,8 @@ SLUS-01240:
     multitap: false
     linkCable: false
 SLUS-01257:
-  name: "Lunar 2 - Eternal Blue Complete (USA) (The Making of)"
+  name: "Lunar 2 - Eternal Blue Complete (The Making of)"
+  saveName: "Lunar 2 - Eternal Blue Complete (USA) (The Making of)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -95464,7 +100367,8 @@ SLPS-02966:
     multitap: false
     linkCable: false
 SLPM-86777:
-  name: "Lunar Wing - Toki o Koeta Seisen (Japan)"
+  name: "Lunar Wing - Toki o Koeta Seisen"
+  saveName: "Lunar Wing - Toki o Koeta Seisen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95483,7 +100387,8 @@ SLPM-86777:
     multitap: false
     linkCable: false
 SLPS-02420:
-  name: "Lunatic Dawn - Odyssey (Japan)"
+  name: "Lunatic Dawn - Odyssey"
+  saveName: "Lunatic Dawn - Odyssey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95502,7 +100407,8 @@ SLPS-02420:
     multitap: false
     linkCable: false
 SLPS-01749:
-  name: "Lunatic Dawn III (Japan)"
+  name: "Lunatic Dawn III"
+  saveName: "Lunatic Dawn III (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95561,7 +100467,8 @@ SLPM-87124:
     multitap: false
     linkCable: false
 SLPS-01402:
-  name: "Lupin 3sei (Japan)"
+  name: "Lupin 3sei"
+  saveName: "Lupin 3sei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -95579,7 +100486,8 @@ SLPS-01402:
     multitap: false
     linkCable: false
 SLPS-91060:
-  name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan) (Disc 1)"
+  name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Disc 1)"
+  saveName: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan) (Disc 1)"
   discSet:
     name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan)"
     serials:
@@ -95603,7 +100511,8 @@ SLPS-91060:
     multitap: false
     linkCable: false
 SLPS-91061:
-  name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan) (Disc 2)"
+  name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Disc 2)"
+  saveName: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan) (Disc 2)"
   discSet:
     name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan)"
     serials:
@@ -95627,7 +100536,8 @@ SLPS-91061:
     multitap: false
     linkCable: false
 SLPS-91062:
-  name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan) (Disc 3)"
+  name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Disc 3)"
+  saveName: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan) (Disc 3)"
   discSet:
     name: "Lupin 3sei - Cagliostro no Shiro - Saikai (Japan)"
     serials:
@@ -95673,7 +100583,8 @@ SLPS-00535:
     multitap: false
     linkCable: false
 SLPS-00416:
-  name: "Lupupu Cube - Lup Salad (Japan)"
+  name: "Lupupu Cube - Lup Salad"
+  saveName: "Lupupu Cube - Lup Salad (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -95694,7 +100605,8 @@ SLPS-00416:
     multitap: false
     linkCable: false
 SLES-02720:
-  name: "Lussan Nathhorst Presenterar Riding Star (Sweden)"
+  name: "Lussan Nathhorst Presenterar Riding Star"
+  saveName: "Lussan Nathhorst Presenterar Riding Star (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95713,7 +100625,8 @@ SLES-02720:
     multitap: false
     linkCable: false
 SLES-03999:
-  name: "M&M's - Shell Shocked (Europe)"
+  name: "M&M's - Shell Shocked"
+  saveName: "M&M's - Shell Shocked (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95732,7 +100645,8 @@ SLES-03999:
     multitap: false
     linkCable: false
 SLES-04001:
-  name: "M&M's - Shell Shocked (France)"
+  name: "M&M's - Shell Shocked"
+  saveName: "M&M's - Shell Shocked (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95751,7 +100665,8 @@ SLES-04001:
     multitap: false
     linkCable: false
 SLES-04002:
-  name: "M&M's - Shell Shocked (Germany)"
+  name: "M&M's - Shell Shocked"
+  saveName: "M&M's - Shell Shocked (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95770,7 +100685,8 @@ SLES-04002:
     multitap: false
     linkCable: false
 SLUS-01306:
-  name: "M&M's - Shell Shocked (USA)"
+  name: "M&M's - Shell Shocked"
+  saveName: "M&M's - Shell Shocked (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95789,23 +100705,28 @@ SLUS-01306:
     multitap: false
     linkCable: false
 SCED-01713:
-  name: "M-6 PlayStation Demo (France)"
+  name: "M-6 PlayStation Demo"
+  saveName: "M-6 PlayStation Demo (France)"
   metadata:
     genre: "** DEMO **"
 SCED-02121:
-  name: "M6 PlayStation - Best of '99 Vol. 1 (France)"
+  name: "M6 PlayStation - Best of '99 Vol. 1"
+  saveName: "M6 PlayStation - Best of '99 Vol. 1 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-02419:
-  name: "M6 PlayStation - Best of '99 Vol. 2 (France)"
+  name: "M6 PlayStation - Best of '99 Vol. 2"
+  saveName: "M6 PlayStation - Best of '99 Vol. 2 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-02570:
-  name: "M6 PlayStation - Special Kids (France)"
+  name: "M6 PlayStation - Special Kids"
+  saveName: "M6 PlayStation - Special Kids (France)"
   metadata:
     genre: "** DEMO **"
 SLES-00980:
-  name: "M6 Turbo Racing (France)"
+  name: "M6 Turbo Racing"
+  saveName: "M6 Turbo Racing (France)"
   controllers:
     - DigitalController
     - NeGcon
@@ -95824,11 +100745,13 @@ SLES-00980:
     multitap: false
     linkCable: true
 SLED-00912:
-  name: "MDK (Europe) (Demo)"
+  name: "MDK (Demo)"
+  saveName: "MDK (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00599:
-  name: "MDK (Europe) (En,Fr,De,Es,It)"
+  name: "MDK"
+  saveName: "MDK (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -95852,11 +100775,13 @@ SLES-00599:
     multitap: false
     linkCable: false
 SLED-01069:
-  name: "MDK (France) (En,Fr) (PlayMag Demo)"
+  name: "MDK (PlayMag Demo)"
+  saveName: "MDK (France) (En,Fr) (PlayMag Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10052:
-  name: "MDK (Japan)"
+  name: "MDK"
+  saveName: "MDK (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -95876,7 +100801,8 @@ SCPS-10052:
     multitap: false
     linkCable: false
 SLUS-00426:
-  name: "MDK (USA)"
+  name: "MDK"
+  saveName: "MDK (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -95899,7 +100825,8 @@ SLUS-00426:
     multitap: false
     linkCable: false
 SLPM-88501:
-  name: "MGG - Manic Game Girl (Korea)"
+  name: "MGG - Manic Game Girl"
+  saveName: "MGG - Manic Game Girl (Korea)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95918,15 +100845,18 @@ SLPM-88501:
     multitap: false
     linkCable: false
 SCED-01189:
-  name: "MIP Club Demo 01 (Germany)"
+  name: "MIP Club Demo 01"
+  saveName: "MIP Club Demo 01 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCED-01190:
-  name: "MIP Club Demo 02 (Germany)"
+  name: "MIP Club Demo 02"
+  saveName: "MIP Club Demo 02 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCUS-94359:
-  name: "MLB 2000 (USA)"
+  name: "MLB 2000"
+  saveName: "MLB 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95945,11 +100875,13 @@ SCUS-94359:
     multitap: false
     linkCable: false
 SCUS-94364:
-  name: "MLB 2000 (USA) (Demo)"
+  name: "MLB 2000 (Demo)"
+  saveName: "MLB 2000 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94478:
-  name: "MLB 2001 (USA)"
+  name: "MLB 2001"
+  saveName: "MLB 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95968,11 +100900,13 @@ SCUS-94478:
     multitap: false
     linkCable: false
 SCUS-94479:
-  name: "MLB 2001 (USA) (Demo)"
+  name: "MLB 2001 (Demo)"
+  saveName: "MLB 2001 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94638:
-  name: "MLB 2002 (USA)"
+  name: "MLB 2002"
+  saveName: "MLB 2002 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -95991,11 +100925,13 @@ SCUS-94638:
     multitap: false
     linkCable: false
 SCUS-94648:
-  name: "MLB 2002 (USA) (Demo)"
+  name: "MLB 2002 (Demo)"
+  saveName: "MLB 2002 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94653:
-  name: "MLB 2003 (USA)"
+  name: "MLB 2003"
+  saveName: "MLB 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96014,11 +100950,13 @@ SCUS-94653:
     multitap: false
     linkCable: false
 SCUS-94672:
-  name: "MLB 2003 (USA) (Demo)"
+  name: "MLB 2003 (Demo)"
+  saveName: "MLB 2003 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94689:
-  name: "MLB 2004 (USA)"
+  name: "MLB 2004"
+  saveName: "MLB 2004 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96037,7 +100975,8 @@ SCUS-94689:
     multitap: false
     linkCable: false
 SCUS-94692:
-  name: "MLB 2005 (USA)"
+  name: "MLB 2005"
+  saveName: "MLB 2005 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96056,7 +100995,8 @@ SCUS-94692:
     multitap: false
     linkCable: false
 SCUS-94170:
-  name: "MLB 98 (USA)"
+  name: "MLB 98"
+  saveName: "MLB 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -96074,7 +101014,8 @@ SCUS-94170:
     multitap: false
     linkCable: false
 SCUS-94233:
-  name: "MLB 99 (USA)"
+  name: "MLB 99"
+  saveName: "MLB 99 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -96092,11 +101033,13 @@ SCUS-94233:
     multitap: false
     linkCable: false
 PAPX-90008:
-  name: "MLB Pennant Race (Japan) (Demo)"
+  name: "MLB Pennant Race (Demo)"
+  saveName: "MLB Pennant Race (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94507:
-  name: "MLB Pennant Race (USA)"
+  name: "MLB Pennant Race"
+  saveName: "MLB Pennant Race (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -96114,7 +101057,8 @@ SCUS-94507:
     multitap: false
     linkCable: false
 SLPS-01467:
-  name: "MTB Dirt Cross (Japan)"
+  name: "MTB Dirt Cross"
+  saveName: "MTB Dirt Cross (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96135,7 +101079,8 @@ SLPS-01467:
     multitap: false
     linkCable: false
 SLES-03967:
-  name: "MTV Celebrity Deathmatch (Europe) (En,Fr,De,Es,It)"
+  name: "MTV Celebrity Deathmatch"
+  saveName: "MTV Celebrity Deathmatch (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96158,7 +101103,8 @@ SLES-03967:
     multitap: false
     linkCable: false
 SLUS-01453:
-  name: "MTV Celebrity Deathmatch (USA)"
+  name: "MTV Celebrity Deathmatch"
+  saveName: "MTV Celebrity Deathmatch (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96177,7 +101123,8 @@ SLUS-01453:
     multitap: false
     linkCable: false
 SLUS-01006:
-  name: "MTV Music Generator (USA)"
+  name: "MTV Music Generator"
+  saveName: "MTV Music Generator (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -96200,7 +101147,8 @@ SLUS-01006:
     multitap: true
     linkCable: false
 SLES-03162:
-  name: "MTV Sports - Pure Ride (Europe) (En,Fr,De)"
+  name: "MTV Sports - Pure Ride"
+  saveName: "MTV Sports - Pure Ride (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96221,11 +101169,13 @@ SLES-03162:
     multitap: false
     linkCable: false
 SLED-03277:
-  name: "MTV Sports - Pure Ride (UK) (Demo)"
+  name: "MTV Sports - Pure Ride (Demo)"
+  saveName: "MTV Sports - Pure Ride (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01231:
-  name: "MTV Sports - Pure Ride (USA)"
+  name: "MTV Sports - Pure Ride"
+  saveName: "MTV Sports - Pure Ride (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96244,11 +101194,13 @@ SLUS-01231:
     multitap: false
     linkCable: false
 SLUS-90089:
-  name: "MTV Sports - Pure Ride (USA) (Demo)"
+  name: "MTV Sports - Pure Ride (Demo)"
+  saveName: "MTV Sports - Pure Ride (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03133:
-  name: "MTV Sports - Skateboarding featuring Andy Macdonald (Europe)"
+  name: "MTV Sports - Skateboarding featuring Andy Macdonald"
+  saveName: "MTV Sports - Skateboarding featuring Andy Macdonald (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96267,7 +101219,8 @@ SLES-03133:
     multitap: false
     linkCable: false
 SLUS-01232:
-  name: "MTV Sports - Skateboarding featuring Andy Macdonald (USA)"
+  name: "MTV Sports - Skateboarding featuring Andy Macdonald"
+  saveName: "MTV Sports - Skateboarding featuring Andy Macdonald (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96286,7 +101239,8 @@ SLUS-01232:
     multitap: false
     linkCable: false
 SLES-02353:
-  name: "MTV Sports - Snowboarding (Europe)"
+  name: "MTV Sports - Snowboarding"
+  saveName: "MTV Sports - Snowboarding (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96305,11 +101259,13 @@ SLES-02353:
     multitap: false
     linkCable: false
 SLED-02412:
-  name: "MTV Sports - Snowboarding (Europe) (Demo)"
+  name: "MTV Sports - Snowboarding (Demo)"
+  saveName: "MTV Sports - Snowboarding (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00990:
-  name: "MTV Sports - Snowboarding (USA)"
+  name: "MTV Sports - Snowboarding"
+  saveName: "MTV Sports - Snowboarding (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96328,7 +101284,8 @@ SLUS-00990:
     multitap: false
     linkCable: false
 SLES-03430:
-  name: "MTV Sports - T.J. Lavin's Ultimate BMX (Europe)"
+  name: "MTV Sports - T.J. Lavin's Ultimate BMX"
+  saveName: "MTV Sports - T.J. Lavin's Ultimate BMX (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96347,7 +101304,8 @@ SLES-03430:
     multitap: false
     linkCable: false
 SLUS-01233:
-  name: "MTV Sports - T.J. Lavin's Ultimate BMX (USA)"
+  name: "MTV Sports - T.J. Lavin's Ultimate BMX"
+  saveName: "MTV Sports - T.J. Lavin's Ultimate BMX (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96366,7 +101324,8 @@ SLUS-01233:
     multitap: false
     linkCable: false
 SLPS-02705:
-  name: "Maboroshi Tsukiyo - Tsukiyono Kitan (Japan) (Disc 1)"
+  name: "Maboroshi Tsukiyo - Tsukiyono Kitan (Disc 1)"
+  saveName: "Maboroshi Tsukiyo - Tsukiyono Kitan (Japan) (Disc 1)"
   discSet:
     name: "Maboroshi Tsukiyo - Tsukiyono Kitan (Japan)"
     serials:
@@ -96390,7 +101349,8 @@ SLPS-02705:
     multitap: false
     linkCable: false
 SLPS-02706:
-  name: "Maboroshi Tsukiyo - Tsukiyono Kitan (Japan) (Disc 2)"
+  name: "Maboroshi Tsukiyo - Tsukiyono Kitan (Disc 2)"
+  saveName: "Maboroshi Tsukiyo - Tsukiyono Kitan (Japan) (Disc 2)"
   discSet:
     name: "Maboroshi Tsukiyo - Tsukiyono Kitan (Japan)"
     serials:
@@ -96436,7 +101396,8 @@ SLPS-03143:
     multitap: false
     linkCable: false
 SLPS-00295:
-  name: "Mach GoGoGo (Japan)"
+  name: "Mach GoGoGo"
+  saveName: "Mach GoGoGo (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -96455,7 +101416,8 @@ SLPS-00295:
     multitap: false
     linkCable: false
 SLUS-00383:
-  name: "Machine Head (USA)"
+  name: "Machine Head"
+  saveName: "Machine Head (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -96473,7 +101435,8 @@ SLUS-00383:
     multitap: false
     linkCable: false
 SLES-00630:
-  name: "Machine Hunter (Europe)"
+  name: "Machine Hunter"
+  saveName: "Machine Hunter (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96492,7 +101455,8 @@ SLES-00630:
     multitap: false
     linkCable: false
 SLES-00830:
-  name: "Machine Hunter (France)"
+  name: "Machine Hunter"
+  saveName: "Machine Hunter (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96511,7 +101475,8 @@ SLES-00830:
     multitap: false
     linkCable: false
 SLES-00831:
-  name: "Machine Hunter (Germany)"
+  name: "Machine Hunter"
+  saveName: "Machine Hunter (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96530,7 +101495,8 @@ SLES-00831:
     multitap: false
     linkCable: false
 SLES-00832:
-  name: "Machine Hunter (Italy)"
+  name: "Machine Hunter"
+  saveName: "Machine Hunter (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96549,7 +101515,8 @@ SLES-00832:
     multitap: false
     linkCable: false
 SLES-00833:
-  name: "Machine Hunter (Spain)"
+  name: "Machine Hunter"
+  saveName: "Machine Hunter (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96568,7 +101535,8 @@ SLES-00833:
     multitap: false
     linkCable: false
 SLUS-00470:
-  name: "Machine Hunter (USA)"
+  name: "Machine Hunter"
+  saveName: "Machine Hunter (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96627,7 +101595,8 @@ SCPS-45021:
     multitap: false
     linkCable: false
 SLPS-00386:
-  name: "Macross Digital Mission VF-X (Japan)"
+  name: "Macross Digital Mission VF-X"
+  saveName: "Macross Digital Mission VF-X (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -96645,11 +101614,13 @@ SLPS-00386:
     multitap: false
     linkCable: false
 SLPM-80083:
-  name: "Macross Digital Mission VF-X (Japan) (Demo)"
+  name: "Macross Digital Mission VF-X (Demo)"
+  saveName: "Macross Digital Mission VF-X (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91058:
-  name: "Macross Digital Mission VF-X (Japan) (Rev 1)"
+  name: "Macross Digital Mission VF-X"
+  saveName: "Macross Digital Mission VF-X (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -96667,7 +101638,8 @@ SLPS-91058:
     multitap: false
     linkCable: false
 SLPS-02791:
-  name: "Macross Plus - Game Edition (Japan)"
+  name: "Macross Plus - Game Edition"
+  saveName: "Macross Plus - Game Edition (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96686,7 +101658,8 @@ SLPS-02791:
     multitap: false
     linkCable: false
 SLPS-02237:
-  name: "Macross VF-X2 (Japan)"
+  name: "Macross VF-X2"
+  saveName: "Macross VF-X2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96705,7 +101678,8 @@ SLPS-02237:
     multitap: false
     linkCable: false
 SLPS-02007:
-  name: "Macross VF-X2, Patlabor - The Game (Japan) (Demo)"
+  name: "Macross VF-X2, Patlabor - The Game (Demo)"
+  saveName: "Macross VF-X2, Patlabor - The Game (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -96723,7 +101697,8 @@ SLPS-02007:
     multitap: false
     linkCable: false
 SLPS-00880:
-  name: "Mad Panic Coaster (Japan)"
+  name: "Mad Panic Coaster"
+  saveName: "Mad Panic Coaster (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -96741,7 +101716,8 @@ SLPS-00880:
     multitap: false
     linkCable: false
 SLPS-00734:
-  name: "Mad Stalker - Full Metal Force (Japan)"
+  name: "Mad Stalker - Full Metal Force"
+  saveName: "Mad Stalker - Full Metal Force (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -96759,7 +101735,8 @@ SLPS-00734:
     multitap: false
     linkCable: false
 SLES-02192:
-  name: "Madden NFL 2000 (Europe)"
+  name: "Madden NFL 2000"
+  saveName: "Madden NFL 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96778,7 +101755,8 @@ SLES-02192:
     multitap: true
     linkCable: false
 SLUS-00961:
-  name: "Madden NFL 2000 (USA)"
+  name: "Madden NFL 2000"
+  saveName: "Madden NFL 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96797,7 +101775,8 @@ SLUS-00961:
     multitap: true
     linkCable: false
 SLES-03067:
-  name: "Madden NFL 2001 (Europe)"
+  name: "Madden NFL 2001"
+  saveName: "Madden NFL 2001 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96816,7 +101795,8 @@ SLES-03067:
     multitap: true
     linkCable: false
 SLUS-01241:
-  name: "Madden NFL 2001 (USA)"
+  name: "Madden NFL 2001"
+  saveName: "Madden NFL 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96835,7 +101815,8 @@ SLUS-01241:
     multitap: true
     linkCable: false
 SLUS-01402:
-  name: "Madden NFL 2002 (USA)"
+  name: "Madden NFL 2002"
+  saveName: "Madden NFL 2002 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96854,7 +101835,8 @@ SLUS-01402:
     multitap: true
     linkCable: false
 SLUS-01482:
-  name: "Madden NFL 2003 (USA)"
+  name: "Madden NFL 2003"
+  saveName: "Madden NFL 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96873,7 +101855,8 @@ SLUS-01482:
     multitap: true
     linkCable: false
 SLUS-01570:
-  name: "Madden NFL 2004 (USA)"
+  name: "Madden NFL 2004"
+  saveName: "Madden NFL 2004 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96892,7 +101875,8 @@ SLUS-01570:
     multitap: true
     linkCable: false
 SLUS-01584:
-  name: "Madden NFL 2005 (USA)"
+  name: "Madden NFL 2005"
+  saveName: "Madden NFL 2005 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -96911,7 +101895,8 @@ SLUS-01584:
     multitap: true
     linkCable: false
 SLES-00436:
-  name: "Madden NFL 97 (Europe)"
+  name: "Madden NFL 97"
+  saveName: "Madden NFL 97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -96929,7 +101914,8 @@ SLES-00436:
     multitap: true
     linkCable: false
 SLUS-00018:
-  name: "Madden NFL 97 (USA)"
+  name: "Madden NFL 97"
+  saveName: "Madden NFL 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -96947,7 +101933,8 @@ SLUS-00018:
     multitap: true
     linkCable: false
 SLES-00904:
-  name: "Madden NFL 98 (Europe)"
+  name: "Madden NFL 98"
+  saveName: "Madden NFL 98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -96965,7 +101952,8 @@ SLES-00904:
     multitap: true
     linkCable: false
 SLUS-00516:
-  name: "Madden NFL 98 (USA)"
+  name: "Madden NFL 98"
+  saveName: "Madden NFL 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -96983,7 +101971,8 @@ SLUS-00516:
     multitap: true
     linkCable: false
 SLES-01427:
-  name: "Madden NFL 99 (Europe)"
+  name: "Madden NFL 99"
+  saveName: "Madden NFL 99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97002,7 +101991,8 @@ SLES-01427:
     multitap: true
     linkCable: false
 SLUS-00729:
-  name: "Madden NFL 99 (USA)"
+  name: "Madden NFL 99"
+  saveName: "Madden NFL 99 (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -97023,7 +102013,8 @@ SLUS-00729:
     multitap: true
     linkCable: false
 SLPM-86586:
-  name: "Maestromusic, The (Japan)"
+  name: "Maestromusic, The"
+  saveName: "Maestromusic, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97042,7 +102033,8 @@ SLPM-86586:
     multitap: false
     linkCable: false
 SLPM-86585:
-  name: "Maestromusic, The (Japan) (Doukonban)"
+  name: "Maestromusic, The (Doukonban)"
+  saveName: "Maestromusic, The (Japan) (Doukonban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97061,7 +102053,8 @@ SLPM-86585:
     multitap: false
     linkCable: false
 SLPM-86679:
-  name: "Maestromusic, The - Encore Disc (Japan)"
+  name: "Maestromusic, The - Encore Disc"
+  saveName: "Maestromusic, The - Encore Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97080,7 +102073,8 @@ SLPM-86679:
     multitap: false
     linkCable: false
 SLPM-86684:
-  name: "Maestromusic, The - Merry Christmas (Japan)"
+  name: "Maestromusic, The - Merry Christmas"
+  saveName: "Maestromusic, The - Merry Christmas (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97099,7 +102093,8 @@ SLPM-86684:
     multitap: false
     linkCable: false
 SLES-00282:
-  name: "Magic - The Gathering - BattleMage (Europe)"
+  name: "Magic - The Gathering - BattleMage"
+  saveName: "Magic - The Gathering - BattleMage (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -97117,7 +102112,8 @@ SLES-00282:
     multitap: false
     linkCable: false
 SLES-00787:
-  name: "Magic - The Gathering - BattleMage (France)"
+  name: "Magic - The Gathering - BattleMage"
+  saveName: "Magic - The Gathering - BattleMage (France)"
   controllers:
     - DigitalController
   metadata:
@@ -97135,7 +102131,8 @@ SLES-00787:
     multitap: false
     linkCable: false
 SLES-00788:
-  name: "Magic - The Gathering - BattleMage (Germany)"
+  name: "Magic - The Gathering - BattleMage"
+  saveName: "Magic - The Gathering - BattleMage (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -97153,7 +102150,8 @@ SLES-00788:
     multitap: false
     linkCable: false
 SLUS-00247:
-  name: "Magic - The Gathering - BattleMage (USA)"
+  name: "Magic - The Gathering - BattleMage"
+  saveName: "Magic - The Gathering - BattleMage (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -97171,7 +102169,8 @@ SLUS-00247:
     multitap: false
     linkCable: false
 SLES-00211:
-  name: "Magic Carpet (Europe) (En,Fr,De,Es,Sv)"
+  name: "Magic Carpet"
+  saveName: "Magic Carpet (Europe) (En,Fr,De,Es,Sv)"
   controllers:
     - DigitalController
   settings:
@@ -97195,7 +102194,8 @@ SLES-00211:
     multitap: false
     linkCable: false
 SLPS-00587:
-  name: "Magic Carpet (Japan)"
+  name: "Magic Carpet"
+  saveName: "Magic Carpet (Japan)"
   controllers:
     - DigitalController
   settings:
@@ -97215,7 +102215,8 @@ SLPS-00587:
     multitap: false
     linkCable: false
 SLUS-00029:
-  name: "Magic Carpet (USA) (En,Fr,De,Es,Sv)"
+  name: "Magic Carpet"
+  saveName: "Magic Carpet (USA) (En,Fr,De,Es,Sv)"
   controllers:
     - DigitalController
   settings:
@@ -97239,7 +102240,8 @@ SLUS-00029:
     multitap: false
     linkCable: false
 SLPS-00426:
-  name: "Magic Johnson to Kareem Abdul-Jabbar no Slam 'n Jam '96 (Japan)"
+  name: "Magic Johnson to Kareem Abdul-Jabbar no Slam 'n Jam '96"
+  saveName: "Magic Johnson to Kareem Abdul-Jabbar no Slam 'n Jam '96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97275,7 +102277,8 @@ SCPS-45134:
     multitap: false
     linkCable: false
 SLPM-86619:
-  name: "Magical Date - Doki Doki Kokuhaku Daisakusen (Japan)"
+  name: "Magical Date - Doki Doki Kokuhaku Daisakusen"
+  saveName: "Magical Date - Doki Doki Kokuhaku Daisakusen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -97296,7 +102299,8 @@ SLPM-86619:
     multitap: false
     linkCable: false
 SCPS-10135:
-  name: "Magical Dice Kids (Japan)"
+  name: "Magical Dice Kids"
+  saveName: "Magical Dice Kids (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97315,7 +102319,8 @@ SCPS-10135:
     multitap: true
     linkCable: false
 SLPS-00201:
-  name: "Magical Drop (Japan)"
+  name: "Magical Drop"
+  saveName: "Magical Drop (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97333,7 +102338,8 @@ SLPS-00201:
     multitap: false
     linkCable: false
 SLPS-02337:
-  name: "Magical Drop F - Daibouken mo Rakujanai! (Japan)"
+  name: "Magical Drop F - Daibouken mo Rakujanai!"
+  saveName: "Magical Drop F - Daibouken mo Rakujanai! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97352,7 +102358,8 @@ SLPS-02337:
     multitap: false
     linkCable: false
 SLPM-86805:
-  name: "Magical Drop F - Daibouken mo Rakujanai! (Japan) (Major Wave)"
+  name: "Magical Drop F - Daibouken mo Rakujanai! (Major Wave)"
+  saveName: "Magical Drop F - Daibouken mo Rakujanai! (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97371,7 +102378,8 @@ SLPM-86805:
     multitap: false
     linkCable: false
 SLES-02964:
-  name: "Magical Drop III (Europe) (En,Fr,De,Es,It,Nl) (Disc 1) (Magical Drop III)"
+  name: "Magical Drop III (Disc 1) (Magical Drop III)"
+  saveName: "Magical Drop III (Europe) (En,Fr,De,Es,It,Nl) (Disc 1) (Magical Drop III)"
   discSet:
     name: "Magical Drop III (Europe) (En,Fr,De,Es,It,Nl)"
     serials:
@@ -97399,7 +102407,8 @@ SLES-02964:
     multitap: false
     linkCable: false
 SLES-12964:
-  name: "Magical Drop III (Europe) (En,Fr,De,Es,It,Nl) (Disc 2) (Magical Drop +1)"
+  name: "Magical Drop III (Disc 2) (Magical Drop +1)"
+  saveName: "Magical Drop III (Europe) (En,Fr,De,Es,It,Nl) (Disc 2) (Magical Drop +1)"
   discSet:
     name: "Magical Drop III (Europe) (En,Fr,De,Es,It,Nl)"
     serials:
@@ -97448,7 +102457,8 @@ SLPM-86755:
     multitap: false
     linkCable: false
 SLPM-86051:
-  name: "Magical Drop III - Yokubari Tokudai-gou! (Japan)"
+  name: "Magical Drop III - Yokubari Tokudai-gou!"
+  saveName: "Magical Drop III - Yokubari Tokudai-gou! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -97473,7 +102483,8 @@ SLPM-86051:
     multitap: false
     linkCable: false
 SLPS-01918:
-  name: "Magical Drop Plus 1! (Japan)"
+  name: "Magical Drop Plus 1!"
+  saveName: "Magical Drop Plus 1! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -97494,7 +102505,8 @@ SLPS-01918:
     multitap: false
     linkCable: false
 SLPS-00737:
-  name: "Magical Hoppers (Japan)"
+  name: "Magical Hoppers"
+  saveName: "Magical Hoppers (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -97515,7 +102527,8 @@ SLPS-00737:
     multitap: false
     linkCable: false
 SLPM-86099:
-  name: "Magical Medical (Japan)"
+  name: "Magical Medical"
+  saveName: "Magical Medical (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97533,7 +102546,8 @@ SLPM-86099:
     multitap: false
     linkCable: false
 SCES-02154:
-  name: "Magical Tetris Challenge (Europe)"
+  name: "Magical Tetris Challenge"
+  saveName: "Magical Tetris Challenge (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97552,7 +102566,8 @@ SCES-02154:
     multitap: false
     linkCable: false
 SCES-02175:
-  name: "Magical Tetris Challenge (Germany)"
+  name: "Magical Tetris Challenge"
+  saveName: "Magical Tetris Challenge (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97571,7 +102586,8 @@ SCES-02175:
     multitap: false
     linkCable: false
 SLPS-01786:
-  name: "Magical Tetris Challenge featuring Mickey (Japan)"
+  name: "Magical Tetris Challenge featuring Mickey"
+  saveName: "Magical Tetris Challenge featuring Mickey (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -97593,11 +102609,13 @@ SLPS-01786:
     multitap: false
     linkCable: false
 SCED-03993:
-  name: "Magical World of Disney on PlayStation, The (Europe)"
+  name: "Magical World of Disney on PlayStation, The"
+  saveName: "Magical World of Disney on PlayStation, The (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-01173:
-  name: "Magical Zunou Power!! Party Selection (Japan)"
+  name: "Magical Zunou Power!! Party Selection"
+  saveName: "Magical Zunou Power!! Party Selection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97633,7 +102651,8 @@ SLPS-02552:
     multitap: true
     linkCable: false
 SCES-02178:
-  name: "Magische Tetris Uitdaging (Netherlands)"
+  name: "Magische Tetris Uitdaging"
+  saveName: "Magische Tetris Uitdaging (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97652,7 +102671,8 @@ SCES-02178:
     multitap: false
     linkCable: false
 SLPS-00043:
-  name: "Mahjong Ganryuujima (Japan)"
+  name: "Mahjong Ganryuujima"
+  saveName: "Mahjong Ganryuujima (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97688,7 +102708,8 @@ SLPS-02979:
     multitap: false
     linkCable: false
 SLPS-00014:
-  name: "Mahjong Gokuu Tenjiku (Japan)"
+  name: "Mahjong Gokuu Tenjiku"
+  saveName: "Mahjong Gokuu Tenjiku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97706,7 +102727,8 @@ SLPS-00014:
     multitap: false
     linkCable: false
 SLPS-02098:
-  name: "Mahjong Gokuu Tenjiku 99 (Japan)"
+  name: "Mahjong Gokuu Tenjiku 99"
+  saveName: "Mahjong Gokuu Tenjiku 99 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -97728,9 +102750,11 @@ SLPS-02098:
     multitap: false
     linkCable: false
 SLPS-00364:
-  name: "Mahjong Senjutsu - Andou Mitsuru Pro no Akuukan Sappou (Japan)"
+  name: "Mahjong Senjutsu - Andou Mitsuru Pro no Akuukan Sappou"
+  saveName: "Mahjong Senjutsu - Andou Mitsuru Pro no Akuukan Sappou (Japan)"
 SLPS-00005:
-  name: "Mahjong Station Mazin (Japan)"
+  name: "Mahjong Station Mazin"
+  saveName: "Mahjong Station Mazin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97748,7 +102772,8 @@ SLPS-00005:
     multitap: false
     linkCable: false
 SLPS-00603:
-  name: "Mahjong Taikai II Special (Japan)"
+  name: "Mahjong Taikai II Special"
+  saveName: "Mahjong Taikai II Special (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97766,7 +102791,8 @@ SLPS-00603:
     multitap: false
     linkCable: false
 SLPM-86993:
-  name: "Mahjong Taikai II Special (Japan) (Rev 1)"
+  name: "Mahjong Taikai II Special"
+  saveName: "Mahjong Taikai II Special (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -97802,7 +102828,8 @@ SLPM-86338:
     multitap: false
     linkCable: false
 SLPS-03064:
-  name: "Mahjong Toriatama Kikou (Japan)"
+  name: "Mahjong Toriatama Kikou"
+  saveName: "Mahjong Toriatama Kikou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97821,7 +102848,8 @@ SLPS-03064:
     multitap: false
     linkCable: false
 SLPS-03123:
-  name: "Mahjong Uranai Fortuna - Tsuki no Megami-tachi (Japan)"
+  name: "Mahjong Uranai Fortuna - Tsuki no Megami-tachi"
+  saveName: "Mahjong Uranai Fortuna - Tsuki no Megami-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97840,7 +102868,8 @@ SLPS-03123:
     multitap: false
     linkCable: false
 SLPM-86173:
-  name: "Mahjong Yarou ze! (Japan)"
+  name: "Mahjong Yarou ze!"
+  saveName: "Mahjong Yarou ze! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97859,7 +102888,8 @@ SLPM-86173:
     multitap: false
     linkCable: false
 SLPS-02956:
-  name: "Mahjong Youchien Tamago Gumi 2 - Taikai e Ikou! (Japan)"
+  name: "Mahjong Youchien Tamago Gumi 2 - Taikai e Ikou!"
+  saveName: "Mahjong Youchien Tamago Gumi 2 - Taikai e Ikou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97878,7 +102908,8 @@ SLPS-02956:
     multitap: false
     linkCable: false
 SLPS-02995:
-  name: "Mahjong de Asobo (Japan)"
+  name: "Mahjong de Asobo"
+  saveName: "Mahjong de Asobo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -97897,7 +102928,8 @@ SLPS-02995:
     multitap: false
     linkCable: false
 SLPS-00460:
-  name: "Mahou Shoujo Fancy CoCo (Japan)"
+  name: "Mahou Shoujo Fancy CoCo"
+  saveName: "Mahou Shoujo Fancy CoCo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -97915,7 +102947,8 @@ SLPS-00460:
     multitap: false
     linkCable: false
 SLPS-00645:
-  name: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Japan) (Disc 1) (Episode 23)"
+  name: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Disc 1) (Episode 23)"
+  saveName: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Japan) (Disc 1) (Episode 23)"
   discSet:
     name: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Japan)"
     serials:
@@ -97938,7 +102971,8 @@ SLPS-00645:
     multitap: false
     linkCable: false
 SLPS-00646:
-  name: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Japan) (Disc 2) (Episode 24)"
+  name: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Disc 2) (Episode 24)"
+  saveName: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Japan) (Disc 2) (Episode 24)"
   discSet:
     name: "Mahou Shoujo Pretty Samy - Part 1 - In the Earth (Japan)"
     serials:
@@ -97961,7 +102995,8 @@ SLPS-00646:
     multitap: false
     linkCable: false
 SLPS-00760:
-  name: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Japan) (Disc 1) (Episode 25)"
+  name: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Disc 1) (Episode 25)"
+  saveName: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Japan) (Disc 1) (Episode 25)"
   discSet:
     name: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Japan)"
     serials:
@@ -97984,7 +103019,8 @@ SLPS-00760:
     multitap: false
     linkCable: false
 SLPS-00761:
-  name: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Japan) (Disc 2) (Episode 26)"
+  name: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Disc 2) (Episode 26)"
+  saveName: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Japan) (Disc 2) (Episode 26)"
   discSet:
     name: "Mahou Shoujo Pretty Samy - Part 2 - In the Julyhelm (Japan)"
     serials:
@@ -98007,7 +103043,8 @@ SLPS-00761:
     multitap: false
     linkCable: false
 SLPS-01754:
-  name: "Mahoutsukai ni Naru Houhou (Japan)"
+  name: "Mahoutsukai ni Naru Houhou"
+  saveName: "Mahoutsukai ni Naru Houhou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98043,7 +103080,8 @@ SCPS-45323:
     multitap: false
     linkCable: false
 SLPS-01249:
-  name: "Mainichi Nekoyoubi (Japan)"
+  name: "Mainichi Nekoyoubi"
+  saveName: "Mainichi Nekoyoubi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98061,7 +103099,8 @@ SLPS-01249:
     multitap: false
     linkCable: false
 SLPS-01850:
-  name: "Majokko Daisakusen - Little Witching Mischiefs (Japan)"
+  name: "Majokko Daisakusen - Little Witching Mischiefs"
+  saveName: "Majokko Daisakusen - Little Witching Mischiefs (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98080,7 +103119,8 @@ SLPS-01850:
     multitap: false
     linkCable: false
 SLPS-00128:
-  name: "Makeruna! Makendou 2 (Japan)"
+  name: "Makeruna! Makendou 2"
+  saveName: "Makeruna! Makendou 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -98100,7 +103140,8 @@ SLPS-00128:
     multitap: false
     linkCable: false
 SLPS-00562:
-  name: "Making of Nightruth, The (Japan)"
+  name: "Making of Nightruth, The"
+  saveName: "Making of Nightruth, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98118,7 +103159,8 @@ SLPS-00562:
     multitap: false
     linkCable: false
 SLES-02402:
-  name: "Manager de Liga (Spain)"
+  name: "Manager de Liga"
+  saveName: "Manager de Liga (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98138,7 +103180,8 @@ SLES-02402:
     multitap: false
     linkCable: false
 SLES-02979:
-  name: "Manager de Liga 2001 (Spain)"
+  name: "Manager de Liga 2001"
+  saveName: "Manager de Liga 2001 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98158,7 +103201,8 @@ SLES-02979:
     multitap: false
     linkCable: false
 SLES-03607:
-  name: "Manager de Liga 2002 (Spain)"
+  name: "Manager de Liga 2002"
+  saveName: "Manager de Liga 2002 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98178,7 +103222,8 @@ SLES-03607:
     multitap: false
     linkCable: false
 SLUS-01471:
-  name: "Marble Master (USA)"
+  name: "Marble Master"
+  saveName: "Marble Master (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98197,7 +103242,8 @@ SLUS-01471:
     multitap: false
     linkCable: false
 SLPS-01738:
-  name: "Marby Baby Story (Japan)"
+  name: "Marby Baby Story"
+  saveName: "Marby Baby Story (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98215,7 +103261,8 @@ SLPS-01738:
     multitap: false
     linkCable: false
 SLES-03868:
-  name: "Marcel Desailly Pro Football (France)"
+  name: "Marcel Desailly Pro Football"
+  saveName: "Marcel Desailly Pro Football (France)"
   controllers:
     - DigitalController
   traits:
@@ -98235,7 +103282,8 @@ SLES-03868:
     multitap: false
     linkCable: false
 SLUS-00526:
-  name: "March Madness '98 (USA)"
+  name: "March Madness '98"
+  saveName: "March Madness '98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -98253,11 +103301,13 @@ SLUS-00526:
     multitap: true
     linkCable: false
 SLPM-80185:
-  name: "Maria - Kimitachi ga Umareta Wake (Japan) (Demo)"
+  name: "Maria - Kimitachi ga Umareta Wake (Demo)"
+  saveName: "Maria - Kimitachi ga Umareta Wake (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01136:
-  name: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 1)"
+  name: "Maria - Kimitachi ga Umareta Wake (Disc 1)"
+  saveName: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 1)"
   discSet:
     name: "Maria - Kimitachi ga Umareta Wake (Japan)"
     serials:
@@ -98284,7 +103334,8 @@ SLPS-01136:
     multitap: false
     linkCable: false
 SLPS-01137:
-  name: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 2)"
+  name: "Maria - Kimitachi ga Umareta Wake (Disc 2)"
+  saveName: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 2)"
   discSet:
     name: "Maria - Kimitachi ga Umareta Wake (Japan)"
     serials:
@@ -98311,7 +103362,8 @@ SLPS-01137:
     multitap: false
     linkCable: false
 SLPS-01138:
-  name: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 3)"
+  name: "Maria - Kimitachi ga Umareta Wake (Disc 3)"
+  saveName: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 3)"
   discSet:
     name: "Maria - Kimitachi ga Umareta Wake (Japan)"
     serials:
@@ -98338,7 +103390,8 @@ SLPS-01138:
     multitap: false
     linkCable: false
 SLPS-02240:
-  name: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Disc 1)"
+  name: "Maria 2 - Jutai Kokuchi no Nazo (Disc 1)"
+  saveName: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Disc 1)"
   discSet:
     name: "Maria 2 - Jutai Kokuchi no Nazo (Japan)"
     serials:
@@ -98362,7 +103415,8 @@ SLPS-02240:
     multitap: false
     linkCable: false
 SLPS-02241:
-  name: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Disc 2)"
+  name: "Maria 2 - Jutai Kokuchi no Nazo (Disc 2)"
+  saveName: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Disc 2)"
   discSet:
     name: "Maria 2 - Jutai Kokuchi no Nazo (Japan)"
     serials:
@@ -98386,7 +103440,8 @@ SLPS-02241:
     multitap: false
     linkCable: false
 SLPS-02242:
-  name: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Disc 3)"
+  name: "Maria 2 - Jutai Kokuchi no Nazo (Disc 3)"
+  saveName: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Disc 3)"
   discSet:
     name: "Maria 2 - Jutai Kokuchi no Nazo (Japan)"
     serials:
@@ -98432,7 +103487,8 @@ SLPM-86850:
     multitap: false
     linkCable: false
 SLPS-00856:
-  name: "Marie no Atelier - Salburg no Renkinjutsushi (Japan)"
+  name: "Marie no Atelier - Salburg no Renkinjutsushi"
+  saveName: "Marie no Atelier - Salburg no Renkinjutsushi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98450,7 +103506,8 @@ SLPS-00856:
     multitap: false
     linkCable: false
 SLPS-01418:
-  name: "Marie no Atelier Plus - Salburg no Renkinjutsushi (Japan)"
+  name: "Marie no Atelier Plus - Salburg no Renkinjutsushi"
+  saveName: "Marie no Atelier Plus - Salburg no Renkinjutsushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98472,7 +103529,8 @@ SLPS-01418:
     multitap: false
     linkCable: false
 SLPS-00964:
-  name: "Mario Mushano no Chou Shougi Juku (Japan)"
+  name: "Mario Mushano no Chou Shougi Juku"
+  saveName: "Mario Mushano no Chou Shougi Juku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98508,7 +103566,8 @@ SLPS-02058:
     multitap: false
     linkCable: false
 SLPM-86810:
-  name: "Marionette Company (Japan)"
+  name: "Marionette Company"
+  saveName: "Marionette Company (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -98526,7 +103585,8 @@ SLPM-86810:
     multitap: false
     linkCable: false
 SLPS-02743:
-  name: "Marionette Company 2 Chu! (Japan)"
+  name: "Marionette Company 2 Chu!"
+  saveName: "Marionette Company 2 Chu! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98545,7 +103605,8 @@ SLPS-02743:
     multitap: false
     linkCable: false
 SLPM-87004:
-  name: "Marionette Company 2 Chu! (Japan) (Major Wave)"
+  name: "Marionette Company 2 Chu! (Major Wave)"
+  saveName: "Marionette Company 2 Chu! (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98564,7 +103625,8 @@ SLPM-87004:
     multitap: false
     linkCable: false
 SLPS-03538:
-  name: "Marl Jong!! (Japan)"
+  name: "Marl Jong!!"
+  saveName: "Marl Jong!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98583,7 +103645,8 @@ SLPS-03538:
     multitap: false
     linkCable: false
 SLPS-03537:
-  name: "Marl Jong!! (Japan) (Genteiban)"
+  name: "Marl Jong!! (Genteiban)"
+  saveName: "Marl Jong!! (Japan) (Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98602,7 +103665,8 @@ SLPS-03537:
     multitap: false
     linkCable: false
 SLPS-01734:
-  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan)"
+  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess"
+  saveName: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98624,7 +103688,8 @@ SLPS-01734:
     multitap: false
     linkCable: false
 SLPS-02287:
-  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan) (Omake Disc)"
+  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Omake Disc)"
+  saveName: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan) (Omake Disc)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98643,7 +103708,8 @@ SLPS-02287:
     multitap: false
     linkCable: false
 SLPS-91415:
-  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan) (PSone Books)"
+  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (PSone Books)"
+  saveName: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan) (PSone Books)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98662,9 +103728,11 @@ SLPS-91415:
     multitap: false
     linkCable: false
 SLPM-80319:
-  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan) (Taikenban)"
+  name: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Taikenban)"
+  saveName: "Marl Oukoku no Ningyou-hime - The Adventure of Puppet Princess (Japan) (Taikenban)"
 SLES-02768:
-  name: "Marranos en Guerra (Spain)"
+  name: "Marranos en Guerra"
+  saveName: "Marranos en Guerra (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98684,7 +103752,8 @@ SLES-02768:
     multitap: true
     linkCable: false
 LSP-010180:
-  name: "Mars Moose Adventure - WalkAbout 1 - The Natural History Museum (USA)"
+  name: "Mars Moose Adventure - WalkAbout 1 - The Natural History Museum"
+  saveName: "Mars Moose Adventure - WalkAbout 1 - The Natural History Museum (USA)"
   codes:
     - LSP-010180
     - LSP01018001
@@ -98705,7 +103774,8 @@ LSP-010180:
     multitap: false
     linkCable: false
 LSP-010280:
-  name: "Mars Moose Adventure - WalkAbout 2 - The Shakespeare Festival (USA)"
+  name: "Mars Moose Adventure - WalkAbout 2 - The Shakespeare Festival"
+  saveName: "Mars Moose Adventure - WalkAbout 2 - The Shakespeare Festival (USA)"
   codes:
     - LSP-010280
     - LSP01028001
@@ -98719,7 +103789,8 @@ LSP-010280:
     languages:
       - English
 LSP-010380:
-  name: "Mars Moose Adventure - WalkAbout 3 - World Sports Day (USA)"
+  name: "Mars Moose Adventure - WalkAbout 3 - World Sports Day"
+  saveName: "Mars Moose Adventure - WalkAbout 3 - World Sports Day (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98742,7 +103813,8 @@ LSP-010380:
     multitap: false
     linkCable: false
 LSP-010170:
-  name: "Mars Moose Cosmic Quest 1 - City Sights (USA)"
+  name: "Mars Moose Cosmic Quest 1 - City Sights"
+  saveName: "Mars Moose Cosmic Quest 1 - City Sights (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98765,7 +103837,8 @@ LSP-010170:
     multitap: false
     linkCable: false
 LSP-010270:
-  name: "Mars Moose Cosmic Quest 2 - Fairy Tale Island (USA)"
+  name: "Mars Moose Cosmic Quest 2 - Fairy Tale Island"
+  saveName: "Mars Moose Cosmic Quest 2 - Fairy Tale Island (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98787,7 +103860,8 @@ LSP-010270:
     multitap: false
     linkCable: false
 LSP-010370:
-  name: "Mars Moose Cosmic Quest 3 - Race Through France (USA)"
+  name: "Mars Moose Cosmic Quest 3 - Race Through France"
+  saveName: "Mars Moose Cosmic Quest 3 - Race Through France (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98809,7 +103883,8 @@ LSP-010370:
     multitap: false
     linkCable: false
 LSP-010160:
-  name: "Mars Moose Stay and Play 1 - In the Clubhouse (USA)"
+  name: "Mars Moose Stay and Play 1 - In the Clubhouse"
+  saveName: "Mars Moose Stay and Play 1 - In the Clubhouse (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98832,7 +103907,8 @@ LSP-010160:
     multitap: false
     linkCable: false
 LSP-010260:
-  name: "Mars Moose Stay and Play 2 - In Mars' Bedroom (USA)"
+  name: "Mars Moose Stay and Play 2 - In Mars' Bedroom"
+  saveName: "Mars Moose Stay and Play 2 - In Mars' Bedroom (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98855,7 +103931,8 @@ LSP-010260:
     multitap: false
     linkCable: false
 LSP-010360:
-  name: "Mars Moose Stay and Play 3 - In Lonnie's Classroom (USA)"
+  name: "Mars Moose Stay and Play 3 - In Lonnie's Classroom"
+  saveName: "Mars Moose Stay and Play 3 - In Lonnie's Classroom (USA)"
   controllers:
     - DigitalController
   codes:
@@ -98877,7 +103954,8 @@ LSP-010360:
     multitap: false
     linkCable: false
 SLPM-87014:
-  name: "Martialbeat (Japan)"
+  name: "Martialbeat"
+  saveName: "Martialbeat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -98896,7 +103974,8 @@ SLPM-87014:
     multitap: false
     linkCable: false
 SLPM-87148:
-  name: "Martialbeat 2 (Japan) (Disc 1) (Disc-B)"
+  name: "Martialbeat 2 (Disc 1) (Disc-B)"
+  saveName: "Martialbeat 2 (Japan) (Disc 1) (Disc-B)"
   discSet:
     name: "Martialbeat 2 (Japan)"
     serials:
@@ -98920,7 +103999,8 @@ SLPM-87148:
     multitap: false
     linkCable: false
 SLPM-87146:
-  name: "Martialbeat 2 (Japan) (Disc 1) (Disc-B) (Controller Doukon Set)"
+  name: "Martialbeat 2 (Disc 1) (Disc-B) (Controller Doukon Set)"
+  saveName: "Martialbeat 2 (Japan) (Disc 1) (Disc-B) (Controller Doukon Set)"
   discSet:
     name: "Martialbeat 2 (Japan) (Controller Doukon Set)"
     serials:
@@ -98944,7 +104024,8 @@ SLPM-87146:
     multitap: false
     linkCable: false
 SLPM-87149:
-  name: "Martialbeat 2 (Japan) (Disc 2) (Disc-F)"
+  name: "Martialbeat 2 (Disc 2) (Disc-F)"
+  saveName: "Martialbeat 2 (Japan) (Disc 2) (Disc-F)"
   discSet:
     name: "Martialbeat 2 (Japan)"
     serials:
@@ -98968,7 +104049,8 @@ SLPM-87149:
     multitap: false
     linkCable: false
 SLPM-87147:
-  name: "Martialbeat 2 (Japan) (Disc 2) (Disc-F) (Controller Doukon Set)"
+  name: "Martialbeat 2 (Disc 2) (Disc-F) (Controller Doukon Set)"
+  saveName: "Martialbeat 2 (Japan) (Disc 2) (Disc-F) (Controller Doukon Set)"
   discSet:
     name: "Martialbeat 2 (Japan) (Controller Doukon Set)"
     serials:
@@ -98992,7 +104074,8 @@ SLPM-87147:
     multitap: false
     linkCable: false
 SLES-01350:
-  name: "Martian Gothic - Unification (Europe) (En,Fr,Es,It)"
+  name: "Martian Gothic - Unification"
+  saveName: "Martian Gothic - Unification (Europe) (En,Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99014,7 +104097,8 @@ SLES-01350:
     multitap: false
     linkCable: false
 SLES-02998:
-  name: "Martian Gothic - Unification (Germany)"
+  name: "Martian Gothic - Unification"
+  saveName: "Martian Gothic - Unification (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99033,7 +104117,8 @@ SLES-02998:
     multitap: false
     linkCable: false
 SLUS-01148:
-  name: "Martian Gothic - Unification (USA)"
+  name: "Martian Gothic - Unification"
+  saveName: "Martian Gothic - Unification (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99052,7 +104137,8 @@ SLUS-01148:
     multitap: false
     linkCable: false
 SLES-00932:
-  name: "Marvel Super Heroes (Europe)"
+  name: "Marvel Super Heroes"
+  saveName: "Marvel Super Heroes (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -99070,13 +104156,15 @@ SLES-00932:
     multitap: false
     linkCable: false
 SLED-00499:
-  name: "Marvel Super Heroes (Europe) (Demo)"
+  name: "Marvel Super Heroes (Demo)"
+  saveName: "Marvel Super Heroes (Europe) (Demo)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SLPS-00763:
-  name: "Marvel Super Heroes (Japan)"
+  name: "Marvel Super Heroes"
+  saveName: "Marvel Super Heroes (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99094,7 +104182,8 @@ SLPS-00763:
     multitap: false
     linkCable: false
 SLUS-00257:
-  name: "Marvel Super Heroes (USA)"
+  name: "Marvel Super Heroes"
+  saveName: "Marvel Super Heroes (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -99112,7 +104201,8 @@ SLUS-00257:
     multitap: false
     linkCable: false
 SLES-01792:
-  name: "Marvel Super Heroes vs. Street Fighter (Europe)"
+  name: "Marvel Super Heroes vs. Street Fighter"
+  saveName: "Marvel Super Heroes vs. Street Fighter (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99133,7 +104223,8 @@ SLES-01792:
     multitap: false
     linkCable: false
 SLUS-00793:
-  name: "Marvel Super Heroes vs. Street Fighter (USA)"
+  name: "Marvel Super Heroes vs. Street Fighter"
+  saveName: "Marvel Super Heroes vs. Street Fighter (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -99156,7 +104247,8 @@ SLUS-00793:
     multitap: false
     linkCable: false
 SLPS-01915:
-  name: "Marvel Super Heroes vs. Street Fighter - EX Edition (Japan)"
+  name: "Marvel Super Heroes vs. Street Fighter - EX Edition"
+  saveName: "Marvel Super Heroes vs. Street Fighter - EX Edition (Japan)"
   compatibility:
     rating: NoIssues
     upscalingIssues: "Sprite glitches"
@@ -99180,7 +104272,8 @@ SLPS-01915:
     multitap: false
     linkCable: false
 SLPM-80376:
-  name: "Marvel Super Heroes vs. Street Fighter - EX Edition (Japan) (Demo)"
+  name: "Marvel Super Heroes vs. Street Fighter - EX Edition (Demo)"
+  saveName: "Marvel Super Heroes vs. Street Fighter - EX Edition (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -99189,7 +104282,8 @@ SLPM-80376:
     - SLPM-80376
     - SLPM-80382
 SLES-02305:
-  name: "Marvel vs. Capcom - Clash of Super Heroes (Europe)"
+  name: "Marvel vs. Capcom - Clash of Super Heroes"
+  saveName: "Marvel vs. Capcom - Clash of Super Heroes (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99210,7 +104304,8 @@ SLES-02305:
     multitap: false
     linkCable: false
 SLUS-01059:
-  name: "Marvel vs. Capcom - Clash of Super Heroes (USA)"
+  name: "Marvel vs. Capcom - Clash of Super Heroes"
+  saveName: "Marvel vs. Capcom - Clash of Super Heroes (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -99234,7 +104329,8 @@ SLUS-01059:
     multitap: false
     linkCable: false
 SLPS-02368:
-  name: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition (Japan)"
+  name: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition"
+  saveName: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99255,13 +104351,15 @@ SLPS-02368:
     multitap: false
     linkCable: false
 SLPM-80508:
-  name: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition (Japan) (Demo)"
+  name: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition (Demo)"
+  saveName: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLES-02379:
-  name: "Mary King's Riding Star (Europe) (En,Fr,De,Es,It,Nl,Pt)"
+  name: "Mary King's Riding Star"
+  saveName: "Mary King's Riding Star (Europe) (En,Fr,De,Es,It,Nl,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99286,7 +104384,8 @@ SLES-02379:
     multitap: false
     linkCable: false
 SLES-03421:
-  name: "Mary-Kate and Ashley - Crush Course (Europe)"
+  name: "Mary-Kate and Ashley - Crush Course"
+  saveName: "Mary-Kate and Ashley - Crush Course (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99305,7 +104404,8 @@ SLES-03421:
     multitap: false
     linkCable: false
 SLUS-01386:
-  name: "Mary-Kate and Ashley - Crush Course (USA)"
+  name: "Mary-Kate and Ashley - Crush Course"
+  saveName: "Mary-Kate and Ashley - Crush Course (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99324,7 +104424,8 @@ SLUS-01386:
     multitap: false
     linkCable: false
 SLES-03422:
-  name: "Mary-Kate and Ashley - Magical Mystery Mall (Europe, Australia)"
+  name: "Mary-Kate and Ashley - Magical Mystery Mall"
+  saveName: "Mary-Kate and Ashley - Magical Mystery Mall (Europe, Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99343,7 +104444,8 @@ SLES-03422:
     multitap: false
     linkCable: false
 SLUS-01121:
-  name: "Mary-Kate and Ashley - Magical Mystery Mall (USA)"
+  name: "Mary-Kate and Ashley - Magical Mystery Mall"
+  saveName: "Mary-Kate and Ashley - Magical Mystery Mall (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99362,7 +104464,8 @@ SLUS-01121:
     multitap: false
     linkCable: false
 SLES-03378:
-  name: "Mary-Kate and Ashley - Winners Circle (Europe)"
+  name: "Mary-Kate and Ashley - Winners Circle"
+  saveName: "Mary-Kate and Ashley - Winners Circle (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99381,7 +104484,8 @@ SLES-03378:
     multitap: false
     linkCable: false
 SLUS-01362:
-  name: "Mary-Kate and Ashley - Winners Circle (USA)"
+  name: "Mary-Kate and Ashley - Winners Circle"
+  saveName: "Mary-Kate and Ashley - Winners Circle (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -99402,7 +104506,8 @@ SLUS-01362:
     multitap: false
     linkCable: false
 SLES-00098:
-  name: "Mass Destruction (Europe) (En,Fr,De,Es)"
+  name: "Mass Destruction"
+  saveName: "Mass Destruction (Europe) (En,Fr,De,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -99427,7 +104532,8 @@ SLES-00098:
     multitap: false
     linkCable: false
 SLUS-00462:
-  name: "Mass Destruction (USA)"
+  name: "Mass Destruction"
+  saveName: "Mass Destruction (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99446,7 +104552,8 @@ SLUS-00462:
     multitap: false
     linkCable: false
 SLPS-00916:
-  name: "Master of Monsters - Akatsuki no Kenja-tachi (Japan)"
+  name: "Master of Monsters - Akatsuki no Kenja-tachi"
+  saveName: "Master of Monsters - Akatsuki no Kenja-tachi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99464,7 +104571,8 @@ SLPS-00916:
     multitap: false
     linkCable: false
 SLPM-86542:
-  name: "Master of Monsters - Akatsuki no Kenja-tachi (Japan) (Major Wave)"
+  name: "Master of Monsters - Akatsuki no Kenja-tachi (Major Wave)"
+  saveName: "Master of Monsters - Akatsuki no Kenja-tachi (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -99482,7 +104590,8 @@ SLPM-86542:
     multitap: false
     linkCable: false
 SLES-00244:
-  name: "Master of Monsters - Disciples of Gaia (Europe) (En,Fr,De)"
+  name: "Master of Monsters - Disciples of Gaia"
+  saveName: "Master of Monsters - Disciples of Gaia (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -99502,7 +104611,8 @@ SLES-00244:
     multitap: false
     linkCable: false
 SLUS-00595:
-  name: "Master of Monsters - Disciples of Gaia (USA)"
+  name: "Master of Monsters - Disciples of Gaia"
+  saveName: "Master of Monsters - Disciples of Gaia (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -99520,7 +104630,8 @@ SLUS-00595:
     multitap: false
     linkCable: false
 SLPS-00373:
-  name: "Masters - Shin Harukanaru Augusta (Japan)"
+  name: "Masters - Shin Harukanaru Augusta"
+  saveName: "Masters - Shin Harukanaru Augusta (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -99541,7 +104652,8 @@ SLPS-00373:
     multitap: false
     linkCable: false
 SLPS-00722:
-  name: "Masters Fighter, The (Japan)"
+  name: "Masters Fighter, The"
+  saveName: "Masters Fighter, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99560,7 +104672,8 @@ SLPS-00722:
     multitap: false
     linkCable: false
 SLPS-01426:
-  name: "Masumon Kids - The Another World of the Master of Monsters (Japan)"
+  name: "Masumon Kids - The Another World of the Master of Monsters"
+  saveName: "Masumon Kids - The Another World of the Master of Monsters (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99578,7 +104691,8 @@ SLPS-01426:
     multitap: false
     linkCable: false
 SLPM-86520:
-  name: "Masumon Kids - The Another World of the Master of Monsters (Japan) (Major Wave)"
+  name: "Masumon Kids - The Another World of the Master of Monsters (Major Wave)"
+  saveName: "Masumon Kids - The Another World of the Master of Monsters (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -99596,7 +104710,8 @@ SLPM-86520:
     multitap: false
     linkCable: false
 SLES-03217:
-  name: "Mat Hoffman's Pro BMX (Europe)"
+  name: "Mat Hoffman's Pro BMX"
+  saveName: "Mat Hoffman's Pro BMX (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99615,7 +104730,8 @@ SLES-03217:
     multitap: false
     linkCable: false
 SLES-03218:
-  name: "Mat Hoffman's Pro BMX (France)"
+  name: "Mat Hoffman's Pro BMX"
+  saveName: "Mat Hoffman's Pro BMX (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99634,7 +104750,8 @@ SLES-03218:
     multitap: false
     linkCable: false
 SLES-03219:
-  name: "Mat Hoffman's Pro BMX (Germany)"
+  name: "Mat Hoffman's Pro BMX"
+  saveName: "Mat Hoffman's Pro BMX (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99653,7 +104770,8 @@ SLES-03219:
     multitap: false
     linkCable: false
 SLPM-87119:
-  name: "Mat Hoffman's Pro BMX (Japan)"
+  name: "Mat Hoffman's Pro BMX"
+  saveName: "Mat Hoffman's Pro BMX (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99672,7 +104790,8 @@ SLPM-87119:
     multitap: false
     linkCable: false
 SLUS-01113:
-  name: "Mat Hoffman's Pro BMX (USA)"
+  name: "Mat Hoffman's Pro BMX"
+  saveName: "Mat Hoffman's Pro BMX (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99691,7 +104810,8 @@ SLUS-01113:
     multitap: false
     linkCable: false
 SLPS-00178:
-  name: "Match Golf, The (Japan)"
+  name: "Match Golf, The"
+  saveName: "Match Golf, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99709,7 +104829,8 @@ SLPS-00178:
     multitap: false
     linkCable: false
 LSP-903433:
-  name: "Math Gallery - Collection 1 (USA)"
+  name: "Math Gallery - Collection 1"
+  saveName: "Math Gallery - Collection 1 (USA)"
   codes:
     - LSP-903433
     - LSP90343300
@@ -99721,7 +104842,8 @@ LSP-903433:
     languages:
       - English
 LSP-903440:
-  name: "Math Gallery - Collection 2 (USA)"
+  name: "Math Gallery - Collection 2"
+  saveName: "Math Gallery - Collection 2 (USA)"
   codes:
     - LSP-903440
     - LSP90344001
@@ -99733,7 +104855,8 @@ LSP-903440:
     languages:
       - English
 LSP-100112:
-  name: "Math on the Move! 1 - Addition-Subtraction Advanced (USA)"
+  name: "Math on the Move! 1 - Addition-Subtraction Advanced"
+  saveName: "Math on the Move! 1 - Addition-Subtraction Advanced (USA)"
   codes:
     - LSP-100112
     - LSP10011201
@@ -99746,7 +104869,8 @@ LSP-100112:
     languages:
       - English
 LSP-100110:
-  name: "Math on the Move! 1 - Addition-Subtraction Intermediate (USA)"
+  name: "Math on the Move! 1 - Addition-Subtraction Intermediate"
+  saveName: "Math on the Move! 1 - Addition-Subtraction Intermediate (USA)"
   codes:
     - LSP-100110
     - LSP10011001
@@ -99758,7 +104882,8 @@ LSP-100110:
     languages:
       - English
 LSP-100113:
-  name: "Math on the Move! 2 - Multiplication-Division Advanced (USA)"
+  name: "Math on the Move! 2 - Multiplication-Division Advanced"
+  saveName: "Math on the Move! 2 - Multiplication-Division Advanced (USA)"
   codes:
     - LSP-100113
     - LSP10011301
@@ -99771,7 +104896,8 @@ LSP-100113:
     languages:
       - English
 LSP-905406:
-  name: "Math on the Move! 2 - Multiplication-Division Intermediate (USA)"
+  name: "Math on the Move! 2 - Multiplication-Division Intermediate"
+  saveName: "Math on the Move! 2 - Multiplication-Division Intermediate (USA)"
   codes:
     - LSP905406
     - LSP10011101
@@ -99782,7 +104908,8 @@ LSP-905406:
     languages:
       - English
 SLPS-00198:
-  name: "Matsukata Hiroki no World Fishing (Japan)"
+  name: "Matsukata Hiroki no World Fishing"
+  saveName: "Matsukata Hiroki no World Fishing (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99800,7 +104927,8 @@ SLPS-00198:
     multitap: false
     linkCable: false
 SLPS-02041:
-  name: "Matsukata Hiroki no World Fishing (Japan) (BPS the Choice)"
+  name: "Matsukata Hiroki no World Fishing (BPS the Choice)"
+  saveName: "Matsukata Hiroki no World Fishing (Japan) (BPS the Choice)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99819,7 +104947,8 @@ SLPS-02041:
     multitap: false
     linkCable: false
 SLPS-03220:
-  name: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Japan) (Disc 1)"
+  name: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Disc 1)"
+  saveName: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Japan) (Disc 1)"
   discSet:
     name: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Japan)"
     serials:
@@ -99843,7 +104972,8 @@ SLPS-03220:
     multitap: false
     linkCable: false
 SLPS-03221:
-  name: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Japan) (Disc 2)"
+  name: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Disc 2)"
+  saveName: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Japan) (Disc 2)"
   discSet:
     name: "Matsumoto Reiji 999 - Story of Galaxy Express 999 (Japan)"
     serials:
@@ -99885,7 +105015,8 @@ SCPS-45242:
     multitap: false
     linkCable: false
 SLPS-01359:
-  name: "Mawatte Mucho! (Japan)"
+  name: "Mawatte Mucho!"
+  saveName: "Mawatte Mucho! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99903,11 +105034,13 @@ SLPS-01359:
     multitap: false
     linkCable: false
 SLPM-80232:
-  name: "Mawatte Mucho! (Japan) (Demo)"
+  name: "Mawatte Mucho! (Demo)"
+  saveName: "Mawatte Mucho! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01694:
-  name: "Max Power Racing (Europe)"
+  name: "Max Power Racing"
+  saveName: "Max Power Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99927,7 +105060,8 @@ SLES-01694:
     multitap: false
     linkCable: false
 SLPS-02398:
-  name: "Max Surfing 2000 (Japan)"
+  name: "Max Surfing 2000"
+  saveName: "Max Surfing 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99946,7 +105080,8 @@ SLPS-02398:
     multitap: false
     linkCable: false
 SLPS-02871:
-  name: "Max Surfing 2nd (Japan)"
+  name: "Max Surfing 2nd"
+  saveName: "Max Surfing 2nd (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -99965,7 +105100,8 @@ SLPS-02871:
     multitap: false
     linkCable: false
 SLPS-00795:
-  name: "MaxRacer (Japan)"
+  name: "MaxRacer"
+  saveName: "MaxRacer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -99983,7 +105119,8 @@ SLPS-00795:
     multitap: false
     linkCable: false
 SLES-01001:
-  name: "Maximum Force (Europe) (En,Fr,Es,It)"
+  name: "Maximum Force"
+  saveName: "Maximum Force (Europe) (En,Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100007,7 +105144,8 @@ SLES-01001:
     multitap: false
     linkCable: false
 SLUS-00503:
-  name: "Maximum Force (USA)"
+  name: "Maximum Force"
+  saveName: "Maximum Force (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -100031,7 +105169,8 @@ SLUS-00503:
     multitap: false
     linkCable: false
 SLPS-03490:
-  name: "Maze Heroes - Meikyuu Densetsu (Japan)"
+  name: "Maze Heroes - Meikyuu Densetsu"
+  saveName: "Maze Heroes - Meikyuu Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100050,23 +105189,28 @@ SLPS-03490:
     multitap: false
     linkCable: false
 SCED-03909:
-  name: "McDonald's - Demo 01 (Europe)"
+  name: "McDonald's - Demo 01"
+  saveName: "McDonald's - Demo 01 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03910:
-  name: "McDonald's - Demo 02 (Europe)"
+  name: "McDonald's - Demo 02"
+  saveName: "McDonald's - Demo 02 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03911:
-  name: "McDonald's - Demo 03 (Europe)"
+  name: "McDonald's - Demo 03"
+  saveName: "McDonald's - Demo 03 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03912:
-  name: "McDonald's - Demo 04 (Europe)"
+  name: "McDonald's - Demo 04"
+  saveName: "McDonald's - Demo 04 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-00340:
-  name: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition (Europe)"
+  name: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition"
+  saveName: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition (Europe)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -100085,7 +105229,8 @@ SLES-00340:
     multitap: false
     linkCable: false
 SLUS-00401:
-  name: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition (USA)"
+  name: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition"
+  saveName: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition (USA)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -100104,7 +105249,8 @@ SLUS-00401:
     multitap: false
     linkCable: false
 SLPS-00937:
-  name: "MechWarrior 2 - Arcade Combat Edition (Japan)"
+  name: "MechWarrior 2 - Arcade Combat Edition"
+  saveName: "MechWarrior 2 - Arcade Combat Edition (Japan)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -100123,7 +105269,8 @@ SLPS-00937:
     multitap: false
     linkCable: false
 SLES-00374:
-  name: "MechWarrior 2 - Combat au 31ieme Siecle (France)"
+  name: "MechWarrior 2 - Combat au 31ieme Siecle"
+  saveName: "MechWarrior 2 - Combat au 31ieme Siecle (France)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -100142,7 +105289,8 @@ SLES-00374:
     multitap: false
     linkCable: false
 SLES-00375:
-  name: "MechWarrior 2 - Kampfspiel des 31. Jahrhunderts - Arcade Combat Edition (Germany)"
+  name: "MechWarrior 2 - Kampfspiel des 31. Jahrhunderts - Arcade Combat Edition"
+  saveName: "MechWarrior 2 - Kampfspiel des 31. Jahrhunderts - Arcade Combat Edition (Germany)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -100161,7 +105309,8 @@ SLES-00375:
     multitap: false
     linkCable: false
 SLES-02470:
-  name: "Medal of Honor (Europe)"
+  name: "Medal of Honor"
+  saveName: "Medal of Honor (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100180,7 +105329,8 @@ SLES-02470:
     multitap: false
     linkCable: false
 SLES-02471:
-  name: "Medal of Honor (France)"
+  name: "Medal of Honor"
+  saveName: "Medal of Honor (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100199,7 +105349,8 @@ SLES-02471:
     multitap: false
     linkCable: false
 SLES-02472:
-  name: "Medal of Honor (Germany)"
+  name: "Medal of Honor"
+  saveName: "Medal of Honor (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100218,7 +105369,8 @@ SLES-02472:
     multitap: false
     linkCable: false
 SLUS-00974:
-  name: "Medal of Honor (USA)"
+  name: "Medal of Honor"
+  saveName: "Medal of Honor (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-941-g2e64f77"
@@ -100240,7 +105392,8 @@ SLUS-00974:
     multitap: false
     linkCable: false
 SLES-03125:
-  name: "Medal of Honor - Resistance (France)"
+  name: "Medal of Honor - Resistance"
+  saveName: "Medal of Honor - Resistance (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100259,7 +105412,8 @@ SLES-03125:
     multitap: false
     linkCable: false
 SLES-03124:
-  name: "Medal of Honor - Underground (Europe)"
+  name: "Medal of Honor - Underground"
+  saveName: "Medal of Honor - Underground (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100278,7 +105432,8 @@ SLES-03124:
     multitap: false
     linkCable: false
 SLES-03126:
-  name: "Medal of Honor - Underground (Germany)"
+  name: "Medal of Honor - Underground"
+  saveName: "Medal of Honor - Underground (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100297,7 +105452,8 @@ SLES-03126:
     multitap: false
     linkCable: false
 SLUS-01270:
-  name: "Medal of Honor - Underground (USA)"
+  name: "Medal of Honor - Underground"
+  saveName: "Medal of Honor - Underground (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -100320,7 +105476,8 @@ SLUS-01270:
     multitap: false
     linkCable: false
 SLPS-02414:
-  name: "Medarot R (Japan)"
+  name: "Medarot R"
+  saveName: "Medarot R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100339,7 +105496,8 @@ SLPS-02414:
     multitap: false
     linkCable: false
 SLPS-02635:
-  name: "Medarot R - Parts Collection (Japan)"
+  name: "Medarot R - Parts Collection"
+  saveName: "Medarot R - Parts Collection (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100358,7 +105516,8 @@ SLPS-02635:
     multitap: false
     linkCable: false
 SCES-00311:
-  name: "MediEvil (Europe)"
+  name: "MediEvil"
+  saveName: "MediEvil (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1419-g34a515cd"
@@ -100381,7 +105540,8 @@ SCES-00311:
     multitap: false
     linkCable: false
 SCES-01492:
-  name: "MediEvil (France)"
+  name: "MediEvil"
+  saveName: "MediEvil (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100401,7 +105561,8 @@ SCES-01492:
     multitap: false
     linkCable: false
 SCES-01493:
-  name: "MediEvil (Germany)"
+  name: "MediEvil"
+  saveName: "MediEvil (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100421,7 +105582,8 @@ SCES-01493:
     multitap: false
     linkCable: false
 SCES-01494:
-  name: "MediEvil (Italy)"
+  name: "MediEvil"
+  saveName: "MediEvil (Italy)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3694-g19734190"
@@ -100444,7 +105606,8 @@ SCES-01494:
     multitap: false
     linkCable: false
 SCES-01495:
-  name: "MediEvil (Spain)"
+  name: "MediEvil"
+  saveName: "MediEvil (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -100467,7 +105630,8 @@ SCES-01495:
     multitap: false
     linkCable: false
 SCUS-94227:
-  name: "MediEvil (USA)"
+  name: "MediEvil"
+  saveName: "MediEvil (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1419-g34a515cd"
@@ -100489,11 +105653,13 @@ SCUS-94227:
     multitap: false
     linkCable: false
 SCUS-94291:
-  name: "MediEvil (USA) (Demo)"
+  name: "MediEvil (Demo)"
+  saveName: "MediEvil (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10081:
-  name: "MediEvil - Yomigaetta Gallowmere no Yuusha (Japan)"
+  name: "MediEvil - Yomigaetta Gallowmere no Yuusha"
+  saveName: "MediEvil - Yomigaetta Gallowmere no Yuusha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100512,7 +105678,8 @@ SCPS-10081:
     multitap: false
     linkCable: false
 SCES-02544:
-  name: "MediEvil 2 (Europe) (En,Fr,De)"
+  name: "MediEvil 2"
+  saveName: "MediEvil 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100534,7 +105701,8 @@ SCES-02544:
     multitap: false
     linkCable: false
 SCES-02545:
-  name: "MediEvil 2 (Europe) (Es,It,Pt)"
+  name: "MediEvil 2"
+  saveName: "MediEvil 2 (Europe) (Es,It,Pt)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -100559,11 +105727,13 @@ SCES-02545:
     multitap: false
     linkCable: false
 SCED-02818:
-  name: "MediEvil 2 (Europe) (Es,It,Pt) (Demo)"
+  name: "MediEvil 2 (Demo)"
+  saveName: "MediEvil 2 (Europe) (Es,It,Pt) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02546:
-  name: "MediEvil 2 (Russia)"
+  name: "MediEvil 2"
+  saveName: "MediEvil 2 (Russia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100583,11 +105753,13 @@ SCES-02546:
     multitap: false
     linkCable: false
 SCED-01527:
-  name: "MediEvil Collector's Edition (UK) (Demo)"
+  name: "MediEvil Collector's Edition (Demo)"
+  saveName: "MediEvil Collector's Edition (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94564:
-  name: "MediEvil II (USA)"
+  name: "MediEvil II"
+  saveName: "MediEvil II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -100609,11 +105781,13 @@ SCUS-94564:
     multitap: false
     linkCable: false
 SCED-01571:
-  name: "MediEvil Special (France) (Demo)"
+  name: "MediEvil Special (Demo)"
+  saveName: "MediEvil Special (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01064:
-  name: "Mega Man 8 (Europe)"
+  name: "Mega Man 8"
+  saveName: "Mega Man 8 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -100638,7 +105812,8 @@ SLES-01064:
     multitap: false
     linkCable: false
 SLUS-00453:
-  name: "Mega Man 8 (USA)"
+  name: "Mega Man 8"
+  saveName: "Mega Man 8 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -100662,7 +105837,8 @@ SLUS-00453:
     multitap: false
     linkCable: false
 SLES-01485:
-  name: "Mega Man Legends (Europe)"
+  name: "Mega Man Legends"
+  saveName: "Mega Man Legends (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -100683,7 +105859,8 @@ SLES-01485:
     multitap: false
     linkCable: false
 SLUS-00603:
-  name: "Mega Man Legends (USA)"
+  name: "Mega Man Legends"
+  saveName: "Mega Man Legends (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -100704,7 +105881,8 @@ SLUS-00603:
     multitap: false
     linkCable: false
 SLES-03556:
-  name: "Mega Man Legends 2 (Europe)"
+  name: "Mega Man Legends 2"
+  saveName: "Mega Man Legends 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100723,7 +105901,8 @@ SLES-03556:
     multitap: false
     linkCable: false
 SLUS-01140:
-  name: "Mega Man Legends 2 (USA)"
+  name: "Mega Man Legends 2"
+  saveName: "Mega Man Legends 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -100745,7 +105924,8 @@ SLUS-01140:
     multitap: false
     linkCable: false
 SLUS-90078:
-  name: "Mega Man Legends 2 (USA) (Demo)"
+  name: "Mega Man Legends 2 (Demo)"
+  saveName: "Mega Man Legends 2 (USA) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100764,7 +105944,8 @@ SLUS-90078:
     multitap: false
     linkCable: false
 SLES-00503:
-  name: "Mega Man X3 (Europe)"
+  name: "Mega Man X3"
+  saveName: "Mega Man X3 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -100786,7 +105967,8 @@ SLES-00503:
     multitap: false
     linkCable: false
 SLUS-00561:
-  name: "Mega Man X4 (USA)"
+  name: "Mega Man X4"
+  saveName: "Mega Man X4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -100807,7 +105989,8 @@ SLUS-00561:
     multitap: false
     linkCable: false
 SLES-03557:
-  name: "Mega Man X5 (Europe)"
+  name: "Mega Man X5"
+  saveName: "Mega Man X5 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100826,7 +106009,8 @@ SLES-03557:
     multitap: false
     linkCable: false
 SLUS-01334:
-  name: "Mega Man X5 (USA)"
+  name: "Mega Man X5"
+  saveName: "Mega Man X5 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -100848,7 +106032,8 @@ SLUS-01334:
     multitap: false
     linkCable: false
 SLES-03778:
-  name: "Mega Man X6 (Europe)"
+  name: "Mega Man X6"
+  saveName: "Mega Man X6 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -100867,7 +106052,8 @@ SLES-03778:
     multitap: false
     linkCable: false
 SLUS-01395:
-  name: "Mega Man X6 (USA)"
+  name: "Mega Man X6"
+  saveName: "Mega Man X6 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -100889,7 +106075,8 @@ SLUS-01395:
     multitap: false
     linkCable: false
 SLES-00766:
-  name: "Megaman - Battle & Chase (Europe)"
+  name: "Megaman - Battle & Chase"
+  saveName: "Megaman - Battle & Chase (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -100948,7 +106135,8 @@ SLPM-88509:
     multitap: false
     linkCable: false
 SLPS-00500:
-  name: "Megami Ibunroku Persona - Be Your True Mind (Japan)"
+  name: "Megami Ibunroku Persona - Be Your True Mind"
+  saveName: "Megami Ibunroku Persona - Be Your True Mind (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -100970,7 +106158,8 @@ SLPS-00500:
     multitap: false
     linkCable: false
 SLPS-91029:
-  name: "Megami Ibunroku Persona - Be Your True Mind (Japan) (Rev 1)"
+  name: "Megami Ibunroku Persona - Be Your True Mind"
+  saveName: "Megami Ibunroku Persona - Be Your True Mind (Japan) (Rev 1)"
   controllers:
     - DigitalController
   traits:
@@ -101014,7 +106203,8 @@ SLPM-87192:
     multitap: false
     linkCable: false
 SLPS-00435:
-  name: "Megatudo 2096 (Japan)"
+  name: "Megatudo 2096"
+  saveName: "Megatudo 2096 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1614-g914f3ad4"
@@ -101037,7 +106227,8 @@ SLPS-00435:
     multitap: false
     linkCable: false
 SLPS-01714:
-  name: "Meguri Aishite (Japan)"
+  name: "Meguri Aishite"
+  saveName: "Meguri Aishite (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101055,7 +106246,8 @@ SLPS-01714:
     multitap: false
     linkCable: false
 SLPS-01153:
-  name: "Meisha Retsuden - Greatest 70's (Japan)"
+  name: "Meisha Retsuden - Greatest 70's"
+  saveName: "Meisha Retsuden - Greatest 70's (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -101074,7 +106266,8 @@ SLPS-01153:
     multitap: false
     linkCable: false
 SLPS-02159:
-  name: "Meisha Retsuden - Greatest 70's (Japan) (Rev 1)"
+  name: "Meisha Retsuden - Greatest 70's"
+  saveName: "Meisha Retsuden - Greatest 70's (Japan) (Rev 1)"
   controllers:
     - DigitalController
     - NeGcon
@@ -101093,7 +106286,8 @@ SLPS-02159:
     multitap: false
     linkCable: false
 SLPS-01690:
-  name: "Meitantei Conan (Japan)"
+  name: "Meitantei Conan"
+  saveName: "Meitantei Conan (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -101114,7 +106308,8 @@ SLPS-01690:
     multitap: false
     linkCable: false
 SLPS-02804:
-  name: "Meitantei Conan - 3-nin no Meisuiri (Japan)"
+  name: "Meitantei Conan - 3-nin no Meisuiri"
+  saveName: "Meitantei Conan - 3-nin no Meisuiri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101136,11 +106331,13 @@ SLPS-02804:
     multitap: false
     linkCable: false
 SLPM-80568:
-  name: "Meitantei Conan - 3-nin no Meisuiri (Japan) (Demo)"
+  name: "Meitantei Conan - 3-nin no Meisuiri (Demo)"
+  saveName: "Meitantei Conan - 3-nin no Meisuiri (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03425:
-  name: "Meitantei Conan - Saikou no Partner (Japan)"
+  name: "Meitantei Conan - Saikou no Partner"
+  saveName: "Meitantei Conan - Saikou no Partner (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101159,9 +106356,11 @@ SLPS-03425:
     multitap: false
     linkCable: false
 SLPM-80640:
-  name: "Meitantei Conan - Trick Trick Vol. 0 - Meikyuu no Crossroad Special Disc (Japan)"
+  name: "Meitantei Conan - Trick Trick Vol. 0 - Meikyuu no Crossroad Special Disc"
+  saveName: "Meitantei Conan - Trick Trick Vol. 0 - Meikyuu no Crossroad Special Disc (Japan)"
 SLPS-03548:
-  name: "Meitantei Conan - Trick Trick Vol. 1 (Japan)"
+  name: "Meitantei Conan - Trick Trick Vol. 1"
+  saveName: "Meitantei Conan - Trick Trick Vol. 1 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101180,7 +106379,8 @@ SLPS-03548:
     multitap: false
     linkCable: false
 SLPS-02649:
-  name: "Meka Pokeler (Japan)"
+  name: "Meka Pokeler"
+  saveName: "Meka Pokeler (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101199,7 +106399,8 @@ SLPS-02649:
     multitap: false
     linkCable: false
 SLPS-00282:
-  name: "MeltyLancer - Ginga Shoujo Keisatsu 2086 (Japan)"
+  name: "MeltyLancer - Ginga Shoujo Keisatsu 2086"
+  saveName: "MeltyLancer - Ginga Shoujo Keisatsu 2086 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101217,11 +106418,13 @@ SLPS-00282:
     multitap: false
     linkCable: false
 SLPM-80161:
-  name: "MeltyLancer - Re-inforce (Japan) (Demo)"
+  name: "MeltyLancer - Re-inforce (Demo)"
+  saveName: "MeltyLancer - Re-inforce (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01147:
-  name: "MeltyLancer - Re-inforce (Japan) (Disc 1)"
+  name: "MeltyLancer - Re-inforce (Disc 1)"
+  saveName: "MeltyLancer - Re-inforce (Japan) (Disc 1)"
   discSet:
     name: "MeltyLancer - Re-inforce (Japan)"
     serials:
@@ -101244,7 +106447,8 @@ SLPS-01147:
     multitap: false
     linkCable: false
 SLPS-01148:
-  name: "MeltyLancer - Re-inforce (Japan) (Disc 2)"
+  name: "MeltyLancer - Re-inforce (Disc 2)"
+  saveName: "MeltyLancer - Re-inforce (Japan) (Disc 2)"
   discSet:
     name: "MeltyLancer - Re-inforce (Japan)"
     serials:
@@ -101267,7 +106471,8 @@ SLPS-01148:
     multitap: false
     linkCable: false
 SLPM-86231:
-  name: "MeltyLancer - The 3rd Planet (Japan) (Disc 1)"
+  name: "MeltyLancer - The 3rd Planet (Disc 1)"
+  saveName: "MeltyLancer - The 3rd Planet (Japan) (Disc 1)"
   discSet:
     name: "MeltyLancer - The 3rd Planet (Japan)"
     serials:
@@ -101291,7 +106496,8 @@ SLPM-86231:
     multitap: false
     linkCable: false
 SLPM-86232:
-  name: "MeltyLancer - The 3rd Planet (Japan) (Disc 2)"
+  name: "MeltyLancer - The 3rd Planet (Disc 2)"
+  saveName: "MeltyLancer - The 3rd Planet (Japan) (Disc 2)"
   discSet:
     name: "MeltyLancer - The 3rd Planet (Japan)"
     serials:
@@ -101315,7 +106521,8 @@ SLPM-86232:
     multitap: false
     linkCable: false
 SLPS-03135:
-  name: "Memorial Series - Sunsoft Vol. 1 (Japan)"
+  name: "Memorial Series - Sunsoft Vol. 1"
+  saveName: "Memorial Series - Sunsoft Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101333,7 +106540,8 @@ SLPS-03135:
     multitap: false
     linkCable: false
 SLPS-03181:
-  name: "Memorial Series - Sunsoft Vol. 2 (Japan)"
+  name: "Memorial Series - Sunsoft Vol. 2"
+  saveName: "Memorial Series - Sunsoft Vol. 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101351,7 +106559,8 @@ SLPS-03181:
     multitap: false
     linkCable: false
 SLPS-03366:
-  name: "Memorial Series - Sunsoft Vol. 3 (Japan)"
+  name: "Memorial Series - Sunsoft Vol. 3"
+  saveName: "Memorial Series - Sunsoft Vol. 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101369,7 +106578,8 @@ SLPS-03366:
     multitap: false
     linkCable: false
 SLPS-03382:
-  name: "Memorial Series - Sunsoft Vol. 4 (Japan)"
+  name: "Memorial Series - Sunsoft Vol. 4"
+  saveName: "Memorial Series - Sunsoft Vol. 4 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101387,7 +106597,8 @@ SLPS-03382:
     multitap: false
     linkCable: false
 SLPS-03397:
-  name: "Memorial Series - Sunsoft Vol. 5 (Japan)"
+  name: "Memorial Series - Sunsoft Vol. 5"
+  saveName: "Memorial Series - Sunsoft Vol. 5 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101405,7 +106616,8 @@ SLPS-03397:
     multitap: false
     linkCable: false
 SLPS-03486:
-  name: "Memorial Series - Sunsoft Vol. 6 (Japan)"
+  name: "Memorial Series - Sunsoft Vol. 6"
+  saveName: "Memorial Series - Sunsoft Vol. 6 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101423,7 +106635,8 @@ SLPS-03486:
     multitap: false
     linkCable: false
 SLPS-02296:
-  name: "Memories Off (Japan)"
+  name: "Memories Off"
+  saveName: "Memories Off (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101442,7 +106655,8 @@ SLPS-02296:
     multitap: false
     linkCable: false
 SLPS-03292:
-  name: "Memories Off 2nd (Japan) (Disc 1)"
+  name: "Memories Off 2nd (Disc 1)"
+  saveName: "Memories Off 2nd (Japan) (Disc 1)"
   discSet:
     name: "Memories Off 2nd (Japan)"
     serials:
@@ -101466,7 +106680,8 @@ SLPS-03292:
     multitap: false
     linkCable: false
 SLPS-03289:
-  name: "Memories Off 2nd (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Memories Off 2nd (Disc 1) (Shokai Genteiban)"
+  saveName: "Memories Off 2nd (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Memories Off 2nd (Japan) (Shokai Genteiban)"
     serials:
@@ -101491,7 +106706,8 @@ SLPS-03289:
     multitap: false
     linkCable: false
 SLPS-03293:
-  name: "Memories Off 2nd (Japan) (Disc 2)"
+  name: "Memories Off 2nd (Disc 2)"
+  saveName: "Memories Off 2nd (Japan) (Disc 2)"
   discSet:
     name: "Memories Off 2nd (Japan)"
     serials:
@@ -101515,7 +106731,8 @@ SLPS-03293:
     multitap: false
     linkCable: false
 SLPS-03290:
-  name: "Memories Off 2nd (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Memories Off 2nd (Disc 2) (Shokai Genteiban)"
+  saveName: "Memories Off 2nd (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Memories Off 2nd (Japan) (Shokai Genteiban)"
     serials:
@@ -101540,7 +106757,8 @@ SLPS-03290:
     multitap: false
     linkCable: false
 SLPS-03291:
-  name: "Memories Off 2nd (Japan) (Disc 3) (Making Disc) (Shokai Genteiban)"
+  name: "Memories Off 2nd (Disc 3) (Making Disc) (Shokai Genteiban)"
+  saveName: "Memories Off 2nd (Japan) (Disc 3) (Making Disc) (Shokai Genteiban)"
   discSet:
     name: "Memories Off 2nd (Japan) (Shokai Genteiban)"
     serials:
@@ -101548,15 +106766,20 @@ SLPS-03291:
       - SLPS-03290
       - SLPS-03291
 SLPM-80153:
-  name: "Memory Card Data Book Vol. 1 (Japan)"
+  name: "Memory Card Data Book Vol. 1"
+  saveName: "Memory Card Data Book Vol. 1 (Japan)"
 SLPM-80251:
-  name: "Memory Card Data Book Vol. 2 (Japan)"
+  name: "Memory Card Data Book Vol. 2"
+  saveName: "Memory Card Data Book Vol. 2 (Japan)"
 SLPM-80395:
-  name: "Memory Card Data Book Vol. 3 (Japan)"
+  name: "Memory Card Data Book Vol. 3"
+  saveName: "Memory Card Data Book Vol. 3 (Japan)"
 SLPM-80520:
-  name: "Memory Card Data Book Vol. 4 (Japan)"
+  name: "Memory Card Data Book Vol. 4"
+  saveName: "Memory Card Data Book Vol. 4 (Japan)"
 SLES-01047:
-  name: "Men in Black - The Game (Europe)"
+  name: "Men in Black - The Game"
+  saveName: "Men in Black - The Game (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -101577,7 +106800,8 @@ SLES-01047:
     multitap: false
     linkCable: false
 SLES-01199:
-  name: "Men in Black - The Game (France)"
+  name: "Men in Black - The Game"
+  saveName: "Men in Black - The Game (France)"
   controllers:
     - DigitalController
   metadata:
@@ -101595,7 +106819,8 @@ SLES-01199:
     multitap: false
     linkCable: false
 SLES-01200:
-  name: "Men in Black - The Game (Germany)"
+  name: "Men in Black - The Game"
+  saveName: "Men in Black - The Game (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -101613,9 +106838,11 @@ SLES-01200:
     multitap: false
     linkCable: false
 SLES-01201:
-  name: "Men in Black - The Game (Italy)"
+  name: "Men in Black - The Game"
+  saveName: "Men in Black - The Game (Italy)"
 SLES-03519:
-  name: "Men in Black - The Series - Crashdown (Europe)"
+  name: "Men in Black - The Series - Crashdown"
+  saveName: "Men in Black - The Series - Crashdown (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101635,7 +106862,8 @@ SLES-03519:
     multitap: false
     linkCable: false
 SLES-03520:
-  name: "Men in Black - The Series - Crashdown (France)"
+  name: "Men in Black - The Series - Crashdown"
+  saveName: "Men in Black - The Series - Crashdown (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101655,7 +106883,8 @@ SLES-03520:
     multitap: false
     linkCable: false
 SLES-03521:
-  name: "Men in Black - The Series - Crashdown (Germany)"
+  name: "Men in Black - The Series - Crashdown"
+  saveName: "Men in Black - The Series - Crashdown (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101675,7 +106904,8 @@ SLES-03521:
     multitap: false
     linkCable: false
 SLES-03522:
-  name: "Men in Black - The Series - Crashdown (Italy)"
+  name: "Men in Black - The Series - Crashdown"
+  saveName: "Men in Black - The Series - Crashdown (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101695,7 +106925,8 @@ SLES-03522:
     multitap: false
     linkCable: false
 SLES-03523:
-  name: "Men in Black - The Series - Crashdown (Spain)"
+  name: "Men in Black - The Series - Crashdown"
+  saveName: "Men in Black - The Series - Crashdown (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101715,7 +106946,8 @@ SLES-03523:
     multitap: false
     linkCable: false
 SLUS-01387:
-  name: "Men in Black - The Series - Crashdown (USA)"
+  name: "Men in Black - The Series - Crashdown"
+  saveName: "Men in Black - The Series - Crashdown (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -101756,7 +106988,8 @@ SLPS-91235:
     multitap: false
     linkCable: false
 SLPS-02685:
-  name: "Menkyo o Torou (Japan)"
+  name: "Menkyo o Torou"
+  saveName: "Menkyo o Torou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101775,11 +107008,13 @@ SLPS-02685:
     multitap: false
     linkCable: false
 SCED-02256:
-  name: "Mental Wealth - ECTS '99 Demo Disc (Europe) (En,Fr,De,Es,It)"
+  name: "Mental Wealth - ECTS '99 Demo Disc"
+  saveName: "Mental Wealth - ECTS '99 Demo Disc (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SLPS-01664:
-  name: "Meremanoid (Japan)"
+  name: "Meremanoid"
+  saveName: "Meremanoid (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -101798,11 +107033,13 @@ SLPS-01664:
     multitap: false
     linkCable: false
 SLPM-80440:
-  name: "Meremanoid (Japan) (Demo)"
+  name: "Meremanoid (Demo)"
+  saveName: "Meremanoid (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86934:
-  name: "Mermaid no Kisetsu (Japan) (Disc 1)"
+  name: "Mermaid no Kisetsu (Disc 1)"
+  saveName: "Mermaid no Kisetsu (Japan) (Disc 1)"
   discSet:
     name: "Mermaid no Kisetsu (Japan)"
     serials:
@@ -101827,7 +107064,8 @@ SLPM-86934:
     multitap: false
     linkCable: false
 SLPM-86935:
-  name: "Mermaid no Kisetsu (Japan) (Disc 2)"
+  name: "Mermaid no Kisetsu (Disc 2)"
+  saveName: "Mermaid no Kisetsu (Japan) (Disc 2)"
   discSet:
     name: "Mermaid no Kisetsu (Japan)"
     serials:
@@ -101852,7 +107090,8 @@ SLPM-86935:
     multitap: false
     linkCable: false
 SLPM-86936:
-  name: "Mermaid no Kisetsu (Japan) (Disc 3)"
+  name: "Mermaid no Kisetsu (Disc 3)"
+  saveName: "Mermaid no Kisetsu (Japan) (Disc 3)"
   discSet:
     name: "Mermaid no Kisetsu (Japan)"
     serials:
@@ -101877,7 +107116,8 @@ SLPM-86936:
     multitap: false
     linkCable: false
 SLPM-87108:
-  name: "Mermaid no Kisetsu - Curtain Call (Japan) (Disc 1)"
+  name: "Mermaid no Kisetsu - Curtain Call (Disc 1)"
+  saveName: "Mermaid no Kisetsu - Curtain Call (Japan) (Disc 1)"
   discSet:
     name: "Mermaid no Kisetsu - Curtain Call (Japan)"
     serials:
@@ -101901,7 +107141,8 @@ SLPM-87108:
     multitap: false
     linkCable: false
 SLPM-87109:
-  name: "Mermaid no Kisetsu - Curtain Call (Japan) (Disc 2)"
+  name: "Mermaid no Kisetsu - Curtain Call (Disc 2)"
+  saveName: "Mermaid no Kisetsu - Curtain Call (Japan) (Disc 2)"
   discSet:
     name: "Mermaid no Kisetsu - Curtain Call (Japan)"
     serials:
@@ -101925,7 +107166,8 @@ SLPM-87109:
     multitap: false
     linkCable: false
 SLPS-01493:
-  name: "Merriment Carrying Caravan (Japan)"
+  name: "Merriment Carrying Caravan"
+  saveName: "Merriment Carrying Caravan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101943,7 +107185,8 @@ SLPS-01493:
     multitap: false
     linkCable: false
 SLPS-00359:
-  name: "Meru Purana (Japan)"
+  name: "Meru Purana"
+  saveName: "Meru Purana (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -101961,7 +107204,8 @@ SLPS-00359:
     multitap: true
     linkCable: false
 SLPS-00680:
-  name: "Meta-Ph-List Mu.X.2297 (Japan) (Disc 1)"
+  name: "Meta-Ph-List Mu.X.2297 (Disc 1)"
+  saveName: "Meta-Ph-List Mu.X.2297 (Japan) (Disc 1)"
   discSet:
     name: "Meta-Ph-List Mu.X.2297 (Japan)"
     serials:
@@ -101984,7 +107228,8 @@ SLPS-00680:
     multitap: false
     linkCable: false
 SLPS-00681:
-  name: "Meta-Ph-List Mu.X.2297 (Japan) (Disc 2)"
+  name: "Meta-Ph-List Mu.X.2297 (Disc 2)"
+  saveName: "Meta-Ph-List Mu.X.2297 (Japan) (Disc 2)"
   discSet:
     name: "Meta-Ph-List Mu.X.2297 (Japan)"
     serials:
@@ -102007,7 +107252,8 @@ SLPS-00681:
     multitap: false
     linkCable: false
 SLPS-00867:
-  name: "Metal Angel 3 (Japan) (Disc 1)"
+  name: "Metal Angel 3 (Disc 1)"
+  saveName: "Metal Angel 3 (Japan) (Disc 1)"
   discSet:
     name: "Metal Angel 3 (Japan)"
     serials:
@@ -102030,7 +107276,8 @@ SLPS-00867:
     multitap: false
     linkCable: false
 SLPS-00868:
-  name: "Metal Angel 3 (Japan) (Disc 2)"
+  name: "Metal Angel 3 (Disc 2)"
+  saveName: "Metal Angel 3 (Japan) (Disc 2)"
   discSet:
     name: "Metal Angel 3 (Japan)"
     serials:
@@ -102053,7 +107300,8 @@ SLPS-00868:
     multitap: false
     linkCable: false
 SLPS-01164:
-  name: "Metal Fist (Japan)"
+  name: "Metal Fist"
+  saveName: "Metal Fist (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -102099,7 +107347,8 @@ SCPS-45320:
     multitap: false
     linkCable: false
 PAPX-90044:
-  name: "Metal Gear Solid (Asia) (Demo)"
+  name: "Metal Gear Solid (Demo)"
+  saveName: "Metal Gear Solid (Asia) (Demo)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -102108,7 +107357,8 @@ PAPX-90044:
   settings:
     cdromMaxReadSpeedupCycles: 100000
 SCPS-45317:
-  name: "Metal Gear Solid (Japan, Asia) (Disc 1) (Ichi) (Premium Package)"
+  name: "Metal Gear Solid (Disc 1) (Ichi) (Premium Package)"
+  saveName: "Metal Gear Solid (Japan, Asia) (Disc 1) (Ichi) (Premium Package)"
   discSet:
     name: "Metal Gear Solid (Japan, Asia) (Premium Package)"
     serials:
@@ -102140,7 +107390,8 @@ SCPS-45317:
     multitap: false
     linkCable: false
 SCPS-45318:
-  name: "Metal Gear Solid (Japan, Asia) (Disc 2) (Ni) (Premium Package)"
+  name: "Metal Gear Solid (Disc 2) (Ni) (Premium Package)"
+  saveName: "Metal Gear Solid (Japan, Asia) (Disc 2) (Ni) (Premium Package)"
   discSet:
     name: "Metal Gear Solid (Japan, Asia) (Premium Package)"
     serials:
@@ -102172,7 +107423,8 @@ SCPS-45318:
     multitap: false
     linkCable: false
 SLED-01400:
-  name: "Metal Gear Solid (Europe) (Demo 1)"
+  name: "Metal Gear Solid (Demo 1)"
+  saveName: "Metal Gear Solid (Europe) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -102180,7 +107432,8 @@ SLED-01400:
   settings:
     cdromMaxReadSpeedupCycles: 100000
 SLED-01775:
-  name: "Metal Gear Solid (Europe) (Demo 2)"
+  name: "Metal Gear Solid (Demo 2)"
+  saveName: "Metal Gear Solid (Europe) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -102188,7 +107441,8 @@ SLED-01775:
   settings:
     cdromMaxReadSpeedupCycles: 100000
 SLES-01370:
-  name: "Metal Gear Solid (Europe) (Disc 1)"
+  name: "Metal Gear Solid (Disc 1)"
+  saveName: "Metal Gear Solid (Europe) (Disc 1)"
   discSet:
     name: "Metal Gear Solid (Europe)"
     serials:
@@ -102220,7 +107474,8 @@ SLES-01370:
     multitap: false
     linkCable: false
 SLES-11370:
-  name: "Metal Gear Solid (Europe) (Disc 2)"
+  name: "Metal Gear Solid (Disc 2)"
+  saveName: "Metal Gear Solid (Europe) (Disc 2)"
   discSet:
     name: "Metal Gear Solid (Europe)"
     serials:
@@ -102252,7 +107507,8 @@ SLES-11370:
     multitap: false
     linkCable: false
 SLES-01506:
-  name: "Metal Gear Solid (France) (Disc 1)"
+  name: "Metal Gear Solid (Disc 1)"
+  saveName: "Metal Gear Solid (France) (Disc 1)"
   discSet:
     name: "Metal Gear Solid (France)"
     serials:
@@ -102284,7 +107540,8 @@ SLES-01506:
     multitap: false
     linkCable: false
 SLES-11506:
-  name: "Metal Gear Solid (France) (Disc 2)"
+  name: "Metal Gear Solid (Disc 2)"
+  saveName: "Metal Gear Solid (France) (Disc 2)"
   discSet:
     name: "Metal Gear Solid (France)"
     serials:
@@ -102316,7 +107573,8 @@ SLES-11506:
     multitap: false
     linkCable: false
 SLES-01507:
-  name: "Metal Gear Solid (Germany) (Disc 1)"
+  name: "Metal Gear Solid (Disc 1)"
+  saveName: "Metal Gear Solid (Germany) (Disc 1)"
   discSet:
     name: "Metal Gear Solid (Germany)"
     serials:
@@ -102348,7 +107606,8 @@ SLES-01507:
     multitap: false
     linkCable: false
 SLES-11507:
-  name: "Metal Gear Solid (Germany) (Disc 2)"
+  name: "Metal Gear Solid (Disc 2)"
+  saveName: "Metal Gear Solid (Germany) (Disc 2)"
   discSet:
     name: "Metal Gear Solid (Germany)"
     serials:
@@ -102380,7 +107639,8 @@ SLES-11507:
     multitap: false
     linkCable: false
 SLES-01508:
-  name: "Metal Gear Solid (Italy) (Disc 1)"
+  name: "Metal Gear Solid (Disc 1)"
+  saveName: "Metal Gear Solid (Italy) (Disc 1)"
   discSet:
     name: "Metal Gear Solid (Italy)"
     serials:
@@ -102412,7 +107672,8 @@ SLES-01508:
     multitap: false
     linkCable: false
 SLES-11508:
-  name: "Metal Gear Solid (Italy) (Disc 2)"
+  name: "Metal Gear Solid (Disc 2)"
+  saveName: "Metal Gear Solid (Italy) (Disc 2)"
   discSet:
     name: "Metal Gear Solid (Italy)"
     serials:
@@ -102444,7 +107705,8 @@ SLES-11508:
     multitap: false
     linkCable: false
 SLPM-86098:
-  name: "Metal Gear Solid (Japan) (Demo)"
+  name: "Metal Gear Solid (Demo)"
+  saveName: "Metal Gear Solid (Japan) (Demo)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -102468,7 +107730,8 @@ SLPM-86098:
     multitap: false
     linkCable: false
 SLPM-86114:
-  name: "Metal Gear Solid (Japan) (Disc 1) (Ichi)"
+  name: "Metal Gear Solid (Disc 1) (Ichi)"
+  saveName: "Metal Gear Solid (Japan) (Disc 1) (Ichi)"
   discSet:
     name: "Metal Gear Solid (Japan)"
     serials:
@@ -102500,7 +107763,8 @@ SLPM-86114:
     multitap: false
     linkCable: false
 SLPM-86115:
-  name: "Metal Gear Solid (Japan) (Disc 2) (Ni)"
+  name: "Metal Gear Solid (Disc 2) (Ni)"
+  saveName: "Metal Gear Solid (Japan) (Disc 2) (Ni)"
   discSet:
     name: "Metal Gear Solid (Japan)"
     serials:
@@ -102532,7 +107796,8 @@ SLPM-86115:
     multitap: false
     linkCable: false
 SLES-01734:
-  name: "Metal Gear Solid (Spain) (Disc 1)"
+  name: "Metal Gear Solid (Disc 1)"
+  saveName: "Metal Gear Solid (Spain) (Disc 1)"
   discSet:
     name: "Metal Gear Solid (Spain)"
     serials:
@@ -102564,7 +107829,8 @@ SLES-01734:
     multitap: false
     linkCable: false
 SLES-11734:
-  name: "Metal Gear Solid (Spain) (Disc 2)"
+  name: "Metal Gear Solid (Disc 2)"
+  saveName: "Metal Gear Solid (Spain) (Disc 2)"
   discSet:
     name: "Metal Gear Solid (Spain)"
     serials:
@@ -102596,7 +107862,8 @@ SLES-11734:
     multitap: false
     linkCable: false
 SLUS-90035:
-  name: "Metal Gear Solid (USA) (Demo)"
+  name: "Metal Gear Solid (Demo)"
+  saveName: "Metal Gear Solid (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -102604,7 +107871,8 @@ SLUS-90035:
   settings:
     cdromMaxReadSpeedupCycles: 100000
 SLUS-00594:
-  name: "Metal Gear Solid (USA) (Disc 1)"
+  name: "Metal Gear Solid (Disc 1)"
+  saveName: "Metal Gear Solid (USA) (Disc 1)"
   discSet:
     name: "Metal Gear Solid (USA)"
     serials:
@@ -102636,7 +107904,8 @@ SLUS-00594:
     multitap: false
     linkCable: false
 SLUS-00776:
-  name: "Metal Gear Solid (USA) (Disc 2)"
+  name: "Metal Gear Solid (Disc 2)"
+  saveName: "Metal Gear Solid (USA) (Disc 2)"
   discSet:
     name: "Metal Gear Solid (USA)"
     serials:
@@ -102668,7 +107937,8 @@ SLUS-00776:
     multitap: false
     linkCable: false
 SCPS-45414:
-  name: "Metal Gear Solid - Integral (Japan, Asia) (Disc 3) (VR-Disc)"
+  name: "Metal Gear Solid - Integral (Disc 3) (VR-Disc)"
+  saveName: "Metal Gear Solid - Integral (Japan, Asia) (Disc 3) (VR-Disc)"
   discSet:
     name: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja)"
     serials:
@@ -102701,7 +107971,8 @@ SCPS-45414:
     multitap: false
     linkCable: false
 SCPS-45412:
-  name: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja) (Disc 1)"
+  name: "Metal Gear Solid - Integral (Disc 1)"
+  saveName: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja) (Disc 1)"
   discSet:
     name: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja)"
     serials:
@@ -102736,7 +108007,8 @@ SCPS-45412:
     multitap: false
     linkCable: false
 SCPS-45413:
-  name: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja) (Disc 2)"
+  name: "Metal Gear Solid - Integral (Disc 2)"
+  saveName: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja) (Disc 2)"
   discSet:
     name: "Metal Gear Solid - Integral (Japan, Asia) (En,Ja)"
     serials:
@@ -102771,7 +108043,8 @@ SCPS-45413:
     multitap: false
     linkCable: false
 SLES-02136:
-  name: "Metal Gear Solid - Special Missions (Europe) (En,Fr,De,Es,It)"
+  name: "Metal Gear Solid - Special Missions"
+  saveName: "Metal Gear Solid - Special Missions (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4315-gf7587eae"
@@ -102798,7 +108071,8 @@ SLES-02136:
     multitap: false
     linkCable: false
 SLUS-00957:
-  name: "Metal Gear Solid - VR Missions (USA)"
+  name: "Metal Gear Solid - VR Missions"
+  saveName: "Metal Gear Solid - VR Missions (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1790-ge8e461c0"
@@ -102821,7 +108095,8 @@ SLUS-00957:
     multitap: false
     linkCable: false
 SLUS-90062:
-  name: "Metal Gear Solid - VR Missions (USA) (Demo)"
+  name: "Metal Gear Solid - VR Missions (Demo)"
+  saveName: "Metal Gear Solid - VR Missions (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86485:
@@ -102873,7 +108148,8 @@ SLPM-87030:
     multitap: false
     linkCable: false
 SLPS-00008:
-  name: "Metal Jacket (Japan)"
+  name: "Metal Jacket"
+  saveName: "Metal Jacket (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -102894,7 +108170,8 @@ SLPS-00008:
     multitap: false
     linkCable: true
 SCPS-45097:
-  name: "Metal Slug - Super Vehicle-001 (Japan, Asia)"
+  name: "Metal Slug - Super Vehicle-001"
+  saveName: "Metal Slug - Super Vehicle-001 (Japan, Asia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -102939,7 +108216,8 @@ SCPS-45490:
     multitap: false
     linkCable: false
 SLES-03575:
-  name: "Metal Slug X (Europe)"
+  name: "Metal Slug X"
+  saveName: "Metal Slug X (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -102961,7 +108239,8 @@ SLES-03575:
     multitap: false
     linkCable: false
 SLUS-01212:
-  name: "Metal Slug X (USA)"
+  name: "Metal Slug X"
+  saveName: "Metal Slug X (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -102983,7 +108262,8 @@ SLUS-01212:
     multitap: false
     linkCable: false
 SLPM-86456:
-  name: "Metal Slug X - Super Vehicle-001 (Japan)"
+  name: "Metal Slug X - Super Vehicle-001"
+  saveName: "Metal Slug X - Super Vehicle-001 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -103008,7 +108288,8 @@ SLPM-86456:
     multitap: false
     linkCable: false
 SLPS-00039:
-  name: "Metamor Panic - Doki Doki Youma Busters!! (Japan)"
+  name: "Metamor Panic - Doki Doki Youma Busters!!"
+  saveName: "Metamor Panic - Doki Doki Youma Busters!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -103026,7 +108307,8 @@ SLPS-00039:
     multitap: false
     linkCable: false
 SLPS-01911:
-  name: "Mezase! Meimon Yakyuubu (Japan)"
+  name: "Mezase! Meimon Yakyuubu"
+  saveName: "Mezase! Meimon Yakyuubu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103049,7 +108331,8 @@ SLPS-01911:
     multitap: false
     linkCable: false
 SLPS-00313:
-  name: "Mezase! Senkyuu-ou (Japan)"
+  name: "Mezase! Senkyuu-ou"
+  saveName: "Mezase! Senkyuu-ou (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -103070,7 +108353,8 @@ SLPS-00313:
     multitap: false
     linkCable: false
 SLPS-02198:
-  name: "Mezase! Skymark - Challenge Airline Pilot (Japan)"
+  name: "Mezase! Skymark - Challenge Airline Pilot"
+  saveName: "Mezase! Skymark - Challenge Airline Pilot (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103089,7 +108373,8 @@ SLPS-02198:
     multitap: false
     linkCable: false
 SLES-01594:
-  name: "Michael Owen's World League Soccer '99 (Europe) (En,Fr,It)"
+  name: "Michael Owen's World League Soccer '99"
+  saveName: "Michael Owen's World League Soccer '99 (Europe) (En,Fr,It)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -103111,7 +108396,8 @@ SLES-01594:
     multitap: true
     linkCable: false
 SLES-03931:
-  name: "Michael Schumacher Racing World Kart 2002 (Europe) (En,Fr,De,Es,It)"
+  name: "Michael Schumacher Racing World Kart 2002"
+  saveName: "Michael Schumacher Racing World Kart 2002 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103135,7 +108421,8 @@ SLES-03931:
     multitap: false
     linkCable: false
 SLES-01545:
-  name: "Michelin Rally Masters - Race of Champions (Europe) (En,De,Sv)"
+  name: "Michelin Rally Masters - Race of Champions"
+  saveName: "Michelin Rally Masters - Race of Champions (Europe) (En,De,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103158,7 +108445,8 @@ SLES-01545:
     multitap: false
     linkCable: false
 SLES-02395:
-  name: "Michelin Rally Masters - Race of Champions (Europe) (Fr,Es,It)"
+  name: "Michelin Rally Masters - Race of Champions"
+  saveName: "Michelin Rally Masters - Race of Champions (Europe) (Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103184,7 +108472,8 @@ SLES-02395:
     multitap: false
     linkCable: false
 SLUS-01229:
-  name: "Michelin Rally Masters - Race of Champions (USA) (En,Fr,Es)"
+  name: "Michelin Rally Masters - Race of Champions"
+  saveName: "Michelin Rally Masters - Race of Champions (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103204,7 +108493,8 @@ SLUS-01229:
     multitap: false
     linkCable: false
 SLPS-02502:
-  name: "Michinoku Hitou Koi Monogatari Kai (Japan)"
+  name: "Michinoku Hitou Koi Monogatari Kai"
+  saveName: "Michinoku Hitou Koi Monogatari Kai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -103222,7 +108512,8 @@ SLPS-02502:
     multitap: false
     linkCable: false
 SCES-00163:
-  name: "Mickey's Wild Adventure (Europe)"
+  name: "Mickey's Wild Adventure"
+  saveName: "Mickey's Wild Adventure (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -103240,7 +108531,8 @@ SCES-00163:
     multitap: false
     linkCable: false
 SLPS-01111:
-  name: "Micro Machines (Japan)"
+  name: "Micro Machines"
+  saveName: "Micro Machines (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -103259,7 +108551,8 @@ SLPS-01111:
     multitap: true
     linkCable: false
 SLES-00016:
-  name: "Micro Machines V3 (Europe) (En,Fr,De,Es,It)"
+  name: "Micro Machines V3"
+  saveName: "Micro Machines V3 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - NeGcon
@@ -103282,7 +108575,8 @@ SLES-00016:
     multitap: true
     linkCable: false
 SLUS-00559:
-  name: "Micro Machines V3 (USA)"
+  name: "Micro Machines V3"
+  saveName: "Micro Machines V3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -103304,7 +108598,8 @@ SLUS-00559:
     multitap: true
     linkCable: false
 SLES-01921:
-  name: "Micro Maniacs (Europe) (En,Fr,De,Es,It)"
+  name: "Micro Maniacs"
+  saveName: "Micro Maniacs (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -103331,7 +108626,8 @@ SLES-01921:
     multitap: true
     linkCable: false
 SLES-00590:
-  name: "Midnight Run - Road Fighter 2 (Europe)"
+  name: "Midnight Run - Road Fighter 2"
+  saveName: "Midnight Run - Road Fighter 2 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -103353,7 +108649,8 @@ SLES-00590:
     multitap: false
     linkCable: false
 SLPM-86022:
-  name: "Midnight Run - Road Fighter 2 (Japan) (En,Ja)"
+  name: "Midnight Run - Road Fighter 2"
+  saveName: "Midnight Run - Road Fighter 2 (Japan) (En,Ja)"
   controllers:
     - DigitalController
     - NeGcon
@@ -103372,7 +108669,8 @@ SLPM-86022:
     multitap: false
     linkCable: false
 SLES-02499:
-  name: "Midnight in Vegas (Europe) (En,Fr,De)"
+  name: "Midnight in Vegas"
+  saveName: "Midnight in Vegas (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103391,7 +108689,8 @@ SLES-02499:
     multitap: true
     linkCable: false
 SLPS-01312:
-  name: "Midori no Makibao - Kuroi Inazuma Shiroi Kiseki (Japan)"
+  name: "Midori no Makibao - Kuroi Inazuma Shiroi Kiseki"
+  saveName: "Midori no Makibao - Kuroi Inazuma Shiroi Kiseki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -103409,7 +108708,8 @@ SLPS-01312:
     multitap: false
     linkCable: false
 SLPS-00583:
-  name: "Mighty Hits (Japan)"
+  name: "Mighty Hits"
+  saveName: "Mighty Hits (Japan)"
   controllers:
     - DigitalController
     - Justifier
@@ -103428,7 +108728,8 @@ SLPS-00583:
     multitap: false
     linkCable: false
 SLES-02244:
-  name: "Mighty Hits Special (Europe) (En,Fr,De)"
+  name: "Mighty Hits Special"
+  saveName: "Mighty Hits Special (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103451,7 +108752,8 @@ SLES-02244:
     multitap: false
     linkCable: false
 SLPS-02165:
-  name: "Mighty Hits Special (Japan)"
+  name: "Mighty Hits Special"
+  saveName: "Mighty Hits Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103472,7 +108774,8 @@ SLPS-02165:
     multitap: false
     linkCable: false
 SLPS-01611:
-  name: "Mikagura Shoujo Tanteidan (Japan) (Disc 1) (Honpen Disc Ichi)"
+  name: "Mikagura Shoujo Tanteidan (Disc 1) (Honpen Disc Ichi)"
+  saveName: "Mikagura Shoujo Tanteidan (Japan) (Disc 1) (Honpen Disc Ichi)"
   discSet:
     name: "Mikagura Shoujo Tanteidan (Japan)"
     serials:
@@ -103498,7 +108801,8 @@ SLPS-01611:
     multitap: false
     linkCable: false
 SLPS-01612:
-  name: "Mikagura Shoujo Tanteidan (Japan) (Disc 2) (Honpen Disc Ni)"
+  name: "Mikagura Shoujo Tanteidan (Disc 2) (Honpen Disc Ni)"
+  saveName: "Mikagura Shoujo Tanteidan (Japan) (Disc 2) (Honpen Disc Ni)"
   discSet:
     name: "Mikagura Shoujo Tanteidan (Japan)"
     serials:
@@ -103524,7 +108828,8 @@ SLPS-01612:
     multitap: false
     linkCable: false
 SLPS-01613:
-  name: "Mikagura Shoujo Tanteidan (Japan) (Disc 3) (Intermission Disc)"
+  name: "Mikagura Shoujo Tanteidan (Disc 3) (Intermission Disc)"
+  saveName: "Mikagura Shoujo Tanteidan (Japan) (Disc 3) (Intermission Disc)"
   discSet:
     name: "Mikagura Shoujo Tanteidan (Japan)"
     serials:
@@ -103550,7 +108855,8 @@ SLPS-01613:
     multitap: false
     linkCable: false
 SLPS-01614:
-  name: "Mikagura Shoujo Tanteidan (Japan) (Disc 4) (Special Disc)"
+  name: "Mikagura Shoujo Tanteidan (Disc 4) (Special Disc)"
+  saveName: "Mikagura Shoujo Tanteidan (Japan) (Disc 4) (Special Disc)"
   discSet:
     name: "Mikagura Shoujo Tanteidan (Japan)"
     serials:
@@ -103576,11 +108882,13 @@ SLPS-01614:
     multitap: false
     linkCable: false
 SLPM-80283:
-  name: "Mikagura Shoujo Tanteidan + Neko Zamurai (Japan) (Demo)"
+  name: "Mikagura Shoujo Tanteidan + Neko Zamurai (Demo)"
+  saveName: "Mikagura Shoujo Tanteidan + Neko Zamurai (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02839:
-  name: "Mike Tyson Boxing (Europe) (En,Fr,De,Es,It)"
+  name: "Mike Tyson Boxing"
+  saveName: "Mike Tyson Boxing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103604,7 +108912,8 @@ SLES-02839:
     multitap: false
     linkCable: false
 SLUS-01162:
-  name: "Mike Tyson Boxing (USA) (En,Fr,Es)"
+  name: "Mike Tyson Boxing"
+  saveName: "Mike Tyson Boxing (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103642,7 +108951,8 @@ SLPS-91481:
     multitap: false
     linkCable: false
 SLPS-03367:
-  name: "Milky Season (Japan)"
+  name: "Milky Season"
+  saveName: "Milky Season (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103661,7 +108971,8 @@ SLPS-03367:
     multitap: false
     linkCable: false
 SLES-02826:
-  name: "Mille Miglia (Europe) (En,Fr,De,Es,It)"
+  name: "Mille Miglia"
+  saveName: "Mille Miglia (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103685,7 +108996,8 @@ SLES-02826:
     multitap: false
     linkCable: false
 SLES-01716:
-  name: "Millennium Soldier - Expendable (Europe) (En,Fr,De,Es,It)"
+  name: "Millennium Soldier - Expendable"
+  saveName: "Millennium Soldier - Expendable (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103708,7 +109020,8 @@ SLES-01716:
     multitap: false
     linkCable: false
 SLPS-01609:
-  name: "Million Classic (Japan) (Disc 1) (Honpen Game Sen'you)"
+  name: "Million Classic (Disc 1) (Honpen Game Sen'you)"
+  saveName: "Million Classic (Japan) (Disc 1) (Honpen Game Sen'you)"
   discSet:
     name: "Million Classic (Japan)"
     serials:
@@ -103731,14 +109044,16 @@ SLPS-01609:
     multitap: false
     linkCable: false
 SLPM-80397:
-  name: "Million Classic (Japan) (Disc 1) (Honpen Game Sen'you) (Nescafe-ban)"
+  name: "Million Classic (Disc 1) (Honpen Game Sen'you) (Nescafe-ban)"
+  saveName: "Million Classic (Japan) (Disc 1) (Honpen Game Sen'you) (Nescafe-ban)"
   discSet:
     name: "Million Classic (Japan) (Nescafe-ban)"
     serials:
       - SLPM-80397
       - SLPM-80398
 SLPS-01610:
-  name: "Million Classic (Japan) (Disc 2) (Taisen Game Sen'you)"
+  name: "Million Classic (Disc 2) (Taisen Game Sen'you)"
+  saveName: "Million Classic (Japan) (Disc 2) (Taisen Game Sen'you)"
   discSet:
     name: "Million Classic (Japan)"
     serials:
@@ -103761,14 +109076,16 @@ SLPS-01610:
     multitap: false
     linkCable: false
 SLPM-80398:
-  name: "Million Classic (Japan) (Disc 2) (Taisen Game Sen'you) (Nescafe-ban)"
+  name: "Million Classic (Disc 2) (Taisen Game Sen'you) (Nescafe-ban)"
+  saveName: "Million Classic (Japan) (Disc 2) (Taisen Game Sen'you) (Nescafe-ban)"
   discSet:
     name: "Million Classic (Japan) (Nescafe-ban)"
     serials:
       - SLPM-80397
       - SLPM-80398
 SLES-03588:
-  name: "Millionen Show, Die (Austria)"
+  name: "Millionen Show, Die"
+  saveName: "Millionen Show, Die (Austria)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103787,7 +109104,8 @@ SLES-03588:
     multitap: false
     linkCable: false
 SLPS-00951:
-  name: "Minakata Hakudou Toujou (Japan) (Disc 1)"
+  name: "Minakata Hakudou Toujou (Disc 1)"
+  saveName: "Minakata Hakudou Toujou (Japan) (Disc 1)"
   discSet:
     name: "Minakata Hakudou Toujou (Japan)"
     serials:
@@ -103810,7 +109128,8 @@ SLPS-00951:
     multitap: false
     linkCable: false
 SLPS-00952:
-  name: "Minakata Hakudou Toujou (Japan) (Disc 2)"
+  name: "Minakata Hakudou Toujou (Disc 2)"
+  saveName: "Minakata Hakudou Toujou (Japan) (Disc 2)"
   discSet:
     name: "Minakata Hakudou Toujou (Japan)"
     serials:
@@ -103852,7 +109171,8 @@ SLPM-87201:
     multitap: true
     linkCable: false
 SLPS-01078:
-  name: "Mini Yonku Bakusou Kyoudai Let's & Go!! WGP Hyper Heat (Japan)"
+  name: "Mini Yonku Bakusou Kyoudai Let's & Go!! WGP Hyper Heat"
+  saveName: "Mini Yonku Bakusou Kyoudai Let's & Go!! WGP Hyper Heat (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -103874,7 +109194,8 @@ SLPS-01078:
     multitap: false
     linkCable: false
 SLPM-87015:
-  name: "Mini-Moni. Dice de Pyon! (Japan)"
+  name: "Mini-Moni. Dice de Pyon!"
+  saveName: "Mini-Moni. Dice de Pyon! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103893,7 +109214,8 @@ SLPM-87015:
     multitap: true
     linkCable: false
 SLPM-87132:
-  name: "Mini-Moni. Shakatto Tambourine! da Pyon! (Japan)"
+  name: "Mini-Moni. Shakatto Tambourine! da Pyon!"
+  saveName: "Mini-Moni. Shakatto Tambourine! da Pyon! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103912,7 +109234,8 @@ SLPM-87132:
     multitap: false
     linkCable: false
 SLPM-87079:
-  name: "Mini-Moni. Shakatto Tambourine! da Pyon! (Japan) (Doukonban)"
+  name: "Mini-Moni. Shakatto Tambourine! da Pyon! (Doukonban)"
+  saveName: "Mini-Moni. Shakatto Tambourine! da Pyon! (Japan) (Doukonban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103931,7 +109254,8 @@ SLPM-87079:
     multitap: false
     linkCable: false
 SLPM-87195:
-  name: "Mini-Moni. Step Pyon Pyon Pyon (Japan)"
+  name: "Mini-Moni. Step Pyon Pyon Pyon"
+  saveName: "Mini-Moni. Step Pyon Pyon Pyon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -103950,7 +109274,8 @@ SLPM-87195:
     multitap: true
     linkCable: false
 SLPS-03554:
-  name: "Minna Atsumare! Igo Kyoushitsu (Japan)"
+  name: "Minna Atsumare! Igo Kyoushitsu"
+  saveName: "Minna Atsumare! Igo Kyoushitsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -103968,7 +109293,8 @@ SLPS-03554:
     multitap: false
     linkCable: false
 SCPS-10042:
-  name: "Minna no Golf (Japan)"
+  name: "Minna no Golf"
+  saveName: "Minna no Golf (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -103989,7 +109315,8 @@ SCPS-10042:
     multitap: true
     linkCable: false
 PAPX-90018:
-  name: "Minna no Golf (Japan) (Demo)"
+  name: "Minna no Golf (Demo)"
+  saveName: "Minna no Golf (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
@@ -104018,7 +109345,8 @@ SCPS-45421:
     multitap: true
     linkCable: false
 SCPS-10093:
-  name: "Minna no Golf 2 (Japan)"
+  name: "Minna no Golf 2"
+  saveName: "Minna no Golf 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104037,7 +109365,8 @@ SCPS-10093:
     multitap: true
     linkCable: false
 SCPS-91197:
-  name: "Minna no Golf 2 (Japan) (Rev 1)"
+  name: "Minna no Golf 2"
+  saveName: "Minna no Golf 2 (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104056,7 +109385,8 @@ SCPS-91197:
     multitap: true
     linkCable: false
 SLPS-03186:
-  name: "Minna no Kanji Kyoushitsu - Chousen! Kanji Kentei (Japan)"
+  name: "Minna no Kanji Kyoushitsu - Chousen! Kanji Kentei"
+  saveName: "Minna no Kanji Kyoushitsu - Chousen! Kanji Kentei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104075,7 +109405,8 @@ SLPS-03186:
     multitap: false
     linkCable: false
 SLPS-03279:
-  name: "Minna no Shiiku Kyoushitsu - Kuwagata-hen (Japan)"
+  name: "Minna no Shiiku Kyoushitsu - Kuwagata-hen"
+  saveName: "Minna no Shiiku Kyoushitsu - Kuwagata-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104094,7 +109425,8 @@ SLPS-03279:
     multitap: false
     linkCable: false
 SLPM-87025:
-  name: "Minna no Takaramono - Watashi no Licca-chan - Otetsudai o Shiyou (Japan)"
+  name: "Minna no Takaramono - Watashi no Licca-chan - Otetsudai o Shiyou"
+  saveName: "Minna no Takaramono - Watashi no Licca-chan - Otetsudai o Shiyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104113,7 +109445,8 @@ SLPM-87025:
     multitap: false
     linkCable: false
 SLPS-03491:
-  name: "Minnya de Ghost Hunter (Japan)"
+  name: "Minnya de Ghost Hunter"
+  saveName: "Minnya de Ghost Hunter (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104132,7 +109465,8 @@ SLPS-03491:
     multitap: true
     linkCable: false
 SLPS-01132:
-  name: "Minton Keibu no Sousa File - Doukeshi Satsujin Jiken (Japan)"
+  name: "Minton Keibu no Sousa File - Doukeshi Satsujin Jiken"
+  saveName: "Minton Keibu no Sousa File - Doukeshi Satsujin Jiken (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -104153,7 +109487,8 @@ SLPS-01132:
     multitap: false
     linkCable: false
 SLPS-01227:
-  name: "Miracle Jim no Bassing Beat (Japan)"
+  name: "Miracle Jim no Bassing Beat"
+  saveName: "Miracle Jim no Bassing Beat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104190,7 +109525,8 @@ SCPS-45241:
     multitap: false
     linkCable: false
 SLPS-01224:
-  name: "Miracle Jumpers (Japan)"
+  name: "Miracle Jumpers"
+  saveName: "Miracle Jumpers (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104208,7 +109544,8 @@ SLPS-01224:
     multitap: false
     linkCable: false
 SLES-04057:
-  name: "Miracle Space Race (Europe)"
+  name: "Miracle Space Race"
+  saveName: "Miracle Space Race (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104228,7 +109565,8 @@ SLES-04057:
     multitap: false
     linkCable: false
 SLUS-01556:
-  name: "Miracle Space Race (USA)"
+  name: "Miracle Space Race"
+  saveName: "Miracle Space Race (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2553-g3ed42977"
@@ -104251,7 +109589,8 @@ SLUS-01556:
     multitap: false
     linkCable: false
 SLPS-00110:
-  name: "Miracle World - Fushigi no Kuni no IQ Meiro (Japan)"
+  name: "Miracle World - Fushigi no Kuni no IQ Meiro"
+  saveName: "Miracle World - Fushigi no Kuni no IQ Meiro (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104269,7 +109608,8 @@ SLPS-00110:
     multitap: false
     linkCable: false
 SLPS-02143:
-  name: "Mirano no Arbeit Collection (Japan)"
+  name: "Mirano no Arbeit Collection"
+  saveName: "Mirano no Arbeit Collection (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104288,23 +109628,28 @@ SLPS-02143:
     multitap: false
     linkCable: false
 PCPX-96132:
-  name: "MiruMiru PlayStation Vol. 28 (Japan)"
+  name: "MiruMiru PlayStation Vol. 28"
+  saveName: "MiruMiru PlayStation Vol. 28 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96139:
-  name: "MiruMiru PlayStation Vol. 29 (Japan)"
+  name: "MiruMiru PlayStation Vol. 29"
+  saveName: "MiruMiru PlayStation Vol. 29 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96144:
-  name: "MiruMiru PlayStation Vol. 31 (Japan)"
+  name: "MiruMiru PlayStation Vol. 31"
+  saveName: "MiruMiru PlayStation Vol. 31 (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96196:
-  name: "MiruMiru PlayStation Vol. 43 (Japan)"
+  name: "MiruMiru PlayStation Vol. 43"
+  saveName: "MiruMiru PlayStation Vol. 43 (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-01276:
-  name: "Misa no Mahou Monogatari (Japan) (Disc 1)"
+  name: "Misa no Mahou Monogatari (Disc 1)"
+  saveName: "Misa no Mahou Monogatari (Japan) (Disc 1)"
   discSet:
     name: "Misa no Mahou Monogatari (Japan)"
     serials:
@@ -104327,7 +109672,8 @@ SLPS-01276:
     multitap: false
     linkCable: false
 SLPS-01274:
-  name: "Misa no Mahou Monogatari (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Misa no Mahou Monogatari (Disc 1) (Shokai Genteiban)"
+  saveName: "Misa no Mahou Monogatari (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Misa no Mahou Monogatari (Japan) (Shokai Genteiban)"
     serials:
@@ -104350,7 +109696,8 @@ SLPS-01274:
     multitap: false
     linkCable: false
 SLPS-01277:
-  name: "Misa no Mahou Monogatari (Japan) (Disc 2)"
+  name: "Misa no Mahou Monogatari (Disc 2)"
+  saveName: "Misa no Mahou Monogatari (Japan) (Disc 2)"
   discSet:
     name: "Misa no Mahou Monogatari (Japan)"
     serials:
@@ -104373,7 +109720,8 @@ SLPS-01277:
     multitap: false
     linkCable: false
 SLPS-01275:
-  name: "Misa no Mahou Monogatari (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Misa no Mahou Monogatari (Disc 2) (Shokai Genteiban)"
+  saveName: "Misa no Mahou Monogatari (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Misa no Mahou Monogatari (Japan) (Shokai Genteiban)"
     serials:
@@ -104396,7 +109744,8 @@ SLPS-01275:
     multitap: false
     linkCable: false
 SLES-02795:
-  name: "Misadventures of Tron Bonne, The (Europe)"
+  name: "Misadventures of Tron Bonne, The"
+  saveName: "Misadventures of Tron Bonne, The (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -104418,7 +109767,8 @@ SLES-02795:
     multitap: false
     linkCable: false
 SLUS-00896:
-  name: "Misadventures of Tron Bonne, The (USA)"
+  name: "Misadventures of Tron Bonne, The"
+  saveName: "Misadventures of Tron Bonne, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -104440,7 +109790,8 @@ SLUS-00896:
     multitap: false
     linkCable: false
 SLPS-01474:
-  name: "Misaki Aggressive! (Japan)"
+  name: "Misaki Aggressive!"
+  saveName: "Misaki Aggressive! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104458,7 +109809,8 @@ SLPS-01474:
     multitap: false
     linkCable: false
 SLUS-01123:
-  name: "Miss Spider's Tea Party (USA)"
+  name: "Miss Spider's Tea Party"
+  saveName: "Miss Spider's Tea Party (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104477,7 +109829,8 @@ SLUS-01123:
     multitap: false
     linkCable: false
 SLES-02245:
-  name: "Missile Command (Europe) (En,It)"
+  name: "Missile Command"
+  saveName: "Missile Command (Europe) (En,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104497,7 +109850,8 @@ SLES-02245:
     multitap: false
     linkCable: false
 SLES-02482:
-  name: "Missile Command (Europe) (Fr,De)"
+  name: "Missile Command"
+  saveName: "Missile Command (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104517,7 +109871,8 @@ SLES-02482:
     multitap: false
     linkCable: false
 SLUS-00992:
-  name: "Missile Command (USA)"
+  name: "Missile Command"
+  saveName: "Missile Command (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104536,7 +109891,8 @@ SLUS-00992:
     multitap: false
     linkCable: false
 SLES-01906:
-  name: "Mission - Impossible (Europe) (En,Fr,De,Es,It)"
+  name: "Mission - Impossible"
+  saveName: "Mission - Impossible (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -104563,7 +109919,8 @@ SLES-01906:
     multitap: false
     linkCable: false
 SLUS-01016:
-  name: "Mission - Impossible (USA) (En,Fr,Es)"
+  name: "Mission - Impossible"
+  saveName: "Mission - Impossible (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104582,7 +109939,8 @@ SLUS-01016:
     multitap: false
     linkCable: false
 SLES-03234:
-  name: "Mission, The (Europe) (En,Fr,De,Es,It,Nl,Pt)"
+  name: "Mission, The"
+  saveName: "Mission, The (Europe) (En,Fr,De,Es,It,Nl,Pt)"
   controllers:
     - DigitalController
   metadata:
@@ -104606,7 +109964,8 @@ SLES-03234:
     multitap: false
     linkCable: false
 SLPS-00047:
-  name: "Missland (Japan)"
+  name: "Missland"
+  saveName: "Missland (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -104626,7 +109985,8 @@ SLPS-00047:
     multitap: false
     linkCable: false
 SLPS-01715:
-  name: "Missland 2 (Japan)"
+  name: "Missland 2"
+  saveName: "Missland 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104645,7 +110005,8 @@ SLPS-01715:
     multitap: true
     linkCable: false
 SLPM-86068:
-  name: "Mitsumete Knight (Japan)"
+  name: "Mitsumete Knight"
+  saveName: "Mitsumete Knight (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104663,7 +110024,8 @@ SLPM-86068:
     multitap: false
     linkCable: false
 SLPM-86134:
-  name: "Mitsumete Knight R - Daibouken-hen (Japan)"
+  name: "Mitsumete Knight R - Daibouken-hen"
+  saveName: "Mitsumete Knight R - Daibouken-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104699,7 +110061,8 @@ SLPM-86220:
     multitap: false
     linkCable: false
 SLPS-02215:
-  name: "Miyake Yuji Produce - Kiseki no Maya Uranai (Japan)"
+  name: "Miyake Yuji Produce - Kiseki no Maya Uranai"
+  saveName: "Miyake Yuji Produce - Kiseki no Maya Uranai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104717,7 +110080,8 @@ SLPS-02215:
     multitap: false
     linkCable: false
 SLPS-00806:
-  name: "Mizuki Shigeru no Youkai Butouden (Japan)"
+  name: "Mizuki Shigeru no Youkai Butouden"
+  saveName: "Mizuki Shigeru no Youkai Butouden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -104735,7 +110099,8 @@ SLPS-00806:
     multitap: false
     linkCable: false
 SLPS-01783:
-  name: "Mizzurna Falls (Japan)"
+  name: "Mizzurna Falls"
+  saveName: "Mizzurna Falls (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104754,7 +110119,8 @@ SLPS-01783:
     multitap: false
     linkCable: false
 SLES-02830:
-  name: "MoHo (Europe) (En,Fr,De,Es,It)"
+  name: "MoHo"
+  saveName: "MoHo (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104778,7 +110144,8 @@ SLES-02830:
     multitap: false
     linkCable: false
 SLES-02574:
-  name: "Mobil 1 Rally Championship (Europe) (En,Fr,De,Es,It)"
+  name: "Mobil 1 Rally Championship"
+  saveName: "Mobil 1 Rally Championship (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104802,7 +110169,8 @@ SLES-02574:
     multitap: false
     linkCable: false
 SLUS-01103:
-  name: "Mobil 1 Rally Championship (USA)"
+  name: "Mobil 1 Rally Championship"
+  saveName: "Mobil 1 Rally Championship (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1724-g5aa1b955"
@@ -104825,7 +110193,8 @@ SLUS-01103:
     multitap: false
     linkCable: false
 SLUS-01469:
-  name: "Mobile Armor (USA)"
+  name: "Mobile Armor"
+  saveName: "Mobile Armor (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104844,7 +110213,8 @@ SLUS-01469:
     multitap: false
     linkCable: false
 SLES-04087:
-  name: "Mobile Light Force (Europe) (En,Fr,De,Es,It)"
+  name: "Mobile Light Force"
+  saveName: "Mobile Light Force (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -104866,7 +110236,8 @@ SLES-04087:
     multitap: false
     linkCable: false
 SLUS-01525:
-  name: "Mobile Light Force (USA)"
+  name: "Mobile Light Force"
+  saveName: "Mobile Light Force (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -104884,7 +110255,8 @@ SLUS-01525:
     multitap: false
     linkCable: false
 SLPS-02239:
-  name: "Mobile Police Patlabor - Game Edition (Japan)"
+  name: "Mobile Police Patlabor - Game Edition"
+  saveName: "Mobile Police Patlabor - Game Edition (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104903,7 +110275,8 @@ SLPS-02239:
     multitap: false
     linkCable: false
 SLPS-00035:
-  name: "Mobile Suit Gundam (Japan)"
+  name: "Mobile Suit Gundam"
+  saveName: "Mobile Suit Gundam (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -104924,7 +110297,8 @@ SLPS-00035:
     multitap: false
     linkCable: false
 SLPM-80291:
-  name: "Mobile Suit Gundam - Char's Counter Attack (Japan) (Demo)"
+  name: "Mobile Suit Gundam - Char's Counter Attack (Demo)"
+  saveName: "Mobile Suit Gundam - Char's Counter Attack (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45349:
@@ -104947,7 +110321,8 @@ SCPS-45349:
     multitap: false
     linkCable: false
 SCPS-45362:
-  name: "Mobile Suit Gundam - Char's Counterattack (Asia)"
+  name: "Mobile Suit Gundam - Char's Counterattack"
+  saveName: "Mobile Suit Gundam - Char's Counterattack (Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104966,7 +110341,8 @@ SCPS-45362:
     multitap: false
     linkCable: false
 SLPS-01724:
-  name: "Mobile Suit Gundam - Char's Counterattack (Japan)"
+  name: "Mobile Suit Gundam - Char's Counterattack"
+  saveName: "Mobile Suit Gundam - Char's Counterattack (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -104988,7 +110364,8 @@ SLPS-01724:
     multitap: false
     linkCable: false
 SLPS-00920:
-  name: "Mobile Suit Gundam - Perfect One Year War (Japan)"
+  name: "Mobile Suit Gundam - Perfect One Year War"
+  saveName: "Mobile Suit Gundam - Perfect One Year War (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105006,7 +110383,8 @@ SLPS-00920:
     multitap: false
     linkCable: false
 SLPS-00280:
-  name: "Mobile Suit Gundam - Version 2.0 (Japan)"
+  name: "Mobile Suit Gundam - Version 2.0"
+  saveName: "Mobile Suit Gundam - Version 2.0 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -105048,11 +110426,13 @@ SCPS-45160:
     multitap: false
     linkCable: true
 SLPM-80139:
-  name: "Mobile Suit Z-Gundam (Japan) (Demo)"
+  name: "Mobile Suit Z-Gundam (Demo)"
+  saveName: "Mobile Suit Z-Gundam (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01142:
-  name: "Mobile Suit Z-Gundam (Japan) (Disc 1)"
+  name: "Mobile Suit Z-Gundam (Disc 1)"
+  saveName: "Mobile Suit Z-Gundam (Japan) (Disc 1)"
   discSet:
     name: "Mobile Suit Z-Gundam (Japan)"
     serials:
@@ -105075,7 +110455,8 @@ SLPS-01142:
     multitap: false
     linkCable: true
 SLPS-03232:
-  name: "Mobile Suit Z-Gundam (Japan) (Disc 1) (Bandai the Best)"
+  name: "Mobile Suit Z-Gundam (Disc 1) (Bandai the Best)"
+  saveName: "Mobile Suit Z-Gundam (Japan) (Disc 1) (Bandai the Best)"
   discSet:
     name: "Mobile Suit Z-Gundam (Japan) (Bandai the Best)"
     serials:
@@ -105098,7 +110479,8 @@ SLPS-03232:
     multitap: false
     linkCable: true
 SLPS-01143:
-  name: "Mobile Suit Z-Gundam (Japan) (Disc 2)"
+  name: "Mobile Suit Z-Gundam (Disc 2)"
+  saveName: "Mobile Suit Z-Gundam (Japan) (Disc 2)"
   discSet:
     name: "Mobile Suit Z-Gundam (Japan)"
     serials:
@@ -105121,7 +110503,8 @@ SLPS-01143:
     multitap: false
     linkCable: true
 SLPS-03233:
-  name: "Mobile Suit Z-Gundam (Japan) (Disc 2) (Bandai the Best)"
+  name: "Mobile Suit Z-Gundam (Disc 2) (Bandai the Best)"
+  saveName: "Mobile Suit Z-Gundam (Japan) (Disc 2) (Bandai the Best)"
   discSet:
     name: "Mobile Suit Z-Gundam (Japan) (Bandai the Best)"
     serials:
@@ -105144,7 +110527,8 @@ SLPS-03233:
     multitap: false
     linkCable: true
 SLPM-87151:
-  name: "Mobile Tomodachi (Japan)"
+  name: "Mobile Tomodachi"
+  saveName: "Mobile Tomodachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105163,7 +110547,8 @@ SLPM-87151:
     multitap: false
     linkCable: false
 SLPS-01281:
-  name: "Moebius Link 3D (Japan)"
+  name: "Moebius Link 3D"
+  saveName: "Moebius Link 3D (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105181,7 +110566,8 @@ SLPS-01281:
     multitap: false
     linkCable: false
 SLPS-00099:
-  name: "Moero!! Pro Yakyuu '95 - Double Header (Japan)"
+  name: "Moero!! Pro Yakyuu '95 - Double Header"
+  saveName: "Moero!! Pro Yakyuu '95 - Double Header (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105199,7 +110585,8 @@ SLPS-00099:
     multitap: false
     linkCable: false
 SLPS-01785:
-  name: "Momotarou Densetsu (Japan)"
+  name: "Momotarou Densetsu"
+  saveName: "Momotarou Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105240,7 +110627,8 @@ SLPM-87101:
     multitap: false
     linkCable: false
 SLPS-01156:
-  name: "Momotarou Dentetsu 7 (Japan)"
+  name: "Momotarou Dentetsu 7"
+  saveName: "Momotarou Dentetsu 7 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105276,7 +110664,8 @@ SLPM-87257:
     multitap: true
     linkCable: false
 SLPS-02456:
-  name: "Momotarou Dentetsu V (Japan)"
+  name: "Momotarou Dentetsu V"
+  saveName: "Momotarou Dentetsu V (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105295,7 +110684,8 @@ SLPS-02456:
     multitap: true
     linkCable: false
 SLPS-02458:
-  name: "Momotarou Dentetsu V (Japan) (Rev 1)"
+  name: "Momotarou Dentetsu V"
+  saveName: "Momotarou Dentetsu V (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105314,7 +110704,8 @@ SLPS-02458:
     multitap: true
     linkCable: false
 SLPM-87032:
-  name: "Momotarou Dentetsu V (Japan) (Rev 2)"
+  name: "Momotarou Dentetsu V"
+  saveName: "Momotarou Dentetsu V (Japan) (Rev 2)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105336,7 +110727,8 @@ SLPM-87032:
     multitap: true
     linkCable: false
 SLPM-86888:
-  name: "Momotarou Matsuri - Ishikawa Rokuemon no Maki (Japan)"
+  name: "Momotarou Matsuri - Ishikawa Rokuemon no Maki"
+  saveName: "Momotarou Matsuri - Ishikawa Rokuemon no Maki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105355,7 +110747,8 @@ SLPM-86888:
     multitap: true
     linkCable: false
 LSP-905017:
-  name: "Mona & Moki 1 - Drive Me Wild! (USA)"
+  name: "Mona & Moki 1 - Drive Me Wild!"
+  saveName: "Mona & Moki 1 - Drive Me Wild! (USA)"
   codes:
     - LSP905017
     - LSP05010101
@@ -105366,7 +110759,8 @@ LSP-905017:
     languages:
       - English
 LSP-905024:
-  name: "Mona & Moki 2 - Drive Me Wilder! (USA)"
+  name: "Mona & Moki 2 - Drive Me Wilder!"
+  saveName: "Mona & Moki 2 - Drive Me Wilder! (USA)"
   codes:
     - LSP905024
     - LSP05010201
@@ -105377,7 +110771,8 @@ LSP-905024:
     languages:
       - English
 SLUS-00834:
-  name: "Monaco Grand Prix (USA)"
+  name: "Monaco Grand Prix"
+  saveName: "Monaco Grand Prix (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105397,7 +110792,8 @@ SLUS-00834:
     multitap: false
     linkCable: true
 SLES-01691:
-  name: "Monaco Grand Prix Racing Simulation 2 (Europe) (En,Fr,Es,It)"
+  name: "Monaco Grand Prix Racing Simulation 2"
+  saveName: "Monaco Grand Prix Racing Simulation 2 (Europe) (En,Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105420,11 +110816,13 @@ SLES-01691:
     multitap: false
     linkCable: true
 SLED-01901:
-  name: "Monaco Grand Prix Racing Simulation 2 (Europe) (En,Fr,Es,It) (Demo)"
+  name: "Monaco Grand Prix Racing Simulation 2 (Demo)"
+  saveName: "Monaco Grand Prix Racing Simulation 2 (Europe) (En,Fr,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02106:
-  name: "Monaco Grand Prix Racing Simulation 2 (Japan)"
+  name: "Monaco Grand Prix Racing Simulation 2"
+  saveName: "Monaco Grand Prix Racing Simulation 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105444,7 +110842,8 @@ SLPS-02106:
     multitap: false
     linkCable: true
 SCES-03073:
-  name: "Monde des Bleus 2, Le (France)"
+  name: "Monde des Bleus 2, Le"
+  saveName: "Monde des Bleus 2, Le (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105463,7 +110862,8 @@ SCES-03073:
     multitap: true
     linkCable: false
 SCES-01701:
-  name: "Monde des Bleus, Le - Le Jeu Officiel de l'Equipe de France (France)"
+  name: "Monde des Bleus, Le - Le Jeu Officiel de l'Equipe de France"
+  saveName: "Monde des Bleus, Le - Le Jeu Officiel de l'Equipe de France (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105483,7 +110883,8 @@ SCES-01701:
     multitap: true
     linkCable: false
 SLPS-00963:
-  name: "Money Idol Exchanger (Japan)"
+  name: "Money Idol Exchanger"
+  saveName: "Money Idol Exchanger (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105501,7 +110902,8 @@ SLPS-00963:
     multitap: false
     linkCable: false
 SLPS-02644:
-  name: "Money Idol Exchanger (Japan) (Rev 1)"
+  name: "Money Idol Exchanger"
+  saveName: "Money Idol Exchanger (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -105541,7 +110943,8 @@ SLES-01803:
     multitap: false
     linkCable: false
 SLES-00979:
-  name: "Monkey Hero (Europe) (En,Fr,De,It)"
+  name: "Monkey Hero"
+  saveName: "Monkey Hero (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105586,7 +110989,8 @@ SLPM-86481:
     multitap: false
     linkCable: false
 SLUS-00765:
-  name: "Monkey Hero (USA)"
+  name: "Monkey Hero"
+  saveName: "Monkey Hero (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -105608,13 +111012,15 @@ SLUS-00765:
     multitap: false
     linkCable: false
 SLUS-80765:
-  name: "Monkey Hero (USA) (Demo)"
+  name: "Monkey Hero (Demo)"
+  saveName: "Monkey Hero (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SLPS-02583:
-  name: "Monkey Magic (Japan)"
+  name: "Monkey Magic"
+  saveName: "Monkey Magic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105632,7 +111038,8 @@ SLPS-02583:
     multitap: false
     linkCable: false
 SLUS-00930:
-  name: "Monkey Magic (USA)"
+  name: "Monkey Magic"
+  saveName: "Monkey Magic (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -105671,7 +111078,8 @@ SLPS-03300:
     multitap: false
     linkCable: false
 SLES-00945:
-  name: "Monopoly (Europe) (En,Fr,De,Es,Nl)"
+  name: "Monopoly"
+  saveName: "Monopoly (Europe) (En,Fr,De,Es,Nl)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -105694,7 +111102,8 @@ SLES-00945:
     multitap: true
     linkCable: false
 SLPS-00741:
-  name: "Monopoly (Japan)"
+  name: "Monopoly"
+  saveName: "Monopoly (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -105716,7 +111125,8 @@ SLPS-00741:
     multitap: true
     linkCable: false
 SLUS-00507:
-  name: "Monopoly (USA)"
+  name: "Monopoly"
+  saveName: "Monopoly (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -105735,7 +111145,8 @@ SLUS-00507:
     multitap: true
     linkCable: false
 SLUS-01490:
-  name: "Monster Bass (USA)"
+  name: "Monster Bass"
+  saveName: "Monster Bass (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105754,7 +111165,8 @@ SLUS-01490:
     multitap: false
     linkCable: false
 SLPS-02245:
-  name: "Monster Collection - Kamen no Madoushi (Japan)"
+  name: "Monster Collection - Kamen no Madoushi"
+  saveName: "Monster Collection - Kamen no Madoushi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -105791,7 +111203,8 @@ SLPS-01870:
     multitap: false
     linkCable: false
 SLPS-02783:
-  name: "Monster Complete World (Japan)"
+  name: "Monster Complete World"
+  saveName: "Monster Complete World (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105810,7 +111223,8 @@ SLPS-02783:
     multitap: false
     linkCable: false
 SLPS-00910:
-  name: "Monster Farm (Japan)"
+  name: "Monster Farm"
+  saveName: "Monster Farm (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -105831,11 +111245,13 @@ SLPS-00910:
     multitap: false
     linkCable: false
 SLPM-80096:
-  name: "Monster Farm (Japan) (Demo)"
+  name: "Monster Farm (Demo)"
+  saveName: "Monster Farm (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01906:
-  name: "Monster Farm 2 (Japan)"
+  name: "Monster Farm 2"
+  saveName: "Monster Farm 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105854,11 +111270,13 @@ SLPS-01906:
     multitap: false
     linkCable: false
 SLPM-80379:
-  name: "Monster Farm 2 (Japan) (Demo)"
+  name: "Monster Farm 2 (Demo)"
+  saveName: "Monster Farm 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02653:
-  name: "Monster Farm Battle Card (Japan)"
+  name: "Monster Farm Battle Card"
+  saveName: "Monster Farm Battle Card (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105877,7 +111295,8 @@ SLPS-02653:
     multitap: true
     linkCable: false
 SLPS-03160:
-  name: "Monster Farm Jump (Japan)"
+  name: "Monster Farm Jump"
+  saveName: "Monster Farm Jump (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105896,7 +111315,8 @@ SLPS-03160:
     multitap: false
     linkCable: false
 SLPS-02491:
-  name: "Monster Punish (Japan)"
+  name: "Monster Punish"
+  saveName: "Monster Punish (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105915,7 +111335,8 @@ SLPS-02491:
     multitap: true
     linkCable: false
 SLPM-86143:
-  name: "Monster Race (Japan)"
+  name: "Monster Race"
+  saveName: "Monster Race (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105935,7 +111356,8 @@ SLPM-86143:
     multitap: false
     linkCable: false
 SLES-03246:
-  name: "Monster Racer (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Monster Racer"
+  saveName: "Monster Racer (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -105960,7 +111382,8 @@ SLES-03246:
     multitap: true
     linkCable: false
 SCES-02872:
-  name: "Monster Rancher (Europe)"
+  name: "Monster Rancher"
+  saveName: "Monster Rancher (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -105978,7 +111401,8 @@ SCES-02872:
     multitap: false
     linkCable: false
 SLUS-00568:
-  name: "Monster Rancher (USA)"
+  name: "Monster Rancher"
+  saveName: "Monster Rancher (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -105996,11 +111420,13 @@ SLUS-00568:
     multitap: false
     linkCable: false
 SLUS-80568:
-  name: "Monster Rancher (USA) (Demo)"
+  name: "Monster Rancher (Demo)"
+  saveName: "Monster Rancher (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00917:
-  name: "Monster Rancher 2 (USA)"
+  name: "Monster Rancher 2"
+  saveName: "Monster Rancher 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -106021,11 +111447,13 @@ SLUS-00917:
     multitap: false
     linkCable: false
 SLUS-90071:
-  name: "Monster Rancher 2 (USA) (Demo)"
+  name: "Monster Rancher 2 (Demo)"
+  saveName: "Monster Rancher 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01178:
-  name: "Monster Rancher Battle Card - Episode II (USA)"
+  name: "Monster Rancher Battle Card - Episode II"
+  saveName: "Monster Rancher Battle Card - Episode II (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106044,7 +111472,8 @@ SLUS-01178:
     multitap: true
     linkCable: false
 SLUS-01325:
-  name: "Monster Rancher Hop-A-Bout (USA)"
+  name: "Monster Rancher Hop-A-Bout"
+  saveName: "Monster Rancher Hop-A-Bout (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -106066,7 +111495,8 @@ SLUS-01325:
     multitap: false
     linkCable: false
 SLES-00314:
-  name: "Monster Trucks (Europe)"
+  name: "Monster Trucks"
+  saveName: "Monster Trucks (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -106085,11 +111515,13 @@ SLES-00314:
     multitap: false
     linkCable: false
 SLED-00692:
-  name: "Monster Trucks (Europe) (Demo)"
+  name: "Monster Trucks (Demo)"
+  saveName: "Monster Trucks (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01540:
-  name: "MonsterSeed (Europe) (En,Fr,De)"
+  name: "MonsterSeed"
+  saveName: "MonsterSeed (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106110,7 +111542,8 @@ SLES-01540:
     multitap: false
     linkCable: false
 SLPS-01572:
-  name: "MonsterSeed (Japan)"
+  name: "MonsterSeed"
+  saveName: "MonsterSeed (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106129,7 +111562,8 @@ SLPS-01572:
     multitap: false
     linkCable: false
 SLUS-00743:
-  name: "MonsterSeed (USA)"
+  name: "MonsterSeed"
+  saveName: "MonsterSeed (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106148,7 +111582,8 @@ SLUS-00743:
     multitap: false
     linkCable: false
 SLPS-03396:
-  name: "Monsters, Inc. - Monsters Academy (Japan)"
+  name: "Monsters, Inc. - Monsters Academy"
+  saveName: "Monsters, Inc. - Monsters Academy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106186,7 +111621,8 @@ SLPS-03281:
     multitap: false
     linkCable: false
 SLES-03813:
-  name: "Monte Carlo Games Compendium (Europe) (Disc 1)"
+  name: "Monte Carlo Games Compendium (Disc 1)"
+  saveName: "Monte Carlo Games Compendium (Europe) (Disc 1)"
   discSet:
     name: "Monte Carlo Games Compendium (Europe)"
     serials:
@@ -106209,7 +111645,8 @@ SLES-03813:
     multitap: true
     linkCable: false
 SLES-13813:
-  name: "Monte Carlo Games Compendium (Europe) (Disc 2)"
+  name: "Monte Carlo Games Compendium (Disc 2)"
+  saveName: "Monte Carlo Games Compendium (Europe) (Disc 2)"
   discSet:
     name: "Monte Carlo Games Compendium (Europe)"
     serials:
@@ -106232,7 +111669,8 @@ SLES-13813:
     multitap: true
     linkCable: false
 SLPS-01031:
-  name: "Moon - Remix RPG Adventure (Japan)"
+  name: "Moon - Remix RPG Adventure"
+  saveName: "Moon - Remix RPG Adventure (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -106250,7 +111688,8 @@ SLPS-01031:
     multitap: false
     linkCable: false
 SLPS-91112:
-  name: "Moon - Remix RPG Adventure (Japan) (Rev 1)"
+  name: "Moon - Remix RPG Adventure"
+  saveName: "Moon - Remix RPG Adventure (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -106289,11 +111728,13 @@ SCPS-45122:
     multitap: false
     linkCable: false
 SLPM-80150:
-  name: "Moonlight Syndrome (Japan) (Demo)"
+  name: "Moonlight Syndrome (Demo)"
+  saveName: "Moonlight Syndrome (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01001:
-  name: "Moonlight Syndrome (Japan) (Disc 1)"
+  name: "Moonlight Syndrome (Disc 1)"
+  saveName: "Moonlight Syndrome (Japan) (Disc 1)"
   discSet:
     name: "Moonlight Syndrome (Japan)"
     serials:
@@ -106319,7 +111760,8 @@ SLPS-01001:
     multitap: false
     linkCable: false
 SLPS-01002:
-  name: "Moonlight Syndrome (Japan) (Disc 2)"
+  name: "Moonlight Syndrome (Disc 2)"
+  saveName: "Moonlight Syndrome (Japan) (Disc 2)"
   discSet:
     name: "Moonlight Syndrome (Japan)"
     serials:
@@ -106345,7 +111787,8 @@ SLPS-01002:
     multitap: false
     linkCable: false
 SLES-03846:
-  name: "Moorhen 3 - Chicken Chase (Europe) (En,Fr,De)"
+  name: "Moorhen 3 - Chicken Chase"
+  saveName: "Moorhen 3 - Chicken Chase (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106366,7 +111809,8 @@ SLES-03846:
     multitap: false
     linkCable: false
 SLES-03898:
-  name: "Moorhen 3 - Chicken Chase (Europe) (Es,It)"
+  name: "Moorhen 3 - Chicken Chase"
+  saveName: "Moorhen 3 - Chicken Chase (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106386,7 +111830,8 @@ SLES-03898:
     multitap: false
     linkCable: false
 SLES-03278:
-  name: "Moorhuhn 2 - Die Jagd Geht Weiter (Germany)"
+  name: "Moorhuhn 2 - Die Jagd Geht Weiter"
+  saveName: "Moorhuhn 2 - Die Jagd Geht Weiter (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106406,7 +111851,8 @@ SLES-03278:
     multitap: false
     linkCable: false
 SLES-04122:
-  name: "Moorhuhn Kart (Germany)"
+  name: "Moorhuhn Kart"
+  saveName: "Moorhuhn Kart (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106426,7 +111872,8 @@ SLES-04122:
     multitap: false
     linkCable: false
 SLES-04174:
-  name: "Moorhuhn X (Germany) (En,De)"
+  name: "Moorhuhn X"
+  saveName: "Moorhuhn X (Germany) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106447,7 +111894,8 @@ SLES-04174:
     multitap: false
     linkCable: false
 SLPS-01861:
-  name: "Mori no Oukoku (Japan)"
+  name: "Mori no Oukoku"
+  saveName: "Mori no Oukoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106466,7 +111914,8 @@ SLPS-01861:
     multitap: false
     linkCable: false
 SLPS-02488:
-  name: "Morita Kazurou no Chess (Japan)"
+  name: "Morita Kazurou no Chess"
+  saveName: "Morita Kazurou no Chess (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106485,7 +111934,8 @@ SLPS-02488:
     multitap: false
     linkCable: false
 SLPS-02487:
-  name: "Morita Kazurou no Gomoku Narabe to Renju (Japan)"
+  name: "Morita Kazurou no Gomoku Narabe to Renju"
+  saveName: "Morita Kazurou no Gomoku Narabe to Renju (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106504,7 +111954,8 @@ SLPS-02487:
     multitap: false
     linkCable: false
 SLPS-02486:
-  name: "Morita Kazurou no Hanafuda (Japan)"
+  name: "Morita Kazurou no Hanafuda"
+  saveName: "Morita Kazurou no Hanafuda (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -106522,9 +111973,11 @@ SLPS-02486:
     multitap: false
     linkCable: false
 SLPS-02588:
-  name: "Morita Kazurou no Mahjong (Japan)"
+  name: "Morita Kazurou no Mahjong"
+  saveName: "Morita Kazurou no Mahjong (Japan)"
 SLPS-02278:
-  name: "Morita Kazurou no Reversi (Japan)"
+  name: "Morita Kazurou no Reversi"
+  saveName: "Morita Kazurou no Reversi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106543,7 +111996,8 @@ SLPS-02278:
     multitap: false
     linkCable: false
 SLPS-02277:
-  name: "Morita Kazurou no Shougi Doujou (Japan)"
+  name: "Morita Kazurou no Shougi Doujou"
+  saveName: "Morita Kazurou no Shougi Doujou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106562,7 +112016,8 @@ SLPS-02277:
     multitap: false
     linkCable: false
 SLPS-01119:
-  name: "Morita Shougi (Japan)"
+  name: "Morita Shougi"
+  saveName: "Morita Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -106580,7 +112035,8 @@ SLPS-01119:
     multitap: false
     linkCable: false
 SLPM-86130:
-  name: "Moritaka Chisato - Safari Tokyo (Japan) (Disc 1)"
+  name: "Moritaka Chisato - Safari Tokyo (Disc 1)"
+  saveName: "Moritaka Chisato - Safari Tokyo (Japan) (Disc 1)"
   discSet:
     name: "Moritaka Chisato - Safari Tokyo (Japan)"
     serials:
@@ -106603,7 +112059,8 @@ SLPM-86130:
     multitap: false
     linkCable: false
 SLPM-86131:
-  name: "Moritaka Chisato - Safari Tokyo (Japan) (Disc 2)"
+  name: "Moritaka Chisato - Safari Tokyo (Disc 2)"
+  saveName: "Moritaka Chisato - Safari Tokyo (Japan) (Disc 2)"
   discSet:
     name: "Moritaka Chisato - Safari Tokyo (Japan)"
     serials:
@@ -106626,7 +112083,8 @@ SLPM-86131:
     multitap: false
     linkCable: false
 SLES-02712:
-  name: "Mort the Chicken (Europe)"
+  name: "Mort the Chicken"
+  saveName: "Mort the Chicken (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106645,7 +112103,8 @@ SLES-02712:
     multitap: false
     linkCable: false
 SLUS-01021:
-  name: "Mort the Chicken (USA)"
+  name: "Mort the Chicken"
+  saveName: "Mort the Chicken (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3224 Android Preview"
@@ -106667,7 +112126,8 @@ SLUS-01021:
     multitap: false
     linkCable: false
 SLES-02338:
-  name: "Mortal Kombat - Special Forces (Europe) (En,Fr,De)"
+  name: "Mortal Kombat - Special Forces"
+  saveName: "Mortal Kombat - Special Forces (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106686,7 +112146,8 @@ SLES-02338:
     multitap: false
     linkCable: false
 SLUS-00824:
-  name: "Mortal Kombat - Special Forces (USA)"
+  name: "Mortal Kombat - Special Forces"
+  saveName: "Mortal Kombat - Special Forces (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1407-g08b81764"
@@ -106726,7 +112187,8 @@ SLUS-01126:
     multitap: false
     linkCable: false
 SCES-00060:
-  name: "Mortal Kombat 3 (Europe)"
+  name: "Mortal Kombat 3"
+  saveName: "Mortal Kombat 3 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -106744,7 +112206,8 @@ SCES-00060:
     multitap: false
     linkCable: false
 SIPS-60006:
-  name: "Mortal Kombat 3 (Japan)"
+  name: "Mortal Kombat 3"
+  saveName: "Mortal Kombat 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -106762,7 +112225,8 @@ SIPS-60006:
     multitap: false
     linkCable: false
 SCUS-94201:
-  name: "Mortal Kombat 3 (USA)"
+  name: "Mortal Kombat 3"
+  saveName: "Mortal Kombat 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1407-g08b81764"
@@ -106783,7 +112247,8 @@ SCUS-94201:
     multitap: false
     linkCable: false
 SLES-01349:
-  name: "Mortal Kombat 4 (Europe)"
+  name: "Mortal Kombat 4"
+  saveName: "Mortal Kombat 4 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -106801,7 +112266,8 @@ SLES-01349:
     multitap: false
     linkCable: false
 SLUS-00605:
-  name: "Mortal Kombat 4 (USA)"
+  name: "Mortal Kombat 4"
+  saveName: "Mortal Kombat 4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -106822,7 +112288,8 @@ SLUS-00605:
     multitap: false
     linkCable: false
 SLPS-00444:
-  name: "Mortal Kombat II (Japan)"
+  name: "Mortal Kombat II"
+  saveName: "Mortal Kombat II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -106840,7 +112307,8 @@ SLPS-00444:
     multitap: false
     linkCable: false
 SLES-01020:
-  name: "Mortal Kombat Mythologies - Sub-Zero (Europe)"
+  name: "Mortal Kombat Mythologies - Sub-Zero"
+  saveName: "Mortal Kombat Mythologies - Sub-Zero (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -106858,7 +112326,8 @@ SLES-01020:
     multitap: false
     linkCable: false
 SLUS-00476:
-  name: "Mortal Kombat Mythologies - Sub-Zero (USA)"
+  name: "Mortal Kombat Mythologies - Sub-Zero"
+  saveName: "Mortal Kombat Mythologies - Sub-Zero (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1407-g08b81764"
@@ -106879,7 +112348,8 @@ SLUS-00476:
     multitap: false
     linkCable: false
 SLES-00528:
-  name: "Mortal Kombat Trilogy (Europe)"
+  name: "Mortal Kombat Trilogy"
+  saveName: "Mortal Kombat Trilogy (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -106897,7 +112367,8 @@ SLES-00528:
     multitap: false
     linkCable: false
 SLES-02509:
-  name: "Mortal Kombat Trilogy (Europe) (Midway Classics)"
+  name: "Mortal Kombat Trilogy (Midway Classics)"
+  saveName: "Mortal Kombat Trilogy (Europe) (Midway Classics)"
   controllers:
     - DigitalController
   metadata:
@@ -106915,7 +112386,8 @@ SLES-02509:
     multitap: false
     linkCable: false
 SLPS-00791:
-  name: "Mortal Kombat Trilogy (Japan)"
+  name: "Mortal Kombat Trilogy"
+  saveName: "Mortal Kombat Trilogy (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -106933,7 +112405,8 @@ SLPS-00791:
     multitap: false
     linkCable: false
 SLUS-00330:
-  name: "Mortal Kombat Trilogy (USA)"
+  name: "Mortal Kombat Trilogy"
+  saveName: "Mortal Kombat Trilogy (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -106954,7 +112427,8 @@ SLUS-00330:
     multitap: false
     linkCable: false
 SLES-02954:
-  name: "Moses - Prince of Egypt (Europe) (En,Fr,De,Nl)"
+  name: "Moses - Prince of Egypt"
+  saveName: "Moses - Prince of Egypt (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -106976,7 +112450,8 @@ SLES-02954:
     multitap: false
     linkCable: false
 SLES-00469:
-  name: "Moto Racer (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Moto Racer"
+  saveName: "Moto Racer (Europe) (En,Fr,De,Es,It,Sv)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -107004,11 +112479,13 @@ SLES-00469:
     multitap: false
     linkCable: false
 SLED-01005:
-  name: "Moto Racer (France) (Demo)"
+  name: "Moto Racer (Demo)"
+  saveName: "Moto Racer (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01163:
-  name: "Moto Racer (Japan)"
+  name: "Moto Racer"
+  saveName: "Moto Racer (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -107031,7 +112508,8 @@ SLPS-01163:
     multitap: false
     linkCable: false
 SLUS-00498:
-  name: "Moto Racer (USA)"
+  name: "Moto Racer"
+  saveName: "Moto Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2837-g632909df"
@@ -107054,11 +112532,13 @@ SLUS-00498:
     multitap: false
     linkCable: false
 SLED-01552:
-  name: "Moto Racer 2 (Europe) (Demo)"
+  name: "Moto Racer 2 (Demo)"
+  saveName: "Moto Racer 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01184:
-  name: "Moto Racer 2 (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Moto Racer 2"
+  saveName: "Moto Racer 2 (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107083,7 +112563,8 @@ SLES-01184:
     multitap: false
     linkCable: false
 SLPS-02040:
-  name: "Moto Racer 2 (Japan)"
+  name: "Moto Racer 2"
+  saveName: "Moto Racer 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107103,7 +112584,8 @@ SLPS-02040:
     multitap: false
     linkCable: false
 SLUS-00738:
-  name: "Moto Racer 2 (USA)"
+  name: "Moto Racer 2"
+  saveName: "Moto Racer 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -107126,7 +112608,8 @@ SLUS-00738:
     multitap: false
     linkCable: false
 SCES-03037:
-  name: "Moto Racer World Tour (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Moto Racer World Tour"
+  saveName: "Moto Racer World Tour (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107151,7 +112634,8 @@ SCES-03037:
     multitap: false
     linkCable: false
 SLUS-01321:
-  name: "Moto Racer World Tour (USA)"
+  name: "Moto Racer World Tour"
+  saveName: "Moto Racer World Tour (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107171,7 +112655,8 @@ SLUS-01321:
     multitap: false
     linkCable: false
 SLES-03325:
-  name: "Motocross Mania (Europe) (En,Fr,De,Es,It)"
+  name: "Motocross Mania"
+  saveName: "Motocross Mania (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107195,7 +112680,8 @@ SLES-03325:
     multitap: false
     linkCable: false
 SLUS-01357:
-  name: "Motocross Mania (USA)"
+  name: "Motocross Mania"
+  saveName: "Motocross Mania (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107215,7 +112701,8 @@ SLUS-01357:
     multitap: false
     linkCable: false
 SLES-04098:
-  name: "Motocross Mania 2 (Europe) (En,Fr,De,Es,It)"
+  name: "Motocross Mania 2"
+  saveName: "Motocross Mania 2 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107239,7 +112726,8 @@ SLES-04098:
     multitap: false
     linkCable: false
 SLUS-01531:
-  name: "Motocross Mania 2 (USA)"
+  name: "Motocross Mania 2"
+  saveName: "Motocross Mania 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107259,7 +112747,8 @@ SLUS-01531:
     multitap: false
     linkCable: false
 SLES-00310:
-  name: "Motor Mash (Europe) (En,Fr,De)"
+  name: "Motor Mash"
+  saveName: "Motor Mash (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
     - NeGcon
@@ -107280,7 +112769,8 @@ SLES-00310:
     multitap: true
     linkCable: false
 SCPS-10001:
-  name: "Motor Toon Grand Prix (Japan)"
+  name: "Motor Toon Grand Prix"
+  saveName: "Motor Toon Grand Prix (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -107308,7 +112798,8 @@ SCPS-10001:
     multitap: false
     linkCable: false
 SCUS-94355:
-  name: "Motor Toon Grand Prix (USA)"
+  name: "Motor Toon Grand Prix"
+  saveName: "Motor Toon Grand Prix (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -107335,7 +112826,8 @@ SCUS-94355:
     multitap: false
     linkCable: false
 SCPS-91027:
-  name: "Motor Toon Grand Prix - USA Edition (Japan)"
+  name: "Motor Toon Grand Prix - USA Edition"
+  saveName: "Motor Toon Grand Prix - USA Edition (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -107354,7 +112846,8 @@ SCPS-91027:
     multitap: false
     linkCable: false
 SCES-00245:
-  name: "Motor Toon Grand Prix 2 (Europe)"
+  name: "Motor Toon Grand Prix 2"
+  saveName: "Motor Toon Grand Prix 2 (Europe)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -107378,7 +112871,8 @@ SCES-00245:
     multitap: false
     linkCable: false
 SCPS-10018:
-  name: "Motor Toon Grand Prix 2 (Japan) (Disc 1)"
+  name: "Motor Toon Grand Prix 2 (Disc 1)"
+  saveName: "Motor Toon Grand Prix 2 (Japan) (Disc 1)"
   discSet:
     name: "Motor Toon Grand Prix 2 (Japan)"
     serials:
@@ -107407,7 +112901,8 @@ SCPS-10018:
     multitap: false
     linkCable: false
 SCPS-10019:
-  name: "Motor Toon Grand Prix 2 (Japan) (Disc 2) (Taisen Sen'you Disc)"
+  name: "Motor Toon Grand Prix 2 (Disc 2) (Taisen Sen'you Disc)"
+  saveName: "Motor Toon Grand Prix 2 (Japan) (Disc 2) (Taisen Sen'you Disc)"
   discSet:
     name: "Motor Toon Grand Prix 2 (Japan)"
     serials:
@@ -107436,7 +112931,8 @@ SCPS-10019:
     multitap: false
     linkCable: false
 SLES-00556:
-  name: "Motorhead (Europe)"
+  name: "Motorhead"
+  saveName: "Motorhead (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107456,7 +112952,8 @@ SLES-00556:
     multitap: false
     linkCable: false
 SLUS-00717:
-  name: "Motorhead (USA)"
+  name: "Motorhead"
+  saveName: "Motorhead (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107476,7 +112973,8 @@ SLUS-00717:
     multitap: false
     linkCable: false
 SLPS-01242:
-  name: "Motteke Tamago with Ganbare! Kamonohashi (Japan)"
+  name: "Motteke Tamago with Ganbare! Kamonohashi"
+  saveName: "Motteke Tamago with Ganbare! Kamonohashi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -107494,7 +112992,8 @@ SLPS-01242:
     multitap: true
     linkCable: false
 SLPS-03321:
-  name: "Motto Trump Shiyou yo! i-Mode de Grand Prix (Japan)"
+  name: "Motto Trump Shiyou yo! i-Mode de Grand Prix"
+  saveName: "Motto Trump Shiyou yo! i-Mode de Grand Prix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107513,7 +113012,8 @@ SLPS-03321:
     multitap: true
     linkCable: false
 SLPS-01796:
-  name: "Motto! Nyan to Wonderful 2 (Japan)"
+  name: "Motto! Nyan to Wonderful 2"
+  saveName: "Motto! Nyan to Wonderful 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107532,7 +113032,8 @@ SLPS-01796:
     multitap: false
     linkCable: false
 SLPS-00674:
-  name: "Mouja (Japan)"
+  name: "Mouja"
+  saveName: "Mouja (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -107550,7 +113051,8 @@ SLPS-00674:
     multitap: false
     linkCable: false
 SLPS-02252:
-  name: "Mouja (Japan) (Honkakuha de 1300)"
+  name: "Mouja (Honkakuha de 1300)"
+  saveName: "Mouja (Japan) (Honkakuha de 1300)"
   controllers:
     - DigitalController
   metadata:
@@ -107568,7 +113070,8 @@ SLPS-02252:
     multitap: false
     linkCable: false
 SLPS-01285:
-  name: "Mouri Motonari - Chikai no Sanshi (Japan)"
+  name: "Mouri Motonari - Chikai no Sanshi"
+  saveName: "Mouri Motonari - Chikai no Sanshi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -107641,7 +113144,8 @@ SCPS-45259:
     multitap: false
     linkCable: false
 SCES-02771:
-  name: "Mr. Driller (Europe) (En,Fr,De,Es,It)"
+  name: "Mr. Driller"
+  saveName: "Mr. Driller (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107665,7 +113169,8 @@ SCES-02771:
     multitap: false
     linkCable: false
 SLPS-02600:
-  name: "Mr. Driller (Japan)"
+  name: "Mr. Driller"
+  saveName: "Mr. Driller (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -107688,7 +113193,8 @@ SLPS-02600:
     multitap: false
     linkCable: false
 SLUS-01111:
-  name: "Mr. Driller (USA)"
+  name: "Mr. Driller"
+  saveName: "Mr. Driller (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -107711,7 +113217,8 @@ SLUS-01111:
     multitap: false
     linkCable: false
 SLPS-03336:
-  name: "Mr. Driller G (Japan)"
+  name: "Mr. Driller G"
+  saveName: "Mr. Driller G (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -107733,7 +113240,8 @@ SLPS-03336:
     multitap: false
     linkCable: false
 SLPS-02226:
-  name: "Mr. Prospector - Horiate-kun (Japan)"
+  name: "Mr. Prospector - Horiate-kun"
+  saveName: "Mr. Prospector - Horiate-kun (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107798,7 +113306,8 @@ SCES-03087:
     multitap: true
     linkCable: false
 SCES-03085:
-  name: "Ms. Pac-Man Maze Madness (Europe) (En,Fr,De,Es,It)"
+  name: "Ms. Pac-Man Maze Madness"
+  saveName: "Ms. Pac-Man Maze Madness (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -107823,7 +113332,8 @@ SCES-03085:
     multitap: true
     linkCable: false
 SLPS-03000:
-  name: "Ms. Pac-Man Maze Madness (Japan)"
+  name: "Ms. Pac-Man Maze Madness"
+  saveName: "Ms. Pac-Man Maze Madness (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107842,7 +113352,8 @@ SLPS-03000:
     multitap: true
     linkCable: false
 SLUS-01018:
-  name: "Ms. Pac-Man Maze Madness (USA)"
+  name: "Ms. Pac-Man Maze Madness"
+  saveName: "Ms. Pac-Man Maze Madness (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107861,11 +113372,13 @@ SLUS-01018:
     multitap: true
     linkCable: false
 SLUS-90080:
-  name: "Ms. Pac-Man Maze Madness (USA) (Demo)"
+  name: "Ms. Pac-Man Maze Madness (Demo)"
+  saveName: "Ms. Pac-Man Maze Madness (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02973:
-  name: "Mummy, The (Europe) (En,Fr,De,Es,It)"
+  name: "Mummy, The"
+  saveName: "Mummy, The (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107888,7 +113401,8 @@ SLES-02973:
     multitap: false
     linkCable: false
 SLUS-01187:
-  name: "Mummy, The (USA)"
+  name: "Mummy, The"
+  saveName: "Mummy, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -107910,7 +113424,8 @@ SLUS-01187:
     multitap: false
     linkCable: false
 SLES-03870:
-  name: "Mundial 2002 Challenge (Portugal)"
+  name: "Mundial 2002 Challenge"
+  saveName: "Mundial 2002 Challenge (Portugal)"
   controllers:
     - DigitalController
   metadata:
@@ -107928,7 +113443,8 @@ SLES-03870:
     multitap: false
     linkCable: false
 SCES-02403:
-  name: "Muppet Monster Adventure (Europe)"
+  name: "Muppet Monster Adventure"
+  saveName: "Muppet Monster Adventure (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107949,7 +113465,8 @@ SCES-02403:
     multitap: false
     linkCable: false
 SCES-03090:
-  name: "Muppet Monster Adventure (France)"
+  name: "Muppet Monster Adventure"
+  saveName: "Muppet Monster Adventure (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107970,7 +113487,8 @@ SCES-03090:
     multitap: false
     linkCable: false
 SCES-03091:
-  name: "Muppet Monster Adventure (Germany)"
+  name: "Muppet Monster Adventure"
+  saveName: "Muppet Monster Adventure (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -107991,7 +113509,8 @@ SCES-03091:
     multitap: false
     linkCable: false
 SCES-03092:
-  name: "Muppet Monster Adventure (Italy)"
+  name: "Muppet Monster Adventure"
+  saveName: "Muppet Monster Adventure (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108012,7 +113531,8 @@ SCES-03092:
     multitap: false
     linkCable: false
 SCES-03093:
-  name: "Muppet Monster Adventure (Spain)"
+  name: "Muppet Monster Adventure"
+  saveName: "Muppet Monster Adventure (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108033,7 +113553,8 @@ SCES-03093:
     multitap: false
     linkCable: false
 SLUS-01238:
-  name: "Muppet Monster Adventure (USA)"
+  name: "Muppet Monster Adventure"
+  saveName: "Muppet Monster Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108054,7 +113575,8 @@ SLUS-01238:
     multitap: false
     linkCable: false
 SCES-02008:
-  name: "Muppet RaceMania (Europe)"
+  name: "Muppet RaceMania"
+  saveName: "Muppet RaceMania (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108074,7 +113596,8 @@ SCES-02008:
     multitap: false
     linkCable: false
 SCES-02483:
-  name: "Muppet RaceMania (France)"
+  name: "Muppet RaceMania"
+  saveName: "Muppet RaceMania (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108094,7 +113617,8 @@ SCES-02483:
     multitap: false
     linkCable: false
 SCES-02484:
-  name: "Muppet RaceMania (Germany)"
+  name: "Muppet RaceMania"
+  saveName: "Muppet RaceMania (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108114,7 +113638,8 @@ SCES-02484:
     multitap: false
     linkCable: false
 SCES-02485:
-  name: "Muppet RaceMania (Italy)"
+  name: "Muppet RaceMania"
+  saveName: "Muppet RaceMania (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108134,7 +113659,8 @@ SCES-02485:
     multitap: false
     linkCable: false
 SCES-02486:
-  name: "Muppet RaceMania (Spain)"
+  name: "Muppet RaceMania"
+  saveName: "Muppet RaceMania (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108154,7 +113680,8 @@ SCES-02486:
     multitap: false
     linkCable: false
 SLUS-01237:
-  name: "Muppet RaceMania (USA)"
+  name: "Muppet RaceMania"
+  saveName: "Muppet RaceMania (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1265-gdd9a419"
@@ -108177,7 +113704,8 @@ SLUS-01237:
     multitap: false
     linkCable: false
 SLPS-01392:
-  name: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan)"
+  name: "Murakoshi Seikai no Bakuchou Nihon Rettou"
+  saveName: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108196,11 +113724,13 @@ SLPS-01392:
     multitap: false
     linkCable: false
 SLPM-80253:
-  name: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan) (Demo)"
+  name: "Murakoshi Seikai no Bakuchou Nihon Rettou (Demo)"
+  saveName: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02279:
-  name: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan) (TsuriCon Taiouban)"
+  name: "Murakoshi Seikai no Bakuchou Nihon Rettou (TsuriCon Taiouban)"
+  saveName: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan) (TsuriCon Taiouban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108219,7 +113749,8 @@ SLPS-02279:
     multitap: false
     linkCable: false
 SLPS-02890:
-  name: "Murakoshi Seikai no Bakuchou Nihon Rettou 2 (Japan)"
+  name: "Murakoshi Seikai no Bakuchou Nihon Rettou 2"
+  saveName: "Murakoshi Seikai no Bakuchou Nihon Rettou 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108238,7 +113769,8 @@ SLPS-02890:
     multitap: false
     linkCable: false
 SLPS-01988:
-  name: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Japan) (Disc 1)"
+  name: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Disc 1)"
+  saveName: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Japan) (Disc 1)"
   discSet:
     name: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Japan)"
     serials:
@@ -108262,7 +113794,8 @@ SLPS-01988:
     multitap: false
     linkCable: false
 SLPS-01989:
-  name: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Japan) (Disc 2)"
+  name: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Disc 2)"
+  saveName: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Japan) (Disc 2)"
   discSet:
     name: "Murakoshi Seikai no Bakuchou SeaBass Fishing (Japan)"
     serials:
@@ -108305,7 +113838,8 @@ SLPS-91492:
     multitap: false
     linkCable: false
 SLPS-00375:
-  name: "Mushi no Idokoro (Japan)"
+  name: "Mushi no Idokoro"
+  saveName: "Mushi no Idokoro (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -108323,7 +113857,8 @@ SLPS-00375:
     multitap: false
     linkCable: false
 SLPS-02816:
-  name: "Mushitarou (Japan)"
+  name: "Mushitarou"
+  saveName: "Mushitarou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108342,7 +113877,8 @@ SLPS-02816:
     multitap: false
     linkCable: false
 SLES-01356:
-  name: "Music - Music Creation for the PlayStation (Europe) (En,Fr,De,Es,It)"
+  name: "Music - Music Creation for the PlayStation"
+  saveName: "Music - Music Creation for the PlayStation (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108365,11 +113901,13 @@ SLES-01356:
     multitap: false
     linkCable: false
 SLED-02539:
-  name: "Music 2000 (Europe) (Demo)"
+  name: "Music 2000 (Demo)"
+  saveName: "Music 2000 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02224:
-  name: "Music 2000 (Europe) (En,Fr,De,Es,It)"
+  name: "Music 2000"
+  saveName: "Music 2000 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108393,7 +113931,8 @@ SLES-02224:
     multitap: true
     linkCable: false
 SLPM-86790:
-  name: "Mutekiou Tri-Zenon (Japan)"
+  name: "Mutekiou Tri-Zenon"
+  saveName: "Mutekiou Tri-Zenon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108412,7 +113951,8 @@ SLPM-86790:
     multitap: false
     linkCable: false
 SLUS-01512:
-  name: "My Disney Kitchen (USA)"
+  name: "My Disney Kitchen"
+  saveName: "My Disney Kitchen (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108432,7 +113972,8 @@ SLUS-01512:
     multitap: false
     linkCable: false
 SLPS-00996:
-  name: "My Dream - On Air ga Matenakute (Japan) (Disc 1)"
+  name: "My Dream - On Air ga Matenakute (Disc 1)"
+  saveName: "My Dream - On Air ga Matenakute (Japan) (Disc 1)"
   discSet:
     name: "My Dream - On Air ga Matenakute (Japan)"
     serials:
@@ -108455,7 +113996,8 @@ SLPS-00996:
     multitap: false
     linkCable: false
 SLPS-00997:
-  name: "My Dream - On Air ga Matenakute (Japan) (Disc 2)"
+  name: "My Dream - On Air ga Matenakute (Disc 2)"
+  saveName: "My Dream - On Air ga Matenakute (Japan) (Disc 2)"
   discSet:
     name: "My Dream - On Air ga Matenakute (Japan)"
     serials:
@@ -108478,7 +114020,8 @@ SLPS-00997:
     multitap: false
     linkCable: false
 SLPS-02213:
-  name: "My Garden (Japan)"
+  name: "My Garden"
+  saveName: "My Garden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -108514,7 +114057,8 @@ SLPS-00931:
     multitap: false
     linkCable: false
 SLPS-91085:
-  name: "My Home Dream (Japan)"
+  name: "My Home Dream"
+  saveName: "My Home Dream (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -108535,7 +114079,8 @@ SLPS-91085:
     multitap: false
     linkCable: false
 SLPS-02470:
-  name: "My Home Dream 2 - Niwatsuki Ikkodate de, Ikou! (Japan)"
+  name: "My Home Dream 2 - Niwatsuki Ikkodate de, Ikou!"
+  saveName: "My Home Dream 2 - Niwatsuki Ikkodate de, Ikou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108573,9 +114118,11 @@ SLPS-03525:
     multitap: false
     linkCable: false
 SLPM-80194:
-  name: "Myaon o Sagase (Japan)"
+  name: "Myaon o Sagase"
+  saveName: "Myaon o Sagase (Japan)"
 SLES-00218:
-  name: "Myst (Europe) (En,Fr,De,Es,It)"
+  name: "Myst"
+  saveName: "Myst (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -108598,7 +114145,8 @@ SLES-00218:
     multitap: false
     linkCable: false
 SLPS-00024:
-  name: "Myst (Japan)"
+  name: "Myst"
+  saveName: "Myst (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -108617,7 +114165,8 @@ SLPS-00024:
     multitap: false
     linkCable: false
 SCUS-94602:
-  name: "Myst (USA)"
+  name: "Myst"
+  saveName: "Myst (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1443-g7ab521f7"
@@ -108639,7 +114188,8 @@ SCUS-94602:
     multitap: false
     linkCable: false
 SLPM-86147:
-  name: "Mystic Ark - Maboroshi Gekijou (Japan)"
+  name: "Mystic Ark - Maboroshi Gekijou"
+  saveName: "Mystic Ark - Maboroshi Gekijou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -108657,9 +114207,11 @@ SLPM-86147:
     multitap: false
     linkCable: false
 SLPM-80392:
-  name: "Mystic Ark - Maboroshi Gekijou (Japan) (Taikenban)"
+  name: "Mystic Ark - Maboroshi Gekijou (Taikenban)"
+  saveName: "Mystic Ark - Maboroshi Gekijou (Japan) (Taikenban)"
 SLPS-02072:
-  name: "Mystic Dragoons, The (Japan)"
+  name: "Mystic Dragoons, The"
+  saveName: "Mystic Dragoons, The (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -108681,7 +114233,8 @@ SLPS-02072:
     multitap: false
     linkCable: false
 SLPS-01562:
-  name: "Mystic Mind - Yureru Omoi (Japan) (Disc 1)"
+  name: "Mystic Mind - Yureru Omoi (Disc 1)"
+  saveName: "Mystic Mind - Yureru Omoi (Japan) (Disc 1)"
   discSet:
     name: "Mystic Mind - Yureru Omoi (Japan)"
     serials:
@@ -108704,7 +114257,8 @@ SLPS-01562:
     multitap: false
     linkCable: false
 SLPS-01563:
-  name: "Mystic Mind - Yureru Omoi (Japan) (Disc 2)"
+  name: "Mystic Mind - Yureru Omoi (Disc 2)"
+  saveName: "Mystic Mind - Yureru Omoi (Japan) (Disc 2)"
   discSet:
     name: "Mystic Mind - Yureru Omoi (Japan)"
     serials:
@@ -108727,7 +114281,8 @@ SLPS-01563:
     multitap: false
     linkCable: false
 SLPS-00393:
-  name: "m [emu] - Kimi o Tsutaete (Japan)"
+  name: "m [emu] - Kimi o Tsutaete"
+  saveName: "m [emu] - Kimi o Tsutaete (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -108748,7 +114303,8 @@ SLPS-00393:
     multitap: false
     linkCable: false
 SLPM-86217:
-  name: "N Gauge Unten Kibun Game - Gatan Goton (Japan)"
+  name: "N Gauge Unten Kibun Game - Gatan Goton"
+  saveName: "N Gauge Unten Kibun Game - Gatan Goton (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -108766,7 +114322,8 @@ SLPM-86217:
     multitap: false
     linkCable: false
 SLPM-86766:
-  name: "N Gauge Unten Kibun Game - Gatan Goton (Japan) (Major Wave)"
+  name: "N Gauge Unten Kibun Game - Gatan Goton (Major Wave)"
+  saveName: "N Gauge Unten Kibun Game - Gatan Goton (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -108784,7 +114341,8 @@ SLPM-86766:
     multitap: false
     linkCable: false
 SLES-02086:
-  name: "N-Gen Racing (Europe) (En,Fr,De,Es,It)"
+  name: "N-Gen Racing"
+  saveName: "N-Gen Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108809,7 +114367,8 @@ SLES-02086:
     multitap: false
     linkCable: false
 SLUS-01155:
-  name: "N-Gen Racing (USA)"
+  name: "N-Gen Racing"
+  saveName: "N-Gen Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1629-g101907a7"
@@ -108832,7 +114391,8 @@ SLUS-01155:
     multitap: false
     linkCable: false
 SLES-00809:
-  name: "N2O (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "N2O"
+  saveName: "N2O (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108856,7 +114416,8 @@ SLES-00809:
     multitap: false
     linkCable: false
 SLUS-00637:
-  name: "N2O - Nitrous Oxide (USA)"
+  name: "N2O - Nitrous Oxide"
+  saveName: "N2O - Nitrous Oxide (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -108878,7 +114439,8 @@ SLUS-00637:
     multitap: false
     linkCable: false
 SLES-02191:
-  name: "NASCAR 2000 (Europe)"
+  name: "NASCAR 2000"
+  saveName: "NASCAR 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108898,7 +114460,8 @@ SLES-02191:
     multitap: false
     linkCable: false
 SLUS-00962:
-  name: "NASCAR 2000 (USA)"
+  name: "NASCAR 2000"
+  saveName: "NASCAR 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108918,7 +114481,8 @@ SLUS-00962:
     multitap: false
     linkCable: false
 SLUS-01263:
-  name: "NASCAR 2001 (USA)"
+  name: "NASCAR 2001"
+  saveName: "NASCAR 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -108938,7 +114502,8 @@ SLUS-01263:
     multitap: false
     linkCable: false
 SLES-00905:
-  name: "NASCAR 98 (Europe)"
+  name: "NASCAR 98"
+  saveName: "NASCAR 98 (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -108959,9 +114524,11 @@ SLES-00905:
     multitap: false
     linkCable: false
 SLES-00765:
-  name: "NASCAR 98 (France)"
+  name: "NASCAR 98"
+  saveName: "NASCAR 98 (France)"
 SLES-00880:
-  name: "NASCAR 98 (Germany)"
+  name: "NASCAR 98"
+  saveName: "NASCAR 98 (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -108982,7 +114549,8 @@ SLES-00880:
     multitap: false
     linkCable: false
 SLPS-01295:
-  name: "NASCAR 98 (Japan)"
+  name: "NASCAR 98"
+  saveName: "NASCAR 98 (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -109003,7 +114571,8 @@ SLPS-01295:
     multitap: false
     linkCable: false
 SLUS-00521:
-  name: "NASCAR 98 (USA)"
+  name: "NASCAR 98"
+  saveName: "NASCAR 98 (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -109024,7 +114593,8 @@ SLUS-00521:
     multitap: false
     linkCable: false
 SLUS-00647:
-  name: "NASCAR 98 Collector's Edition (USA)"
+  name: "NASCAR 98 Collector's Edition"
+  saveName: "NASCAR 98 Collector's Edition (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -109045,7 +114615,8 @@ SLUS-00647:
     multitap: false
     linkCable: false
 SLES-01447:
-  name: "NASCAR 99 (Europe)"
+  name: "NASCAR 99"
+  saveName: "NASCAR 99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109065,7 +114636,8 @@ SLES-01447:
     multitap: false
     linkCable: false
 SLES-01452:
-  name: "NASCAR 99 (France)"
+  name: "NASCAR 99"
+  saveName: "NASCAR 99 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109085,7 +114657,8 @@ SLES-01452:
     multitap: false
     linkCable: false
 SLES-01453:
-  name: "NASCAR 99 (Germany)"
+  name: "NASCAR 99"
+  saveName: "NASCAR 99 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109105,7 +114678,8 @@ SLES-01453:
     multitap: false
     linkCable: false
 SLUS-00740:
-  name: "NASCAR 99 (USA)"
+  name: "NASCAR 99"
+  saveName: "NASCAR 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109125,7 +114699,8 @@ SLUS-00740:
     multitap: false
     linkCable: false
 SLUS-00883:
-  name: "NASCAR 99 Legacy (USA)"
+  name: "NASCAR 99 Legacy"
+  saveName: "NASCAR 99 Legacy (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109145,7 +114720,8 @@ SLUS-00883:
     multitap: false
     linkCable: false
 SLUS-01166:
-  name: "NASCAR Heat (USA)"
+  name: "NASCAR Heat"
+  saveName: "NASCAR Heat (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109165,7 +114741,8 @@ SLUS-01166:
     multitap: false
     linkCable: false
 SLUS-00374:
-  name: "NASCAR Racing (USA)"
+  name: "NASCAR Racing"
+  saveName: "NASCAR Racing (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -109184,7 +114761,8 @@ SLUS-00374:
     multitap: false
     linkCable: false
 SLPS-00884:
-  name: "NASCAR Racing - Season 96 (Japan)"
+  name: "NASCAR Racing - Season 96"
+  saveName: "NASCAR Racing - Season 96 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -109203,7 +114781,8 @@ SLPS-00884:
     multitap: false
     linkCable: false
 SLUS-01068:
-  name: "NASCAR Rumble (USA)"
+  name: "NASCAR Rumble"
+  saveName: "NASCAR Rumble (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1485-ge6156e2a"
@@ -109226,7 +114805,8 @@ SLUS-01068:
     multitap: false
     linkCable: false
 SLUS-01403:
-  name: "NASCAR Thunder 2002 (USA)"
+  name: "NASCAR Thunder 2002"
+  saveName: "NASCAR Thunder 2002 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109246,7 +114826,8 @@ SLUS-01403:
     multitap: false
     linkCable: false
 SLUS-01502:
-  name: "NASCAR Thunder 2003 (USA)"
+  name: "NASCAR Thunder 2003"
+  saveName: "NASCAR Thunder 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109266,7 +114847,8 @@ SLUS-01502:
     multitap: false
     linkCable: false
 SLUS-01571:
-  name: "NASCAR Thunder 2004 (USA)"
+  name: "NASCAR Thunder 2004"
+  saveName: "NASCAR Thunder 2004 (USA)"
   compatibility:
     rating: GraphicalAudioIssues
     comments: "Screen transitions are corrupted."
@@ -109289,11 +114871,13 @@ SLUS-01571:
     multitap: false
     linkCable: false
 SLUS-80473:
-  name: "NBA 2Ball (USA) (Demo)"
+  name: "NBA 2Ball (Demo)"
+  saveName: "NBA 2Ball (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02299:
-  name: "NBA Basketball 2000 (Europe) (En,Fr,De,Es,It)"
+  name: "NBA Basketball 2000"
+  saveName: "NBA Basketball 2000 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109316,7 +114900,8 @@ SLES-02299:
     multitap: true
     linkCable: false
 SLUS-00926:
-  name: "NBA Basketball 2000 (USA)"
+  name: "NBA Basketball 2000"
+  saveName: "NBA Basketball 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109335,7 +114920,8 @@ SLUS-00926:
     multitap: true
     linkCable: false
 SLES-01003:
-  name: "NBA Fastbreak '98 (Europe)"
+  name: "NBA Fastbreak '98"
+  saveName: "NBA Fastbreak '98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -109353,7 +114939,8 @@ SLES-01003:
     multitap: true
     linkCable: false
 SLUS-00492:
-  name: "NBA Fastbreak '98 (USA)"
+  name: "NBA Fastbreak '98"
+  saveName: "NBA Fastbreak '98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -109371,7 +114958,8 @@ SLUS-00492:
     multitap: true
     linkCable: false
 SLUS-00329:
-  name: "NBA Hangtime (USA)"
+  name: "NBA Hangtime"
+  saveName: "NBA Hangtime (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -109391,7 +114979,8 @@ SLUS-00329:
     multitap: true
     linkCable: false
 SLES-03362:
-  name: "NBA Hoopz (Europe) (En,Fr,De)"
+  name: "NBA Hoopz"
+  saveName: "NBA Hoopz (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109410,7 +114999,8 @@ SLES-03362:
     multitap: true
     linkCable: false
 SLUS-01331:
-  name: "NBA Hoopz (USA)"
+  name: "NBA Hoopz"
+  saveName: "NBA Hoopz (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109429,7 +115019,8 @@ SLUS-01331:
     multitap: true
     linkCable: false
 SLES-00068:
-  name: "NBA Jam - Tournament Edition (Europe)"
+  name: "NBA Jam - Tournament Edition"
+  saveName: "NBA Jam - Tournament Edition (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -109447,7 +115038,8 @@ SLES-00068:
     multitap: true
     linkCable: false
 SLPS-00199:
-  name: "NBA Jam - Tournament Edition (Japan)"
+  name: "NBA Jam - Tournament Edition"
+  saveName: "NBA Jam - Tournament Edition (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -109465,7 +115057,8 @@ SLPS-00199:
     multitap: true
     linkCable: false
 SLUS-00002:
-  name: "NBA Jam - Tournament Edition (USA)"
+  name: "NBA Jam - Tournament Edition"
+  saveName: "NBA Jam - Tournament Edition (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -109483,7 +115076,8 @@ SLUS-00002:
     multitap: true
     linkCable: false
 SLES-00529:
-  name: "NBA Jam Extreme (Europe)"
+  name: "NBA Jam Extreme"
+  saveName: "NBA Jam Extreme (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -109503,7 +115097,8 @@ SLES-00529:
     multitap: true
     linkCable: false
 SLPS-00699:
-  name: "NBA Jam Extreme (Japan)"
+  name: "NBA Jam Extreme"
+  saveName: "NBA Jam Extreme (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -109523,7 +115118,8 @@ SLPS-00699:
     multitap: true
     linkCable: false
 SLUS-00388:
-  name: "NBA Jam Extreme (USA)"
+  name: "NBA Jam Extreme"
+  saveName: "NBA Jam Extreme (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1614-g914f3ad4"
@@ -109546,7 +115142,8 @@ SLUS-00388:
     multitap: true
     linkCable: false
 SLES-02358:
-  name: "NBA Live 2000 (Europe)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109565,7 +115162,8 @@ SLES-02358:
     multitap: true
     linkCable: false
 SLES-02359:
-  name: "NBA Live 2000 (France)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109584,7 +115182,8 @@ SLES-02359:
     multitap: true
     linkCable: false
 SLES-02360:
-  name: "NBA Live 2000 (Germany)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109603,7 +115202,8 @@ SLES-02360:
     multitap: true
     linkCable: false
 SLES-02361:
-  name: "NBA Live 2000 (Italy)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109622,7 +115222,8 @@ SLES-02361:
     multitap: true
     linkCable: false
 SLPS-02603:
-  name: "NBA Live 2000 (Japan)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109641,7 +115242,8 @@ SLPS-02603:
     multitap: true
     linkCable: false
 SLES-02362:
-  name: "NBA Live 2000 (Spain)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109660,7 +115262,8 @@ SLES-02362:
     multitap: true
     linkCable: false
 SLUS-00998:
-  name: "NBA Live 2000 (USA)"
+  name: "NBA Live 2000"
+  saveName: "NBA Live 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109679,7 +115282,8 @@ SLUS-00998:
     multitap: true
     linkCable: false
 SLES-03128:
-  name: "NBA Live 2001 (Europe)"
+  name: "NBA Live 2001"
+  saveName: "NBA Live 2001 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109698,7 +115302,8 @@ SLES-03128:
     multitap: true
     linkCable: false
 SLES-03129:
-  name: "NBA Live 2001 (France)"
+  name: "NBA Live 2001"
+  saveName: "NBA Live 2001 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109717,7 +115322,8 @@ SLES-03129:
     multitap: true
     linkCable: false
 SLES-03130:
-  name: "NBA Live 2001 (Germany)"
+  name: "NBA Live 2001"
+  saveName: "NBA Live 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109736,7 +115342,8 @@ SLES-03130:
     multitap: true
     linkCable: false
 SLES-03131:
-  name: "NBA Live 2001 (Italy)"
+  name: "NBA Live 2001"
+  saveName: "NBA Live 2001 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109755,7 +115362,8 @@ SLES-03131:
     multitap: true
     linkCable: false
 SLES-03132:
-  name: "NBA Live 2001 (Spain)"
+  name: "NBA Live 2001"
+  saveName: "NBA Live 2001 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109774,7 +115382,8 @@ SLES-03132:
     multitap: true
     linkCable: false
 SLUS-01271:
-  name: "NBA Live 2001 (USA)"
+  name: "NBA Live 2001"
+  saveName: "NBA Live 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109793,7 +115402,8 @@ SLUS-01271:
     multitap: true
     linkCable: false
 SLES-03718:
-  name: "NBA Live 2002 (Europe)"
+  name: "NBA Live 2002"
+  saveName: "NBA Live 2002 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109812,7 +115422,8 @@ SLES-03718:
     multitap: true
     linkCable: false
 SLES-03719:
-  name: "NBA Live 2002 (France)"
+  name: "NBA Live 2002"
+  saveName: "NBA Live 2002 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109831,7 +115442,8 @@ SLES-03719:
     multitap: true
     linkCable: false
 SLES-03720:
-  name: "NBA Live 2002 (Germany)"
+  name: "NBA Live 2002"
+  saveName: "NBA Live 2002 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109850,7 +115462,8 @@ SLES-03720:
     multitap: true
     linkCable: false
 SLES-03721:
-  name: "NBA Live 2002 (Italy)"
+  name: "NBA Live 2002"
+  saveName: "NBA Live 2002 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109869,7 +115482,8 @@ SLES-03721:
     multitap: true
     linkCable: false
 SLES-03722:
-  name: "NBA Live 2002 (Spain)"
+  name: "NBA Live 2002"
+  saveName: "NBA Live 2002 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109888,7 +115502,8 @@ SLES-03722:
     multitap: true
     linkCable: false
 SLUS-01416:
-  name: "NBA Live 2002 (USA)"
+  name: "NBA Live 2002"
+  saveName: "NBA Live 2002 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109907,7 +115522,8 @@ SLUS-01416:
     multitap: true
     linkCable: false
 SLES-03982:
-  name: "NBA Live 2003 (Europe)"
+  name: "NBA Live 2003"
+  saveName: "NBA Live 2003 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109926,7 +115542,8 @@ SLES-03982:
     multitap: true
     linkCable: false
 SLES-03969:
-  name: "NBA Live 2003 (France)"
+  name: "NBA Live 2003"
+  saveName: "NBA Live 2003 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109945,7 +115562,8 @@ SLES-03969:
     multitap: true
     linkCable: false
 SLES-03968:
-  name: "NBA Live 2003 (Germany)"
+  name: "NBA Live 2003"
+  saveName: "NBA Live 2003 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109964,7 +115582,8 @@ SLES-03968:
     multitap: true
     linkCable: false
 SLES-03970:
-  name: "NBA Live 2003 (Italy)"
+  name: "NBA Live 2003"
+  saveName: "NBA Live 2003 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -109983,7 +115602,8 @@ SLES-03970:
     multitap: true
     linkCable: false
 SLES-03971:
-  name: "NBA Live 2003 (Spain)"
+  name: "NBA Live 2003"
+  saveName: "NBA Live 2003 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110002,7 +115622,8 @@ SLES-03971:
     multitap: true
     linkCable: false
 SLUS-01483:
-  name: "NBA Live 2003 (USA)"
+  name: "NBA Live 2003"
+  saveName: "NBA Live 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110021,7 +115642,8 @@ SLUS-01483:
     multitap: true
     linkCable: false
 SLES-00225:
-  name: "NBA Live 96 (Europe)"
+  name: "NBA Live 96"
+  saveName: "NBA Live 96 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -110039,7 +115661,8 @@ SLES-00225:
     multitap: true
     linkCable: false
 SLPS-00389:
-  name: "NBA Live 96 (Japan)"
+  name: "NBA Live 96"
+  saveName: "NBA Live 96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -110057,7 +115680,8 @@ SLPS-00389:
     multitap: true
     linkCable: false
 SLUS-00060:
-  name: "NBA Live 96 (USA)"
+  name: "NBA Live 96"
+  saveName: "NBA Live 96 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -110079,7 +115703,8 @@ SLUS-00060:
     multitap: true
     linkCable: false
 SLES-00517:
-  name: "NBA Live 97 (Europe) (En,Fr,De)"
+  name: "NBA Live 97"
+  saveName: "NBA Live 97 (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -110099,7 +115724,8 @@ SLES-00517:
     multitap: true
     linkCable: false
 SLPS-00736:
-  name: "NBA Live 97 (Japan)"
+  name: "NBA Live 97"
+  saveName: "NBA Live 97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -110117,7 +115743,8 @@ SLPS-00736:
     multitap: true
     linkCable: false
 SLUS-00267:
-  name: "NBA Live 97 (USA)"
+  name: "NBA Live 97"
+  saveName: "NBA Live 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110135,7 +115762,8 @@ SLUS-00267:
     multitap: true
     linkCable: false
 SLES-00906:
-  name: "NBA Live 98 (Europe) (En,Es,It)"
+  name: "NBA Live 98"
+  saveName: "NBA Live 98 (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110156,7 +115784,8 @@ SLES-00906:
     multitap: true
     linkCable: false
 SLES-00951:
-  name: "NBA Live 98 (France)"
+  name: "NBA Live 98"
+  saveName: "NBA Live 98 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110175,7 +115804,8 @@ SLES-00951:
     multitap: true
     linkCable: false
 SLES-00952:
-  name: "NBA Live 98 (Germany)"
+  name: "NBA Live 98"
+  saveName: "NBA Live 98 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110194,7 +115824,8 @@ SLES-00952:
     multitap: true
     linkCable: false
 SLPS-01296:
-  name: "NBA Live 98 (Japan)"
+  name: "NBA Live 98"
+  saveName: "NBA Live 98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110213,7 +115844,8 @@ SLPS-01296:
     multitap: true
     linkCable: false
 SLUS-00523:
-  name: "NBA Live 98 (USA)"
+  name: "NBA Live 98"
+  saveName: "NBA Live 98 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110232,7 +115864,8 @@ SLUS-00523:
     multitap: true
     linkCable: false
 SLES-01446:
-  name: "NBA Live 99 (Europe)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110251,7 +115884,8 @@ SLES-01446:
     multitap: true
     linkCable: false
 SLES-01454:
-  name: "NBA Live 99 (France)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110270,7 +115904,8 @@ SLES-01454:
     multitap: true
     linkCable: false
 SLES-01455:
-  name: "NBA Live 99 (Germany)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110289,7 +115924,8 @@ SLES-01455:
     multitap: true
     linkCable: false
 SLES-01456:
-  name: "NBA Live 99 (Italy)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110308,7 +115944,8 @@ SLES-01456:
     multitap: true
     linkCable: false
 SLPS-02033:
-  name: "NBA Live 99 (Japan)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110327,7 +115964,8 @@ SLPS-02033:
     multitap: true
     linkCable: false
 SLES-01457:
-  name: "NBA Live 99 (Spain)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110346,7 +115984,8 @@ SLES-01457:
     multitap: true
     linkCable: false
 SLUS-00736:
-  name: "NBA Live 99 (USA)"
+  name: "NBA Live 99"
+  saveName: "NBA Live 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110365,7 +116004,8 @@ SLUS-00736:
     multitap: true
     linkCable: false
 SLPS-00188:
-  name: "NBA Power Dunkers (Japan)"
+  name: "NBA Power Dunkers"
+  saveName: "NBA Power Dunkers (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -110383,7 +116023,8 @@ SLPS-00188:
     multitap: true
     linkCable: false
 SLPM-86011:
-  name: "NBA Power Dunkers 2 (Japan)"
+  name: "NBA Power Dunkers 2"
+  saveName: "NBA Power Dunkers 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -110402,7 +116043,8 @@ SLPM-86011:
     multitap: true
     linkCable: false
 SLPM-86060:
-  name: "NBA Power Dunkers 3 (Japan)"
+  name: "NBA Power Dunkers 3"
+  saveName: "NBA Power Dunkers 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -110420,7 +116062,8 @@ SLPM-86060:
     multitap: true
     linkCable: false
 SLPM-86176:
-  name: "NBA Power Dunkers 4 (Japan)"
+  name: "NBA Power Dunkers 4"
+  saveName: "NBA Power Dunkers 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110440,7 +116083,8 @@ SLPM-86176:
     multitap: true
     linkCable: false
 SLPM-86397:
-  name: "NBA Power Dunkers 5 (Japan)"
+  name: "NBA Power Dunkers 5"
+  saveName: "NBA Power Dunkers 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110459,7 +116103,8 @@ SLPM-86397:
     multitap: true
     linkCable: false
 SLES-00882:
-  name: "NBA Pro 98 (Europe)"
+  name: "NBA Pro 98"
+  saveName: "NBA Pro 98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -110477,7 +116122,8 @@ SLES-00882:
     multitap: true
     linkCable: false
 SLES-01970:
-  name: "NBA Pro 99 (Europe)"
+  name: "NBA Pro 99"
+  saveName: "NBA Pro 99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110496,7 +116142,8 @@ SLES-01970:
     multitap: true
     linkCable: false
 SCUS-94552:
-  name: "NBA Shoot Out '97 (USA)"
+  name: "NBA Shoot Out '97"
+  saveName: "NBA Shoot Out '97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110514,7 +116161,8 @@ SCUS-94552:
     multitap: true
     linkCable: false
 SCUS-94500:
-  name: "NBA Shoot Out (USA)"
+  name: "NBA Shoot Out"
+  saveName: "NBA Shoot Out (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110532,7 +116180,8 @@ SCUS-94500:
     multitap: true
     linkCable: false
 SCUS-94561:
-  name: "NBA ShootOut 2000 (USA)"
+  name: "NBA ShootOut 2000"
+  saveName: "NBA ShootOut 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110551,7 +116200,8 @@ SCUS-94561:
     multitap: true
     linkCable: false
 SCUS-94581:
-  name: "NBA ShootOut 2001 (USA)"
+  name: "NBA ShootOut 2001"
+  saveName: "NBA ShootOut 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110570,11 +116220,13 @@ SCUS-94581:
     multitap: true
     linkCable: false
 SCUS-94582:
-  name: "NBA ShootOut 2001 (USA) (Demo)"
+  name: "NBA ShootOut 2001 (Demo)"
+  saveName: "NBA ShootOut 2001 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94641:
-  name: "NBA ShootOut 2002 (USA)"
+  name: "NBA ShootOut 2002"
+  saveName: "NBA ShootOut 2002 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110593,11 +116245,13 @@ SCUS-94641:
     multitap: true
     linkCable: false
 SCUS-94660:
-  name: "NBA ShootOut 2002 (USA) (Demo)"
+  name: "NBA ShootOut 2002 (Demo)"
+  saveName: "NBA ShootOut 2002 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94673:
-  name: "NBA ShootOut 2003 (USA)"
+  name: "NBA ShootOut 2003"
+  saveName: "NBA ShootOut 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110616,7 +116270,8 @@ SCUS-94673:
     multitap: true
     linkCable: false
 SCUS-94691:
-  name: "NBA ShootOut 2004 (USA)"
+  name: "NBA ShootOut 2004"
+  saveName: "NBA ShootOut 2004 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110635,7 +116290,8 @@ SCUS-94691:
     multitap: true
     linkCable: false
 SCUS-94171:
-  name: "NBA ShootOut 98 (USA)"
+  name: "NBA ShootOut 98"
+  saveName: "NBA ShootOut 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110653,7 +116309,8 @@ SCUS-94171:
     multitap: true
     linkCable: false
 SLES-02336:
-  name: "NBA Showtime - NBA on NBC (Europe)"
+  name: "NBA Showtime - NBA on NBC"
+  saveName: "NBA Showtime - NBA on NBC (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110672,7 +116329,8 @@ SLES-02336:
     multitap: true
     linkCable: false
 SLUS-00948:
-  name: "NBA Showtime - NBA on NBC (USA)"
+  name: "NBA Showtime - NBA on NBC"
+  saveName: "NBA Showtime - NBA on NBC (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110691,7 +116349,8 @@ SLUS-00948:
     multitap: true
     linkCable: false
 SLUS-00445:
-  name: "NBA in the Zone '98 (USA)"
+  name: "NBA in the Zone '98"
+  saveName: "NBA in the Zone '98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110709,7 +116368,8 @@ SLUS-00445:
     multitap: true
     linkCable: false
 SLUS-00791:
-  name: "NBA in the Zone '99 (USA)"
+  name: "NBA in the Zone '99"
+  saveName: "NBA in the Zone '99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110728,7 +116388,8 @@ SLUS-00791:
     multitap: true
     linkCable: false
 SLES-00171:
-  name: "NBA in the Zone (Europe)"
+  name: "NBA in the Zone"
+  saveName: "NBA in the Zone (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -110746,7 +116407,8 @@ SLES-00171:
     multitap: true
     linkCable: false
 SLUS-00048:
-  name: "NBA in the Zone (USA)"
+  name: "NBA in the Zone"
+  saveName: "NBA in the Zone (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110764,7 +116426,8 @@ SLUS-00048:
     multitap: true
     linkCable: false
 SLES-00560:
-  name: "NBA in the Zone 2 (Europe)"
+  name: "NBA in the Zone 2"
+  saveName: "NBA in the Zone 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -110782,7 +116445,8 @@ SLES-00560:
     multitap: true
     linkCable: false
 SLUS-00294:
-  name: "NBA in the Zone 2 (USA)"
+  name: "NBA in the Zone 2"
+  saveName: "NBA in the Zone 2 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110800,7 +116464,8 @@ SLUS-00294:
     multitap: true
     linkCable: false
 SLES-02513:
-  name: "NBA in the Zone 2000 (Europe)"
+  name: "NBA in the Zone 2000"
+  saveName: "NBA in the Zone 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110819,7 +116484,8 @@ SLES-02513:
     multitap: true
     linkCable: false
 SLUS-01028:
-  name: "NBA in the Zone 2000 (USA)"
+  name: "NBA in the Zone 2000"
+  saveName: "NBA in the Zone 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110838,7 +116504,8 @@ SLUS-01028:
     multitap: true
     linkCable: false
 SLUS-00142:
-  name: "NCAA Basketball Final Four 97 (USA)"
+  name: "NCAA Basketball Final Four 97"
+  saveName: "NCAA Basketball Final Four 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110856,7 +116523,8 @@ SLUS-00142:
     multitap: true
     linkCable: false
 SCUS-94562:
-  name: "NCAA Final Four 2000 (USA)"
+  name: "NCAA Final Four 2000"
+  saveName: "NCAA Final Four 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110875,11 +116543,13 @@ SCUS-94562:
     multitap: true
     linkCable: false
 SCUS-94391:
-  name: "NCAA Final Four 2000 (USA) (Demo)"
+  name: "NCAA Final Four 2000 (Demo)"
+  saveName: "NCAA Final Four 2000 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94579:
-  name: "NCAA Final Four 2001 (USA)"
+  name: "NCAA Final Four 2001"
+  saveName: "NCAA Final Four 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110898,7 +116568,8 @@ SCUS-94579:
     multitap: true
     linkCable: false
 SCUS-94264:
-  name: "NCAA Final Four 99 (USA)"
+  name: "NCAA Final Four 99"
+  saveName: "NCAA Final Four 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110920,7 +116591,8 @@ SCUS-94264:
     multitap: true
     linkCable: false
 SLUS-00932:
-  name: "NCAA Football 2000 (USA)"
+  name: "NCAA Football 2000"
+  saveName: "NCAA Football 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110939,7 +116611,8 @@ SLUS-00932:
     multitap: true
     linkCable: false
 SLUS-01219:
-  name: "NCAA Football 2001 (USA)"
+  name: "NCAA Football 2001"
+  saveName: "NCAA Football 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110958,7 +116631,8 @@ SLUS-01219:
     multitap: true
     linkCable: false
 SLUS-00514:
-  name: "NCAA Football 98 (USA)"
+  name: "NCAA Football 98"
+  saveName: "NCAA Football 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -110976,7 +116650,8 @@ SLUS-00514:
     multitap: true
     linkCable: false
 SLUS-00688:
-  name: "NCAA Football 99 (USA)"
+  name: "NCAA Football 99"
+  saveName: "NCAA Football 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -110995,7 +116670,8 @@ SLUS-00688:
     multitap: true
     linkCable: false
 SCUS-94509:
-  name: "NCAA Football GameBreaker (USA)"
+  name: "NCAA Football GameBreaker"
+  saveName: "NCAA Football GameBreaker (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111013,7 +116689,8 @@ SCUS-94509:
     multitap: true
     linkCable: false
 SCUS-94557:
-  name: "NCAA GameBreaker 2000 (USA)"
+  name: "NCAA GameBreaker 2000"
+  saveName: "NCAA GameBreaker 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111032,11 +116709,13 @@ SCUS-94557:
     multitap: true
     linkCable: false
 SCUS-94386:
-  name: "NCAA GameBreaker 2000 (USA) (Demo)"
+  name: "NCAA GameBreaker 2000 (Demo)"
+  saveName: "NCAA GameBreaker 2000 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94573:
-  name: "NCAA GameBreaker 2001 (USA)"
+  name: "NCAA GameBreaker 2001"
+  saveName: "NCAA GameBreaker 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111055,11 +116734,13 @@ SCUS-94573:
     multitap: true
     linkCable: false
 SCUS-94574:
-  name: "NCAA GameBreaker 2001 (USA) (Demo)"
+  name: "NCAA GameBreaker 2001 (Demo)"
+  saveName: "NCAA GameBreaker 2001 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94172:
-  name: "NCAA GameBreaker 98 (USA)"
+  name: "NCAA GameBreaker 98"
+  saveName: "NCAA GameBreaker 98 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111078,7 +116759,8 @@ SCUS-94172:
     multitap: true
     linkCable: false
 SCUS-94246:
-  name: "NCAA GameBreaker 99 (USA)"
+  name: "NCAA GameBreaker 99"
+  saveName: "NCAA GameBreaker 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111097,11 +116779,13 @@ SCUS-94246:
     multitap: true
     linkCable: false
 SCUS-94375:
-  name: "NCAA GameBreaker 99 (USA) (Demo)"
+  name: "NCAA GameBreaker 99 (Demo)"
+  saveName: "NCAA GameBreaker 99 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01023:
-  name: "NCAA March Madness 2000 (USA)"
+  name: "NCAA March Madness 2000"
+  saveName: "NCAA March Madness 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111120,7 +116804,8 @@ SLUS-01023:
     multitap: true
     linkCable: false
 SLUS-01320:
-  name: "NCAA March Madness 2001 (USA)"
+  name: "NCAA March Madness 2001"
+  saveName: "NCAA March Madness 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111139,7 +116824,8 @@ SLUS-01320:
     multitap: true
     linkCable: false
 SLUS-00805:
-  name: "NCAA March Madness 99 (USA)"
+  name: "NCAA March Madness 99"
+  saveName: "NCAA March Madness 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111158,7 +116844,8 @@ SLUS-00805:
     multitap: true
     linkCable: false
 SLUS-00617:
-  name: "NFL Blitz (USA)"
+  name: "NFL Blitz"
+  saveName: "NFL Blitz (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111177,7 +116864,8 @@ SLUS-00617:
     multitap: false
     linkCable: false
 SLES-02335:
-  name: "NFL Blitz 2000 (Europe)"
+  name: "NFL Blitz 2000"
+  saveName: "NFL Blitz 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111196,7 +116884,8 @@ SLES-02335:
     multitap: true
     linkCable: false
 SLUS-00861:
-  name: "NFL Blitz 2000 (USA)"
+  name: "NFL Blitz 2000"
+  saveName: "NFL Blitz 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111215,7 +116904,8 @@ SLUS-00861:
     multitap: true
     linkCable: false
 SLUS-01146:
-  name: "NFL Blitz 2001 (USA)"
+  name: "NFL Blitz 2001"
+  saveName: "NFL Blitz 2001 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1761-g3096f095"
@@ -111237,7 +116927,8 @@ SLUS-01146:
     multitap: true
     linkCable: false
 SLUS-00047:
-  name: "NFL Full Contact (USA)"
+  name: "NFL Full Contact"
+  saveName: "NFL Full Contact (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111255,7 +116946,8 @@ SLUS-00047:
     multitap: false
     linkCable: false
 SCES-00219:
-  name: "NFL GameDay (Europe)"
+  name: "NFL GameDay"
+  saveName: "NFL GameDay (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -111273,7 +116965,8 @@ SCES-00219:
     multitap: false
     linkCable: false
 SCUS-94505:
-  name: "NFL GameDay (USA)"
+  name: "NFL GameDay"
+  saveName: "NFL GameDay (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -111294,7 +116987,8 @@ SCUS-94505:
     multitap: false
     linkCable: false
 SCUS-94556:
-  name: "NFL GameDay 2000 (USA)"
+  name: "NFL GameDay 2000"
+  saveName: "NFL GameDay 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111313,11 +117007,13 @@ SCUS-94556:
     multitap: true
     linkCable: false
 SCUS-94385:
-  name: "NFL GameDay 2000 (USA) (Demo)"
+  name: "NFL GameDay 2000 (Demo)"
+  saveName: "NFL GameDay 2000 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94575:
-  name: "NFL GameDay 2001 (USA)"
+  name: "NFL GameDay 2001"
+  saveName: "NFL GameDay 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111336,11 +117032,13 @@ SCUS-94575:
     multitap: true
     linkCable: false
 SCUS-94576:
-  name: "NFL GameDay 2001 (USA) (Demo)"
+  name: "NFL GameDay 2001 (Demo)"
+  saveName: "NFL GameDay 2001 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94639:
-  name: "NFL GameDay 2002 (USA)"
+  name: "NFL GameDay 2002"
+  saveName: "NFL GameDay 2002 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111359,7 +117057,8 @@ SCUS-94639:
     multitap: true
     linkCable: false
 SCUS-94665:
-  name: "NFL GameDay 2003 (USA)"
+  name: "NFL GameDay 2003"
+  saveName: "NFL GameDay 2003 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111378,7 +117077,8 @@ SCUS-94665:
     multitap: true
     linkCable: false
 SCUS-94690:
-  name: "NFL GameDay 2004 (USA)"
+  name: "NFL GameDay 2004"
+  saveName: "NFL GameDay 2004 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111397,7 +117097,8 @@ SCUS-94690:
     multitap: true
     linkCable: false
 SCUS-94695:
-  name: "NFL GameDay 2005 (USA)"
+  name: "NFL GameDay 2005"
+  saveName: "NFL GameDay 2005 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111416,7 +117117,8 @@ SCUS-94695:
     multitap: true
     linkCable: false
 SCUS-94510:
-  name: "NFL GameDay 97 (USA)"
+  name: "NFL GameDay 97"
+  saveName: "NFL GameDay 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111434,7 +117136,8 @@ SCUS-94510:
     multitap: true
     linkCable: false
 SCUS-94173:
-  name: "NFL GameDay 98 (USA)"
+  name: "NFL GameDay 98"
+  saveName: "NFL GameDay 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111452,7 +117155,8 @@ SCUS-94173:
     multitap: true
     linkCable: false
 SCUS-94234:
-  name: "NFL GameDay 99 (USA)"
+  name: "NFL GameDay 99"
+  saveName: "NFL GameDay 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111474,7 +117178,8 @@ SCUS-94234:
     multitap: true
     linkCable: false
 SCUS-94285:
-  name: "NFL GameDay 99 (USA) (Demo)"
+  name: "NFL GameDay 99 (Demo)"
+  saveName: "NFL GameDay 99 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00221:
@@ -111496,7 +117201,8 @@ SLPS-00221:
     multitap: true
     linkCable: false
 SLES-00449:
-  name: "NFL Quarterback Club 97 (Europe)"
+  name: "NFL Quarterback Club 97"
+  saveName: "NFL Quarterback Club 97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -111514,7 +117220,8 @@ SLES-00449:
     multitap: true
     linkCable: false
 SLUS-00011:
-  name: "NFL Quarterback Club 97 (USA)"
+  name: "NFL Quarterback Club 97"
+  saveName: "NFL Quarterback Club 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111532,7 +117239,8 @@ SLUS-00011:
     multitap: true
     linkCable: false
 SCES-01490:
-  name: "NFL Xtreme (Europe)"
+  name: "NFL Xtreme"
+  saveName: "NFL Xtreme (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111551,7 +117259,8 @@ SCES-01490:
     multitap: false
     linkCable: false
 SCUS-94245:
-  name: "NFL Xtreme (USA)"
+  name: "NFL Xtreme"
+  saveName: "NFL Xtreme (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111570,11 +117279,13 @@ SCUS-94245:
     multitap: false
     linkCable: false
 SCUS-94271:
-  name: "NFL Xtreme (USA) (Demo)"
+  name: "NFL Xtreme (Demo)"
+  saveName: "NFL Xtreme (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94420:
-  name: "NFL Xtreme 2 (USA)"
+  name: "NFL Xtreme 2"
+  saveName: "NFL Xtreme 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111593,11 +117304,13 @@ SCUS-94420:
     multitap: true
     linkCable: false
 SCUS-94383:
-  name: "NFL Xtreme 2 (USA) (Demo)"
+  name: "NFL Xtreme 2 (Demo)"
+  saveName: "NFL Xtreme 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02225:
-  name: "NHL 2000 (Europe) (En,Sv,Fi)"
+  name: "NHL 2000"
+  saveName: "NHL 2000 (Europe) (En,Sv,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111618,7 +117331,8 @@ SLES-02225:
     multitap: true
     linkCable: false
 SLES-02226:
-  name: "NHL 2000 (Europe) (Fr,Cs)"
+  name: "NHL 2000"
+  saveName: "NHL 2000 (Europe) (Fr,Cs)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111637,7 +117351,8 @@ SLES-02226:
     multitap: true
     linkCable: false
 SLES-02227:
-  name: "NHL 2000 (Germany)"
+  name: "NHL 2000"
+  saveName: "NHL 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111656,7 +117371,8 @@ SLES-02227:
     multitap: true
     linkCable: false
 SLUS-00965:
-  name: "NHL 2000 (USA)"
+  name: "NHL 2000"
+  saveName: "NHL 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111675,7 +117391,8 @@ SLUS-00965:
     multitap: true
     linkCable: false
 SLES-03139:
-  name: "NHL 2001 (Europe) (En,Sv,Fi)"
+  name: "NHL 2001"
+  saveName: "NHL 2001 (Europe) (En,Sv,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111696,7 +117413,8 @@ SLES-03139:
     multitap: true
     linkCable: false
 SLES-03155:
-  name: "NHL 2001 (Europe) (Fr,Cs)"
+  name: "NHL 2001"
+  saveName: "NHL 2001 (Europe) (Fr,Cs)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111716,7 +117434,8 @@ SLES-03155:
     multitap: true
     linkCable: false
 SLES-03154:
-  name: "NHL 2001 (Germany)"
+  name: "NHL 2001"
+  saveName: "NHL 2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111735,7 +117454,8 @@ SLES-03154:
     multitap: true
     linkCable: false
 SLUS-01264:
-  name: "NHL 2001 (USA)"
+  name: "NHL 2001"
+  saveName: "NHL 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111754,7 +117474,8 @@ SLUS-01264:
     multitap: true
     linkCable: false
 SLES-00492:
-  name: "NHL 97 (Europe)"
+  name: "NHL 97"
+  saveName: "NHL 97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -111772,7 +117493,8 @@ SLES-00492:
     multitap: true
     linkCable: false
 SLES-00533:
-  name: "NHL 97 (Germany)"
+  name: "NHL 97"
+  saveName: "NHL 97 (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -111790,7 +117512,8 @@ SLES-00533:
     multitap: true
     linkCable: false
 SLPS-00861:
-  name: "NHL 97 (Japan)"
+  name: "NHL 97"
+  saveName: "NHL 97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -111808,7 +117531,8 @@ SLPS-00861:
     multitap: true
     linkCable: false
 SLUS-00030:
-  name: "NHL 97 (USA)"
+  name: "NHL 97"
+  saveName: "NHL 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111826,7 +117550,8 @@ SLUS-00030:
     multitap: true
     linkCable: false
 SLES-00907:
-  name: "NHL 98 (Europe) (En,Sv,Fi)"
+  name: "NHL 98"
+  saveName: "NHL 98 (Europe) (En,Sv,Fi)"
   controllers:
     - DigitalController
   metadata:
@@ -111846,7 +117571,8 @@ SLES-00907:
     multitap: true
     linkCable: false
 SLES-00512:
-  name: "NHL 98 (Germany)"
+  name: "NHL 98"
+  saveName: "NHL 98 (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -111864,7 +117590,8 @@ SLES-00512:
     multitap: true
     linkCable: false
 SLUS-00519:
-  name: "NHL 98 (USA)"
+  name: "NHL 98"
+  saveName: "NHL 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -111882,7 +117609,8 @@ SLUS-00519:
     multitap: true
     linkCable: false
 SLES-01445:
-  name: "NHL 99 (Europe) (En,Fr,Sv,Fi)"
+  name: "NHL 99"
+  saveName: "NHL 99 (Europe) (En,Fr,Sv,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111904,7 +117632,8 @@ SLES-01445:
     multitap: true
     linkCable: false
 SLES-01458:
-  name: "NHL 99 (Germany)"
+  name: "NHL 99"
+  saveName: "NHL 99 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111923,7 +117652,8 @@ SLES-01458:
     multitap: true
     linkCable: false
 SLUS-00735:
-  name: "NHL 99 (USA)"
+  name: "NHL 99"
+  saveName: "NHL 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111942,7 +117672,8 @@ SLUS-00735:
     multitap: true
     linkCable: false
 SLES-02514:
-  name: "NHL Blades of Steel 2000 (Europe)"
+  name: "NHL Blades of Steel 2000"
+  saveName: "NHL Blades of Steel 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111961,7 +117692,8 @@ SLES-02514:
     multitap: true
     linkCable: false
 SLPM-86193:
-  name: "NHL Blades of Steel 2000 (Japan)"
+  name: "NHL Blades of Steel 2000"
+  saveName: "NHL Blades of Steel 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111980,7 +117712,8 @@ SLPM-86193:
     multitap: true
     linkCable: false
 SLUS-00825:
-  name: "NHL Blades of Steel 2000 (USA)"
+  name: "NHL Blades of Steel 2000"
+  saveName: "NHL Blades of Steel 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -111999,7 +117732,8 @@ SLUS-00825:
     multitap: true
     linkCable: false
 SLES-00624:
-  name: "NHL Breakaway 98 (Europe)"
+  name: "NHL Breakaway 98"
+  saveName: "NHL Breakaway 98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -112017,7 +117751,8 @@ SLES-00624:
     multitap: true
     linkCable: false
 SLUS-00391:
-  name: "NHL Breakaway 98 (USA)"
+  name: "NHL Breakaway 98"
+  saveName: "NHL Breakaway 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -112035,7 +117770,8 @@ SLUS-00391:
     multitap: true
     linkCable: false
 SLES-02298:
-  name: "NHL Championship 2000 (Europe) (En,Fr,De,Sv)"
+  name: "NHL Championship 2000"
+  saveName: "NHL Championship 2000 (Europe) (En,Fr,De,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112054,7 +117790,8 @@ SLES-02298:
     multitap: true
     linkCable: false
 SLUS-00925:
-  name: "NHL Championship 2000 (USA)"
+  name: "NHL Championship 2000"
+  saveName: "NHL Championship 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112073,7 +117810,8 @@ SLUS-00925:
     multitap: true
     linkCable: false
 SCES-00392:
-  name: "NHL Face Off '97 (Europe)"
+  name: "NHL Face Off '97"
+  saveName: "NHL Face Off '97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -112091,7 +117829,8 @@ SCES-00392:
     multitap: true
     linkCable: false
 SCUS-94550:
-  name: "NHL Face Off '97 (USA)"
+  name: "NHL Face Off '97"
+  saveName: "NHL Face Off '97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -112109,7 +117848,8 @@ SCUS-94550:
     multitap: true
     linkCable: false
 SCES-00220:
-  name: "NHL Face Off (Europe)"
+  name: "NHL Face Off"
+  saveName: "NHL Face Off (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -112127,7 +117867,8 @@ SCES-00220:
     multitap: false
     linkCable: false
 SCUS-94504:
-  name: "NHL Face Off (USA)"
+  name: "NHL Face Off"
+  saveName: "NHL Face Off (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -112145,7 +117886,8 @@ SCUS-94504:
     multitap: false
     linkCable: false
 SCES-02451:
-  name: "NHL FaceOff 2000 (Europe)"
+  name: "NHL FaceOff 2000"
+  saveName: "NHL FaceOff 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112164,7 +117906,8 @@ SCES-02451:
     multitap: true
     linkCable: false
 SCUS-94558:
-  name: "NHL FaceOff 2000 (USA)"
+  name: "NHL FaceOff 2000"
+  saveName: "NHL FaceOff 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112183,11 +117926,13 @@ SCUS-94558:
     multitap: true
     linkCable: false
 SCUS-94387:
-  name: "NHL FaceOff 2000 (USA) (Demo)"
+  name: "NHL FaceOff 2000 (Demo)"
+  saveName: "NHL FaceOff 2000 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94577:
-  name: "NHL FaceOff 2001 (USA)"
+  name: "NHL FaceOff 2001"
+  saveName: "NHL FaceOff 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112208,13 +117953,15 @@ SCUS-94577:
     multitap: true
     linkCable: false
 SCUS-94578:
-  name: "NHL FaceOff 2001 (USA) (Demo)"
+  name: "NHL FaceOff 2001 (Demo)"
+  saveName: "NHL FaceOff 2001 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceRecompilerICache
 SCES-01022:
-  name: "NHL FaceOff 98 (Europe)"
+  name: "NHL FaceOff 98"
+  saveName: "NHL FaceOff 98 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112233,7 +117980,8 @@ SCES-01022:
     multitap: true
     linkCable: false
 SCUS-94174:
-  name: "NHL FaceOff 98 (USA)"
+  name: "NHL FaceOff 98"
+  saveName: "NHL FaceOff 98 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112252,7 +118000,8 @@ SCUS-94174:
     multitap: true
     linkCable: false
 SCES-01736:
-  name: "NHL FaceOff 99 (Europe)"
+  name: "NHL FaceOff 99"
+  saveName: "NHL FaceOff 99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112271,7 +118020,8 @@ SCES-01736:
     multitap: true
     linkCable: false
 SCUS-94235:
-  name: "NHL FaceOff 99 (USA)"
+  name: "NHL FaceOff 99"
+  saveName: "NHL FaceOff 99 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112290,11 +118040,13 @@ SCUS-94235:
     multitap: true
     linkCable: false
 SCUS-94372:
-  name: "NHL FaceOff 99 (USA) (Demo)"
+  name: "NHL FaceOff 99 (Demo)"
+  saveName: "NHL FaceOff 99 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00327:
-  name: "NHL Open Ice - 2 on 2 Challenge (USA)"
+  name: "NHL Open Ice - 2 on 2 Challenge"
+  saveName: "NHL Open Ice - 2 on 2 Challenge (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -112312,7 +118064,8 @@ SLUS-00327:
     multitap: true
     linkCable: false
 SIPS-60018:
-  name: "NHL PowerRink '97 (Japan)"
+  name: "NHL PowerRink '97"
+  saveName: "NHL PowerRink '97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -112330,7 +118083,8 @@ SIPS-60018:
     multitap: true
     linkCable: false
 SLPS-00595:
-  name: "NHL Powerplay '96 (Japan)"
+  name: "NHL Powerplay '96"
+  saveName: "NHL Powerplay '96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -112348,7 +118102,8 @@ SLPS-00595:
     multitap: true
     linkCable: false
 SLUS-00227:
-  name: "NHL Powerplay '96 (USA)"
+  name: "NHL Powerplay '96"
+  saveName: "NHL Powerplay '96 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -112366,7 +118121,8 @@ SLUS-00227:
     multitap: true
     linkCable: false
 SLES-00313:
-  name: "NHL Powerplay (Europe)"
+  name: "NHL Powerplay"
+  saveName: "NHL Powerplay (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -112384,7 +118140,8 @@ SLES-00313:
     multitap: true
     linkCable: false
 SLES-00418:
-  name: "NHL Powerplay 98 (Europe) (En,Fr,De)"
+  name: "NHL Powerplay 98"
+  saveName: "NHL Powerplay 98 (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -112404,7 +118161,8 @@ SLES-00418:
     multitap: true
     linkCable: false
 SLUS-00528:
-  name: "NHL Powerplay 98 (USA) (En,Fr,De)"
+  name: "NHL Powerplay 98"
+  saveName: "NHL Powerplay 98 (USA) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -112424,7 +118182,8 @@ SLUS-00528:
     multitap: true
     linkCable: false
 SLES-02794:
-  name: "NHL Rock the Rink (Europe)"
+  name: "NHL Rock the Rink"
+  saveName: "NHL Rock the Rink (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112443,7 +118202,8 @@ SLES-02794:
     multitap: false
     linkCable: false
 SLUS-01085:
-  name: "NHL Rock the Rink (USA)"
+  name: "NHL Rock the Rink"
+  saveName: "NHL Rock the Rink (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112462,7 +118222,8 @@ SLUS-01085:
     multitap: false
     linkCable: false
 SLPS-01193:
-  name: "NOeL - La Neige (Japan) (Disc 1)"
+  name: "NOeL - La Neige (Disc 1)"
+  saveName: "NOeL - La Neige (Japan) (Disc 1)"
   discSet:
     name: "NOeL - La Neige (Japan)"
     serials:
@@ -112487,7 +118248,8 @@ SLPS-01193:
     multitap: false
     linkCable: false
 SLPS-01190:
-  name: "NOeL - La Neige (Japan) (Disc 1) (Special Edition)"
+  name: "NOeL - La Neige (Disc 1) (Special Edition)"
+  saveName: "NOeL - La Neige (Japan) (Disc 1) (Special Edition)"
   discSet:
     name: "NOeL - La Neige (Japan) (Special Edition)"
     serials:
@@ -112512,7 +118274,8 @@ SLPS-01190:
     multitap: false
     linkCable: false
 SLPS-01194:
-  name: "NOeL - La Neige (Japan) (Disc 2)"
+  name: "NOeL - La Neige (Disc 2)"
+  saveName: "NOeL - La Neige (Japan) (Disc 2)"
   discSet:
     name: "NOeL - La Neige (Japan)"
     serials:
@@ -112537,7 +118300,8 @@ SLPS-01194:
     multitap: false
     linkCable: false
 SLPS-01191:
-  name: "NOeL - La Neige (Japan) (Disc 2) (Special Edition)"
+  name: "NOeL - La Neige (Disc 2) (Special Edition)"
+  saveName: "NOeL - La Neige (Japan) (Disc 2) (Special Edition)"
   discSet:
     name: "NOeL - La Neige (Japan) (Special Edition)"
     serials:
@@ -112562,7 +118326,8 @@ SLPS-01191:
     multitap: false
     linkCable: false
 SLPS-01195:
-  name: "NOeL - La Neige (Japan) (Disc 3)"
+  name: "NOeL - La Neige (Disc 3)"
+  saveName: "NOeL - La Neige (Japan) (Disc 3)"
   discSet:
     name: "NOeL - La Neige (Japan)"
     serials:
@@ -112587,7 +118352,8 @@ SLPS-01195:
     multitap: false
     linkCable: false
 SLPS-01192:
-  name: "NOeL - La Neige (Japan) (Disc 3) (Special Edition)"
+  name: "NOeL - La Neige (Disc 3) (Special Edition)"
+  saveName: "NOeL - La Neige (Japan) (Disc 3) (Special Edition)"
   discSet:
     name: "NOeL - La Neige (Japan) (Special Edition)"
     serials:
@@ -112612,7 +118378,8 @@ SLPS-01192:
     multitap: false
     linkCable: false
 SLPS-01515:
-  name: "NOeL - La Neige Special (Japan)"
+  name: "NOeL - La Neige Special"
+  saveName: "NOeL - La Neige Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112631,7 +118398,8 @@ SLPS-01515:
     multitap: false
     linkCable: false
 SLPS-00304:
-  name: "NOeL - Not Digital (Japan) (Disc 1)"
+  name: "NOeL - Not Digital (Disc 1)"
+  saveName: "NOeL - Not Digital (Japan) (Disc 1)"
   discSet:
     name: "NOeL - Not Digital (Japan)"
     serials:
@@ -112657,7 +118425,8 @@ SLPS-00304:
     multitap: false
     linkCable: false
 SLPS-00316:
-  name: "NOeL - Not Digital (Japan) (Disc 1) (Rev 1)"
+  name: "NOeL - Not Digital (Disc 1)"
+  saveName: "NOeL - Not Digital (Japan) (Disc 1) (Rev 1)"
   controllers:
     - DigitalController
   codes:
@@ -112677,7 +118446,8 @@ SLPS-00316:
     multitap: false
     linkCable: false
 SLPS-00305:
-  name: "NOeL - Not Digital (Japan) (Disc 2)"
+  name: "NOeL - Not Digital (Disc 2)"
+  saveName: "NOeL - Not Digital (Japan) (Disc 2)"
   discSet:
     name: "NOeL - Not Digital (Japan)"
     serials:
@@ -112704,7 +118474,8 @@ SLPS-00305:
     multitap: false
     linkCable: false
 SLPS-01895:
-  name: "NOeL 3 - Mission on the Line (Japan) (Disc 1)"
+  name: "NOeL 3 - Mission on the Line (Disc 1)"
+  saveName: "NOeL 3 - Mission on the Line (Japan) (Disc 1)"
   discSet:
     name: "NOeL 3 - Mission on the Line (Japan)"
     serials:
@@ -112729,7 +118500,8 @@ SLPS-01895:
     multitap: false
     linkCable: false
 SLPM-86609:
-  name: "NOeL 3 - Mission on the Line (Japan) (Disc 1) (Major Wave)"
+  name: "NOeL 3 - Mission on the Line (Disc 1) (Major Wave)"
+  saveName: "NOeL 3 - Mission on the Line (Japan) (Disc 1) (Major Wave)"
   discSet:
     name: "NOeL 3 - Mission on the Line (Japan) (Major Wave)"
     serials:
@@ -112754,7 +118526,8 @@ SLPM-86609:
     multitap: false
     linkCable: false
 SLPS-01896:
-  name: "NOeL 3 - Mission on the Line (Japan) (Disc 2)"
+  name: "NOeL 3 - Mission on the Line (Disc 2)"
+  saveName: "NOeL 3 - Mission on the Line (Japan) (Disc 2)"
   discSet:
     name: "NOeL 3 - Mission on the Line (Japan)"
     serials:
@@ -112779,7 +118552,8 @@ SLPS-01896:
     multitap: false
     linkCable: false
 SLPM-86610:
-  name: "NOeL 3 - Mission on the Line (Japan) (Disc 2) (Major Wave)"
+  name: "NOeL 3 - Mission on the Line (Disc 2) (Major Wave)"
+  saveName: "NOeL 3 - Mission on the Line (Japan) (Disc 2) (Major Wave)"
   discSet:
     name: "NOeL 3 - Mission on the Line (Japan) (Major Wave)"
     serials:
@@ -112804,7 +118578,8 @@ SLPM-86610:
     multitap: false
     linkCable: false
 SLPS-01897:
-  name: "NOeL 3 - Mission on the Line (Japan) (Disc 3)"
+  name: "NOeL 3 - Mission on the Line (Disc 3)"
+  saveName: "NOeL 3 - Mission on the Line (Japan) (Disc 3)"
   discSet:
     name: "NOeL 3 - Mission on the Line (Japan)"
     serials:
@@ -112829,7 +118604,8 @@ SLPS-01897:
     multitap: false
     linkCable: false
 SLPM-86611:
-  name: "NOeL 3 - Mission on the Line (Japan) (Disc 3) (Major Wave)"
+  name: "NOeL 3 - Mission on the Line (Disc 3) (Major Wave)"
+  saveName: "NOeL 3 - Mission on the Line (Japan) (Disc 3) (Major Wave)"
   discSet:
     name: "NOeL 3 - Mission on the Line (Japan) (Major Wave)"
     serials:
@@ -112854,7 +118630,8 @@ SLPM-86611:
     multitap: false
     linkCable: false
 SLES-00999:
-  name: "Nagano Winter Olympics '98 (Europe)"
+  name: "Nagano Winter Olympics '98"
+  saveName: "Nagano Winter Olympics '98 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112873,7 +118650,8 @@ SLES-00999:
     multitap: true
     linkCable: false
 SLUS-00591:
-  name: "Nagano Winter Olympics '98 (USA)"
+  name: "Nagano Winter Olympics '98"
+  saveName: "Nagano Winter Olympics '98 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112892,7 +118670,8 @@ SLUS-00591:
     multitap: true
     linkCable: false
 SLPS-00692:
-  name: "Nage Libre - Rasen no Soukoku (Japan)"
+  name: "Nage Libre - Rasen no Soukoku"
+  saveName: "Nage Libre - Rasen no Soukoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -112910,7 +118689,8 @@ SLPS-00692:
     multitap: false
     linkCable: false
 SLPS-02500:
-  name: "Nainai no Meitantei (Japan)"
+  name: "Nainai no Meitantei"
+  saveName: "Nainai no Meitantei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -112929,7 +118709,8 @@ SLPS-02500:
     multitap: false
     linkCable: false
 SLPM-86601:
-  name: "Najavu no Daibouken - My Favorite Namjatown (Japan)"
+  name: "Najavu no Daibouken - My Favorite Namjatown"
+  saveName: "Najavu no Daibouken - My Favorite Namjatown (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -112947,7 +118728,8 @@ SLPM-86601:
     multitap: false
     linkCable: false
 SLPS-01625:
-  name: "Nakajima Miyuki - Namiromu (Japan)"
+  name: "Nakajima Miyuki - Namiromu"
+  saveName: "Nakajima Miyuki - Namiromu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -112965,7 +118747,8 @@ SLPS-01625:
     multitap: false
     linkCable: false
 SLPS-01220:
-  name: "Namco Anthology 1 (Japan)"
+  name: "Namco Anthology 1"
+  saveName: "Namco Anthology 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -112983,7 +118766,8 @@ SLPS-01220:
     multitap: false
     linkCable: false
 SLPS-01221:
-  name: "Namco Anthology 2 (Japan)"
+  name: "Namco Anthology 2"
+  saveName: "Namco Anthology 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -113001,15 +118785,18 @@ SLPS-01221:
     multitap: false
     linkCable: false
 SCED-00789:
-  name: "Namco Demo (Europe)"
+  name: "Namco Demo"
+  saveName: "Namco Demo (Europe)"
   metadata:
     genre: "** DEMO **"
 SLUS-90008:
-  name: "Namco Demo CD (USA)"
+  name: "Namco Demo CD"
+  saveName: "Namco Demo CD (USA)"
   metadata:
     genre: "** DEMO **"
 SLPS-01050:
-  name: "Namco Museum Encore (Japan)"
+  name: "Namco Museum Encore"
+  saveName: "Namco Museum Encore (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113028,7 +118815,8 @@ SLPS-01050:
     multitap: false
     linkCable: false
 SLPS-00765:
-  name: "Namco Museum Encore (Japan) (Shokai Gentei Special Box)"
+  name: "Namco Museum Encore (Shokai Gentei Special Box)"
+  saveName: "Namco Museum Encore (Japan) (Shokai Gentei Special Box)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113047,7 +118835,8 @@ SLPS-00765:
     multitap: false
     linkCable: false
 SLPS-91163:
-  name: "Namco Museum Encore (Japan) (Shokai Gentei Special Box) (Rev 1)"
+  name: "Namco Museum Encore (Shokai Gentei Special Box)"
+  saveName: "Namco Museum Encore (Japan) (Shokai Gentei Special Box) (Rev 1)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113066,7 +118855,8 @@ SLPS-91163:
     multitap: false
     linkCable: false
 SCES-00243:
-  name: "Namco Museum Vol. 1 (Europe)"
+  name: "Namco Museum Vol. 1"
+  saveName: "Namco Museum Vol. 1 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113085,7 +118875,8 @@ SCES-00243:
     multitap: false
     linkCable: false
 SLPS-00107:
-  name: "Namco Museum Vol. 1 (Japan)"
+  name: "Namco Museum Vol. 1"
+  saveName: "Namco Museum Vol. 1 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113107,7 +118898,8 @@ SLPS-00107:
     multitap: false
     linkCable: false
 SLUS-00215:
-  name: "Namco Museum Vol. 1 (USA)"
+  name: "Namco Museum Vol. 1"
+  saveName: "Namco Museum Vol. 1 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -113129,7 +118921,8 @@ SLUS-00215:
     multitap: false
     linkCable: false
 SCES-00267:
-  name: "Namco Museum Vol. 2 (Europe)"
+  name: "Namco Museum Vol. 2"
+  saveName: "Namco Museum Vol. 2 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113148,7 +118941,8 @@ SCES-00267:
     multitap: false
     linkCable: false
 SLPS-00210:
-  name: "Namco Museum Vol. 2 (Japan)"
+  name: "Namco Museum Vol. 2"
+  saveName: "Namco Museum Vol. 2 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113170,7 +118964,8 @@ SLPS-00210:
     multitap: false
     linkCable: false
 SLPS-00209:
-  name: "Namco Museum Vol. 2 (Japan) (Gentei Box)"
+  name: "Namco Museum Vol. 2 (Gentei Box)"
+  saveName: "Namco Museum Vol. 2 (Japan) (Gentei Box)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113189,7 +118984,8 @@ SLPS-00209:
     multitap: false
     linkCable: false
 SLUS-00216:
-  name: "Namco Museum Vol. 2 (USA)"
+  name: "Namco Museum Vol. 2"
+  saveName: "Namco Museum Vol. 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -113211,7 +119007,8 @@ SLUS-00216:
     multitap: false
     linkCable: false
 SCES-00268:
-  name: "Namco Museum Vol. 3 (Europe)"
+  name: "Namco Museum Vol. 3"
+  saveName: "Namco Museum Vol. 3 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113230,7 +119027,8 @@ SCES-00268:
     multitap: false
     linkCable: false
 SLPS-00390:
-  name: "Namco Museum Vol. 3 (Japan)"
+  name: "Namco Museum Vol. 3"
+  saveName: "Namco Museum Vol. 3 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113252,7 +119050,8 @@ SLPS-00390:
     multitap: false
     linkCable: false
 SLUS-00398:
-  name: "Namco Museum Vol. 3 (USA)"
+  name: "Namco Museum Vol. 3"
+  saveName: "Namco Museum Vol. 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1407-g08b81764"
@@ -113274,7 +119073,8 @@ SLUS-00398:
     multitap: false
     linkCable: false
 SCES-00701:
-  name: "Namco Museum Vol. 4 (Europe)"
+  name: "Namco Museum Vol. 4"
+  saveName: "Namco Museum Vol. 4 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113293,7 +119093,8 @@ SCES-00701:
     multitap: false
     linkCable: false
 SLPS-00540:
-  name: "Namco Museum Vol. 4 (Japan)"
+  name: "Namco Museum Vol. 4"
+  saveName: "Namco Museum Vol. 4 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113315,7 +119116,8 @@ SLPS-00540:
     multitap: false
     linkCable: false
 SLUS-00416:
-  name: "Namco Museum Vol. 4 (USA)"
+  name: "Namco Museum Vol. 4"
+  saveName: "Namco Museum Vol. 4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1407-g08b81764"
@@ -113337,7 +119139,8 @@ SLUS-00416:
     multitap: false
     linkCable: false
 SCES-00702:
-  name: "Namco Museum Vol. 5 (Europe)"
+  name: "Namco Museum Vol. 5"
+  saveName: "Namco Museum Vol. 5 (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113356,7 +119159,8 @@ SCES-00702:
     multitap: false
     linkCable: false
 SLPS-00705:
-  name: "Namco Museum Vol. 5 (Japan)"
+  name: "Namco Museum Vol. 5"
+  saveName: "Namco Museum Vol. 5 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -113378,7 +119182,8 @@ SLPS-00705:
     multitap: false
     linkCable: false
 SLUS-00417:
-  name: "Namco Museum Vol. 5 (USA)"
+  name: "Namco Museum Vol. 5"
+  saveName: "Namco Museum Vol. 5 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1407-g08b81764"
@@ -113400,7 +119205,8 @@ SLUS-00417:
     multitap: false
     linkCable: false
 SCES-00266:
-  name: "Namco Soccer Prime Goal (Europe)"
+  name: "Namco Soccer Prime Goal"
+  saveName: "Namco Soccer Prime Goal (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -113418,7 +119224,8 @@ SCES-00266:
     multitap: false
     linkCable: false
 SCES-00263:
-  name: "Namco Tennis Smash Court (Europe)"
+  name: "Namco Tennis Smash Court"
+  saveName: "Namco Tennis Smash Court (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -113436,7 +119243,8 @@ SCES-00263:
     multitap: true
     linkCable: false
 SLPM-86179:
-  name: "Nanatsu no Hikan (Japan) (Disc 1)"
+  name: "Nanatsu no Hikan (Disc 1)"
+  saveName: "Nanatsu no Hikan (Japan) (Disc 1)"
   discSet:
     name: "Nanatsu no Hikan (Japan)"
     serials:
@@ -113463,7 +119271,8 @@ SLPM-86179:
     multitap: false
     linkCable: false
 SLPM-86180:
-  name: "Nanatsu no Hikan (Japan) (Disc 2)"
+  name: "Nanatsu no Hikan (Disc 2)"
+  saveName: "Nanatsu no Hikan (Japan) (Disc 2)"
   discSet:
     name: "Nanatsu no Hikan (Japan)"
     serials:
@@ -113490,7 +119299,8 @@ SLPM-86180:
     multitap: false
     linkCable: false
 SLPM-86181:
-  name: "Nanatsu no Hikan (Japan) (Disc 3)"
+  name: "Nanatsu no Hikan (Disc 3)"
+  saveName: "Nanatsu no Hikan (Japan) (Disc 3)"
   discSet:
     name: "Nanatsu no Hikan (Japan)"
     serials:
@@ -113517,7 +119327,8 @@ SLPM-86181:
     multitap: false
     linkCable: false
 SLPS-03049:
-  name: "Naniwa Kinyuudou - Aoki Yuji no Seken Munazanyou (Japan)"
+  name: "Naniwa Kinyuudou - Aoki Yuji no Seken Munazanyou"
+  saveName: "Naniwa Kinyuudou - Aoki Yuji no Seken Munazanyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -113536,7 +119347,8 @@ SLPS-03049:
     multitap: true
     linkCable: false
 SLPS-01206:
-  name: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai (Japan)"
+  name: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai"
+  saveName: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -113576,7 +119388,8 @@ SLPS-02535:
     multitap: false
     linkCable: false
 SLPS-00768:
-  name: "Naniwa no Akindo - Futte Nanbo no Saikoro Jinsei (Japan)"
+  name: "Naniwa no Akindo - Futte Nanbo no Saikoro Jinsei"
+  saveName: "Naniwa no Akindo - Futte Nanbo no Saikoro Jinsei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -113594,7 +119407,8 @@ SLPS-00768:
     multitap: true
     linkCable: false
 SLES-00329:
-  name: "NanoTek Warrior (Europe)"
+  name: "NanoTek Warrior"
+  saveName: "NanoTek Warrior (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -113612,7 +119426,8 @@ SLES-00329:
     multitap: false
     linkCable: false
 SLPS-00835:
-  name: "NanoTek Warrior (Japan)"
+  name: "NanoTek Warrior"
+  saveName: "NanoTek Warrior (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -113630,7 +119445,8 @@ SLPS-00835:
     multitap: false
     linkCable: false
 SLUS-00325:
-  name: "NanoTek Warrior (USA)"
+  name: "NanoTek Warrior"
+  saveName: "NanoTek Warrior (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -113666,7 +119482,8 @@ SCPS-45073:
     multitap: false
     linkCable: false
 SLPS-03553:
-  name: "Naruto - Shinobi no Sato no Jintori Gassen (Japan)"
+  name: "Naruto - Shinobi no Sato no Jintori Gassen"
+  saveName: "Naruto - Shinobi no Sato no Jintori Gassen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -113704,7 +119521,8 @@ SLPS-02667:
     multitap: false
     linkCable: false
 SLPS-02665:
-  name: "Natsuiro Kenjutsu Komachi (Japan) (Disc 1)"
+  name: "Natsuiro Kenjutsu Komachi (Disc 1)"
+  saveName: "Natsuiro Kenjutsu Komachi (Japan) (Disc 1)"
   discSet:
     name: "Natsuiro Kenjutsu Komachi (Japan)"
     serials:
@@ -113728,7 +119546,8 @@ SLPS-02665:
     multitap: false
     linkCable: false
 SLPS-02666:
-  name: "Natsuiro Kenjutsu Komachi (Japan) (Disc 2) (Special Disc)"
+  name: "Natsuiro Kenjutsu Komachi (Disc 2) (Special Disc)"
+  saveName: "Natsuiro Kenjutsu Komachi (Japan) (Disc 2) (Special Disc)"
   discSet:
     name: "Natsuiro Kenjutsu Komachi (Japan)"
     serials:
@@ -113771,7 +119590,8 @@ SLPS-03565:
     multitap: false
     linkCable: false
 SLPS-01530:
-  name: "Navit (Japan)"
+  name: "Navit"
+  saveName: "Navit (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -113793,7 +119613,8 @@ SLPS-01530:
     multitap: false
     linkCable: false
 SLPS-00447:
-  name: "Nazoou (Japan)"
+  name: "Nazoou"
+  saveName: "Nazoou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -113811,7 +119632,8 @@ SLPS-00447:
     multitap: false
     linkCable: false
 SLES-03495:
-  name: "Necronomicon - Das Mysterium der Daemmerung (Germany) (Disc 1)"
+  name: "Necronomicon - Das Mysterium der Daemmerung (Disc 1)"
+  saveName: "Necronomicon - Das Mysterium der Daemmerung (Germany) (Disc 1)"
   discSet:
     name: "Necronomicon - Das Mysterium der Daemmerung (Germany)"
     serials:
@@ -113836,7 +119658,8 @@ SLES-03495:
     multitap: false
     linkCable: false
 SLES-13495:
-  name: "Necronomicon - Das Mysterium der Daemmerung (Germany) (Disc 2)"
+  name: "Necronomicon - Das Mysterium der Daemmerung (Disc 2)"
+  saveName: "Necronomicon - Das Mysterium der Daemmerung (Germany) (Disc 2)"
   discSet:
     name: "Necronomicon - Das Mysterium der Daemmerung (Germany)"
     serials:
@@ -113861,7 +119684,8 @@ SLES-13495:
     multitap: false
     linkCable: false
 SLES-03497:
-  name: "Necronomicon - El Alba de las Tinieblas (Spain) (Disc 1)"
+  name: "Necronomicon - El Alba de las Tinieblas (Disc 1)"
+  saveName: "Necronomicon - El Alba de las Tinieblas (Spain) (Disc 1)"
   discSet:
     name: "Necronomicon - El Alba de las Tinieblas (Spain)"
     serials:
@@ -113886,7 +119710,8 @@ SLES-03497:
     multitap: false
     linkCable: false
 SLES-13497:
-  name: "Necronomicon - El Alba de las Tinieblas (Spain) (Disc 2)"
+  name: "Necronomicon - El Alba de las Tinieblas (Disc 2)"
+  saveName: "Necronomicon - El Alba de las Tinieblas (Spain) (Disc 2)"
   discSet:
     name: "Necronomicon - El Alba de las Tinieblas (Spain)"
     serials:
@@ -113911,7 +119736,8 @@ SLES-13497:
     multitap: false
     linkCable: false
 SLES-03496:
-  name: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Italy) (Disc 1)"
+  name: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Disc 1)"
+  saveName: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Italy) (Disc 1)"
   discSet:
     name: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Italy)"
     serials:
@@ -113936,7 +119762,8 @@ SLES-03496:
     multitap: false
     linkCable: false
 SLES-13496:
-  name: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Italy) (Disc 2)"
+  name: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Disc 2)"
+  saveName: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Italy) (Disc 2)"
   discSet:
     name: "Necronomicon - Ispirato alle opere di H.P. Lovecraft (Italy)"
     serials:
@@ -113961,7 +119788,8 @@ SLES-13496:
     multitap: false
     linkCable: false
 SLES-03494:
-  name: "Necronomicon - L'Aube des Tenebres (France) (Disc 1)"
+  name: "Necronomicon - L'Aube des Tenebres (Disc 1)"
+  saveName: "Necronomicon - L'Aube des Tenebres (France) (Disc 1)"
   discSet:
     name: "Necronomicon - L'Aube des Tenebres (France)"
     serials:
@@ -113986,7 +119814,8 @@ SLES-03494:
     multitap: false
     linkCable: false
 SLES-13494:
-  name: "Necronomicon - L'Aube des Tenebres (France) (Disc 2)"
+  name: "Necronomicon - L'Aube des Tenebres (Disc 2)"
+  saveName: "Necronomicon - L'Aube des Tenebres (France) (Disc 2)"
   discSet:
     name: "Necronomicon - L'Aube des Tenebres (France)"
     serials:
@@ -114011,7 +119840,8 @@ SLES-13494:
     multitap: false
     linkCable: false
 SLES-03498:
-  name: "Necronomicon - O Despertar das Trevas (Portugal) (Disc 1)"
+  name: "Necronomicon - O Despertar das Trevas (Disc 1)"
+  saveName: "Necronomicon - O Despertar das Trevas (Portugal) (Disc 1)"
   discSet:
     name: "Necronomicon - O Despertar das Trevas (Portugal)"
     serials:
@@ -114036,7 +119866,8 @@ SLES-03498:
     multitap: false
     linkCable: false
 SLES-13498:
-  name: "Necronomicon - O Despertar das Trevas (Portugal) (Disc 2)"
+  name: "Necronomicon - O Despertar das Trevas (Disc 2)"
+  saveName: "Necronomicon - O Despertar das Trevas (Portugal) (Disc 2)"
   discSet:
     name: "Necronomicon - O Despertar das Trevas (Portugal)"
     serials:
@@ -114061,7 +119892,8 @@ SLES-13498:
     multitap: false
     linkCable: false
 SLES-03493:
-  name: "Necronomicon - The Dawning of Darkness (Europe) (Disc 1)"
+  name: "Necronomicon - The Dawning of Darkness (Disc 1)"
+  saveName: "Necronomicon - The Dawning of Darkness (Europe) (Disc 1)"
   discSet:
     name: "Necronomicon - The Dawning of Darkness (Europe)"
     serials:
@@ -114086,7 +119918,8 @@ SLES-03493:
     multitap: false
     linkCable: false
 SLES-13493:
-  name: "Necronomicon - The Dawning of Darkness (Europe) (Disc 2)"
+  name: "Necronomicon - The Dawning of Darkness (Disc 2)"
+  saveName: "Necronomicon - The Dawning of Darkness (Europe) (Disc 2)"
   discSet:
     name: "Necronomicon - The Dawning of Darkness (Europe)"
     serials:
@@ -114111,7 +119944,8 @@ SLES-13493:
     multitap: false
     linkCable: false
 SLPS-01245:
-  name: "Nectaris (Japan)"
+  name: "Nectaris"
+  saveName: "Nectaris (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -114129,7 +119963,8 @@ SLPS-01245:
     multitap: false
     linkCable: false
 SLUS-00764:
-  name: "Nectaris - Military Madness (USA)"
+  name: "Nectaris - Military Madness"
+  saveName: "Nectaris - Military Madness (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -114147,7 +119982,8 @@ SLUS-00764:
     multitap: false
     linkCable: false
 SLES-01876:
-  name: "Need for Speed - High Stakes (Australia)"
+  name: "Need for Speed - High Stakes"
+  saveName: "Need for Speed - High Stakes (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114167,7 +120003,8 @@ SLES-01876:
     multitap: false
     linkCable: false
 SLUS-00826:
-  name: "Need for Speed - High Stakes (USA)"
+  name: "Need for Speed - High Stakes"
+  saveName: "Need for Speed - High Stakes (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -114190,7 +120027,8 @@ SLUS-00826:
     multitap: false
     linkCable: false
 SLES-02689:
-  name: "Need for Speed - Porsche 2000 (Europe) (En,De,Sv)"
+  name: "Need for Speed - Porsche 2000"
+  saveName: "Need for Speed - Porsche 2000 (Europe) (En,De,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114213,7 +120051,8 @@ SLES-02689:
     multitap: true
     linkCable: false
 SLES-02700:
-  name: "Need for Speed - Porsche 2000 (Europe) (Fr,Es,It)"
+  name: "Need for Speed - Porsche 2000"
+  saveName: "Need for Speed - Porsche 2000 (Europe) (Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114236,7 +120075,8 @@ SLES-02700:
     multitap: true
     linkCable: false
 SLUS-01104:
-  name: "Need for Speed - Porsche Unleashed (USA)"
+  name: "Need for Speed - Porsche Unleashed"
+  saveName: "Need for Speed - Porsche Unleashed (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -114259,7 +120099,8 @@ SLUS-01104:
     multitap: true
     linkCable: false
 SLES-01790:
-  name: "Need for Speed - Road Challenge (Europe) (En,Es,It)"
+  name: "Need for Speed - Road Challenge"
+  saveName: "Need for Speed - Road Challenge (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114281,7 +120122,8 @@ SLES-01790:
     multitap: false
     linkCable: false
 SLES-01788:
-  name: "Need for Speed - Road Challenge (Europe) (En,Sv)"
+  name: "Need for Speed - Road Challenge"
+  saveName: "Need for Speed - Road Challenge (Europe) (En,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114302,7 +120144,8 @@ SLES-01788:
     multitap: false
     linkCable: false
 SLES-01789:
-  name: "Need for Speed - Road Challenge (Europe) (Fr,De)"
+  name: "Need for Speed - Road Challenge"
+  saveName: "Need for Speed - Road Challenge (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114323,7 +120166,8 @@ SLES-01789:
     multitap: false
     linkCable: false
 SLUS-00590:
-  name: "Need for Speed - V-Rally (USA)"
+  name: "Need for Speed - V-Rally"
+  saveName: "Need for Speed - V-Rally (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -114345,7 +120189,8 @@ SLUS-00590:
     multitap: false
     linkCable: false
 SLUS-01003:
-  name: "Need for Speed - V-Rally 2 (USA)"
+  name: "Need for Speed - V-Rally 2"
+  saveName: "Need for Speed - V-Rally 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -114369,7 +120214,8 @@ SLUS-01003:
     multitap: true
     linkCable: false
 SLES-00658:
-  name: "Need for Speed II (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Need for Speed II"
+  saveName: "Need for Speed II (Europe) (En,Fr,De,Es,It,Sv)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -114398,7 +120244,8 @@ SLES-00658:
     multitap: false
     linkCable: false
 SLUS-00276:
-  name: "Need for Speed II (USA)"
+  name: "Need for Speed II"
+  saveName: "Need for Speed II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -114427,7 +120274,8 @@ SLUS-00276:
     multitap: false
     linkCable: false
 SLES-01154:
-  name: "Need for Speed III - Hot Pursuit (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Need for Speed III - Hot Pursuit"
+  saveName: "Need for Speed III - Hot Pursuit (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114452,7 +120300,8 @@ SLES-01154:
     multitap: false
     linkCable: false
 SLUS-00620:
-  name: "Need for Speed III - Hot Pursuit (USA)"
+  name: "Need for Speed III - Hot Pursuit"
+  saveName: "Need for Speed III - Hot Pursuit (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -114480,7 +120329,8 @@ SLUS-00620:
     multitap: false
     linkCable: false
 SLPS-00006:
-  name: "Nekketsu Oyako (Japan)"
+  name: "Nekketsu Oyako"
+  saveName: "Nekketsu Oyako (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -114500,7 +120350,8 @@ SLPS-00006:
     multitap: false
     linkCable: false
 SLPS-01543:
-  name: "Neko Zamurai (Japan) (Disc 1)"
+  name: "Neko Zamurai (Disc 1)"
+  saveName: "Neko Zamurai (Japan) (Disc 1)"
   discSet:
     name: "Neko Zamurai (Japan)"
     serials:
@@ -114524,7 +120375,8 @@ SLPS-01543:
     multitap: false
     linkCable: false
 SLPS-01544:
-  name: "Neko Zamurai (Japan) (Disc 2)"
+  name: "Neko Zamurai (Disc 2)"
+  saveName: "Neko Zamurai (Japan) (Disc 2)"
   discSet:
     name: "Neko Zamurai (Japan)"
     serials:
@@ -114548,7 +120400,8 @@ SLPS-01544:
     multitap: false
     linkCable: false
 SLPS-01545:
-  name: "Neko Zamurai (Japan) (Disc 3)"
+  name: "Neko Zamurai (Disc 3)"
+  saveName: "Neko Zamurai (Japan) (Disc 3)"
   discSet:
     name: "Neko Zamurai (Japan)"
     serials:
@@ -114572,7 +120425,8 @@ SLPS-01545:
     multitap: false
     linkCable: false
 SLPS-01616:
-  name: "Neko na Ka-N-Ke-I (Japan)"
+  name: "Neko na Ka-N-Ke-I"
+  saveName: "Neko na Ka-N-Ke-I (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -114608,7 +120462,8 @@ SLPS-91524:
     multitap: false
     linkCable: false
 SLPS-02597:
-  name: "Nemuru Mayu (Japan)"
+  name: "Nemuru Mayu"
+  saveName: "Nemuru Mayu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114627,7 +120482,8 @@ SLPS-02597:
     multitap: false
     linkCable: false
 SLPS-01212:
-  name: "Neo Atlas (Japan)"
+  name: "Neo Atlas"
+  saveName: "Neo Atlas (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114649,11 +120505,13 @@ SLPS-01212:
     multitap: false
     linkCable: false
 SLPM-80230:
-  name: "Neo Atlas (Japan) (Demo)"
+  name: "Neo Atlas (Demo)"
+  saveName: "Neo Atlas (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80282:
-  name: "Neo Atlas - Famitsuu no Nazo (Japan) (Demo)"
+  name: "Neo Atlas - Famitsuu no Nazo (Demo)"
+  saveName: "Neo Atlas - Famitsuu no Nazo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02238:
@@ -114676,7 +120534,8 @@ SLPS-02238:
     multitap: false
     linkCable: false
 SLPS-02974:
-  name: "Neo Atlas II (Japan)"
+  name: "Neo Atlas II"
+  saveName: "Neo Atlas II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114695,7 +120554,8 @@ SLPS-02974:
     multitap: false
     linkCable: false
 SLPS-00323:
-  name: "Neo Planet (Japan)"
+  name: "Neo Planet"
+  saveName: "Neo Planet (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -114713,9 +120573,11 @@ SLPS-00323:
     multitap: false
     linkCable: false
 PAPX-90051:
-  name: "Neon Genesis Evangelion - Original Screen Saver (Japan)"
+  name: "Neon Genesis Evangelion - Original Screen Saver"
+  saveName: "Neon Genesis Evangelion - Original Screen Saver (Japan)"
 SLPS-00823:
-  name: "Neorude (Japan) (Disc 1) (Game Disc)"
+  name: "Neorude (Disc 1) (Game Disc)"
+  saveName: "Neorude (Japan) (Disc 1) (Game Disc)"
   discSet:
     name: "Neorude (Japan)"
     serials:
@@ -114739,7 +120601,8 @@ SLPS-00823:
     multitap: false
     linkCable: false
 SLPS-00824:
-  name: "Neorude (Japan) (Disc 2) (Special Disc)"
+  name: "Neorude (Disc 2) (Special Disc)"
+  saveName: "Neorude (Japan) (Disc 2) (Special Disc)"
   discSet:
     name: "Neorude (Japan)"
     serials:
@@ -114763,7 +120626,8 @@ SLPS-00824:
     multitap: false
     linkCable: false
 SLPS-02417:
-  name: "Neorude - Kizamareta Monshou (Japan)"
+  name: "Neorude - Kizamareta Monshou"
+  saveName: "Neorude - Kizamareta Monshou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114783,7 +120647,8 @@ SLPS-02417:
     multitap: false
     linkCable: false
 SLPS-01112:
-  name: "Neorude 2 (Japan)"
+  name: "Neorude 2"
+  saveName: "Neorude 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114842,7 +120707,8 @@ SLPS-02212:
     multitap: false
     linkCable: false
 SLPS-00913:
-  name: "Nessa no Hoshi (Japan) (Disc 1)"
+  name: "Nessa no Hoshi (Disc 1)"
+  saveName: "Nessa no Hoshi (Japan) (Disc 1)"
   discSet:
     name: "Nessa no Hoshi (Japan)"
     serials:
@@ -114865,7 +120731,8 @@ SLPS-00913:
     multitap: false
     linkCable: false
 SLPS-00914:
-  name: "Nessa no Hoshi (Japan) (Disc 2)"
+  name: "Nessa no Hoshi (Disc 2)"
+  saveName: "Nessa no Hoshi (Japan) (Disc 2)"
   discSet:
     name: "Nessa no Hoshi (Japan)"
     serials:
@@ -114888,12 +120755,14 @@ SLPS-00914:
     multitap: false
     linkCable: false
 SLED-01340:
-  name: "Net Yaroze (Europe) (Demo)"
+  name: "Net Yaroze (Demo)"
+  saveName: "Net Yaroze (Europe) (Demo)"
   libcrypt: true
   metadata:
     genre: "** DEMO **"
 SLPM-86163:
-  name: "Netz Magazine - Altezza (Japan)"
+  name: "Netz Magazine - Altezza"
+  saveName: "Netz Magazine - Altezza (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -114912,9 +120781,11 @@ SLPM-86163:
     multitap: false
     linkCable: false
 SLPM-80377:
-  name: "Netz Magazine - Vitz (Japan)"
+  name: "Netz Magazine - Vitz"
+  saveName: "Netz Magazine - Vitz (Japan)"
 SLPS-02559:
-  name: "Neues (Japan)"
+  name: "Neues"
+  saveName: "Neues (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -114950,7 +120821,8 @@ SLPS-02981:
     multitap: false
     linkCable: false
 SLES-03659:
-  name: "Newcomer - Be a Popstar (Germany)"
+  name: "Newcomer - Be a Popstar"
+  saveName: "Newcomer - Be a Popstar (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114969,7 +120841,8 @@ SLES-03659:
     multitap: false
     linkCable: false
 SLES-00933:
-  name: "Newman Haas Racing (Europe) (En,Fr,De,It)"
+  name: "Newman Haas Racing"
+  saveName: "Newman Haas Racing (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -114994,7 +120867,8 @@ SLES-00933:
     multitap: false
     linkCable: false
 SLED-01196:
-  name: "Newman Haas Racing (Europe) (En,Fr,De,It) (Demo)"
+  name: "Newman Haas Racing (Demo)"
+  saveName: "Newman Haas Racing (Europe) (En,Fr,De,It) (Demo)"
   metadata:
     genre: "** DEMO **"
   controllers:
@@ -115004,7 +120878,8 @@ SLED-01196:
   traits:
     - ForcePGXPCPUMode
 SLUS-00602:
-  name: "Newman Haas Racing (USA)"
+  name: "Newman Haas Racing"
+  saveName: "Newman Haas Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115026,27 +120901,33 @@ SLUS-00602:
     multitap: false
     linkCable: false
 SLED-02022:
-  name: "Next Demo 4 (Italy) (En,It)"
+  name: "Next Demo 4"
+  saveName: "Next Demo 4 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLED-02076:
-  name: "Next Demo 5 (Italy) (En,It)"
+  name: "Next Demo 5"
+  saveName: "Next Demo 5 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLED-02041:
-  name: "Next Demo 6 (Italy) (En,It)"
+  name: "Next Demo 6"
+  saveName: "Next Demo 6 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLED-02156:
-  name: "Next Demo 7 (Italy) (En,It)"
+  name: "Next Demo 7"
+  saveName: "Next Demo 7 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLED-02157:
-  name: "Next Demo 9 (Italy) (En,It)"
+  name: "Next Demo 9"
+  saveName: "Next Demo 9 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLPS-00859:
-  name: "Next King - Koi no Sennen Oukoku (Japan)"
+  name: "Next King - Koi no Sennen Oukoku"
+  saveName: "Next King - Koi no Sennen Oukoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -115064,7 +120945,8 @@ SLPS-00859:
     multitap: true
     linkCable: false
 SLPS-00858:
-  name: "Next King - Koi no Sennen Oukoku (Japan) (Genteiban)"
+  name: "Next King - Koi no Sennen Oukoku (Genteiban)"
+  saveName: "Next King - Koi no Sennen Oukoku (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -115082,19 +120964,23 @@ SLPS-00858:
     multitap: true
     linkCable: false
 SLED-01750:
-  name: "Next Station 1 (Italy) (En,It)"
+  name: "Next Station 1"
+  saveName: "Next Station 1 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLED-01873:
-  name: "Next Station 2 (Italy) (En,It)"
+  name: "Next Station 2"
+  saveName: "Next Station 2 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLED-01953:
-  name: "Next Station 3 (Italy) (En,It)"
+  name: "Next Station 3"
+  saveName: "Next Station 3 (Italy) (En,It)"
   metadata:
     genre: "** DEMO **"
 SLPS-02507:
-  name: "Next Tetris DLX, The (Japan)"
+  name: "Next Tetris DLX, The"
+  saveName: "Next Tetris DLX, The (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -115114,7 +121000,8 @@ SLPS-02507:
     multitap: false
     linkCable: false
 SLES-01987:
-  name: "Next Tetris, The (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Next Tetris, The"
+  saveName: "Next Tetris, The (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - DigitalController
   metadata:
@@ -115137,7 +121024,8 @@ SLES-01987:
     multitap: false
     linkCable: false
 SLPS-01774:
-  name: "Next Tetris, The (Japan)"
+  name: "Next Tetris, The"
+  saveName: "Next Tetris, The (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -115160,7 +121048,8 @@ SLPS-01774:
     multitap: false
     linkCable: false
 SLUS-00862:
-  name: "Next Tetris, The (USA)"
+  name: "Next Tetris, The"
+  saveName: "Next Tetris, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1638-g0af22825"
@@ -115183,9 +121072,11 @@ SLUS-00862:
     multitap: false
     linkCable: false
 SLED-01512:
-  name: "Next Wave Herbst '98 (Germany)"
+  name: "Next Wave Herbst '98"
+  saveName: "Next Wave Herbst '98 (Germany)"
 SLPS-00721:
-  name: "Nibiiro no Koubou - 32 Nin no Senshachou (Japan)"
+  name: "Nibiiro no Koubou - 32 Nin no Senshachou"
+  saveName: "Nibiiro no Koubou - 32 Nin no Senshachou (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -115206,7 +121097,8 @@ SLPS-00721:
     multitap: false
     linkCable: false
 SLES-02960:
-  name: "Nice Cats (Europe) (En,Fr,De,Nl)"
+  name: "Nice Cats"
+  saveName: "Nice Cats (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115228,7 +121120,8 @@ SLES-02960:
     multitap: false
     linkCable: false
 SLPS-03351:
-  name: "Nice Price Series Vol. 01 - Nihon Pro Mahjong Renmei Kounin - Honkaku Pro Mahjong (Japan)"
+  name: "Nice Price Series Vol. 01 - Nihon Pro Mahjong Renmei Kounin - Honkaku Pro Mahjong"
+  saveName: "Nice Price Series Vol. 01 - Nihon Pro Mahjong Renmei Kounin - Honkaku Pro Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115247,7 +121140,8 @@ SLPS-03351:
     multitap: false
     linkCable: false
 SLPS-03352:
-  name: "Nice Price Series Vol. 02 - Honkaku Shougi Shinan (Japan)"
+  name: "Nice Price Series Vol. 02 - Honkaku Shougi Shinan"
+  saveName: "Nice Price Series Vol. 02 - Honkaku Shougi Shinan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115266,7 +121160,8 @@ SLPS-03352:
     multitap: false
     linkCable: false
 SLPS-03369:
-  name: "Nice Price Series Vol. 03 - Hanafuda & Card Game (Japan)"
+  name: "Nice Price Series Vol. 03 - Hanafuda & Card Game"
+  saveName: "Nice Price Series Vol. 03 - Hanafuda & Card Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115285,7 +121180,8 @@ SLPS-03369:
     multitap: false
     linkCable: false
 SLPS-03368:
-  name: "Nice Price Series Vol. 04 - Billiard King (Japan)"
+  name: "Nice Price Series Vol. 04 - Billiard King"
+  saveName: "Nice Price Series Vol. 04 - Billiard King (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115304,7 +121200,8 @@ SLPS-03368:
     multitap: false
     linkCable: false
 SLPS-03383:
-  name: "Nice Price Series Vol. 05 - Chess & Reversi (Japan)"
+  name: "Nice Price Series Vol. 05 - Chess & Reversi"
+  saveName: "Nice Price Series Vol. 05 - Chess & Reversi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -115322,7 +121219,8 @@ SLPS-03383:
     multitap: false
     linkCable: false
 SLPS-03384:
-  name: "Nice Price Series Vol. 06 - Quiz de Battle (Japan)"
+  name: "Nice Price Series Vol. 06 - Quiz de Battle"
+  saveName: "Nice Price Series Vol. 06 - Quiz de Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115341,7 +121239,8 @@ SLPS-03384:
     multitap: true
     linkCable: false
 SLPS-03398:
-  name: "Nice Price Series Vol. 07 - World Tournament Bowling (Japan)"
+  name: "Nice Price Series Vol. 07 - World Tournament Bowling"
+  saveName: "Nice Price Series Vol. 07 - World Tournament Bowling (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115360,7 +121259,8 @@ SLPS-03398:
     multitap: false
     linkCable: false
 SLPS-03399:
-  name: "Nice Price Series Vol. 08 - Elemental Pinball (Japan)"
+  name: "Nice Price Series Vol. 08 - Elemental Pinball"
+  saveName: "Nice Price Series Vol. 08 - Elemental Pinball (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115379,7 +121279,8 @@ SLPS-03399:
     multitap: false
     linkCable: false
 SLPS-03409:
-  name: "Nice Price Series Vol. 09 - Paradise Casino (Japan)"
+  name: "Nice Price Series Vol. 09 - Paradise Casino"
+  saveName: "Nice Price Series Vol. 09 - Paradise Casino (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115398,7 +121299,8 @@ SLPS-03409:
     multitap: false
     linkCable: false
 SLPS-03410:
-  name: "Nice Price Series Vol. 10 - Igo wo Utou! (Japan)"
+  name: "Nice Price Series Vol. 10 - Igo wo Utou!"
+  saveName: "Nice Price Series Vol. 10 - Igo wo Utou! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -115416,7 +121318,8 @@ SLPS-03410:
     multitap: false
     linkCable: false
 SLPS-03431:
-  name: "Nice Price Series Vol. 11 - Nikakudori Deluxe (Japan)"
+  name: "Nice Price Series Vol. 11 - Nikakudori Deluxe"
+  saveName: "Nice Price Series Vol. 11 - Nikakudori Deluxe (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115435,7 +121338,8 @@ SLPS-03431:
     multitap: false
     linkCable: false
 SLPS-00184:
-  name: "Nichibutsu Arcade Classics (Japan)"
+  name: "Nichibutsu Arcade Classics"
+  saveName: "Nichibutsu Arcade Classics (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -115453,7 +121357,8 @@ SLPS-00184:
     multitap: false
     linkCable: false
 SLPS-00038:
-  name: "Nichibutsu Mahjong - Joshikou Meijinsen (Japan)"
+  name: "Nichibutsu Mahjong - Joshikou Meijinsen"
+  saveName: "Nichibutsu Mahjong - Joshikou Meijinsen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -115471,7 +121376,8 @@ SLPS-00038:
     multitap: false
     linkCable: false
 SLES-04173:
-  name: "Nick Jr. Dora the Explorer - Barnyard Buddies (Europe)"
+  name: "Nick Jr. Dora the Explorer - Barnyard Buddies"
+  saveName: "Nick Jr. Dora the Explorer - Barnyard Buddies (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115490,7 +121396,8 @@ SLES-04173:
     multitap: false
     linkCable: false
 SLUS-01576:
-  name: "Nick Jr. Dora the Explorer - Barnyard Buddies (USA)"
+  name: "Nick Jr. Dora the Explorer - Barnyard Buddies"
+  saveName: "Nick Jr. Dora the Explorer - Barnyard Buddies (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115509,7 +121416,8 @@ SLUS-01576:
     multitap: false
     linkCable: false
 SLES-03545:
-  name: "Nickelodeon Les Razmoket - 100% Angelica (France)"
+  name: "Nickelodeon Les Razmoket - 100% Angelica"
+  saveName: "Nickelodeon Les Razmoket - 100% Angelica (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115528,7 +121436,8 @@ SLES-03545:
     multitap: false
     linkCable: false
 SLES-01669:
-  name: "Nickelodeon Les Razmoket - A la Recherche de Reptar (France)"
+  name: "Nickelodeon Les Razmoket - A la Recherche de Reptar"
+  saveName: "Nickelodeon Les Razmoket - A la Recherche de Reptar (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115547,7 +121456,8 @@ SLES-01669:
     multitap: false
     linkCable: false
 SLES-02524:
-  name: "Nickelodeon Les Razmoket - Font leur Cinema (France)"
+  name: "Nickelodeon Les Razmoket - Font leur Cinema"
+  saveName: "Nickelodeon Les Razmoket - Font leur Cinema (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115566,7 +121476,8 @@ SLES-02524:
     multitap: false
     linkCable: false
 SLES-03343:
-  name: "Nickelodeon Les Razmoket a Paris - Le Film (France)"
+  name: "Nickelodeon Les Razmoket a Paris - Le Film"
+  saveName: "Nickelodeon Les Razmoket a Paris - Le Film (France)"
   controllers:
     - DigitalController
   metadata:
@@ -115584,7 +121495,8 @@ SLES-03343:
     multitap: false
     linkCable: false
 SLES-03732:
-  name: "Nickelodeon Rocket Power - Sauvetage Extreme (France)"
+  name: "Nickelodeon Rocket Power - Sauvetage Extreme"
+  saveName: "Nickelodeon Rocket Power - Sauvetage Extreme (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115603,7 +121515,8 @@ SLES-03732:
     multitap: false
     linkCable: false
 SLES-03702:
-  name: "Nickelodeon Rocket Power - Team Rocket Rescue (Europe)"
+  name: "Nickelodeon Rocket Power - Team Rocket Rescue"
+  saveName: "Nickelodeon Rocket Power - Team Rocket Rescue (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115622,7 +121535,8 @@ SLES-03702:
     multitap: false
     linkCable: false
 SLUS-01353:
-  name: "Nickelodeon Rocket Power - Team Rocket Rescue (USA)"
+  name: "Nickelodeon Rocket Power - Team Rocket Rescue"
+  saveName: "Nickelodeon Rocket Power - Team Rocket Rescue (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115641,7 +121555,8 @@ SLUS-01353:
     multitap: false
     linkCable: false
 SLES-01671:
-  name: "Nickelodeon Rugrats - Alla Ricerca di Reptar (Italy)"
+  name: "Nickelodeon Rugrats - Alla Ricerca di Reptar"
+  saveName: "Nickelodeon Rugrats - Alla Ricerca di Reptar (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115660,7 +121575,8 @@ SLES-01671:
     multitap: false
     linkCable: false
 SLES-01670:
-  name: "Nickelodeon Rugrats - Auf der Suche nach Reptar (Germany)"
+  name: "Nickelodeon Rugrats - Auf der Suche nach Reptar"
+  saveName: "Nickelodeon Rugrats - Auf der Suche nach Reptar (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115679,7 +121595,8 @@ SLES-01670:
     multitap: false
     linkCable: false
 SLES-01672:
-  name: "Nickelodeon Rugrats - De Speurtocht naar Reptar (Netherlands)"
+  name: "Nickelodeon Rugrats - De Speurtocht naar Reptar"
+  saveName: "Nickelodeon Rugrats - De Speurtocht naar Reptar (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115698,7 +121615,8 @@ SLES-01672:
     multitap: false
     linkCable: false
 SLES-02911:
-  name: "Nickelodeon Rugrats - Excursion al estudio (Spain)"
+  name: "Nickelodeon Rugrats - Excursion al estudio"
+  saveName: "Nickelodeon Rugrats - Excursion al estudio (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115717,7 +121635,8 @@ SLES-02911:
     multitap: false
     linkCable: false
 SLES-02049:
-  name: "Nickelodeon Rugrats - La Busqueda de Reptar (Spain)"
+  name: "Nickelodeon Rugrats - La Busqueda de Reptar"
+  saveName: "Nickelodeon Rugrats - La Busqueda de Reptar (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115736,7 +121655,8 @@ SLES-02049:
     multitap: false
     linkCable: false
 SLES-01538:
-  name: "Nickelodeon Rugrats - Search for Reptar (Europe)"
+  name: "Nickelodeon Rugrats - Search for Reptar"
+  saveName: "Nickelodeon Rugrats - Search for Reptar (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115755,7 +121675,8 @@ SLES-01538:
     multitap: false
     linkCable: false
 SLUS-00650:
-  name: "Nickelodeon Rugrats - Search for Reptar (USA)"
+  name: "Nickelodeon Rugrats - Search for Reptar"
+  saveName: "Nickelodeon Rugrats - Search for Reptar (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115774,11 +121695,13 @@ SLUS-00650:
     multitap: false
     linkCable: false
 SLUS-80650:
-  name: "Nickelodeon Rugrats - Search for Reptar (USA) (Demo)"
+  name: "Nickelodeon Rugrats - Search for Reptar (Demo)"
+  saveName: "Nickelodeon Rugrats - Search for Reptar (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02525:
-  name: "Nickelodeon Rugrats - Studio Tour (Europe)"
+  name: "Nickelodeon Rugrats - Studio Tour"
+  saveName: "Nickelodeon Rugrats - Studio Tour (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115797,7 +121720,8 @@ SLES-02525:
     multitap: false
     linkCable: false
 SLES-02523:
-  name: "Nickelodeon Rugrats - Studio Tour (Germany)"
+  name: "Nickelodeon Rugrats - Studio Tour"
+  saveName: "Nickelodeon Rugrats - Studio Tour (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115816,7 +121740,8 @@ SLES-02523:
     multitap: false
     linkCable: false
 SLES-02912:
-  name: "Nickelodeon Rugrats - Studio Tour (Italy)"
+  name: "Nickelodeon Rugrats - Studio Tour"
+  saveName: "Nickelodeon Rugrats - Studio Tour (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115835,7 +121760,8 @@ SLES-02912:
     multitap: false
     linkCable: false
 SLUS-00880:
-  name: "Nickelodeon Rugrats - Studio Tour (USA)"
+  name: "Nickelodeon Rugrats - Studio Tour"
+  saveName: "Nickelodeon Rugrats - Studio Tour (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115854,7 +121780,8 @@ SLUS-00880:
     multitap: false
     linkCable: false
 SLES-03544:
-  name: "Nickelodeon Rugrats - Totally Angelica (Europe)"
+  name: "Nickelodeon Rugrats - Totally Angelica"
+  saveName: "Nickelodeon Rugrats - Totally Angelica (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115873,7 +121800,8 @@ SLES-03544:
     multitap: false
     linkCable: false
 SLUS-01364:
-  name: "Nickelodeon Rugrats - Totally Angelica (USA)"
+  name: "Nickelodeon Rugrats - Totally Angelica"
+  saveName: "Nickelodeon Rugrats - Totally Angelica (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115892,7 +121820,8 @@ SLUS-01364:
     multitap: false
     linkCable: false
 SLES-03344:
-  name: "Nickelodeon Rugrats en Paris - La pelicula (Spain)"
+  name: "Nickelodeon Rugrats en Paris - La pelicula"
+  saveName: "Nickelodeon Rugrats en Paris - La pelicula (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -115910,7 +121839,8 @@ SLES-03344:
     multitap: false
     linkCable: false
 SLES-03342:
-  name: "Nickelodeon Rugrats in Paris - The Movie (Europe)"
+  name: "Nickelodeon Rugrats in Paris - The Movie"
+  saveName: "Nickelodeon Rugrats in Paris - The Movie (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -115928,7 +121858,8 @@ SLES-03342:
     multitap: false
     linkCable: false
 SLUS-01116:
-  name: "Nickelodeon Rugrats in Paris - The Movie (USA)"
+  name: "Nickelodeon Rugrats in Paris - The Movie"
+  saveName: "Nickelodeon Rugrats in Paris - The Movie (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -115946,7 +121877,8 @@ SLUS-01116:
     multitap: false
     linkCable: false
 SLES-03704:
-  name: "Nickelodeon SpongeBob SquarePants - SuperSponge (Europe)"
+  name: "Nickelodeon SpongeBob SquarePants - SuperSponge"
+  saveName: "Nickelodeon SpongeBob SquarePants - SuperSponge (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -115965,7 +121897,8 @@ SLES-03704:
     multitap: false
     linkCable: false
 SLUS-01352:
-  name: "Nickelodeon SpongeBob SquarePants - SuperSponge (USA)"
+  name: "Nickelodeon SpongeBob SquarePants - SuperSponge"
+  saveName: "Nickelodeon SpongeBob SquarePants - SuperSponge (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -115987,7 +121920,8 @@ SLUS-01352:
     multitap: false
     linkCable: false
 SLES-03153:
-  name: "Nicktoons Racing (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Nicktoons Racing"
+  saveName: "Nicktoons Racing (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116012,7 +121946,8 @@ SLES-03153:
     multitap: false
     linkCable: false
 SLUS-01047:
-  name: "Nicktoons Racing (USA)"
+  name: "Nicktoons Racing"
+  saveName: "Nicktoons Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -116035,7 +121970,8 @@ SLUS-01047:
     multitap: false
     linkCable: false
 SLPS-00111:
-  name: "Night Head - The Labyrinth (Japan)"
+  name: "Night Head - The Labyrinth"
+  saveName: "Night Head - The Labyrinth (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116053,7 +121989,8 @@ SLPS-00111:
     multitap: false
     linkCable: false
 SLPM-87048:
-  name: "Night Raid (Japan)"
+  name: "Night Raid"
+  saveName: "Night Raid (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -116075,7 +122012,8 @@ SLPM-87048:
     multitap: false
     linkCable: false
 SLPS-00050:
-  name: "Night Striker (Japan)"
+  name: "Night Striker"
+  saveName: "Night Striker (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -116095,7 +122033,8 @@ SLPS-00050:
     multitap: false
     linkCable: false
 SCES-00582:
-  name: "Nightmare Creatures (Europe)"
+  name: "Nightmare Creatures"
+  saveName: "Nightmare Creatures (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116117,7 +122056,8 @@ SCES-00582:
     multitap: false
     linkCable: false
 SCES-00684:
-  name: "Nightmare Creatures (Germany)"
+  name: "Nightmare Creatures"
+  saveName: "Nightmare Creatures (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116139,7 +122079,8 @@ SCES-00684:
     multitap: false
     linkCable: false
 SIPS-60027:
-  name: "Nightmare Creatures (Japan)"
+  name: "Nightmare Creatures"
+  saveName: "Nightmare Creatures (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116161,14 +122102,16 @@ SIPS-60027:
     multitap: false
     linkCable: false
 PCPX-96101:
-  name: "Nightmare Creatures (Japan) (Demo)"
+  name: "Nightmare Creatures (Demo)"
+  saveName: "Nightmare Creatures (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceRecompilerICache # Crappy CD code on boot is timing sensitive.
     - ForceFullBoot # Full boot improves reliability.
 SLUS-00582:
-  name: "Nightmare Creatures (USA)"
+  name: "Nightmare Creatures"
+  saveName: "Nightmare Creatures (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -116193,14 +122136,16 @@ SLUS-00582:
     multitap: false
     linkCable: false
 SLUS-90011:
-  name: "Nightmare Creatures (USA) (Demo)"
+  name: "Nightmare Creatures (Demo)"
+  saveName: "Nightmare Creatures (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceRecompilerICache # Crappy CD code on boot is timing sensitive.
     - ForceFullBoot # Full boot improves reliability.
 SLES-02751:
-  name: "Nightmare Creatures II (Europe) (En,Fr,De)"
+  name: "Nightmare Creatures II"
+  saveName: "Nightmare Creatures II (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116223,7 +122168,8 @@ SLES-02751:
     multitap: false
     linkCable: false
 SLUS-01112:
-  name: "Nightmare Creatures II (USA)"
+  name: "Nightmare Creatures II"
+  saveName: "Nightmare Creatures II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -116247,7 +122193,8 @@ SLUS-01112:
     multitap: false
     linkCable: false
 SLPS-01045:
-  name: "Nightmare Project - Yakata (Japan) (Disc 1)"
+  name: "Nightmare Project - Yakata (Disc 1)"
+  saveName: "Nightmare Project - Yakata (Japan) (Disc 1)"
   discSet:
     name: "Nightmare Project - Yakata (Japan)"
     serials:
@@ -116271,7 +122218,8 @@ SLPS-01045:
     multitap: false
     linkCable: false
 SLPS-01046:
-  name: "Nightmare Project - Yakata (Japan) (Disc 2)"
+  name: "Nightmare Project - Yakata (Disc 2)"
+  saveName: "Nightmare Project - Yakata (Japan) (Disc 2)"
   discSet:
     name: "Nightmare Project - Yakata (Japan)"
     serials:
@@ -116295,7 +122243,8 @@ SLPS-01046:
     multitap: false
     linkCable: false
 SLPS-01047:
-  name: "Nightmare Project - Yakata (Japan) (Disc 3)"
+  name: "Nightmare Project - Yakata (Disc 3)"
+  saveName: "Nightmare Project - Yakata (Japan) (Disc 3)"
   discSet:
     name: "Nightmare Project - Yakata (Japan)"
     serials:
@@ -116319,7 +122268,8 @@ SLPS-01047:
     multitap: false
     linkCable: false
 SLPS-00561:
-  name: "Nightruth - Explanation of the Paranormal - 'Yami no Tobira' (Japan)"
+  name: "Nightruth - Explanation of the Paranormal - 'Yami no Tobira'"
+  saveName: "Nightruth - Explanation of the Paranormal - 'Yami no Tobira' (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116337,7 +122287,8 @@ SLPS-00561:
     multitap: false
     linkCable: false
 SLPS-01667:
-  name: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle (Japan)"
+  name: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle"
+  saveName: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -116358,11 +122309,13 @@ SLPS-01667:
     multitap: true
     linkCable: false
 SLPM-80086:
-  name: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle (Japan) (Demo)"
+  name: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle (Demo)"
+  saveName: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00793:
-  name: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi (Japan)"
+  name: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi"
+  saveName: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116380,7 +122333,8 @@ SLPS-00793:
     multitap: false
     linkCable: false
 SLPS-03128:
-  name: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi 2 (Japan)"
+  name: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi 2"
+  saveName: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116398,7 +122352,8 @@ SLPS-03128:
     multitap: false
     linkCable: false
 SLPS-01653:
-  name: "Nihon Pro Mahjong Renmei Kounin - Honkaku Pro Mahjong - Shin Tetsuman (Japan)"
+  name: "Nihon Pro Mahjong Renmei Kounin - Honkaku Pro Mahjong - Shin Tetsuman"
+  saveName: "Nihon Pro Mahjong Renmei Kounin - Honkaku Pro Mahjong - Shin Tetsuman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116420,7 +122375,8 @@ SLPS-01653:
     multitap: false
     linkCable: false
 SLPS-01826:
-  name: "Nihon Pro Mahjong Renmei Kounin - Tehodoki Mahjong Nyuumon-hen (Japan)"
+  name: "Nihon Pro Mahjong Renmei Kounin - Tehodoki Mahjong Nyuumon-hen"
+  saveName: "Nihon Pro Mahjong Renmei Kounin - Tehodoki Mahjong Nyuumon-hen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -116441,7 +122397,8 @@ SLPS-01826:
     multitap: false
     linkCable: false
 SLPM-86575:
-  name: "Nihon Sumou Kyoukai Kounin - Nihon Oozumou (Japan)"
+  name: "Nihon Sumou Kyoukai Kounin - Nihon Oozumou"
+  saveName: "Nihon Sumou Kyoukai Kounin - Nihon Oozumou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116460,7 +122417,8 @@ SLPM-86575:
     multitap: false
     linkCable: false
 SLPM-87039:
-  name: "Nijiiro Dodgeball - Otome-tachi no Seishun (Japan)"
+  name: "Nijiiro Dodgeball - Otome-tachi no Seishun"
+  saveName: "Nijiiro Dodgeball - Otome-tachi no Seishun (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116479,7 +122437,8 @@ SLPM-87039:
     multitap: false
     linkCable: false
 SLPS-01506:
-  name: "Nijiiro Twinkle - Guru Guru Daisakusen (Japan)"
+  name: "Nijiiro Twinkle - Guru Guru Daisakusen"
+  saveName: "Nijiiro Twinkle - Guru Guru Daisakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116517,7 +122476,8 @@ SLPS-02971:
     multitap: false
     linkCable: false
 SLPS-02854:
-  name: "Ningyo no Rakuin (Japan)"
+  name: "Ningyo no Rakuin"
+  saveName: "Ningyo no Rakuin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116536,7 +122496,8 @@ SLPS-02854:
     multitap: false
     linkCable: false
 SLES-00757:
-  name: "Ninja - L'Ombre des Tenebres (France)"
+  name: "Ninja - L'Ombre des Tenebres"
+  saveName: "Ninja - L'Ombre des Tenebres (France)"
   controllers:
     - DigitalController
   metadata:
@@ -116554,7 +122515,8 @@ SLES-00757:
     multitap: false
     linkCable: false
 SLES-01554:
-  name: "Ninja - Shadow of Darkness (Europe)"
+  name: "Ninja - Shadow of Darkness"
+  saveName: "Ninja - Shadow of Darkness (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -116572,7 +122534,8 @@ SLES-01554:
     multitap: false
     linkCable: false
 SLES-00076:
-  name: "Ninja - Shadow of Darkness (Europe) (Beta)"
+  name: "Ninja - Shadow of Darkness (Beta)"
+  saveName: "Ninja - Shadow of Darkness (Europe) (Beta)"
   controllers:
     - DigitalController
   metadata:
@@ -116590,15 +122553,18 @@ SLES-00076:
     multitap: true
     linkCable: false
 SLED-01413:
-  name: "Ninja - Shadow of Darkness (Europe) (Demo 1)"
+  name: "Ninja - Shadow of Darkness (Demo 1)"
+  saveName: "Ninja - Shadow of Darkness (Europe) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLED-01414:
-  name: "Ninja - Shadow of Darkness (Europe) (Demo 2)"
+  name: "Ninja - Shadow of Darkness (Demo 2)"
+  saveName: "Ninja - Shadow of Darkness (Europe) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLES-00756:
-  name: "Ninja - Shadow of Darkness (Europe) (Es,It)"
+  name: "Ninja - Shadow of Darkness"
+  saveName: "Ninja - Shadow of Darkness (Europe) (Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -116617,7 +122583,8 @@ SLES-00756:
     multitap: false
     linkCable: false
 SLES-00758:
-  name: "Ninja - Shadow of Darkness (Germany)"
+  name: "Ninja - Shadow of Darkness"
+  saveName: "Ninja - Shadow of Darkness (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -116635,7 +122602,8 @@ SLES-00758:
     multitap: false
     linkCable: false
 SLUS-00435:
-  name: "Ninja - Shadow of Darkness (USA)"
+  name: "Ninja - Shadow of Darkness"
+  saveName: "Ninja - Shadow of Darkness (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -116656,7 +122624,8 @@ SLUS-00435:
     multitap: false
     linkCable: false
 SLPS-00494:
-  name: "Ninja Jajamaru-kun - Onigiri Ninpouchou (Japan)"
+  name: "Ninja Jajamaru-kun - Onigiri Ninpouchou"
+  saveName: "Ninja Jajamaru-kun - Onigiri Ninpouchou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116674,7 +122643,8 @@ SLPS-00494:
     multitap: false
     linkCable: false
 SLPS-00172:
-  name: "Ninkuu (Japan)"
+  name: "Ninkuu"
+  saveName: "Ninkuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116692,7 +122662,8 @@ SLPS-00172:
     multitap: false
     linkCable: false
 SLPS-03493:
-  name: "Ninpuu Sentai Hurricanger (Japan)"
+  name: "Ninpuu Sentai Hurricanger"
+  saveName: "Ninpuu Sentai Hurricanger (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116711,7 +122682,8 @@ SLPS-03493:
     multitap: false
     linkCable: false
 SLPS-01757:
-  name: "Ninteiou - Zen Nihon Tsume Shougi Renmei Kaichou Okada Toshi no Tsume Shougi Kyoushitsu (Japan)"
+  name: "Ninteiou - Zen Nihon Tsume Shougi Renmei Kaichou Okada Toshi no Tsume Shougi Kyoushitsu"
+  saveName: "Ninteiou - Zen Nihon Tsume Shougi Renmei Kaichou Okada Toshi no Tsume Shougi Kyoushitsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116747,7 +122719,8 @@ SLPS-00658:
     multitap: true
     linkCable: false
 SLPM-86917:
-  name: "Nippon Ichi Mahjong - Souryuu (Japan) (Major Wave)"
+  name: "Nippon Ichi Mahjong - Souryuu (Major Wave)"
+  saveName: "Nippon Ichi Mahjong - Souryuu (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -116820,7 +122793,8 @@ SLPM-86846:
     multitap: false
     linkCable: false
 SLPS-02175:
-  name: "Nishijin Pachinko Tengoku EX (Japan)"
+  name: "Nishijin Pachinko Tengoku EX"
+  saveName: "Nishijin Pachinko Tengoku EX (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116839,7 +122813,8 @@ SLPS-02175:
     multitap: false
     linkCable: false
 SLPS-00614:
-  name: "Nishijin Pachinko Tengoku Vol. 1 (Japan)"
+  name: "Nishijin Pachinko Tengoku Vol. 1"
+  saveName: "Nishijin Pachinko Tengoku Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116857,7 +122832,8 @@ SLPS-00614:
     multitap: false
     linkCable: false
 SLPS-00886:
-  name: "Nishijin Pachinko Tengoku Vol. 2 (Japan)"
+  name: "Nishijin Pachinko Tengoku Vol. 2"
+  saveName: "Nishijin Pachinko Tengoku Vol. 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116875,7 +122851,8 @@ SLPS-00886:
     multitap: false
     linkCable: false
 SLPS-01761:
-  name: "Nishijin Pachinko Tengoku Vol. 3 (Japan)"
+  name: "Nishijin Pachinko Tengoku Vol. 3"
+  saveName: "Nishijin Pachinko Tengoku Vol. 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116894,7 +122871,8 @@ SLPS-01761:
     multitap: false
     linkCable: false
 SLPS-03268:
-  name: "Nishijin Pachinko Tettei Kouryaku - CR Hanaman Sokuhou & CR Obake Land (Japan)"
+  name: "Nishijin Pachinko Tettei Kouryaku - CR Hanaman Sokuhou & CR Obake Land"
+  saveName: "Nishijin Pachinko Tettei Kouryaku - CR Hanaman Sokuhou & CR Obake Land (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -116912,7 +122890,8 @@ SLPS-03268:
     multitap: false
     linkCable: false
 SLPS-01024:
-  name: "Nissan Presents - Over Drivin' - Skyline Memorial (Japan)"
+  name: "Nissan Presents - Over Drivin' - Skyline Memorial"
+  saveName: "Nissan Presents - Over Drivin' - Skyline Memorial (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -116931,11 +122910,13 @@ SLPS-01024:
     multitap: false
     linkCable: false
 SLPM-80160:
-  name: "Nissan Presents - Over Drivin' - Skyline Memorial (Japan) (Demo)"
+  name: "Nissan Presents - Over Drivin' - Skyline Memorial (Demo)"
+  saveName: "Nissan Presents - Over Drivin' - Skyline Memorial (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01000:
-  name: "No Fear Downhill Mountain Bike Racing (USA)"
+  name: "No Fear Downhill Mountain Bike Racing"
+  saveName: "No Fear Downhill Mountain Bike Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -116958,11 +122939,13 @@ SLUS-01000:
     multitap: false
     linkCable: false
 SLED-02450:
-  name: "No Fear Downhill Mountain Biking (Europe) (Demo)"
+  name: "No Fear Downhill Mountain Biking (Demo)"
+  saveName: "No Fear Downhill Mountain Biking (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00849:
-  name: "No Fear Downhill Mountain Biking (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "No Fear Downhill Mountain Biking"
+  saveName: "No Fear Downhill Mountain Biking (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -116987,7 +122970,8 @@ SLES-00849:
     multitap: false
     linkCable: false
 SLES-01354:
-  name: "No One Can Stop Mr. Domino (Europe)"
+  name: "No One Can Stop Mr. Domino"
+  saveName: "No One Can Stop Mr. Domino (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -117005,7 +122989,8 @@ SLES-01354:
     multitap: false
     linkCable: false
 SLUS-00804:
-  name: "No One Can Stop Mr. Domino (USA)"
+  name: "No One Can Stop Mr. Domino"
+  saveName: "No One Can Stop Mr. Domino (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -117023,7 +123008,8 @@ SLUS-00804:
     multitap: false
     linkCable: false
 SLUS-80804:
-  name: "No One Can Stop Mr. Domino (USA) (Demo)"
+  name: "No One Can Stop Mr. Domino (Demo)"
+  saveName: "No One Can Stop Mr. Domino (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00265:
@@ -117045,7 +123031,8 @@ SLPS-00265:
     multitap: false
     linkCable: false
 SLPS-00493:
-  name: "No-appointment Gals Olympos - Apo Nashi Gals Olympos (Japan)"
+  name: "No-appointment Gals Olympos - Apo Nashi Gals Olympos"
+  saveName: "No-appointment Gals Olympos - Apo Nashi Gals Olympos (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117063,7 +123050,8 @@ SLPS-00493:
     multitap: false
     linkCable: false
 SLPS-00862:
-  name: "Nobunaga Hiroku - Geten no Yume (Japan)"
+  name: "Nobunaga Hiroku - Geten no Yume"
+  saveName: "Nobunaga Hiroku - Geten no Yume (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117117,7 +123105,8 @@ SLPM-86152:
     multitap: false
     linkCable: false
 SLPS-00337:
-  name: "Nobunaga Shippuuki - Kirameki (Japan)"
+  name: "Nobunaga Shippuuki - Kirameki"
+  saveName: "Nobunaga Shippuuki - Kirameki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117154,7 +123143,8 @@ SLPM-86174:
     multitap: false
     linkCable: false
 SLPM-86604:
-  name: "Nobunaga no Yabou - Bushou Fuuunroku (Japan)"
+  name: "Nobunaga no Yabou - Bushou Fuuunroku"
+  saveName: "Nobunaga no Yabou - Bushou Fuuunroku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117173,7 +123163,8 @@ SLPM-86604:
     multitap: false
     linkCable: false
 SLPM-86992:
-  name: "Nobunaga no Yabou - Haouden (Japan)"
+  name: "Nobunaga no Yabou - Haouden"
+  saveName: "Nobunaga no Yabou - Haouden (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -117195,7 +123186,8 @@ SLPM-86992:
     multitap: false
     linkCable: false
 SLPM-86300:
-  name: "Nobunaga no Yabou - Reppuuden (Japan)"
+  name: "Nobunaga no Yabou - Reppuuden"
+  saveName: "Nobunaga no Yabou - Reppuuden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117252,7 +123244,8 @@ SLPM-87320:
     multitap: false
     linkCable: false
 SLPM-86483:
-  name: "Nobunaga no Yabou - Reppuuden with Power-Up Kit (Japan) (Rev 1)"
+  name: "Nobunaga no Yabou - Reppuuden with Power-Up Kit"
+  saveName: "Nobunaga no Yabou - Reppuuden with Power-Up Kit (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117271,7 +123264,8 @@ SLPM-86483:
     multitap: false
     linkCable: false
 SLPS-00423:
-  name: "Nobunaga no Yabou - Returns (Japan)"
+  name: "Nobunaga no Yabou - Returns"
+  saveName: "Nobunaga no Yabou - Returns (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117307,7 +123301,8 @@ SLPM-86169:
     multitap: false
     linkCable: false
 SLPS-01247:
-  name: "Nobunaga no Yabou - Sengoku Gunyuuden (Japan)"
+  name: "Nobunaga no Yabou - Sengoku Gunyuuden"
+  saveName: "Nobunaga no Yabou - Sengoku Gunyuuden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117343,7 +123338,8 @@ SLPM-86606:
     multitap: false
     linkCable: false
 SLPS-01115:
-  name: "Nobunaga no Yabou - Shouseiroku (Japan)"
+  name: "Nobunaga no Yabou - Shouseiroku"
+  saveName: "Nobunaga no Yabou - Shouseiroku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117361,7 +123357,8 @@ SLPS-01115:
     multitap: false
     linkCable: false
 SLPM-86376:
-  name: "Nobunaga no Yabou - Shouseiroku (Japan) (Rev 1)"
+  name: "Nobunaga no Yabou - Shouseiroku"
+  saveName: "Nobunaga no Yabou - Shouseiroku (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117434,7 +123431,8 @@ SLPM-86286:
     multitap: false
     linkCable: false
 SLPS-00319:
-  name: "Nobunaga no Yabou - Tenshouki (Japan)"
+  name: "Nobunaga no Yabou - Tenshouki"
+  saveName: "Nobunaga no Yabou - Tenshouki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117452,7 +123450,8 @@ SLPS-00319:
     multitap: false
     linkCable: false
 SLPS-00980:
-  name: "Nobunaga no Yabou - Tenshouki with Power-Up Kit (Japan)"
+  name: "Nobunaga no Yabou - Tenshouki with Power-Up Kit"
+  saveName: "Nobunaga no Yabou - Tenshouki with Power-Up Kit (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117488,7 +123487,8 @@ SLPS-01210:
     multitap: false
     linkCable: false
 SLPM-86605:
-  name: "Nobunaga no Yabou - Zenkokuban (Japan)"
+  name: "Nobunaga no Yabou - Zenkokuban"
+  saveName: "Nobunaga no Yabou - Zenkokuban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117506,7 +123506,8 @@ SLPM-86605:
     multitap: false
     linkCable: false
 SLES-03529:
-  name: "Noddy - Una Aventura Magica (Spain)"
+  name: "Noddy - Una Aventura Magica"
+  saveName: "Noddy - Una Aventura Magica (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117525,7 +123526,8 @@ SLES-03529:
     multitap: false
     linkCable: false
 SLES-02878:
-  name: "Noddy's Magic Adventure (Europe) (En,Fr)"
+  name: "Noddy's Magic Adventure"
+  saveName: "Noddy's Magic Adventure (Europe) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117545,7 +123547,8 @@ SLES-02878:
     multitap: false
     linkCable: false
 SLPM-86063:
-  name: "Noon (Japan)"
+  name: "Noon"
+  saveName: "Noon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117563,7 +123566,8 @@ SLPM-86063:
     multitap: true
     linkCable: false
 SLUS-00466:
-  name: "Norse by Norsewest - The Return of the Lost Vikings (USA)"
+  name: "Norse by Norsewest - The Return of the Lost Vikings"
+  saveName: "Norse by Norsewest - The Return of the Lost Vikings (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -117581,7 +123585,8 @@ SLUS-00466:
     multitap: false
     linkCable: false
 SLPS-00274:
-  name: "Not Treasure Hunter (Japan)"
+  name: "Not Treasure Hunter"
+  saveName: "Not Treasure Hunter (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117599,7 +123604,8 @@ SLPS-00274:
     multitap: false
     linkCable: false
 SLES-00749:
-  name: "Note, The (Europe) (En,Fr,De,Es,It)"
+  name: "Note, The"
+  saveName: "Note, The (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -117621,7 +123627,8 @@ SLES-00749:
     multitap: false
     linkCable: false
 SCES-00011:
-  name: "Novastorm (Europe) (Disc 1)"
+  name: "Novastorm (Disc 1)"
+  saveName: "Novastorm (Europe) (Disc 1)"
   discSet:
     name: "Novastorm (Europe)"
     serials:
@@ -117644,7 +123651,8 @@ SCES-00011:
     multitap: false
     linkCable: false
 SCES-10011:
-  name: "Novastorm (Europe) (Disc 2)"
+  name: "Novastorm (Disc 2)"
+  saveName: "Novastorm (Europe) (Disc 2)"
   discSet:
     name: "Novastorm (Europe)"
     serials:
@@ -117667,7 +123675,8 @@ SCES-10011:
     multitap: false
     linkCable: false
 SLPS-00314:
-  name: "Novastorm (Japan) (Disc 1)"
+  name: "Novastorm (Disc 1)"
+  saveName: "Novastorm (Japan) (Disc 1)"
   discSet:
     name: "Novastorm (Japan)"
     serials:
@@ -117690,7 +123699,8 @@ SLPS-00314:
     multitap: false
     linkCable: false
 SLPS-00315:
-  name: "Novastorm (Japan) (Disc 2)"
+  name: "Novastorm (Disc 2)"
+  saveName: "Novastorm (Japan) (Disc 2)"
   discSet:
     name: "Novastorm (Japan)"
     serials:
@@ -117713,7 +123723,8 @@ SLPS-00315:
     multitap: false
     linkCable: false
 SCUS-94404:
-  name: "Novastorm (USA) (Disc 1)"
+  name: "Novastorm (Disc 1)"
+  saveName: "Novastorm (USA) (Disc 1)"
   discSet:
     name: "Novastorm (USA)"
     serials:
@@ -117736,7 +123747,8 @@ SCUS-94404:
     multitap: false
     linkCable: false
 SCUS-94407:
-  name: "Novastorm (USA) (Disc 2)"
+  name: "Novastorm (Disc 2)"
+  saveName: "Novastorm (USA) (Disc 2)"
   discSet:
     name: "Novastorm (USA)"
     serials:
@@ -117759,7 +123771,8 @@ SCUS-94407:
     multitap: false
     linkCable: false
 SLPS-02009:
-  name: "Novels - Game Center Arashi R (Japan)"
+  name: "Novels - Game Center Arashi R"
+  saveName: "Novels - Game Center Arashi R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117778,7 +123791,8 @@ SLPS-02009:
     multitap: false
     linkCable: false
 SLPS-00294:
-  name: "NuPa - Numeric Paint Puzzle (Japan)"
+  name: "NuPa - Numeric Paint Puzzle"
+  saveName: "NuPa - Numeric Paint Puzzle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117796,7 +123810,8 @@ SLPS-00294:
     multitap: false
     linkCable: false
 SLES-00919:
-  name: "Nuclear Strike (Europe)"
+  name: "Nuclear Strike"
+  saveName: "Nuclear Strike (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -117814,7 +123829,8 @@ SLES-00919:
     multitap: false
     linkCable: false
 SLES-00920:
-  name: "Nuclear Strike (France)"
+  name: "Nuclear Strike"
+  saveName: "Nuclear Strike (France)"
   controllers:
     - DigitalController
   metadata:
@@ -117832,7 +123848,8 @@ SLES-00920:
     multitap: false
     linkCable: false
 SLES-00921:
-  name: "Nuclear Strike (Germany)"
+  name: "Nuclear Strike"
+  saveName: "Nuclear Strike (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -117850,7 +123867,8 @@ SLES-00921:
     multitap: false
     linkCable: false
 SLUS-00518:
-  name: "Nuclear Strike (USA)"
+  name: "Nuclear Strike"
+  saveName: "Nuclear Strike (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -117868,14 +123886,16 @@ SLUS-00518:
     multitap: false
     linkCable: false
 SLUS-80518:
-  name: "Nuclear Strike (USA) (Demo)"
+  name: "Nuclear Strike (Demo)"
+  saveName: "Nuclear Strike (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
     - SLUS-80518
     - SLUS-90006
 SLPM-86880:
-  name: "Nukumori no Naka de - In the Warmth (Japan)"
+  name: "Nukumori no Naka de - In the Warmth"
+  saveName: "Nukumori no Naka de - In the Warmth (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117893,7 +123913,8 @@ SLPM-86880:
     multitap: false
     linkCable: false
 SLPS-01939:
-  name: "Nurse Story (Japan)"
+  name: "Nurse Story"
+  saveName: "Nurse Story (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -117930,7 +123951,8 @@ SLPS-03223:
     multitap: false
     linkCable: false
 SLPS-00442:
-  name: "Nyan to Wonderful (Japan)"
+  name: "Nyan to Wonderful"
+  saveName: "Nyan to Wonderful (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -117951,7 +123973,8 @@ SLPS-00442:
     multitap: false
     linkCable: false
 SLES-01391:
-  name: "O.D.T. (Europe)"
+  name: "O.D.T."
+  saveName: "O.D.T. (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117970,7 +123993,8 @@ SLES-01391:
     multitap: false
     linkCable: false
 SLES-01409:
-  name: "O.D.T. (France)"
+  name: "O.D.T."
+  saveName: "O.D.T. (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -117989,11 +124013,13 @@ SLES-01409:
     multitap: false
     linkCable: false
 SLED-01574:
-  name: "O.D.T. (France) (Demo)"
+  name: "O.D.T. (Demo)"
+  saveName: "O.D.T. (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01410:
-  name: "O.D.T. (Germany)"
+  name: "O.D.T."
+  saveName: "O.D.T. (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -118012,11 +124038,13 @@ SLES-01410:
     multitap: false
     linkCable: false
 SLED-01575:
-  name: "O.D.T. (Germany) (Demo)"
+  name: "O.D.T. (Demo)"
+  saveName: "O.D.T. (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01411:
-  name: "O.D.T. (Italy)"
+  name: "O.D.T."
+  saveName: "O.D.T. (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -118035,7 +124063,8 @@ SLES-01411:
     multitap: false
     linkCable: false
 SLES-01412:
-  name: "O.D.T. (Spain)"
+  name: "O.D.T."
+  saveName: "O.D.T. (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -118054,7 +124083,8 @@ SLES-01412:
     multitap: false
     linkCable: false
 SLUS-00698:
-  name: "O.D.T. (USA)"
+  name: "O.D.T."
+  saveName: "O.D.T. (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -118073,23 +124103,28 @@ SLUS-00698:
     multitap: false
     linkCable: false
 SLUS-90043:
-  name: "O.D.T. (USA) (Demo)"
+  name: "O.D.T. (Demo)"
+  saveName: "O.D.T. (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-02851:
-  name: "OPSM Best Ever Ever Games Demo (Europe)"
+  name: "OPSM Best Ever Ever Games Demo"
+  saveName: "OPSM Best Ever Ever Games Demo (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03239:
-  name: "OPSM Best PS One Games Ever (Europe, Australia)"
+  name: "OPSM Best PS One Games Ever"
+  saveName: "OPSM Best PS One Games Ever (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SCED-02492:
-  name: "OPSM Best Racing Game Ever (Europe)"
+  name: "OPSM Best Racing Game Ever"
+  saveName: "OPSM Best Racing Game Ever (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-01899:
-  name: "Oasis Road (Japan)"
+  name: "Oasis Road"
+  saveName: "Oasis Road (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -118108,7 +124143,8 @@ SLPS-01899:
     multitap: false
     linkCable: false
 SLPM-86681:
-  name: "Ocha no Ma Battle (Japan)"
+  name: "Ocha no Ma Battle"
+  saveName: "Ocha no Ma Battle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -118144,7 +124180,8 @@ SLPS-00345:
     multitap: false
     linkCable: false
 SLPM-86337:
-  name: "Oda Nobunaga Den (Japan)"
+  name: "Oda Nobunaga Den"
+  saveName: "Oda Nobunaga Den (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -118183,7 +124220,8 @@ SLPM-87042:
     multitap: false
     linkCable: false
 SLES-01480:
-  name: "Oddworld - Abe's Exoddus (Europe) (Disc 1)"
+  name: "Oddworld - Abe's Exoddus (Disc 1)"
+  saveName: "Oddworld - Abe's Exoddus (Europe) (Disc 1)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Europe)"
     serials:
@@ -118208,7 +124246,8 @@ SLES-01480:
     multitap: false
     linkCable: false
 SLES-11480:
-  name: "Oddworld - Abe's Exoddus (Europe) (Disc 2)"
+  name: "Oddworld - Abe's Exoddus (Disc 2)"
+  saveName: "Oddworld - Abe's Exoddus (Europe) (Disc 2)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Europe)"
     serials:
@@ -118233,7 +124272,8 @@ SLES-11480:
     multitap: false
     linkCable: false
 SLES-01503:
-  name: "Oddworld - Abe's Exoddus (Germany) (Disc 1)"
+  name: "Oddworld - Abe's Exoddus (Disc 1)"
+  saveName: "Oddworld - Abe's Exoddus (Germany) (Disc 1)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Germany)"
     serials:
@@ -118256,7 +124296,8 @@ SLES-01503:
     multitap: false
     linkCable: false
 SLES-11503:
-  name: "Oddworld - Abe's Exoddus (Germany) (Disc 2)"
+  name: "Oddworld - Abe's Exoddus (Disc 2)"
+  saveName: "Oddworld - Abe's Exoddus (Germany) (Disc 2)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Germany)"
     serials:
@@ -118279,7 +124320,8 @@ SLES-11503:
     multitap: false
     linkCable: false
 SLES-01504:
-  name: "Oddworld - Abe's Exoddus (Italy) (Disc 1)"
+  name: "Oddworld - Abe's Exoddus (Disc 1)"
+  saveName: "Oddworld - Abe's Exoddus (Italy) (Disc 1)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Italy)"
     serials:
@@ -118302,7 +124344,8 @@ SLES-01504:
     multitap: false
     linkCable: false
 SLES-11504:
-  name: "Oddworld - Abe's Exoddus (Italy) (Disc 2)"
+  name: "Oddworld - Abe's Exoddus (Disc 2)"
+  saveName: "Oddworld - Abe's Exoddus (Italy) (Disc 2)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Italy)"
     serials:
@@ -118325,7 +124368,8 @@ SLES-11504:
     multitap: false
     linkCable: false
 SLES-01505:
-  name: "Oddworld - Abe's Exoddus (Spain) (Disc 1)"
+  name: "Oddworld - Abe's Exoddus (Disc 1)"
+  saveName: "Oddworld - Abe's Exoddus (Spain) (Disc 1)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Spain)"
     serials:
@@ -118351,7 +124395,8 @@ SLES-01505:
     multitap: false
     linkCable: false
 SLES-11505:
-  name: "Oddworld - Abe's Exoddus (Spain) (Disc 2)"
+  name: "Oddworld - Abe's Exoddus (Disc 2)"
+  saveName: "Oddworld - Abe's Exoddus (Spain) (Disc 2)"
   discSet:
     name: "Oddworld - Abe's Exoddus (Spain)"
     serials:
@@ -118377,7 +124422,8 @@ SLES-11505:
     multitap: false
     linkCable: false
 SLUS-00710:
-  name: "Oddworld - Abe's Exoddus (USA) (Disc 1)"
+  name: "Oddworld - Abe's Exoddus (Disc 1)"
+  saveName: "Oddworld - Abe's Exoddus (USA) (Disc 1)"
   discSet:
     name: "Oddworld - Abe's Exoddus (USA)"
     serials:
@@ -118404,7 +124450,8 @@ SLUS-00710:
     multitap: false
     linkCable: false
 SLUS-00731:
-  name: "Oddworld - Abe's Exoddus (USA) (Disc 2)"
+  name: "Oddworld - Abe's Exoddus (Disc 2)"
+  saveName: "Oddworld - Abe's Exoddus (USA) (Disc 2)"
   discSet:
     name: "Oddworld - Abe's Exoddus (USA)"
     serials:
@@ -118427,13 +124474,16 @@ SLUS-00731:
     multitap: false
     linkCable: false
 SLED-01608:
-  name: "Oddworld - Abe's Exoddus + Duke Nukem - Time To Kill + B-Movie (Europe) (Demo)"
+  name: "Oddworld - Abe's Exoddus + Duke Nukem - Time To Kill + B-Movie (Demo)"
+  saveName: "Oddworld - Abe's Exoddus + Duke Nukem - Time To Kill + B-Movie (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-01655:
-  name: "Oddworld - Abe's Exoddus + Duke Nukem - Time to Kill + Duke Nukem - 3D (France) (En,Fr)"
+  name: "Oddworld - Abe's Exoddus + Duke Nukem - Time to Kill + Duke Nukem - 3D"
+  saveName: "Oddworld - Abe's Exoddus + Duke Nukem - Time to Kill + Duke Nukem - 3D (France) (En,Fr)"
 SLES-00664:
-  name: "Oddworld - Abe's Oddysee (Europe)"
+  name: "Oddworld - Abe's Oddysee"
+  saveName: "Oddworld - Abe's Oddysee (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -118454,11 +124504,13 @@ SLES-00664:
     multitap: false
     linkCable: false
 SLED-00725:
-  name: "Oddworld - Abe's Oddysee (Europe) (Demo)"
+  name: "Oddworld - Abe's Oddysee (Demo)"
+  saveName: "Oddworld - Abe's Oddysee (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00839:
-  name: "Oddworld - Abe's Oddysee (Germany)"
+  name: "Oddworld - Abe's Oddysee"
+  saveName: "Oddworld - Abe's Oddysee (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -118476,7 +124528,8 @@ SLES-00839:
     multitap: false
     linkCable: false
 SLES-00840:
-  name: "Oddworld - Abe's Oddysee (Italy)"
+  name: "Oddworld - Abe's Oddysee"
+  saveName: "Oddworld - Abe's Oddysee (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -118494,7 +124547,8 @@ SLES-00840:
     multitap: false
     linkCable: false
 SLES-00841:
-  name: "Oddworld - Abe's Oddysee (Spain)"
+  name: "Oddworld - Abe's Oddysee"
+  saveName: "Oddworld - Abe's Oddysee (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -118515,7 +124569,8 @@ SLES-00841:
     multitap: false
     linkCable: false
 SLUS-00190:
-  name: "Oddworld - Abe's Oddysee (USA)"
+  name: "Oddworld - Abe's Oddysee"
+  saveName: "Oddworld - Abe's Oddysee (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1233-ge144392"
@@ -118537,11 +124592,13 @@ SLUS-00190:
     multitap: false
     linkCable: false
 SLUS-90004:
-  name: "Oddworld - Abe's Oddysee (USA) (Demo)"
+  name: "Oddworld - Abe's Oddysee (Demo)"
+  saveName: "Oddworld - Abe's Oddysee (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01502:
-  name: "Oddworld - L'Exode d'Abe (France) (Disc 1)"
+  name: "Oddworld - L'Exode d'Abe (Disc 1)"
+  saveName: "Oddworld - L'Exode d'Abe (France) (Disc 1)"
   discSet:
     name: "Oddworld - L'Exode d'Abe (France)"
     serials:
@@ -118564,7 +124621,8 @@ SLES-01502:
     multitap: false
     linkCable: false
 SLES-11502:
-  name: "Oddworld - L'Exode d'Abe (France) (Disc 2)"
+  name: "Oddworld - L'Exode d'Abe (Disc 2)"
+  saveName: "Oddworld - L'Exode d'Abe (France) (Disc 2)"
   discSet:
     name: "Oddworld - L'Exode d'Abe (France)"
     serials:
@@ -118587,7 +124645,8 @@ SLES-11502:
     multitap: false
     linkCable: false
 SLES-00838:
-  name: "Oddworld - L'Odyssee d'Abe (France)"
+  name: "Oddworld - L'Odyssee d'Abe"
+  saveName: "Oddworld - L'Odyssee d'Abe (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -118608,7 +124667,8 @@ SLES-00838:
     multitap: false
     linkCable: false
 SLPS-00754:
-  name: "Odo Odo Oddity (Japan)"
+  name: "Odo Odo Oddity"
+  saveName: "Odo Odo Oddity (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -118626,7 +124686,8 @@ SLPS-00754:
     multitap: false
     linkCable: false
 SLPS-00462:
-  name: "Oehlins Hyper-Rally (Japan)"
+  name: "Oehlins Hyper-Rally"
+  saveName: "Oehlins Hyper-Rally (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -118645,7 +124706,8 @@ SLPS-00462:
     multitap: false
     linkCable: false
 SLES-00047:
-  name: "Off-World Interceptor Extreme (Europe)"
+  name: "Off-World Interceptor Extreme"
+  saveName: "Off-World Interceptor Extreme (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -118663,7 +124725,8 @@ SLES-00047:
     multitap: false
     linkCable: false
 SLPS-00122:
-  name: "Off-World Interceptor Extreme (Japan)"
+  name: "Off-World Interceptor Extreme"
+  saveName: "Off-World Interceptor Extreme (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -118681,7 +124744,8 @@ SLPS-00122:
     multitap: false
     linkCable: false
 SLUS-00020:
-  name: "Off-World Interceptor Extreme (USA)"
+  name: "Off-World Interceptor Extreme"
+  saveName: "Off-World Interceptor Extreme (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -118699,243 +124763,303 @@ SLUS-00020:
     multitap: false
     linkCable: false
 SCZS-94106:
-  name: "Official Fan Book - Circadia - Special CD-ROM (Japan)"
+  name: "Official Fan Book - Circadia - Special CD-ROM"
+  saveName: "Official Fan Book - Circadia - Special CD-ROM (Japan)"
   metadata:
     genre: "** DEMO **"
 SCED-03375:
-  name: "Official PlayStation Magazine Best Games Ever 2000 (Europe)"
+  name: "Official PlayStation Magazine Best Games Ever 2000"
+  saveName: "Official PlayStation Magazine Best Games Ever 2000 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02122:
-  name: "Official PlayStation Magazine Platinum Special Demo (Europe)"
+  name: "Official PlayStation Magazine Platinum Special Demo"
+  saveName: "Official PlayStation Magazine Platinum Special Demo (Europe)"
   metadata:
     genre: "** DEMO **"
 SCUS-94189:
-  name: "Official U.S. PlayStation Magazine Demo Disc 01 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 01"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 01 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94198:
-  name: "Official U.S. PlayStation Magazine Demo Disc 02 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 02"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 02 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94210:
-  name: "Official U.S. PlayStation Magazine Demo Disc 03 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 03"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 03 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94211:
-  name: "Official U.S. PlayStation Magazine Demo Disc 04 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 04"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 04 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94212:
-  name: "Official U.S. PlayStation Magazine Demo Disc 05 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 05"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 05 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94213:
-  name: "Official U.S. PlayStation Magazine Demo Disc 06 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 06"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 06 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94214:
-  name: "Official U.S. PlayStation Magazine Demo Disc 07 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 07"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 07 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94215:
-  name: "Official U.S. PlayStation Magazine Demo Disc 08 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 08"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 08 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94216:
-  name: "Official U.S. PlayStation Magazine Demo Disc 09 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 09"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 09 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94217:
-  name: "Official U.S. PlayStation Magazine Demo Disc 10 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 10"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 10 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94218:
-  name: "Official U.S. PlayStation Magazine Demo Disc 11 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 11"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 11 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94219:
-  name: "Official U.S. PlayStation Magazine Demo Disc 12 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 12"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 12 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94275:
-  name: "Official U.S. PlayStation Magazine Demo Disc 13 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 13"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 13 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94276:
-  name: "Official U.S. PlayStation Magazine Demo Disc 14 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 14"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 14 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94277:
-  name: "Official U.S. PlayStation Magazine Demo Disc 15 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 15"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 15 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94278:
-  name: "Official U.S. PlayStation Magazine Demo Disc 16 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 16"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 16 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94279:
-  name: "Official U.S. PlayStation Magazine Demo Disc 17 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 17"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 17 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94280:
-  name: "Official U.S. PlayStation Magazine Demo Disc 18 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 18"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 18 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94281:
-  name: "Official U.S. PlayStation Magazine Demo Disc 19 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 19"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 19 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94282:
-  name: "Official U.S. PlayStation Magazine Demo Disc 20 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 20"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 20 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94429:
-  name: "Official U.S. PlayStation Magazine Demo Disc 21 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 21"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 21 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94430:
-  name: "Official U.S. PlayStation Magazine Demo Disc 22 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 22"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 22 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94431:
-  name: "Official U.S. PlayStation Magazine Demo Disc 23 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 23"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 23 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94432:
-  name: "Official U.S. PlayStation Magazine Demo Disc 24 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 24"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 24 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94433:
-  name: "Official U.S. PlayStation Magazine Demo Disc 25 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 25"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 25 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94434:
-  name: "Official U.S. PlayStation Magazine Demo Disc 26 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 26"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 26 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94435:
-  name: "Official U.S. PlayStation Magazine Demo Disc 27 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 27"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 27 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94436:
-  name: "Official U.S. PlayStation Magazine Demo Disc 28 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 28"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 28 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94437:
-  name: "Official U.S. PlayStation Magazine Demo Disc 29 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 29"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 29 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94438:
-  name: "Official U.S. PlayStation Magazine Demo Disc 30 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 30"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 30 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94499:
-  name: "Official U.S. PlayStation Magazine Demo Disc 31 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 31"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 31 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94583:
-  name: "Official U.S. PlayStation Magazine Demo Disc 32 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 32"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 32 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94591:
-  name: "Official U.S. PlayStation Magazine Demo Disc 33 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 33"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 33 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94593:
-  name: "Official U.S. PlayStation Magazine Demo Disc 34 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 34"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 34 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94596:
-  name: "Official U.S. PlayStation Magazine Demo Disc 35 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 35"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 35 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94599:
-  name: "Official U.S. PlayStation Magazine Demo Disc 36 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 36"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 36 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94614:
-  name: "Official U.S. PlayStation Magazine Demo Disc 37 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 37"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 37 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94617:
-  name: "Official U.S. PlayStation Magazine Demo Disc 38 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 38"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 38 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94622:
-  name: "Official U.S. PlayStation Magazine Demo Disc 39 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 39"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 39 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94628:
-  name: "Official U.S. PlayStation Magazine Demo Disc 40 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 40"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 40 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94630:
-  name: "Official U.S. PlayStation Magazine Demo Disc 41 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 41"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 41 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94631:
-  name: "Official U.S. PlayStation Magazine Demo Disc 42 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 42"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 42 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94634:
-  name: "Official U.S. PlayStation Magazine Demo Disc 43 (USA) (EDC)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 43 (EDC)"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 43 (USA) (EDC)"
   metadata:
     genre: "** DEMO **"
 SCUS-94637:
-  name: "Official U.S. PlayStation Magazine Demo Disc 44 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 44"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 44 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94645:
-  name: "Official U.S. PlayStation Magazine Demo Disc 45 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 45"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 45 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94649:
-  name: "Official U.S. PlayStation Magazine Demo Disc 46 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 46"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 46 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94652:
-  name: "Official U.S. PlayStation Magazine Demo Disc 47 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 47"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 47 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94655:
-  name: "Official U.S. PlayStation Magazine Demo Disc 48 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 48"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 48 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94658:
-  name: "Official U.S. PlayStation Magazine Demo Disc 50 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 50"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 50 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94662:
-  name: "Official U.S. PlayStation Magazine Demo Disc 52 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 52"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 52 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94664:
-  name: "Official U.S. PlayStation Magazine Demo Disc 54 (USA)"
+  name: "Official U.S. PlayStation Magazine Demo Disc 54"
+  saveName: "Official U.S. PlayStation Magazine Demo Disc 54 (USA)"
   metadata:
     genre: "** DEMO **"
 SCED-03408:
-  name: "Official UK PlayStation Best Games Ever! (UK)"
+  name: "Official UK PlayStation Best Games Ever!"
+  saveName: "Official UK PlayStation Best Games Ever! (UK)"
   metadata:
     genre: "** DEMO **"
 SCZS-94101:
-  name: "Official Yarudora Fan Book - Double Cast - CD-ROM Special Data-shuu (Japan)"
+  name: "Official Yarudora Fan Book - Double Cast - CD-ROM Special Data-shuu"
+  saveName: "Official Yarudora Fan Book - Double Cast - CD-ROM Special Data-shuu (Japan)"
   metadata:
     genre: "** DEMO **"
 SCZS-94102:
-  name: "Official Yarudora Fan Book - Kisetsu o Dakishimete (Japan)"
+  name: "Official Yarudora Fan Book - Kisetsu o Dakishimete"
+  saveName: "Official Yarudora Fan Book - Kisetsu o Dakishimete (Japan)"
   metadata:
     genre: "** DEMO **"
 SCZS-94103:
-  name: "Official Yarudora Fan Book - Sampaguita (Japan)"
+  name: "Official Yarudora Fan Book - Sampaguita"
+  saveName: "Official Yarudora Fan Book - Sampaguita (Japan)"
   metadata:
     genre: "** DEMO **"
 SCZS-94104:
-  name: "Official Yarudora Fan Book - Yukiwari no Hana - CD-ROM Special Data-shuu (Japan)"
+  name: "Official Yarudora Fan Book - Yukiwari no Hana - CD-ROM Special Data-shuu"
+  saveName: "Official Yarudora Fan Book - Yukiwari no Hana - CD-ROM Special Data-shuu (Japan)"
   metadata:
     genre: "** DEMO **"
 SLUS-00467:
-  name: "Ogre Battle - Limited Edition (USA)"
+  name: "Ogre Battle - Limited Edition"
+  saveName: "Ogre Battle - Limited Edition (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -118956,7 +125080,8 @@ SLUS-00467:
     multitap: false
     linkCable: false
 SLPS-02764:
-  name: "Oh No! (Japan)"
+  name: "Oh No!"
+  saveName: "Oh No! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -118995,7 +125120,8 @@ SCPS-45491:
     multitap: false
     linkCable: false
 SLPS-02680:
-  name: "Oh! Bakyuuun (Japan)"
+  name: "Oh! Bakyuuun"
+  saveName: "Oh! Bakyuuun (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119014,7 +125140,8 @@ SLPS-02680:
     multitap: false
     linkCable: false
 SLPS-00093:
-  name: "Oh-chan no Oekaki Logic (Japan)"
+  name: "Oh-chan no Oekaki Logic"
+  saveName: "Oh-chan no Oekaki Logic (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3919-g4875b2ec"
@@ -119037,7 +125164,8 @@ SLPS-00093:
     multitap: false
     linkCable: false
 SLPS-02145:
-  name: "Oh-chan no Oekaki Logic 2 (Japan) (Rev 1)"
+  name: "Oh-chan no Oekaki Logic 2"
+  saveName: "Oh-chan no Oekaki Logic 2 (Japan) (Rev 1)"
   controllers:
     - DigitalController
   codes:
@@ -119058,7 +125186,8 @@ SLPS-02145:
     multitap: false
     linkCable: false
 SLPS-03134:
-  name: "Oh-chan no Oekaki Logic 3 (Japan)"
+  name: "Oh-chan no Oekaki Logic 3"
+  saveName: "Oh-chan no Oekaki Logic 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119077,7 +125206,8 @@ SLPS-03134:
     multitap: false
     linkCable: false
 SLPM-86603:
-  name: "Oha-Studio Dance Dance Revolution (Japan)"
+  name: "Oha-Studio Dance Dance Revolution"
+  saveName: "Oha-Studio Dance Dance Revolution (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119096,7 +125226,8 @@ SLPM-86603:
     multitap: false
     linkCable: false
 SLPS-03497:
-  name: "Oja Majo DoReMi Dokkan! Nijiiro ParaDice (Japan)"
+  name: "Oja Majo DoReMi Dokkan! Nijiiro ParaDice"
+  saveName: "Oja Majo DoReMi Dokkan! Nijiiro ParaDice (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119115,7 +125246,8 @@ SLPS-03497:
     multitap: false
     linkCable: false
 SLPS-01495:
-  name: "Ojousama Express (Japan) (Disc 1)"
+  name: "Ojousama Express (Disc 1)"
+  saveName: "Ojousama Express (Japan) (Disc 1)"
   discSet:
     name: "Ojousama Express (Japan)"
     serials:
@@ -119139,7 +125271,8 @@ SLPS-01495:
     multitap: false
     linkCable: false
 SLPS-01496:
-  name: "Ojousama Express (Japan) (Disc 2)"
+  name: "Ojousama Express (Disc 2)"
+  saveName: "Ojousama Express (Japan) (Disc 2)"
   discSet:
     name: "Ojousama Express (Japan)"
     serials:
@@ -119163,9 +125296,11 @@ SLPS-01496:
     multitap: false
     linkCable: false
 SLPM-80255:
-  name: "Ojousama Express (Japan) (Taikenban)"
+  name: "Ojousama Express (Taikenban)"
+  saveName: "Ojousama Express (Japan) (Taikenban)"
 SLPS-01524:
-  name: "Okappari-ou (Japan)"
+  name: "Okappari-ou"
+  saveName: "Okappari-ou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119220,7 +125355,8 @@ SLPS-02932:
     multitap: false
     linkCable: false
 SLPS-01386:
-  name: "Olympia, Takasago - Virtua Pachi-Slot III (Japan)"
+  name: "Olympia, Takasago - Virtua Pachi-Slot III"
+  saveName: "Olympia, Takasago - Virtua Pachi-Slot III (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119238,7 +125374,8 @@ SLPS-01386:
     multitap: false
     linkCable: false
 SLPS-00714:
-  name: "Olympia, Yamasa - Virtua Pachi-Slot II - Jissen! Bishoujo Kouryakuhou (Japan)"
+  name: "Olympia, Yamasa - Virtua Pachi-Slot II - Jissen! Bishoujo Kouryakuhou"
+  saveName: "Olympia, Yamasa - Virtua Pachi-Slot II - Jissen! Bishoujo Kouryakuhou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119256,7 +125393,8 @@ SLPS-00714:
     multitap: false
     linkCable: false
 SLES-00110:
-  name: "Olympic Games (Europe) (En,Fr,De,Es,It)"
+  name: "Olympic Games"
+  saveName: "Olympic Games (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -119278,7 +125416,8 @@ SLES-00110:
     multitap: true
     linkCable: false
 SLES-00113:
-  name: "Olympic Soccer (Europe) (En,Fr,De,Es,It)"
+  name: "Olympic Soccer"
+  saveName: "Olympic Soccer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -119300,7 +125439,8 @@ SLES-00113:
     multitap: true
     linkCable: false
 SLPS-00523:
-  name: "Olympic Soccer (Japan)"
+  name: "Olympic Soccer"
+  saveName: "Olympic Soccer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119318,7 +125458,8 @@ SLPS-00523:
     multitap: true
     linkCable: false
 SLUS-00156:
-  name: "Olympic Soccer (USA)"
+  name: "Olympic Soccer"
+  saveName: "Olympic Soccer (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -119336,7 +125477,8 @@ SLUS-00156:
     multitap: true
     linkCable: false
 SLUS-00148:
-  name: "Olympic Summer Games (USA)"
+  name: "Olympic Summer Games"
+  saveName: "Olympic Summer Games (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -119354,7 +125496,8 @@ SLUS-00148:
     multitap: true
     linkCable: false
 SLES-04051:
-  name: "Omega Assault (Europe)"
+  name: "Omega Assault"
+  saveName: "Omega Assault (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119392,7 +125535,8 @@ SCPS-45399:
     multitap: false
     linkCable: false
 SCES-02120:
-  name: "Omega Boost (Europe) (En,Fr,De,Es,It)"
+  name: "Omega Boost"
+  saveName: "Omega Boost (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119415,11 +125559,13 @@ SCES-02120:
     multitap: false
     linkCable: false
 PAPX-90080:
-  name: "Omega Boost (Japan) (Demo)"
+  name: "Omega Boost (Demo)"
+  saveName: "Omega Boost (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10020:
-  name: "Omega Boost (Japan) (En,Ja)"
+  name: "Omega Boost"
+  saveName: "Omega Boost (Japan) (En,Ja)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -119441,7 +125587,8 @@ SCPS-10020:
     multitap: false
     linkCable: false
 SCUS-94449:
-  name: "Omega Boost (USA)"
+  name: "Omega Boost"
+  saveName: "Omega Boost (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2498-gd7de578d"
@@ -119464,7 +125611,8 @@ SCUS-94449:
     multitap: false
     linkCable: false
 SLPM-86439:
-  name: "Omiai Commando - Ba-Couple ni Tsukkomi o (Japan)"
+  name: "Omiai Commando - Ba-Couple ni Tsukkomi o"
+  saveName: "Omiai Commando - Ba-Couple ni Tsukkomi o (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119482,7 +125630,8 @@ SLPM-86439:
     multitap: false
     linkCable: false
 SLPS-01876:
-  name: "Omise de Tenshu (Japan)"
+  name: "Omise de Tenshu"
+  saveName: "Omise de Tenshu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119500,7 +125649,8 @@ SLPS-01876:
     multitap: false
     linkCable: false
 SLPS-02815:
-  name: "Omizu no Hanamichi (Japan)"
+  name: "Omizu no Hanamichi"
+  saveName: "Omizu no Hanamichi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119518,11 +125668,13 @@ SLPS-02815:
     multitap: false
     linkCable: false
 SLED-01170:
-  name: "One (Europe) (Demo)"
+  name: "One (Demo)"
+  saveName: "One (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00944:
-  name: "One (Europe) (En,Fr,De,Es,It)"
+  name: "One"
+  saveName: "One (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119545,7 +125697,8 @@ SLES-00944:
     multitap: false
     linkCable: false
 SLPS-01812:
-  name: "One (Japan)"
+  name: "One"
+  saveName: "One (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119564,7 +125717,8 @@ SLPS-01812:
     multitap: false
     linkCable: false
 SLUS-00469:
-  name: "One (USA)"
+  name: "One"
+  saveName: "One (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -119586,7 +125740,8 @@ SLUS-00469:
     multitap: false
     linkCable: false
 SLES-03723:
-  name: "One Piece Mansion (Europe)"
+  name: "One Piece Mansion"
+  saveName: "One Piece Mansion (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119605,7 +125760,8 @@ SLES-03723:
     multitap: false
     linkCable: false
 SLPM-86837:
-  name: "One Piece Mansion (Japan)"
+  name: "One Piece Mansion"
+  saveName: "One Piece Mansion (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119624,11 +125780,13 @@ SLPM-86837:
     multitap: false
     linkCable: false
 SLPM-80617:
-  name: "One Piece Mansion (Japan) (Demo)"
+  name: "One Piece Mansion (Demo)"
+  saveName: "One Piece Mansion (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01406:
-  name: "One Piece Mansion (USA)"
+  name: "One Piece Mansion"
+  saveName: "One Piece Mansion (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119647,7 +125805,8 @@ SLUS-01406:
     multitap: false
     linkCable: false
 SLPS-02585:
-  name: "One Two Smash - Tanoshii Tennis (Japan)"
+  name: "One Two Smash - Tanoshii Tennis"
+  saveName: "One Two Smash - Tanoshii Tennis (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119665,7 +125824,8 @@ SLPS-02585:
     multitap: false
     linkCable: false
 SLPS-00903:
-  name: "Ongaku Tkool - Kanadeeru 2 (Japan)"
+  name: "Ongaku Tkool - Kanadeeru 2"
+  saveName: "Ongaku Tkool - Kanadeeru 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119683,7 +125843,8 @@ SLPS-00903:
     multitap: false
     linkCable: false
 SLPS-03161:
-  name: "Ongaku Tkool 3 (Japan)"
+  name: "Ongaku Tkool 3"
+  saveName: "Ongaku Tkool 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119720,7 +125881,8 @@ SLPS-02684:
     multitap: false
     linkCable: false
 SLPS-00089:
-  name: "Oni Taiji!!, The - Mezase! Nidaime Momotarou (Japan)"
+  name: "Oni Taiji!!, The - Mezase! Nidaime Momotarou"
+  saveName: "Oni Taiji!!, The - Mezase! Nidaime Momotarou (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -119740,7 +125902,8 @@ SLPS-00089:
     multitap: true
     linkCable: false
 SLPM-86989:
-  name: "Oni Taiji!!, The - Mezase! Nidaime Momotarou (Japan) (Major Wave)"
+  name: "Oni Taiji!!, The - Mezase! Nidaime Momotarou (Major Wave)"
+  saveName: "Oni Taiji!!, The - Mezase! Nidaime Momotarou (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -119758,11 +125921,13 @@ SLPM-86989:
     multitap: true
     linkCable: false
 LSP-150500:
-  name: "Online Connection CD - For the PlayStation Game Console (USA) (Demo)"
+  name: "Online Connection CD - For the PlayStation Game Console (Demo)"
+  saveName: "Online Connection CD - For the PlayStation Game Console (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00079:
-  name: "Onside Complete Soccer (Europe) (En,Fr,De,Es)"
+  name: "Onside Complete Soccer"
+  saveName: "Onside Complete Soccer (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -119783,7 +125948,8 @@ SLES-00079:
     multitap: false
     linkCable: false
 SLPS-02814:
-  name: "Ooedo Huusui Ingaritsu - Hanabi 2 (Japan)"
+  name: "Ooedo Huusui Ingaritsu - Hanabi 2"
+  saveName: "Ooedo Huusui Ingaritsu - Hanabi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119821,7 +125987,8 @@ SLPS-03112:
     multitap: false
     linkCable: false
 SLPS-00874:
-  name: "Ooumi Nobunaga Den - Geten II (Japan)"
+  name: "Ooumi Nobunaga Den - Geten II"
+  saveName: "Ooumi Nobunaga Den - Geten II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119839,7 +126006,8 @@ SLPS-00874:
     multitap: false
     linkCable: false
 SLPS-00418:
-  name: "Open Golf, The - History of Turnberry (Japan)"
+  name: "Open Golf, The - History of Turnberry"
+  saveName: "Open Golf, The - History of Turnberry (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -119857,7 +126025,8 @@ SLPS-00418:
     multitap: false
     linkCable: false
 SLPS-01207:
-  name: "Option - Tuning Car Battle (Japan)"
+  name: "Option - Tuning Car Battle"
+  saveName: "Option - Tuning Car Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119877,7 +126046,8 @@ SLPS-01207:
     multitap: false
     linkCable: false
 SLPS-91037:
-  name: "Option - Tuning Car Battle (Japan) (Rev 1)"
+  name: "Option - Tuning Car Battle"
+  saveName: "Option - Tuning Car Battle (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119897,7 +126067,8 @@ SLPS-91037:
     multitap: false
     linkCable: false
 SLPS-01857:
-  name: "Option - Tuning Car Battle 2 (Japan)"
+  name: "Option - Tuning Car Battle 2"
+  saveName: "Option - Tuning Car Battle 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119917,7 +126088,8 @@ SLPS-01857:
     multitap: false
     linkCable: false
 SLPS-02587:
-  name: "Option - Tuning Car Battle Spec R (Japan)"
+  name: "Option - Tuning Car Battle Spec R"
+  saveName: "Option - Tuning Car Battle Spec R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -119981,7 +126153,8 @@ SLPS-02951:
     multitap: false
     linkCable: false
 SLPS-00240:
-  name: "Oracle no Houseki - Jewels of the Oracle (Japan) (En,Ja,Fr,De)"
+  name: "Oracle no Houseki - Jewels of the Oracle"
+  saveName: "Oracle no Houseki - Jewels of the Oracle (Japan) (En,Ja,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -120002,7 +126175,8 @@ SLPS-00240:
     multitap: false
     linkCable: false
 SCPS-10099:
-  name: "Ore no Ryouri (Japan)"
+  name: "Ore no Ryouri"
+  saveName: "Ore no Ryouri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120043,7 +126217,8 @@ SCPS-91323:
     multitap: false
     linkCable: false
 SCPS-10074:
-  name: "Ore no Shikabane o Koete Yuke (Japan)"
+  name: "Ore no Shikabane o Koete Yuke"
+  saveName: "Ore no Shikabane o Koete Yuke (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -120083,7 +126258,8 @@ SCPS-91330:
     multitap: false
     linkCable: false
 SLPS-02132:
-  name: "Ore no Yotto - Ganbare! Nippon Challenge (Japan) (En,Ja)"
+  name: "Ore no Yotto - Ganbare! Nippon Challenge"
+  saveName: "Ore no Yotto - Ganbare! Nippon Challenge (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120103,7 +126279,8 @@ SLPS-02132:
     multitap: false
     linkCable: false
 SLPS-01144:
-  name: "Ore! Tomba (Japan)"
+  name: "Ore! Tomba"
+  saveName: "Ore! Tomba (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120122,11 +126299,13 @@ SLPS-01144:
     multitap: false
     linkCable: false
 SLPM-80165:
-  name: "Ore! Tomba (Japan) (Demo)"
+  name: "Ore! Tomba (Demo)"
+  saveName: "Ore! Tomba (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03186:
-  name: "Oro e Gloria - La Strada per El Dorado (Italy)"
+  name: "Oro e Gloria - La Strada per El Dorado"
+  saveName: "Oro e Gloria - La Strada per El Dorado (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120145,7 +126324,8 @@ SLES-03186:
     multitap: false
     linkCable: false
 SLES-03187:
-  name: "Oro y Gloria - La Ruta hacia El Dorado (Spain)"
+  name: "Oro y Gloria - La Ruta hacia El Dorado"
+  saveName: "Oro y Gloria - La Ruta hacia El Dorado (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120164,7 +126344,8 @@ SLES-03187:
     multitap: false
     linkCable: false
 SLPS-02013:
-  name: "Osaka Naniwa Matenrou (Japan)"
+  name: "Osaka Naniwa Matenrou"
+  saveName: "Osaka Naniwa Matenrou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -120182,7 +126363,8 @@ SLPS-02013:
     multitap: false
     linkCable: false
 SLPM-87316:
-  name: "Oshigoto-shiki Jinsei Game - Mezase Shokugyou King (Japan)"
+  name: "Oshigoto-shiki Jinsei Game - Mezase Shokugyou King"
+  saveName: "Oshigoto-shiki Jinsei Game - Mezase Shokugyou King (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -120203,7 +126385,8 @@ SLPM-87316:
     multitap: true
     linkCable: false
 SLPM-87047:
-  name: "Otenki Kororin (Japan)"
+  name: "Otenki Kororin"
+  saveName: "Otenki Kororin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120224,7 +126407,8 @@ SLPM-87047:
     multitap: false
     linkCable: false
 SLPS-00136:
-  name: "Othello World II - Yume to Michi e no Chousen (Japan)"
+  name: "Othello World II - Yume to Michi e no Chousen"
+  saveName: "Othello World II - Yume to Michi e no Chousen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -120265,7 +126449,8 @@ SLPM-86104:
     multitap: false
     linkCable: false
 SLPM-86047:
-  name: "Other Life Azure Dreams (Japan)"
+  name: "Other Life Azure Dreams"
+  saveName: "Other Life Azure Dreams (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -120285,7 +126470,8 @@ SLPM-86047:
     multitap: false
     linkCable: false
 SLPS-03531:
-  name: "Otogi Story - Tenshi no Shippo (Japan)"
+  name: "Otogi Story - Tenshi no Shippo"
+  saveName: "Otogi Story - Tenshi no Shippo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120304,7 +126490,8 @@ SLPS-03531:
     multitap: false
     linkCable: false
 SLPS-02459:
-  name: "Otona no Asobi (Japan)"
+  name: "Otona no Asobi"
+  saveName: "Otona no Asobi (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1850-g8342fec2"
@@ -120326,7 +126513,8 @@ SLPS-02459:
     multitap: false
     linkCable: false
 SLPS-03412:
-  name: "Oujisama Lv1 (Japan)"
+  name: "Oujisama Lv1"
+  saveName: "Oujisama Lv1 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120345,7 +126533,8 @@ SLPS-03412:
     multitap: false
     linkCable: false
 SLPS-03534:
-  name: "Oujisama Lv1.5 - Oujisama no Tamago (Japan)"
+  name: "Oujisama Lv1.5 - Oujisama no Tamago"
+  saveName: "Oujisama Lv1.5 - Oujisama no Tamago (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120364,7 +126553,8 @@ SLPS-03534:
     multitap: false
     linkCable: false
 SLPS-00438:
-  name: "Oukyuu no Hihou Tension (Japan)"
+  name: "Oukyuu no Hihou Tension"
+  saveName: "Oukyuu no Hihou Tension (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120386,7 +126576,8 @@ SLPS-00438:
     multitap: false
     linkCable: false
 SLPS-03235:
-  name: "Oumagatoki (Japan)"
+  name: "Oumagatoki"
+  saveName: "Oumagatoki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120408,9 +126599,11 @@ SLPS-03235:
     multitap: false
     linkCable: false
 SLPM-80623:
-  name: "Oumagatoki (Japan) (Premium Fan Disc)"
+  name: "Oumagatoki (Premium Fan Disc)"
+  saveName: "Oumagatoki (Japan) (Premium Fan Disc)"
 SLPS-03272:
-  name: "Oumagatoki 2 (Japan)"
+  name: "Oumagatoki 2"
+  saveName: "Oumagatoki 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120448,7 +126641,8 @@ SLPS-91522:
     multitap: false
     linkCable: false
 SLPS-02576:
-  name: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Japan) (Disc 1) (Mahjong de Pon!)"
+  name: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Disc 1) (Mahjong de Pon!)"
+  saveName: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Japan) (Disc 1) (Mahjong de Pon!)"
   discSet:
     name: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Japan)"
     serials:
@@ -120471,14 +126665,16 @@ SLPS-02576:
     multitap: false
     linkCable: false
 SLPS-02577:
-  name: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Japan) (Disc 2) (Hanafuda de Koi!)"
+  name: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Disc 2) (Hanafuda de Koi!)"
+  saveName: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Japan) (Disc 2) (Hanafuda de Koi!)"
   discSet:
     name: "Our Graduation - Mahjong de Pon! Hanafuda de Koi! (Japan)"
     serials:
       - SLPS-02576
       - SLPS-02577
 SLPS-00746:
-  name: "Out Live - Be Eliminate Yesterday (Japan)"
+  name: "Out Live - Be Eliminate Yesterday"
+  saveName: "Out Live - Be Eliminate Yesterday (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -120532,7 +126728,8 @@ SLPS-03282:
     multitap: false
     linkCable: false
 SLPS-00327:
-  name: "Over Drivin' DX (Japan)"
+  name: "Over Drivin' DX"
+  saveName: "Over Drivin' DX (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -120551,7 +126748,8 @@ SLPS-00327:
     multitap: false
     linkCable: true
 SLPM-80032:
-  name: "Over Drivin' DX - Rally Edition (Japan)"
+  name: "Over Drivin' DX - Rally Edition"
+  saveName: "Over Drivin' DX - Rally Edition (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -120568,7 +126766,8 @@ SLPM-80032:
     multitap: false
     linkCable: false
 SLPS-00895:
-  name: "Over Drivin' II (Japan)"
+  name: "Over Drivin' II"
+  saveName: "Over Drivin' II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120588,7 +126787,8 @@ SLPS-00895:
     multitap: false
     linkCable: false
 SLPS-01593:
-  name: "Over Drivin' III - Hot Pursuit (Japan)"
+  name: "Over Drivin' III - Hot Pursuit"
+  saveName: "Over Drivin' III - Hot Pursuit (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120608,9 +126808,11 @@ SLPS-01593:
     multitap: false
     linkCable: false
 SLPM-80298:
-  name: "Over Drivin' III - Hot Pursuit (Japan) (Taikenban)"
+  name: "Over Drivin' III - Hot Pursuit (Taikenban)"
+  saveName: "Over Drivin' III - Hot Pursuit (Japan) (Taikenban)"
 SLPS-02099:
-  name: "Over Drivin' IV (Japan)"
+  name: "Over Drivin' IV"
+  saveName: "Over Drivin' IV (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -120630,11 +126832,13 @@ SLPS-02099:
     multitap: false
     linkCable: false
 SLPM-80437:
-  name: "Over Drivin' IV (Japan) (Demo)"
+  name: "Over Drivin' IV (Demo)"
+  saveName: "Over Drivin' IV (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00768:
-  name: "OverBlood (Europe)"
+  name: "OverBlood"
+  saveName: "OverBlood (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -120652,7 +126856,8 @@ SLES-00768:
     multitap: false
     linkCable: false
 SLES-00769:
-  name: "OverBlood (France)"
+  name: "OverBlood"
+  saveName: "OverBlood (France)"
   controllers:
     - DigitalController
   metadata:
@@ -120670,7 +126875,8 @@ SLES-00769:
     multitap: false
     linkCable: false
 SLES-00770:
-  name: "OverBlood (Germany)"
+  name: "OverBlood"
+  saveName: "OverBlood (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -120688,7 +126894,8 @@ SLES-00770:
     multitap: false
     linkCable: false
 SLPS-00392:
-  name: "OverBlood (Japan)"
+  name: "OverBlood"
+  saveName: "OverBlood (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -120709,7 +126916,8 @@ SLPS-00392:
     multitap: false
     linkCable: false
 SLPM-86641:
-  name: "OverBlood (Japan) (Major Wave)"
+  name: "OverBlood (Major Wave)"
+  saveName: "OverBlood (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -120727,7 +126935,8 @@ SLPM-86641:
     multitap: false
     linkCable: false
 SLUS-00464:
-  name: "OverBlood (USA)"
+  name: "OverBlood"
+  saveName: "OverBlood (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -120745,7 +126954,8 @@ SLUS-00464:
     multitap: false
     linkCable: false
 SLES-01879:
-  name: "OverBlood 2 (Europe) (Disc 1)"
+  name: "OverBlood 2 (Disc 1)"
+  saveName: "OverBlood 2 (Europe) (Disc 1)"
   discSet:
     name: "OverBlood 2 (Europe)"
     serials:
@@ -120771,7 +126981,8 @@ SLES-01879:
     multitap: false
     linkCable: false
 SLES-11879:
-  name: "OverBlood 2 (Europe) (Disc 2)"
+  name: "OverBlood 2 (Disc 2)"
+  saveName: "OverBlood 2 (Europe) (Disc 2)"
   discSet:
     name: "OverBlood 2 (Europe)"
     serials:
@@ -120797,7 +127008,8 @@ SLES-11879:
     multitap: false
     linkCable: false
 SLES-02187:
-  name: "OverBlood 2 (Germany) (Disc 1) (Rev 1)"
+  name: "OverBlood 2 (Disc 1)"
+  saveName: "OverBlood 2 (Germany) (Disc 1) (Rev 1)"
   discSet:
     name: "OverBlood 2 (Germany) (Rev 1)"
     serials:
@@ -120821,7 +127033,8 @@ SLES-02187:
     multitap: false
     linkCable: false
 SLES-12187:
-  name: "OverBlood 2 (Germany) (Disc 2) (Rev 1)"
+  name: "OverBlood 2 (Disc 2)"
+  saveName: "OverBlood 2 (Germany) (Disc 2) (Rev 1)"
   discSet:
     name: "OverBlood 2 (Germany) (Rev 1)"
     serials:
@@ -120845,7 +127058,8 @@ SLES-12187:
     multitap: false
     linkCable: false
 SLES-01880:
-  name: "OverBlood 2 (Italy) (Disc 1)"
+  name: "OverBlood 2 (Disc 1)"
+  saveName: "OverBlood 2 (Italy) (Disc 1)"
   discSet:
     name: "OverBlood 2 (Italy)"
     serials:
@@ -120869,7 +127083,8 @@ SLES-01880:
     multitap: false
     linkCable: false
 SLES-11880:
-  name: "OverBlood 2 (Italy) (Disc 2)"
+  name: "OverBlood 2 (Disc 2)"
+  saveName: "OverBlood 2 (Italy) (Disc 2)"
   discSet:
     name: "OverBlood 2 (Italy)"
     serials:
@@ -120893,11 +127108,13 @@ SLES-11880:
     multitap: false
     linkCable: false
 PAPX-90046:
-  name: "OverBlood 2 (Japan) (Demo)"
+  name: "OverBlood 2 (Demo)"
+  saveName: "OverBlood 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01261:
-  name: "OverBlood 2 (Japan) (Disc 1)"
+  name: "OverBlood 2 (Disc 1)"
+  saveName: "OverBlood 2 (Japan) (Disc 1)"
   discSet:
     name: "OverBlood 2 (Japan)"
     serials:
@@ -120921,7 +127138,8 @@ SLPS-01261:
     multitap: false
     linkCable: false
 SLPS-01262:
-  name: "OverBlood 2 (Japan) (Disc 2)"
+  name: "OverBlood 2 (Disc 2)"
+  saveName: "OverBlood 2 (Japan) (Disc 2)"
   discSet:
     name: "OverBlood 2 (Japan)"
     serials:
@@ -120967,7 +127185,8 @@ SLPS-91140:
     multitap: false
     linkCable: false
 SLES-00865:
-  name: "Overboard! (Europe)"
+  name: "Overboard!"
+  saveName: "Overboard! (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -121044,7 +127263,8 @@ SLPS-02592:
     multitap: false
     linkCable: false
 SLPS-02591:
-  name: "Oyaji no Jikan - Nee-chan Hanafuda de Shoubu ya! (Japan)"
+  name: "Oyaji no Jikan - Nee-chan Hanafuda de Shoubu ya!"
+  saveName: "Oyaji no Jikan - Nee-chan Hanafuda de Shoubu ya! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121062,7 +127282,8 @@ SLPS-02591:
     multitap: false
     linkCable: false
 SLPS-03262:
-  name: "Oyaji no Jikan - Nee-chan Mahjong de Shoubu ya! (Japan)"
+  name: "Oyaji no Jikan - Nee-chan Mahjong de Shoubu ya!"
+  saveName: "Oyaji no Jikan - Nee-chan Mahjong de Shoubu ya! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121081,7 +127302,8 @@ SLPS-03262:
     multitap: false
     linkCable: false
 SLPS-02590:
-  name: "Oyaji no Jikan - Nee-chan Tsuri Iku de! (Japan)"
+  name: "Oyaji no Jikan - Nee-chan Tsuri Iku de!"
+  saveName: "Oyaji no Jikan - Nee-chan Tsuri Iku de! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121100,7 +127322,8 @@ SLPS-02590:
     multitap: false
     linkCable: false
 SLPM-86393:
-  name: "Oyako Entertainment Series - TV Kamishibai Vol. 1 (Japan)"
+  name: "Oyako Entertainment Series - TV Kamishibai Vol. 1"
+  saveName: "Oyako Entertainment Series - TV Kamishibai Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121118,7 +127341,8 @@ SLPM-86393:
     multitap: false
     linkCable: false
 SLPS-02335:
-  name: "Oz no Mahoutsukai - Another World - Rung Rung (Japan)"
+  name: "Oz no Mahoutsukai - Another World - Rung Rung"
+  saveName: "Oz no Mahoutsukai - Another World - Rung Rung (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121137,7 +127361,8 @@ SLPS-02335:
     multitap: false
     linkCable: false
 LSP-060190:
-  name: "P.K.'s Math Studio (USA)"
+  name: "P.K.'s Math Studio"
+  saveName: "P.K.'s Math Studio (USA)"
   codes:
     - LSP060190
     - LSP06019001
@@ -121148,7 +127373,8 @@ LSP-060190:
     languages:
       - English
 LSP-060310:
-  name: "P.K.'s Place 1 - Party on the Patio! (USA)"
+  name: "P.K.'s Place 1 - Party on the Patio!"
+  saveName: "P.K.'s Place 1 - Party on the Patio! (USA)"
   codes:
     - LSP-060310
     - LSP06031001
@@ -121160,7 +127386,8 @@ LSP-060310:
     languages:
       - English
 LSP-180210:
-  name: "P.K.'s Place 2 - Hoopo at Sea! (USA)"
+  name: "P.K.'s Place 2 - Hoopo at Sea!"
+  saveName: "P.K.'s Place 2 - Hoopo at Sea! (USA)"
   codes:
     - LSP-180210
     - LSP18021001
@@ -121172,7 +127399,8 @@ LSP-180210:
     languages:
       - English
 LSP-180310:
-  name: "P.K.'s Place 3 - Carlos at the Races! (USA)"
+  name: "P.K.'s Place 3 - Carlos at the Races!"
+  saveName: "P.K.'s Place 3 - Carlos at the Races! (USA)"
   codes:
     - LSP-180310
     - LSP18031001
@@ -121184,7 +127412,8 @@ LSP-180310:
     languages:
       - English
 LSP-180410:
-  name: "P.K.'s Place 4 - Daphne and the Seventh Wonder (USA)"
+  name: "P.K.'s Place 4 - Daphne and the Seventh Wonder"
+  saveName: "P.K.'s Place 4 - Daphne and the Seventh Wonder (USA)"
   codes:
     - LSP180410
     - LSP18041001
@@ -121195,7 +127424,8 @@ LSP-180410:
     languages:
       - English
 SCPS-10097:
-  name: "PAQA (Japan)"
+  name: "PAQA"
+  saveName: "PAQA (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121214,11 +127444,13 @@ SCPS-10097:
     multitap: false
     linkCable: false
 PAPX-90092:
-  name: "PAQA (Japan) (Demo)"
+  name: "PAQA (Demo)"
+  saveName: "PAQA (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00195:
-  name: "PD Ultraman Invader (Japan)"
+  name: "PD Ultraman Invader"
+  saveName: "PD Ultraman Invader (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121236,7 +127468,8 @@ SLPS-00195:
     multitap: false
     linkCable: false
 SLES-02061:
-  name: "PGA European Tour Golf (Europe) (En,De)"
+  name: "PGA European Tour Golf"
+  saveName: "PGA European Tour Golf (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121257,7 +127490,8 @@ SLES-02061:
     multitap: true
     linkCable: false
 SLES-02396:
-  name: "PGA European Tour Golf (Europe) (Fr,Es,It)"
+  name: "PGA European Tour Golf"
+  saveName: "PGA European Tour Golf (Europe) (Fr,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121279,7 +127513,8 @@ SLES-02396:
     multitap: true
     linkCable: false
 SLES-00073:
-  name: "PGA Tour 96 (Europe)"
+  name: "PGA Tour 96"
+  saveName: "PGA Tour 96 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -121297,7 +127532,8 @@ SLES-00073:
     multitap: false
     linkCable: false
 SLPS-00245:
-  name: "PGA Tour 96 (Japan)"
+  name: "PGA Tour 96"
+  saveName: "PGA Tour 96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121315,7 +127551,8 @@ SLPS-00245:
     multitap: false
     linkCable: false
 SLUS-00016:
-  name: "PGA Tour 96 (USA)"
+  name: "PGA Tour 96"
+  saveName: "PGA Tour 96 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -121333,7 +127570,8 @@ SLUS-00016:
     multitap: false
     linkCable: false
 SLES-00437:
-  name: "PGA Tour 97 (Europe)"
+  name: "PGA Tour 97"
+  saveName: "PGA Tour 97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -121351,7 +127589,8 @@ SLES-00437:
     multitap: false
     linkCable: false
 SLPS-00758:
-  name: "PGA Tour 97 (Japan)"
+  name: "PGA Tour 97"
+  saveName: "PGA Tour 97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121369,7 +127608,8 @@ SLPS-00758:
     multitap: false
     linkCable: false
 SLUS-00261:
-  name: "PGA Tour 97 (USA)"
+  name: "PGA Tour 97"
+  saveName: "PGA Tour 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -121387,7 +127627,8 @@ SLUS-00261:
     multitap: false
     linkCable: false
 SLES-00908:
-  name: "PGA Tour 98 (Europe)"
+  name: "PGA Tour 98"
+  saveName: "PGA Tour 98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -121405,7 +127646,8 @@ SLES-00908:
     multitap: false
     linkCable: false
 SLUS-00517:
-  name: "PGA Tour 98 (USA)"
+  name: "PGA Tour 98"
+  saveName: "PGA Tour 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -121423,7 +127665,8 @@ SLUS-00517:
     multitap: false
     linkCable: false
 SLES-00168:
-  name: "PO'ed (Europe) (En,Fr,De,Es,It)"
+  name: "PO'ed"
+  saveName: "PO'ed (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -121445,7 +127688,8 @@ SLES-00168:
     multitap: false
     linkCable: false
 SLPS-00437:
-  name: "PO'ed (Japan)"
+  name: "PO'ed"
+  saveName: "PO'ed (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121463,7 +127707,8 @@ SLPS-00437:
     multitap: false
     linkCable: false
 SLUS-00097:
-  name: "PO'ed (USA)"
+  name: "PO'ed"
+  saveName: "PO'ed (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -121481,40 +127726,49 @@ SLUS-00097:
     multitap: false
     linkCable: false
 SCED-03675:
-  name: "PS One Demo Disc 02 (Europe) (En,Fr,De,Es,It)"
+  name: "PS One Demo Disc 02"
+  saveName: "PS One Demo Disc 02 (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCED-03920:
-  name: "PS One Demo Disc 2002 (Europe) (En,Fr,De,Es,It)"
+  name: "PS One Demo Disc 2002"
+  saveName: "PS One Demo Disc 2002 (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCED-03238:
-  name: "PS One Kids Autumn 2000 (Europe) (En,Fr,De,Es,It)"
+  name: "PS One Kids Autumn 2000"
+  saveName: "PS One Kids Autumn 2000 (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCED-03340:
-  name: "PS One Kids Autumn 2000 (France) (En,Fr,De,Es,It)"
+  name: "PS One Kids Autumn 2000"
+  saveName: "PS One Kids Autumn 2000 (France) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCED-03175:
-  name: "PS One Special Demo 01 (Europe) (En,Fr,De,Es,It)"
+  name: "PS One Special Demo 01"
+  saveName: "PS One Special Demo 01 (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCUS-94696:
-  name: "PS One Winter 03 Kiosk Version 1.21 (USA)"
+  name: "PS One Winter 03 Kiosk Version 1.21"
+  saveName: "PS One Winter 03 Kiosk Version 1.21 (USA)"
 SCUS-94799:
-  name: "PSone - Wherever, Whenever, Forever. (USA) (EDC)"
+  name: "PSone - Wherever, Whenever, Forever. (EDC)"
+  saveName: "PSone - Wherever, Whenever, Forever. (USA) (EDC)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
 SCED-04019:
-  name: "PSone Xmas Special (France)"
+  name: "PSone Xmas Special"
+  saveName: "PSone Xmas Special (France)"
   metadata:
     genre: "** DEMO **"
 SCPS-18002:
-  name: "PaRappa the Rapper (Japan)"
+  name: "PaRappa the Rapper"
+  saveName: "PaRappa the Rapper (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -121536,15 +127790,18 @@ SCPS-18002:
     multitap: false
     linkCable: false
 PCPX-96049:
-  name: "PaRappa the Rapper (Japan) (Demo)"
+  name: "PaRappa the Rapper (Demo)"
+  saveName: "PaRappa the Rapper (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94195:
-  name: "PaRappa the Rapper (USA) (Demo)"
+  name: "PaRappa the Rapper (Demo)"
+  saveName: "PaRappa the Rapper (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94183:
-  name: "PaRappa the Rapper (USA) (En,Fr,De,Es,It)"
+  name: "PaRappa the Rapper"
+  saveName: "PaRappa the Rapper (USA) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -121569,7 +127826,8 @@ SCUS-94183:
     multitap: false
     linkCable: false
 SCES-00743:
-  name: "PaRappa the Rapper - The Hip Hop Hero (Europe) (En,Fr,De,Es,It)"
+  name: "PaRappa the Rapper - The Hip Hop Hero"
+  saveName: "PaRappa the Rapper - The Hip Hop Hero (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -121613,11 +127871,13 @@ SCPS-45445:
     multitap: false
     linkCable: false
 SLUS-90057:
-  name: "Pac-Man World (USA) (Demo)"
+  name: "Pac-Man World (Demo)"
+  saveName: "Pac-Man World (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00439:
-  name: "Pac-Man World - 20th Anniversary (USA)"
+  name: "Pac-Man World - 20th Anniversary"
+  saveName: "Pac-Man World - 20th Anniversary (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1485-ge6156e2a"
@@ -121639,7 +127899,8 @@ SLUS-00439:
     multitap: false
     linkCable: false
 SCES-00934:
-  name: "Pac-Man World 20th Anniversary (Europe)"
+  name: "Pac-Man World 20th Anniversary"
+  saveName: "Pac-Man World 20th Anniversary (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121658,7 +127919,8 @@ SCES-00934:
     multitap: false
     linkCable: false
 SCES-02277:
-  name: "Pac-Man World 20th Anniversary (France)"
+  name: "Pac-Man World 20th Anniversary"
+  saveName: "Pac-Man World 20th Anniversary (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121677,7 +127939,8 @@ SCES-02277:
     multitap: false
     linkCable: false
 SCES-02278:
-  name: "Pac-Man World 20th Anniversary (Germany)"
+  name: "Pac-Man World 20th Anniversary"
+  saveName: "Pac-Man World 20th Anniversary (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121696,7 +127959,8 @@ SCES-02278:
     multitap: false
     linkCable: false
 SCES-02279:
-  name: "Pac-Man World 20th Anniversary (Italy)"
+  name: "Pac-Man World 20th Anniversary"
+  saveName: "Pac-Man World 20th Anniversary (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121715,7 +127979,8 @@ SCES-02279:
     multitap: false
     linkCable: false
 SLPS-02345:
-  name: "Pac-Man World 20th Anniversary (Japan)"
+  name: "Pac-Man World 20th Anniversary"
+  saveName: "Pac-Man World 20th Anniversary (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121734,7 +127999,8 @@ SLPS-02345:
     multitap: false
     linkCable: false
 SCES-02280:
-  name: "Pac-Man World 20th Anniversary (Spain)"
+  name: "Pac-Man World 20th Anniversary"
+  saveName: "Pac-Man World 20th Anniversary (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121753,7 +128019,8 @@ SCES-02280:
     multitap: false
     linkCable: false
 SLPS-02122:
-  name: "Paca Paca Passion (Japan)"
+  name: "Paca Paca Passion"
+  saveName: "Paca Paca Passion (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121771,7 +128038,8 @@ SLPS-02122:
     multitap: false
     linkCable: false
 SLPS-02720:
-  name: "Paca Paca Passion 2 (Japan)"
+  name: "Paca Paca Passion 2"
+  saveName: "Paca Paca Passion 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121789,7 +128057,8 @@ SLPS-02720:
     multitap: false
     linkCable: false
 SLPS-03420:
-  name: "Paca Paca Passion Special (Japan)"
+  name: "Paca Paca Passion Special"
+  saveName: "Paca Paca Passion Special (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121825,7 +128094,8 @@ SLPS-02895:
     multitap: false
     linkCable: false
 SLPS-00288:
-  name: "Pachi Pachi Saga (Japan)"
+  name: "Pachi Pachi Saga"
+  saveName: "Pachi Pachi Saga (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121843,7 +128113,8 @@ SLPS-00288:
     multitap: false
     linkCable: false
 SLPS-01848:
-  name: "Pachi Slot Teiou - Big Wave, Pika Gorou, BB Junky 7 (Japan)"
+  name: "Pachi Slot Teiou - Big Wave, Pika Gorou, BB Junky 7"
+  saveName: "Pachi Slot Teiou - Big Wave, Pika Gorou, BB Junky 7 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -121880,7 +128151,8 @@ SLPS-03210:
     multitap: false
     linkCable: false
 SLPS-02782:
-  name: "Pachi Slot Teiou W - Arabesque R, Hot Rod Queen (Japan)"
+  name: "Pachi Slot Teiou W - Arabesque R, Hot Rod Queen"
+  saveName: "Pachi Slot Teiou W - Arabesque R, Hot Rod Queen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121899,7 +128171,8 @@ SLPS-02782:
     multitap: false
     linkCable: false
 SLPS-01968:
-  name: "Pachi-Slot Aruze Oukoku (Japan)"
+  name: "Pachi-Slot Aruze Oukoku"
+  saveName: "Pachi-Slot Aruze Oukoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121918,7 +128191,8 @@ SLPS-01968:
     multitap: false
     linkCable: false
 SLPS-02416:
-  name: "Pachi-Slot Aruze Oukoku 2 (Japan)"
+  name: "Pachi-Slot Aruze Oukoku 2"
+  saveName: "Pachi-Slot Aruze Oukoku 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121937,7 +128211,8 @@ SLPS-02416:
     multitap: false
     linkCable: false
 SLPS-91493:
-  name: "Pachi-Slot Aruze Oukoku 2 (Japan) (PSone Books)"
+  name: "Pachi-Slot Aruze Oukoku 2 (PSone Books)"
+  saveName: "Pachi-Slot Aruze Oukoku 2 (Japan) (PSone Books)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121956,7 +128231,8 @@ SLPS-91493:
     multitap: false
     linkCable: false
 SLPS-02846:
-  name: "Pachi-Slot Aruze Oukoku 3 (Japan)"
+  name: "Pachi-Slot Aruze Oukoku 3"
+  saveName: "Pachi-Slot Aruze Oukoku 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121975,7 +128251,8 @@ SLPS-02846:
     multitap: false
     linkCable: false
 SLPS-03089:
-  name: "Pachi-Slot Aruze Oukoku 4 (Japan)"
+  name: "Pachi-Slot Aruze Oukoku 4"
+  saveName: "Pachi-Slot Aruze Oukoku 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -121994,7 +128271,8 @@ SLPS-03089:
     multitap: false
     linkCable: false
 SLPS-91499:
-  name: "Pachi-Slot Aruze Oukoku 4 (Japan) (PSone Books)"
+  name: "Pachi-Slot Aruze Oukoku 4 (PSone Books)"
+  saveName: "Pachi-Slot Aruze Oukoku 4 (Japan) (PSone Books)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122013,7 +128291,8 @@ SLPS-91499:
     multitap: false
     linkCable: false
 SLPS-03088:
-  name: "Pachi-Slot Aruze Oukoku 4 Deluxe Pack (Japan)"
+  name: "Pachi-Slot Aruze Oukoku 4 Deluxe Pack"
+  saveName: "Pachi-Slot Aruze Oukoku 4 Deluxe Pack (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122032,7 +128311,8 @@ SLPS-03088:
     multitap: false
     linkCable: false
 SLPS-03280:
-  name: "Pachi-Slot Aruze Oukoku 5 (Japan)"
+  name: "Pachi-Slot Aruze Oukoku 5"
+  saveName: "Pachi-Slot Aruze Oukoku 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122051,9 +128331,11 @@ SLPS-03280:
     multitap: false
     linkCable: false
 SLPS-03440:
-  name: "Pachi-Slot Aruze Oukoku 7 (Japan) (Disc 2) (4th Reel Disc)"
+  name: "Pachi-Slot Aruze Oukoku 7 (Disc 2) (4th Reel Disc)"
+  saveName: "Pachi-Slot Aruze Oukoku 7 (Japan) (Disc 2) (4th Reel Disc)"
 SLPS-01308:
-  name: "Pachi-Slot Kanzen Kaiseki - Wai Wai Pulsar 2 & 77 2 (Japan)"
+  name: "Pachi-Slot Kanzen Kaiseki - Wai Wai Pulsar 2 & 77 2"
+  saveName: "Pachi-Slot Kanzen Kaiseki - Wai Wai Pulsar 2 & 77 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122072,7 +128354,8 @@ SLPS-01308:
     multitap: false
     linkCable: false
 SLPS-02127:
-  name: "Pachi-Slot Kanzen Kouryaku - Aruze Koushiki Guide Volume 4 (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Aruze Koushiki Guide Volume 4"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Aruze Koushiki Guide Volume 4 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122090,7 +128373,8 @@ SLPS-02127:
     multitap: false
     linkCable: false
 SLPS-01023:
-  name: "Pachi-Slot Kanzen Kouryaku - Cranky Pro (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Cranky Pro"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Cranky Pro (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122108,7 +128392,8 @@ SLPS-01023:
     multitap: false
     linkCable: false
 SLPS-03110:
-  name: "Pachi-Slot Kanzen Kouryaku - Takasago Super Project (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Takasago Super Project"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Takasago Super Project (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122126,7 +128411,8 @@ SLPS-03110:
     multitap: false
     linkCable: false
 SLPM-86962:
-  name: "Pachi-Slot Kanzen Kouryaku - Takasago Super Project 2 (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Takasago Super Project 2"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Takasago Super Project 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122144,7 +128430,8 @@ SLPM-86962:
     multitap: false
     linkCable: false
 SLPS-00752:
-  name: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 1 (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 1"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122162,7 +128449,8 @@ SLPS-00752:
     multitap: false
     linkCable: false
 SLPS-00943:
-  name: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 2 (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 2"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122180,7 +128468,8 @@ SLPS-00943:
     multitap: false
     linkCable: false
 SLPS-01550:
-  name: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 3 (Japan)"
+  name: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 3"
+  saveName: "Pachi-Slot Kanzen Kouryaku - Universal Koushiki Guide Volume 3 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -122201,7 +128490,8 @@ SLPS-01550:
     multitap: false
     linkCable: false
 SLPS-01927:
-  name: "Pachi-Slot Master - Sammy SP (Japan)"
+  name: "Pachi-Slot Master - Sammy SP"
+  saveName: "Pachi-Slot Master - Sammy SP (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122239,7 +128529,8 @@ SLPS-03476:
     multitap: false
     linkCable: false
 SLPS-03108:
-  name: "Pachi-Slot Teiou - Battle Knight, Atlantis Doom (Japan)"
+  name: "Pachi-Slot Teiou - Battle Knight, Atlantis Doom"
+  saveName: "Pachi-Slot Teiou - Battle Knight, Atlantis Doom (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122258,7 +128549,8 @@ SLPS-03108:
     multitap: false
     linkCable: false
 SLPS-03029:
-  name: "Pachi-Slot Teiou - Beat the Dragon 2 (Japan)"
+  name: "Pachi-Slot Teiou - Beat the Dragon 2"
+  saveName: "Pachi-Slot Teiou - Beat the Dragon 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122298,7 +128590,8 @@ SLPS-02629:
     multitap: false
     linkCable: false
 SLPS-03265:
-  name: "Pachi-Slot Teiou - Bunny Girl SP (Japan)"
+  name: "Pachi-Slot Teiou - Bunny Girl SP"
+  saveName: "Pachi-Slot Teiou - Bunny Girl SP (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122317,7 +128610,8 @@ SLPS-03265:
     multitap: false
     linkCable: false
 SLPS-03455:
-  name: "Pachi-Slot Teiou - Dateline Pegasus (Japan)"
+  name: "Pachi-Slot Teiou - Dateline Pegasus"
+  saveName: "Pachi-Slot Teiou - Dateline Pegasus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122336,7 +128630,8 @@ SLPS-03455:
     multitap: false
     linkCable: false
 SLPS-03441:
-  name: "Pachi-Slot Teiou - Golgo 13 - Las Vegas (Japan)"
+  name: "Pachi-Slot Teiou - Golgo 13 - Las Vegas"
+  saveName: "Pachi-Slot Teiou - Golgo 13 - Las Vegas (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122355,7 +128650,8 @@ SLPS-03441:
     multitap: false
     linkCable: false
 SLPS-03158:
-  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 2 - Ice Story (Japan)"
+  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 2 - Ice Story"
+  saveName: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 2 - Ice Story (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122377,7 +128673,8 @@ SLPS-03158:
     multitap: false
     linkCable: false
 SLPS-03130:
-  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 3 - I'm Angel - White 2 & Blue 2 (Japan)"
+  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 3 - I'm Angel - White 2 & Blue 2"
+  saveName: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 3 - I'm Angel - White 2 & Blue 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122399,7 +128696,8 @@ SLPS-03130:
     multitap: false
     linkCable: false
 SLPS-03217:
-  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 4 - Exhaust, Ooedo Sakura Fubuki 2 (Japan)"
+  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 4 - Exhaust, Ooedo Sakura Fubuki 2"
+  saveName: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 4 - Exhaust, Ooedo Sakura Fubuki 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122418,7 +128716,8 @@ SLPS-03217:
     multitap: false
     linkCable: false
 SLPS-03245:
-  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 5 - Race Queen 2, Tomcat (Japan)"
+  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 5 - Race Queen 2, Tomcat"
+  saveName: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 5 - Race Queen 2, Tomcat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122437,7 +128736,8 @@ SLPS-03245:
     multitap: false
     linkCable: false
 SLPS-03329:
-  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 6 - Takarabune (Japan)"
+  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 6 - Takarabune"
+  saveName: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 6 - Takarabune (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122456,7 +128756,8 @@ SLPS-03329:
     multitap: false
     linkCable: false
 SLPS-03391:
-  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 7 - Trick Monster 2 (Japan)"
+  name: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 7 - Trick Monster 2"
+  saveName: "Pachi-Slot Teiou - Maker Suishou Manual Vol. 7 - Trick Monster 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122475,7 +128776,8 @@ SLPS-03391:
     multitap: false
     linkCable: false
 SLPS-03423:
-  name: "Pachi-Slot Teiou - Naniwa Sakura Fubuki (Japan)"
+  name: "Pachi-Slot Teiou - Naniwa Sakura Fubuki"
+  saveName: "Pachi-Slot Teiou - Naniwa Sakura Fubuki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122494,7 +128796,8 @@ SLPS-03423:
     multitap: false
     linkCable: false
 SLPS-03442:
-  name: "Pachi-Slot Teiou - Shimauta-30, Twist, Nangoku Monogatari-30 (Japan)"
+  name: "Pachi-Slot Teiou - Shimauta-30, Twist, Nangoku Monogatari-30"
+  saveName: "Pachi-Slot Teiou - Shimauta-30, Twist, Nangoku Monogatari-30 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122513,7 +128816,8 @@ SLPS-03442:
     multitap: false
     linkCable: false
 SLPS-02905:
-  name: "Pachi-Slot Teiou - Yamasa Remix (Japan)"
+  name: "Pachi-Slot Teiou - Yamasa Remix"
+  saveName: "Pachi-Slot Teiou - Yamasa Remix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122551,7 +128855,8 @@ SLPS-02827:
     multitap: false
     linkCable: false
 SLPS-02217:
-  name: "Pachi-Slot Teiou 2 - Kagetsu Two Pair, Beaver X (Japan)"
+  name: "Pachi-Slot Teiou 2 - Kagetsu Two Pair, Beaver X"
+  saveName: "Pachi-Slot Teiou 2 - Kagetsu Two Pair, Beaver X (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122589,7 +128894,8 @@ SLPS-02887:
     multitap: false
     linkCable: false
 SLPS-02413:
-  name: "Pachi-Slot Teiou 3 - Sea Master X, Epsilon R, Wai Wai Pulsar 2 (Japan)"
+  name: "Pachi-Slot Teiou 3 - Sea Master X, Epsilon R, Wai Wai Pulsar 2"
+  saveName: "Pachi-Slot Teiou 3 - Sea Master X, Epsilon R, Wai Wai Pulsar 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122608,7 +128914,8 @@ SLPS-02413:
     multitap: false
     linkCable: false
 SLPS-02564:
-  name: "Pachi-Slot Teiou 4 - Oicho Kaba X, Magical Pops, LequiO-30 (Japan)"
+  name: "Pachi-Slot Teiou 4 - Oicho Kaba X, Magical Pops, LequiO-30"
+  saveName: "Pachi-Slot Teiou 4 - Oicho Kaba X, Magical Pops, LequiO-30 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122627,7 +128934,8 @@ SLPS-02564:
     multitap: false
     linkCable: false
 SLPS-02888:
-  name: "Pachi-Slot Teiou 4 - Oicho Kaba X, Magical Pops, LequiO-30 (Japan) (Best of the Best)"
+  name: "Pachi-Slot Teiou 4 - Oicho Kaba X, Magical Pops, LequiO-30 (Best of the Best)"
+  saveName: "Pachi-Slot Teiou 4 - Oicho Kaba X, Magical Pops, LequiO-30 (Japan) (Best of the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122646,7 +128954,8 @@ SLPS-02888:
     multitap: false
     linkCable: false
 SLPS-02627:
-  name: "Pachi-Slot Teiou 5 - Kongdom, Super Star Dust 2, Flying Momonga (Japan)"
+  name: "Pachi-Slot Teiou 5 - Kongdom, Super Star Dust 2, Flying Momonga"
+  saveName: "Pachi-Slot Teiou 5 - Kongdom, Super Star Dust 2, Flying Momonga (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122665,7 +128974,8 @@ SLPS-02627:
     multitap: false
     linkCable: false
 SLPS-03149:
-  name: "Pachi-Slot Teiou 5 - Kongdom, Super Star Dust 2, Flying Momonga (Japan) (Best of the Best)"
+  name: "Pachi-Slot Teiou 5 - Kongdom, Super Star Dust 2, Flying Momonga (Best of the Best)"
+  saveName: "Pachi-Slot Teiou 5 - Kongdom, Super Star Dust 2, Flying Momonga (Japan) (Best of the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122703,7 +129013,8 @@ SLPS-03150:
     multitap: false
     linkCable: false
 SLPS-02657:
-  name: "Pachi-Slot Teiou 6 - Kung-Fu Lady, BangBang, Prelude 2 (Japan)"
+  name: "Pachi-Slot Teiou 6 - Kung-Fu Lady, BangBang, Prelude 2"
+  saveName: "Pachi-Slot Teiou 6 - Kung-Fu Lady, BangBang, Prelude 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122722,7 +129033,8 @@ SLPS-02657:
     multitap: false
     linkCable: false
 SLPS-02991:
-  name: "Pachi-Slot Teiou 7 - Maker Suishou Manual Vol. 1 - Beat the Dragon 2, Lupin Sansei, Hot Rod Queen (Japan)"
+  name: "Pachi-Slot Teiou 7 - Maker Suishou Manual Vol. 1 - Beat the Dragon 2, Lupin Sansei, Hot Rod Queen"
+  saveName: "Pachi-Slot Teiou 7 - Maker Suishou Manual Vol. 1 - Beat the Dragon 2, Lupin Sansei, Hot Rod Queen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122741,7 +129053,8 @@ SLPS-02991:
     multitap: false
     linkCable: false
 SLPS-02114:
-  name: "Pachi-Slot Teiou Mini - Dr. A7 (Japan)"
+  name: "Pachi-Slot Teiou Mini - Dr. A7"
+  saveName: "Pachi-Slot Teiou Mini - Dr. A7 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122779,7 +129092,8 @@ SLPS-02745:
     multitap: false
     linkCable: false
 SLPS-02860:
-  name: "Pachinko & Pachi-Slot - Parlor! Pro EX - CR Inakappe Taishou A & Pachi-Slot Lupin Sansei (Japan)"
+  name: "Pachinko & Pachi-Slot - Parlor! Pro EX - CR Inakappe Taishou A & Pachi-Slot Lupin Sansei"
+  saveName: "Pachinko & Pachi-Slot - Parlor! Pro EX - CR Inakappe Taishou A & Pachi-Slot Lupin Sansei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122798,7 +129112,8 @@ SLPS-02860:
     multitap: false
     linkCable: false
 SLPM-86006:
-  name: "Pachinko Dream (Japan)"
+  name: "Pachinko Dream"
+  saveName: "Pachinko Dream (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122816,7 +129131,8 @@ SLPM-86006:
     multitap: false
     linkCable: false
 SLPS-01089:
-  name: "Pachinko Hall - Shinsou Daikaiten (Japan)"
+  name: "Pachinko Hall - Shinsou Daikaiten"
+  saveName: "Pachinko Hall - Shinsou Daikaiten (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -122834,7 +129150,8 @@ SLPS-01089:
     multitap: false
     linkCable: false
 SLPS-03254:
-  name: "Pachinko Teiou - CR Sore Ute Hama-chan 2 & CR Sore Yuke Matchan S (Japan)"
+  name: "Pachinko Teiou - CR Sore Ute Hama-chan 2 & CR Sore Yuke Matchan S"
+  saveName: "Pachinko Teiou - CR Sore Ute Hama-chan 2 & CR Sore Yuke Matchan S (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122853,7 +129170,8 @@ SLPS-03254:
     multitap: false
     linkCable: false
 SLPS-00037:
-  name: "Pachio-kun - Pachinko Land Adventure (Japan)"
+  name: "Pachio-kun - Pachinko Land Adventure"
+  saveName: "Pachio-kun - Pachinko Land Adventure (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -122873,7 +129191,8 @@ SLPS-00037:
     multitap: false
     linkCable: false
 SLPS-02419:
-  name: "Pachitte Chonmage - Ouendan & C. C. Girls (Japan)"
+  name: "Pachitte Chonmage - Ouendan & C. C. Girls"
+  saveName: "Pachitte Chonmage - Ouendan & C. C. Girls (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122892,7 +129211,8 @@ SLPS-02419:
     multitap: false
     linkCable: false
 SLPS-02575:
-  name: "Pachitte Chonmage 2 - Kyoraku Kounin Tanukichi 2000 & Jungle P (Japan)"
+  name: "Pachitte Chonmage 2 - Kyoraku Kounin Tanukichi 2000 & Jungle P"
+  saveName: "Pachitte Chonmage 2 - Kyoraku Kounin Tanukichi 2000 & Jungle P (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122911,7 +129231,8 @@ SLPS-02575:
     multitap: false
     linkCable: false
 SLPS-03422:
-  name: "Pachitte Chonmage 3 - Kyoraku Kounin Gladiator & Tama-chan (Japan)"
+  name: "Pachitte Chonmage 3 - Kyoraku Kounin Gladiator & Tama-chan"
+  saveName: "Pachitte Chonmage 3 - Kyoraku Kounin Gladiator & Tama-chan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122930,7 +129251,8 @@ SLPS-03422:
     multitap: false
     linkCable: false
 SLES-03576:
-  name: "Pajama Sam - You Are What You Eat from Your Head to Your Feet (Europe)"
+  name: "Pajama Sam - You Are What You Eat from Your Head to Your Feet"
+  saveName: "Pajama Sam - You Are What You Eat from Your Head to Your Feet (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122949,7 +129271,8 @@ SLES-03576:
     multitap: false
     linkCable: false
 SLUS-01389:
-  name: "Pajama Sam - You Are What You Eat from Your Head to Your Feet (USA)"
+  name: "Pajama Sam - You Are What You Eat from Your Head to Your Feet"
+  saveName: "Pajama Sam - You Are What You Eat from Your Head to Your Feet (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -122968,7 +129291,8 @@ SLUS-01389:
     multitap: false
     linkCable: false
 SLPS-00346:
-  name: "Pal - Shinken Densetsu (Japan)"
+  name: "Pal - Shinken Densetsu"
+  saveName: "Pal - Shinken Densetsu (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -122989,11 +129313,13 @@ SLPS-00346:
     multitap: false
     linkCable: false
 SLPM-80079:
-  name: "Pal - Shinken Densetsu (Japan) (Demo)"
+  name: "Pal - Shinken Densetsu (Demo)"
+  saveName: "Pal - Shinken Densetsu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01820:
-  name: "Palm Town (Japan)"
+  name: "Palm Town"
+  saveName: "Palm Town (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123012,7 +129338,8 @@ SLPS-01820:
     multitap: true
     linkCable: false
 SLPM-87018:
-  name: "Palm Town (Japan) (Major Wave)"
+  name: "Palm Town (Major Wave)"
+  saveName: "Palm Town (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123031,7 +129358,8 @@ SLPM-87018:
     multitap: true
     linkCable: false
 SLES-00965:
-  name: "Pandemonium 2 (Europe)"
+  name: "Pandemonium 2"
+  saveName: "Pandemonium 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -123049,11 +129377,13 @@ SLES-00965:
     multitap: false
     linkCable: false
 SLED-01015:
-  name: "Pandemonium 2 (France) (Demo)"
+  name: "Pandemonium 2 (Demo)"
+  saveName: "Pandemonium 2 (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00578:
-  name: "Pandemonium 2 (USA)"
+  name: "Pandemonium 2"
+  saveName: "Pandemonium 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -123074,11 +129404,13 @@ SLUS-00578:
     multitap: false
     linkCable: false
 SLUS-80578:
-  name: "Pandemonium 2 (USA) (Demo)"
+  name: "Pandemonium 2 (Demo)"
+  saveName: "Pandemonium 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00526:
-  name: "Pandemonium! (Europe)"
+  name: "Pandemonium!"
+  saveName: "Pandemonium! (Europe)"
   controllers:
     - DigitalController
   settings:
@@ -123098,13 +129430,15 @@ SLES-00526:
     multitap: false
     linkCable: false
 SLED-00570:
-  name: "Pandemonium! (Europe) (Demo)"
+  name: "Pandemonium! (Demo)"
+  saveName: "Pandemonium! (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 100
 SLUS-00232:
-  name: "Pandemonium! (USA)"
+  name: "Pandemonium!"
+  saveName: "Pandemonium! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -123127,7 +129461,8 @@ SLUS-00232:
     multitap: false
     linkCable: false
 SLPS-02391:
-  name: "Pandora Max Series Vol. 1 - Dragon Knights Glorious (Japan)"
+  name: "Pandora Max Series Vol. 1 - Dragon Knights Glorious"
+  saveName: "Pandora Max Series Vol. 1 - Dragon Knights Glorious (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123146,7 +129481,8 @@ SLPS-02391:
     multitap: false
     linkCable: false
 SLPS-02551:
-  name: "Pandora Max Series Vol. 2 - Shisha no Yobu Yakata (Japan)"
+  name: "Pandora Max Series Vol. 2 - Shisha no Yobu Yakata"
+  saveName: "Pandora Max Series Vol. 2 - Shisha no Yobu Yakata (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123165,7 +129501,8 @@ SLPS-02551:
     multitap: false
     linkCable: false
 SLPS-02637:
-  name: "Pandora Max Series Vol. 3 - Rubbish Blazon (Japan)"
+  name: "Pandora Max Series Vol. 3 - Rubbish Blazon"
+  saveName: "Pandora Max Series Vol. 3 - Rubbish Blazon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123184,7 +129521,8 @@ SLPS-02637:
     multitap: false
     linkCable: false
 SLPS-02712:
-  name: "Pandora Max Series Vol. 4 - Catch! Kimochi Sensation (Japan)"
+  name: "Pandora Max Series Vol. 4 - Catch! Kimochi Sensation"
+  saveName: "Pandora Max Series Vol. 4 - Catch! Kimochi Sensation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123203,7 +129541,8 @@ SLPS-02712:
     multitap: false
     linkCable: false
 SLPS-02944:
-  name: "Pandora Max Series Vol. 5 - Gochachiru (Japan)"
+  name: "Pandora Max Series Vol. 5 - Gochachiru"
+  saveName: "Pandora Max Series Vol. 5 - Gochachiru (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123222,7 +129561,8 @@ SLPS-02944:
     multitap: false
     linkCable: false
 SLPS-03106:
-  name: "Pandora Max Series Vol. 6 - Oni Zero - Fukkatsu (Japan)"
+  name: "Pandora Max Series Vol. 6 - Oni Zero - Fukkatsu"
+  saveName: "Pandora Max Series Vol. 6 - Oni Zero - Fukkatsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123241,7 +129581,8 @@ SLPS-03106:
     multitap: false
     linkCable: false
 SLPS-00347:
-  name: "Pandora Project - The Logic Master (Japan)"
+  name: "Pandora Project - The Logic Master"
+  saveName: "Pandora Project - The Logic Master (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -123259,7 +129600,8 @@ SLPS-00347:
     multitap: false
     linkCable: false
 SCPS-10096:
-  name: "Panekit - Infinitive Crafting Toy Case (Japan)"
+  name: "Panekit - Infinitive Crafting Toy Case"
+  saveName: "Panekit - Infinitive Crafting Toy Case (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-903-g35a8c5b"
@@ -123281,7 +129623,8 @@ SCPS-10096:
     multitap: false
     linkCable: false
 SLPS-01162:
-  name: "Panel Quiz Attack 25 (Japan)"
+  name: "Panel Quiz Attack 25"
+  saveName: "Panel Quiz Attack 25 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -123299,7 +129642,8 @@ SLPS-01162:
     multitap: true
     linkCable: false
 SLPS-00899:
-  name: "Panzer Bandit (Japan)"
+  name: "Panzer Bandit"
+  saveName: "Panzer Bandit (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -123321,11 +129665,13 @@ SLPS-00899:
     multitap: true
     linkCable: false
 SLPM-80124:
-  name: "Panzer Bandit (Japan) (Demo)"
+  name: "Panzer Bandit (Demo)"
+  saveName: "Panzer Bandit (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03339:
-  name: "Panzer Front (Europe) (En,Fr,De)"
+  name: "Panzer Front"
+  saveName: "Panzer Front (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123346,7 +129692,8 @@ SLES-03339:
     multitap: false
     linkCable: false
 SLPS-02503:
-  name: "Panzer Front (Japan)"
+  name: "Panzer Front"
+  saveName: "Panzer Front (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123365,11 +129712,13 @@ SLPS-02503:
     multitap: false
     linkCable: false
 SLPM-80499:
-  name: "Panzer Front (Japan) (Demo)"
+  name: "Panzer Front (Demo)"
+  saveName: "Panzer Front (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01399:
-  name: "Panzer Front (USA)"
+  name: "Panzer Front"
+  saveName: "Panzer Front (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123407,9 +129756,11 @@ SLPS-03345:
     multitap: false
     linkCable: false
 SLES-03750:
-  name: "Panzer Front bis. (Europe) (En,Fr,De) (Beta)"
+  name: "Panzer Front bis. (Beta)"
+  saveName: "Panzer Front bis. (Europe) (En,Fr,De) (Beta)"
 SLPS-03111:
-  name: "Panzer Front bis. (Japan)"
+  name: "Panzer Front bis."
+  saveName: "Panzer Front bis. (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123428,7 +129779,8 @@ SLPS-03111:
     multitap: false
     linkCable: false
 SLES-00041:
-  name: "Panzer General (Europe)"
+  name: "Panzer General"
+  saveName: "Panzer General (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -123446,7 +129798,8 @@ SLES-00041:
     multitap: false
     linkCable: false
 SLPS-00552:
-  name: "Panzer General (Japan)"
+  name: "Panzer General"
+  saveName: "Panzer General (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -123464,7 +129817,8 @@ SLPS-00552:
     multitap: false
     linkCable: false
 SLUS-00132:
-  name: "Panzer General (USA)"
+  name: "Panzer General"
+  saveName: "Panzer General (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -123482,7 +129836,8 @@ SLUS-00132:
     multitap: false
     linkCable: false
 SLPM-86695:
-  name: "Pao Leeming Kanshuu - Fuusui Nyuumon (Japan)"
+  name: "Pao Leeming Kanshuu - Fuusui Nyuumon"
+  saveName: "Pao Leeming Kanshuu - Fuusui Nyuumon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -123500,7 +129855,8 @@ SLPM-86695:
     multitap: false
     linkCable: false
 SLES-04048:
-  name: "Paradise Casino (Europe)"
+  name: "Paradise Casino"
+  saveName: "Paradise Casino (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -123519,7 +129875,8 @@ SLES-04048:
     multitap: false
     linkCable: false
 SLPS-01375:
-  name: "Paranoia Scape (Japan)"
+  name: "Paranoia Scape"
+  saveName: "Paranoia Scape (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -123579,7 +129936,8 @@ SCPS-45203:
     multitap: false
     linkCable: false
 SLPS-01230:
-  name: "Parasite Eve (Japan) (Disc 1)"
+  name: "Parasite Eve (Disc 1)"
+  saveName: "Parasite Eve (Japan) (Disc 1)"
   discSet:
     name: "Parasite Eve (Japan)"
     serials:
@@ -123605,7 +129963,8 @@ SLPS-01230:
     multitap: false
     linkCable: false
 SLPS-01231:
-  name: "Parasite Eve (Japan) (Disc 2)"
+  name: "Parasite Eve (Disc 2)"
+  saveName: "Parasite Eve (Japan) (Disc 2)"
   discSet:
     name: "Parasite Eve (Japan)"
     serials:
@@ -123631,7 +129990,8 @@ SLPS-01231:
     multitap: false
     linkCable: false
 SLUS-00662:
-  name: "Parasite Eve (USA) (Disc 1)"
+  name: "Parasite Eve (Disc 1)"
+  saveName: "Parasite Eve (USA) (Disc 1)"
   discSet:
     name: "Parasite Eve (USA)"
     serials:
@@ -123660,7 +130020,8 @@ SLUS-00662:
     multitap: false
     linkCable: false
 SLUS-00668:
-  name: "Parasite Eve (USA) (Disc 2)"
+  name: "Parasite Eve (Disc 2)"
+  saveName: "Parasite Eve (USA) (Disc 2)"
   discSet:
     name: "Parasite Eve (USA)"
     serials:
@@ -123689,7 +130050,8 @@ SLUS-00668:
     multitap: false
     linkCable: false
 SLPM-80300:
-  name: "Parasite Eve - Special CD-ROM (Japan)"
+  name: "Parasite Eve - Special CD-ROM"
+  saveName: "Parasite Eve - Special CD-ROM (Japan)"
   traits:
     - DisableWidescreen
 SLPS-91479:
@@ -123747,7 +130109,8 @@ SLPS-02779:
     multitap: false
     linkCable: false
 SLES-02558:
-  name: "Parasite Eve II (Europe) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (Europe) (Disc 1)"
   discSet:
     name: "Parasite Eve II (Europe)"
     serials:
@@ -123777,7 +130140,8 @@ SLES-02558:
     multitap: false
     linkCable: false
 SLES-12558:
-  name: "Parasite Eve II (Europe) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (Europe) (Disc 2)"
   discSet:
     name: "Parasite Eve II (Europe)"
     serials:
@@ -123807,7 +130171,8 @@ SLES-12558:
     multitap: false
     linkCable: false
 SLES-02559:
-  name: "Parasite Eve II (France) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (France) (Disc 1)"
   discSet:
     name: "Parasite Eve II (France)"
     serials:
@@ -123837,7 +130202,8 @@ SLES-02559:
     multitap: false
     linkCable: false
 SLES-12559:
-  name: "Parasite Eve II (France) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (France) (Disc 2)"
   discSet:
     name: "Parasite Eve II (France)"
     serials:
@@ -123867,7 +130233,8 @@ SLES-12559:
     multitap: false
     linkCable: false
 SLES-02560:
-  name: "Parasite Eve II (Germany) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (Germany) (Disc 1)"
   discSet:
     name: "Parasite Eve II (Germany)"
     serials:
@@ -123897,7 +130264,8 @@ SLES-02560:
     multitap: false
     linkCable: false
 SLES-12560:
-  name: "Parasite Eve II (Germany) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (Germany) (Disc 2)"
   discSet:
     name: "Parasite Eve II (Germany)"
     serials:
@@ -123927,7 +130295,8 @@ SLES-12560:
     multitap: false
     linkCable: false
 SLES-02562:
-  name: "Parasite Eve II (Italy) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (Italy) (Disc 1)"
   discSet:
     name: "Parasite Eve II (Italy)"
     serials:
@@ -123957,7 +130326,8 @@ SLES-02562:
     multitap: false
     linkCable: false
 SLES-12562:
-  name: "Parasite Eve II (Italy) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (Italy) (Disc 2)"
   discSet:
     name: "Parasite Eve II (Italy)"
     serials:
@@ -123987,7 +130357,8 @@ SLES-12562:
     multitap: false
     linkCable: false
 SCPS-45467:
-  name: "Parasite Eve II (Japan, Asia) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (Japan, Asia) (Disc 1)"
   discSet:
     name: "Parasite Eve II (Japan, Asia)"
     serials:
@@ -124019,7 +130390,8 @@ SCPS-45467:
     multitap: false
     linkCable: false
 SCPS-45468:
-  name: "Parasite Eve II (Japan, Asia) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (Japan, Asia) (Disc 2)"
   discSet:
     name: "Parasite Eve II (Japan, Asia)"
     serials:
@@ -124051,7 +130423,8 @@ SCPS-45468:
     multitap: false
     linkCable: false
 SLES-02561:
-  name: "Parasite Eve II (Spain) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (Spain) (Disc 1)"
   discSet:
     name: "Parasite Eve II (Spain)"
     serials:
@@ -124084,7 +130457,8 @@ SLES-02561:
     multitap: false
     linkCable: false
 SLES-12561:
-  name: "Parasite Eve II (Spain) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (Spain) (Disc 2)"
   discSet:
     name: "Parasite Eve II (Spain)"
     serials:
@@ -124117,7 +130491,8 @@ SLES-12561:
     multitap: false
     linkCable: false
 SLUS-01042:
-  name: "Parasite Eve II (USA) (Disc 1)"
+  name: "Parasite Eve II (Disc 1)"
+  saveName: "Parasite Eve II (USA) (Disc 1)"
   discSet:
     name: "Parasite Eve II (USA)"
     serials:
@@ -124149,7 +130524,8 @@ SLUS-01042:
     multitap: false
     linkCable: false
 SLUS-01055:
-  name: "Parasite Eve II (USA) (Disc 2)"
+  name: "Parasite Eve II (Disc 2)"
+  saveName: "Parasite Eve II (USA) (Disc 2)"
   discSet:
     name: "Parasite Eve II (USA)"
     serials:
@@ -124180,7 +130556,8 @@ SLUS-01055:
     multitap: false
     linkCable: false
 SLES-03108:
-  name: "Paris-Marseille Racing (France)"
+  name: "Paris-Marseille Racing"
+  saveName: "Paris-Marseille Racing (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -124203,7 +130580,8 @@ SLES-03108:
     multitap: false
     linkCable: false
 SLES-03918:
-  name: "Paris-Marseille Racing II (France)"
+  name: "Paris-Marseille Racing II"
+  saveName: "Paris-Marseille Racing II (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -124227,7 +130605,8 @@ SLES-03918:
     multitap: false
     linkCable: false
 SLPS-01539:
-  name: "Parlor Station (Japan)"
+  name: "Parlor Station"
+  saveName: "Parlor Station (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124245,7 +130624,8 @@ SLPS-01539:
     multitap: false
     linkCable: false
 SLPS-02732:
-  name: "Parlor Station (Japan) (Reprint)"
+  name: "Parlor Station (Reprint)"
+  saveName: "Parlor Station (Japan) (Reprint)"
   controllers:
     - DigitalController
   metadata:
@@ -124263,7 +130643,8 @@ SLPS-02732:
     multitap: false
     linkCable: false
 SLPS-00838:
-  name: "Parlor! Pro (Japan)"
+  name: "Parlor! Pro"
+  saveName: "Parlor! Pro (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -124284,7 +130665,8 @@ SLPS-00838:
     multitap: false
     linkCable: false
 SLPS-01043:
-  name: "Parlor! Pro 2 (Japan)"
+  name: "Parlor! Pro 2"
+  saveName: "Parlor! Pro 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124320,7 +130702,8 @@ SLPS-91184:
     multitap: false
     linkCable: false
 SLPS-01453:
-  name: "Parlor! Pro 3 (Japan)"
+  name: "Parlor! Pro 3"
+  saveName: "Parlor! Pro 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124338,7 +130721,8 @@ SLPS-01453:
     multitap: false
     linkCable: false
 SLPS-01646:
-  name: "Parlor! Pro 4 (Japan)"
+  name: "Parlor! Pro 4"
+  saveName: "Parlor! Pro 4 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -124359,7 +130743,8 @@ SLPS-01646:
     multitap: false
     linkCable: false
 SLPS-01828:
-  name: "Parlor! Pro 5 (Japan)"
+  name: "Parlor! Pro 5"
+  saveName: "Parlor! Pro 5 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124377,7 +130762,8 @@ SLPS-01828:
     multitap: false
     linkCable: false
 SLPS-01859:
-  name: "Parlor! Pro 6 (Japan)"
+  name: "Parlor! Pro 6"
+  saveName: "Parlor! Pro 6 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124395,7 +130781,8 @@ SLPS-01859:
     multitap: false
     linkCable: false
 SLPS-01971:
-  name: "Parlor! Pro 7 (Japan)"
+  name: "Parlor! Pro 7"
+  saveName: "Parlor! Pro 7 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124414,7 +130801,8 @@ SLPS-01971:
     multitap: false
     linkCable: false
 SLPS-02483:
-  name: "Parlor! Pro 8 (Japan)"
+  name: "Parlor! Pro 8"
+  saveName: "Parlor! Pro 8 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124433,7 +130821,8 @@ SLPS-02483:
     multitap: false
     linkCable: false
 SLPS-02949:
-  name: "Parlor! Pro Collection (Japan)"
+  name: "Parlor! Pro Collection"
+  saveName: "Parlor! Pro Collection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124451,7 +130840,8 @@ SLPS-02949:
     multitap: false
     linkCable: false
 SLPS-02781:
-  name: "Parlor! Pro Jr. Collection (Japan)"
+  name: "Parlor! Pro Jr. Collection"
+  saveName: "Parlor! Pro Jr. Collection (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124470,7 +130860,8 @@ SLPS-02781:
     multitap: false
     linkCable: false
 SLPS-02092:
-  name: "Parlor! Pro Jr. Vol. 1 - CR Dera Maitta J-3 (Japan)"
+  name: "Parlor! Pro Jr. Vol. 1 - CR Dera Maitta J-3"
+  saveName: "Parlor! Pro Jr. Vol. 1 - CR Dera Maitta J-3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124489,7 +130880,8 @@ SLPS-02092:
     multitap: false
     linkCable: false
 SLPS-02357:
-  name: "Parlor! Pro Jr. Vol. 2 - CR Lupin Sansei K (Japan)"
+  name: "Parlor! Pro Jr. Vol. 2 - CR Lupin Sansei K"
+  saveName: "Parlor! Pro Jr. Vol. 2 - CR Lupin Sansei K (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124508,7 +130900,8 @@ SLPS-02357:
     multitap: false
     linkCable: false
 SLPS-02426:
-  name: "Parlor! Pro Jr. Vol. 3 - CR Shin Pikaichi Tengoku T (Japan)"
+  name: "Parlor! Pro Jr. Vol. 3 - CR Shin Pikaichi Tengoku T"
+  saveName: "Parlor! Pro Jr. Vol. 3 - CR Shin Pikaichi Tengoku T (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124527,7 +130920,8 @@ SLPS-02426:
     multitap: false
     linkCable: false
 SLPS-02519:
-  name: "Parlor! Pro Jr. Vol. 4 - Thunder Skeleton X (Japan)"
+  name: "Parlor! Pro Jr. Vol. 4 - Thunder Skeleton X"
+  saveName: "Parlor! Pro Jr. Vol. 4 - Thunder Skeleton X (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124546,7 +130940,8 @@ SLPS-02519:
     multitap: false
     linkCable: false
 SLPS-02562:
-  name: "Parlor! Pro Jr. Vol. 5 - CR Fruit World X (Japan)"
+  name: "Parlor! Pro Jr. Vol. 5 - CR Fruit World X"
+  saveName: "Parlor! Pro Jr. Vol. 5 - CR Fruit World X (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124565,7 +130960,8 @@ SLPS-02562:
     multitap: false
     linkCable: false
 SLPS-02690:
-  name: "Parlor! Pro Jr. Vol. 6 - CR Tsumo Tsumo Tengoku Nan 2-kyoku (Japan)"
+  name: "Parlor! Pro Jr. Vol. 6 - CR Tsumo Tsumo Tengoku Nan 2-kyoku"
+  saveName: "Parlor! Pro Jr. Vol. 6 - CR Tsumo Tsumo Tengoku Nan 2-kyoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124583,7 +130979,8 @@ SLPS-02690:
     multitap: false
     linkCable: false
 SLPS-02996:
-  name: "Parlor! Pro Special - CR Harenchi Gakuen & CR Toukon (Japan)"
+  name: "Parlor! Pro Special - CR Harenchi Gakuen & CR Toukon"
+  saveName: "Parlor! Pro Special - CR Harenchi Gakuen & CR Toukon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124602,7 +130999,8 @@ SLPS-02996:
     multitap: false
     linkCable: false
 SLPM-86016:
-  name: "Paro Wars (Japan)"
+  name: "Paro Wars"
+  saveName: "Paro Wars (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -124640,7 +131038,8 @@ SLPM-86392:
     multitap: true
     linkCable: false
 SLES-00036:
-  name: "Parodius (Europe)"
+  name: "Parodius"
+  saveName: "Parodius (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -124679,7 +131078,8 @@ SCPS-45112:
     multitap: false
     linkCable: false
 SLPS-00959:
-  name: "Pastel Muses (Japan)"
+  name: "Pastel Muses"
+  saveName: "Pastel Muses (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124697,11 +131097,13 @@ SLPS-00959:
     multitap: false
     linkCable: false
 SLPM-80131:
-  name: "Pastel Muses (Japan) (Demo)"
+  name: "Pastel Muses (Demo)"
+  saveName: "Pastel Muses (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01804:
-  name: "Patlabor - The Game - Taikenban Ver. 1.0 (Japan) (Demo)"
+  name: "Patlabor - The Game - Taikenban Ver. 1.0 (Demo)"
+  saveName: "Patlabor - The Game - Taikenban Ver. 1.0 (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124720,7 +131122,8 @@ SLPS-01804:
     multitap: false
     linkCable: false
 SLES-04092:
-  name: "Patriotic Pinball (Europe) (En,Fr,De,It)"
+  name: "Patriotic Pinball"
+  saveName: "Patriotic Pinball (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124742,7 +131145,8 @@ SLES-04092:
     multitap: false
     linkCable: false
 SLUS-01539:
-  name: "Patriotic Pinball (USA)"
+  name: "Patriotic Pinball"
+  saveName: "Patriotic Pinball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124761,7 +131165,8 @@ SLUS-01539:
     multitap: false
     linkCable: false
 SLES-00953:
-  name: "Pax Corpus (Europe) (En,Fr,De)"
+  name: "Pax Corpus"
+  saveName: "Pax Corpus (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -124781,7 +131186,8 @@ SLES-00953:
     multitap: false
     linkCable: false
 SLES-00727:
-  name: "Peak Performance (Europe)"
+  name: "Peak Performance"
+  saveName: "Peak Performance (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -124803,7 +131209,8 @@ SLES-00727:
     multitap: false
     linkCable: false
 SLUS-00400:
-  name: "Peak Performance (USA)"
+  name: "Peak Performance"
+  saveName: "Peak Performance (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -124822,7 +131229,8 @@ SLUS-00400:
     multitap: false
     linkCable: false
 SLPS-00632:
-  name: "Pebble Beach no Hatou Plus (Japan)"
+  name: "Pebble Beach no Hatou Plus"
+  saveName: "Pebble Beach no Hatou Plus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -124858,7 +131266,8 @@ SLPS-00841:
     multitap: false
     linkCable: false
 SCES-00391:
-  name: "Penny Racers (Europe)"
+  name: "Penny Racers"
+  saveName: "Penny Racers (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -124880,7 +131289,8 @@ SCES-00391:
     multitap: false
     linkCable: false
 SLPS-01762:
-  name: "Pepsiman (Japan)"
+  name: "Pepsiman"
+  saveName: "Pepsiman (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -124906,7 +131316,8 @@ SLPS-01762:
     multitap: false
     linkCable: false
 SLES-01583:
-  name: "Pequenos Guerreros (Spain)"
+  name: "Pequenos Guerreros"
+  saveName: "Pequenos Guerreros (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124925,7 +131336,8 @@ SLES-01583:
     multitap: false
     linkCable: false
 SLES-00805:
-  name: "Perfect Assassin (Europe) (En,Fr,De,Es,It)"
+  name: "Perfect Assassin"
+  saveName: "Perfect Assassin (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -124948,7 +131360,8 @@ SLES-00805:
     multitap: false
     linkCable: false
 SLPS-02409:
-  name: "Perfect Fishing - Bass Tsuri (Japan)"
+  name: "Perfect Fishing - Bass Tsuri"
+  saveName: "Perfect Fishing - Bass Tsuri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124967,7 +131380,8 @@ SLPS-02409:
     multitap: false
     linkCable: false
 SLPS-02410:
-  name: "Perfect Fishing - Isozuri (Japan)"
+  name: "Perfect Fishing - Isozuri"
+  saveName: "Perfect Fishing - Isozuri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -124986,7 +131400,8 @@ SLPS-02410:
     multitap: false
     linkCable: false
 SLPS-01394:
-  name: "Perfect Golf 2 (Japan)"
+  name: "Perfect Golf 2"
+  saveName: "Perfect Golf 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125004,7 +131419,8 @@ SLPS-01394:
     multitap: false
     linkCable: false
 SLPS-00087:
-  name: "Perfect Golf, The (Japan)"
+  name: "Perfect Golf, The"
+  saveName: "Perfect Golf, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125022,7 +131438,8 @@ SLPS-00087:
     multitap: false
     linkCable: false
 SLPS-02135:
-  name: "Perfect Performer - The Yellow Monkey (Japan)"
+  name: "Perfect Performer - The Yellow Monkey"
+  saveName: "Perfect Performer - The Yellow Monkey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125041,7 +131458,8 @@ SLPS-02135:
     multitap: true
     linkCable: false
 SLES-00581:
-  name: "Perfect Weapon (Europe)"
+  name: "Perfect Weapon"
+  saveName: "Perfect Weapon (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -125059,7 +131477,8 @@ SLES-00581:
     multitap: false
     linkCable: false
 SLES-00685:
-  name: "Perfect Weapon (France)"
+  name: "Perfect Weapon"
+  saveName: "Perfect Weapon (France)"
   controllers:
     - DigitalController
   metadata:
@@ -125077,7 +131496,8 @@ SLES-00685:
     multitap: false
     linkCable: false
 SLES-00686:
-  name: "Perfect Weapon (Germany)"
+  name: "Perfect Weapon"
+  saveName: "Perfect Weapon (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -125095,7 +131515,8 @@ SLES-00686:
     multitap: false
     linkCable: false
 SLUS-00341:
-  name: "Perfect Weapon (USA)"
+  name: "Perfect Weapon"
+  saveName: "Perfect Weapon (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -125113,7 +131534,8 @@ SLUS-00341:
     multitap: false
     linkCable: false
 SLUS-00339:
-  name: "Persona (USA)"
+  name: "Persona"
+  saveName: "Persona (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-941-g2e64f77"
@@ -125138,7 +131560,8 @@ SLUS-00339:
     multitap: false
     linkCable: false
 SLPM-86967:
-  name: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 1)"
+  name: "Persona 2 - Batsu - Eternal Punishment (Disc 1)"
+  saveName: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 1)"
   discSet:
     name: "Persona 2 - Batsu - Eternal Punishment (Japan)"
     serials:
@@ -125167,7 +131590,8 @@ SLPM-86967:
     multitap: false
     linkCable: false
 SLPS-02785:
-  name: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 1) (Deluxe Pack)"
+  name: "Persona 2 - Batsu - Eternal Punishment (Disc 1) (Deluxe Pack)"
+  saveName: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 1) (Deluxe Pack)"
   discSet:
     name: "Persona 2 - Batsu - Eternal Punishment (Japan) (Deluxe Pack)"
     serials:
@@ -125193,7 +131617,8 @@ SLPS-02785:
     multitap: false
     linkCable: false
 SLPS-02826:
-  name: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 2) (Sumaru TV Special Preview Disc)"
+  name: "Persona 2 - Batsu - Eternal Punishment (Disc 2) (Sumaru TV Special Preview Disc)"
+  saveName: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 2) (Sumaru TV Special Preview Disc)"
   discSet:
     name: "Persona 2 - Batsu - Eternal Punishment (Japan)"
     serials:
@@ -125219,7 +131644,8 @@ SLPS-02826:
     multitap: false
     linkCable: false
 SLPS-02786:
-  name: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 2) (Sumaru TV Special Preview Disc) (Deluxe Pack)"
+  name: "Persona 2 - Batsu - Eternal Punishment (Disc 2) (Sumaru TV Special Preview Disc) (Deluxe Pack)"
+  saveName: "Persona 2 - Batsu - Eternal Punishment (Japan) (Disc 2) (Sumaru TV Special Preview Disc) (Deluxe Pack)"
   discSet:
     name: "Persona 2 - Batsu - Eternal Punishment (Japan) (Deluxe Pack)"
     serials:
@@ -125269,7 +131695,8 @@ SCPS-45495:
     multitap: false
     linkCable: false
 SLUS-01158:
-  name: "Persona 2 - Eternal Punishment (USA)"
+  name: "Persona 2 - Eternal Punishment"
+  saveName: "Persona 2 - Eternal Punishment (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -125293,7 +131720,8 @@ SLUS-01158:
     multitap: false
     linkCable: false
 SLUS-01339:
-  name: "Persona 2 - Eternal Punishment (USA) (Bonus Disc)"
+  name: "Persona 2 - Eternal Punishment (Bonus Disc)"
+  saveName: "Persona 2 - Eternal Punishment (USA) (Bonus Disc)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125335,7 +131763,8 @@ SCPS-45410:
     multitap: false
     linkCable: false
 SLPS-02100:
-  name: "Persona 2 - Tsumi - Innocent Sin (Japan)"
+  name: "Persona 2 - Tsumi - Innocent Sin"
+  saveName: "Persona 2 - Tsumi - Innocent Sin (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3771-g8df0496d"
@@ -125359,7 +131788,8 @@ SLPS-02100:
     multitap: false
     linkCable: false
 SLPS-01923:
-  name: "Persona 2 - Tsumi - Innocent Sin (Japan) (Demo)"
+  name: "Persona 2 - Tsumi - Innocent Sin (Demo)"
+  saveName: "Persona 2 - Tsumi - Innocent Sin (Japan) (Demo)"
   controllers:
     - DigitalController
   traits:
@@ -125379,7 +131809,8 @@ SLPS-01923:
     multitap: false
     linkCable: false
 SLPS-91211:
-  name: "Persona 2 - Tsumi - Innocent Sin (Japan) (Rev 1)"
+  name: "Persona 2 - Tsumi - Innocent Sin"
+  saveName: "Persona 2 - Tsumi - Innocent Sin (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125419,7 +131850,8 @@ SLPS-02292:
     multitap: false
     linkCable: false
 SLPS-03082:
-  name: "Pet Pet Pet (Japan)"
+  name: "Pet Pet Pet"
+  saveName: "Pet Pet Pet (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125438,7 +131870,8 @@ SLPS-03082:
     multitap: false
     linkCable: false
 SCES-00981:
-  name: "Pet in TV (Europe)"
+  name: "Pet in TV"
+  saveName: "Pet in TV (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -125456,7 +131889,8 @@ SCES-00981:
     multitap: false
     linkCable: false
 SCES-01358:
-  name: "Pet in TV (Germany)"
+  name: "Pet in TV"
+  saveName: "Pet in TV (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -125474,7 +131908,8 @@ SCES-01358:
     multitap: false
     linkCable: false
 SCES-01357:
-  name: "Pet in TV - Ton Nouveau Meilleur Ami! (France)"
+  name: "Pet in TV - Ton Nouveau Meilleur Ami!"
+  saveName: "Pet in TV - Ton Nouveau Meilleur Ami! (France)"
   controllers:
     - DigitalController
   metadata:
@@ -125492,7 +131927,8 @@ SCES-01357:
     multitap: false
     linkCable: false
 SCPS-10111:
-  name: "Pet in TV - With My Dear Dog (Japan)"
+  name: "Pet in TV - With My Dear Dog"
+  saveName: "Pet in TV - With My Dear Dog (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125511,7 +131947,8 @@ SCPS-10111:
     multitap: false
     linkCable: false
 SLUS-01130:
-  name: "Peter Jacobsen's Golden Tee Golf (USA)"
+  name: "Peter Jacobsen's Golden Tee Golf"
+  saveName: "Peter Jacobsen's Golden Tee Golf (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125530,7 +131967,8 @@ SLUS-01130:
     multitap: true
     linkCable: false
 SCUS-94643:
-  name: "Peter Pan in Disney's Return to Never Land (USA)"
+  name: "Peter Pan in Disney's Return to Never Land"
+  saveName: "Peter Pan in Disney's Return to Never Land (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125549,7 +131987,8 @@ SCUS-94643:
     multitap: false
     linkCable: false
 SLES-02982:
-  name: "Petit Dinosaure, Le - Retour vers la Grande Vallee (France)"
+  name: "Petit Dinosaure, Le - Retour vers la Grande Vallee"
+  saveName: "Petit Dinosaure, Le - Retour vers la Grande Vallee (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125568,7 +132007,8 @@ SLES-02982:
     multitap: false
     linkCable: false
 SLES-01178:
-  name: "Phat Air - Extreme Snowboarding (Europe)"
+  name: "Phat Air - Extreme Snowboarding"
+  saveName: "Phat Air - Extreme Snowboarding (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -125586,7 +132026,8 @@ SLES-01178:
     multitap: false
     linkCable: false
 SCES-00059:
-  name: "Philosoma (Europe) (En,Fr,De)"
+  name: "Philosoma"
+  saveName: "Philosoma (Europe) (En,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -125609,7 +132050,8 @@ SCES-00059:
     multitap: false
     linkCable: false
 SCPS-10009:
-  name: "Philosoma (Japan)"
+  name: "Philosoma"
+  saveName: "Philosoma (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125627,7 +132069,8 @@ SCPS-10009:
     multitap: false
     linkCable: false
 SCUS-94403:
-  name: "Philosoma (USA)"
+  name: "Philosoma"
+  saveName: "Philosoma (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -125645,11 +132088,14 @@ SCUS-94403:
     multitap: false
     linkCable: false
 SCPM-85002:
-  name: "Philosoma Art Book Movie CD-ROM (Japan)"
+  name: "Philosoma Art Book Movie CD-ROM"
+  saveName: "Philosoma Art Book Movie CD-ROM (Japan)"
 PCPX-96012:
-  name: "Philosoma Ver. 0 - Movie CD-ROM (Japan)"
+  name: "Philosoma Ver. 0 - Movie CD-ROM"
+  saveName: "Philosoma Ver. 0 - Movie CD-ROM (Japan)"
 SLUS-01523:
-  name: "Phix - The Adventure (USA)"
+  name: "Phix - The Adventure"
+  saveName: "Phix - The Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125668,7 +132114,8 @@ SLUS-01523:
     multitap: false
     linkCable: false
 SLPS-01116:
-  name: "Photo Genic (Japan)"
+  name: "Photo Genic"
+  saveName: "Photo Genic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125686,7 +132133,8 @@ SLPS-01116:
     multitap: false
     linkCable: false
 SLPS-01092:
-  name: "Photo Genic (Japan) (Genteiban)"
+  name: "Photo Genic (Genteiban)"
+  saveName: "Photo Genic (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -125704,7 +132152,8 @@ SLPS-01092:
     multitap: false
     linkCable: false
 SLPS-01866:
-  name: "Pi to Mail (Japan)"
+  name: "Pi to Mail"
+  saveName: "Pi to Mail (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125723,7 +132172,8 @@ SLPS-01866:
     multitap: false
     linkCable: false
 SLES-03319:
-  name: "Pierrafeu, Les - Bedrock Bowling (France)"
+  name: "Pierrafeu, Les - Bedrock Bowling"
+  saveName: "Pierrafeu, Les - Bedrock Bowling (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125742,7 +132192,8 @@ SLES-03319:
     multitap: false
     linkCable: false
 SLPS-01345:
-  name: "Pikiinya! Excellent (Japan)"
+  name: "Pikiinya! Excellent"
+  saveName: "Pikiinya! Excellent (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125778,7 +132229,8 @@ SLPS-02970:
     multitap: false
     linkCable: false
 SLPS-01847:
-  name: "Pikupiku Sentaro - Puzzle de Gohan! (Japan)"
+  name: "Pikupiku Sentaro - Puzzle de Gohan!"
+  saveName: "Pikupiku Sentaro - Puzzle de Gohan! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125797,7 +132249,8 @@ SLPS-01847:
     multitap: false
     linkCable: false
 SLPS-01600:
-  name: "Pilot ni Narou! (Japan)"
+  name: "Pilot ni Narou!"
+  saveName: "Pilot ni Narou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125820,9 +132273,11 @@ SLPS-01600:
     multitap: false
     linkCable: false
 SLPM-80293:
-  name: "Pilot ni Narou! (Japan) (Taikenban)"
+  name: "Pilot ni Narou! (Taikenban)"
+  saveName: "Pilot ni Narou! (Japan) (Taikenban)"
 SLPS-00482:
-  name: "Pinball Fantasies Deluxe (Japan)"
+  name: "Pinball Fantasies Deluxe"
+  saveName: "Pinball Fantasies Deluxe (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125840,7 +132295,8 @@ SLPS-00482:
     multitap: false
     linkCable: false
 SLES-02922:
-  name: "Pinball Power (Europe)"
+  name: "Pinball Power"
+  saveName: "Pinball Power (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -125859,7 +132315,8 @@ SLES-02922:
     multitap: false
     linkCable: false
 SLES-03932:
-  name: "Pink Panther - Pinkadelic Pursuit (Europe) (En,Fr,De,Es,It)"
+  name: "Pink Panther - Pinkadelic Pursuit"
+  saveName: "Pink Panther - Pinkadelic Pursuit (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -125885,7 +132342,8 @@ SLES-03932:
     multitap: false
     linkCable: false
 SLUS-01451:
-  name: "Pink Panther - Pinkadelic Pursuit (USA)"
+  name: "Pink Panther - Pinkadelic Pursuit"
+  saveName: "Pink Panther - Pinkadelic Pursuit (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1629-g101907a7"
@@ -125907,7 +132365,8 @@ SLUS-01451:
     multitap: false
     linkCable: false
 SLES-04014:
-  name: "Pinobee (Europe) (En,Fr,De,Es,It)"
+  name: "Pinobee"
+  saveName: "Pinobee (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -125929,7 +132388,8 @@ SLES-04014:
     multitap: false
     linkCable: false
 SLUS-01494:
-  name: "Pinobee (USA)"
+  name: "Pinobee"
+  saveName: "Pinobee (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -125947,7 +132407,8 @@ SLUS-01494:
     multitap: false
     linkCable: false
 SLPM-87110:
-  name: "Pinobee no Daibouken (Japan)"
+  name: "Pinobee no Daibouken"
+  saveName: "Pinobee no Daibouken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125965,7 +132426,8 @@ SLPM-87110:
     multitap: false
     linkCable: false
 SLPS-01587:
-  name: "Pinocchia no Miru Yume (Japan)"
+  name: "Pinocchia no Miru Yume"
+  saveName: "Pinocchia no Miru Yume (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -125983,7 +132445,8 @@ SLPS-01587:
     multitap: false
     linkCable: false
 SLUS-01409:
-  name: "Pipe Dreams 3D (USA)"
+  name: "Pipe Dreams 3D"
+  saveName: "Pipe Dreams 3D (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1629-g101907a7"
@@ -126005,7 +132468,8 @@ SLUS-01409:
     multitap: false
     linkCable: false
 SLES-03400:
-  name: "Pipe Mania 3D (Europe) (En,Fr,De,Es,It)"
+  name: "Pipe Mania 3D"
+  saveName: "Pipe Mania 3D (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126028,7 +132492,8 @@ SLES-03400:
     multitap: false
     linkCable: false
 SLES-00201:
-  name: "Pitball (Europe) (En,Fr,De,Es,It)"
+  name: "Pitball"
+  saveName: "Pitball (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -126046,7 +132511,8 @@ SLES-00201:
     multitap: true
     linkCable: false
 SLPS-00607:
-  name: "Pitball (Japan)"
+  name: "Pitball"
+  saveName: "Pitball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -126064,7 +132530,8 @@ SLPS-00607:
     multitap: true
     linkCable: false
 SLUS-00146:
-  name: "Pitball (USA)"
+  name: "Pitball"
+  saveName: "Pitball (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -126082,7 +132549,8 @@ SLUS-00146:
     multitap: true
     linkCable: false
 SLES-00481:
-  name: "Pitfall 3D - Beyond the Jungle (Europe)"
+  name: "Pitfall 3D - Beyond the Jungle"
+  saveName: "Pitfall 3D - Beyond the Jungle (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126101,7 +132569,8 @@ SLES-00481:
     multitap: false
     linkCable: false
 SLES-00836:
-  name: "Pitfall 3D - Beyond the Jungle (France)"
+  name: "Pitfall 3D - Beyond the Jungle"
+  saveName: "Pitfall 3D - Beyond the Jungle (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -126123,11 +132592,13 @@ SLES-00836:
     multitap: false
     linkCable: false
 SLED-01243:
-  name: "Pitfall 3D - Beyond the Jungle (France) (Demo)"
+  name: "Pitfall 3D - Beyond the Jungle (Demo)"
+  saveName: "Pitfall 3D - Beyond the Jungle (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00837:
-  name: "Pitfall 3D - Beyond the Jungle (Germany)"
+  name: "Pitfall 3D - Beyond the Jungle"
+  saveName: "Pitfall 3D - Beyond the Jungle (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126146,7 +132617,8 @@ SLES-00837:
     multitap: false
     linkCable: false
 SLPS-01669:
-  name: "Pitfall 3D - Beyond the Jungle (Japan)"
+  name: "Pitfall 3D - Beyond the Jungle"
+  saveName: "Pitfall 3D - Beyond the Jungle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126165,7 +132637,8 @@ SLPS-01669:
     multitap: false
     linkCable: false
 SLUS-00254:
-  name: "Pitfall 3D - Beyond the Jungle (USA)"
+  name: "Pitfall 3D - Beyond the Jungle"
+  saveName: "Pitfall 3D - Beyond the Jungle (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -126187,11 +132660,13 @@ SLUS-00254:
     multitap: false
     linkCable: false
 SLUS-90017:
-  name: "Pitfall 3D - Beyond the Jungle (USA) (Demo)"
+  name: "Pitfall 3D - Beyond the Jungle (Demo)"
+  saveName: "Pitfall 3D - Beyond the Jungle (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02290:
-  name: "Pixygarden (Japan) (Disc 1) (Game Disc)"
+  name: "Pixygarden (Disc 1) (Game Disc)"
+  saveName: "Pixygarden (Japan) (Disc 1) (Game Disc)"
   discSet:
     name: "Pixygarden (Japan)"
     serials:
@@ -126215,7 +132690,8 @@ SLPS-02290:
     multitap: false
     linkCable: false
 SLPS-02291:
-  name: "Pixygarden (Japan) (Disc 2) (Extra Disc)"
+  name: "Pixygarden (Disc 2) (Extra Disc)"
+  saveName: "Pixygarden (Japan) (Disc 2) (Extra Disc)"
   discSet:
     name: "Pixygarden (Japan)"
     serials:
@@ -126258,25 +132734,31 @@ SLPS-02906:
     multitap: false
     linkCable: false
 SCED-02520:
-  name: "Pizza Hut Demo 01 (Europe)"
+  name: "Pizza Hut Demo 01"
+  saveName: "Pizza Hut Demo 01 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02833:
-  name: "Pizza Hut Demo 01 (France)"
+  name: "Pizza Hut Demo 01"
+  saveName: "Pizza Hut Demo 01 (France)"
   metadata:
     genre: "** DEMO **"
 SCED-02521:
-  name: "Pizza Hut Demo 02 (Europe)"
+  name: "Pizza Hut Demo 02"
+  saveName: "Pizza Hut Demo 02 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCUS-94292:
-  name: "Pizza Hut Demo CD (USA)"
+  name: "Pizza Hut Demo CD"
+  saveName: "Pizza Hut Demo CD (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94480:
-  name: "Pizza Hut Disc 1 (USA)"
+  name: "Pizza Hut Disc 1"
+  saveName: "Pizza Hut Disc 1 (USA)"
 SCUS-94481:
-  name: "Pizza Hut Disc 2 (USA) (EDC)"
+  name: "Pizza Hut Disc 2 (EDC)"
+  saveName: "Pizza Hut Disc 2 (USA) (EDC)"
 SLES-02087:
   name: "Plane Crazy"
   controllers:
@@ -126303,7 +132785,8 @@ SLES-02087:
     multitap: false
     linkCable: false
 SLPS-02111:
-  name: "Planet Dob (Japan)"
+  name: "Planet Dob"
+  saveName: "Planet Dob (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126322,11 +132805,13 @@ SLPS-02111:
     multitap: false
     linkCable: false
 SLPM-80442:
-  name: "Planet Dob (Japan) (Demo)"
+  name: "Planet Dob (Demo)"
+  saveName: "Planet Dob (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86264:
-  name: "Planet Laika (Japan)"
+  name: "Planet Laika"
+  saveName: "Planet Laika (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126345,7 +132830,8 @@ SLPM-86264:
     multitap: false
     linkCable: false
 SLES-03844:
-  name: "Planet of the Apes (Europe) (En,Fr,De,Es,It)"
+  name: "Planet of the Apes"
+  saveName: "Planet of the Apes (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126368,7 +132854,8 @@ SLES-03844:
     multitap: false
     linkCable: false
 SLUS-01468:
-  name: "Planet of the Apes (USA)"
+  name: "Planet of the Apes"
+  saveName: "Planet of the Apes (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126387,51 +132874,73 @@ SLUS-01468:
     multitap: false
     linkCable: false
 SLED-02519:
-  name: "Play Fun 01-00 (Germany)"
+  name: "Play Fun 01-00"
+  saveName: "Play Fun 01-00 (Germany)"
 SLED-02309:
-  name: "Play Fun 02-00 (Germany)"
+  name: "Play Fun 02-00"
+  saveName: "Play Fun 02-00 (Germany)"
 SLED-02594:
-  name: "Play Fun 04-00 (Germany)"
+  name: "Play Fun 04-00"
+  saveName: "Play Fun 04-00 (Germany)"
 SLED-02065:
-  name: "Play Fun 06-99 (Germany)"
+  name: "Play Fun 06-99"
+  saveName: "Play Fun 06-99 (Germany)"
 SLED-02110:
-  name: "Play Fun 07-99 (Germany)"
+  name: "Play Fun 07-99"
+  saveName: "Play Fun 07-99 (Germany)"
 SLED-02188:
-  name: "Play Fun 09-99 (Germany)"
+  name: "Play Fun 09-99"
+  saveName: "Play Fun 09-99 (Germany)"
 SLED-02291:
-  name: "Play Fun 10-99 (Germany)"
+  name: "Play Fun 10-99"
+  saveName: "Play Fun 10-99 (Germany)"
 SLED-02311:
-  name: "Play Fun 11-99 (Germany)"
+  name: "Play Fun 11-99"
+  saveName: "Play Fun 11-99 (Germany)"
 SLED-02414:
-  name: "Play Fun 12-99 (Germany)"
+  name: "Play Fun 12-99"
+  saveName: "Play Fun 12-99 (Germany)"
 SLED-02593:
-  name: "Play Fun 3-00 (Germany)"
+  name: "Play Fun 3-00"
+  saveName: "Play Fun 3-00 (Germany)"
 SLED-02155:
-  name: "Play Fun 8-99 (Germany)"
+  name: "Play Fun 8-99"
+  saveName: "Play Fun 8-99 (Germany)"
 SLES-00221:
-  name: "Play It (Europe)"
+  name: "Play It"
+  saveName: "Play It (Europe)"
 SLED-02097:
-  name: "Play Power 4 (Spain) (En,Es) (Demo)"
+  name: "Play Power 4 (Demo)"
+  saveName: "Play Power 4 (Spain) (En,Es) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-02721:
-  name: "Play Zone Vol. 18 (Germany)"
+  name: "Play Zone Vol. 18"
+  saveName: "Play Zone Vol. 18 (Germany)"
 SLED-02832:
-  name: "Play Zone Vol. 19 (Germany)"
+  name: "Play Zone Vol. 19"
+  saveName: "Play Zone Vol. 19 (Germany)"
 SLED-02880:
-  name: "Play Zone Vol. 20 (Germany)"
+  name: "Play Zone Vol. 20"
+  saveName: "Play Zone Vol. 20 (Germany)"
 SLED-02987:
-  name: "Play Zone Vol. 21 (Germany)"
+  name: "Play Zone Vol. 21"
+  saveName: "Play Zone Vol. 21 (Germany)"
 SLED-03049:
-  name: "Play Zone Vol. 22 (Germany)"
+  name: "Play Zone Vol. 22"
+  saveName: "Play Zone Vol. 22 (Germany)"
 SLED-03106:
-  name: "Play Zone Vol. 23 (Germany)"
+  name: "Play Zone Vol. 23"
+  saveName: "Play Zone Vol. 23 (Germany)"
 SLED-03165:
-  name: "Play Zone Vol. 24 (Germany)"
+  name: "Play Zone Vol. 24"
+  saveName: "Play Zone Vol. 24 (Germany)"
 SLED-03255:
-  name: "Play Zone Vol. 25 (Germany)"
+  name: "Play Zone Vol. 25"
+  saveName: "Play Zone Vol. 25 (Germany)"
 SLPS-02543:
-  name: "Play de Oboeru Chuugaku Eitango Deruderu 1200 (Japan)"
+  name: "Play de Oboeru Chuugaku Eitango Deruderu 1200"
+  saveName: "Play de Oboeru Chuugaku Eitango Deruderu 1200 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126450,7 +132959,8 @@ SLPS-02543:
     multitap: false
     linkCable: false
 SLPM-89004:
-  name: "Play de Oboeru Chuugaku Eitango Deruderu 1200 (Japan) (Shotenban)"
+  name: "Play de Oboeru Chuugaku Eitango Deruderu 1200 (Shotenban)"
+  saveName: "Play de Oboeru Chuugaku Eitango Deruderu 1200 (Japan) (Shotenban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126469,7 +132979,8 @@ SLPM-89004:
     multitap: false
     linkCable: false
 SLPS-02907:
-  name: "Play de Oboeru Eijukugo Deruderu 750 (Japan)"
+  name: "Play de Oboeru Eijukugo Deruderu 750"
+  saveName: "Play de Oboeru Eijukugo Deruderu 750 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126488,7 +132999,8 @@ SLPS-02907:
     multitap: false
     linkCable: false
 SLPM-89008:
-  name: "Play de Oboeru Eijukugo Deruderu 750 (Japan) (Shotenban)"
+  name: "Play de Oboeru Eijukugo Deruderu 750 (Shotenban)"
+  saveName: "Play de Oboeru Eijukugo Deruderu 750 (Japan) (Shotenban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126507,7 +133019,8 @@ SLPM-89008:
     multitap: false
     linkCable: false
 SLPM-89001:
-  name: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Japan)"
+  name: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou"
+  saveName: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126526,7 +133039,8 @@ SLPM-89001:
     multitap: false
     linkCable: false
 SLPS-02544:
-  name: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Japan) (Rerelease)"
+  name: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Rerelease)"
+  saveName: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Japan) (Rerelease)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126545,7 +133059,8 @@ SLPS-02544:
     multitap: false
     linkCable: false
 SLPM-89002:
-  name: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Japan) (Shotenban)"
+  name: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Shotenban)"
+  saveName: "Play de Oboeru Eitango Deruderu 1700 - Center Shiken Level Taiou (Japan) (Shotenban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126564,7 +133079,8 @@ SLPM-89002:
     multitap: false
     linkCable: false
 SLPS-02697:
-  name: "Play de Oboeru Series - Nihonshi Keyword Deruderu 1800 (Japan) (Reprint)"
+  name: "Play de Oboeru Series - Nihonshi Keyword Deruderu 1800 (Reprint)"
+  saveName: "Play de Oboeru Series - Nihonshi Keyword Deruderu 1800 (Japan) (Reprint)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126583,7 +133099,8 @@ SLPS-02697:
     multitap: false
     linkCable: false
 SLPM-89006:
-  name: "Play de Oboeru Series - Nihonshi Keyword Deruderu 1800 (Japan) (Shotenban)"
+  name: "Play de Oboeru Series - Nihonshi Keyword Deruderu 1800 (Shotenban)"
+  saveName: "Play de Oboeru Series - Nihonshi Keyword Deruderu 1800 (Japan) (Shotenban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126602,7 +133119,8 @@ SLPM-89006:
     multitap: false
     linkCable: false
 SLPS-02696:
-  name: "Play de Oboeru Series - Sekaishi Keyword Deruderu 1800 (Japan)"
+  name: "Play de Oboeru Series - Sekaishi Keyword Deruderu 1800"
+  saveName: "Play de Oboeru Series - Sekaishi Keyword Deruderu 1800 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126621,7 +133139,8 @@ SLPS-02696:
     multitap: false
     linkCable: false
 SLPS-03099:
-  name: "Play de Oboeru Series 6 - Play de Oboeru Kanji Kentei Deruderu 1100 (Japan)"
+  name: "Play de Oboeru Series 6 - Play de Oboeru Kanji Kentei Deruderu 1100"
+  saveName: "Play de Oboeru Series 6 - Play de Oboeru Kanji Kentei Deruderu 1100 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126640,7 +133159,8 @@ SLPS-03099:
     multitap: false
     linkCable: false
 SLPM-89009:
-  name: "Play de Oboeru Series 6 - Play de Oboeru Kanji Kentei Deruderu 1100 (Japan) (Shotenban)"
+  name: "Play de Oboeru Series 6 - Play de Oboeru Kanji Kentei Deruderu 1100 (Shotenban)"
+  saveName: "Play de Oboeru Series 6 - Play de Oboeru Kanji Kentei Deruderu 1100 (Japan) (Shotenban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126659,7 +133179,8 @@ SLPM-89009:
     multitap: false
     linkCable: false
 SLPS-03168:
-  name: "Play de Oboeru Series 7 - Play de Oboeru TOEIC Test - Goku Deruderu 1700 (Japan)"
+  name: "Play de Oboeru Series 7 - Play de Oboeru TOEIC Test - Goku Deruderu 1700"
+  saveName: "Play de Oboeru Series 7 - Play de Oboeru TOEIC Test - Goku Deruderu 1700 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126716,7 +133237,8 @@ SLPM-89010:
     multitap: false
     linkCable: false
 SLES-02374:
-  name: "Play with the Teletubbies (Europe)"
+  name: "Play with the Teletubbies"
+  saveName: "Play with the Teletubbies (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126735,7 +133257,8 @@ SLES-02374:
     multitap: false
     linkCable: false
 SLUS-00959:
-  name: "Play with the Teletubbies (USA)"
+  name: "Play with the Teletubbies"
+  saveName: "Play with the Teletubbies (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126754,11 +133277,14 @@ SLUS-00959:
     multitap: false
     linkCable: false
 PAPX-90062:
-  name: "Play! '98 Fuyu Taikenban (Japan) (Green Disc)"
+  name: "Play! '98 Fuyu Taikenban (Green Disc)"
+  saveName: "Play! '98 Fuyu Taikenban (Japan) (Green Disc)"
 PAPX-90061:
-  name: "Play! '98 Fuyu Taikenban (Japan) (Red Disc)"
+  name: "Play! '98 Fuyu Taikenban (Red Disc)"
+  saveName: "Play! '98 Fuyu Taikenban (Japan) (Red Disc)"
 SLPS-00239:
-  name: "PlayStadium (Japan)"
+  name: "PlayStadium"
+  saveName: "PlayStadium (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -126776,7 +133302,8 @@ SLPS-00239:
     multitap: false
     linkCable: false
 SLPS-00807:
-  name: "PlayStadium 2 (Japan)"
+  name: "PlayStadium 2"
+  saveName: "PlayStadium 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -126794,7 +133321,8 @@ SLPS-00807:
     multitap: false
     linkCable: false
 SLPS-01369:
-  name: "PlayStadium 3 (Japan)"
+  name: "PlayStadium 3"
+  saveName: "PlayStadium 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126813,7 +133341,8 @@ SLPS-01369:
     multitap: false
     linkCable: false
 SLPS-02121:
-  name: "PlayStadium 4 - Fumetsu no Dai League Ball (Japan)"
+  name: "PlayStadium 4 - Fumetsu no Dai League Ball"
+  saveName: "PlayStadium 4 - Fumetsu no Dai League Ball (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126832,7 +133361,8 @@ SLPS-02121:
     multitap: false
     linkCable: false
 SCPS-19004:
-  name: "PlayStation Comic - 2999-nen no Game Kids (Japan)"
+  name: "PlayStation Comic - 2999-nen no Game Kids"
+  saveName: "PlayStation Comic - 2999-nen no Game Kids (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126851,19 +133381,23 @@ SCPS-19004:
     multitap: false
     linkCable: false
 PAPX-90057:
-  name: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 1)"
+  name: "PlayStation Comic - 2999-nen no Game Kids (Demo 1)"
+  saveName: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PCPX-96135:
-  name: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 2)"
+  name: "PlayStation Comic - 2999-nen no Game Kids (Demo 2)"
+  saveName: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 PAPX-90076:
-  name: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 3)"
+  name: "PlayStation Comic - 2999-nen no Game Kids (Demo 3)"
+  saveName: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 3)"
   metadata:
     genre: "** DEMO **"
 SCPS-19007:
-  name: "PlayStation Comic - Buzzer Beater - Kouhen (Japan)"
+  name: "PlayStation Comic - Buzzer Beater - Kouhen"
+  saveName: "PlayStation Comic - Buzzer Beater - Kouhen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126882,7 +133416,8 @@ SCPS-19007:
     multitap: false
     linkCable: false
 SCPS-19006:
-  name: "PlayStation Comic - Buzzer Beater - Zenpen (Japan)"
+  name: "PlayStation Comic - Buzzer Beater - Zenpen"
+  saveName: "PlayStation Comic - Buzzer Beater - Zenpen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126901,7 +133436,8 @@ SCPS-19006:
     multitap: false
     linkCable: false
 SCPS-19003:
-  name: "PlayStation Comic - Carol the DarkAngel (Japan)"
+  name: "PlayStation Comic - Carol the DarkAngel"
+  saveName: "PlayStation Comic - Carol the DarkAngel (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -126919,7 +133455,8 @@ SCPS-19003:
     multitap: false
     linkCable: false
 SCPS-19005:
-  name: "PlayStation Comic - Space Adventure Cobra - Galaxy Nights (Japan)"
+  name: "PlayStation Comic - Space Adventure Cobra - Galaxy Nights"
+  saveName: "PlayStation Comic - Space Adventure Cobra - Galaxy Nights (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -126938,7 +133475,8 @@ SCPS-19005:
     multitap: false
     linkCable: false
 SCPS-19001:
-  name: "PlayStation Comic - Space Adventure Cobra - The Psychogun Vol. 1 (Japan)"
+  name: "PlayStation Comic - Space Adventure Cobra - The Psychogun Vol. 1"
+  saveName: "PlayStation Comic - Space Adventure Cobra - The Psychogun Vol. 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -126956,7 +133494,8 @@ SCPS-19001:
     multitap: false
     linkCable: false
 SCPS-19002:
-  name: "PlayStation Comic - Space Adventure Cobra - The Psychogun Vol. 2 (Japan)"
+  name: "PlayStation Comic - Space Adventure Cobra - The Psychogun Vol. 2"
+  saveName: "PlayStation Comic - Space Adventure Cobra - The Psychogun Vol. 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -126974,103 +133513,124 @@ SCPS-19002:
     multitap: false
     linkCable: false
 SCUS-94482:
-  name: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94482)"
+  name: "PlayStation Demo Disc - Shock Your System! (SCUS-94482)"
+  saveName: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94482)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94483:
-  name: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94483)"
+  name: "PlayStation Demo Disc - Shock Your System! (SCUS-94483)"
+  saveName: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94483)"
   metadata:
     genre: "** DEMO **"
 SCUS-94496:
-  name: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94496)"
+  name: "PlayStation Demo Disc - Shock Your System! (SCUS-94496)"
+  saveName: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94496)"
   metadata:
     genre: "** DEMO **"
 SCUS-94594:
-  name: "PlayStation Demo Disc - Spring 2000 (USA) (SCUS-94594)"
+  name: "PlayStation Demo Disc - Spring 2000 (SCUS-94594)"
+  saveName: "PlayStation Demo Disc - Spring 2000 (USA) (SCUS-94594)"
   metadata:
     genre: "** DEMO **"
 SCUS-94595:
-  name: "PlayStation Demo Disc - Spring 2000 (USA, Canada) (SCUS-94595)"
+  name: "PlayStation Demo Disc - Spring 2000 (SCUS-94595)"
+  saveName: "PlayStation Demo Disc - Spring 2000 (USA, Canada) (SCUS-94595)"
   metadata:
     genre: "** DEMO **"
 SCUS-94619:
-  name: "PlayStation Demo Disc Ver. 1.15 (USA)"
+  name: "PlayStation Demo Disc Ver. 1.15"
+  saveName: "PlayStation Demo Disc Ver. 1.15 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94618:
-  name: "PlayStation Demo Disc Version 1.3 (USA)"
+  name: "PlayStation Demo Disc Version 1.3"
+  saveName: "PlayStation Demo Disc Version 1.3 (USA)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94650:
-  name: "PlayStation Demo Disc Version 1.4 (USA)"
+  name: "PlayStation Demo Disc Version 1.4"
+  saveName: "PlayStation Demo Disc Version 1.4 (USA)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94674:
-  name: "PlayStation Demo Disc Version 1.5 (USA)"
+  name: "PlayStation Demo Disc Version 1.5"
+  saveName: "PlayStation Demo Disc Version 1.5 (USA)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94497:
-  name: "PlayStation Demo Disc Winter 1999 - Shock Your System! (USA)"
+  name: "PlayStation Demo Disc Winter 1999 - Shock Your System!"
+  saveName: "PlayStation Demo Disc Winter 1999 - Shock Your System! (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94950:
-  name: "PlayStation Developer's Demo Disc (USA) (SCUS-94950)"
+  name: "PlayStation Developer's Demo Disc (SCUS-94950)"
+  saveName: "PlayStation Developer's Demo Disc (USA) (SCUS-94950)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94954:
-  name: "PlayStation Developer's Demo Disc (USA) (SCUS-94954)"
+  name: "PlayStation Developer's Demo Disc (SCUS-94954)"
+  saveName: "PlayStation Developer's Demo Disc (USA) (SCUS-94954)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCED-01229:
-  name: "PlayStation Kids (Europe)"
+  name: "PlayStation Kids"
+  saveName: "PlayStation Kids (Europe)"
 SCUS-94705:
-  name: "PlayStation Kiosk Demo Disc 2004-2005 (USA)"
+  name: "PlayStation Kiosk Demo Disc 2004-2005"
+  saveName: "PlayStation Kiosk Demo Disc 2004-2005 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94651:
-  name: "PlayStation Kiosk Demo Disc Version 1.16 (USA)"
+  name: "PlayStation Kiosk Demo Disc Version 1.16"
+  saveName: "PlayStation Kiosk Demo Disc Version 1.16 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94663:
-  name: "PlayStation Kiosk Demo Disc Version 1.17 (USA)"
+  name: "PlayStation Kiosk Demo Disc Version 1.17"
+  saveName: "PlayStation Kiosk Demo Disc Version 1.17 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94667:
-  name: "PlayStation Kiosk Demo Disc Version 1.18 (USA)"
+  name: "PlayStation Kiosk Demo Disc Version 1.18"
+  saveName: "PlayStation Kiosk Demo Disc Version 1.18 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94675:
-  name: "PlayStation Kiosk Demo Disc Version 1.19 (USA)"
+  name: "PlayStation Kiosk Demo Disc Version 1.19"
+  saveName: "PlayStation Kiosk Demo Disc Version 1.19 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94678:
-  name: "PlayStation Kiosk Demo Disc Version 1.20 (USA)"
+  name: "PlayStation Kiosk Demo Disc Version 1.20"
+  saveName: "PlayStation Kiosk Demo Disc Version 1.20 (USA)"
   metadata:
     genre: "** DEMO **"
 PCPX-96095:
-  name: "PlayStation Official Catalog CD-ROM (Japan)"
+  name: "PlayStation Official Catalog CD-ROM"
+  saveName: "PlayStation Official Catalog CD-ROM (Japan)"
   metadata:
     genre: "** DEMO **"
 SCUS-94952:
-  name: "PlayStation Picks (USA) (SCUS-94952)"
+  name: "PlayStation Picks (SCUS-94952)"
+  saveName: "PlayStation Picks (USA) (SCUS-94952)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -127080,27 +133640,34 @@ SCUS-94952:
   metadata:
     genre: "** DEMO **"
 SCUS-94960:
-  name: "PlayStation Picks (USA) (SCUS-94960)"
+  name: "PlayStation Picks (SCUS-94960)"
+  saveName: "PlayStation Picks (USA) (SCUS-94960)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1539-gf704cc64"
     comments: "Can hang if speed up in Star Wars Rebel Assaut 2 demo."
 SLED-02040:
-  name: "PlayStation Power (Spain) (Activision)"
+  name: "PlayStation Power (Activision)"
+  saveName: "PlayStation Power (Spain) (Activision)"
 SLED-01933:
-  name: "PlayStation Power (Spain) (GT Interactive)"
+  name: "PlayStation Power (GT Interactive)"
+  saveName: "PlayStation Power (Spain) (GT Interactive)"
 SLED-01989:
-  name: "PlayStation Power (Spain) (Virgin Interactive)"
+  name: "PlayStation Power (Virgin Interactive)"
+  saveName: "PlayStation Power (Spain) (Virgin Interactive)"
 SCED-01049:
-  name: "PlayStation Sampler (Europe)"
+  name: "PlayStation Sampler"
+  saveName: "PlayStation Sampler (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-03103:
-  name: "PlayStation Speziale Italia (Italy)"
+  name: "PlayStation Speziale Italia"
+  saveName: "PlayStation Speziale Italia (Italy)"
   metadata:
     genre: "** DEMO **"
 SCUS-94440:
-  name: "PlayStation Underground 3.1 (USA) (Disc 1)"
+  name: "PlayStation Underground 3.1 (Disc 1)"
+  saveName: "PlayStation Underground 3.1 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 3.1 (USA)"
     serials:
@@ -127112,7 +133679,8 @@ SCUS-94440:
   metadata:
     genre: "** DEMO **"
 SCUS-94441:
-  name: "PlayStation Underground 3.1 (USA) (Disc 2)"
+  name: "PlayStation Underground 3.1 (Disc 2)"
+  saveName: "PlayStation Underground 3.1 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 3.1 (USA)"
     serials:
@@ -127121,7 +133689,8 @@ SCUS-94441:
   metadata:
     genre: "** DEMO **"
 SCUS-94442:
-  name: "PlayStation Underground 3.2 (USA) (Disc 1)"
+  name: "PlayStation Underground 3.2 (Disc 1)"
+  saveName: "PlayStation Underground 3.2 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 3.2 (USA)"
     serials:
@@ -127130,7 +133699,8 @@ SCUS-94442:
   metadata:
     genre: "** DEMO **"
 SCUS-94443:
-  name: "PlayStation Underground 3.2 (USA) (Disc 2)"
+  name: "PlayStation Underground 3.2 (Disc 2)"
+  saveName: "PlayStation Underground 3.2 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 3.2 (USA)"
     serials:
@@ -127139,7 +133709,8 @@ SCUS-94443:
   metadata:
     genre: "** DEMO **"
 SCUS-94444:
-  name: "PlayStation Underground 3.3 (USA) (Disc 1)"
+  name: "PlayStation Underground 3.3 (Disc 1)"
+  saveName: "PlayStation Underground 3.3 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 3.3 (USA)"
     serials:
@@ -127148,7 +133719,8 @@ SCUS-94444:
   metadata:
     genre: "** DEMO **"
 SCUS-94445:
-  name: "PlayStation Underground 3.3 (USA) (Disc 2)"
+  name: "PlayStation Underground 3.3 (Disc 2)"
+  saveName: "PlayStation Underground 3.3 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 3.3 (USA)"
     serials:
@@ -127157,7 +133729,8 @@ SCUS-94445:
   metadata:
     genre: "** DEMO **"
 SCUS-94446:
-  name: "PlayStation Underground 3.4 (USA) (Disc 1)"
+  name: "PlayStation Underground 3.4 (Disc 1)"
+  saveName: "PlayStation Underground 3.4 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 3.4 (USA)"
     serials:
@@ -127166,7 +133739,8 @@ SCUS-94446:
   metadata:
     genre: "** DEMO **"
 SCUS-94447:
-  name: "PlayStation Underground 3.4 (USA) (Disc 2)"
+  name: "PlayStation Underground 3.4 (Disc 2)"
+  saveName: "PlayStation Underground 3.4 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 3.4 (USA)"
     serials:
@@ -127175,7 +133749,8 @@ SCUS-94447:
   metadata:
     genre: "** DEMO **"
 SCUS-94565:
-  name: "PlayStation Underground 4.1 (USA) (Disc 1)"
+  name: "PlayStation Underground 4.1 (Disc 1)"
+  saveName: "PlayStation Underground 4.1 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 4.1 (USA)"
     serials:
@@ -127184,7 +133759,8 @@ SCUS-94565:
   metadata:
     genre: "** DEMO **"
 SCUS-94566:
-  name: "PlayStation Underground 4.1 (USA) (Disc 2)"
+  name: "PlayStation Underground 4.1 (Disc 2)"
+  saveName: "PlayStation Underground 4.1 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 4.1 (USA)"
     serials:
@@ -127193,7 +133769,8 @@ SCUS-94566:
   metadata:
     genre: "** DEMO **"
 SCUS-94612:
-  name: "PlayStation Underground 4.2 (USA) (Disc 1)"
+  name: "PlayStation Underground 4.2 (Disc 1)"
+  saveName: "PlayStation Underground 4.2 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 4.2 (USA)"
     serials:
@@ -127202,7 +133779,8 @@ SCUS-94612:
   metadata:
     genre: "** DEMO **"
 SCUS-94613:
-  name: "PlayStation Underground 4.2 (USA) (Disc 2)"
+  name: "PlayStation Underground 4.2 (Disc 2)"
+  saveName: "PlayStation Underground 4.2 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 4.2 (USA)"
     serials:
@@ -127211,7 +133789,8 @@ SCUS-94613:
   metadata:
     genre: "** DEMO **"
 SCUS-94620:
-  name: "PlayStation Underground 4.3 (USA) (Disc 1)"
+  name: "PlayStation Underground 4.3 (Disc 1)"
+  saveName: "PlayStation Underground 4.3 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground 4.3 (USA)"
     serials:
@@ -127220,7 +133799,8 @@ SCUS-94620:
   metadata:
     genre: "** DEMO **"
 SCUS-94621:
-  name: "PlayStation Underground 4.3 (USA) (Disc 2)"
+  name: "PlayStation Underground 4.3 (Disc 2)"
+  saveName: "PlayStation Underground 4.3 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground 4.3 (USA)"
     serials:
@@ -127229,51 +133809,62 @@ SCUS-94621:
   metadata:
     genre: "** DEMO **"
 SCUS-97120:
-  name: "PlayStation Underground 4.4 (USA) (Disc 1)"
+  name: "PlayStation Underground 4.4 (Disc 1)"
+  saveName: "PlayStation Underground 4.4 (USA) (Disc 1)"
 SCUS-94267:
-  name: "PlayStation Underground Jampack (USA)"
+  name: "PlayStation Underground Jampack"
+  saveName: "PlayStation Underground Jampack (USA)"
   codes:
     - SCUS-94267
     - SCUS-94287
   metadata:
     genre: "** DEMO **"
 SCUS-94657:
-  name: "PlayStation Underground Jampack - Fall 2001 (USA)"
+  name: "PlayStation Underground Jampack - Fall 2001"
+  saveName: "PlayStation Underground Jampack - Fall 2001 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94428:
-  name: "PlayStation Underground Jampack - Summer '99 (USA)"
+  name: "PlayStation Underground Jampack - Summer '99"
+  saveName: "PlayStation Underground Jampack - Summer '99 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94587:
-  name: "PlayStation Underground Jampack - Summer 2K (USA)"
+  name: "PlayStation Underground Jampack - Summer 2K"
+  saveName: "PlayStation Underground Jampack - Summer 2K (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94293:
-  name: "PlayStation Underground Jampack - Winter '98 (USA)"
+  name: "PlayStation Underground Jampack - Winter '98"
+  saveName: "PlayStation Underground Jampack - Winter '98 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94475:
-  name: "PlayStation Underground Jampack - Winter '99 (USA)"
+  name: "PlayStation Underground Jampack - Winter '99"
+  saveName: "PlayStation Underground Jampack - Winter '99 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94624:
-  name: "PlayStation Underground Jampack - Winter 2000 (USA)"
+  name: "PlayStation Underground Jampack - Winter 2000"
+  saveName: "PlayStation Underground Jampack - Winter 2000 (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94161:
-  name: "PlayStation Underground Number 1 (USA) (Disc 1)"
+  name: "PlayStation Underground Number 1 (Disc 1)"
+  saveName: "PlayStation Underground Number 1 (USA) (Disc 1)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1539-gf704cc64"
   metadata:
     genre: "** DEMO **"
 SCUS-94178:
-  name: "PlayStation Underground Number 2 (USA) (Disc 1)"
+  name: "PlayStation Underground Number 2 (Disc 1)"
+  saveName: "PlayStation Underground Number 2 (USA) (Disc 1)"
   metadata:
     genre: "** DEMO **"
 SCUS-94191:
-  name: "PlayStation Underground Number 3 (USA) (Disc 1)"
+  name: "PlayStation Underground Number 3 (Disc 1)"
+  saveName: "PlayStation Underground Number 3 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground Number 3 (USA)"
     serials:
@@ -127282,7 +133873,8 @@ SCUS-94191:
   metadata:
     genre: "** DEMO **"
 SCUS-94192:
-  name: "PlayStation Underground Number 3 (USA) (Disc 2)"
+  name: "PlayStation Underground Number 3 (Disc 2)"
+  saveName: "PlayStation Underground Number 3 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground Number 3 (USA)"
     serials:
@@ -127291,7 +133883,8 @@ SCUS-94192:
   metadata:
     genre: "** DEMO **"
 SCUS-94225:
-  name: "PlayStation Underground Number 4 (USA) (Disc 1)"
+  name: "PlayStation Underground Number 4 (Disc 1)"
+  saveName: "PlayStation Underground Number 4 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground Number 4 (USA)"
     serials:
@@ -127300,7 +133893,8 @@ SCUS-94225:
   metadata:
     genre: "** DEMO **"
 SCUS-94226:
-  name: "PlayStation Underground Number 4 (USA) (Disc 2)"
+  name: "PlayStation Underground Number 4 (Disc 2)"
+  saveName: "PlayStation Underground Number 4 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground Number 4 (USA)"
     serials:
@@ -127309,7 +133903,8 @@ SCUS-94226:
   metadata:
     genre: "** DEMO **"
 SCUS-94237:
-  name: "PlayStation Underground Volume 2 Issue 1 (USA) (Disc 1)"
+  name: "PlayStation Underground Volume 2 Issue 1 (Disc 1)"
+  saveName: "PlayStation Underground Volume 2 Issue 1 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground Volume 2 Issue 1 (USA)"
     serials:
@@ -127318,7 +133913,8 @@ SCUS-94237:
   metadata:
     genre: "** DEMO **"
 SCUS-94238:
-  name: "PlayStation Underground Volume 2 Issue 1 (USA) (Disc 2)"
+  name: "PlayStation Underground Volume 2 Issue 1 (Disc 2)"
+  saveName: "PlayStation Underground Volume 2 Issue 1 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground Volume 2 Issue 1 (USA)"
     serials:
@@ -127327,7 +133923,8 @@ SCUS-94238:
   metadata:
     genre: "** DEMO **"
 SCUS-94259:
-  name: "PlayStation Underground Volume 2 Issue 2 (USA) (Disc 1)"
+  name: "PlayStation Underground Volume 2 Issue 2 (Disc 1)"
+  saveName: "PlayStation Underground Volume 2 Issue 2 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground Volume 2 Issue 2 (USA)"
     serials:
@@ -127336,7 +133933,8 @@ SCUS-94259:
   metadata:
     genre: "** DEMO **"
 SCUS-94260:
-  name: "PlayStation Underground Volume 2 Issue 2 (USA) (Disc 2)"
+  name: "PlayStation Underground Volume 2 Issue 2 (Disc 2)"
+  saveName: "PlayStation Underground Volume 2 Issue 2 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground Volume 2 Issue 2 (USA)"
     serials:
@@ -127345,7 +133943,8 @@ SCUS-94260:
   metadata:
     genre: "** DEMO **"
 SCUS-94298:
-  name: "PlayStation Underground Volume 2 Issue 4 (USA) (Disc 1)"
+  name: "PlayStation Underground Volume 2 Issue 4 (Disc 1)"
+  saveName: "PlayStation Underground Volume 2 Issue 4 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground Volume 2 Issue 4 (USA)"
     serials:
@@ -127354,7 +133953,8 @@ SCUS-94298:
   metadata:
     genre: "** DEMO **"
 SCUS-94299:
-  name: "PlayStation Underground Volume 2 Issue 4 (USA) (Disc 2)"
+  name: "PlayStation Underground Volume 2 Issue 4 (Disc 2)"
+  saveName: "PlayStation Underground Volume 2 Issue 4 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground Volume 2 Issue 4 (USA)"
     serials:
@@ -127363,7 +133963,8 @@ SCUS-94299:
   metadata:
     genre: "** DEMO **"
 SCUS-94269:
-  name: "PlayStation Underground Volume 2.3 (USA) (Disc 1)"
+  name: "PlayStation Underground Volume 2.3 (Disc 1)"
+  saveName: "PlayStation Underground Volume 2.3 (USA) (Disc 1)"
   discSet:
     name: "PlayStation Underground Volume 2.3 (USA)"
     serials:
@@ -127372,7 +133973,8 @@ SCUS-94269:
   metadata:
     genre: "** DEMO **"
 SCUS-94270:
-  name: "PlayStation Underground Volume 2.3 (USA) (Disc 2)"
+  name: "PlayStation Underground Volume 2.3 (Disc 2)"
+  saveName: "PlayStation Underground Volume 2.3 (USA) (Disc 2)"
   discSet:
     name: "PlayStation Underground Volume 2.3 (USA)"
     serials:
@@ -127381,79 +133983,98 @@ SCUS-94270:
   metadata:
     genre: "** DEMO **"
 SLED-01633:
-  name: "PlayStation Zone CD Vol. 1 (Germany)"
+  name: "PlayStation Zone CD Vol. 1"
+  saveName: "PlayStation Zone CD Vol. 1 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02190:
-  name: "PlayStation Zone CD Vol. 10 (Germany)"
+  name: "PlayStation Zone CD Vol. 10"
+  saveName: "PlayStation Zone CD Vol. 10 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02275:
-  name: "PlayStation Zone CD Vol. 11 (Germany)"
+  name: "PlayStation Zone CD Vol. 11"
+  saveName: "PlayStation Zone CD Vol. 11 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02312:
-  name: "PlayStation Zone CD Vol. 12 (Germany)"
+  name: "PlayStation Zone CD Vol. 12"
+  saveName: "PlayStation Zone CD Vol. 12 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02381:
-  name: "PlayStation Zone CD Vol. 13 (Germany)"
+  name: "PlayStation Zone CD Vol. 13"
+  saveName: "PlayStation Zone CD Vol. 13 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02436:
-  name: "PlayStation Zone CD Vol. 14 (Germany)"
+  name: "PlayStation Zone CD Vol. 14"
+  saveName: "PlayStation Zone CD Vol. 14 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02518:
-  name: "PlayStation Zone CD Vol. 15 (Germany)"
+  name: "PlayStation Zone CD Vol. 15"
+  saveName: "PlayStation Zone CD Vol. 15 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02592:
-  name: "PlayStation Zone CD Vol. 16 (Germany)"
+  name: "PlayStation Zone CD Vol. 16"
+  saveName: "PlayStation Zone CD Vol. 16 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02683:
-  name: "PlayStation Zone CD Vol. 17 (Germany)"
+  name: "PlayStation Zone CD Vol. 17"
+  saveName: "PlayStation Zone CD Vol. 17 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-01724:
-  name: "PlayStation Zone CD Vol. 2 (Germany)"
+  name: "PlayStation Zone CD Vol. 2"
+  saveName: "PlayStation Zone CD Vol. 2 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-01773:
-  name: "PlayStation Zone CD Vol. 3 (Germany)"
+  name: "PlayStation Zone CD Vol. 3"
+  saveName: "PlayStation Zone CD Vol. 3 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-01783:
-  name: "PlayStation Zone CD Vol. 4 (Germany)"
+  name: "PlayStation Zone CD Vol. 4"
+  saveName: "PlayStation Zone CD Vol. 4 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-01898:
-  name: "PlayStation Zone CD Vol. 5 (Germany)"
+  name: "PlayStation Zone CD Vol. 5"
+  saveName: "PlayStation Zone CD Vol. 5 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-01968:
-  name: "PlayStation Zone CD Vol. 6 (Germany)"
+  name: "PlayStation Zone CD Vol. 6"
+  saveName: "PlayStation Zone CD Vol. 6 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02042:
-  name: "PlayStation Zone CD Vol. 7 (Germany)"
+  name: "PlayStation Zone CD Vol. 7"
+  saveName: "PlayStation Zone CD Vol. 7 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02078:
-  name: "PlayStation Zone CD Vol. 8 (Germany)"
+  name: "PlayStation Zone CD Vol. 8"
+  saveName: "PlayStation Zone CD Vol. 8 (Germany)"
   metadata:
     genre: "** DEMO **"
 SLED-02139:
-  name: "PlayStation Zone CD Vol. 9 (Germany)"
+  name: "PlayStation Zone CD Vol. 9"
+  saveName: "PlayStation Zone CD Vol. 9 (Germany)"
   metadata:
     genre: "** DEMO **"
 SCUS-94193:
-  name: "PlayStation-Pepsi Sampler Disc (USA)"
+  name: "PlayStation-Pepsi Sampler Disc"
+  saveName: "PlayStation-Pepsi Sampler Disc (USA)"
   metadata:
     genre: "** DEMO **"
 SLES-00319:
-  name: "Player Manager (Europe) (En,Fr,De,Es,It,Sv,No)"
+  name: "Player Manager"
+  saveName: "Player Manager (Europe) (En,Fr,De,Es,It,Sv,No)"
   controllers:
     - DigitalController
   metadata:
@@ -127477,7 +134098,8 @@ SLES-00319:
     multitap: false
     linkCable: false
 SLES-02015:
-  name: "Player Manager - Epoca 98-99 (Portugal)"
+  name: "Player Manager - Epoca 98-99"
+  saveName: "Player Manager - Epoca 98-99 (Portugal)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127496,7 +134118,8 @@ SLES-02015:
     multitap: false
     linkCable: false
 SLES-02325:
-  name: "Player Manager 2000 (Europe)"
+  name: "Player Manager 2000"
+  saveName: "Player Manager 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127515,7 +134138,8 @@ SLES-02325:
     multitap: false
     linkCable: false
 SLES-02613:
-  name: "Player Manager 2000 (Germany)"
+  name: "Player Manager 2000"
+  saveName: "Player Manager 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127534,9 +134158,11 @@ SLES-02613:
     multitap: false
     linkCable: false
 SLES-02844:
-  name: "Player Manager 2000 (Portugal)"
+  name: "Player Manager 2000"
+  saveName: "Player Manager 2000 (Portugal)"
 SLES-01346:
-  name: "Player Manager Ninety Nine (Europe)"
+  name: "Player Manager Ninety Nine"
+  saveName: "Player Manager Ninety Nine (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127555,7 +134181,8 @@ SLES-01346:
     multitap: false
     linkCable: false
 SLES-01766:
-  name: "Player Manager Ninety Nine (Germany)"
+  name: "Player Manager Ninety Nine"
+  saveName: "Player Manager Ninety Nine (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127574,7 +134201,8 @@ SLES-01766:
     multitap: false
     linkCable: false
 SLES-02132:
-  name: "Player Manager Ninety Nine (UK)"
+  name: "Player Manager Ninety Nine"
+  saveName: "Player Manager Ninety Nine (UK)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127593,7 +134221,8 @@ SLES-02132:
     multitap: false
     linkCable: false
 SLES-01767:
-  name: "Player Manager Novanta Nove (Italy)"
+  name: "Player Manager Novanta Nove"
+  saveName: "Player Manager Novanta Nove (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127612,7 +134241,8 @@ SLES-01767:
     multitap: false
     linkCable: false
 SLPM-87121:
-  name: "Plue no Daibouken from Groove Adventure Rave (Japan)"
+  name: "Plue no Daibouken from Groove Adventure Rave"
+  saveName: "Plue no Daibouken from Groove Adventure Rave (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127631,7 +134261,8 @@ SLPM-87121:
     multitap: false
     linkCable: false
 SCPS-10023:
-  name: "PoPoLoCrois Monogatari (Japan)"
+  name: "PoPoLoCrois Monogatari"
+  saveName: "PoPoLoCrois Monogatari (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -127652,11 +134283,13 @@ SCPS-10023:
     multitap: false
     linkCable: false
 PCPX-96195:
-  name: "PoPoLoCrois Monogatari II (Japan) (Demo)"
+  name: "PoPoLoCrois Monogatari II (Demo)"
+  saveName: "PoPoLoCrois Monogatari II (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10112:
-  name: "PoPoLoCrois Monogatari II (Japan) (Disc 1)"
+  name: "PoPoLoCrois Monogatari II (Disc 1)"
+  saveName: "PoPoLoCrois Monogatari II (Japan) (Disc 1)"
   discSet:
     name: "PoPoLoCrois Monogatari II (Japan)"
     serials:
@@ -127686,7 +134319,8 @@ SCPS-10112:
     multitap: false
     linkCable: false
 SCPS-10113:
-  name: "PoPoLoCrois Monogatari II (Japan) (Disc 2)"
+  name: "PoPoLoCrois Monogatari II (Disc 2)"
+  saveName: "PoPoLoCrois Monogatari II (Japan) (Disc 2)"
   discSet:
     name: "PoPoLoCrois Monogatari II (Japan)"
     serials:
@@ -127716,7 +134350,8 @@ SCPS-10113:
     multitap: false
     linkCable: false
 SCPS-10114:
-  name: "PoPoLoCrois Monogatari II (Japan) (Disc 3)"
+  name: "PoPoLoCrois Monogatari II (Disc 3)"
+  saveName: "PoPoLoCrois Monogatari II (Japan) (Disc 3)"
   discSet:
     name: "PoPoLoCrois Monogatari II (Japan)"
     serials:
@@ -127746,9 +134381,11 @@ SCPS-10114:
     multitap: false
     linkCable: false
 SCZS-94105:
-  name: "PoPoLoCrois Monogatari Official Fan Book - PoPoRoGue no Daizukan - Chotto Ureshii CD-ROM Data-shuu (Japan)"
+  name: "PoPoLoCrois Monogatari Official Fan Book - PoPoRoGue no Daizukan - Chotto Ureshii CD-ROM Data-shuu"
+  saveName: "PoPoLoCrois Monogatari Official Fan Book - PoPoRoGue no Daizukan - Chotto Ureshii CD-ROM Data-shuu (Japan)"
 SCPS-10050:
-  name: "PoPoRoGue (Japan)"
+  name: "PoPoRoGue"
+  saveName: "PoPoRoGue (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127770,9 +134407,11 @@ SCPS-10050:
     multitap: false
     linkCable: false
 PAPX-90056:
-  name: "PoPoRoGue (Japan) (Yokokuban)"
+  name: "PoPoRoGue (Yokokuban)"
+  saveName: "PoPoRoGue (Japan) (Yokokuban)"
 SLPS-02497:
-  name: "Pocke-Kano - Aida Yumi (Japan)"
+  name: "Pocke-Kano - Aida Yumi"
+  saveName: "Pocke-Kano - Aida Yumi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127791,7 +134430,8 @@ SLPS-02497:
     multitap: false
     linkCable: false
 SLPS-02499:
-  name: "Pocke-Kano - Hojoin Shizuka (Japan)"
+  name: "Pocke-Kano - Hojoin Shizuka"
+  saveName: "Pocke-Kano - Hojoin Shizuka (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127810,7 +134450,8 @@ SLPS-02499:
     multitap: false
     linkCable: false
 SLPS-02498:
-  name: "Pocke-Kano - Ueno Fumio (Japan)"
+  name: "Pocke-Kano - Ueno Fumio"
+  saveName: "Pocke-Kano - Ueno Fumio (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127829,7 +134470,8 @@ SLPS-02498:
     multitap: false
     linkCable: false
 SLPS-02800:
-  name: "Pocket DigimonWorld (Japan)"
+  name: "Pocket DigimonWorld"
+  saveName: "Pocket DigimonWorld (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127848,7 +134490,8 @@ SLPS-02800:
     multitap: false
     linkCable: false
 SLPS-03146:
-  name: "Pocket DigimonWorld - Cool & Nature Battle Disc (Japan)"
+  name: "Pocket DigimonWorld - Cool & Nature Battle Disc"
+  saveName: "Pocket DigimonWorld - Cool & Nature Battle Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127867,7 +134510,8 @@ SLPS-03146:
     multitap: false
     linkCable: false
 SLPS-02992:
-  name: "Pocket DigimonWorld - Wind Battle Disc (Japan)"
+  name: "Pocket DigimonWorld - Wind Battle Disc"
+  saveName: "Pocket DigimonWorld - Wind Battle Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127886,7 +134530,8 @@ SLPS-02992:
     multitap: false
     linkCable: false
 SCPS-10075:
-  name: "Pocket Dungeon (Japan)"
+  name: "Pocket Dungeon"
+  saveName: "Pocket Dungeon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127905,7 +134550,8 @@ SCPS-10075:
     multitap: false
     linkCable: false
 SLPS-02134:
-  name: "Pocket Family - Happy Family Plan (Japan)"
+  name: "Pocket Family - Happy Family Plan"
+  saveName: "Pocket Family - Happy Family Plan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127924,7 +134570,8 @@ SLPS-02134:
     multitap: false
     linkCable: false
 SLES-01378:
-  name: "Pocket Fighter (Europe)"
+  name: "Pocket Fighter"
+  saveName: "Pocket Fighter (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -127943,7 +134590,8 @@ SLES-01378:
     multitap: false
     linkCable: false
 SLPS-01360:
-  name: "Pocket Fighter (Japan)"
+  name: "Pocket Fighter"
+  saveName: "Pocket Fighter (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -127966,7 +134614,8 @@ SLPS-01360:
     multitap: false
     linkCable: false
 SLUS-00653:
-  name: "Pocket Fighter (USA)"
+  name: "Pocket Fighter"
+  saveName: "Pocket Fighter (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-973-g8eb3ac6"
@@ -128007,7 +134656,8 @@ SLPS-91191:
     multitap: false
     linkCable: false
 SCPS-10104:
-  name: "Pocket Jiman (Japan)"
+  name: "Pocket Jiman"
+  saveName: "Pocket Jiman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128026,7 +134676,8 @@ SCPS-10104:
     multitap: false
     linkCable: false
 SCPS-10076:
-  name: "Pocket MuuMuu (Japan)"
+  name: "Pocket MuuMuu"
+  saveName: "Pocket MuuMuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128045,7 +134696,8 @@ SCPS-10076:
     multitap: false
     linkCable: false
 SLPS-02218:
-  name: "Pocket Tuner (Japan)"
+  name: "Pocket Tuner"
+  saveName: "Pocket Tuner (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128064,13 +134716,16 @@ SLPS-02218:
     multitap: false
     linkCable: false
 PAPX-90094:
-  name: "Pocket Zanmai - 3 Title Iri Taikenban (PAQA, PokeTan, Pocket Jiman) (Japan)"
+  name: "Pocket Zanmai - 3 Title Iri Taikenban (PAQA, PokeTan, Pocket Jiman)"
+  saveName: "Pocket Zanmai - 3 Title Iri Taikenban (PAQA, PokeTan, Pocket Jiman) (Japan)"
 SCED-00287:
-  name: "Point Blank (Europe) (Demo)"
+  name: "Point Blank (Demo)"
+  saveName: "Point Blank (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00886:
-  name: "Point Blank (Europe) (En,Fr,De)"
+  name: "Point Blank"
+  saveName: "Point Blank (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
     - GunCon
@@ -128091,7 +134746,8 @@ SCES-00886:
     multitap: false
     linkCable: false
 SLUS-00481:
-  name: "Point Blank (USA)"
+  name: "Point Blank"
+  saveName: "Point Blank (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -128113,7 +134769,8 @@ SLUS-00481:
     multitap: false
     linkCable: false
 SCES-02180:
-  name: "Point Blank 2 (Europe, Australia) (En,Fr,De,Es,It)"
+  name: "Point Blank 2"
+  saveName: "Point Blank 2 (Europe, Australia) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - GunCon
@@ -128136,7 +134793,8 @@ SCES-02180:
     multitap: false
     linkCable: false
 SLUS-00796:
-  name: "Point Blank 2 (USA)"
+  name: "Point Blank 2"
+  saveName: "Point Blank 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -128158,7 +134816,8 @@ SLUS-00796:
     multitap: false
     linkCable: false
 SCES-03383:
-  name: "Point Blank 3 (Europe) (En,Fr,De,Es,It)"
+  name: "Point Blank 3"
+  saveName: "Point Blank 3 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128182,7 +134841,8 @@ SCES-03383:
     multitap: false
     linkCable: false
 SLUS-01354:
-  name: "Point Blank 3 (USA)"
+  name: "Point Blank 3"
+  saveName: "Point Blank 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33c"
@@ -128225,7 +134885,8 @@ SLUS-00072:
     multitap: false
     linkCable: false
 SLPM-86061:
-  name: "Poitter's Point 2 - Sodom no Inbou (Japan)"
+  name: "Poitter's Point 2 - Sodom no Inbou"
+  saveName: "Poitter's Point 2 - Sodom no Inbou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128244,7 +134905,8 @@ SLPM-86061:
     multitap: true
     linkCable: false
 SLPM-86034:
-  name: "Poitters' Point (Japan)"
+  name: "Poitters' Point"
+  saveName: "Poitters' Point (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -128262,7 +134924,8 @@ SLPM-86034:
     multitap: true
     linkCable: false
 SCPS-10102:
-  name: "PokeTan (Japan)"
+  name: "PokeTan"
+  saveName: "PokeTan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128284,7 +134947,8 @@ SCPS-10102:
     multitap: false
     linkCable: false
 SLPS-02185:
-  name: "Pokeler (Japan)"
+  name: "Pokeler"
+  saveName: "Pokeler (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128303,7 +134967,8 @@ SLPS-02185:
     multitap: false
     linkCable: false
 SLPS-02651:
-  name: "Pokeler DX - Black (Japan)"
+  name: "Pokeler DX - Black"
+  saveName: "Pokeler DX - Black (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128322,7 +134987,8 @@ SLPS-02651:
     multitap: false
     linkCable: false
 SLPS-02664:
-  name: "Pokeler DX - Pink (Japan)"
+  name: "Pokeler DX - Pink"
+  saveName: "Pokeler DX - Pink (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128341,7 +135007,8 @@ SLPS-02664:
     multitap: false
     linkCable: false
 SLUS-01033:
-  name: "Polaris SnoCross (USA)"
+  name: "Polaris SnoCross"
+  saveName: "Polaris SnoCross (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128361,7 +135028,8 @@ SLUS-01033:
     multitap: false
     linkCable: false
 SLPM-86048:
-  name: "Policenauts (Japan) (Disc 1)"
+  name: "Policenauts (Disc 1)"
+  saveName: "Policenauts (Japan) (Disc 1)"
   discSet:
     name: "Policenauts (Japan)"
     serials:
@@ -128392,7 +135060,8 @@ SLPM-86048:
     multitap: false
     linkCable: false
 SLPM-86049:
-  name: "Policenauts (Japan) (Disc 2)"
+  name: "Policenauts (Disc 2)"
+  saveName: "Policenauts (Japan) (Disc 2)"
   discSet:
     name: "Policenauts (Japan)"
     serials:
@@ -128423,7 +135092,8 @@ SLPM-86049:
     multitap: false
     linkCable: false
 SLES-02020:
-  name: "Pong (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Pong"
+  saveName: "Pong (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128447,7 +135117,8 @@ SLES-02020:
     multitap: true
     linkCable: false
 SLUS-00889:
-  name: "Pong - The Next Level (USA)"
+  name: "Pong - The Next Level"
+  saveName: "Pong - The Next Level (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -128472,7 +135143,8 @@ SLUS-00889:
     multitap: true
     linkCable: false
 SLPS-03460:
-  name: "Pooh-san no Minna de Mori no Daikyousou! (Japan)"
+  name: "Pooh-san no Minna de Mori no Daikyousou!"
+  saveName: "Pooh-san no Minna de Mori no Daikyousou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128491,7 +135163,8 @@ SLPS-03460:
     multitap: true
     linkCable: false
 SLES-02697:
-  name: "Pool Academy (Europe) (En,Fr,De)"
+  name: "Pool Academy"
+  saveName: "Pool Academy (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128512,7 +135185,8 @@ SLES-02697:
     multitap: true
     linkCable: false
 SLES-01688:
-  name: "Pool Hustler (Europe)"
+  name: "Pool Hustler"
+  saveName: "Pool Hustler (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128531,7 +135205,8 @@ SLES-01688:
     multitap: false
     linkCable: false
 SLUS-00758:
-  name: "Pool Hustler (USA)"
+  name: "Pool Hustler"
+  saveName: "Pool Hustler (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128550,7 +135225,8 @@ SLUS-00758:
     multitap: false
     linkCable: false
 SLES-01537:
-  name: "Pool Shark (Europe)"
+  name: "Pool Shark"
+  saveName: "Pool Shark (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128588,7 +135264,8 @@ SLPM-86454:
     multitap: false
     linkCable: false
 SLPS-02961:
-  name: "Pop de Cute na Shinri Test - Alabama (Japan)"
+  name: "Pop de Cute na Shinri Test - Alabama"
+  saveName: "Pop de Cute na Shinri Test - Alabama (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128607,7 +135284,8 @@ SLPS-02961:
     multitap: false
     linkCable: false
 SLES-01971:
-  name: "Pop n' Pop (Europe)"
+  name: "Pop n' Pop"
+  saveName: "Pop n' Pop (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128646,7 +135324,8 @@ SCPS-45379:
     multitap: false
     linkCable: false
 SLPM-86183:
-  name: "Pop'n Music (Japan)"
+  name: "Pop'n Music"
+  saveName: "Pop'n Music (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128666,7 +135345,8 @@ SLPM-86183:
     multitap: false
     linkCable: false
 SLPM-86592:
-  name: "Pop'n Music - Animation Melody (Japan)"
+  name: "Pop'n Music - Animation Melody"
+  saveName: "Pop'n Music - Animation Melody (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128686,7 +135366,8 @@ SLPM-86592:
     multitap: false
     linkCable: false
 SLPM-86670:
-  name: "Pop'n Music - Disney Tunes (Japan)"
+  name: "Pop'n Music - Disney Tunes"
+  saveName: "Pop'n Music - Disney Tunes (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128726,7 +135407,8 @@ SCPS-45433:
     multitap: false
     linkCable: false
 SLPM-86294:
-  name: "Pop'n Music 2 (Japan)"
+  name: "Pop'n Music 2"
+  saveName: "Pop'n Music 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128749,7 +135431,8 @@ SLPM-86294:
     multitap: false
     linkCable: false
 SLPM-86415:
-  name: "Pop'n Music 3 - Append Disc (Japan)"
+  name: "Pop'n Music 3 - Append Disc"
+  saveName: "Pop'n Music 3 - Append Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128769,7 +135452,8 @@ SLPM-86415:
     multitap: false
     linkCable: false
 SLPM-86649:
-  name: "Pop'n Music 4 - Append Disc (Japan)"
+  name: "Pop'n Music 4 - Append Disc"
+  saveName: "Pop'n Music 4 - Append Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128789,7 +135473,8 @@ SLPM-86649:
     multitap: false
     linkCable: false
 SLPM-86937:
-  name: "Pop'n Music 5 (Japan)"
+  name: "Pop'n Music 5"
+  saveName: "Pop'n Music 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128809,7 +135494,8 @@ SLPM-86937:
     multitap: false
     linkCable: false
 SLPM-87089:
-  name: "Pop'n Music 6 (Japan)"
+  name: "Pop'n Music 6"
+  saveName: "Pop'n Music 6 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128829,7 +135515,8 @@ SLPM-87089:
     multitap: false
     linkCable: false
 SLPS-01636:
-  name: "Pop'n Pop (Japan)"
+  name: "Pop'n Pop"
+  saveName: "Pop'n Pop (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128849,7 +135536,8 @@ SLPS-01636:
     multitap: false
     linkCable: false
 SLPM-86146:
-  name: "Pop'n Tanks! (Japan)"
+  name: "Pop'n Tanks!"
+  saveName: "Pop'n Tanks! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-774-g5a1b008"
@@ -128871,7 +135559,8 @@ SLPM-86146:
     multitap: false
     linkCable: false
 SLES-03657:
-  name: "Popstar Maker (Europe)"
+  name: "Popstar Maker"
+  saveName: "Popstar Maker (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128890,7 +135579,8 @@ SLES-03657:
     multitap: false
     linkCable: false
 SLES-01760:
-  name: "Populous - The Beginning (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  name: "Populous - The Beginning"
+  saveName: "Populous - The Beginning (Europe) (En,Fr,De,Es,It,Nl,Sv)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -128918,7 +135608,8 @@ SLES-01760:
     multitap: false
     linkCable: false
 SLPS-02085:
-  name: "Populous - The Beginning (Japan)"
+  name: "Populous - The Beginning"
+  saveName: "Populous - The Beginning (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128937,7 +135628,8 @@ SLPS-02085:
     multitap: false
     linkCable: false
 SLUS-00277:
-  name: "Populous - The Beginning (USA)"
+  name: "Populous - The Beginning"
+  saveName: "Populous - The Beginning (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -128977,7 +135669,8 @@ SCPS-45117:
     multitap: false
     linkCable: false
 SCES-00409:
-  name: "Porsche Challenge (Europe) (En,Fr,De,Es,It)"
+  name: "Porsche Challenge"
+  saveName: "Porsche Challenge (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -129002,7 +135695,8 @@ SCES-00409:
     multitap: false
     linkCable: false
 SIPS-60016:
-  name: "Porsche Challenge (Japan)"
+  name: "Porsche Challenge"
+  saveName: "Porsche Challenge (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -129023,7 +135717,8 @@ SIPS-60016:
     multitap: false
     linkCable: false
 SCUS-94187:
-  name: "Porsche Challenge (USA) (En,Fr,Es)"
+  name: "Porsche Challenge"
+  saveName: "Porsche Challenge (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -129048,7 +135743,8 @@ SCUS-94187:
     multitap: false
     linkCable: false
 SLPS-00439:
-  name: "Posit (Japan)"
+  name: "Posit"
+  saveName: "Posit (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129066,7 +135762,8 @@ SLPS-00439:
     multitap: false
     linkCable: false
 SLPS-00324:
-  name: "Potestas (Japan)"
+  name: "Potestas"
+  saveName: "Potestas (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -129088,7 +135785,8 @@ SLPS-00324:
     multitap: false
     linkCable: false
 SLES-03184:
-  name: "Pour l'Or et la Gloire - La Route d'Eldorado (France)"
+  name: "Pour l'Or et la Gloire - La Route d'Eldorado"
+  saveName: "Pour l'Or et la Gloire - La Route d'Eldorado (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129107,7 +135805,8 @@ SLES-03184:
     multitap: false
     linkCable: false
 SLES-03388:
-  name: "Power Diggerz (Europe) (En,Fr,De)"
+  name: "Power Diggerz"
+  saveName: "Power Diggerz (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129128,7 +135827,8 @@ SLES-03388:
     multitap: false
     linkCable: false
 SLPS-01033:
-  name: "Power DoLLS 2 (Japan)"
+  name: "Power DoLLS 2"
+  saveName: "Power DoLLS 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129164,7 +135864,8 @@ SLPS-03205:
     multitap: false
     linkCable: false
 SLPS-01517:
-  name: "Power League (Japan)"
+  name: "Power League"
+  saveName: "Power League (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129182,7 +135883,8 @@ SLPS-01517:
     multitap: false
     linkCable: false
 SLES-00202:
-  name: "Power Move Pro Wrestling (Europe)"
+  name: "Power Move Pro Wrestling"
+  saveName: "Power Move Pro Wrestling (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -129200,7 +135902,8 @@ SLES-00202:
     multitap: false
     linkCable: false
 SLUS-00408:
-  name: "Power Move Pro Wrestling (USA)"
+  name: "Power Move Pro Wrestling"
+  saveName: "Power Move Pro Wrestling (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -129218,7 +135921,8 @@ SLUS-00408:
     multitap: false
     linkCable: false
 SLUS-01445:
-  name: "Power Play - Sports Trivia (USA)"
+  name: "Power Play - Sports Trivia"
+  saveName: "Power Play - Sports Trivia (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129237,7 +135941,8 @@ SLUS-01445:
     multitap: true
     linkCable: false
 SLES-03731:
-  name: "Power Rangers - La Force du Temps (France)"
+  name: "Power Rangers - La Force du Temps"
+  saveName: "Power Rangers - La Force du Temps (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129256,7 +135961,8 @@ SLES-03731:
     multitap: false
     linkCable: false
 SLPS-00490:
-  name: "Power Rangers Pinball (Japan)"
+  name: "Power Rangers Pinball"
+  saveName: "Power Rangers Pinball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129274,7 +135980,8 @@ SLPS-00490:
     multitap: false
     linkCable: false
 SLES-00118:
-  name: "Power Serve (Europe) (En,Fr,De)"
+  name: "Power Serve"
+  saveName: "Power Serve (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -129294,7 +136001,8 @@ SLES-00118:
     multitap: false
     linkCable: false
 SLUS-00105:
-  name: "Power Serve 3D Tennis (USA)"
+  name: "Power Serve 3D Tennis"
+  saveName: "Power Serve 3D Tennis (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -129312,7 +136020,8 @@ SLUS-00105:
     multitap: false
     linkCable: false
 SLUS-01343:
-  name: "Power Shovel (USA)"
+  name: "Power Shovel"
+  saveName: "Power Shovel (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1539-gf704cc64"
@@ -129334,7 +136043,8 @@ SLUS-01343:
     multitap: false
     linkCable: false
 SLPM-86629:
-  name: "Power Shovel ni Norou!! (Japan)"
+  name: "Power Shovel ni Norou!!"
+  saveName: "Power Shovel ni Norou!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129353,9 +136063,11 @@ SLPM-86629:
     multitap: false
     linkCable: false
 SCES-00667:
-  name: "Power Source (Europe)"
+  name: "Power Source"
+  saveName: "Power Source (Europe)"
 SLUS-01196:
-  name: "Power Spike - Pro Beach Volleyball (USA)"
+  name: "Power Spike - Pro Beach Volleyball"
+  saveName: "Power Spike - Pro Beach Volleyball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129374,7 +136086,8 @@ SLUS-01196:
     multitap: true
     linkCable: false
 SLPM-86032:
-  name: "Power Stakes (Japan)"
+  name: "Power Stakes"
+  saveName: "Power Stakes (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129392,7 +136105,8 @@ SLPM-86032:
     multitap: false
     linkCable: false
 SLPM-86079:
-  name: "Power Stakes 2 (Japan)"
+  name: "Power Stakes 2"
+  saveName: "Power Stakes 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129410,7 +136124,8 @@ SLPM-86079:
     multitap: false
     linkCable: false
 SLPM-86050:
-  name: "Power Stakes Grade 1 (Japan)"
+  name: "Power Stakes Grade 1"
+  saveName: "Power Stakes Grade 1 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129428,7 +136143,8 @@ SLPM-86050:
     multitap: false
     linkCable: false
 SLES-03629:
-  name: "Powerpuff Girls, The - Chemical X-Traction (Europe) (En,Fr,De,Es)"
+  name: "Powerpuff Girls, The - Chemical X-Traction"
+  saveName: "Powerpuff Girls, The - Chemical X-Traction (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129450,7 +136166,8 @@ SLES-03629:
     multitap: false
     linkCable: false
 SLUS-01423:
-  name: "Powerpuff Girls, The - Chemical X-Traction (USA) (En,Es)"
+  name: "Powerpuff Girls, The - Chemical X-Traction"
+  saveName: "Powerpuff Girls, The - Chemical X-Traction (USA) (En,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -129473,7 +136190,8 @@ SLUS-01423:
     multitap: false
     linkCable: false
 SLUS-00102:
-  name: "Powerslave (USA)"
+  name: "Powerslave"
+  saveName: "Powerslave (USA)"
   compatibility:
     rating: NoIssues
     upscalingIssues: "2D elements on title screen"
@@ -129494,7 +136212,8 @@ SLUS-00102:
     multitap: false
     linkCable: false
 SLES-00785:
-  name: "Poy Poy (Europe)"
+  name: "Poy Poy"
+  saveName: "Poy Poy (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -129512,7 +136231,8 @@ SLES-00785:
     multitap: true
     linkCable: false
 SLUS-00486:
-  name: "Poy Poy (USA)"
+  name: "Poy Poy"
+  saveName: "Poy Poy (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -129530,7 +136250,8 @@ SLUS-00486:
     multitap: true
     linkCable: false
 SLES-01536:
-  name: "Poy Poy 2 (Europe)"
+  name: "Poy Poy 2"
+  saveName: "Poy Poy 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129549,221 +136270,263 @@ SLES-01536:
     multitap: true
     linkCable: false
 PCPD-99501:
-  name: "PrePre PlayStation Vol. 0 (Japan)"
+  name: "PrePre PlayStation Vol. 0"
+  saveName: "PrePre PlayStation Vol. 0 (Japan)"
 PCPX-96173:
-  name: "PrePre Plus 001 - 1999 October (Japan) (Disc 1)"
+  name: "PrePre Plus 001 - 1999 October (Disc 1)"
+  saveName: "PrePre Plus 001 - 1999 October (Japan) (Disc 1)"
   discSet:
     name: "PrePre Plus 001 - 1999 October (Japan)"
     serials:
       - PCPX-96173
       - PCPX-96174
 PCPX-96174:
-  name: "PrePre Plus 001 - 1999 October (Japan) (Disc 2) (What's Next)"
+  name: "PrePre Plus 001 - 1999 October (Disc 2) (What's Next)"
+  saveName: "PrePre Plus 001 - 1999 October (Japan) (Disc 2) (What's Next)"
   discSet:
     name: "PrePre Plus 001 - 1999 October (Japan)"
     serials:
       - PCPX-96173
       - PCPX-96174
 PCPX-96186:
-  name: "PrePre Plus 002 - 1999 December (Japan) (Disc 1)"
+  name: "PrePre Plus 002 - 1999 December (Disc 1)"
+  saveName: "PrePre Plus 002 - 1999 December (Japan) (Disc 1)"
   discSet:
     name: "PrePre Plus 002 - 1999 December (Japan)"
     serials:
       - PCPX-96186
       - PCPX-96187
 PCPX-96187:
-  name: "PrePre Plus 002 - 1999 December (Japan) (Disc 2) (What's Next)"
+  name: "PrePre Plus 002 - 1999 December (Disc 2) (What's Next)"
+  saveName: "PrePre Plus 002 - 1999 December (Japan) (Disc 2) (What's Next)"
   discSet:
     name: "PrePre Plus 002 - 1999 December (Japan)"
     serials:
       - PCPX-96186
       - PCPX-96187
 PCPX-96190:
-  name: "PrePre Plus 003 - 2000 February (Japan)"
+  name: "PrePre Plus 003 - 2000 February"
+  saveName: "PrePre Plus 003 - 2000 February (Japan)"
 PCPX-96198:
-  name: "PrePre Plus 004 - 2000 June (Japan) (Disc 1)"
+  name: "PrePre Plus 004 - 2000 June (Disc 1)"
+  saveName: "PrePre Plus 004 - 2000 June (Japan) (Disc 1)"
 PCPX-96199:
-  name: "PrePre Plus 005 - 2000 August (Japan)"
+  name: "PrePre Plus 005 - 2000 August"
+  saveName: "PrePre Plus 005 - 2000 August (Japan)"
 PCPX-96201:
-  name: "PrePre Plus 006 - 2000 October (Japan)"
+  name: "PrePre Plus 006 - 2000 October"
+  saveName: "PrePre Plus 006 - 2000 October (Japan)"
 PCPX-96203:
-  name: "PrePre Plus 007 - 2000 December (Japan)"
+  name: "PrePre Plus 007 - 2000 December"
+  saveName: "PrePre Plus 007 - 2000 December (Japan)"
 PCPX-96015:
-  name: "PrePre Soukan Junbi-gou - DemoDemo PlayStation Special (Japan)"
+  name: "PrePre Soukan Junbi-gou - DemoDemo PlayStation Special"
+  saveName: "PrePre Soukan Junbi-gou - DemoDemo PlayStation Special (Japan)"
   metadata:
     genre: "** DEMO **"
 PCPX-96017:
-  name: "PrePre Vol. 1 (Japan)"
+  name: "PrePre Vol. 1"
+  saveName: "PrePre Vol. 1 (Japan)"
 PCPX-96103:
-  name: "PrePre Vol. 10 (Japan) (Disc 1)"
+  name: "PrePre Vol. 10 (Disc 1)"
+  saveName: "PrePre Vol. 10 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 10 (Japan)"
     serials:
       - PCPX-96103
       - PCPX-96104
 PCPX-96104:
-  name: "PrePre Vol. 10 (Japan) (Disc 2) (CM Collection III)"
+  name: "PrePre Vol. 10 (Disc 2) (CM Collection III)"
+  saveName: "PrePre Vol. 10 (Japan) (Disc 2) (CM Collection III)"
   discSet:
     name: "PrePre Vol. 10 (Japan)"
     serials:
       - PCPX-96103
       - PCPX-96104
 PCPX-96108:
-  name: "PrePre Vol. 11 (Japan)"
+  name: "PrePre Vol. 11"
+  saveName: "PrePre Vol. 11 (Japan)"
 PCPX-96114:
-  name: "PrePre Vol. 12 (Japan)"
+  name: "PrePre Vol. 12"
+  saveName: "PrePre Vol. 12 (Japan)"
 PCPX-96118:
-  name: "PrePre Vol. 13 (Japan) (Disc 1)"
+  name: "PrePre Vol. 13 (Disc 1)"
+  saveName: "PrePre Vol. 13 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 13 (Japan)"
     serials:
       - PCPX-96118
       - PCPX-96119
 PCPX-96119:
-  name: "PrePre Vol. 13 (Japan) (Disc 2) (Yarudora Trial Version)"
+  name: "PrePre Vol. 13 (Disc 2) (Yarudora Trial Version)"
+  saveName: "PrePre Vol. 13 (Japan) (Disc 2) (Yarudora Trial Version)"
   discSet:
     name: "PrePre Vol. 13 (Japan)"
     serials:
       - PCPX-96118
       - PCPX-96119
 PCPX-96126:
-  name: "PrePre Vol. 14 (Japan) (Disc 1)"
+  name: "PrePre Vol. 14 (Disc 1)"
+  saveName: "PrePre Vol. 14 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 14 (Japan)"
     serials:
       - PCPX-96126
       - PCPX-96127
 PCPX-96127:
-  name: "PrePre Vol. 14 (Japan) (Disc 2) (Legaia Densetsu Trial Version)"
+  name: "PrePre Vol. 14 (Disc 2) (Legaia Densetsu Trial Version)"
+  saveName: "PrePre Vol. 14 (Japan) (Disc 2) (Legaia Densetsu Trial Version)"
   discSet:
     name: "PrePre Vol. 14 (Japan)"
     serials:
       - PCPX-96126
       - PCPX-96127
 PCPX-96133:
-  name: "PrePre Vol. 15 (Japan) (Disc 1)"
+  name: "PrePre Vol. 15 (Disc 1)"
+  saveName: "PrePre Vol. 15 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 15 (Japan)"
     serials:
       - PCPX-96133
       - PCPX-96134
 PCPX-96134:
-  name: "PrePre Vol. 15 (Japan) (Disc 2)"
+  name: "PrePre Vol. 15 (Disc 2)"
+  saveName: "PrePre Vol. 15 (Japan) (Disc 2)"
   discSet:
     name: "PrePre Vol. 15 (Japan)"
     serials:
       - PCPX-96133
       - PCPX-96134
 PCPX-96142:
-  name: "PrePre Vol. 16 (Japan) (Disc 1)"
+  name: "PrePre Vol. 16 (Disc 1)"
+  saveName: "PrePre Vol. 16 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 16 (Japan)"
     serials:
       - PCPX-96142
       - PCPX-96143
 PCPX-96143:
-  name: "PrePre Vol. 16 (Japan) (Disc 2) (CM Collection IV)"
+  name: "PrePre Vol. 16 (Disc 2) (CM Collection IV)"
+  saveName: "PrePre Vol. 16 (Japan) (Disc 2) (CM Collection IV)"
   discSet:
     name: "PrePre Vol. 16 (Japan)"
     serials:
       - PCPX-96142
       - PCPX-96143
 PCPX-96148:
-  name: "PrePre Vol. 17 (Japan) (Disc 1)"
+  name: "PrePre Vol. 17 (Disc 1)"
+  saveName: "PrePre Vol. 17 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 17 (Japan)"
     serials:
       - PCPX-96148
       - PCPX-96149
 PCPX-96149:
-  name: "PrePre Vol. 17 (Japan) (Disc 2) (Omega Boost Trial Version)"
+  name: "PrePre Vol. 17 (Disc 2) (Omega Boost Trial Version)"
+  saveName: "PrePre Vol. 17 (Japan) (Disc 2) (Omega Boost Trial Version)"
   discSet:
     name: "PrePre Vol. 17 (Japan)"
     serials:
       - PCPX-96148
       - PCPX-96149
 PCPX-96156:
-  name: "PrePre Vol. 18 (Japan) (Disc 1)"
+  name: "PrePre Vol. 18 (Disc 1)"
+  saveName: "PrePre Vol. 18 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 18 (Japan)"
     serials:
       - PCPX-96156
       - PCPX-96157
 PCPX-96157:
-  name: "PrePre Vol. 18 (Japan) (Disc 2) (What's Next)"
+  name: "PrePre Vol. 18 (Disc 2) (What's Next)"
+  saveName: "PrePre Vol. 18 (Japan) (Disc 2) (What's Next)"
   discSet:
     name: "PrePre Vol. 18 (Japan)"
     serials:
       - PCPX-96156
       - PCPX-96157
 PCPX-96167:
-  name: "PrePre Vol. 19 (Japan) (Disc 1)"
+  name: "PrePre Vol. 19 (Disc 1)"
+  saveName: "PrePre Vol. 19 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 19 (Japan)"
     serials:
       - PCPX-96167
       - PCPX-96168
 PCPX-96168:
-  name: "PrePre Vol. 19 (Japan) (Disc 2) (What's Next 1999 Aug)"
+  name: "PrePre Vol. 19 (Disc 2) (What's Next 1999 Aug)"
+  saveName: "PrePre Vol. 19 (Japan) (Disc 2) (What's Next 1999 Aug)"
   discSet:
     name: "PrePre Vol. 19 (Japan)"
     serials:
       - PCPX-96167
       - PCPX-96168
 PCPX-96023:
-  name: "PrePre Vol. 2 (Japan)"
+  name: "PrePre Vol. 2"
+  saveName: "PrePre Vol. 2 (Japan)"
 PCPX-96028:
-  name: "PrePre Vol. 3 (Japan)"
+  name: "PrePre Vol. 3"
+  saveName: "PrePre Vol. 3 (Japan)"
 PCPX-96039:
-  name: "PrePre Vol. 4 (Japan)"
+  name: "PrePre Vol. 4"
+  saveName: "PrePre Vol. 4 (Japan)"
 PCPX-96054:
-  name: "PrePre Vol. 5 (Japan) (Disc 1)"
+  name: "PrePre Vol. 5 (Disc 1)"
+  saveName: "PrePre Vol. 5 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 5 (Japan)"
     serials:
       - PCPX-96054
       - PCPX-96055
 PCPX-96055:
-  name: "PrePre Vol. 5 (Japan) (Disc 2) (CM Collection)"
+  name: "PrePre Vol. 5 (Disc 2) (CM Collection)"
+  saveName: "PrePre Vol. 5 (Japan) (Disc 2) (CM Collection)"
   discSet:
     name: "PrePre Vol. 5 (Japan)"
     serials:
       - PCPX-96054
       - PCPX-96055
 PCPX-96063:
-  name: "PrePre Vol. 6 (Japan) (Disc 1)"
+  name: "PrePre Vol. 6 (Disc 1)"
+  saveName: "PrePre Vol. 6 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 6 (Japan)"
     serials:
       - PCPX-96063
       - PCPX-96064
 PCPX-96064:
-  name: "PrePre Vol. 6 (Japan) (Disc 2) (CM Collection II)"
+  name: "PrePre Vol. 6 (Disc 2) (CM Collection II)"
+  saveName: "PrePre Vol. 6 (Japan) (Disc 2) (CM Collection II)"
   discSet:
     name: "PrePre Vol. 6 (Japan)"
     serials:
       - PCPX-96063
       - PCPX-96064
 PCPX-96075:
-  name: "PrePre Vol. 7 (Japan)"
+  name: "PrePre Vol. 7"
+  saveName: "PrePre Vol. 7 (Japan)"
 PCPX-96084:
-  name: "PrePre Vol. 8 (Japan)"
+  name: "PrePre Vol. 8"
+  saveName: "PrePre Vol. 8 (Japan)"
 PCPX-96093:
-  name: "PrePre Vol. 9 (Japan) (Disc 1)"
+  name: "PrePre Vol. 9 (Disc 1)"
+  saveName: "PrePre Vol. 9 (Japan) (Disc 1)"
   discSet:
     name: "PrePre Vol. 9 (Japan)"
     serials:
       - PCPX-96093
       - PCPX-96094
 PCPX-96094:
-  name: "PrePre Vol. 9 (Japan) (Disc 2) (Official Catalog CD-ROM)"
+  name: "PrePre Vol. 9 (Disc 2) (Official Catalog CD-ROM)"
+  saveName: "PrePre Vol. 9 (Japan) (Disc 2) (Official Catalog CD-ROM)"
   discSet:
     name: "PrePre Vol. 9 (Japan)"
     serials:
       - PCPX-96093
       - PCPX-96094
 SLES-02292:
-  name: "Premier Manager 2000 (Europe)"
+  name: "Premier Manager 2000"
+  saveName: "Premier Manager 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129783,7 +136546,8 @@ SLES-02292:
     multitap: true
     linkCable: false
 SLES-00738:
-  name: "Premier Manager 98 (Europe)"
+  name: "Premier Manager 98"
+  saveName: "Premier Manager 98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -129801,7 +136565,8 @@ SLES-00738:
     multitap: false
     linkCable: false
 SLES-01284:
-  name: "Premier Manager 98 (Italy)"
+  name: "Premier Manager 98"
+  saveName: "Premier Manager 98 (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -129819,7 +136584,8 @@ SLES-01284:
     multitap: false
     linkCable: false
 SLES-01544:
-  name: "Premier Manager Ninety Nine (Europe)"
+  name: "Premier Manager Ninety Nine"
+  saveName: "Premier Manager Ninety Nine (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129838,7 +136604,8 @@ SLES-01544:
     multitap: false
     linkCable: false
 SLES-01864:
-  name: "Premier Manager Novanta Nove (Italy)"
+  name: "Premier Manager Novanta Nove"
+  saveName: "Premier Manager Novanta Nove (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129857,7 +136624,8 @@ SLES-01864:
     multitap: false
     linkCable: false
 SLES-00140:
-  name: "Primal Rage (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Primal Rage"
+  saveName: "Primal Rage (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - DigitalController
   metadata:
@@ -129880,7 +136648,8 @@ SLES-00140:
     multitap: false
     linkCable: false
 SLPS-00543:
-  name: "Primal Rage (Japan)"
+  name: "Primal Rage"
+  saveName: "Primal Rage (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -129898,7 +136667,8 @@ SLPS-00543:
     multitap: false
     linkCable: false
 SLUS-00126:
-  name: "Primal Rage (USA)"
+  name: "Primal Rage"
+  saveName: "Primal Rage (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -129919,7 +136689,8 @@ SLUS-00126:
     multitap: false
     linkCable: false
 SLES-02702:
-  name: "Primera Division Stars (Spain)"
+  name: "Primera Division Stars"
+  saveName: "Primera Division Stars (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129938,7 +136709,8 @@ SLES-02702:
     multitap: true
     linkCable: false
 SLES-00017:
-  name: "Prince Naseem Boxing (Europe) (En,Fr,De,Es,It)"
+  name: "Prince Naseem Boxing"
+  saveName: "Prince Naseem Boxing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -129962,7 +136734,8 @@ SLES-00017:
     multitap: false
     linkCable: false
 SLPM-86590:
-  name: "Princess Maker - Go! Go! Princess (Japan) (Best Wing 2800)"
+  name: "Princess Maker - Go! Go! Princess (Best Wing 2800)"
+  saveName: "Princess Maker - Go! Go! Princess (Japan) (Best Wing 2800)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130004,7 +136777,8 @@ SLPS-01505:
     multitap: true
     linkCable: false
 SLPS-01477:
-  name: "Princess Maker - Pocket Daisakusen (Japan)"
+  name: "Princess Maker - Pocket Daisakusen"
+  saveName: "Princess Maker - Pocket Daisakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130023,7 +136797,8 @@ SLPS-01477:
     multitap: false
     linkCable: false
 SLPM-86591:
-  name: "Princess Maker - Pocket Daisakusen (Japan) (Best Wing 2800)"
+  name: "Princess Maker - Pocket Daisakusen (Best Wing 2800)"
+  saveName: "Princess Maker - Pocket Daisakusen (Japan) (Best Wing 2800)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130042,7 +136817,8 @@ SLPM-86591:
     multitap: false
     linkCable: false
 SCPS-10032:
-  name: "Princess Maker - Yumemiru Yousei (Japan)"
+  name: "Princess Maker - Yumemiru Yousei"
+  saveName: "Princess Maker - Yumemiru Yousei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130060,7 +136836,8 @@ SCPS-10032:
     multitap: false
     linkCable: false
 PAPX-90013:
-  name: "Princess Maker - Yumemiru Yousei (Japan) (Demo)"
+  name: "Princess Maker - Yumemiru Yousei (Demo)"
+  saveName: "Princess Maker - Yumemiru Yousei (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-45013:
@@ -130082,7 +136859,8 @@ SCPS-45013:
     multitap: false
     linkCable: false
 SLPS-01226:
-  name: "Prism Court (Japan)"
+  name: "Prism Court"
+  saveName: "Prism Court (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130100,7 +136878,8 @@ SLPS-01226:
     multitap: false
     linkCable: false
 SLPS-02586:
-  name: "Prism Land (Japan)"
+  name: "Prism Land"
+  saveName: "Prism Land (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -130122,7 +136901,8 @@ SLPS-02586:
     multitap: false
     linkCable: false
 SLES-03284:
-  name: "Prism Land Story (Europe)"
+  name: "Prism Land Story"
+  saveName: "Prism Land Story (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -130141,7 +136921,8 @@ SLES-03284:
     multitap: false
     linkCable: false
 SLPS-01252:
-  name: "Prism Land Story (Japan)"
+  name: "Prism Land Story"
+  saveName: "Prism Land Story (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -130160,7 +136941,8 @@ SLPS-01252:
     multitap: false
     linkCable: false
 SLPS-02360:
-  name: "Prismaticallization (Japan)"
+  name: "Prismaticallization"
+  saveName: "Prismaticallization (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130179,7 +136961,8 @@ SLPS-02360:
     multitap: false
     linkCable: false
 SLPS-02387:
-  name: "Prisoner (Japan)"
+  name: "Prisoner"
+  saveName: "Prisoner (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130198,7 +136981,8 @@ SLPS-02387:
     multitap: false
     linkCable: false
 SLPS-01129:
-  name: "Prisoner of Ice - Jashin Kourin (Japan)"
+  name: "Prisoner of Ice - Jashin Kourin"
+  saveName: "Prisoner of Ice - Jashin Kourin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130217,7 +137001,8 @@ SLPS-01129:
     multitap: false
     linkCable: false
 SLPS-00228:
-  name: "Private Collection - Policenauts (Japan)"
+  name: "Private Collection - Policenauts"
+  saveName: "Private Collection - Policenauts (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -130236,7 +137021,8 @@ SLPS-00228:
     multitap: false
     linkCable: false
 SLPM-86001:
-  name: "Private Collection - Tokimeki Memorial (Japan)"
+  name: "Private Collection - Tokimeki Memorial"
+  saveName: "Private Collection - Tokimeki Memorial (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -130255,7 +137041,8 @@ SLPM-86001:
     multitap: false
     linkCable: false
 SLES-01559:
-  name: "Pro 18 - World Tour Golf (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Pro 18 - World Tour Golf"
+  saveName: "Pro 18 - World Tour Golf (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130279,7 +137066,8 @@ SLES-01559:
     multitap: true
     linkCable: false
 SLUS-00817:
-  name: "Pro 18 - World Tour Golf (USA)"
+  name: "Pro 18 - World Tour Golf"
+  saveName: "Pro 18 - World Tour Golf (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130298,7 +137086,8 @@ SLUS-00817:
     multitap: true
     linkCable: false
 SLES-04052:
-  name: "Pro Backgammon (Europe)"
+  name: "Pro Backgammon"
+  saveName: "Pro Backgammon (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -130316,7 +137105,8 @@ SLES-04052:
     multitap: false
     linkCable: false
 SLES-03327:
-  name: "Pro Body Boarding (Europe) (En,Fr,De)"
+  name: "Pro Body Boarding"
+  saveName: "Pro Body Boarding (Europe) (En,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -130340,7 +137130,8 @@ SLES-03327:
     multitap: true
     linkCable: false
 SLES-03795:
-  name: "Pro Evolution Soccer (Europe) (En,Fr,De)"
+  name: "Pro Evolution Soccer"
+  saveName: "Pro Evolution Soccer (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130361,7 +137152,8 @@ SLES-03795:
     multitap: true
     linkCable: false
 SLES-03796:
-  name: "Pro Evolution Soccer (Europe) (Es,It)"
+  name: "Pro Evolution Soccer"
+  saveName: "Pro Evolution Soccer (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130381,7 +137173,8 @@ SLES-03796:
     multitap: true
     linkCable: false
 SLES-03946:
-  name: "Pro Evolution Soccer 2 (Europe) (En,Fr,De)"
+  name: "Pro Evolution Soccer 2"
+  saveName: "Pro Evolution Soccer 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130402,7 +137195,8 @@ SLES-03946:
     multitap: true
     linkCable: false
 SLES-03957:
-  name: "Pro Evolution Soccer 2 (Europe) (Es,It)"
+  name: "Pro Evolution Soccer 2"
+  saveName: "Pro Evolution Soccer 2 (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130422,9 +137216,11 @@ SLES-03957:
     multitap: true
     linkCable: false
 SLED-01295:
-  name: "Pro Foot Contest '98 + Grand Theft Auto + Courier Crisis (France) (En,Fr,De,It)"
+  name: "Pro Foot Contest '98 + Grand Theft Auto + Courier Crisis"
+  saveName: "Pro Foot Contest '98 + Grand Theft Auto + Courier Crisis (France) (En,Fr,De,It)"
 SLPM-86018:
-  name: "Pro Logic Mahjong Hai-Shin (Japan)"
+  name: "Pro Logic Mahjong Hai-Shin"
+  saveName: "Pro Logic Mahjong Hai-Shin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130442,7 +137238,8 @@ SLPM-86018:
     multitap: false
     linkCable: false
 SLPS-02347:
-  name: "Pro Mahjong Kiwame - Tengensen-hen (Japan)"
+  name: "Pro Mahjong Kiwame - Tengensen-hen"
+  saveName: "Pro Mahjong Kiwame - Tengensen-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130464,7 +137261,8 @@ SLPS-02347:
     multitap: false
     linkCable: false
 SLPS-00402:
-  name: "Pro Mahjong Kiwame Plus (Japan)"
+  name: "Pro Mahjong Kiwame Plus"
+  saveName: "Pro Mahjong Kiwame Plus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130482,7 +137280,8 @@ SLPS-00402:
     multitap: false
     linkCable: false
 SLPS-01605:
-  name: "Pro Mahjong Kiwame Plus II (Japan)"
+  name: "Pro Mahjong Kiwame Plus II"
+  saveName: "Pro Mahjong Kiwame Plus II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130536,7 +137335,8 @@ SLPS-91134:
     multitap: false
     linkCable: false
 SLPS-01987:
-  name: "Pro Mahjong Tsuwamono 2 (Japan)"
+  name: "Pro Mahjong Tsuwamono 2"
+  saveName: "Pro Mahjong Tsuwamono 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130554,7 +137354,8 @@ SLPS-01987:
     multitap: false
     linkCable: false
 SLPS-03065:
-  name: "Pro Mahjong Tsuwamono 2 (Japan) (BPV)"
+  name: "Pro Mahjong Tsuwamono 2 (BPV)"
+  saveName: "Pro Mahjong Tsuwamono 2 (Japan) (BPV)"
   controllers:
     - DigitalController
   metadata:
@@ -130590,7 +137391,8 @@ SLPS-02659:
     multitap: false
     linkCable: false
 SLPS-03464:
-  name: "Pro Mahjong Tsuwamono 3 (Japan)"
+  name: "Pro Mahjong Tsuwamono 3"
+  saveName: "Pro Mahjong Tsuwamono 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130626,7 +137428,8 @@ SLPS-02359:
     multitap: false
     linkCable: false
 SLPS-03218:
-  name: "Pro Mahjong Tsuwamono Series - Joryuu Janshi ni Chousen - Watashi-tachi ni Chousen Shite ne! (Japan)"
+  name: "Pro Mahjong Tsuwamono Series - Joryuu Janshi ni Chousen - Watashi-tachi ni Chousen Shite ne!"
+  saveName: "Pro Mahjong Tsuwamono Series - Joryuu Janshi ni Chousen - Watashi-tachi ni Chousen Shite ne! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130644,7 +137447,8 @@ SLPS-03218:
     multitap: false
     linkCable: false
 SLPM-86139:
-  name: "Pro Mahjong, The - Menkyo Kaiden (Japan)"
+  name: "Pro Mahjong, The - Menkyo Kaiden"
+  saveName: "Pro Mahjong, The - Menkyo Kaiden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130663,7 +137467,8 @@ SLPM-86139:
     multitap: false
     linkCable: false
 SLES-01211:
-  name: "Pro Pinball - Big Race USA (Europe) (En,Fr,De,Es)"
+  name: "Pro Pinball - Big Race USA"
+  saveName: "Pro Pinball - Big Race USA (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130688,7 +137493,8 @@ SLES-01211:
     multitap: false
     linkCable: true
 SLUS-01260:
-  name: "Pro Pinball - Big Race USA (USA)"
+  name: "Pro Pinball - Big Race USA"
+  saveName: "Pro Pinball - Big Race USA (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -130712,7 +137518,8 @@ SLUS-01260:
     multitap: false
     linkCable: true
 SLES-02466:
-  name: "Pro Pinball - Fantastic Journey (Europe) (En,Fr,De,Es)"
+  name: "Pro Pinball - Fantastic Journey"
+  saveName: "Pro Pinball - Fantastic Journey (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130737,7 +137544,8 @@ SLES-02466:
     multitap: false
     linkCable: false
 SLUS-01261:
-  name: "Pro Pinball - Fantastic Journey (USA)"
+  name: "Pro Pinball - Fantastic Journey"
+  saveName: "Pro Pinball - Fantastic Journey (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -130762,7 +137570,8 @@ SLUS-01261:
     multitap: false
     linkCable: false
 SLES-00259:
-  name: "Pro Pinball - The Web (Europe)"
+  name: "Pro Pinball - The Web"
+  saveName: "Pro Pinball - The Web (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -130783,7 +137592,8 @@ SLES-00259:
     multitap: false
     linkCable: false
 SLES-00606:
-  name: "Pro Pinball - Timeshock! (Europe) (En,Fr,De,Es,It)"
+  name: "Pro Pinball - Timeshock!"
+  saveName: "Pro Pinball - Timeshock! (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   traits:
@@ -130808,7 +137618,8 @@ SLES-00606:
     multitap: false
     linkCable: false
 SLUS-00639:
-  name: "Pro Pinball - Timeshock! (USA)"
+  name: "Pro Pinball - Timeshock!"
+  saveName: "Pro Pinball - Timeshock! (USA)"
   controllers:
     - DigitalController
   traits:
@@ -130829,14 +137640,16 @@ SLUS-00639:
     multitap: false
     linkCable: false
 SLUS-90039:
-  name: "Pro Pinball - Timeshock! (USA) (Demo)"
+  name: "Pro Pinball - Timeshock! (Demo)"
+  saveName: "Pro Pinball - Timeshock! (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForceSoftwareRenderer # Lots of readbacks.
     - ForceDeinterlacing # Blend results in best-looking pinballs.
 SLES-03962:
-  name: "Pro Racer (Europe)"
+  name: "Pro Racer"
+  saveName: "Pro Racer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130856,7 +137669,8 @@ SLES-03962:
     multitap: false
     linkCable: false
 SLPS-01006:
-  name: "Pro Wres Sengokuden - Hyper Tag Match (Japan)"
+  name: "Pro Wres Sengokuden - Hyper Tag Match"
+  saveName: "Pro Wres Sengokuden - Hyper Tag Match (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130874,7 +137688,8 @@ SLPS-01006:
     multitap: true
     linkCable: false
 SLPS-01388:
-  name: "Pro Wrestling Sengokuden 2 - Kakutou Emaki (Japan)"
+  name: "Pro Wrestling Sengokuden 2 - Kakutou Emaki"
+  saveName: "Pro Wrestling Sengokuden 2 - Kakutou Emaki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130892,7 +137707,8 @@ SLPS-01388:
     multitap: false
     linkCable: false
 SLPS-01371:
-  name: "Pro Yakyuu Nettou Puzzle Stadium (Japan)"
+  name: "Pro Yakyuu Nettou Puzzle Stadium"
+  saveName: "Pro Yakyuu Nettou Puzzle Stadium (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -130910,7 +137726,8 @@ SLPS-01371:
     multitap: false
     linkCable: false
 SLPS-02333:
-  name: "Pro Yakyuu Simulation Dugout '99 (Japan)"
+  name: "Pro Yakyuu Simulation Dugout '99"
+  saveName: "Pro Yakyuu Simulation Dugout '99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -130929,7 +137746,8 @@ SLPS-02333:
     multitap: false
     linkCable: false
 SLUS-00371:
-  name: "Pro-Pinball (USA)"
+  name: "Pro-Pinball"
+  saveName: "Pro-Pinball (USA)"
   controllers:
     - DigitalController
   traits:
@@ -130950,7 +137768,8 @@ SLUS-00371:
     multitap: false
     linkCable: false
 SCUS-94551:
-  name: "Professional Underground League of Pain (USA)"
+  name: "Professional Underground League of Pain"
+  saveName: "Professional Underground League of Pain (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -130968,7 +137787,8 @@ SCUS-94551:
     multitap: true
     linkCable: false
 SCUS-94408:
-  name: "Project - Horned Owl (USA)"
+  name: "Project - Horned Owl"
+  saveName: "Project - Horned Owl (USA)"
   controllers:
     - DigitalController
     - Justifier
@@ -130988,7 +137808,8 @@ SCUS-94408:
     multitap: false
     linkCable: false
 SCPS-45136:
-  name: "Project Gaiaray (Japan, Asia)"
+  name: "Project Gaiaray"
+  saveName: "Project Gaiaray (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131010,7 +137831,8 @@ SCPS-45136:
     multitap: false
     linkCable: false
 SLES-00500:
-  name: "Project Overkill (Europe)"
+  name: "Project Overkill"
+  saveName: "Project Overkill (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -131028,7 +137850,8 @@ SLES-00500:
     multitap: false
     linkCable: false
 SLUS-00045:
-  name: "Project Overkill (USA)"
+  name: "Project Overkill"
+  saveName: "Project Overkill (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -131046,7 +137869,8 @@ SLUS-00045:
     multitap: false
     linkCable: false
 SLPS-01260:
-  name: "Project V6 (Japan)"
+  name: "Project V6"
+  saveName: "Project V6 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131065,7 +137889,8 @@ SLPS-01260:
     multitap: false
     linkCable: false
 SLPS-00531:
-  name: "Proof Club (Japan)"
+  name: "Proof Club"
+  saveName: "Proof Club (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131083,7 +137908,8 @@ SLPS-00531:
     multitap: true
     linkCable: false
 SLES-00929:
-  name: "Psybadek (Europe) (En,Fr,De,Es,It)"
+  name: "Psybadek"
+  saveName: "Psybadek (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131106,11 +137932,13 @@ SLES-00929:
     multitap: false
     linkCable: false
 SLED-01488:
-  name: "Psybadek (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Psybadek (Demo)"
+  saveName: "Psybadek (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00730:
-  name: "Psybadek (USA)"
+  name: "Psybadek"
+  saveName: "Psybadek (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131129,7 +137957,8 @@ SLUS-00730:
     multitap: false
     linkCable: false
 SLES-00070:
-  name: "Psychic Detective (Europe) (Disc 1)"
+  name: "Psychic Detective (Disc 1)"
+  saveName: "Psychic Detective (Europe) (Disc 1)"
   discSet:
     name: "Psychic Detective (Europe)"
     serials:
@@ -131153,7 +137982,8 @@ SLES-00070:
     multitap: false
     linkCable: false
 SLES-10070:
-  name: "Psychic Detective (Europe) (Disc 2)"
+  name: "Psychic Detective (Disc 2)"
+  saveName: "Psychic Detective (Europe) (Disc 2)"
   discSet:
     name: "Psychic Detective (Europe)"
     serials:
@@ -131177,7 +138007,8 @@ SLES-10070:
     multitap: false
     linkCable: false
 SLES-20070:
-  name: "Psychic Detective (Europe) (Disc 3)"
+  name: "Psychic Detective (Disc 3)"
+  saveName: "Psychic Detective (Europe) (Disc 3)"
   discSet:
     name: "Psychic Detective (Europe)"
     serials:
@@ -131201,7 +138032,8 @@ SLES-20070:
     multitap: false
     linkCable: false
 SLUS-00165:
-  name: "Psychic Detective (USA) (Disc 1)"
+  name: "Psychic Detective (Disc 1)"
+  saveName: "Psychic Detective (USA) (Disc 1)"
   discSet:
     name: "Psychic Detective (USA)"
     serials:
@@ -131225,7 +138057,8 @@ SLUS-00165:
     multitap: false
     linkCable: false
 SLUS-00166:
-  name: "Psychic Detective (USA) (Disc 2)"
+  name: "Psychic Detective (Disc 2)"
+  saveName: "Psychic Detective (USA) (Disc 2)"
   discSet:
     name: "Psychic Detective (USA)"
     serials:
@@ -131249,7 +138082,8 @@ SLUS-00166:
     multitap: false
     linkCable: false
 SLUS-00167:
-  name: "Psychic Detective (USA) (Disc 3)"
+  name: "Psychic Detective (Disc 3)"
+  saveName: "Psychic Detective (USA) (Disc 3)"
   discSet:
     name: "Psychic Detective (USA)"
     serials:
@@ -131273,7 +138107,8 @@ SLUS-00167:
     multitap: false
     linkCable: false
 SLES-00629:
-  name: "Psychic Force (Europe)"
+  name: "Psychic Force"
+  saveName: "Psychic Force (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131292,7 +138127,8 @@ SLES-00629:
     multitap: false
     linkCable: false
 SLPM-86616:
-  name: "Psychic Force (Japan)"
+  name: "Psychic Force"
+  saveName: "Psychic Force (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131314,11 +138150,13 @@ SLPM-86616:
     multitap: false
     linkCable: false
 SLPM-80049:
-  name: "Psychic Force (Japan) (Demo)"
+  name: "Psychic Force (Demo)"
+  saveName: "Psychic Force (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00419:
-  name: "Psychic Force (USA)"
+  name: "Psychic Force"
+  saveName: "Psychic Force (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131337,7 +138175,8 @@ SLUS-00419:
     multitap: false
     linkCable: false
 SLPS-01018:
-  name: "Psychic Force - Puzzle Taisen (Japan) (Disc 1) (Game Disc)"
+  name: "Psychic Force - Puzzle Taisen (Disc 1) (Game Disc)"
+  saveName: "Psychic Force - Puzzle Taisen (Japan) (Disc 1) (Game Disc)"
   discSet:
     name: "Psychic Force - Puzzle Taisen (Japan)"
     serials:
@@ -131360,7 +138199,8 @@ SLPS-01018:
     multitap: false
     linkCable: false
 SLPS-01019:
-  name: "Psychic Force - Puzzle Taisen (Japan) (Disc 2) (Premium CD-ROM)"
+  name: "Psychic Force - Puzzle Taisen (Disc 2) (Premium CD-ROM)"
+  saveName: "Psychic Force - Puzzle Taisen (Japan) (Disc 2) (Premium CD-ROM)"
   discSet:
     name: "Psychic Force - Puzzle Taisen (Japan)"
     serials:
@@ -131383,7 +138223,8 @@ SLPS-01019:
     multitap: false
     linkCable: false
 SLES-02557:
-  name: "Psychic Force 2 (Europe)"
+  name: "Psychic Force 2"
+  saveName: "Psychic Force 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131402,7 +138243,8 @@ SLES-02557:
     multitap: false
     linkCable: false
 SLPM-86273:
-  name: "Psychic Force 2 (Japan)"
+  name: "Psychic Force 2"
+  saveName: "Psychic Force 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131421,11 +138263,13 @@ SLPM-86273:
     multitap: false
     linkCable: false
 SLPM-80463:
-  name: "Psychic Force 2 (Japan) (Demo)"
+  name: "Psychic Force 2 (Demo)"
+  saveName: "Psychic Force 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01869:
-  name: "Psychometrer Eiji (Japan)"
+  name: "Psychometrer Eiji"
+  saveName: "Psychometrer Eiji (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131444,19 +138288,23 @@ SLPS-01869:
     multitap: false
     linkCable: false
 SLUS-90037:
-  name: "Psygnosis '98 Interactive Demos (USA) (Demo)"
+  name: "Psygnosis '98 Interactive Demos (Demo)"
+  saveName: "Psygnosis '98 Interactive Demos (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-02784:
-  name: "Pub Demo 03 (Europe)"
+  name: "Pub Demo 03"
+  saveName: "Pub Demo 03 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02785:
-  name: "Pub Demo 04 (Europe)"
+  name: "Pub Demo 04"
+  saveName: "Pub Demo 04 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-02070:
-  name: "Puchi Carat (Europe)"
+  name: "Puchi Carat"
+  saveName: "Puchi Carat (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131476,7 +138324,8 @@ SLES-02070:
     multitap: false
     linkCable: false
 SLPM-86545:
-  name: "Puchi Carat (Japan)"
+  name: "Puchi Carat"
+  saveName: "Puchi Carat (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -131502,7 +138351,8 @@ SLPM-86545:
     multitap: false
     linkCable: false
 ESPM-70003:
-  name: "Puffy no P.S. I Love You (Japan)"
+  name: "Puffy no P.S. I Love You"
+  saveName: "Puffy no P.S. I Love You (Japan)"
   controllers:
     - DigitalController
     - GunCon
@@ -131521,7 +138371,8 @@ ESPM-70003:
     multitap: false
     linkCable: false
 SLES-01203:
-  name: "Puma Street Soccer (Europe) (En,Fr,De,It)"
+  name: "Puma Street Soccer"
+  saveName: "Puma Street Soccer (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131543,7 +138394,8 @@ SLES-01203:
     multitap: true
     linkCable: false
 SLPS-02805:
-  name: "Punch the Monkey! Game Edition (Japan)"
+  name: "Punch the Monkey! Game Edition"
+  saveName: "Punch the Monkey! Game Edition (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131562,7 +138414,8 @@ SLPS-02805:
     multitap: false
     linkCable: false
 SLUS-00579:
-  name: "Punky Skunk (USA)"
+  name: "Punky Skunk"
+  saveName: "Punky Skunk (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -131583,7 +138436,8 @@ SLUS-00579:
     multitap: false
     linkCable: false
 SLPS-00149:
-  name: "Puppet Zoo Pilomy (Japan) (En,Ja)"
+  name: "Puppet Zoo Pilomy"
+  saveName: "Puppet Zoo Pilomy (Japan) (En,Ja)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -131605,7 +138459,8 @@ SLPS-00149:
     multitap: false
     linkCable: false
 SLPS-02163:
-  name: "Purumui Purumui (Japan)"
+  name: "Purumui Purumui"
+  saveName: "Purumui Purumui (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131641,7 +138496,8 @@ SLPS-02378:
     multitap: false
     linkCable: false
 SLPS-00679:
-  name: "Pururun! with Shape Up Girls (Japan)"
+  name: "Pururun! with Shape Up Girls"
+  saveName: "Pururun! with Shape Up Girls (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131659,7 +138515,8 @@ SLPS-00679:
     multitap: false
     linkCable: false
 SLUS-01371:
-  name: "Putter Golf (USA)"
+  name: "Putter Golf"
+  saveName: "Putter Golf (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131678,7 +138535,8 @@ SLUS-01371:
     multitap: true
     linkCable: false
 SLES-03565:
-  name: "Puuha Pete - Korjataanko (Finland)"
+  name: "Puuha Pete - Korjataanko"
+  saveName: "Puuha Pete - Korjataanko (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131697,7 +138555,8 @@ SLES-03565:
     multitap: false
     linkCable: false
 SLPS-03114:
-  name: "Puyo Puyo Box (Japan)"
+  name: "Puyo Puyo Box"
+  saveName: "Puyo Puyo Box (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131716,7 +138575,8 @@ SLPS-03114:
     multitap: true
     linkCable: false
 SLPS-01080:
-  name: "Puyo Puyo Sun - Ketteiban (Japan)"
+  name: "Puyo Puyo Sun - Ketteiban"
+  saveName: "Puyo Puyo Sun - Ketteiban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131734,7 +138594,8 @@ SLPS-01080:
     multitap: false
     linkCable: false
 SLPM-87213:
-  name: "Puyo Puyo Sun - Ketteiban (Japan) (Rerelease)"
+  name: "Puyo Puyo Sun - Ketteiban (Rerelease)"
+  saveName: "Puyo Puyo Sun - Ketteiban (Japan) (Rerelease)"
   controllers:
     - DigitalController
   metadata:
@@ -131752,7 +138613,8 @@ SLPM-87213:
     multitap: false
     linkCable: false
 SLPS-00530:
-  name: "Puyo Puyo Tsuu - Ketteiban (Japan)"
+  name: "Puyo Puyo Tsuu - Ketteiban"
+  saveName: "Puyo Puyo Tsuu - Ketteiban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131770,7 +138632,8 @@ SLPS-00530:
     multitap: false
     linkCable: false
 SLPS-02412:
-  name: "Puyo Puyoon - Car-kun to Issho (Japan)"
+  name: "Puyo Puyoon - Car-kun to Issho"
+  saveName: "Puyo Puyoon - Car-kun to Issho (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131789,7 +138652,8 @@ SLPS-02412:
     multitap: false
     linkCable: false
 SLPS-02663:
-  name: "Puzz Loop (Japan)"
+  name: "Puzz Loop"
+  saveName: "Puzz Loop (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131808,7 +138672,8 @@ SLPS-02663:
     multitap: false
     linkCable: false
 SLPS-00879:
-  name: "Puzzle Arena Toushinden (Japan)"
+  name: "Puzzle Arena Toushinden"
+  saveName: "Puzzle Arena Toushinden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131826,7 +138691,8 @@ SLPS-00879:
     multitap: false
     linkCable: false
 SLPM-86618:
-  name: "Puzzle Bobble 2 (Japan)"
+  name: "Puzzle Bobble 2"
+  saveName: "Puzzle Bobble 2 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -131851,7 +138717,8 @@ SLPM-86618:
     multitap: false
     linkCable: false
 SLPS-01065:
-  name: "Puzzle Bobble 3DX (Japan)"
+  name: "Puzzle Bobble 3DX"
+  saveName: "Puzzle Bobble 3DX (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -131875,7 +138742,8 @@ SLPS-01065:
     multitap: false
     linkCable: false
 SLPS-01492:
-  name: "Puzzle Bobble 4 (Japan)"
+  name: "Puzzle Bobble 4"
+  saveName: "Puzzle Bobble 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -131894,7 +138762,8 @@ SLPS-01492:
     multitap: false
     linkCable: false
 SLPS-01778:
-  name: "Puzzle Mania (Japan)"
+  name: "Puzzle Mania"
+  saveName: "Puzzle Mania (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -131912,7 +138781,8 @@ SLPS-01778:
     multitap: false
     linkCable: false
 SLPM-86653:
-  name: "Puzzle Mania (Japan) (Major Wave)"
+  name: "Puzzle Mania (Major Wave)"
+  saveName: "Puzzle Mania (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -131948,7 +138818,8 @@ SLPS-01952:
     multitap: false
     linkCable: false
 SLPM-86674:
-  name: "Puzzle Mania 2 (Japan) (Major Wave)"
+  name: "Puzzle Mania 2 (Major Wave)"
+  saveName: "Puzzle Mania 2 (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -131966,7 +138837,8 @@ SLPM-86674:
     multitap: false
     linkCable: false
 SLUS-01307:
-  name: "Puzzle Star Sweep (USA)"
+  name: "Puzzle Star Sweep"
+  saveName: "Puzzle Star Sweep (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -131984,7 +138856,8 @@ SLUS-01307:
     multitap: false
     linkCable: false
 SLES-03915:
-  name: "Puzznic (Europe)"
+  name: "Puzznic"
+  saveName: "Puzznic (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132003,7 +138876,8 @@ SLES-03915:
     multitap: false
     linkCable: false
 SLPS-03163:
-  name: "Puzznic (Japan)"
+  name: "Puzznic"
+  saveName: "Puzznic (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132022,7 +138896,8 @@ SLPS-03163:
     multitap: false
     linkCable: false
 SLUS-01492:
-  name: "Puzznic (USA)"
+  name: "Puzznic"
+  saveName: "Puzznic (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132041,7 +138916,8 @@ SLUS-01492:
     multitap: false
     linkCable: false
 SLES-03577:
-  name: "Pyjama Sam - Heros du Gouter (France)"
+  name: "Pyjama Sam - Heros du Gouter"
+  saveName: "Pyjama Sam - Heros du Gouter (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132060,7 +138936,8 @@ SLES-03577:
     multitap: false
     linkCable: false
 SLES-03578:
-  name: "Pyjama Sam - Suessigkeiten kriegen Saures (Germany)"
+  name: "Pyjama Sam - Suessigkeiten kriegen Saures"
+  saveName: "Pyjama Sam - Suessigkeiten kriegen Saures (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132079,7 +138956,8 @@ SLES-03578:
     multitap: false
     linkCable: false
 SLES-02214:
-  name: "Q-bert (Europe) (En,Fr,De,Es,It)"
+  name: "Q-bert"
+  saveName: "Q-bert (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132102,7 +138980,8 @@ SLES-02214:
     multitap: false
     linkCable: false
 SLUS-00904:
-  name: "Q-bert (USA)"
+  name: "Q-bert"
+  saveName: "Q-bert (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -132124,7 +139003,8 @@ SLUS-00904:
     multitap: false
     linkCable: false
 SLUS-01561:
-  name: "Qix Neo (USA)"
+  name: "Qix Neo"
+  saveName: "Qix Neo (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132143,7 +139023,8 @@ SLUS-01561:
     multitap: false
     linkCable: false
 LSP-905314:
-  name: "Quaddle Family Mysteries, The 1 - The Case of the Scarce Scarab - Lobby & Kitchen (USA)"
+  name: "Quaddle Family Mysteries, The 1 - The Case of the Scarce Scarab - Lobby & Kitchen"
+  saveName: "Quaddle Family Mysteries, The 1 - The Case of the Scarce Scarab - Lobby & Kitchen (USA)"
   codes:
     - LSP905314
     - LSP06010101
@@ -132154,7 +139035,8 @@ LSP-905314:
     languages:
       - English
 LSP-905321:
-  name: "Quaddle Family Mysteries, The 2 - The Case of the Scarce Scarab - Garden (USA)"
+  name: "Quaddle Family Mysteries, The 2 - The Case of the Scarce Scarab - Garden"
+  saveName: "Quaddle Family Mysteries, The 2 - The Case of the Scarce Scarab - Garden (USA)"
   codes:
     - LSP905321
     - LSP06010201
@@ -132165,7 +139047,8 @@ LSP-905321:
     languages:
       - English
 LSP-905338:
-  name: "Quaddle Family Mysteries, The 3 - The Case of the Scarce Scarab - Parlor & Family Room (USA)"
+  name: "Quaddle Family Mysteries, The 3 - The Case of the Scarce Scarab - Parlor & Family Room"
+  saveName: "Quaddle Family Mysteries, The 3 - The Case of the Scarce Scarab - Parlor & Family Room (USA)"
   codes:
     - LSP905338
     - LSP06010301
@@ -132176,7 +139059,8 @@ LSP-905338:
     languages:
       - English
 SLES-01534:
-  name: "Quake II (Europe)"
+  name: "Quake II"
+  saveName: "Quake II (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -132197,7 +139081,8 @@ SLES-01534:
     multitap: true
     linkCable: false
 SLUS-00757:
-  name: "Quake II (USA)"
+  name: "Quake II"
+  saveName: "Quake II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -132221,7 +139106,8 @@ SLUS-00757:
     multitap: true
     linkCable: false
 SLPS-00399:
-  name: "Quantum Gate I - Akumu no Joshou (Japan)"
+  name: "Quantum Gate I - Akumu no Joshou"
+  saveName: "Quantum Gate I - Akumu no Joshou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -132239,7 +139125,8 @@ SLPS-00399:
     multitap: false
     linkCable: false
 SLPS-00711:
-  name: "Queen's Road (Japan)"
+  name: "Queen's Road"
+  saveName: "Queen's Road (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -132257,7 +139144,8 @@ SLPS-00711:
     multitap: false
     linkCable: false
 SCPS-18004:
-  name: "Quest for Fame - Be a Virtual Rock Legend (Japan) (Disc 1)"
+  name: "Quest for Fame - Be a Virtual Rock Legend (Disc 1)"
+  saveName: "Quest for Fame - Be a Virtual Rock Legend (Japan) (Disc 1)"
   discSet:
     name: "Quest for Fame - Be a Virtual Rock Legend (Japan)"
     serials:
@@ -132280,7 +139168,8 @@ SCPS-18004:
     multitap: false
     linkCable: false
 SCPS-18005:
-  name: "Quest for Fame - Be a Virtual Rock Legend (Japan) (Disc 2)"
+  name: "Quest for Fame - Be a Virtual Rock Legend (Disc 2)"
+  saveName: "Quest for Fame - Be a Virtual Rock Legend (Japan) (Disc 2)"
   discSet:
     name: "Quest for Fame - Be a Virtual Rock Legend (Japan)"
     serials:
@@ -132303,7 +139192,8 @@ SCPS-18005:
     multitap: false
     linkCable: false
 SLES-03480:
-  name: "Qui Veut Gagner des Millions (France)"
+  name: "Qui Veut Gagner des Millions"
+  saveName: "Qui Veut Gagner des Millions (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132322,7 +139212,8 @@ SLES-03480:
     multitap: true
     linkCable: false
 SLES-03593:
-  name: "Qui Veut Gagner des Millions - Junior (France)"
+  name: "Qui Veut Gagner des Millions - Junior"
+  saveName: "Qui Veut Gagner des Millions - Junior (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132341,7 +139232,8 @@ SLES-03593:
     multitap: true
     linkCable: false
 SLES-03590:
-  name: "Qui Veut Gagner des Millions - Seconde Edition (France)"
+  name: "Qui Veut Gagner des Millions - Seconde Edition"
+  saveName: "Qui Veut Gagner des Millions - Seconde Edition (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132360,7 +139252,8 @@ SLES-03590:
     multitap: false
     linkCable: false
 SLES-03481:
-  name: "Quiere ser millonario (Spain)"
+  name: "Quiere ser millonario"
+  saveName: "Quiere ser millonario (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132398,7 +139291,8 @@ SLPS-91529:
     multitap: true
     linkCable: false
 SLPS-02189:
-  name: "Quiz Chara-Oke Don! Toei Tokusatsu Hero Part 1 (Japan)"
+  name: "Quiz Chara-Oke Don! Toei Tokusatsu Hero Part 1"
+  saveName: "Quiz Chara-Oke Don! Toei Tokusatsu Hero Part 1 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132417,7 +139311,8 @@ SLPS-02189:
     multitap: true
     linkCable: false
 SLPS-02310:
-  name: "Quiz Chara-Oke Don! Toei Tokusatsu Hero Part 2 (Japan)"
+  name: "Quiz Chara-Oke Don! Toei Tokusatsu Hero Part 2"
+  saveName: "Quiz Chara-Oke Don! Toei Tokusatsu Hero Part 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132455,7 +139350,8 @@ SLPM-87156:
     multitap: true
     linkCable: false
 SLPM-87097:
-  name: "Quiz Darake no Jinsei Game - Un to Atama de Daifugou! (Japan)"
+  name: "Quiz Darake no Jinsei Game - Un to Atama de Daifugou!"
+  saveName: "Quiz Darake no Jinsei Game - Un to Atama de Daifugou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132477,7 +139373,8 @@ SLPM-87097:
     multitap: true
     linkCable: false
 SLPS-00875:
-  name: "Quiz Nanairo Dreams - Nijiirochou no Kiseki (Japan)"
+  name: "Quiz Nanairo Dreams - Nijiirochou no Kiseki"
+  saveName: "Quiz Nanairo Dreams - Nijiirochou no Kiseki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -132495,7 +139392,8 @@ SLPS-00875:
     multitap: false
     linkCable: false
 SLES-03752:
-  name: "Quiz Show (Italy) (Disc 1) (CD Gioco)"
+  name: "Quiz Show (Disc 1) (CD Gioco)"
+  saveName: "Quiz Show (Italy) (Disc 1) (CD Gioco)"
   discSet:
     name: "Quiz Show (Italy)"
     serials:
@@ -132518,7 +139416,8 @@ SLES-03752:
     multitap: false
     linkCable: false
 SLES-13752:
-  name: "Quiz Show (Italy) (Disc 2) (CD Help e Backstage)"
+  name: "Quiz Show (Disc 2) (CD Help e Backstage)"
+  saveName: "Quiz Show (Italy) (Disc 2) (CD Help e Backstage)"
   discSet:
     name: "Quiz Show (Italy)"
     serials:
@@ -132541,7 +139440,8 @@ SLES-13752:
     multitap: false
     linkCable: false
 SLPS-03364:
-  name: "Quiz$Millionaire (Japan)"
+  name: "Quiz$Millionaire"
+  saveName: "Quiz$Millionaire (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132560,7 +139460,8 @@ SLPS-03364:
     multitap: true
     linkCable: false
 SLPS-91515:
-  name: "Quiz$Millionaire (Japan) (PSone Books)"
+  name: "Quiz$Millionaire (PSone Books)"
+  saveName: "Quiz$Millionaire (Japan) (PSone Books)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132579,7 +139480,8 @@ SLPS-91515:
     multitap: true
     linkCable: false
 SLPS-03494:
-  name: "Quiz$Millionaire - Waku Waku Party (Japan)"
+  name: "Quiz$Millionaire - Waku Waku Party"
+  saveName: "Quiz$Millionaire - Waku Waku Party (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132598,7 +139500,8 @@ SLPS-03494:
     multitap: true
     linkCable: false
 SLPS-00733:
-  name: "QuoVadis - Iverkurtz Sen'eki (Japan)"
+  name: "QuoVadis - Iverkurtz Sen'eki"
+  saveName: "QuoVadis - Iverkurtz Sen'eki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -132616,7 +139519,8 @@ SLPS-00733:
     multitap: false
     linkCable: false
 SLPS-02047:
-  name: "R (Japan)"
+  name: "R"
+  saveName: "R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132635,7 +139539,8 @@ SLPS-02047:
     multitap: false
     linkCable: false
 SLPS-02045:
-  name: "R (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "R (Disc 1) (Shokai Genteiban)"
+  saveName: "R (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "R (Japan) (Shokai Genteiban)"
     serials:
@@ -132659,7 +139564,8 @@ SLPS-02045:
     multitap: false
     linkCable: false
 SLPS-02046:
-  name: "R (Japan) (Disc 2) (Photo Album) (Shokai Genteiban)"
+  name: "R (Disc 2) (Photo Album) (Shokai Genteiban)"
+  saveName: "R (Japan) (Disc 2) (Photo Album) (Shokai Genteiban)"
   discSet:
     name: "R (Japan) (Shokai Genteiban)"
     serials:
@@ -132683,7 +139589,8 @@ SLPS-02046:
     multitap: false
     linkCable: false
 SLES-01459:
-  name: "R-C Stunt Copter (Europe)"
+  name: "R-C Stunt Copter"
+  saveName: "R-C Stunt Copter (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132702,11 +139609,13 @@ SLES-01459:
     multitap: false
     linkCable: false
 SLED-01501:
-  name: "R-C Stunt Copter (Europe) (Demo)"
+  name: "R-C Stunt Copter (Demo)"
+  saveName: "R-C Stunt Copter (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02141:
-  name: "R-C Stunt Copter (France)"
+  name: "R-C Stunt Copter"
+  saveName: "R-C Stunt Copter (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132725,11 +139634,13 @@ SLES-02141:
     multitap: false
     linkCable: false
 SLED-02231:
-  name: "R-C Stunt Copter (France) (Demo)"
+  name: "R-C Stunt Copter (Demo)"
+  saveName: "R-C Stunt Copter (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02140:
-  name: "R-C Stunt Copter (Germany)"
+  name: "R-C Stunt Copter"
+  saveName: "R-C Stunt Copter (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132748,7 +139659,8 @@ SLES-02140:
     multitap: false
     linkCable: false
 SLPM-86407:
-  name: "R-C Stunt Copter (Japan)"
+  name: "R-C Stunt Copter"
+  saveName: "R-C Stunt Copter (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132767,7 +139679,8 @@ SLPM-86407:
     multitap: false
     linkCable: false
 SLUS-00954:
-  name: "R-C Stunt Copter (USA)"
+  name: "R-C Stunt Copter"
+  saveName: "R-C Stunt Copter (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132786,7 +139699,8 @@ SLUS-00954:
     multitap: false
     linkCable: false
 SCES-01762:
-  name: "R-Type Delta (Europe)"
+  name: "R-Type Delta"
+  saveName: "R-Type Delta (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132807,7 +139721,8 @@ SCES-01762:
     multitap: false
     linkCable: false
 SLPS-01688:
-  name: "R-Type Delta (Japan)"
+  name: "R-Type Delta"
+  saveName: "R-Type Delta (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -132833,7 +139748,8 @@ SLPS-01688:
     multitap: false
     linkCable: false
 SLUS-00877:
-  name: "R-Type Delta (USA)"
+  name: "R-Type Delta"
+  saveName: "R-Type Delta (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -132857,7 +139773,8 @@ SLUS-00877:
     multitap: false
     linkCable: false
 SLES-01355:
-  name: "R-Types (Europe)"
+  name: "R-Types"
+  saveName: "R-Types (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -132875,7 +139792,8 @@ SLES-01355:
     multitap: false
     linkCable: false
 SLPS-01236:
-  name: "R-Types (Japan)"
+  name: "R-Types"
+  saveName: "R-Types (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -132914,7 +139832,8 @@ SLPS-03310:
     multitap: false
     linkCable: false
 SLUS-00753:
-  name: "R-Types (USA)"
+  name: "R-Types"
+  saveName: "R-Types (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -132959,7 +139878,8 @@ SCPS-45354:
     multitap: false
     linkCable: false
 SLPS-01798:
-  name: "R4 - Ridge Racer Type 4 (Japan) (R4 + JogCon)"
+  name: "R4 - Ridge Racer Type 4 (R4 + JogCon)"
+  saveName: "R4 - Ridge Racer Type 4 (Japan) (R4 + JogCon)"
   controllers:
     - AnalogController
     - DigitalController
@@ -132980,7 +139900,8 @@ SLPS-01798:
     multitap: false
     linkCable: false
 SCPS-45356:
-  name: "R4 - Ridge Racer Type 4 (Japan, Asia)"
+  name: "R4 - Ridge Racer Type 4"
+  saveName: "R4 - Ridge Racer Type 4 (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133004,7 +139925,8 @@ SCPS-45356:
     multitap: false
     linkCable: false
 SLUS-00797:
-  name: "R4 - Ridge Racer Type 4 (USA)"
+  name: "R4 - Ridge Racer Type 4"
+  saveName: "R4 - Ridge Racer Type 4 (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -133048,7 +139970,8 @@ SLPS-91463:
     multitap: false
     linkCable: false
 SLUS-01376:
-  name: "RC Helicopter (USA)"
+  name: "RC Helicopter"
+  saveName: "RC Helicopter (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -133070,7 +139993,8 @@ SLUS-01376:
     multitap: false
     linkCable: false
 SLES-02824:
-  name: "RC Revenge (Europe) (En,Fr,De,Es)"
+  name: "RC Revenge"
+  saveName: "RC Revenge (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133094,11 +140018,13 @@ SLES-02824:
     multitap: false
     linkCable: false
 SLED-03100:
-  name: "RC Revenge (Europe) (En,Fr,De,Es) (Demo)"
+  name: "RC Revenge (Demo)"
+  saveName: "RC Revenge (Europe) (En,Fr,De,Es) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86635:
-  name: "RC Revenge (Japan)"
+  name: "RC Revenge"
+  saveName: "RC Revenge (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133118,7 +140044,8 @@ SLPM-86635:
     multitap: false
     linkCable: false
 SLUS-01168:
-  name: "RC Revenge (USA)"
+  name: "RC Revenge"
+  saveName: "RC Revenge (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2553-g3ed42977"
@@ -133141,7 +140068,8 @@ SLUS-01168:
     multitap: false
     linkCable: false
 SLES-03068:
-  name: "RC de Go! (Europe)"
+  name: "RC de Go!"
+  saveName: "RC de Go! (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133161,7 +140089,8 @@ SLES-03068:
     multitap: false
     linkCable: false
 SLPM-86546:
-  name: "RC de Go! (Japan)"
+  name: "RC de Go!"
+  saveName: "RC de Go! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133181,7 +140110,8 @@ SLPM-86546:
     multitap: false
     linkCable: false
 SLUS-01285:
-  name: "RC de Go! (USA)"
+  name: "RC de Go!"
+  saveName: "RC de Go! (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133201,7 +140131,8 @@ SLUS-01285:
     multitap: false
     linkCable: false
 SLPS-01087:
-  name: "RMJ - The Mystery Hospital (Japan) (Disc 1) (What's Going On)"
+  name: "RMJ - The Mystery Hospital (Disc 1) (What's Going On)"
+  saveName: "RMJ - The Mystery Hospital (Japan) (Disc 1) (What's Going On)"
   discSet:
     name: "RMJ - The Mystery Hospital (Japan)"
     serials:
@@ -133227,7 +140158,8 @@ SLPS-01087:
     multitap: false
     linkCable: false
 SLPS-01088:
-  name: "RMJ - The Mystery Hospital (Japan) (Disc 2) (Fears Behind)"
+  name: "RMJ - The Mystery Hospital (Disc 2) (Fears Behind)"
+  saveName: "RMJ - The Mystery Hospital (Japan) (Disc 2) (Fears Behind)"
   discSet:
     name: "RMJ - The Mystery Hospital (Japan)"
     serials:
@@ -133253,11 +140185,13 @@ SLPS-01088:
     multitap: false
     linkCable: false
 SLPM-80172:
-  name: "RMJ - The Mystery Hospital - Second Attack Sample CD-ROM (Japan)"
+  name: "RMJ - The Mystery Hospital - Second Attack Sample CD-ROM"
+  saveName: "RMJ - The Mystery Hospital - Second Attack Sample CD-ROM (Japan)"
   metadata:
     genre: "** DEMO **"
 SLUS-00640:
-  name: "RPG Maker (USA)"
+  name: "RPG Maker"
+  saveName: "RPG Maker (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -133279,7 +140213,8 @@ SLUS-00640:
     multitap: false
     linkCable: false
 SLPS-01093:
-  name: "RPG Tkool 3 (Japan)"
+  name: "RPG Tkool 3"
+  saveName: "RPG Tkool 3 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -133300,7 +140235,8 @@ SLPS-01093:
     multitap: false
     linkCable: false
 SLPS-02861:
-  name: "RPG Tkool 4 (Japan) (Disc 1)"
+  name: "RPG Tkool 4 (Disc 1)"
+  saveName: "RPG Tkool 4 (Japan) (Disc 1)"
   discSet:
     name: "RPG Tkool 4 (Japan)"
     serials:
@@ -133324,7 +140260,8 @@ SLPS-02861:
     multitap: false
     linkCable: false
 SLPS-02862:
-  name: "RPG Tkool 4 (Japan) (Disc 2) (Character Tkool)"
+  name: "RPG Tkool 4 (Disc 2) (Character Tkool)"
+  saveName: "RPG Tkool 4 (Japan) (Disc 2) (Character Tkool)"
   discSet:
     name: "RPG Tkool 4 (Japan)"
     serials:
@@ -133348,7 +140285,8 @@ SLPS-02862:
     multitap: false
     linkCable: false
 SLES-03772:
-  name: "RTL Skispringen 2002 (Germany) (En,De)"
+  name: "RTL Skispringen 2002"
+  saveName: "RTL Skispringen 2002 (Germany) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133368,7 +140306,8 @@ SLES-03772:
     multitap: false
     linkCable: false
 SLPS-02293:
-  name: "Raamen-bashi (Japan)"
+  name: "Raamen-bashi"
+  saveName: "Raamen-bashi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133387,7 +140326,8 @@ SLPS-02293:
     multitap: false
     linkCable: false
 SLPS-00167:
-  name: "Race Drivin' a Go! Go! (Japan)"
+  name: "Race Drivin' a Go! Go!"
+  saveName: "Race Drivin' a Go! Go! (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -133406,7 +140346,8 @@ SLPS-00167:
     multitap: false
     linkCable: false
 SLUS-01291:
-  name: "Racing (USA) (En,Fr,Es)"
+  name: "Racing"
+  saveName: "Racing (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133426,7 +140367,8 @@ SLUS-01291:
     multitap: false
     linkCable: false
 SCPS-45404:
-  name: "Racing Lagoon (Japan, Asia)"
+  name: "Racing Lagoon"
+  saveName: "Racing Lagoon (Japan, Asia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -133474,7 +140416,8 @@ SLPS-91487:
     multitap: false
     linkCable: false
 SLES-01665:
-  name: "Racing Simulation 2 (Germany)"
+  name: "Racing Simulation 2"
+  saveName: "Racing Simulation 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133494,9 +140437,11 @@ SLES-01665:
     multitap: false
     linkCable: true
 SCED-01640:
-  name: "Racing Special (Europe)"
+  name: "Racing Special"
+  saveName: "Racing Special (Europe)"
 SLPS-00417:
-  name: "Racingroovy VS (Japan)"
+  name: "Racingroovy VS"
+  saveName: "Racingroovy VS (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -133520,7 +140465,8 @@ SLPS-00417:
     multitap: false
     linkCable: true
 SLES-01943:
-  name: "Radikal Bikers (Europe) (En,Fr,De,Es,It)"
+  name: "Radikal Bikers"
+  saveName: "Radikal Bikers (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133545,7 +140491,8 @@ SLES-01943:
     multitap: false
     linkCable: false
 SCES-00650:
-  name: "Rage Racer (Europe)"
+  name: "Rage Racer"
+  saveName: "Rage Racer (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -133564,7 +140511,8 @@ SCES-00650:
     multitap: false
     linkCable: false
 SLPS-00600:
-  name: "Rage Racer (Japan)"
+  name: "Rage Racer"
+  saveName: "Rage Racer (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -133583,7 +140531,8 @@ SLPS-00600:
     multitap: false
     linkCable: false
 SLUS-00403:
-  name: "Rage Racer (USA)"
+  name: "Rage Racer"
+  saveName: "Rage Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1669-g455f3591"
@@ -133605,7 +140554,8 @@ SLUS-00403:
     multitap: false
     linkCable: false
 SLES-03511:
-  name: "Rageball (Europe)"
+  name: "Rageball"
+  saveName: "Rageball (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133624,7 +140574,8 @@ SLES-03511:
     multitap: true
     linkCable: false
 SLUS-01461:
-  name: "Rageball (USA)"
+  name: "Rageball"
+  saveName: "Rageball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133643,7 +140594,8 @@ SLUS-01461:
     multitap: true
     linkCable: false
 SCES-00222:
-  name: "Raging Skies (Europe) (En,Fr,De)"
+  name: "Raging Skies"
+  saveName: "Raging Skies (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -133681,7 +140633,8 @@ SCPS-45019:
     multitap: false
     linkCable: false
 SLPS-00728:
-  name: "Raiden DX (Japan)"
+  name: "Raiden DX"
+  saveName: "Raiden DX (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -133702,7 +140655,8 @@ SLPS-00728:
     multitap: false
     linkCable: false
 SLPM-86656:
-  name: "Raiden DX (Japan) (Major Wave)"
+  name: "Raiden DX (Major Wave)"
+  saveName: "Raiden DX (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -133720,7 +140674,8 @@ SLPM-86656:
     multitap: false
     linkCable: false
 SLPS-00013:
-  name: "Raiden Project (Japan)"
+  name: "Raiden Project"
+  saveName: "Raiden Project (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -133759,7 +140714,8 @@ SLPS-91144:
     multitap: false
     linkCable: false
 SLES-00051:
-  name: "Raiden Project, The (Europe)"
+  name: "Raiden Project, The"
+  saveName: "Raiden Project, The (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -133777,7 +140733,8 @@ SLES-00051:
     multitap: false
     linkCable: false
 SCUS-94402:
-  name: "Raiden Project, The (USA)"
+  name: "Raiden Project, The"
+  saveName: "Raiden Project, The (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -133797,7 +140754,8 @@ SCUS-94402:
     multitap: false
     linkCable: false
 SLES-02426:
-  name: "Railroad Tycoon II (Europe) (En,Fr,De)"
+  name: "Railroad Tycoon II"
+  saveName: "Railroad Tycoon II (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133819,7 +140777,8 @@ SLES-02426:
     multitap: false
     linkCable: false
 SLUS-00808:
-  name: "Railroad Tycoon II (USA)"
+  name: "Railroad Tycoon II"
+  saveName: "Railroad Tycoon II (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133839,7 +140798,8 @@ SLUS-00808:
     multitap: false
     linkCable: false
 SLPM-86272:
-  name: "Rakugaki Showtime (Japan)"
+  name: "Rakugaki Showtime"
+  saveName: "Rakugaki Showtime (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -133857,7 +140817,8 @@ SLPM-86272:
     multitap: true
     linkCable: false
 SCES-00408:
-  name: "Rally Cross (Europe)"
+  name: "Rally Cross"
+  saveName: "Rally Cross (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133877,7 +140838,8 @@ SCES-00408:
     multitap: true
     linkCable: false
 SIPS-60022:
-  name: "Rally Cross (Japan)"
+  name: "Rally Cross"
+  saveName: "Rally Cross (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133897,7 +140859,8 @@ SIPS-60022:
     multitap: true
     linkCable: false
 SCUS-94308:
-  name: "Rally Cross (USA)"
+  name: "Rally Cross"
+  saveName: "Rally Cross (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133917,7 +140880,8 @@ SCUS-94308:
     multitap: true
     linkCable: false
 SCES-01631:
-  name: "Rally Cross 2 (Europe)"
+  name: "Rally Cross 2"
+  saveName: "Rally Cross 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133937,7 +140901,8 @@ SCES-01631:
     multitap: false
     linkCable: false
 SCUS-94247:
-  name: "Rally Cross 2 (USA)"
+  name: "Rally Cross 2"
+  saveName: "Rally Cross 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -133961,11 +140926,13 @@ SCUS-94247:
     multitap: false
     linkCable: false
 SCUS-94377:
-  name: "Rally Cross 2 (USA) (Demo)"
+  name: "Rally Cross 2 (Demo)"
+  saveName: "Rally Cross 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01601:
-  name: "Rally de Africa (Japan)"
+  name: "Rally de Africa"
+  saveName: "Rally de Africa (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -133988,9 +140955,11 @@ SLPS-01601:
     multitap: false
     linkCable: false
 SLPM-80296:
-  name: "Rally de Africa (Japan) (Taikenban)"
+  name: "Rally de Africa (Taikenban)"
+  saveName: "Rally de Africa (Japan) (Taikenban)"
 SLPS-02679:
-  name: "Rally de Europe (Japan)"
+  name: "Rally de Europe"
+  saveName: "Rally de Europe (Japan)"
   traits:
     - DisableWidescreen # Speedometer breaks with WS rendering.
   controllers:
@@ -134031,7 +141000,8 @@ SLPS-03139:
     multitap: false
     linkCable: false
 SLPS-01546:
-  name: "Rami-chan no Ooedo Sugoroku - Keiou Yuugekitai Gaiden (Japan)"
+  name: "Rami-chan no Ooedo Sugoroku - Keiou Yuugekitai Gaiden"
+  saveName: "Rami-chan no Ooedo Sugoroku - Keiou Yuugekitai Gaiden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134050,7 +141020,8 @@ SLPS-01546:
     multitap: true
     linkCable: false
 SLES-02849:
-  name: "Rampage - Through Time (Europe) (En,Fr,De)"
+  name: "Rampage - Through Time"
+  saveName: "Rampage - Through Time (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134071,7 +141042,8 @@ SLES-02849:
     multitap: true
     linkCable: false
 SLUS-01065:
-  name: "Rampage - Through Time (USA)"
+  name: "Rampage - Through Time"
+  saveName: "Rampage - Through Time (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -134093,7 +141065,8 @@ SLUS-01065:
     multitap: true
     linkCable: false
 SLES-01011:
-  name: "Rampage - World Tour (Europe)"
+  name: "Rampage - World Tour"
+  saveName: "Rampage - World Tour (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -134111,7 +141084,8 @@ SLES-01011:
     multitap: false
     linkCable: false
 SLUS-00549:
-  name: "Rampage - World Tour (USA)"
+  name: "Rampage - World Tour"
+  saveName: "Rampage - World Tour (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -134132,7 +141106,8 @@ SLUS-00549:
     multitap: false
     linkCable: false
 SLES-02021:
-  name: "Rampage 2 - Universal Tour (Europe)"
+  name: "Rampage 2 - Universal Tour"
+  saveName: "Rampage 2 - Universal Tour (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134151,7 +141126,8 @@ SLES-02021:
     multitap: true
     linkCable: false
 SLUS-00742:
-  name: "Rampage 2 - Universal Tour (USA)"
+  name: "Rampage 2 - Universal Tour"
+  saveName: "Rampage 2 - Universal Tour (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3597-gb1cf2555"
@@ -134173,7 +141149,8 @@ SLUS-00742:
     multitap: true
     linkCable: false
 SLES-00214:
-  name: "Ran Soccer (Germany)"
+  name: "Ran Soccer"
+  saveName: "Ran Soccer (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -134191,7 +141168,8 @@ SLES-00214:
     multitap: false
     linkCable: false
 SLPS-00522:
-  name: "Ranma 1-2 - Battle Renaissance (Japan)"
+  name: "Ranma 1-2 - Battle Renaissance"
+  saveName: "Ranma 1-2 - Battle Renaissance (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -134209,7 +141187,8 @@ SLPS-00522:
     multitap: false
     linkCable: false
 PAPX-90007:
-  name: "Rap-la-MuuMuu from JumpingFlash! 2 (Japan)"
+  name: "Rap-la-MuuMuu from JumpingFlash! 2"
+  saveName: "Rap-la-MuuMuu from JumpingFlash! 2 (Japan)"
 SCPS-45282:
   name: "Rapid Racer"
   controllers:
@@ -134231,7 +141210,8 @@ SCPS-45282:
     multitap: false
     linkCable: false
 SCES-00394:
-  name: "Rapid Racer (Europe) (En,Fr,De,Es,It)"
+  name: "Rapid Racer"
+  saveName: "Rapid Racer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134255,7 +141235,8 @@ SCES-00394:
     multitap: false
     linkCable: false
 SCPS-10060:
-  name: "Rapid Racer (Japan)"
+  name: "Rapid Racer"
+  saveName: "Rapid Racer (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134275,7 +141256,8 @@ SCPS-10060:
     multitap: false
     linkCable: false
 SCES-00004:
-  name: "Rapid Reload (Europe)"
+  name: "Rapid Reload"
+  saveName: "Rapid Reload (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -134298,7 +141280,8 @@ SCES-00004:
     multitap: false
     linkCable: false
 SLES-00858:
-  name: "Rascal (Europe)"
+  name: "Rascal"
+  saveName: "Rascal (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134317,11 +141300,13 @@ SLES-00858:
     multitap: false
     linkCable: false
 SLED-01065:
-  name: "Rascal (Europe) (Demo)"
+  name: "Rascal (Demo)"
+  saveName: "Rascal (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00542:
-  name: "Rascal (USA)"
+  name: "Rascal"
+  saveName: "Rascal (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -134343,11 +141328,13 @@ SLUS-00542:
     multitap: false
     linkCable: false
 SLUS-90015:
-  name: "Rascal (USA) (Demo)"
+  name: "Rascal (Demo)"
+  saveName: "Rascal (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-04058:
-  name: "Rascal Racers (Europe)"
+  name: "Rascal Racers"
+  saveName: "Rascal Racers (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134367,7 +141354,8 @@ SLES-04058:
     multitap: false
     linkCable: false
 SLUS-01575:
-  name: "Rascal Racers (USA)"
+  name: "Rascal Racers"
+  saveName: "Rascal Racers (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134387,7 +141375,8 @@ SLUS-01575:
     multitap: false
     linkCable: false
 SLES-01103:
-  name: "Rat Attack (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Rat Attack"
+  saveName: "Rat Attack (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -134413,7 +141402,8 @@ SLES-01103:
     multitap: true
     linkCable: false
 SLUS-00656:
-  name: "Rat Attack! (USA)"
+  name: "Rat Attack!"
+  saveName: "Rat Attack! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -134437,7 +141427,8 @@ SLUS-00656:
     multitap: true
     linkCable: false
 SLES-00039:
-  name: "Raven Project, The (Europe) (En,Fr,De) (Disc 1)"
+  name: "Raven Project, The (Disc 1)"
+  saveName: "Raven Project, The (Europe) (En,Fr,De) (Disc 1)"
   discSet:
     name: "Raven Project, The (Europe) (En,Fr,De)"
     serials:
@@ -134462,7 +141453,8 @@ SLES-00039:
     multitap: false
     linkCable: false
 SLES-10039:
-  name: "Raven Project, The (Europe) (En,Fr,De) (Disc 2)"
+  name: "Raven Project, The (Disc 2)"
+  saveName: "Raven Project, The (Europe) (En,Fr,De) (Disc 2)"
   discSet:
     name: "Raven Project, The (Europe) (En,Fr,De)"
     serials:
@@ -134487,7 +141479,8 @@ SLES-10039:
     multitap: false
     linkCable: false
 SLES-00518:
-  name: "Raven Project, The (France) (En,Fr,De) (Disc 1)"
+  name: "Raven Project, The (Disc 1)"
+  saveName: "Raven Project, The (France) (En,Fr,De) (Disc 1)"
   discSet:
     name: "Raven Project, The (France) (En,Fr,De)"
     serials:
@@ -134512,7 +141505,8 @@ SLES-00518:
     multitap: false
     linkCable: false
 SLES-10518:
-  name: "Raven Project, The (France) (En,Fr,De) (Disc 2)"
+  name: "Raven Project, The (Disc 2)"
+  saveName: "Raven Project, The (France) (En,Fr,De) (Disc 2)"
   discSet:
     name: "Raven Project, The (France) (En,Fr,De)"
     serials:
@@ -134537,7 +141531,8 @@ SLES-10518:
     multitap: false
     linkCable: false
 SLES-00519:
-  name: "Raven Project, The (Germany) (En,Fr,De) (Disc 1)"
+  name: "Raven Project, The (Disc 1)"
+  saveName: "Raven Project, The (Germany) (En,Fr,De) (Disc 1)"
   discSet:
     name: "Raven Project, The (Germany) (En,Fr,De)"
     serials:
@@ -134562,7 +141557,8 @@ SLES-00519:
     multitap: false
     linkCable: false
 SLES-10519:
-  name: "Raven Project, The (Germany) (En,Fr,De) (Disc 2)"
+  name: "Raven Project, The (Disc 2)"
+  saveName: "Raven Project, The (Germany) (En,Fr,De) (Disc 2)"
   discSet:
     name: "Raven Project, The (Germany) (En,Fr,De)"
     serials:
@@ -134606,7 +141602,8 @@ SCPS-45010:
     multitap: false
     linkCable: false
 SCES-00741:
-  name: "Ray Tracers (Europe)"
+  name: "Ray Tracers"
+  saveName: "Ray Tracers (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -134625,7 +141622,8 @@ SCES-00741:
     multitap: false
     linkCable: false
 SLPS-00098:
-  name: "Ray Tracers (Japan)"
+  name: "Ray Tracers"
+  saveName: "Ray Tracers (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -134644,7 +141642,8 @@ SLPS-00098:
     multitap: false
     linkCable: false
 SLUS-00534:
-  name: "Ray Tracers (USA)"
+  name: "Ray Tracers"
+  saveName: "Ray Tracers (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -134663,13 +141662,15 @@ SLUS-00534:
     multitap: false
     linkCable: false
 SLPM-80078:
-  name: "Ray-Ray CD-ROM (Japan)"
+  name: "Ray-Ray CD-ROM"
+  saveName: "Ray-Ray CD-ROM (Japan)"
   compatibility:
     rating: CrashesInGame
     versionTested: "0.1-1641-gb2057ac6"
     comments: "Crashes when choosing EXIT on the menu."
 SLES-02882:
-  name: "RayCrisis (Europe)"
+  name: "RayCrisis"
+  saveName: "RayCrisis (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1638-g0af22825"
@@ -134692,7 +141693,8 @@ SLES-02882:
     multitap: false
     linkCable: false
 SLPM-86450:
-  name: "RayCrisis (Japan)"
+  name: "RayCrisis"
+  saveName: "RayCrisis (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -134715,7 +141717,8 @@ SLPM-86450:
     multitap: false
     linkCable: false
 SLUS-01217:
-  name: "RayCrisis - Series Termination (USA)"
+  name: "RayCrisis - Series Termination"
+  saveName: "RayCrisis - Series Termination (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1638-g0af22825"
@@ -134738,7 +141741,8 @@ SLUS-01217:
     multitap: false
     linkCable: false
 SCES-00742:
-  name: "RayStorm (Europe)"
+  name: "RayStorm"
+  saveName: "RayStorm (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1638-g0af22825"
@@ -134759,7 +141763,8 @@ SCES-00742:
     multitap: false
     linkCable: false
 SLPS-00678:
-  name: "RayStorm (Japan)"
+  name: "RayStorm"
+  saveName: "RayStorm (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1638-g0af22825"
@@ -134783,11 +141788,13 @@ SLPS-00678:
     multitap: false
     linkCable: false
 SLPM-80066:
-  name: "RayStorm (Japan) (Demo)"
+  name: "RayStorm (Demo)"
+  saveName: "RayStorm (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00482:
-  name: "RayStorm (USA)"
+  name: "RayStorm"
+  saveName: "RayStorm (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -134827,7 +141834,8 @@ SCPS-45487:
     multitap: false
     linkCable: false
 SLES-00049:
-  name: "Rayman (Europe) (En,Fr,De)"
+  name: "Rayman"
+  saveName: "Rayman (Europe) (En,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -134850,7 +141858,8 @@ SLES-00049:
     multitap: false
     linkCable: false
 SLPS-00026:
-  name: "Rayman (Japan)"
+  name: "Rayman"
+  saveName: "Rayman (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2108-ga036ae92"
@@ -134873,7 +141882,8 @@ SLPS-00026:
     multitap: false
     linkCable: false
 SLUS-00005:
-  name: "Rayman (USA)"
+  name: "Rayman"
+  saveName: "Rayman (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1419-g34a515cd"
@@ -134894,7 +141904,8 @@ SLUS-00005:
     multitap: false
     linkCable: false
 SLUS-90001:
-  name: "Rayman (USA) (Playable Game Preview)"
+  name: "Rayman (Playable Game Preview)"
+  saveName: "Rayman (USA) (Playable Game Preview)"
   metadata:
     genre: "** DEMO **"
   compatibility:
@@ -134903,7 +141914,8 @@ SLUS-90001:
   controllers:
     - DigitalController
 SLES-02906:
-  name: "Rayman 2 - The Great Escape (Europe) (En,Es,It)"
+  name: "Rayman 2 - The Great Escape"
+  saveName: "Rayman 2 - The Great Escape (Europe) (En,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -134927,7 +141939,8 @@ SLES-02906:
     multitap: false
     linkCable: false
 SLES-02905:
-  name: "Rayman 2 - The Great Escape (Europe) (Fr,De)"
+  name: "Rayman 2 - The Great Escape"
+  saveName: "Rayman 2 - The Great Escape (Europe) (Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -134950,11 +141963,13 @@ SLES-02905:
     multitap: false
     linkCable: false
 SLUS-90095:
-  name: "Rayman 2 - The Great Escape (USA) (Demo)"
+  name: "Rayman 2 - The Great Escape (Demo)"
+  saveName: "Rayman 2 - The Great Escape (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01235:
-  name: "Rayman 2 - The Great Escape (USA) (En,Fr,Es)"
+  name: "Rayman 2 - The Great Escape"
+  saveName: "Rayman 2 - The Great Escape (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -134978,7 +141993,8 @@ SLUS-01235:
     multitap: false
     linkCable: false
 SLUS-01265:
-  name: "Rayman Brain Games (USA)"
+  name: "Rayman Brain Games"
+  saveName: "Rayman Brain Games (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
@@ -134999,7 +142015,8 @@ SLUS-01265:
     multitap: false
     linkCable: false
 SLES-02797:
-  name: "Rayman Junior (Europe) (Fr,De,Es,It)"
+  name: "Rayman Junior"
+  saveName: "Rayman Junior (Europe) (Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -135020,7 +142037,8 @@ SLES-02797:
     multitap: false
     linkCable: false
 SLES-02798:
-  name: "Rayman Junior - Level 1 (Europe) (En,Fr,De,Es,It)"
+  name: "Rayman Junior - Level 1"
+  saveName: "Rayman Junior - Level 1 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135043,7 +142061,8 @@ SLES-02798:
     multitap: false
     linkCable: false
 SLES-02799:
-  name: "Rayman Junior - Level 2 (Europe) (En,Fr,De,Es,It)"
+  name: "Rayman Junior - Level 2"
+  saveName: "Rayman Junior - Level 2 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -135065,7 +142084,8 @@ SLES-02799:
     multitap: false
     linkCable: false
 SLES-02800:
-  name: "Rayman Junior - Level 3 (Europe) (En,Fr,Es,It)"
+  name: "Rayman Junior - Level 3"
+  saveName: "Rayman Junior - Level 3 (Europe) (En,Fr,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -135087,7 +142107,8 @@ SLES-02800:
     multitap: false
     linkCable: false
 SLES-03812:
-  name: "Rayman Rush (Europe) (En,Fr,De,Es,It)"
+  name: "Rayman Rush"
+  saveName: "Rayman Rush (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1641-gb2057ac6"
@@ -135114,7 +142135,8 @@ SLES-03812:
     multitap: false
     linkCable: false
 SLPM-88503:
-  name: "Rayman Rush (Korea)"
+  name: "Rayman Rush"
+  saveName: "Rayman Rush (Korea)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -135137,7 +142159,8 @@ SLPM-88503:
     multitap: false
     linkCable: false
 SLUS-01458:
-  name: "Rayman Rush (USA)"
+  name: "Rayman Rush"
+  saveName: "Rayman Rush (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -135160,7 +142183,8 @@ SLUS-01458:
     multitap: false
     linkCable: false
 SLUS-01322:
-  name: "Razor Freestyle Scooter (USA)"
+  name: "Razor Freestyle Scooter"
+  saveName: "Razor Freestyle Scooter (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -135183,7 +142207,8 @@ SLUS-01322:
     multitap: false
     linkCable: false
 SLUS-01410:
-  name: "Razor Racing (USA)"
+  name: "Razor Racing"
+  saveName: "Razor Racing (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
@@ -135206,7 +142231,8 @@ SLUS-01410:
     multitap: false
     linkCable: false
 SLES-00537:
-  name: "Re-Loaded (Europe) (En,Fr,De)"
+  name: "Re-Loaded"
+  saveName: "Re-Loaded (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -135226,7 +142252,8 @@ SLES-00537:
     multitap: false
     linkCable: false
 SLUS-00382:
-  name: "Re-Loaded - The Hardcore Sequel (USA)"
+  name: "Re-Loaded - The Hardcore Sequel"
+  saveName: "Re-Loaded - The Hardcore Sequel (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2498-gd7de578d"
@@ -135247,7 +142274,8 @@ SLUS-00382:
     multitap: false
     linkCable: false
 SLES-01973:
-  name: "Re-Volt (Europe) (En,Fr,De,Es,It)"
+  name: "Re-Volt"
+  saveName: "Re-Volt (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135271,7 +142299,8 @@ SLES-01973:
     multitap: false
     linkCable: false
 SLPM-86332:
-  name: "Re-Volt (Japan)"
+  name: "Re-Volt"
+  saveName: "Re-Volt (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135291,7 +142320,8 @@ SLPM-86332:
     multitap: false
     linkCable: false
 SLUS-00851:
-  name: "Re-Volt (USA)"
+  name: "Re-Volt"
+  saveName: "Re-Volt (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -135314,7 +142344,8 @@ SLUS-00851:
     multitap: false
     linkCable: false
 SLES-00922:
-  name: "ReBoot (Europe)"
+  name: "ReBoot"
+  saveName: "ReBoot (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135333,7 +142364,8 @@ SLES-00922:
     multitap: false
     linkCable: false
 SLES-00923:
-  name: "ReBoot (France)"
+  name: "ReBoot"
+  saveName: "ReBoot (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135352,7 +142384,8 @@ SLES-00923:
     multitap: false
     linkCable: false
 SLES-00924:
-  name: "ReBoot (Germany)"
+  name: "ReBoot"
+  saveName: "ReBoot (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135371,7 +142404,8 @@ SLES-00924:
     multitap: false
     linkCable: false
 SLES-00925:
-  name: "ReBoot (Spain)"
+  name: "ReBoot"
+  saveName: "ReBoot (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135390,7 +142424,8 @@ SLES-00925:
     multitap: false
     linkCable: false
 SLUS-00274:
-  name: "ReBoot (USA)"
+  name: "ReBoot"
+  saveName: "ReBoot (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -135431,7 +142466,8 @@ SLPM-86448:
     multitap: false
     linkCable: false
 SLES-02333:
-  name: "Ready 2 Rumble Boxing (Europe) (En,Fr,De)"
+  name: "Ready 2 Rumble Boxing"
+  saveName: "Ready 2 Rumble Boxing (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135452,7 +142488,8 @@ SLES-02333:
     multitap: false
     linkCable: false
 SLUS-00857:
-  name: "Ready 2 Rumble Boxing (USA)"
+  name: "Ready 2 Rumble Boxing"
+  saveName: "Ready 2 Rumble Boxing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135471,7 +142508,8 @@ SLUS-00857:
     multitap: false
     linkCable: false
 SLES-02850:
-  name: "Ready 2 Rumble Boxing - Round 2 (Europe) (En,Fr,De)"
+  name: "Ready 2 Rumble Boxing - Round 2"
+  saveName: "Ready 2 Rumble Boxing - Round 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135492,7 +142530,8 @@ SLES-02850:
     multitap: false
     linkCable: false
 SLUS-01147:
-  name: "Ready 2 Rumble Boxing - Round 2 (USA)"
+  name: "Ready 2 Rumble Boxing - Round 2"
+  saveName: "Ready 2 Rumble Boxing - Round 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135511,7 +142550,8 @@ SLUS-01147:
     multitap: false
     linkCable: false
 SCES-00561:
-  name: "Real Bout Fatal Fury (Europe)"
+  name: "Real Bout Fatal Fury"
+  saveName: "Real Bout Fatal Fury (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -135547,11 +142587,13 @@ SCPS-45033:
     multitap: false
     linkCable: false
 SLPM-80070:
-  name: "Real Bout Garou Densetsu (Japan) (Demo)"
+  name: "Real Bout Garou Densetsu (Demo)"
+  saveName: "Real Bout Garou Densetsu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00640:
-  name: "Real Bout Garou Densetsu (Japan) (En,Ja)"
+  name: "Real Bout Garou Densetsu"
+  saveName: "Real Bout Garou Densetsu (Japan) (En,Ja)"
   controllers:
     - DigitalController
   metadata:
@@ -135590,7 +142632,8 @@ SCPS-45276:
     multitap: false
     linkCable: false
 SLPM-86085:
-  name: "Real Bout Garou Densetsu Special - Dominated Mind (Japan)"
+  name: "Real Bout Garou Densetsu Special - Dominated Mind"
+  saveName: "Real Bout Garou Densetsu Special - Dominated Mind (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135611,7 +142654,8 @@ SLPM-86085:
     multitap: false
     linkCable: false
 SLPM-80246:
-  name: "Real Bout Garou Densetsu Special - Dominated Mind (Japan) (Demo)"
+  name: "Real Bout Garou Densetsu Special - Dominated Mind (Demo)"
+  saveName: "Real Bout Garou Densetsu Special - Dominated Mind (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   controllers:
@@ -135620,7 +142664,8 @@ SLPM-80246:
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLPM-86090:
-  name: "Real Bout Garou Densetsu Special - Dominated Mind (Japan) (Shokai Genteiban)"
+  name: "Real Bout Garou Densetsu Special - Dominated Mind (Shokai Genteiban)"
+  saveName: "Real Bout Garou Densetsu Special - Dominated Mind (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135680,7 +142725,8 @@ SLPM-86108:
     multitap: false
     linkCable: false
 SLPS-02139:
-  name: "Real Robot Sensen (Japan)"
+  name: "Real Robot Sensen"
+  saveName: "Real Robot Sensen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135699,7 +142745,8 @@ SLPS-02139:
     multitap: false
     linkCable: false
 SLPS-01125:
-  name: "Real Robots - Final Attack (Japan)"
+  name: "Real Robots - Final Attack"
+  saveName: "Real Robots - Final Attack (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -135717,7 +142764,8 @@ SLPS-01125:
     multitap: false
     linkCable: true
 SLPS-01343:
-  name: "Rebus (Japan)"
+  name: "Rebus"
+  saveName: "Rebus (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -135738,7 +142786,8 @@ SLPS-01343:
     multitap: false
     linkCable: false
 SCPS-45089:
-  name: "Recipro Heat 5000 (Japan, Asia)"
+  name: "Recipro Heat 5000"
+  saveName: "Recipro Heat 5000 (Japan, Asia)"
   controllers:
     - DigitalController
     - NeGcon
@@ -135761,7 +142810,8 @@ SCPS-45089:
     multitap: false
     linkCable: false
 SLUS-00282:
-  name: "Red Asphalt (USA)"
+  name: "Red Asphalt"
+  saveName: "Red Asphalt (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -135785,7 +142835,8 @@ SLUS-00282:
     multitap: false
     linkCable: true
 SLES-01727:
-  name: "Reel Fishing (Europe)"
+  name: "Reel Fishing"
+  saveName: "Reel Fishing (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -135805,7 +142856,8 @@ SLES-01727:
     multitap: false
     linkCable: false
 SLUS-00440:
-  name: "Reel Fishing (USA)"
+  name: "Reel Fishing"
+  saveName: "Reel Fishing (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -135823,7 +142875,8 @@ SLUS-00440:
     multitap: false
     linkCable: false
 SLES-02780:
-  name: "Reel Fishing II (Europe) (En,De)"
+  name: "Reel Fishing II"
+  saveName: "Reel Fishing II (Europe) (En,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135843,7 +142896,8 @@ SLES-02780:
     multitap: false
     linkCable: false
 SLUS-00843:
-  name: "Reel Fishing II (USA)"
+  name: "Reel Fishing II"
+  saveName: "Reel Fishing II (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -135880,7 +142934,8 @@ SLPS-02151:
     multitap: false
     linkCable: false
 SLPS-00753:
-  name: "Refrain Love - Anata ni Aitai (Japan)"
+  name: "Refrain Love - Anata ni Aitai"
+  saveName: "Refrain Love - Anata ni Aitai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -135898,7 +142953,8 @@ SLPS-00753:
     multitap: false
     linkCable: false
 SLPM-86654:
-  name: "Refrain Love - Anata ni Aitai (Japan) (Major Wave)"
+  name: "Refrain Love - Anata ni Aitai (Major Wave)"
+  saveName: "Refrain Love - Anata ni Aitai (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -135916,7 +142972,8 @@ SLPM-86654:
     multitap: false
     linkCable: false
 SLPS-01840:
-  name: "Refrain Love 2 (Japan) (Disc 1)"
+  name: "Refrain Love 2 (Disc 1)"
+  saveName: "Refrain Love 2 (Japan) (Disc 1)"
   discSet:
     name: "Refrain Love 2 (Japan)"
     serials:
@@ -135939,7 +142996,8 @@ SLPS-01840:
     multitap: false
     linkCable: false
 SLPS-01841:
-  name: "Refrain Love 2 (Japan) (Disc 2)"
+  name: "Refrain Love 2 (Disc 2)"
+  saveName: "Refrain Love 2 (Japan) (Disc 2)"
   discSet:
     name: "Refrain Love 2 (Japan)"
     serials:
@@ -135962,35 +143020,43 @@ SLPS-01841:
     multitap: false
     linkCable: false
 SCED-01385:
-  name: "Registered Users Demo (Europe)"
+  name: "Registered Users Demo"
+  saveName: "Registered Users Demo (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00936:
-  name: "Registered Users Demo 02 (Europe)"
+  name: "Registered Users Demo 02"
+  saveName: "Registered Users Demo 02 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01230:
-  name: "Registered Users Demo 03 (Europe)"
+  name: "Registered Users Demo 03"
+  saveName: "Registered Users Demo 03 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-01636:
-  name: "Registered Users Demo 05 (Europe) (En,Fr,De,Es,It)"
+  name: "Registered Users Demo 05"
+  saveName: "Registered Users Demo 05 (Europe) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCED-01988:
-  name: "Registered Users Demo 06 (Europe)"
+  name: "Registered Users Demo 06"
+  saveName: "Registered Users Demo 06 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02676:
-  name: "Registered Users Demo 08 (Europe)"
+  name: "Registered Users Demo 08"
+  saveName: "Registered Users Demo 08 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-00637:
-  name: "Registration Demo 01 (Europe)"
+  name: "Registration Demo 01"
+  saveName: "Registration Demo 01 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPM-86274:
-  name: "Reikoku - Ikeda Kizoku Shinrei Kenkyuujo (Japan)"
+  name: "Reikoku - Ikeda Kizoku Shinrei Kenkyuujo"
+  saveName: "Reikoku - Ikeda Kizoku Shinrei Kenkyuujo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136047,7 +143113,8 @@ SCPS-45418:
     multitap: false
     linkCable: false
 SLPS-02243:
-  name: "Remote Control Dandy (Japan)"
+  name: "Remote Control Dandy"
+  saveName: "Remote Control Dandy (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2615-g6224d0ab"
@@ -136070,11 +143137,13 @@ SLPS-02243:
     multitap: false
     linkCable: false
 SLPM-80445:
-  name: "Remote Control Dandy (Japan) (Demo)"
+  name: "Remote Control Dandy (Demo)"
+  saveName: "Remote Control Dandy (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01588:
-  name: "Ren'ai Kouza - Real Age (Japan)"
+  name: "Ren'ai Kouza - Real Age"
+  saveName: "Ren'ai Kouza - Real Age (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -136092,7 +143161,8 @@ SLPS-01588:
     multitap: false
     linkCable: false
 SLPS-01589:
-  name: "Ren'ai Kouza - Real Age - The Art of Eguchi Hisashi (Japan)"
+  name: "Ren'ai Kouza - Real Age - The Art of Eguchi Hisashi"
+  saveName: "Ren'ai Kouza - Real Age - The Art of Eguchi Hisashi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -136128,7 +143198,8 @@ SLPS-01590:
     multitap: false
     linkCable: false
 SLES-02274:
-  name: "Renegade Racers (Europe)"
+  name: "Renegade Racers"
+  saveName: "Renegade Racers (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136148,7 +143219,8 @@ SLES-02274:
     multitap: false
     linkCable: false
 SLUS-01012:
-  name: "Renegade Racers (USA)"
+  name: "Renegade Racers"
+  saveName: "Renegade Racers (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136168,7 +143240,8 @@ SLUS-01012:
     multitap: false
     linkCable: false
 SLPS-00572:
-  name: "Rescue 24 Hours (Japan)"
+  name: "Rescue 24 Hours"
+  saveName: "Rescue 24 Hours (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -136186,7 +143259,8 @@ SLPS-00572:
     multitap: false
     linkCable: false
 SLUS-01507:
-  name: "Rescue Copter (USA)"
+  name: "Rescue Copter"
+  saveName: "Rescue Copter (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136205,7 +143279,8 @@ SLUS-01507:
     multitap: false
     linkCable: false
 SLES-03726:
-  name: "Rescue Heroes - Helden in Gefahr (Germany)"
+  name: "Rescue Heroes - Helden in Gefahr"
+  saveName: "Rescue Heroes - Helden in Gefahr (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136224,7 +143299,8 @@ SLES-03726:
     multitap: false
     linkCable: false
 SLES-03724:
-  name: "Rescue Heroes - Molten Menace (Europe)"
+  name: "Rescue Heroes - Molten Menace"
+  saveName: "Rescue Heroes - Molten Menace (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136243,7 +143319,8 @@ SLES-03724:
     multitap: false
     linkCable: false
 SLUS-01373:
-  name: "Rescue Heroes - Molten Menace (USA)"
+  name: "Rescue Heroes - Molten Menace"
+  saveName: "Rescue Heroes - Molten Menace (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136281,7 +143358,8 @@ SLES-03725:
     multitap: false
     linkCable: false
 SCES-02569:
-  name: "Rescue Shot (Europe) (En,Fr,De,Es,It)"
+  name: "Rescue Shot"
+  saveName: "Rescue Shot (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136327,12 +143405,14 @@ SCPS-45477:
     multitap: false
     linkCable: false
 SLPM-80522:
-  name: "Rescue Shot Bubibo & Biohazard - Gun Survivor - GunCon Taiou Shooting Taikenban (Japan)"
+  name: "Rescue Shot Bubibo & Biohazard - Gun Survivor - GunCon Taiou Shooting Taikenban"
+  saveName: "Rescue Shot Bubibo & Biohazard - Gun Survivor - GunCon Taiou Shooting Taikenban (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
 SLPS-02555:
-  name: "Rescue Shot Bubibo (Japan)"
+  name: "Rescue Shot Bubibo"
+  saveName: "Rescue Shot Bubibo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136353,7 +143433,8 @@ SLPS-02555:
     multitap: false
     linkCable: false
 SLES-00200:
-  name: "Resident Evil (Europe)"
+  name: "Resident Evil"
+  saveName: "Resident Evil (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -136373,13 +143454,15 @@ SLES-00200:
     multitap: false
     linkCable: false
 SLES-00335:
-  name: "Resident Evil (Europe, Australia) (Demo)"
+  name: "Resident Evil (Demo)"
+  saveName: "Resident Evil (Europe, Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-00227:
-  name: "Resident Evil (France)"
+  name: "Resident Evil"
+  saveName: "Resident Evil (France)"
   controllers:
     - DigitalController
   traits:
@@ -136399,7 +143482,8 @@ SLES-00227:
     multitap: false
     linkCable: false
 SLES-00228:
-  name: "Resident Evil (Germany)"
+  name: "Resident Evil"
+  saveName: "Resident Evil (Germany)"
   controllers:
     - DigitalController
   traits:
@@ -136419,13 +143503,15 @@ SLES-00228:
     multitap: false
     linkCable: false
 SLES-00355:
-  name: "Resident Evil (Germany) (Demo)"
+  name: "Resident Evil (Demo)"
+  saveName: "Resident Evil (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLUS-00170:
-  name: "Resident Evil (USA)"
+  name: "Resident Evil"
+  saveName: "Resident Evil (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -136448,7 +143534,8 @@ SLUS-00170:
     multitap: false
     linkCable: false
 SLES-00969:
-  name: "Resident Evil - Director's Cut (Europe)"
+  name: "Resident Evil - Director's Cut"
+  saveName: "Resident Evil - Director's Cut (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -136468,7 +143555,8 @@ SLES-00969:
     multitap: false
     linkCable: false
 SLES-00970:
-  name: "Resident Evil - Director's Cut (France)"
+  name: "Resident Evil - Director's Cut"
+  saveName: "Resident Evil - Director's Cut (France)"
   controllers:
     - DigitalController
   traits:
@@ -136488,7 +143576,8 @@ SLES-00970:
     multitap: false
     linkCable: false
 SLES-00971:
-  name: "Resident Evil - Director's Cut (Germany)"
+  name: "Resident Evil - Director's Cut"
+  saveName: "Resident Evil - Director's Cut (Germany)"
   controllers:
     - DigitalController
   traits:
@@ -136508,7 +143597,8 @@ SLES-00971:
     multitap: false
     linkCable: false
 SLUS-00551:
-  name: "Resident Evil - Director's Cut (USA)"
+  name: "Resident Evil - Director's Cut"
+  saveName: "Resident Evil - Director's Cut (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -136531,7 +143621,8 @@ SLUS-00551:
     multitap: false
     linkCable: false
 SLUS-00747:
-  name: "Resident Evil - Director's Cut - Dual Shock Ver. (USA)"
+  name: "Resident Evil - Director's Cut - Dual Shock Ver."
+  saveName: "Resident Evil - Director's Cut - Dual Shock Ver. (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136552,7 +143643,8 @@ SLUS-00747:
     multitap: false
     linkCable: false
 SLES-02732:
-  name: "Resident Evil - Survivor (Europe)"
+  name: "Resident Evil - Survivor"
+  saveName: "Resident Evil - Survivor (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136572,7 +143664,8 @@ SLES-02732:
     multitap: false
     linkCable: false
 SLES-02744:
-  name: "Resident Evil - Survivor (France)"
+  name: "Resident Evil - Survivor"
+  saveName: "Resident Evil - Survivor (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -136593,7 +143686,8 @@ SLES-02744:
     multitap: false
     linkCable: false
 SLUS-01087:
-  name: "Resident Evil - Survivor (USA)"
+  name: "Resident Evil - Survivor"
+  saveName: "Resident Evil - Survivor (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-967-gf856a8a"
@@ -136616,7 +143710,8 @@ SLUS-01087:
     multitap: false
     linkCable: false
 SLES-00972:
-  name: "Resident Evil 2 (Europe) (Disc 1)"
+  name: "Resident Evil 2 (Disc 1)"
+  saveName: "Resident Evil 2 (Europe) (Disc 1)"
   discSet:
     name: "Resident Evil 2 (Europe)"
     serials:
@@ -136643,7 +143738,8 @@ SLES-00972:
     multitap: false
     linkCable: false
 SLES-10972:
-  name: "Resident Evil 2 (Europe) (Disc 2)"
+  name: "Resident Evil 2 (Disc 2)"
+  saveName: "Resident Evil 2 (Europe) (Disc 2)"
   discSet:
     name: "Resident Evil 2 (Europe)"
     serials:
@@ -136670,7 +143766,8 @@ SLES-10972:
     multitap: false
     linkCable: false
 SLED-00977:
-  name: "Resident Evil 2 (Europe) (Preview)"
+  name: "Resident Evil 2 (Preview)"
+  saveName: "Resident Evil 2 (Europe) (Preview)"
   controllers:
     - DigitalController
   traits:
@@ -136678,7 +143775,8 @@ SLED-00977:
   settings:
     cdromMaxReadSpeedupCycles: 70000
 SLES-00973:
-  name: "Resident Evil 2 (France) (Disc 1)"
+  name: "Resident Evil 2 (Disc 1)"
+  saveName: "Resident Evil 2 (France) (Disc 1)"
   discSet:
     name: "Resident Evil 2 (France)"
     serials:
@@ -136705,7 +143803,8 @@ SLES-00973:
     multitap: false
     linkCable: false
 SLES-10973:
-  name: "Resident Evil 2 (France) (Disc 2)"
+  name: "Resident Evil 2 (Disc 2)"
+  saveName: "Resident Evil 2 (France) (Disc 2)"
   discSet:
     name: "Resident Evil 2 (France)"
     serials:
@@ -136732,7 +143831,8 @@ SLES-10973:
     multitap: false
     linkCable: false
 SLES-00974:
-  name: "Resident Evil 2 (Germany) (Disc 1)"
+  name: "Resident Evil 2 (Disc 1)"
+  saveName: "Resident Evil 2 (Germany) (Disc 1)"
   discSet:
     name: "Resident Evil 2 (Germany)"
     serials:
@@ -136759,7 +143859,8 @@ SLES-00974:
     multitap: false
     linkCable: false
 SLES-10974:
-  name: "Resident Evil 2 (Germany) (Disc 2)"
+  name: "Resident Evil 2 (Disc 2)"
+  saveName: "Resident Evil 2 (Germany) (Disc 2)"
   discSet:
     name: "Resident Evil 2 (Germany)"
     serials:
@@ -136786,7 +143887,8 @@ SLES-10974:
     multitap: false
     linkCable: false
 SLES-00975:
-  name: "Resident Evil 2 (Italy) (Disc 1)"
+  name: "Resident Evil 2 (Disc 1)"
+  saveName: "Resident Evil 2 (Italy) (Disc 1)"
   discSet:
     name: "Resident Evil 2 (Italy)"
     serials:
@@ -136813,7 +143915,8 @@ SLES-00975:
     multitap: false
     linkCable: false
 SLES-10975:
-  name: "Resident Evil 2 (Italy) (Disc 2)"
+  name: "Resident Evil 2 (Disc 2)"
+  saveName: "Resident Evil 2 (Italy) (Disc 2)"
   discSet:
     name: "Resident Evil 2 (Italy)"
     serials:
@@ -136840,7 +143943,8 @@ SLES-10975:
     multitap: false
     linkCable: false
 SLES-00976:
-  name: "Resident Evil 2 (Spain) (Disc 1)"
+  name: "Resident Evil 2 (Disc 1)"
+  saveName: "Resident Evil 2 (Spain) (Disc 1)"
   discSet:
     name: "Resident Evil 2 (Spain)"
     serials:
@@ -136870,7 +143974,8 @@ SLES-00976:
     multitap: false
     linkCable: false
 SLES-10976:
-  name: "Resident Evil 2 (Spain) (Disc 2)"
+  name: "Resident Evil 2 (Disc 2)"
+  saveName: "Resident Evil 2 (Spain) (Disc 2)"
   discSet:
     name: "Resident Evil 2 (Spain)"
     serials:
@@ -136900,7 +144005,8 @@ SLES-10976:
     multitap: false
     linkCable: false
 SLUS-80421:
-  name: "Resident Evil 2 (USA) (Demo)"
+  name: "Resident Evil 2 (Demo)"
+  saveName: "Resident Evil 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -136911,7 +144017,8 @@ SLUS-80421:
     - SLUS-80421
     - SLUS-90009
 SLUS-00421:
-  name: "Resident Evil 2 (USA) (Disc 1)"
+  name: "Resident Evil 2 (Disc 1)"
+  saveName: "Resident Evil 2 (USA) (Disc 1)"
   discSet:
     name: "Resident Evil 2 (USA)"
     serials:
@@ -136941,7 +144048,8 @@ SLUS-00421:
     multitap: false
     linkCable: false
 SLUS-00592:
-  name: "Resident Evil 2 (USA) (Disc 2)"
+  name: "Resident Evil 2 (Disc 2)"
+  saveName: "Resident Evil 2 (USA) (Disc 2)"
   discSet:
     name: "Resident Evil 2 (USA)"
     serials:
@@ -136971,7 +144079,8 @@ SLUS-00592:
     multitap: false
     linkCable: false
 SLUS-00748:
-  name: "Resident Evil 2 - Dual Shock Ver. (USA) (Disc 1)"
+  name: "Resident Evil 2 - Dual Shock Ver. (Disc 1)"
+  saveName: "Resident Evil 2 - Dual Shock Ver. (USA) (Disc 1)"
   discSet:
     name: "Resident Evil 2 - Dual Shock Ver. (USA)"
     serials:
@@ -137002,7 +144111,8 @@ SLUS-00748:
     multitap: false
     linkCable: false
 SLUS-00756:
-  name: "Resident Evil 2 - Dual Shock Ver. (USA) (Disc 2)"
+  name: "Resident Evil 2 - Dual Shock Ver. (Disc 2)"
+  saveName: "Resident Evil 2 - Dual Shock Ver. (USA) (Disc 2)"
   discSet:
     name: "Resident Evil 2 - Dual Shock Ver. (USA)"
     serials:
@@ -137033,7 +144143,8 @@ SLUS-00756:
     multitap: false
     linkCable: false
 SLES-02529:
-  name: "Resident Evil 3 - Nemesis (Europe)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137059,7 +144170,8 @@ SLES-02529:
     multitap: false
     linkCable: false
 SLED-02541:
-  name: "Resident Evil 3 - Nemesis (Europe) (Demo)"
+  name: "Resident Evil 3 - Nemesis (Demo)"
+  saveName: "Resident Evil 3 - Nemesis (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -137069,7 +144181,8 @@ SLED-02541:
   settings:
     cdromMaxReadSpeedupCycles: 70000
 SLES-02530:
-  name: "Resident Evil 3 - Nemesis (France)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137095,7 +144208,8 @@ SLES-02530:
     multitap: false
     linkCable: false
 SLES-02531:
-  name: "Resident Evil 3 - Nemesis (Germany)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137121,7 +144235,8 @@ SLES-02531:
     multitap: false
     linkCable: false
 SLES-02698:
-  name: "Resident Evil 3 - Nemesis (Ireland)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (Ireland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137147,7 +144262,8 @@ SLES-02698:
     multitap: false
     linkCable: false
 SLES-02533:
-  name: "Resident Evil 3 - Nemesis (Italy)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137173,7 +144289,8 @@ SLES-02533:
     multitap: false
     linkCable: false
 SLES-02532:
-  name: "Resident Evil 3 - Nemesis (Spain)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -137202,7 +144319,8 @@ SLES-02532:
     multitap: false
     linkCable: false
 SLUS-00923:
-  name: "Resident Evil 3 - Nemesis (USA)"
+  name: "Resident Evil 3 - Nemesis"
+  saveName: "Resident Evil 3 - Nemesis (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -137230,7 +144348,8 @@ SLUS-00923:
     multitap: false
     linkCable: false
 SLUS-90064:
-  name: "Resident Evil 3 - Nemesis (USA) (Demo)"
+  name: "Resident Evil 3 - Nemesis (Demo)"
+  saveName: "Resident Evil 3 - Nemesis (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -137240,7 +144359,8 @@ SLUS-90064:
   settings:
     cdromMaxReadSpeedupCycles: 70000
 SLPS-01974:
-  name: "Restaurant Dream (Japan)"
+  name: "Restaurant Dream"
+  saveName: "Restaurant Dream (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -137258,7 +144378,8 @@ SLPS-01974:
     multitap: false
     linkCable: false
 SLES-01661:
-  name: "Retro Force (Europe) (En,Fr,De,Es,It)"
+  name: "Retro Force"
+  saveName: "Retro Force (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137281,9 +144402,11 @@ SLES-01661:
     multitap: false
     linkCable: false
 SCED-03924:
-  name: "Retrouve la Magie Disney sur PlayStation (France)"
+  name: "Retrouve la Magie Disney sur PlayStation"
+  saveName: "Retrouve la Magie Disney sur PlayStation (France)"
 SLES-00177:
-  name: "Return Fire (Europe) (En,Ja,Fr,De,Es,It,Pt,Ko,Ru,Ar)"
+  name: "Return Fire"
+  saveName: "Return Fire (Europe) (En,Ja,Fr,De,Es,It,Pt,Ko,Ru,Ar)"
   controllers:
     - DigitalController
   metadata:
@@ -137310,7 +144433,8 @@ SLES-00177:
     multitap: false
     linkCable: false
 SLUS-00184:
-  name: "Return Fire (USA)"
+  name: "Return Fire"
+  saveName: "Return Fire (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -137331,7 +144455,8 @@ SLUS-00184:
     multitap: false
     linkCable: false
 SLPS-00192:
-  name: "Return to Zork (Japan) (Disc 1)"
+  name: "Return to Zork (Disc 1)"
+  saveName: "Return to Zork (Japan) (Disc 1)"
   discSet:
     name: "Return to Zork (Japan)"
     serials:
@@ -137354,7 +144479,8 @@ SLPS-00192:
     multitap: false
     linkCable: false
 SLPS-00193:
-  name: "Return to Zork (Japan) (Disc 2)"
+  name: "Return to Zork (Disc 2)"
+  saveName: "Return to Zork (Japan) (Disc 2)"
   discSet:
     name: "Return to Zork (Japan)"
     serials:
@@ -137377,7 +144503,8 @@ SLPS-00193:
     multitap: false
     linkCable: false
 SLPS-00143:
-  name: "Reverthion (Japan)"
+  name: "Reverthion"
+  saveName: "Reverthion (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -137395,7 +144522,8 @@ SLPS-00143:
     multitap: false
     linkCable: false
 SLES-00129:
-  name: "Revolution X - Music Is the Weapon (Europe)"
+  name: "Revolution X - Music Is the Weapon"
+  saveName: "Revolution X - Music Is the Weapon (Europe)"
   controllers:
     - DigitalController
     - GunCon
@@ -137414,7 +144542,8 @@ SLES-00129:
     multitap: false
     linkCable: false
 SLES-00151:
-  name: "Revolution X - Music Is the Weapon (Germany)"
+  name: "Revolution X - Music Is the Weapon"
+  saveName: "Revolution X - Music Is the Weapon (Germany)"
   controllers:
     - DigitalController
     - GunCon
@@ -137433,7 +144562,8 @@ SLES-00151:
     multitap: false
     linkCable: false
 SLPS-00258:
-  name: "Revolution X - Music Is the Weapon (Japan)"
+  name: "Revolution X - Music Is the Weapon"
+  saveName: "Revolution X - Music Is the Weapon (Japan)"
   controllers:
     - DigitalController
     - GunCon
@@ -137452,7 +144582,8 @@ SLPS-00258:
     multitap: false
     linkCable: false
 SLUS-00012:
-  name: "Revolution X - Music Is the Weapon (USA)"
+  name: "Revolution X - Music Is the Weapon"
+  saveName: "Revolution X - Music Is the Weapon (USA)"
   controllers:
     - DigitalController
     - GunCon
@@ -137471,7 +144602,8 @@ SLUS-00012:
     multitap: false
     linkCable: false
 SLUS-01073:
-  name: "Rhapsody - A Musical Adventure (USA)"
+  name: "Rhapsody - A Musical Adventure"
+  saveName: "Rhapsody - A Musical Adventure (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -137492,7 +144624,8 @@ SLUS-01073:
     multitap: false
     linkCable: false
 SLPS-02634:
-  name: "Rhythm 'N' Face (Japan)"
+  name: "Rhythm 'N' Face"
+  saveName: "Rhythm 'N' Face (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137511,7 +144644,8 @@ SLPS-02634:
     multitap: false
     linkCable: false
 SLES-04146:
-  name: "Rhythm Beat (Europe)"
+  name: "Rhythm Beat"
+  saveName: "Rhythm Beat (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -137529,7 +144663,8 @@ SLES-04146:
     multitap: false
     linkCable: false
 SLPS-00905:
-  name: "Ridegear Guybrave (Japan)"
+  name: "Ridegear Guybrave"
+  saveName: "Ridegear Guybrave (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -137547,11 +144682,13 @@ SLPS-00905:
     multitap: false
     linkCable: false
 SLPM-80127:
-  name: "Ridegear Guybrave (Japan) (Demo)"
+  name: "Ridegear Guybrave (Demo)"
+  saveName: "Ridegear Guybrave (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01643:
-  name: "Ridegear Guybrave II (Japan) (Disc 1)"
+  name: "Ridegear Guybrave II (Disc 1)"
+  saveName: "Ridegear Guybrave II (Japan) (Disc 1)"
   discSet:
     name: "Ridegear Guybrave II (Japan)"
     serials:
@@ -137575,7 +144712,8 @@ SLPS-01643:
     multitap: false
     linkCable: false
 SLPS-01644:
-  name: "Ridegear Guybrave II (Japan) (Disc 2)"
+  name: "Ridegear Guybrave II (Disc 2)"
+  saveName: "Ridegear Guybrave II (Japan) (Disc 2)"
   discSet:
     name: "Ridegear Guybrave II (Japan)"
     serials:
@@ -137599,7 +144737,8 @@ SLPS-01644:
     multitap: false
     linkCable: false
 SCES-00001:
-  name: "Ridge Racer (Europe)"
+  name: "Ridge Racer"
+  saveName: "Ridge Racer (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -137618,7 +144757,8 @@ SCES-00001:
     multitap: false
     linkCable: false
 SLPS-00001:
-  name: "Ridge Racer (Japan)"
+  name: "Ridge Racer"
+  saveName: "Ridge Racer (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -137639,7 +144779,8 @@ SLPS-00001:
     multitap: false
     linkCable: false
 SCUS-94300:
-  name: "Ridge Racer (USA)"
+  name: "Ridge Racer"
+  saveName: "Ridge Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -137664,7 +144805,8 @@ SCUS-94300:
     multitap: false
     linkCable: false
 SLPS-01799:
-  name: "Ridge Racer - High Spec Ver. & Namco Catalogue '98 (Japan) (R4 + JogCon)"
+  name: "Ridge Racer - High Spec Ver. & Namco Catalogue '98 (R4 + JogCon)"
+  saveName: "Ridge Racer - High Spec Ver. & Namco Catalogue '98 (Japan) (R4 + JogCon)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137684,7 +144826,8 @@ SLPS-01799:
     multitap: false
     linkCable: false
 SCPS-45357:
-  name: "Ridge Racer - High Spec Ver. & Namco Catalogue '98 (Japan, Asia)"
+  name: "Ridge Racer - High Spec Ver. & Namco Catalogue '98"
+  saveName: "Ridge Racer - High Spec Ver. & Namco Catalogue '98 (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137707,7 +144850,8 @@ SCPS-45357:
     multitap: false
     linkCable: false
 SLUS-90049:
-  name: "Ridge Racer Bonus Turbo Mode Disc (USA)"
+  name: "Ridge Racer Bonus Turbo Mode Disc"
+  saveName: "Ridge Racer Bonus Turbo Mode Disc (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1119-g745b53e"
@@ -137730,7 +144874,8 @@ SLUS-90049:
     multitap: false
     linkCable: false
 SCED-01832:
-  name: "Ridge Racer Hi-Spec Demo (Europe)"
+  name: "Ridge Racer Hi-Spec Demo"
+  saveName: "Ridge Racer Hi-Spec Demo (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137754,7 +144899,8 @@ SCED-01832:
     multitap: false
     linkCable: false
 SCES-00242:
-  name: "Ridge Racer Revolution (Europe)"
+  name: "Ridge Racer Revolution"
+  saveName: "Ridge Racer Revolution (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -137773,7 +144919,8 @@ SCES-00242:
     multitap: false
     linkCable: true
 SLPS-00150:
-  name: "Ridge Racer Revolution (Japan)"
+  name: "Ridge Racer Revolution"
+  saveName: "Ridge Racer Revolution (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -137792,7 +144939,8 @@ SLPS-00150:
     multitap: false
     linkCable: true
 SLUS-00214:
-  name: "Ridge Racer Revolution (USA)"
+  name: "Ridge Racer Revolution"
+  saveName: "Ridge Racer Revolution (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -137814,7 +144962,8 @@ SLUS-00214:
     multitap: false
     linkCable: true
 SCES-01706:
-  name: "Ridge Racer Type 4 (Europe) (En,Fr,De,Es,It)"
+  name: "Ridge Racer Type 4"
+  saveName: "Ridge Racer Type 4 (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -137842,11 +144991,13 @@ SCES-01706:
     multitap: false
     linkCable: false
 SCED-01982:
-  name: "Ridge Racer Type 4 Collectors Demo (Europe, Australia)"
+  name: "Ridge Racer Type 4 Collectors Demo"
+  saveName: "Ridge Racer Type 4 Collectors Demo (Europe, Australia)"
   metadata:
     genre: "** DEMO **"
 SLPS-03023:
-  name: "Riichi Mahjong - Ohitorisama demo Utemasu! (Japan)"
+  name: "Riichi Mahjong - Ohitorisama demo Utemasu!"
+  saveName: "Riichi Mahjong - Ohitorisama demo Utemasu! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -137864,7 +145015,8 @@ SLPS-03023:
     multitap: false
     linkCable: false
 SLPM-87210:
-  name: "Rikujou Boueitai Mao-chan (Japan)"
+  name: "Rikujou Boueitai Mao-chan"
+  saveName: "Rikujou Boueitai Mao-chan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137883,7 +145035,8 @@ SLPM-87210:
     multitap: false
     linkCable: false
 SLPM-87198:
-  name: "Rikujou Boueitai Mao-chan (Japan) (DX Pack)"
+  name: "Rikujou Boueitai Mao-chan (DX Pack)"
+  saveName: "Rikujou Boueitai Mao-chan (Japan) (DX Pack)"
   controllers:
     - AnalogController
     - DigitalController
@@ -137902,7 +145055,8 @@ SLPM-87198:
     multitap: false
     linkCable: false
 SLPS-00207:
-  name: "Ring of Sias (Japan)"
+  name: "Ring of Sias"
+  saveName: "Ring of Sias (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -137920,7 +145074,8 @@ SLPS-00207:
     multitap: false
     linkCable: false
 SLES-00472:
-  name: "Riot (Europe)"
+  name: "Riot"
+  saveName: "Riot (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -137938,11 +145093,13 @@ SLES-00472:
     multitap: true
     linkCable: false
 SLED-00639:
-  name: "Riot (Europe) (Demo)"
+  name: "Riot (Demo)"
+  saveName: "Riot (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00829:
-  name: "Riot Stars (Japan)"
+  name: "Riot Stars"
+  saveName: "Riot Stars (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -137960,11 +145117,13 @@ SLPS-00829:
     multitap: false
     linkCable: false
 SLPM-80102:
-  name: "Riot Stars (Japan) (Sample)"
+  name: "Riot Stars (Sample)"
+  saveName: "Riot Stars (Japan) (Sample)"
   metadata:
     genre: "** DEMO **"
 SLES-00164:
-  name: "Rise 2 - Resurrection (Europe) (En,Fr,De,Es,It)"
+  name: "Rise 2 - Resurrection"
+  saveName: "Rise 2 - Resurrection (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -137986,7 +145145,8 @@ SLES-00164:
     multitap: false
     linkCable: false
 SLPS-00259:
-  name: "Rise 2 - Resurrection (Japan) (En,Fr,De,Es,It)"
+  name: "Rise 2 - Resurrection"
+  saveName: "Rise 2 - Resurrection (Japan) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -138008,7 +145168,8 @@ SLPS-00259:
     multitap: false
     linkCable: false
 SLUS-00186:
-  name: "Rise 2 - Resurrection (USA) (En,Fr,De,Es,It)"
+  name: "Rise 2 - Resurrection"
+  saveName: "Rise 2 - Resurrection (USA) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -138032,7 +145193,8 @@ SLUS-00186:
     multitap: false
     linkCable: false
 SLES-01779:
-  name: "Rising Zan - The Samurai Gunman (Europe) (En,Fr,De,Es,It)"
+  name: "Rising Zan - The Samurai Gunman"
+  saveName: "Rising Zan - The Samurai Gunman (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138055,7 +145217,8 @@ SLES-01779:
     multitap: false
     linkCable: false
 SLPS-01691:
-  name: "Rising Zan - The Samurai Gunman (Japan)"
+  name: "Rising Zan - The Samurai Gunman"
+  saveName: "Rising Zan - The Samurai Gunman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138074,7 +145237,8 @@ SLPS-01691:
     multitap: false
     linkCable: false
 SLUS-00829:
-  name: "Rising Zan - The Samurai Gunman (USA)"
+  name: "Rising Zan - The Samurai Gunman"
+  saveName: "Rising Zan - The Samurai Gunman (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138093,7 +145257,8 @@ SLUS-00829:
     multitap: false
     linkCable: false
 SLES-00707:
-  name: "Risk (Europe) (En,Fr,De,Es)"
+  name: "Risk"
+  saveName: "Risk (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138116,7 +145281,8 @@ SLES-00707:
     multitap: true
     linkCable: false
 SLUS-00616:
-  name: "Risk - The Game of Global Domination (USA)"
+  name: "Risk - The Game of Global Domination"
+  saveName: "Risk - The Game of Global Domination (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138136,7 +145302,8 @@ SLUS-00616:
     multitap: true
     linkCable: false
 SLPS-01272:
-  name: "Rittai Ninja Katsugeki - Tenchu (Japan)"
+  name: "Rittai Ninja Katsugeki - Tenchu"
+  saveName: "Rittai Ninja Katsugeki - Tenchu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138155,11 +145322,13 @@ SLPS-01272:
     multitap: false
     linkCable: false
 PAPX-90029:
-  name: "Rittai Ninja Katsugeki - Tenchu (Japan) (Demo)"
+  name: "Rittai Ninja Katsugeki - Tenchu (Demo)"
+  saveName: "Rittai Ninja Katsugeki - Tenchu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01901:
-  name: "Rittai Ninja Katsugeki - Tenchu - Shinobi Gaisen (Japan) (En,Ja,Fr,It)"
+  name: "Rittai Ninja Katsugeki - Tenchu - Shinobi Gaisen"
+  saveName: "Rittai Ninja Katsugeki - Tenchu - Shinobi Gaisen (Japan) (En,Ja,Fr,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138184,7 +145353,8 @@ SLPS-01901:
     multitap: false
     linkCable: false
 SLPS-02400:
-  name: "Rittai Ninja Katsugeki - Tenchu - Shinobi Hyakusen (Japan)"
+  name: "Rittai Ninja Katsugeki - Tenchu - Shinobi Hyakusen"
+  saveName: "Rittai Ninja Katsugeki - Tenchu - Shinobi Hyakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138203,7 +145373,8 @@ SLPS-02400:
     multitap: false
     linkCable: false
 SLPS-03040:
-  name: "Rittai Ninja Katsugeki - Tenchu 2 (Japan)"
+  name: "Rittai Ninja Katsugeki - Tenchu 2"
+  saveName: "Rittai Ninja Katsugeki - Tenchu 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -138246,9 +145417,11 @@ SCPS-45383:
     multitap: false
     linkCable: false
 SLED-01756:
-  name: "Rival Schools + Resident Evil 2 + Bloody Roar + Street Fighter EX Plus Alpha + Mr Domino + Victory Boxing 2 (France)"
+  name: "Rival Schools + Resident Evil 2 + Bloody Roar + Street Fighter EX Plus Alpha + Mr Domino + Victory Boxing 2"
+  saveName: "Rival Schools + Resident Evil 2 + Bloody Roar + Street Fighter EX Plus Alpha + Mr Domino + Victory Boxing 2 (France)"
 SLES-01436:
-  name: "Rival Schools - United by Fate (Europe) (Disc 1) (Evolution Disc)"
+  name: "Rival Schools - United by Fate (Disc 1) (Evolution Disc)"
+  saveName: "Rival Schools - United by Fate (Europe) (Disc 1) (Evolution Disc)"
   discSet:
     name: "Rival Schools - United by Fate (Europe)"
     serials:
@@ -138272,7 +145445,8 @@ SLES-01436:
     multitap: true
     linkCable: false
 SLES-11436:
-  name: "Rival Schools - United by Fate (Europe) (Disc 2) (Arcade Disc)"
+  name: "Rival Schools - United by Fate (Disc 2) (Arcade Disc)"
+  saveName: "Rival Schools - United by Fate (Europe) (Disc 2) (Arcade Disc)"
   discSet:
     name: "Rival Schools - United by Fate (Europe)"
     serials:
@@ -138296,7 +145470,8 @@ SLES-11436:
     multitap: true
     linkCable: false
 SLUS-00681:
-  name: "Rival Schools - United by Fate (USA) (Disc 1) (Arcade Disc)"
+  name: "Rival Schools - United by Fate (Disc 1) (Arcade Disc)"
+  saveName: "Rival Schools - United by Fate (USA) (Disc 1) (Arcade Disc)"
   discSet:
     name: "Rival Schools - United by Fate (USA)"
     serials:
@@ -138323,7 +145498,8 @@ SLUS-00681:
     multitap: true
     linkCable: false
 SLUS-00771:
-  name: "Rival Schools - United by Fate (USA) (Disc 2) (Evolution Disc)"
+  name: "Rival Schools - United by Fate (Disc 2) (Evolution Disc)"
+  saveName: "Rival Schools - United by Fate (USA) (Disc 2) (Evolution Disc)"
   discSet:
     name: "Rival Schools - United by Fate (USA)"
     serials:
@@ -138350,7 +145526,8 @@ SLUS-00771:
     multitap: true
     linkCable: false
 SLES-00963:
-  name: "Riven - The Sequel to Myst (Europe) (Disc 1)"
+  name: "Riven - The Sequel to Myst (Disc 1)"
+  saveName: "Riven - The Sequel to Myst (Europe) (Disc 1)"
   discSet:
     name: "Riven - The Sequel to Myst (Europe)"
     serials:
@@ -138377,7 +145554,8 @@ SLES-00963:
     multitap: false
     linkCable: false
 SLES-10963:
-  name: "Riven - The Sequel to Myst (Europe) (Disc 2)"
+  name: "Riven - The Sequel to Myst (Disc 2)"
+  saveName: "Riven - The Sequel to Myst (Europe) (Disc 2)"
   discSet:
     name: "Riven - The Sequel to Myst (Europe)"
     serials:
@@ -138404,7 +145582,8 @@ SLES-10963:
     multitap: false
     linkCable: false
 SLES-20963:
-  name: "Riven - The Sequel to Myst (Europe) (Disc 3)"
+  name: "Riven - The Sequel to Myst (Disc 3)"
+  saveName: "Riven - The Sequel to Myst (Europe) (Disc 3)"
   discSet:
     name: "Riven - The Sequel to Myst (Europe)"
     serials:
@@ -138431,7 +145610,8 @@ SLES-20963:
     multitap: false
     linkCable: false
 SLES-30963:
-  name: "Riven - The Sequel to Myst (Europe) (Disc 4)"
+  name: "Riven - The Sequel to Myst (Disc 4)"
+  saveName: "Riven - The Sequel to Myst (Europe) (Disc 4)"
   discSet:
     name: "Riven - The Sequel to Myst (Europe)"
     serials:
@@ -138458,7 +145638,8 @@ SLES-30963:
     multitap: false
     linkCable: false
 SLES-40963:
-  name: "Riven - The Sequel to Myst (Europe) (Disc 5)"
+  name: "Riven - The Sequel to Myst (Disc 5)"
+  saveName: "Riven - The Sequel to Myst (Europe) (Disc 5)"
   discSet:
     name: "Riven - The Sequel to Myst (Europe)"
     serials:
@@ -138485,7 +145666,8 @@ SLES-40963:
     multitap: false
     linkCable: false
 SLES-01099:
-  name: "Riven - The Sequel to Myst (France) (Disc 1)"
+  name: "Riven - The Sequel to Myst (Disc 1)"
+  saveName: "Riven - The Sequel to Myst (France) (Disc 1)"
   discSet:
     name: "Riven - The Sequel to Myst (France)"
     serials:
@@ -138512,7 +145694,8 @@ SLES-01099:
     multitap: false
     linkCable: false
 SLES-11099:
-  name: "Riven - The Sequel to Myst (France) (Disc 2)"
+  name: "Riven - The Sequel to Myst (Disc 2)"
+  saveName: "Riven - The Sequel to Myst (France) (Disc 2)"
   discSet:
     name: "Riven - The Sequel to Myst (France)"
     serials:
@@ -138539,7 +145722,8 @@ SLES-11099:
     multitap: false
     linkCable: false
 SLES-21099:
-  name: "Riven - The Sequel to Myst (France) (Disc 3)"
+  name: "Riven - The Sequel to Myst (Disc 3)"
+  saveName: "Riven - The Sequel to Myst (France) (Disc 3)"
   discSet:
     name: "Riven - The Sequel to Myst (France)"
     serials:
@@ -138566,7 +145750,8 @@ SLES-21099:
     multitap: false
     linkCable: false
 SLES-31099:
-  name: "Riven - The Sequel to Myst (France) (Disc 4)"
+  name: "Riven - The Sequel to Myst (Disc 4)"
+  saveName: "Riven - The Sequel to Myst (France) (Disc 4)"
   discSet:
     name: "Riven - The Sequel to Myst (France)"
     serials:
@@ -138593,7 +145778,8 @@ SLES-31099:
     multitap: false
     linkCable: false
 SLES-41099:
-  name: "Riven - The Sequel to Myst (France) (Disc 5)"
+  name: "Riven - The Sequel to Myst (Disc 5)"
+  saveName: "Riven - The Sequel to Myst (France) (Disc 5)"
   discSet:
     name: "Riven - The Sequel to Myst (France)"
     serials:
@@ -138620,7 +145806,8 @@ SLES-41099:
     multitap: false
     linkCable: false
 SLES-01100:
-  name: "Riven - The Sequel to Myst (Germany) (Disc 1)"
+  name: "Riven - The Sequel to Myst (Disc 1)"
+  saveName: "Riven - The Sequel to Myst (Germany) (Disc 1)"
   discSet:
     name: "Riven - The Sequel to Myst (Germany)"
     serials:
@@ -138647,7 +145834,8 @@ SLES-01100:
     multitap: false
     linkCable: false
 SLES-11100:
-  name: "Riven - The Sequel to Myst (Germany) (Disc 2)"
+  name: "Riven - The Sequel to Myst (Disc 2)"
+  saveName: "Riven - The Sequel to Myst (Germany) (Disc 2)"
   discSet:
     name: "Riven - The Sequel to Myst (Germany)"
     serials:
@@ -138674,7 +145862,8 @@ SLES-11100:
     multitap: false
     linkCable: false
 SLES-21100:
-  name: "Riven - The Sequel to Myst (Germany) (Disc 3)"
+  name: "Riven - The Sequel to Myst (Disc 3)"
+  saveName: "Riven - The Sequel to Myst (Germany) (Disc 3)"
   discSet:
     name: "Riven - The Sequel to Myst (Germany)"
     serials:
@@ -138701,7 +145890,8 @@ SLES-21100:
     multitap: false
     linkCable: false
 SLES-31100:
-  name: "Riven - The Sequel to Myst (Germany) (Disc 4)"
+  name: "Riven - The Sequel to Myst (Disc 4)"
+  saveName: "Riven - The Sequel to Myst (Germany) (Disc 4)"
   discSet:
     name: "Riven - The Sequel to Myst (Germany)"
     serials:
@@ -138728,7 +145918,8 @@ SLES-31100:
     multitap: false
     linkCable: false
 SLES-41100:
-  name: "Riven - The Sequel to Myst (Germany) (Disc 5)"
+  name: "Riven - The Sequel to Myst (Disc 5)"
+  saveName: "Riven - The Sequel to Myst (Germany) (Disc 5)"
   discSet:
     name: "Riven - The Sequel to Myst (Germany)"
     serials:
@@ -138755,7 +145946,8 @@ SLES-41100:
     multitap: false
     linkCable: false
 SLPS-01180:
-  name: "Riven - The Sequel to Myst (Japan) (Disc 1)"
+  name: "Riven - The Sequel to Myst (Disc 1)"
+  saveName: "Riven - The Sequel to Myst (Japan) (Disc 1)"
   discSet:
     name: "Riven - The Sequel to Myst (Japan)"
     serials:
@@ -138782,7 +145974,8 @@ SLPS-01180:
     multitap: false
     linkCable: false
 SLPS-01181:
-  name: "Riven - The Sequel to Myst (Japan) (Disc 2)"
+  name: "Riven - The Sequel to Myst (Disc 2)"
+  saveName: "Riven - The Sequel to Myst (Japan) (Disc 2)"
   discSet:
     name: "Riven - The Sequel to Myst (Japan)"
     serials:
@@ -138809,7 +146002,8 @@ SLPS-01181:
     multitap: false
     linkCable: false
 SLPS-01182:
-  name: "Riven - The Sequel to Myst (Japan) (Disc 3)"
+  name: "Riven - The Sequel to Myst (Disc 3)"
+  saveName: "Riven - The Sequel to Myst (Japan) (Disc 3)"
   discSet:
     name: "Riven - The Sequel to Myst (Japan)"
     serials:
@@ -138836,7 +146030,8 @@ SLPS-01182:
     multitap: false
     linkCable: false
 SLPS-01183:
-  name: "Riven - The Sequel to Myst (Japan) (Disc 4)"
+  name: "Riven - The Sequel to Myst (Disc 4)"
+  saveName: "Riven - The Sequel to Myst (Japan) (Disc 4)"
   discSet:
     name: "Riven - The Sequel to Myst (Japan)"
     serials:
@@ -138863,7 +146058,8 @@ SLPS-01183:
     multitap: false
     linkCable: false
 SLPS-01184:
-  name: "Riven - The Sequel to Myst (Japan) (Disc 5)"
+  name: "Riven - The Sequel to Myst (Disc 5)"
+  saveName: "Riven - The Sequel to Myst (Japan) (Disc 5)"
   discSet:
     name: "Riven - The Sequel to Myst (Japan)"
     serials:
@@ -138890,7 +146086,8 @@ SLPS-01184:
     multitap: false
     linkCable: false
 SLUS-00535:
-  name: "Riven - The Sequel to Myst (USA) (Disc 1)"
+  name: "Riven - The Sequel to Myst (Disc 1)"
+  saveName: "Riven - The Sequel to Myst (USA) (Disc 1)"
   discSet:
     name: "Riven - The Sequel to Myst (USA)"
     serials:
@@ -138917,7 +146114,8 @@ SLUS-00535:
     multitap: false
     linkCable: false
 SLUS-00563:
-  name: "Riven - The Sequel to Myst (USA) (Disc 2)"
+  name: "Riven - The Sequel to Myst (Disc 2)"
+  saveName: "Riven - The Sequel to Myst (USA) (Disc 2)"
   discSet:
     name: "Riven - The Sequel to Myst (USA)"
     serials:
@@ -138944,7 +146142,8 @@ SLUS-00563:
     multitap: false
     linkCable: false
 SLUS-00564:
-  name: "Riven - The Sequel to Myst (USA) (Disc 3)"
+  name: "Riven - The Sequel to Myst (Disc 3)"
+  saveName: "Riven - The Sequel to Myst (USA) (Disc 3)"
   discSet:
     name: "Riven - The Sequel to Myst (USA)"
     serials:
@@ -138971,7 +146170,8 @@ SLUS-00564:
     multitap: false
     linkCable: false
 SLUS-00565:
-  name: "Riven - The Sequel to Myst (USA) (Disc 4)"
+  name: "Riven - The Sequel to Myst (Disc 4)"
+  saveName: "Riven - The Sequel to Myst (USA) (Disc 4)"
   discSet:
     name: "Riven - The Sequel to Myst (USA)"
     serials:
@@ -138998,7 +146198,8 @@ SLUS-00565:
     multitap: false
     linkCable: false
 SLUS-00580:
-  name: "Riven - The Sequel to Myst (USA) (Disc 5)"
+  name: "Riven - The Sequel to Myst (Disc 5)"
+  saveName: "Riven - The Sequel to Myst (USA) (Disc 5)"
   discSet:
     name: "Riven - The Sequel to Myst (USA)"
     serials:
@@ -139025,7 +146226,8 @@ SLUS-00580:
     multitap: false
     linkCable: false
 SLPS-02388:
-  name: "RoX - 6 = Six (Japan)"
+  name: "RoX - 6 = Six"
+  saveName: "RoX - 6 = Six (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -139043,7 +146245,8 @@ SLPS-02388:
     multitap: false
     linkCable: false
 SLES-00223:
-  name: "Road & Track Presents - The Need for Speed (Europe) (En,De)"
+  name: "Road & Track Presents - The Need for Speed"
+  saveName: "Road & Track Presents - The Need for Speed (Europe) (En,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -139066,7 +146269,8 @@ SLES-00223:
     multitap: false
     linkCable: true
 SLUS-00204:
-  name: "Road & Track Presents - The Need for Speed (USA)"
+  name: "Road & Track Presents - The Need for Speed"
+  saveName: "Road & Track Presents - The Need for Speed (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -139088,7 +146292,8 @@ SLUS-00204:
     multitap: false
     linkCable: true
 SLES-00543:
-  name: "Road Rage (Europe)"
+  name: "Road Rage"
+  saveName: "Road Rage (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -139107,7 +146312,8 @@ SLES-00543:
     multitap: false
     linkCable: false
 SLES-00158:
-  name: "Road Rash (Europe)"
+  name: "Road Rash"
+  saveName: "Road Rash (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -139126,7 +146332,8 @@ SLES-00158:
     multitap: false
     linkCable: false
 SLPS-00243:
-  name: "Road Rash (Japan)"
+  name: "Road Rash"
+  saveName: "Road Rash (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -139145,7 +146352,8 @@ SLPS-00243:
     multitap: false
     linkCable: false
 SLUS-00035:
-  name: "Road Rash (USA)"
+  name: "Road Rash"
+  saveName: "Road Rash (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -139167,7 +146375,8 @@ SLUS-00035:
     multitap: false
     linkCable: false
 SLES-02552:
-  name: "Road Rash - Jailbreak (Europe) (En,Fr,De)"
+  name: "Road Rash - Jailbreak"
+  saveName: "Road Rash - Jailbreak (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139189,7 +146398,8 @@ SLES-02552:
     multitap: true
     linkCable: false
 SLUS-01053:
-  name: "Road Rash - Jailbreak (USA)"
+  name: "Road Rash - Jailbreak"
+  saveName: "Road Rash - Jailbreak (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -139212,7 +146422,8 @@ SLUS-01053:
     multitap: true
     linkCable: false
 SLES-00910:
-  name: "Road Rash 3D (Europe)"
+  name: "Road Rash 3D"
+  saveName: "Road Rash 3D (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139234,7 +146445,8 @@ SLES-00910:
     multitap: false
     linkCable: false
 SLES-01157:
-  name: "Road Rash 3D (France)"
+  name: "Road Rash 3D"
+  saveName: "Road Rash 3D (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139256,7 +146468,8 @@ SLES-01157:
     multitap: false
     linkCable: false
 SLES-01158:
-  name: "Road Rash 3D (Germany)"
+  name: "Road Rash 3D"
+  saveName: "Road Rash 3D (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139278,7 +146491,8 @@ SLES-01158:
     multitap: false
     linkCable: false
 SLUS-00524:
-  name: "Road Rash 3D (USA)"
+  name: "Road Rash 3D"
+  saveName: "Road Rash 3D (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -139303,7 +146517,8 @@ SLUS-00524:
     multitap: false
     linkCable: false
 LSP-907127:
-  name: "Road Writer (USA)"
+  name: "Road Writer"
+  saveName: "Road Writer (USA)"
   codes:
     - LSP-907127
     - LSP-907127001
@@ -139315,7 +146530,8 @@ LSP-907127:
     languages:
       - English
 SLES-02326:
-  name: "Roadsters (Europe) (En,Fr,De,Es,It)"
+  name: "Roadsters"
+  saveName: "Roadsters (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139339,7 +146555,8 @@ SLES-02326:
     multitap: false
     linkCable: false
 SLUS-01024:
-  name: "Roadsters (USA)"
+  name: "Roadsters"
+  saveName: "Roadsters (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -139362,7 +146579,8 @@ SLUS-01024:
     multitap: false
     linkCable: false
 SCPS-10103:
-  name: "Robbit mon Dieu (Japan)"
+  name: "Robbit mon Dieu"
+  saveName: "Robbit mon Dieu (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -139384,7 +146602,8 @@ SCPS-10103:
     multitap: false
     linkCable: false
 SLES-04110:
-  name: "Robin Hood - The Siege (Europe)"
+  name: "Robin Hood - The Siege"
+  saveName: "Robin Hood - The Siege (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139403,7 +146622,8 @@ SLES-04110:
     multitap: false
     linkCable: false
 SLPS-02501:
-  name: "Robin Lloyd no Bouken (Japan)"
+  name: "Robin Lloyd no Bouken"
+  saveName: "Robin Lloyd no Bouken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139422,7 +146642,8 @@ SLPS-02501:
     multitap: false
     linkCable: false
 SLES-00452:
-  name: "Robo Pit (Europe)"
+  name: "Robo Pit"
+  saveName: "Robo Pit (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -139440,7 +146661,8 @@ SLES-00452:
     multitap: false
     linkCable: false
 SLPS-00165:
-  name: "Robo Pit (Japan)"
+  name: "Robo Pit"
+  saveName: "Robo Pit (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -139461,7 +146683,8 @@ SLPS-00165:
     multitap: false
     linkCable: false
 SLUS-00316:
-  name: "Robo Pit (USA)"
+  name: "Robo Pit"
+  saveName: "Robo Pit (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -139479,7 +146702,8 @@ SLUS-00316:
     multitap: false
     linkCable: false
 SLES-04054:
-  name: "Robo Pit 2 (Europe)"
+  name: "Robo Pit 2"
+  saveName: "Robo Pit 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -139497,7 +146721,8 @@ SLES-04054:
     multitap: false
     linkCable: true
 SLUS-01563:
-  name: "Robo Pit 2 (USA)"
+  name: "Robo Pit 2"
+  saveName: "Robo Pit 2 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -139515,7 +146740,8 @@ SLUS-01563:
     multitap: false
     linkCable: true
 SLPS-00975:
-  name: "Robo-Pit 2 (Japan) (Demo)"
+  name: "Robo-Pit 2 (Demo)"
+  saveName: "Robo-Pit 2 (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -139533,7 +146759,8 @@ SLPS-00975:
     multitap: false
     linkCable: false
 SCPS-45082:
-  name: "Robo-Pit 2 (Japan, Asia)"
+  name: "Robo-Pit 2"
+  saveName: "Robo-Pit 2 (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -139572,7 +146799,8 @@ SLPS-00877:
     multitap: false
     linkCable: true
 SLES-04112:
-  name: "Robocod - James Pond II (Europe) (En,Fr,De,Es,It)"
+  name: "Robocod - James Pond II"
+  saveName: "Robocod - James Pond II (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139595,7 +146823,8 @@ SLES-04112:
     multitap: false
     linkCable: false
 SLPS-02331:
-  name: "Robot x Robot (Japan)"
+  name: "Robot x Robot"
+  saveName: "Robot x Robot (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -139614,7 +146843,8 @@ SLPS-02331:
     multitap: false
     linkCable: false
 SLES-00539:
-  name: "Robotron X (Europe)"
+  name: "Robotron X"
+  saveName: "Robotron X (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -139632,11 +146862,13 @@ SLES-00539:
     multitap: false
     linkCable: false
 SLED-00515:
-  name: "Robotron X (Europe) (Demo)"
+  name: "Robotron X (Demo)"
+  saveName: "Robotron X (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00790:
-  name: "Robotron X (Japan)"
+  name: "Robotron X"
+  saveName: "Robotron X (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -139657,7 +146889,8 @@ SLPS-00790:
     multitap: false
     linkCable: false
 SLUS-00252:
-  name: "Robotron X (USA)"
+  name: "Robotron X"
+  saveName: "Robotron X (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -139675,7 +146908,8 @@ SLUS-00252:
     multitap: false
     linkCable: false
 ESPM-70002:
-  name: "Robots - Video Alchemy (Japan)"
+  name: "Robots - Video Alchemy"
+  saveName: "Robots - Video Alchemy (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -139699,7 +146933,8 @@ ESPM-70002:
     multitap: false
     linkCable: false
 SLES-00056:
-  name: "Rock & Roll Racing 2 - Red Asphalt (Europe)"
+  name: "Rock & Roll Racing 2 - Red Asphalt"
+  saveName: "Rock & Roll Racing 2 - Red Asphalt (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -139721,7 +146956,8 @@ SLES-00056:
     multitap: false
     linkCable: true
 SLUS-01124:
-  name: "Rock 'Em Sock 'Em Robots Arena (USA)"
+  name: "Rock 'Em Sock 'Em Robots Arena"
+  saveName: "Rock 'Em Sock 'Em Robots Arena (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -139743,7 +146979,8 @@ SLUS-01124:
     multitap: false
     linkCable: false
 SLPS-00662:
-  name: "Rock-Climbing - Mitouhou e no Chousen - Alps Hen (Japan)"
+  name: "Rock-Climbing - Mitouhou e no Chousen - Alps Hen"
+  saveName: "Rock-Climbing - Mitouhou e no Chousen - Alps Hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -139761,7 +146998,8 @@ SLPS-00662:
     multitap: false
     linkCable: false
 SLPM-87250:
-  name: "Rockman (Japan)"
+  name: "Rockman"
+  saveName: "Rockman (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139785,7 +147023,8 @@ SLPM-87250:
     multitap: false
     linkCable: false
 SLPS-00764:
-  name: "Rockman - Battle & Chase (Japan)"
+  name: "Rockman - Battle & Chase"
+  saveName: "Rockman - Battle & Chase (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139808,7 +147047,8 @@ SLPS-00764:
     multitap: false
     linkCable: false
 SLPS-91093:
-  name: "Rockman - Battle & Chase (Japan) (PlayStation the Best for Family)"
+  name: "Rockman - Battle & Chase (PlayStation the Best for Family)"
+  saveName: "Rockman - Battle & Chase (Japan) (PlayStation the Best for Family)"
   controllers:
     - DigitalController
     - NeGcon
@@ -139863,7 +147103,8 @@ SLPM-87410:
     multitap: false
     linkCable: false
 SLPM-87249:
-  name: "Rockman 2 - Dr. Wily no Nazo (Japan)"
+  name: "Rockman 2 - Dr. Wily no Nazo"
+  saveName: "Rockman 2 - Dr. Wily no Nazo (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139887,7 +147128,8 @@ SLPM-87249:
     multitap: false
     linkCable: false
 SLPS-02262:
-  name: "Rockman 3 - Dr. Wily no Saigo! (Japan)"
+  name: "Rockman 3 - Dr. Wily no Saigo!"
+  saveName: "Rockman 3 - Dr. Wily no Saigo! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139911,7 +147153,8 @@ SLPS-02262:
     multitap: false
     linkCable: false
 SLPM-87259:
-  name: "Rockman 4 - Aratanaru Yabou!! (Japan)"
+  name: "Rockman 4 - Aratanaru Yabou!!"
+  saveName: "Rockman 4 - Aratanaru Yabou!! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139935,7 +147178,8 @@ SLPM-87259:
     multitap: false
     linkCable: false
 SLPM-87268:
-  name: "Rockman 5 - Blues no Wana!? (Japan)"
+  name: "Rockman 5 - Blues no Wana!?"
+  saveName: "Rockman 5 - Blues no Wana!? (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139959,7 +147203,8 @@ SLPM-87268:
     multitap: false
     linkCable: false
 SLPM-87269:
-  name: "Rockman 6 - Shijou Saidai no Tatakai!! (Japan)"
+  name: "Rockman 6 - Shijou Saidai no Tatakai!!"
+  saveName: "Rockman 6 - Shijou Saidai no Tatakai!! (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -139983,7 +147228,8 @@ SLPM-87269:
     multitap: false
     linkCable: false
 SLPS-00630:
-  name: "Rockman 8 - Metal Heroes (Japan)"
+  name: "Rockman 8 - Metal Heroes"
+  saveName: "Rockman 8 - Metal Heroes (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -140011,7 +147257,8 @@ SLPS-00630:
     multitap: false
     linkCable: false
 SLPS-01141:
-  name: "Rockman Dash - Hagane no Boukenshin (Japan)"
+  name: "Rockman Dash - Hagane no Boukenshin"
+  saveName: "Rockman Dash - Hagane no Boukenshin (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -140034,13 +147281,15 @@ SLPS-01141:
     multitap: false
     linkCable: false
 SLPM-80158:
-  name: "Rockman Dash - Hagane no Boukenshin (Japan) (Demo)"
+  name: "Rockman Dash - Hagane no Boukenshin (Demo)"
+  saveName: "Rockman Dash - Hagane no Boukenshin (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SLPS-91094:
-  name: "Rockman Dash - Hagane no Boukenshin (Japan) (Digest-ban)"
+  name: "Rockman Dash - Hagane no Boukenshin (Digest-ban)"
+  saveName: "Rockman Dash - Hagane no Boukenshin (Japan) (Digest-ban)"
   controllers:
     - DigitalController
   codes:
@@ -140061,7 +147310,8 @@ SLPS-91094:
     multitap: false
     linkCable: false
 SLPS-02109:
-  name: "Rockman Dash 2 - Episode 1 - 'Roll-chan Kiki Ippatsu!' no Maki (Japan) (Demo)"
+  name: "Rockman Dash 2 - Episode 1 - 'Roll-chan Kiki Ippatsu!' no Maki (Demo)"
+  saveName: "Rockman Dash 2 - Episode 1 - 'Roll-chan Kiki Ippatsu!' no Maki (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140080,7 +147330,8 @@ SLPS-02109:
     multitap: false
     linkCable: false
 SLPM-86813:
-  name: "Rockman Dash 2 - Episode 2 - Ooinaru Isan (Japan)"
+  name: "Rockman Dash 2 - Episode 2 - Ooinaru Isan"
+  saveName: "Rockman Dash 2 - Episode 2 - Ooinaru Isan (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -140105,7 +147356,8 @@ SLPM-86813:
     multitap: false
     linkCable: false
 SLPS-00283:
-  name: "Rockman X3 (Japan)"
+  name: "Rockman X3"
+  saveName: "Rockman X3 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -140130,7 +147382,8 @@ SLPS-00283:
     multitap: false
     linkCable: false
 SLPM-87315:
-  name: "Rockman X4 (Japan)"
+  name: "Rockman X4"
+  saveName: "Rockman X4 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -140152,7 +147405,8 @@ SLPM-87315:
     multitap: false
     linkCable: false
 SLPS-00901:
-  name: "Rockman X4 (Japan) (Special Limited Pack)"
+  name: "Rockman X4 (Special Limited Pack)"
+  saveName: "Rockman X4 (Japan) (Special Limited Pack)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -140173,11 +147427,13 @@ SLPS-00901:
     multitap: false
     linkCable: false
 SLPM-80121:
-  name: "Rockman X4, Rockman 8 - Metal Heroes, Rockman - Battle & Chase (Japan) (Demo)"
+  name: "Rockman X4, Rockman 8 - Metal Heroes, Rockman - Battle & Chase (Demo)"
+  saveName: "Rockman X4, Rockman 8 - Metal Heroes, Rockman - Battle & Chase (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86666:
-  name: "Rockman X5 (Japan)"
+  name: "Rockman X5"
+  saveName: "Rockman X5 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -140201,7 +147457,8 @@ SLPM-86666:
     multitap: false
     linkCable: false
 SLPM-86959:
-  name: "Rockman X6 (Japan)"
+  name: "Rockman X6"
+  saveName: "Rockman X6 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -140225,7 +147482,8 @@ SLPM-86959:
     multitap: false
     linkCable: false
 SLES-02976:
-  name: "Roger Lemerre - La Selection des Champions (France)"
+  name: "Roger Lemerre - La Selection des Champions"
+  saveName: "Roger Lemerre - La Selection des Champions (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140245,7 +147503,8 @@ SLES-02976:
     multitap: false
     linkCable: false
 SLES-03604:
-  name: "Roger Lemerre - La Selection des Champions 2002 (France)"
+  name: "Roger Lemerre - La Selection des Champions 2002"
+  saveName: "Roger Lemerre - La Selection des Champions 2002 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140265,7 +147524,8 @@ SLES-03604:
     multitap: false
     linkCable: false
 SLES-01417:
-  name: "Rogue Trip - Vacation 2012 (Europe)"
+  name: "Rogue Trip - Vacation 2012"
+  saveName: "Rogue Trip - Vacation 2012 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140284,7 +147544,8 @@ SLES-01417:
     multitap: false
     linkCable: true
 SLUS-00643:
-  name: "Rogue Trip - Vacation 2012 (USA)"
+  name: "Rogue Trip - Vacation 2012"
+  saveName: "Rogue Trip - Vacation 2012 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140303,15 +147564,18 @@ SLUS-00643:
     multitap: false
     linkCable: true
 SLUS-90044:
-  name: "Rogue Trip - Vacation 2012 (USA) (Demo)"
+  name: "Rogue Trip - Vacation 2012 (Demo)"
+  saveName: "Rogue Trip - Vacation 2012 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-80643:
-  name: "Rogue Trip - Vacation 2012 (USA) (Demo) (Alt)"
+  name: "Rogue Trip - Vacation 2012 (Demo) (Alt)"
+  saveName: "Rogue Trip - Vacation 2012 (USA) (Demo) (Alt)"
   metadata:
     genre: "** DEMO **"
 SLES-03449:
-  name: "Roland Garros French Open 2001 (Europe) (En,Fr,De,Es,It)"
+  name: "Roland Garros French Open 2001"
+  saveName: "Roland Garros French Open 2001 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140336,7 +147600,8 @@ SLES-03449:
     multitap: false
     linkCable: false
 SLUS-00724:
-  name: "Roll Away (USA)"
+  name: "Roll Away"
+  saveName: "Roll Away (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -140358,11 +147623,13 @@ SLUS-00724:
     multitap: false
     linkCable: false
 SLED-01896:
-  name: "Rollcage (Europe) (Demo)"
+  name: "Rollcage (Demo)"
+  saveName: "Rollcage (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01660:
-  name: "Rollcage (Europe) (En,Fr,De,Es,It)"
+  name: "Rollcage"
+  saveName: "Rollcage (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -140389,11 +147656,13 @@ SLES-01660:
     multitap: false
     linkCable: false
 SLED-01732:
-  name: "Rollcage (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Rollcage (Demo)"
+  saveName: "Rollcage (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00800:
-  name: "Rollcage (USA)"
+  name: "Rollcage"
+  saveName: "Rollcage (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3862-g8f821c77"
@@ -140416,11 +147685,13 @@ SLUS-00800:
     multitap: false
     linkCable: false
 SLUS-90052:
-  name: "Rollcage (USA) (Demo)"
+  name: "Rollcage (Demo)"
+  saveName: "Rollcage (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01922:
-  name: "Rollcage Stage II (Europe) (En,Fr,De,Es,It)"
+  name: "Rollcage Stage II"
+  saveName: "Rollcage Stage II (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -140449,7 +147720,8 @@ SCES-01922:
     multitap: false
     linkCable: false
 SLUS-00867:
-  name: "Rollcage Stage II (USA)"
+  name: "Rollcage Stage II"
+  saveName: "Rollcage Stage II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -140496,7 +147768,8 @@ SLPM-87113:
     multitap: false
     linkCable: false
 SLUS-00195:
-  name: "Romance of the Three Kingdoms IV - Wall of Fire (USA)"
+  name: "Romance of the Three Kingdoms IV - Wall of Fire"
+  saveName: "Romance of the Three Kingdoms IV - Wall of Fire (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -140514,7 +147787,8 @@ SLUS-00195:
     multitap: false
     linkCable: false
 SLUS-00918:
-  name: "Romance of the Three Kingdoms VI - Awakening of the Dragon (USA)"
+  name: "Romance of the Three Kingdoms VI - Awakening of the Dragon"
+  saveName: "Romance of the Three Kingdoms VI - Awakening of the Dragon (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -140532,7 +147806,8 @@ SLUS-00918:
     multitap: false
     linkCable: false
 SLPM-87111:
-  name: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Disc 1) (Shokai Genteiban)"
+  saveName: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Japan) (Shokai Genteiban)"
     serials:
@@ -140556,7 +147831,8 @@ SLPM-87111:
     multitap: false
     linkCable: false
 SLPM-87112:
-  name: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Disc 2) (Shokai Genteiban)"
+  saveName: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Romance wa Tsurugi no Kagayaki II - Gin no Niji o Sagashite (Japan) (Shokai Genteiban)"
     serials:
@@ -140580,7 +147856,8 @@ SLPM-87112:
     multitap: false
     linkCable: false
 SLES-02681:
-  name: "Ronaldo V-Football (Europe) (De,Es,It,Pt)"
+  name: "Ronaldo V-Football"
+  saveName: "Ronaldo V-Football (Europe) (De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140603,7 +147880,8 @@ SLES-02681:
     multitap: false
     linkCable: false
 SLES-00995:
-  name: "Ronaldo V-Football (Europe) (En,Fr,Nl,Sv)"
+  name: "Ronaldo V-Football"
+  saveName: "Ronaldo V-Football (Europe) (En,Fr,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140626,7 +147904,8 @@ SLES-00995:
     multitap: false
     linkCable: false
 SLPS-02702:
-  name: "Rong Rong, The (Japan)"
+  name: "Rong Rong, The"
+  saveName: "Rong Rong, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140645,7 +147924,8 @@ SLPS-02702:
     multitap: false
     linkCable: false
 SLES-02094:
-  name: "Ronin Blade (Europe) (En,Fr,De)"
+  name: "Ronin Blade"
+  saveName: "Ronin Blade (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140666,7 +147946,8 @@ SLES-02094:
     multitap: false
     linkCable: false
 SLPS-02140:
-  name: "Roommate - Inoue Ryoko (Japan)"
+  name: "Roommate - Inoue Ryoko"
+  saveName: "Roommate - Inoue Ryoko (Japan)"
   compatibility:
     rating: CrashesInGame
     versionTested: "0.1-3769-g4786beb0"
@@ -140688,7 +147969,8 @@ SLPS-02140:
     multitap: false
     linkCable: false
 SCES-00257:
-  name: "Rosco McQueen (Europe) (En,Fr,De,Es,It)"
+  name: "Rosco McQueen"
+  saveName: "Rosco McQueen (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140711,7 +147993,8 @@ SCES-00257:
     multitap: false
     linkCable: false
 SLUS-00750:
-  name: "Rosco McQueen Firefighter Extreme (USA)"
+  name: "Rosco McQueen Firefighter Extreme"
+  saveName: "Rosco McQueen Firefighter Extreme (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140730,7 +148013,8 @@ SLUS-00750:
     multitap: false
     linkCable: false
 SLES-02591:
-  name: "Roswell Conspiracies - Aliens, Myths & Legends (Europe) (En,Fr,De)"
+  name: "Roswell Conspiracies - Aliens, Myths & Legends"
+  saveName: "Roswell Conspiracies - Aliens, Myths & Legends (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140753,7 +148037,8 @@ SLES-02591:
     multitap: false
     linkCable: false
 SLUS-01062:
-  name: "Roswell Conspiracies - Aliens, Myths & Legends (USA)"
+  name: "Roswell Conspiracies - Aliens, Myths & Legends"
+  saveName: "Roswell Conspiracies - Aliens, Myths & Legends (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -140776,7 +148061,8 @@ SLUS-01062:
     multitap: false
     linkCable: false
 SLES-04069:
-  name: "Rox (Europe)"
+  name: "Rox"
+  saveName: "Rox (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -140812,7 +148098,8 @@ SLPS-01641:
     multitap: false
     linkCable: false
 SLES-01939:
-  name: "Ruff & Tumble (Germany)"
+  name: "Ruff & Tumble"
+  saveName: "Ruff & Tumble (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140831,7 +148118,8 @@ SLES-01939:
     multitap: false
     linkCable: false
 SLES-02384:
-  name: "Ruff & Tumble (Netherlands)"
+  name: "Ruff & Tumble"
+  saveName: "Ruff & Tumble (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140850,7 +148138,8 @@ SLES-02384:
     multitap: false
     linkCable: false
 SLPS-00857:
-  name: "Runabout (Japan)"
+  name: "Runabout"
+  saveName: "Runabout (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -140871,11 +148160,13 @@ SLPS-00857:
     multitap: false
     linkCable: false
 SLPM-80104:
-  name: "Runabout (Japan) (Demo)"
+  name: "Runabout (Demo)"
+  saveName: "Runabout (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-04015:
-  name: "Runabout 2 (Europe)"
+  name: "Runabout 2"
+  saveName: "Runabout 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140895,7 +148186,8 @@ SLES-04015:
     multitap: false
     linkCable: false
 SLPS-02403:
-  name: "Runabout 2 (Japan)"
+  name: "Runabout 2"
+  saveName: "Runabout 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140915,11 +148207,13 @@ SLPS-02403:
     multitap: false
     linkCable: false
 SLPM-80510:
-  name: "Runabout 2 (Japan) (Demo)"
+  name: "Runabout 2 (Demo)"
+  saveName: "Runabout 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03033:
-  name: "Runabout 2 (Japan) (Fukyuuban 1500)"
+  name: "Runabout 2 (Fukyuuban 1500)"
+  saveName: "Runabout 2 (Japan) (Fukyuuban 1500)"
   controllers:
     - AnalogController
     - DigitalController
@@ -140939,7 +148233,8 @@ SLPS-03033:
     multitap: false
     linkCable: false
 SLUS-01135:
-  name: "Runabout 2 (USA)"
+  name: "Runabout 2"
+  saveName: "Runabout 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141014,7 +148309,8 @@ SCPS-45064:
     multitap: false
     linkCable: false
 SLPS-00751:
-  name: "Running High (Japan)"
+  name: "Running High"
+  saveName: "Running High (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -141033,11 +148329,13 @@ SLPS-00751:
     multitap: false
     linkCable: false
 SLPM-80095:
-  name: "Running High (Japan) (Demo)"
+  name: "Running High (Demo)"
+  saveName: "Running High (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01630:
-  name: "Running Wild (Europe)"
+  name: "Running Wild"
+  saveName: "Running Wild (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141061,7 +148359,8 @@ SCES-01630:
     multitap: true
     linkCable: false
 SCUS-94272:
-  name: "Running Wild (USA)"
+  name: "Running Wild"
+  saveName: "Running Wild (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141081,11 +148380,13 @@ SCUS-94272:
     multitap: true
     linkCable: false
 SCUS-94373:
-  name: "Running Wild (USA) (Demo)"
+  name: "Running Wild (Demo)"
+  saveName: "Running Wild (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10030:
-  name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Ishin Gekitou-hen (Japan)"
+  name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Ishin Gekitou-hen"
+  saveName: "Rurouni Kenshin - Meiji Kenkaku Romantan - Ishin Gekitou-hen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -141106,7 +148407,8 @@ SCPS-10030:
     multitap: false
     linkCable: false
 SCPS-10048:
-  name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen (Japan)"
+  name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen"
+  saveName: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -141124,14 +148426,16 @@ SCPS-10048:
     multitap: false
     linkCable: false
 PAPX-90021:
-  name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen (Japan) (Demo)"
+  name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen (Demo)"
+  saveName: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
     - PAPX-90021
     - PAPX-90024
 SCUS-94417:
-  name: "Rush Hour (USA)"
+  name: "Rush Hour"
+  saveName: "Rush Hour (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2632-g14c227a8"
@@ -141153,7 +148457,8 @@ SCUS-94417:
     multitap: false
     linkCable: false
 SLES-01080:
-  name: "Rushdown (Europe) (En,Fr,De)"
+  name: "Rushdown"
+  saveName: "Rushdown (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141174,7 +148479,8 @@ SLES-01080:
     multitap: false
     linkCable: false
 SLUS-00828:
-  name: "Rushdown (USA)"
+  name: "Rushdown"
+  saveName: "Rushdown (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141193,7 +148499,8 @@ SLUS-00828:
     multitap: false
     linkCable: false
 SLPS-01035:
-  name: "Ryuuki Denshou - Dragoon (Japan)"
+  name: "Ryuuki Denshou - Dragoon"
+  saveName: "Ryuuki Denshou - Dragoon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -141211,17 +148518,22 @@ SLPS-01035:
     multitap: false
     linkCable: false
 SLED-00966:
-  name: "radicalgames@psygnosis (Europe)"
+  name: "radicalgames@psygnosis"
+  saveName: "radicalgames@psygnosis (Europe)"
 SLED-00990:
-  name: "radicalgames@psygnosis v.2 (Europe)"
+  name: "radicalgames@psygnosis v.2"
+  saveName: "radicalgames@psygnosis v.2 (Europe)"
 SLED-01511:
-  name: "radicalgames@psygnosis v.3 (Europe) (En,Fr,De,Es,It,Fi)"
+  name: "radicalgames@psygnosis v.3"
+  saveName: "radicalgames@psygnosis v.3 (Europe) (En,Fr,De,Es,It,Fi)"
 SLED-01415:
-  name: "S.C.A.R.S. (Europe) (Demo)"
+  name: "S.C.A.R.S. (Demo)"
+  saveName: "S.C.A.R.S. (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01286:
-  name: "S.C.A.R.S. (Europe) (En,Fr,De,Es,It)"
+  name: "S.C.A.R.S."
+  saveName: "S.C.A.R.S. (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -141246,7 +148558,8 @@ SLES-01286:
     multitap: true
     linkCable: false
 SLUS-00692:
-  name: "S.C.A.R.S. (USA)"
+  name: "S.C.A.R.S."
+  saveName: "S.C.A.R.S. (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -141267,7 +148580,8 @@ SLUS-00692:
     multitap: true
     linkCable: false
 SLPS-91065:
-  name: "SD Gundam - GCentury (Japan) (Rev 1)"
+  name: "SD Gundam - GCentury"
+  saveName: "SD Gundam - GCentury (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -141285,7 +148599,8 @@ SLPS-91065:
     multitap: true
     linkCable: false
 SCPS-45034:
-  name: "SD Gundam - GCentury (Japan, Asia)"
+  name: "SD Gundam - GCentury"
+  saveName: "SD Gundam - GCentury (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -141306,7 +148621,8 @@ SCPS-45034:
     multitap: true
     linkCable: false
 SLPS-01560:
-  name: "SD Gundam - GGeneration (Japan)"
+  name: "SD Gundam - GGeneration"
+  saveName: "SD Gundam - GGeneration (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141325,7 +148641,8 @@ SLPS-01560:
     multitap: true
     linkCable: false
 SLPS-01561:
-  name: "SD Gundam - GGeneration (Premium Disc) (Japan)"
+  name: "SD Gundam - GGeneration (Premium Disc)"
+  saveName: "SD Gundam - GGeneration (Premium Disc) (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141344,7 +148661,8 @@ SLPS-01561:
     multitap: true
     linkCable: false
 SLPS-02200:
-  name: "SD Gundam - GGeneration-0 (Japan) (Disc 1)"
+  name: "SD Gundam - GGeneration-0 (Disc 1)"
+  saveName: "SD Gundam - GGeneration-0 (Japan) (Disc 1)"
   discSet:
     name: "SD Gundam - GGeneration-0 (Japan)"
     serials:
@@ -141368,7 +148686,8 @@ SLPS-02200:
     multitap: true
     linkCable: false
 SLPS-03206:
-  name: "SD Gundam - GGeneration-0 (Japan) (Disc 1) (Rev 1)"
+  name: "SD Gundam - GGeneration-0 (Disc 1)"
+  saveName: "SD Gundam - GGeneration-0 (Japan) (Disc 1) (Rev 1)"
   discSet:
     name: "SD Gundam - GGeneration-0 (Japan) (Rev 1)"
     serials:
@@ -141392,7 +148711,8 @@ SLPS-03206:
     multitap: true
     linkCable: false
 SLPS-02201:
-  name: "SD Gundam - GGeneration-0 (Japan) (Disc 2)"
+  name: "SD Gundam - GGeneration-0 (Disc 2)"
+  saveName: "SD Gundam - GGeneration-0 (Japan) (Disc 2)"
   discSet:
     name: "SD Gundam - GGeneration-0 (Japan)"
     serials:
@@ -141416,7 +148736,8 @@ SLPS-02201:
     multitap: true
     linkCable: false
 SLPS-03207:
-  name: "SD Gundam - GGeneration-0 (Japan) (Disc 2) (Rev 1)"
+  name: "SD Gundam - GGeneration-0 (Disc 2)"
+  saveName: "SD Gundam - GGeneration-0 (Japan) (Disc 2) (Rev 1)"
   discSet:
     name: "SD Gundam - GGeneration-0 (Japan) (Rev 1)"
     serials:
@@ -141440,7 +148761,8 @@ SLPS-03207:
     multitap: true
     linkCable: false
 SLPS-02900:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 1)"
+  name: "SD Gundam - GGeneration-F (Disc 1)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 1)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan)"
     serials:
@@ -141470,7 +148792,8 @@ SLPS-02900:
     multitap: true
     linkCable: false
 SLPM-84004:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 1) (Tokubetsu-ban)"
+  name: "SD Gundam - GGeneration-F (Disc 1) (Tokubetsu-ban)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 1) (Tokubetsu-ban)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan) (Tokubetsu-ban)"
     serials:
@@ -141479,7 +148802,8 @@ SLPM-84004:
       - SLPM-84006
       - SLPM-84007
 SLPS-02901:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 2)"
+  name: "SD Gundam - GGeneration-F (Disc 2)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 2)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan)"
     serials:
@@ -141509,7 +148833,8 @@ SLPS-02901:
     multitap: true
     linkCable: false
 SLPM-84005:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 2) (Tokubetsu-ban)"
+  name: "SD Gundam - GGeneration-F (Disc 2) (Tokubetsu-ban)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 2) (Tokubetsu-ban)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan) (Tokubetsu-ban)"
     serials:
@@ -141518,7 +148843,8 @@ SLPM-84005:
       - SLPM-84006
       - SLPM-84007
 SLPS-02902:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 3)"
+  name: "SD Gundam - GGeneration-F (Disc 3)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 3)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan)"
     serials:
@@ -141548,7 +148874,8 @@ SLPS-02902:
     multitap: true
     linkCable: false
 SLPM-84006:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 3) (Tokubetsu-ban)"
+  name: "SD Gundam - GGeneration-F (Disc 3) (Tokubetsu-ban)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 3) (Tokubetsu-ban)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan) (Tokubetsu-ban)"
     serials:
@@ -141557,7 +148884,8 @@ SLPM-84006:
       - SLPM-84006
       - SLPM-84007
 SLPS-02915:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 4) (Premium Disc)"
+  name: "SD Gundam - GGeneration-F (Disc 4) (Premium Disc)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 4) (Premium Disc)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan)"
     serials:
@@ -141584,7 +148912,8 @@ SLPS-02915:
     multitap: true
     linkCable: false
 SLPS-02903:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 4) (Premium Disc) (Limited Edition)"
+  name: "SD Gundam - GGeneration-F (Disc 4) (Premium Disc) (Limited Edition)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 4) (Premium Disc) (Limited Edition)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan)"
     serials:
@@ -141611,7 +148940,8 @@ SLPS-02903:
     multitap: true
     linkCable: false
 SLPM-84007:
-  name: "SD Gundam - GGeneration-F (Japan) (Disc 4) (Premium Disc) (Tokubetsu-ban)"
+  name: "SD Gundam - GGeneration-F (Disc 4) (Premium Disc) (Tokubetsu-ban)"
+  saveName: "SD Gundam - GGeneration-F (Japan) (Disc 4) (Premium Disc) (Tokubetsu-ban)"
   discSet:
     name: "SD Gundam - GGeneration-F (Japan) (Tokubetsu-ban)"
     serials:
@@ -141620,7 +148950,8 @@ SLPM-84007:
       - SLPM-84006
       - SLPM-84007
 SLPS-03195:
-  name: "SD Gundam - GGeneration-F.I.F (Japan)"
+  name: "SD Gundam - GGeneration-F.I.F"
+  saveName: "SD Gundam - GGeneration-F.I.F (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141639,7 +148970,8 @@ SLPS-03195:
     multitap: true
     linkCable: false
 SLPS-00385:
-  name: "SD Gundam - Over Galaxian (Japan)"
+  name: "SD Gundam - Over Galaxian"
+  saveName: "SD Gundam - Over Galaxian (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -141657,7 +148989,8 @@ SLPS-00385:
     multitap: false
     linkCable: false
 SLPS-03145:
-  name: "SD Gundam Eiyuuden - Daikessen!! Knight vs. Musha (Japan)"
+  name: "SD Gundam Eiyuuden - Daikessen!! Knight vs. Musha"
+  saveName: "SD Gundam Eiyuuden - Daikessen!! Knight vs. Musha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141676,7 +149009,8 @@ SLPS-03145:
     multitap: false
     linkCable: false
 SLPM-86091:
-  name: "SNK Fan Collection - Garou Densetsu (Japan)"
+  name: "SNK Fan Collection - Garou Densetsu"
+  saveName: "SNK Fan Collection - Garou Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141695,7 +149029,8 @@ SLPM-86091:
     multitap: false
     linkCable: false
 SCPS-45102:
-  name: "SaGa Frontier (Japan, Asia)"
+  name: "SaGa Frontier"
+  saveName: "SaGa Frontier (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -141718,7 +149053,8 @@ SCPS-45102:
     multitap: false
     linkCable: false
 SCUS-94230:
-  name: "SaGa Frontier (USA)"
+  name: "SaGa Frontier"
+  saveName: "SaGa Frontier (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-9460-g09e785555"
@@ -141739,7 +149075,8 @@ SCUS-94230:
     multitap: false
     linkCable: false
 SLES-02112:
-  name: "SaGa Frontier 2 (Europe)"
+  name: "SaGa Frontier 2"
+  saveName: "SaGa Frontier 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141761,7 +149098,8 @@ SLES-02112:
     multitap: false
     linkCable: false
 SLES-02113:
-  name: "SaGa Frontier 2 (France)"
+  name: "SaGa Frontier 2"
+  saveName: "SaGa Frontier 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141783,7 +149121,8 @@ SLES-02113:
     multitap: false
     linkCable: false
 SLES-02118:
-  name: "SaGa Frontier 2 (Germany)"
+  name: "SaGa Frontier 2"
+  saveName: "SaGa Frontier 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141805,7 +149144,8 @@ SLES-02118:
     multitap: false
     linkCable: false
 SLUS-00933:
-  name: "SaGa Frontier 2 (USA)"
+  name: "SaGa Frontier 2"
+  saveName: "SaGa Frontier 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-9460-g09e785555"
@@ -141829,7 +149169,8 @@ SLUS-00933:
     multitap: false
     linkCable: false
 SCPS-45400:
-  name: "SaGa Frontier II (Japan, Asia)"
+  name: "SaGa Frontier II"
+  saveName: "SaGa Frontier II (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141853,7 +149194,8 @@ SCPS-45400:
     multitap: false
     linkCable: false
 SLES-03286:
-  name: "Saban's Power Rangers - Lightspeed Rescue (Europe) (En,Fr,De)"
+  name: "Saban's Power Rangers - Lightspeed Rescue"
+  saveName: "Saban's Power Rangers - Lightspeed Rescue (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141874,7 +149216,8 @@ SLES-03286:
     multitap: false
     linkCable: false
 SLUS-01114:
-  name: "Saban's Power Rangers - Lightspeed Rescue (USA)"
+  name: "Saban's Power Rangers - Lightspeed Rescue"
+  saveName: "Saban's Power Rangers - Lightspeed Rescue (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141893,7 +149236,8 @@ SLUS-01114:
     multitap: false
     linkCable: false
 SLES-03730:
-  name: "Saban's Power Rangers - Time Force (Europe)"
+  name: "Saban's Power Rangers - Time Force"
+  saveName: "Saban's Power Rangers - Time Force (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141912,7 +149256,8 @@ SLES-03730:
     multitap: false
     linkCable: false
 SLUS-01351:
-  name: "Saban's Power Rangers - Time Force (USA)"
+  name: "Saban's Power Rangers - Time Force"
+  saveName: "Saban's Power Rangers - Time Force (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -141931,7 +149276,8 @@ SLUS-01351:
     multitap: false
     linkCable: false
 SLES-00597:
-  name: "Saban's Power Rangers Zeo - Full Tilt Battle Pinball (Europe)"
+  name: "Saban's Power Rangers Zeo - Full Tilt Battle Pinball"
+  saveName: "Saban's Power Rangers Zeo - Full Tilt Battle Pinball (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -141949,7 +149295,8 @@ SLES-00597:
     multitap: false
     linkCable: false
 SLUS-00256:
-  name: "Saban's Power Rangers Zeo - Full Tilt Battle Pinball (USA)"
+  name: "Saban's Power Rangers Zeo - Full Tilt Battle Pinball"
+  saveName: "Saban's Power Rangers Zeo - Full Tilt Battle Pinball (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -141967,7 +149314,8 @@ SLUS-00256:
     multitap: false
     linkCable: false
 SLPS-00739:
-  name: "Saber Marionette J - Battle Sabers (Japan)"
+  name: "Saber Marionette J - Battle Sabers"
+  saveName: "Saber Marionette J - Battle Sabers (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -141985,7 +149333,8 @@ SLPS-00739:
     multitap: false
     linkCable: false
 SLPS-00738:
-  name: "Saber Marionette J - Battle Sabers (Japan) (Shokai Genteiban)"
+  name: "Saber Marionette J - Battle Sabers (Shokai Genteiban)"
+  saveName: "Saber Marionette J - Battle Sabers (Japan) (Shokai Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -142003,7 +149352,8 @@ SLPS-00738:
     multitap: false
     linkCable: false
 SLES-03628:
-  name: "Sabrina l'Apprentie Sorciere et l'Horloge Cosmique (France)"
+  name: "Sabrina l'Apprentie Sorciere et l'Horloge Cosmique"
+  saveName: "Sabrina l'Apprentie Sorciere et l'Horloge Cosmique (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142022,7 +149372,8 @@ SLES-03628:
     multitap: false
     linkCable: false
 SLES-03561:
-  name: "Sabrina the Teenage Witch - A Twitch in Time! (Europe)"
+  name: "Sabrina the Teenage Witch - A Twitch in Time!"
+  saveName: "Sabrina the Teenage Witch - A Twitch in Time! (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142041,7 +149392,8 @@ SLES-03561:
     multitap: false
     linkCable: false
 SLUS-01208:
-  name: "Sabrina the Teenage Witch - A Twitch in Time! (USA)"
+  name: "Sabrina the Teenage Witch - A Twitch in Time!"
+  saveName: "Sabrina the Teenage Witch - A Twitch in Time! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -142122,7 +149474,8 @@ SLPS-02766:
     multitap: false
     linkCable: false
 SLPS-02611:
-  name: "Saibara Rieko no Mahjong Toriatama Kikou (Japan)"
+  name: "Saibara Rieko no Mahjong Toriatama Kikou"
+  saveName: "Saibara Rieko no Mahjong Toriatama Kikou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142141,7 +149494,8 @@ SLPS-02611:
     multitap: false
     linkCable: false
 SLPS-03482:
-  name: "Saikyou Ginsei Chess (Japan)"
+  name: "Saikyou Ginsei Chess"
+  saveName: "Saikyou Ginsei Chess (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142159,7 +149513,8 @@ SLPS-03482:
     multitap: false
     linkCable: false
 SLPS-03461:
-  name: "Saikyou Ginsei Mahjong (Japan)"
+  name: "Saikyou Ginsei Mahjong"
+  saveName: "Saikyou Ginsei Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142177,7 +149532,8 @@ SLPS-03461:
     multitap: false
     linkCable: false
 SLPS-03326:
-  name: "Saikyou Ginsei Shougi (Japan)"
+  name: "Saikyou Ginsei Shougi"
+  saveName: "Saikyou Ginsei Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142195,9 +149551,11 @@ SLPS-03326:
     multitap: false
     linkCable: false
 SLPS-03481:
-  name: "Saikyou Ginsei Shougi 2 (Japan)"
+  name: "Saikyou Ginsei Shougi 2"
+  saveName: "Saikyou Ginsei Shougi 2 (Japan)"
 SLPS-01679:
-  name: "Saikyou Toudai Shougi (Japan)"
+  name: "Saikyou Toudai Shougi"
+  saveName: "Saikyou Toudai Shougi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142219,7 +149577,8 @@ SLPS-01679:
     multitap: false
     linkCable: false
 SLPS-02397:
-  name: "Saikyou Toudai Shougi 2 (Japan)"
+  name: "Saikyou Toudai Shougi 2"
+  saveName: "Saikyou Toudai Shougi 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -142240,7 +149599,8 @@ SLPS-02397:
     multitap: false
     linkCable: false
 SLPS-01321:
-  name: "Saikyou no Igo (Japan)"
+  name: "Saikyou no Igo"
+  saveName: "Saikyou no Igo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142258,7 +149618,8 @@ SLPS-01321:
     multitap: false
     linkCable: false
 SLPS-01978:
-  name: "Saikyou no Shougi (Japan)"
+  name: "Saikyou no Shougi"
+  saveName: "Saikyou no Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142276,7 +149637,8 @@ SLPS-01978:
     multitap: false
     linkCable: false
 SLPS-01257:
-  name: "Saishuu Densha (Japan)"
+  name: "Saishuu Densha"
+  saveName: "Saishuu Densha (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -142297,7 +149659,8 @@ SLPS-01257:
     multitap: false
     linkCable: false
 SLPM-80215:
-  name: "Saishuu Densha (Japan) (Demo)"
+  name: "Saishuu Densha (Demo)"
+  saveName: "Saishuu Densha (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03327:
@@ -142319,7 +149682,8 @@ SLPS-03327:
     multitap: false
     linkCable: false
 SLUS-01381:
-  name: "Saiyuki - Journey West (USA)"
+  name: "Saiyuki - Journey West"
+  saveName: "Saiyuki - Journey West (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142357,7 +149721,8 @@ SLPM-87127:
     multitap: false
     linkCable: false
 SLPM-86339:
-  name: "Saiyuuki (Japan) (Rev 1)"
+  name: "Saiyuuki"
+  saveName: "Saiyuuki (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142379,7 +149744,8 @@ SLPM-86339:
     multitap: false
     linkCable: false
 SLPS-01152:
-  name: "Sakamoto Ryouma - Ishin Kaikoku (Japan)"
+  name: "Sakamoto Ryouma - Ishin Kaikoku"
+  saveName: "Sakamoto Ryouma - Ishin Kaikoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142397,7 +149763,8 @@ SLPS-01152:
     multitap: false
     linkCable: false
 SLPS-02808:
-  name: "Sakkyoku Surundamon - Dance Remix Hen (Japan)"
+  name: "Sakkyoku Surundamon - Dance Remix Hen"
+  saveName: "Sakkyoku Surundamon - Dance Remix Hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142416,7 +149783,8 @@ SLPS-02808:
     multitap: false
     linkCable: false
 SLPS-01740:
-  name: "Sakuma-shiki Jinsei Game (Japan)"
+  name: "Sakuma-shiki Jinsei Game"
+  saveName: "Sakuma-shiki Jinsei Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142434,7 +149802,8 @@ SLPS-01740:
     multitap: true
     linkCable: false
 SLPM-86037:
-  name: "Salamander Deluxe Pack Plus (Japan)"
+  name: "Salamander Deluxe Pack Plus"
+  saveName: "Salamander Deluxe Pack Plus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142452,7 +149821,8 @@ SLPM-86037:
     multitap: false
     linkCable: false
 SLPM-86820:
-  name: "Salaryman Champ - Tatakau Salaryman (Japan)"
+  name: "Salaryman Champ - Tatakau Salaryman"
+  saveName: "Salaryman Champ - Tatakau Salaryman (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142471,7 +149841,8 @@ SLPM-86820:
     multitap: true
     linkCable: false
 SLPS-02806:
-  name: "Salaryman Kintaro - The Game (Japan)"
+  name: "Salaryman Kintaro - The Game"
+  saveName: "Salaryman Kintaro - The Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142490,7 +149861,8 @@ SLPS-02806:
     multitap: false
     linkCable: false
 SLPS-03175:
-  name: "Salaryman Settai Mahjong (Japan)"
+  name: "Salaryman Settai Mahjong"
+  saveName: "Salaryman Settai Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142509,7 +149881,8 @@ SLPS-03175:
     multitap: false
     linkCable: false
 SLES-03753:
-  name: "Saltwater Sportfishing (Europe) (En,Fr,De,Es,It)"
+  name: "Saltwater Sportfishing"
+  saveName: "Saltwater Sportfishing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142532,7 +149905,8 @@ SLES-03753:
     multitap: false
     linkCable: false
 SLUS-01397:
-  name: "Saltwater Sportfishing (USA)"
+  name: "Saltwater Sportfishing"
+  saveName: "Saltwater Sportfishing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142551,7 +149925,8 @@ SLUS-01397:
     multitap: false
     linkCable: false
 SLUS-01063:
-  name: "Sammy Sosa High Heat Baseball 2001 (USA)"
+  name: "Sammy Sosa High Heat Baseball 2001"
+  saveName: "Sammy Sosa High Heat Baseball 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142570,7 +149945,8 @@ SLUS-01063:
     multitap: false
     linkCable: false
 SLUS-01064:
-  name: "Sammy Sosa Softball Slam (USA)"
+  name: "Sammy Sosa Softball Slam"
+  saveName: "Sammy Sosa Softball Slam (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142589,7 +149965,8 @@ SLUS-01064:
     multitap: false
     linkCable: false
 SLES-00217:
-  name: "Sampras Extreme Tennis (Europe) (En,Fr,De,Es,It)"
+  name: "Sampras Extreme Tennis"
+  saveName: "Sampras Extreme Tennis (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -142611,7 +149988,8 @@ SLES-00217:
     multitap: true
     linkCable: false
 SLPS-00594:
-  name: "Sampras Extreme Tennis (Japan)"
+  name: "Sampras Extreme Tennis"
+  saveName: "Sampras Extreme Tennis (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142650,7 +150028,8 @@ SLPS-03506:
     multitap: false
     linkCable: false
 SLPS-03505:
-  name: "Samurai Deeper Kyou (Japan)"
+  name: "Samurai Deeper Kyou"
+  saveName: "Samurai Deeper Kyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142671,7 +150050,8 @@ SLPS-03505:
     multitap: false
     linkCable: false
 SLUS-01039:
-  name: "Samurai Shodown - Warriors Rage (USA)"
+  name: "Samurai Shodown - Warriors Rage"
+  saveName: "Samurai Shodown - Warriors Rage (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
@@ -142695,7 +150075,8 @@ SLUS-01039:
     multitap: false
     linkCable: false
 SCES-00563:
-  name: "Samurai Shodown III (Europe)"
+  name: "Samurai Shodown III"
+  saveName: "Samurai Shodown III (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -142713,7 +150094,8 @@ SCES-00563:
     multitap: false
     linkCable: false
 SCUS-94206:
-  name: "Samurai Shodown III - Blades of Blood (USA)"
+  name: "Samurai Shodown III - Blades of Blood"
+  saveName: "Samurai Shodown III - Blades of Blood (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -142731,7 +150113,8 @@ SCUS-94206:
     multitap: false
     linkCable: false
 SLPS-01171:
-  name: "Samurai Spirits - Amakusa Kourin Special (Japan)"
+  name: "Samurai Spirits - Amakusa Kourin Special"
+  saveName: "Samurai Spirits - Amakusa Kourin Special (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -142755,7 +150138,8 @@ SLPS-01171:
     multitap: false
     linkCable: false
 SCPS-45209:
-  name: "Samurai Spirits - Kenkaku Shinan Pack (Japan, Asia)"
+  name: "Samurai Spirits - Kenkaku Shinan Pack"
+  saveName: "Samurai Spirits - Kenkaku Shinan Pack (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -142776,7 +150160,8 @@ SCPS-45209:
     multitap: false
     linkCable: false
 SLPS-00350:
-  name: "Samurai Spirits - Zankurou Musouken (Japan)"
+  name: "Samurai Spirits - Zankurou Musouken"
+  saveName: "Samurai Spirits - Zankurou Musouken (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -142815,7 +150200,8 @@ SLPS-91024:
     multitap: false
     linkCable: false
 SLES-01208:
-  name: "San Francisco Rush - Extreme Racing (Europe) (En,Fr,De,Es,It)"
+  name: "San Francisco Rush - Extreme Racing"
+  saveName: "San Francisco Rush - Extreme Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142839,7 +150225,8 @@ SLES-01208:
     multitap: false
     linkCable: true
 SLUS-00505:
-  name: "San Francisco Rush - Extreme Racing (USA)"
+  name: "San Francisco Rush - Extreme Racing"
+  saveName: "San Francisco Rush - Extreme Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -142859,7 +150246,8 @@ SLUS-00505:
     multitap: false
     linkCable: true
 SLPS-00731:
-  name: "Sangoku Musou (Japan)"
+  name: "Sangoku Musou"
+  saveName: "Sangoku Musou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -142877,11 +150265,13 @@ SLPS-00731:
     multitap: false
     linkCable: false
 SLPM-80085:
-  name: "Sangoku Musou (Japan) (Demo)"
+  name: "Sangoku Musou (Demo)"
+  saveName: "Sangoku Musou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86860:
-  name: "Sangoku Musou (Japan) (Rev 1)"
+  name: "Sangoku Musou"
+  saveName: "Sangoku Musou (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -142917,7 +150307,8 @@ SLPM-86151:
     multitap: false
     linkCable: false
 SLPM-86744:
-  name: "Sangokushi Eiketsuden (Japan)"
+  name: "Sangokushi Eiketsuden"
+  saveName: "Sangokushi Eiketsuden (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -142979,7 +150370,8 @@ SLPS-01596:
     multitap: false
     linkCable: false
 SLPM-86607:
-  name: "Sangokushi II (Japan)"
+  name: "Sangokushi II"
+  saveName: "Sangokushi II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143017,7 +150409,8 @@ SLPM-86747:
     multitap: false
     linkCable: false
 SLPM-87129:
-  name: "Sangokushi III (Japan)"
+  name: "Sangokushi III"
+  saveName: "Sangokushi III (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143036,7 +150429,8 @@ SLPM-87129:
     multitap: false
     linkCable: false
 SLPS-00114:
-  name: "Sangokushi IV (Japan)"
+  name: "Sangokushi IV"
+  saveName: "Sangokushi IV (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143054,7 +150448,8 @@ SLPS-00114:
     multitap: false
     linkCable: false
 SLPS-91052:
-  name: "Sangokushi IV (Japan) (Rev 1)"
+  name: "Sangokushi IV"
+  saveName: "Sangokushi IV (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -143108,7 +150503,8 @@ SLPS-00979:
     multitap: false
     linkCable: false
 SLPM-86205:
-  name: "Sangokushi Koumeiden (Japan)"
+  name: "Sangokushi Koumeiden"
+  saveName: "Sangokushi Koumeiden (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -143165,7 +150561,8 @@ SLPS-00474:
     multitap: false
     linkCable: false
 SLPM-86171:
-  name: "Sangokushi Returns (Japan)"
+  name: "Sangokushi Returns"
+  saveName: "Sangokushi Returns (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143183,7 +150580,8 @@ SLPM-86171:
     multitap: false
     linkCable: false
 SLPS-00703:
-  name: "Sangokushi V (Japan)"
+  name: "Sangokushi V"
+  saveName: "Sangokushi V (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143255,7 +150653,8 @@ SLPS-01466:
     multitap: false
     linkCable: false
 SCPS-45327:
-  name: "Sangokushi VI (Japan, Asia)"
+  name: "Sangokushi VI"
+  saveName: "Sangokushi VI (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -143295,7 +150694,8 @@ SLPM-86285:
     multitap: false
     linkCable: false
 SLPM-86312:
-  name: "Sangokushi VI with Power-Up Kit (Japan)"
+  name: "Sangokushi VI with Power-Up Kit"
+  saveName: "Sangokushi VI with Power-Up Kit (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143313,7 +150713,8 @@ SLPM-86312:
     multitap: false
     linkCable: false
 SLPM-86728:
-  name: "Sangokushi VII (Japan)"
+  name: "Sangokushi VII"
+  saveName: "Sangokushi VII (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143332,7 +150733,8 @@ SLPM-86728:
     multitap: false
     linkCable: false
 SCPS-45003:
-  name: "Sanguozhi IV (Asia) (En,Zh)"
+  name: "Sanguozhi IV"
+  saveName: "Sanguozhi IV (Asia) (En,Zh)"
   controllers:
     - DigitalController
   metadata:
@@ -143351,7 +150753,8 @@ SCPS-45003:
     multitap: false
     linkCable: false
 SCPS-45128:
-  name: "Sanguozhi V (Asia)"
+  name: "Sanguozhi V"
+  saveName: "Sanguozhi V (Asia)"
   controllers:
     - DigitalController
   metadata:
@@ -143369,7 +150772,8 @@ SCPS-45128:
     multitap: false
     linkCable: false
 SLPS-00425:
-  name: "Sankyo Fever - Downtown Geki (Japan)"
+  name: "Sankyo Fever - Downtown Geki"
+  saveName: "Sankyo Fever - Downtown Geki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143387,7 +150791,8 @@ SLPS-00425:
     multitap: false
     linkCable: false
 SLPS-00264:
-  name: "Sankyo Fever - Jikki Simulation (Japan)"
+  name: "Sankyo Fever - Jikki Simulation"
+  saveName: "Sankyo Fever - Jikki Simulation (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143405,7 +150810,8 @@ SLPS-00264:
     multitap: false
     linkCable: false
 SLPS-01176:
-  name: "Sankyo Fever - Jikki Simulation Vol. 2 (Japan)"
+  name: "Sankyo Fever - Jikki Simulation Vol. 2"
+  saveName: "Sankyo Fever - Jikki Simulation Vol. 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143424,7 +150830,8 @@ SLPS-01176:
     multitap: false
     linkCable: false
 SLPS-01393:
-  name: "Sankyo Fever - Jikki Simulation Vol. 3 (Japan)"
+  name: "Sankyo Fever - Jikki Simulation Vol. 3"
+  saveName: "Sankyo Fever - Jikki Simulation Vol. 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143462,9 +150869,11 @@ SLPS-91494:
     multitap: false
     linkCable: false
 SLPM-80065:
-  name: "Sanmiittai (Japan)"
+  name: "Sanmiittai"
+  saveName: "Sanmiittai (Japan)"
 SLES-04023:
-  name: "Santa Claus Saves the Earth (Europe)"
+  name: "Santa Claus Saves the Earth"
+  saveName: "Santa Claus Saves the Earth (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143483,7 +150892,8 @@ SLES-04023:
     multitap: false
     linkCable: false
 SLES-02919:
-  name: "Sanvein (Europe)"
+  name: "Sanvein"
+  saveName: "Sanvein (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143502,7 +150912,8 @@ SLES-02919:
     multitap: false
     linkCable: false
 SLPS-02164:
-  name: "Sanyo Pachinko Paradise (Japan)"
+  name: "Sanyo Pachinko Paradise"
+  saveName: "Sanyo Pachinko Paradise (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143521,7 +150932,8 @@ SLPS-02164:
     multitap: false
     linkCable: false
 SLPS-02389:
-  name: "Sanyo Pachinko Paradise 2 - Umi Monogatari Special (Japan)"
+  name: "Sanyo Pachinko Paradise 2 - Umi Monogatari Special"
+  saveName: "Sanyo Pachinko Paradise 2 - Umi Monogatari Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143540,7 +150952,8 @@ SLPS-02389:
     multitap: false
     linkCable: false
 SLPS-02633:
-  name: "Sanyo Pachinko Paradise 3 - Wan Wan Daikoushin (Japan)"
+  name: "Sanyo Pachinko Paradise 3 - Wan Wan Daikoushin"
+  saveName: "Sanyo Pachinko Paradise 3 - Wan Wan Daikoushin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143559,7 +150972,8 @@ SLPS-02633:
     multitap: false
     linkCable: false
 SLPS-02988:
-  name: "Sanyo Pachinko Paradise 4 - Sushiya da Gen-san!! (Japan)"
+  name: "Sanyo Pachinko Paradise 4 - Sushiya da Gen-san!!"
+  saveName: "Sanyo Pachinko Paradise 4 - Sushiya da Gen-san!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143578,7 +150992,8 @@ SLPS-02988:
     multitap: false
     linkCable: false
 SLPS-03190:
-  name: "Sanyo Pachinko Paradise 5 - Uki Uki Tairyoubata (Japan)"
+  name: "Sanyo Pachinko Paradise 5 - Uki Uki Tairyoubata"
+  saveName: "Sanyo Pachinko Paradise 5 - Uki Uki Tairyoubata (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143597,7 +151012,8 @@ SLPS-03190:
     multitap: false
     linkCable: false
 SLPS-02761:
-  name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan) (Disc 1)"
+  name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Disc 1)"
+  saveName: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan) (Disc 1)"
   discSet:
     name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan)"
     serials:
@@ -143622,7 +151038,8 @@ SLPS-02761:
     multitap: false
     linkCable: false
 SLPS-02762:
-  name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan) (Disc 2)"
+  name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Disc 2)"
+  saveName: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan) (Disc 2)"
   discSet:
     name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan)"
     serials:
@@ -143647,7 +151064,8 @@ SLPS-02762:
     multitap: false
     linkCable: false
 SLPS-02763:
-  name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan) (Disc 3)"
+  name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Disc 3)"
+  saveName: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan) (Disc 3)"
   discSet:
     name: "Saraba Uchuu Senkan Yamato - Ai no Senshi-tachi (Japan)"
     serials:
@@ -143690,7 +151108,8 @@ SCPS-45411:
     multitap: false
     linkCable: false
 SCPS-10091:
-  name: "Saru! Get You! (Japan)"
+  name: "Saru! Get You!"
+  saveName: "Saru! Get You! (Japan)"
   controllers:
     - AnalogController
   metadata:
@@ -143708,7 +151127,8 @@ SCPS-10091:
     multitap: false
     linkCable: false
 PAPX-90079:
-  name: "Saru! Get You! (Japan) (Demo)"
+  name: "Saru! Get You! (Demo)"
+  saveName: "Saru! Get You! (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143730,7 +151150,8 @@ PAPX-90079:
     multitap: false
     linkCable: false
 SCPS-91196:
-  name: "Saru! Get You! (Japan) (Rev 1)"
+  name: "Saru! Get You!"
+  saveName: "Saru! Get You! (Japan) (Rev 1)"
   controllers:
     - AnalogController
   metadata:
@@ -143766,7 +151187,8 @@ SCPS-91331:
     multitap: false
     linkCable: false
 SLPS-01203:
-  name: "SatelliTV (Japan)"
+  name: "SatelliTV"
+  saveName: "SatelliTV (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143784,7 +151206,8 @@ SLPS-01203:
     multitap: false
     linkCable: false
 SLPS-00613:
-  name: "Satomi no Nazo (Japan)"
+  name: "Satomi no Nazo"
+  saveName: "Satomi no Nazo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143802,7 +151225,8 @@ SLPS-00613:
     multitap: false
     linkCable: false
 SLES-04177:
-  name: "Schnappi - Das kleine Krokodil - 3 Fun-Games (Germany)"
+  name: "Schnappi - Das kleine Krokodil - 3 Fun-Games"
+  saveName: "Schnappi - Das kleine Krokodil - 3 Fun-Games (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143821,7 +151245,8 @@ SLES-04177:
     multitap: false
     linkCable: false
 SLPS-00780:
-  name: "Schroedinger no Neko - Die Katze von Schroedinger (Japan)"
+  name: "Schroedinger no Neko - Die Katze von Schroedinger"
+  saveName: "Schroedinger no Neko - Die Katze von Schroedinger (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -143857,7 +151282,8 @@ SCPS-45075:
     multitap: false
     linkCable: false
 LSP-99016101:
-  name: "Science Is Elementary 1 (USA)"
+  name: "Science Is Elementary 1"
+  saveName: "Science Is Elementary 1 (USA)"
   codes:
     - LSP99016101
   metadata:
@@ -143867,7 +151293,8 @@ LSP-99016101:
     languages:
       - English
 LSP-99016201:
-  name: "Science Is Elementary 2 (USA)"
+  name: "Science Is Elementary 2"
+  saveName: "Science Is Elementary 2 (USA)"
   codes:
     - LSP99016201
   metadata:
@@ -143877,7 +151304,8 @@ LSP-99016201:
     languages:
       - English
 LSP-99016301:
-  name: "Science Is Elementary 3 (USA)"
+  name: "Science Is Elementary 3"
+  saveName: "Science Is Elementary 3 (USA)"
   codes:
     - LSP99016301
   metadata:
@@ -143887,7 +151315,8 @@ LSP-99016301:
     languages:
       - English
 SLES-03703:
-  name: "Scooby-Doo and the Cyber Chase (Europe)"
+  name: "Scooby-Doo and the Cyber Chase"
+  saveName: "Scooby-Doo and the Cyber Chase (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143906,7 +151335,8 @@ SLES-03703:
     multitap: false
     linkCable: false
 SLUS-01396:
-  name: "Scooby-Doo and the Cyber Chase (USA)"
+  name: "Scooby-Doo and the Cyber Chase"
+  saveName: "Scooby-Doo and the Cyber Chase (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1520-g0aefdf47"
@@ -143928,11 +151358,13 @@ SLUS-01396:
     multitap: false
     linkCable: false
 SLUS-90098:
-  name: "Scooby-Doo and the Cyber Chase (USA) (Demo)"
+  name: "Scooby-Doo and the Cyber Chase (Demo)"
+  saveName: "Scooby-Doo and the Cyber Chase (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03733:
-  name: "Scooby-Doo et la Cybertraque (France)"
+  name: "Scooby-Doo et la Cybertraque"
+  saveName: "Scooby-Doo et la Cybertraque (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143951,7 +151383,8 @@ SLES-03733:
     multitap: false
     linkCable: false
 SLES-03770:
-  name: "Scooter Racing (Europe)"
+  name: "Scooter Racing"
+  saveName: "Scooter Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143971,7 +151404,8 @@ SLES-03770:
     multitap: false
     linkCable: false
 SLES-03642:
-  name: "Scrabble (Europe) (En,De,Es)"
+  name: "Scrabble"
+  saveName: "Scrabble (Europe) (En,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -143992,7 +151426,8 @@ SLES-03642:
     multitap: true
     linkCable: false
 SLES-03751:
-  name: "Scrabble (France)"
+  name: "Scrabble"
+  saveName: "Scrabble (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144011,7 +151446,8 @@ SLES-03751:
     multitap: true
     linkCable: false
 SLUS-00903:
-  name: "Scrabble (USA)"
+  name: "Scrabble"
+  saveName: "Scrabble (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144030,7 +151466,8 @@ SLUS-00903:
     multitap: false
     linkCable: false
 SLPS-02757:
-  name: "Screen (Japan)"
+  name: "Screen"
+  saveName: "Screen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144049,7 +151486,8 @@ SLPS-02757:
     multitap: false
     linkCable: false
 SLUS-01149:
-  name: "Sea-Doo Hydro Cross (USA)"
+  name: "Sea-Doo Hydro Cross"
+  saveName: "Sea-Doo Hydro Cross (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144069,7 +151507,8 @@ SLUS-01149:
     multitap: false
     linkCable: false
 SLPS-00356:
-  name: "SeaBass Fishing (Japan)"
+  name: "SeaBass Fishing"
+  saveName: "SeaBass Fishing (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144087,7 +151526,8 @@ SLPS-00356:
     multitap: false
     linkCable: false
 SLPS-00992:
-  name: "SeaBass Fishing 2 (Japan)"
+  name: "SeaBass Fishing 2"
+  saveName: "SeaBass Fishing 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144105,7 +151545,8 @@ SLPS-00992:
     multitap: false
     linkCable: false
 LSP-020160:
-  name: "Secret of Googol 1a, The - Reshaping Googol - The Submarine (USA)"
+  name: "Secret of Googol 1a, The - Reshaping Googol - The Submarine"
+  saveName: "Secret of Googol 1a, The - Reshaping Googol - The Submarine (USA)"
   controllers:
     - DigitalController
   codes:
@@ -144127,7 +151568,8 @@ LSP-020160:
     multitap: false
     linkCable: false
 LSP-020150:
-  name: "Secret of Googol 1b, The - Reshaping Googol - The Tower (USA)"
+  name: "Secret of Googol 1b, The - Reshaping Googol - The Tower"
+  saveName: "Secret of Googol 1b, The - Reshaping Googol - The Tower (USA)"
   controllers:
     - DigitalController
   codes:
@@ -144149,7 +151591,8 @@ LSP-020150:
     multitap: false
     linkCable: false
 LSP-020180:
-  name: "Secret of Googol 2a, The - Reshaping Googol - The Castle (USA)"
+  name: "Secret of Googol 2a, The - Reshaping Googol - The Castle"
+  saveName: "Secret of Googol 2a, The - Reshaping Googol - The Castle (USA)"
   codes:
     - LSP-020180
     - LSP02018001
@@ -144161,7 +151604,8 @@ LSP-020180:
     languages:
       - English
 LSP-020170:
-  name: "Secret of Googol 2b, The - Reshaping Googol - Under the Ocean (USA)"
+  name: "Secret of Googol 2b, The - Reshaping Googol - Under the Ocean"
+  saveName: "Secret of Googol 2b, The - Reshaping Googol - Under the Ocean (USA)"
   codes:
     - LSP-020170
     - LSP02017001
@@ -144173,7 +151617,8 @@ LSP-020170:
     languages:
       - English
 LSP-020260:
-  name: "Secret of Googol 3, The - The Googol Counting Fair - Midways (USA)"
+  name: "Secret of Googol 3, The - The Googol Counting Fair - Midways"
+  saveName: "Secret of Googol 3, The - The Googol Counting Fair - Midways (USA)"
   codes:
     - LSP-020260
     - LSP02026001
@@ -144185,7 +151630,8 @@ LSP-020260:
     languages:
       - English
 LSP-020280:
-  name: "Secret of Googol 4, The - The Googol Counting Fair - Corral & Fun House (USA)"
+  name: "Secret of Googol 4, The - The Googol Counting Fair - Corral & Fun House"
+  saveName: "Secret of Googol 4, The - The Googol Counting Fair - Corral & Fun House (USA)"
   codes:
     - LSP-020280
     - LSP02028001
@@ -144197,7 +151643,8 @@ LSP-020280:
     languages:
       - English
 LSP-020450:
-  name: "Secret of Googol 5, The - Googolfest - Party Isle & Toy Isle (USA)"
+  name: "Secret of Googol 5, The - Googolfest - Party Isle & Toy Isle"
+  saveName: "Secret of Googol 5, The - Googolfest - Party Isle & Toy Isle (USA)"
   codes:
     - LSP-020450
     - LSP02045001
@@ -144209,7 +151656,8 @@ LSP-020450:
     languages:
       - English
 LSP-020570:
-  name: "Secret of Googol 6, The - Googolfest - Arcade Isle & Moon Feast Isle (USA)"
+  name: "Secret of Googol 6, The - Googolfest - Arcade Isle & Moon Feast Isle"
+  saveName: "Secret of Googol 6, The - Googolfest - Arcade Isle & Moon Feast Isle (USA)"
   codes:
     - LSP-020570
     - LSP02057001
@@ -144221,7 +151669,8 @@ LSP-020570:
     languages:
       - English
 LSP-020650:
-  name: "Secret of Googol 7, The - Eggs All Around - Egg Trek & Balloon Picnic (USA)"
+  name: "Secret of Googol 7, The - Eggs All Around - Egg Trek & Balloon Picnic"
+  saveName: "Secret of Googol 7, The - Eggs All Around - Egg Trek & Balloon Picnic (USA)"
   codes:
     - LSP-020650
     - LSP02065001
@@ -144233,7 +151682,8 @@ LSP-020650:
     languages:
       - English
 LSP-020780:
-  name: "Secret of Googol 8, The - Googol Gulch - General Store & Math Arcade (USA)"
+  name: "Secret of Googol 8, The - Googol Gulch - General Store & Math Arcade"
+  saveName: "Secret of Googol 8, The - Googol Gulch - General Store & Math Arcade (USA)"
   codes:
     - LSP02078001
   metadata:
@@ -144243,7 +151693,8 @@ LSP-020780:
     languages:
       - English
 SLPM-86230:
-  name: "Segare Ijiri (Japan)"
+  name: "Segare Ijiri"
+  saveName: "Segare Ijiri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144262,11 +151713,13 @@ SLPM-86230:
     multitap: false
     linkCable: false
 SLPM-80426:
-  name: "Segare Ijiri (Japan) (Demo)"
+  name: "Segare Ijiri (Demo)"
+  saveName: "Segare Ijiri (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02323:
-  name: "Seikai no Monshou (Japan)"
+  name: "Seikai no Monshou"
+  saveName: "Seikai no Monshou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144285,7 +151738,8 @@ SLPS-02323:
     multitap: false
     linkCable: false
 SCPS-45416:
-  name: "Seiken Densetsu - Legend of Mana (Japan, Asia)"
+  name: "Seiken Densetsu - Legend of Mana"
+  saveName: "Seiken Densetsu - Legend of Mana (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144310,7 +151764,8 @@ SCPS-45416:
     multitap: false
     linkCable: false
 SLPS-00483:
-  name: "Seikon no Joka - Hikari to Yami no Seioujo (Japan)"
+  name: "Seikon no Joka - Hikari to Yami no Seioujo"
+  saveName: "Seikon no Joka - Hikari to Yami no Seioujo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144328,7 +151783,8 @@ SLPS-00483:
     multitap: false
     linkCable: false
 SLPS-01271:
-  name: "Seirei Shoukan - Princess of Darkness (Japan)"
+  name: "Seirei Shoukan - Princess of Darkness"
+  saveName: "Seirei Shoukan - Princess of Darkness (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144346,11 +151802,13 @@ SLPS-01271:
     multitap: false
     linkCable: false
 SLPM-80271:
-  name: "Seirei Shoukan - Princess of Darkness (Japan) (Demo)"
+  name: "Seirei Shoukan - Princess of Darkness (Demo)"
+  saveName: "Seirei Shoukan - Princess of Darkness (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02652:
-  name: "Seireiki Rayblade (Japan)"
+  name: "Seireiki Rayblade"
+  saveName: "Seireiki Rayblade (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144368,7 +151826,8 @@ SLPS-02652:
     multitap: false
     linkCable: false
 SLPS-00599:
-  name: "Seireki 1999 - Pharaoh no Fukkatsu (Japan)"
+  name: "Seireki 1999 - Pharaoh no Fukkatsu"
+  saveName: "Seireki 1999 - Pharaoh no Fukkatsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144386,7 +151845,8 @@ SLPS-00599:
     multitap: false
     linkCable: false
 SLPM-86191:
-  name: "Seishoujo Kantai Virgin Fleet (Japan)"
+  name: "Seishoujo Kantai Virgin Fleet"
+  saveName: "Seishoujo Kantai Virgin Fleet (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144405,9 +151865,11 @@ SLPM-86191:
     multitap: false
     linkCable: false
 SLPS-03325:
-  name: "Sekai Saikyou Ginsei Igo (Japan)"
+  name: "Sekai Saikyou Ginsei Igo"
+  saveName: "Sekai Saikyou Ginsei Igo (Japan)"
 SLPS-03480:
-  name: "Sekai Saikyou Ginsei Igo 2 (Japan)"
+  name: "Sekai Saikyou Ginsei Igo 2"
+  saveName: "Sekai Saikyou Ginsei Igo 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144425,7 +151887,8 @@ SLPS-03480:
     multitap: false
     linkCable: false
 SLPS-03563:
-  name: "Sekai Saikyou Ginsei Igo 3 (Japan)"
+  name: "Sekai Saikyou Ginsei Igo 3"
+  saveName: "Sekai Saikyou Ginsei Igo 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144443,7 +151906,8 @@ SLPS-03563:
     multitap: false
     linkCable: false
 SCPS-10011:
-  name: "Sengoku Cyber - Fujimaru Jigokuhen (Japan)"
+  name: "Sengoku Cyber - Fujimaru Jigokuhen"
+  saveName: "Sengoku Cyber - Fujimaru Jigokuhen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144461,7 +151925,8 @@ SCPS-10011:
     multitap: false
     linkCable: false
 SLPS-03151:
-  name: "Sengoku Mugen (Japan)"
+  name: "Sengoku Mugen"
+  saveName: "Sengoku Mugen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144480,7 +151945,8 @@ SLPS-03151:
     multitap: false
     linkCable: false
 SLPS-02736:
-  name: "Senkai Taisen - TV Animation Senkaiden Houshin Engi yori (Japan)"
+  name: "Senkai Taisen - TV Animation Senkaiden Houshin Engi yori"
+  saveName: "Senkai Taisen - TV Animation Senkaiden Houshin Engi yori (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144499,7 +151965,8 @@ SLPS-02736:
     multitap: false
     linkCable: false
 SLPS-03176:
-  name: "Senkai Tsuuroku Seishi - TV Animation Senkaiden Houshin Engi yori (Japan)"
+  name: "Senkai Tsuuroku Seishi - TV Animation Senkaiden Houshin Engi yori"
+  saveName: "Senkai Tsuuroku Seishi - TV Animation Senkaiden Houshin Engi yori (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144518,7 +151985,8 @@ SLPS-03176:
     multitap: false
     linkCable: false
 SLPS-00427:
-  name: "Senran (Japan)"
+  name: "Senran"
+  saveName: "Senran (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144536,7 +152004,8 @@ SLPS-00427:
     multitap: false
     linkCable: false
 SLPS-91422:
-  name: "Senryaku Shidan - Tora! Tora! Tora! Rikusen-hen (Japan)"
+  name: "Senryaku Shidan - Tora! Tora! Tora! Rikusen-hen"
+  saveName: "Senryaku Shidan - Tora! Tora! Tora! Rikusen-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144593,7 +152062,8 @@ SLPS-02936:
     multitap: false
     linkCable: false
 SLPS-00142:
-  name: "Senryaku Shougi (Japan)"
+  name: "Senryaku Shougi"
+  saveName: "Senryaku Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144611,7 +152081,8 @@ SLPS-00142:
     multitap: false
     linkCable: false
 SLES-01021:
-  name: "Sensible Soccer (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Sensible Soccer"
+  saveName: "Sensible Soccer (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144635,7 +152106,8 @@ SLES-01021:
     multitap: false
     linkCable: false
 SCUS-94110:
-  name: "Sentient (USA)"
+  name: "Sentient"
+  saveName: "Sentient (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -144656,7 +152128,8 @@ SCUS-94110:
     multitap: false
     linkCable: false
 SLES-00106:
-  name: "Sentient - Explore the Infinite (Europe)"
+  name: "Sentient - Explore the Infinite"
+  saveName: "Sentient - Explore the Infinite (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -144674,7 +152147,8 @@ SLES-00106:
     multitap: false
     linkCable: false
 SLPS-03184:
-  name: "Sentimental Graffiti (Japan)"
+  name: "Sentimental Graffiti"
+  saveName: "Sentimental Graffiti (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144692,7 +152166,8 @@ SLPS-03184:
     multitap: false
     linkCable: false
 SLPS-03183:
-  name: "Sentimental Graffiti - Yakusoku (Japan)"
+  name: "Sentimental Graffiti - Yakusoku"
+  saveName: "Sentimental Graffiti - Yakusoku (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144710,7 +152185,8 @@ SLPS-03183:
     multitap: false
     linkCable: false
 SLPS-01473:
-  name: "Sentimental Journey (Japan)"
+  name: "Sentimental Journey"
+  saveName: "Sentimental Journey (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144728,7 +152204,8 @@ SLPS-01473:
     multitap: true
     linkCable: false
 SLES-01051:
-  name: "Sentinel Returns (Europe) (En,Fr,De,Es,It)"
+  name: "Sentinel Returns"
+  saveName: "Sentinel Returns (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -144751,7 +152228,8 @@ SLES-01051:
     multitap: false
     linkCable: false
 SLUS-00604:
-  name: "Sentinel Returns (USA)"
+  name: "Sentinel Returns"
+  saveName: "Sentinel Returns (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -144770,7 +152248,8 @@ SLUS-00604:
     multitap: false
     linkCable: false
 SLPS-00124:
-  name: "Sento Monogatari - Sono I (Japan)"
+  name: "Sento Monogatari - Sono I"
+  saveName: "Sento Monogatari - Sono I (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144788,7 +152267,8 @@ SLPS-00124:
     multitap: false
     linkCable: false
 SCPS-10015:
-  name: "Sentou Kokka - Air Land Battle (Japan)"
+  name: "Sentou Kokka - Air Land Battle"
+  saveName: "Sentou Kokka - Air Land Battle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144806,7 +152286,8 @@ SCPS-10015:
     multitap: false
     linkCable: false
 SCPS-10034:
-  name: "Sentou Kokka Kai - Improved (Japan)"
+  name: "Sentou Kokka Kai - Improved"
+  saveName: "Sentou Kokka Kai - Improved (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -144842,7 +152323,8 @@ SCPS-91156:
     multitap: false
     linkCable: false
 SLPS-01940:
-  name: "Septentrion - Out of the Blue (Japan)"
+  name: "Septentrion - Out of the Blue"
+  saveName: "Septentrion - Out of the Blue (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144861,7 +152343,8 @@ SLPS-01940:
     multitap: false
     linkCable: false
 SLPM-86612:
-  name: "Septentrion - Out of the Blue (Japan) (Major Wave)"
+  name: "Septentrion - Out of the Blue (Major Wave)"
+  saveName: "Septentrion - Out of the Blue (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144880,7 +152363,8 @@ SLPM-86612:
     multitap: false
     linkCable: false
 SLPS-01603:
-  name: "Serial Experiments Lain (Japan) (Disc 1)"
+  name: "Serial Experiments Lain (Disc 1)"
+  saveName: "Serial Experiments Lain (Japan) (Disc 1)"
   discSet:
     name: "Serial Experiments Lain (Japan)"
     serials:
@@ -144904,7 +152388,8 @@ SLPS-01603:
     multitap: false
     linkCable: false
 SLPS-01604:
-  name: "Serial Experiments Lain (Japan) (Disc 2)"
+  name: "Serial Experiments Lain (Disc 2)"
+  saveName: "Serial Experiments Lain (Japan) (Disc 2)"
   discSet:
     name: "Serial Experiments Lain (Japan)"
     serials:
@@ -144928,7 +152413,8 @@ SLPS-01604:
     multitap: false
     linkCable: false
 SLES-02510:
-  name: "Sesame Street - Elmo's Letter Adventure (Europe)"
+  name: "Sesame Street - Elmo's Letter Adventure"
+  saveName: "Sesame Street - Elmo's Letter Adventure (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144950,7 +152436,8 @@ SLES-02510:
     multitap: false
     linkCable: false
 SLUS-00621:
-  name: "Sesame Street - Elmo's Letter Adventure (USA)"
+  name: "Sesame Street - Elmo's Letter Adventure"
+  saveName: "Sesame Street - Elmo's Letter Adventure (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144972,7 +152459,8 @@ SLUS-00621:
     multitap: false
     linkCable: false
 SLES-02511:
-  name: "Sesame Street - Elmo's Number Journey (Europe)"
+  name: "Sesame Street - Elmo's Number Journey"
+  saveName: "Sesame Street - Elmo's Number Journey (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -144991,7 +152479,8 @@ SLES-02511:
     multitap: false
     linkCable: false
 SLUS-00622:
-  name: "Sesame Street - Elmo's Number Journey (USA)"
+  name: "Sesame Street - Elmo's Number Journey"
+  saveName: "Sesame Street - Elmo's Number Journey (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145010,7 +152499,8 @@ SLUS-00622:
     multitap: false
     linkCable: false
 SLES-03180:
-  name: "Sesame Street Sports (Europe)"
+  name: "Sesame Street Sports"
+  saveName: "Sesame Street Sports (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145029,7 +152519,8 @@ SLES-03180:
     multitap: false
     linkCable: false
 SLUS-01180:
-  name: "Sesame Street Sports (USA)"
+  name: "Sesame Street Sports"
+  saveName: "Sesame Street Sports (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145048,7 +152539,8 @@ SLUS-01180:
     multitap: false
     linkCable: false
 SLPM-86009:
-  name: "Sexy Parodius (Japan)"
+  name: "Sexy Parodius"
+  saveName: "Sexy Parodius (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -145069,7 +152561,8 @@ SLPM-86009:
     multitap: false
     linkCable: false
 SCES-02176:
-  name: "Sfida al Tetris Magico (Italy)"
+  name: "Sfida al Tetris Magico"
+  saveName: "Sfida al Tetris Magico (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145088,7 +152581,8 @@ SCES-02176:
     multitap: false
     linkCable: false
 SCPS-10139:
-  name: "Shachou Eiyuuden (Japan) (Ja,Zh)"
+  name: "Shachou Eiyuuden"
+  saveName: "Shachou Eiyuuden (Japan) (Ja,Zh)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145108,7 +152602,8 @@ SCPS-10139:
     multitap: false
     linkCable: false
 SLES-01359:
-  name: "Shadow Gunner - The Robot Wars (Europe) (En,Fr,De,Es,It)"
+  name: "Shadow Gunner - The Robot Wars"
+  saveName: "Shadow Gunner - The Robot Wars (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145131,7 +152626,8 @@ SLES-01359:
     multitap: false
     linkCable: false
 SCES-02099:
-  name: "Shadow Madness (Europe) (Disc 1)"
+  name: "Shadow Madness (Disc 1)"
+  saveName: "Shadow Madness (Europe) (Disc 1)"
   discSet:
     name: "Shadow Madness (Europe)"
     serials:
@@ -145155,7 +152651,8 @@ SCES-02099:
     multitap: false
     linkCable: false
 SCES-12099:
-  name: "Shadow Madness (Europe) (Disc 2)"
+  name: "Shadow Madness (Disc 2)"
+  saveName: "Shadow Madness (Europe) (Disc 2)"
   discSet:
     name: "Shadow Madness (Europe)"
     serials:
@@ -145179,7 +152676,8 @@ SCES-12099:
     multitap: false
     linkCable: false
 SCES-02100:
-  name: "Shadow Madness (France) (Disc 1)"
+  name: "Shadow Madness (Disc 1)"
+  saveName: "Shadow Madness (France) (Disc 1)"
   discSet:
     name: "Shadow Madness (France)"
     serials:
@@ -145203,7 +152701,8 @@ SCES-02100:
     multitap: false
     linkCable: false
 SCES-12100:
-  name: "Shadow Madness (France) (Disc 2)"
+  name: "Shadow Madness (Disc 2)"
+  saveName: "Shadow Madness (France) (Disc 2)"
   discSet:
     name: "Shadow Madness (France)"
     serials:
@@ -145227,7 +152726,8 @@ SCES-12100:
     multitap: false
     linkCable: false
 SCES-02101:
-  name: "Shadow Madness (Germany) (Disc 1)"
+  name: "Shadow Madness (Disc 1)"
+  saveName: "Shadow Madness (Germany) (Disc 1)"
   discSet:
     name: "Shadow Madness (Germany)"
     serials:
@@ -145251,7 +152751,8 @@ SCES-02101:
     multitap: false
     linkCable: false
 SCES-12101:
-  name: "Shadow Madness (Germany) (Disc 2)"
+  name: "Shadow Madness (Disc 2)"
+  saveName: "Shadow Madness (Germany) (Disc 2)"
   discSet:
     name: "Shadow Madness (Germany)"
     serials:
@@ -145275,7 +152776,8 @@ SCES-12101:
     multitap: false
     linkCable: false
 SCES-02102:
-  name: "Shadow Madness (Italy) (Disc 1)"
+  name: "Shadow Madness (Disc 1)"
+  saveName: "Shadow Madness (Italy) (Disc 1)"
   discSet:
     name: "Shadow Madness (Italy)"
     serials:
@@ -145299,7 +152801,8 @@ SCES-02102:
     multitap: false
     linkCable: false
 SCES-12102:
-  name: "Shadow Madness (Italy) (Disc 2)"
+  name: "Shadow Madness (Disc 2)"
+  saveName: "Shadow Madness (Italy) (Disc 2)"
   discSet:
     name: "Shadow Madness (Italy)"
     serials:
@@ -145323,7 +152826,8 @@ SCES-12102:
     multitap: false
     linkCable: false
 SCES-02103:
-  name: "Shadow Madness (Spain) (Disc 1)"
+  name: "Shadow Madness (Disc 1)"
+  saveName: "Shadow Madness (Spain) (Disc 1)"
   discSet:
     name: "Shadow Madness (Spain)"
     serials:
@@ -145347,7 +152851,8 @@ SCES-02103:
     multitap: false
     linkCable: false
 SCES-12103:
-  name: "Shadow Madness (Spain) (Disc 2)"
+  name: "Shadow Madness (Disc 2)"
+  saveName: "Shadow Madness (Spain) (Disc 2)"
   discSet:
     name: "Shadow Madness (Spain)"
     serials:
@@ -145371,11 +152876,13 @@ SCES-12103:
     multitap: false
     linkCable: false
 SLUS-90031:
-  name: "Shadow Madness (USA) (Demo)"
+  name: "Shadow Madness (Demo)"
+  saveName: "Shadow Madness (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00468:
-  name: "Shadow Madness (USA) (Disc 1)"
+  name: "Shadow Madness (Disc 1)"
+  saveName: "Shadow Madness (USA) (Disc 1)"
   discSet:
     name: "Shadow Madness (USA)"
     serials:
@@ -145399,7 +152906,8 @@ SLUS-00468:
     multitap: false
     linkCable: false
 SLUS-00718:
-  name: "Shadow Madness (USA) (Disc 2)"
+  name: "Shadow Madness (Disc 2)"
+  saveName: "Shadow Madness (USA) (Disc 2)"
   discSet:
     name: "Shadow Madness (USA)"
     serials:
@@ -145423,7 +152931,8 @@ SLUS-00718:
     multitap: false
     linkCable: false
 SLES-00947:
-  name: "Shadow Man (Europe) (En,Fr,Es)"
+  name: "Shadow Man"
+  saveName: "Shadow Man (Europe) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145444,7 +152953,8 @@ SLES-00947:
     multitap: false
     linkCable: false
 SLES-02281:
-  name: "Shadow Man (Italy)"
+  name: "Shadow Man"
+  saveName: "Shadow Man (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145463,7 +152973,8 @@ SLES-02281:
     multitap: false
     linkCable: false
 SLUS-00895:
-  name: "Shadow Man (USA)"
+  name: "Shadow Man"
+  saveName: "Shadow Man (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -145485,7 +152996,8 @@ SLUS-00895:
     multitap: false
     linkCable: false
 SLES-02282:
-  name: "Shadow Man - Rette deine Seele (Germany)"
+  name: "Shadow Man - Rette deine Seele"
+  saveName: "Shadow Man - Rette deine Seele (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145504,7 +153016,8 @@ SLES-02282:
     multitap: false
     linkCable: false
 SLES-00888:
-  name: "Shadow Master (Europe) (En,Fr,De,Es,It)"
+  name: "Shadow Master"
+  saveName: "Shadow Master (Europe) (En,Fr,De,Es,It)"
   compatibility:
     comments: "Intro logos require the software renderer to display correctly."
   controllers:
@@ -145529,11 +153042,13 @@ SLES-00888:
     multitap: false
     linkCable: false
 SLED-00968:
-  name: "Shadow Master (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Shadow Master (Demo)"
+  saveName: "Shadow Master (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00545:
-  name: "Shadow Master (USA)"
+  name: "Shadow Master"
+  saveName: "Shadow Master (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2598-g9e198706"
@@ -145556,7 +153071,8 @@ SLUS-00545:
     multitap: false
     linkCable: false
 SLPS-01420:
-  name: "Shadow Tower (Japan)"
+  name: "Shadow Tower"
+  saveName: "Shadow Tower (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145577,7 +153093,8 @@ SLPS-01420:
     multitap: false
     linkCable: false
 SLUS-00863:
-  name: "Shadow Tower (USA)"
+  name: "Shadow Tower"
+  saveName: "Shadow Tower (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1773-gbdd98281"
@@ -145601,7 +153118,8 @@ SLUS-00863:
     multitap: false
     linkCable: false
 SLPM-87027:
-  name: "Shadow and Shadow (Japan)"
+  name: "Shadow and Shadow"
+  saveName: "Shadow and Shadow (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -145619,7 +153137,8 @@ SLPM-87027:
     multitap: false
     linkCable: false
 SLPS-01472:
-  name: "Shake Kids (Japan)"
+  name: "Shake Kids"
+  saveName: "Shake Kids (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145638,7 +153157,8 @@ SLPS-01472:
     multitap: false
     linkCable: false
 SLPS-03432:
-  name: "Shaman King - Spirit of Shamans (Japan)"
+  name: "Shaman King - Spirit of Shamans"
+  saveName: "Shaman King - Spirit of Shamans (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145657,7 +153177,8 @@ SLPS-03432:
     multitap: false
     linkCable: false
 SLES-01576:
-  name: "Shane Warne Cricket (Australia)"
+  name: "Shane Warne Cricket"
+  saveName: "Shane Warne Cricket (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145676,7 +153197,8 @@ SLES-01576:
     multitap: true
     linkCable: false
 SCPS-10004:
-  name: "Shanghai - Banri no Choujou (Japan)"
+  name: "Shanghai - Banri no Choujou"
+  saveName: "Shanghai - Banri no Choujou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -145694,7 +153216,8 @@ SCPS-10004:
     multitap: false
     linkCable: false
 SCPS-10005:
-  name: "Shanghai - Banri no Choujou (Japan) (Gentei Box)"
+  name: "Shanghai - Banri no Choujou (Gentei Box)"
+  saveName: "Shanghai - Banri no Choujou (Japan) (Gentei Box)"
   controllers:
     - DigitalController
   metadata:
@@ -145712,7 +153235,8 @@ SCPS-10005:
     multitap: false
     linkCable: false
 SLPS-00266:
-  name: "Shanghai - Great Moments (Japan)"
+  name: "Shanghai - Great Moments"
+  saveName: "Shanghai - Great Moments (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -145730,7 +153254,8 @@ SLPS-00266:
     multitap: false
     linkCable: false
 SLPS-01552:
-  name: "Shanghai - Mateki Buyuu (Japan)"
+  name: "Shanghai - Mateki Buyuu"
+  saveName: "Shanghai - Mateki Buyuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145752,7 +153277,8 @@ SLPS-01552:
     multitap: false
     linkCable: false
 SLPM-86836:
-  name: "Shanghai - Shouryuu Sairin (Japan)"
+  name: "Shanghai - Shouryuu Sairin"
+  saveName: "Shanghai - Shouryuu Sairin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -145770,7 +153296,8 @@ SLPM-86836:
     multitap: false
     linkCable: false
 SLES-01618:
-  name: "Shanghai - True Valor (Europe)"
+  name: "Shanghai - True Valor"
+  saveName: "Shanghai - True Valor (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145790,7 +153317,8 @@ SLES-01618:
     multitap: false
     linkCable: false
 SLUS-00795:
-  name: "Shanghai - True Valor (USA)"
+  name: "Shanghai - True Valor"
+  saveName: "Shanghai - True Valor (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -145813,7 +153341,8 @@ SLUS-00795:
     multitap: false
     linkCable: false
 SLES-01658:
-  name: "Shaolin (Europe)"
+  name: "Shaolin"
+  saveName: "Shaolin (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145832,7 +153361,8 @@ SLES-01658:
     multitap: true
     linkCable: false
 SCPS-45510:
-  name: "Shediao Yingxiongzhuan (Asia)"
+  name: "Shediao Yingxiongzhuan"
+  saveName: "Shediao Yingxiongzhuan (Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145870,7 +153400,8 @@ SLPS-03229:
     multitap: false
     linkCable: false
 SLES-02218:
-  name: "Sheep (Europe) (En,Fr,De,Es,It)"
+  name: "Sheep"
+  saveName: "Sheep (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145893,7 +153424,8 @@ SLES-02218:
     multitap: false
     linkCable: false
 SLPM-87020:
-  name: "Sheep (Japan)"
+  name: "Sheep"
+  saveName: "Sheep (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -145912,7 +153444,8 @@ SLPM-87020:
     multitap: false
     linkCable: false
 SLUS-01298:
-  name: "Sheep (USA)"
+  name: "Sheep"
+  saveName: "Sheep (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -145934,7 +153467,8 @@ SLUS-01298:
     multitap: false
     linkCable: false
 SLES-02895:
-  name: "Sheep, Dog 'n' Wolf (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Sheep, Dog 'n' Wolf"
+  saveName: "Sheep, Dog 'n' Wolf (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1031-g47138aa"
@@ -145963,13 +153497,15 @@ SLES-02895:
     multitap: false
     linkCable: false
 SLED-03631:
-  name: "Sheep, Dog 'n' Wolf - Interactive Demo (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Sheep, Dog 'n' Wolf - Interactive Demo"
+  saveName: "Sheep, Dog 'n' Wolf - Interactive Demo (Europe) (En,Fr,De,Es,It,Nl)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Fixes seams and near-camera wobble.
 SLES-00026:
-  name: "Shellshock (Europe)"
+  name: "Shellshock"
+  saveName: "Shellshock (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -145987,7 +153523,8 @@ SLES-00026:
     multitap: false
     linkCable: false
 SLES-00215:
-  name: "Shellshock (France)"
+  name: "Shellshock"
+  saveName: "Shellshock (France)"
   controllers:
     - DigitalController
   metadata:
@@ -146005,7 +153542,8 @@ SLES-00215:
     multitap: false
     linkCable: false
 SLES-00216:
-  name: "Shellshock (Germany)"
+  name: "Shellshock"
+  saveName: "Shellshock (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -146023,7 +153561,8 @@ SLES-00216:
     multitap: false
     linkCable: false
 SLUS-00031:
-  name: "Shellshock (USA)"
+  name: "Shellshock"
+  saveName: "Shellshock (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -146041,7 +153580,8 @@ SLUS-00031:
     multitap: false
     linkCable: false
 SLPS-00486:
-  name: "Shellshock - Jus' Keepin' da Peace (Japan)"
+  name: "Shellshock - Jus' Keepin' da Peace"
+  saveName: "Shellshock - Jus' Keepin' da Peace (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146059,7 +153599,8 @@ SLPS-00486:
     multitap: false
     linkCable: false
 SLPM-86527:
-  name: "Shichida-shiki Unou de Asobenture Vol. 1 - Kotoba ABC - 0-2-sai Muke (Japan)"
+  name: "Shichida-shiki Unou de Asobenture Vol. 1 - Kotoba ABC - 0-2-sai Muke"
+  saveName: "Shichida-shiki Unou de Asobenture Vol. 1 - Kotoba ABC - 0-2-sai Muke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146077,7 +153618,8 @@ SLPM-86527:
     multitap: false
     linkCable: false
 SLPM-86528:
-  name: "Shichida-shiki Unou de Asobenture Vol. 2 - Katachi 123 - 0-2-sai Muke (Japan)"
+  name: "Shichida-shiki Unou de Asobenture Vol. 2 - Katachi 123 - 0-2-sai Muke"
+  saveName: "Shichida-shiki Unou de Asobenture Vol. 2 - Katachi 123 - 0-2-sai Muke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146095,7 +153637,8 @@ SLPM-86528:
     multitap: false
     linkCable: false
 SLPM-86529:
-  name: "Shichida-shiki Unou de Asobenture Vol. 3 - Kotoba ABC - 2-4sai Muke (Japan)"
+  name: "Shichida-shiki Unou de Asobenture Vol. 3 - Kotoba ABC - 2-4sai Muke"
+  saveName: "Shichida-shiki Unou de Asobenture Vol. 3 - Kotoba ABC - 2-4sai Muke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146113,7 +153656,8 @@ SLPM-86529:
     multitap: false
     linkCable: false
 SLPM-86530:
-  name: "Shichida-shiki Unou de Asobenture Vol. 4 - Katachi 123 - 2-4-sai Muke (Japan)"
+  name: "Shichida-shiki Unou de Asobenture Vol. 4 - Katachi 123 - 2-4-sai Muke"
+  saveName: "Shichida-shiki Unou de Asobenture Vol. 4 - Katachi 123 - 2-4-sai Muke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146131,7 +153675,8 @@ SLPM-86530:
     multitap: false
     linkCable: false
 SLPM-86531:
-  name: "Shichida-shiki Unou de Asobenture Vol. 5 - Kotoba ABC - 4-6-sai Muke (Japan)"
+  name: "Shichida-shiki Unou de Asobenture Vol. 5 - Kotoba ABC - 4-6-sai Muke"
+  saveName: "Shichida-shiki Unou de Asobenture Vol. 5 - Kotoba ABC - 4-6-sai Muke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146149,7 +153694,8 @@ SLPM-86531:
     multitap: false
     linkCable: false
 SLPM-86532:
-  name: "Shichida-shiki Unou de Asobenture Vol. 6 - Katachi 123 - 4-6-sai Muke (Japan)"
+  name: "Shichida-shiki Unou de Asobenture Vol. 6 - Katachi 123 - 4-6-sai Muke"
+  saveName: "Shichida-shiki Unou de Asobenture Vol. 6 - Katachi 123 - 4-6-sai Muke (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146167,7 +153713,8 @@ SLPM-86532:
     multitap: false
     linkCable: false
 SLPS-01619:
-  name: "Shichisei Toushin Guyferd - Crown Kaimetsu Sakusen (Japan)"
+  name: "Shichisei Toushin Guyferd - Crown Kaimetsu Sakusen"
+  saveName: "Shichisei Toushin Guyferd - Crown Kaimetsu Sakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146186,7 +153733,8 @@ SLPS-01619:
     multitap: false
     linkCable: false
 SLPS-00082:
-  name: "Shichuu Suimei Pitagraph (Japan)"
+  name: "Shichuu Suimei Pitagraph"
+  saveName: "Shichuu Suimei Pitagraph (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146204,7 +153752,8 @@ SLPS-00082:
     multitap: false
     linkCable: false
 SLPS-02810:
-  name: "Shiki Oriori no Bass Tsuri (Japan)"
+  name: "Shiki Oriori no Bass Tsuri"
+  saveName: "Shiki Oriori no Bass Tsuri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146223,7 +153772,8 @@ SLPS-02810:
     multitap: false
     linkCable: false
 SLPM-87251:
-  name: "Shin DX Okuman Chouja Game - Tsukutte! Utte! Oomouke! (Japan)"
+  name: "Shin DX Okuman Chouja Game - Tsukutte! Utte! Oomouke!"
+  saveName: "Shin DX Okuman Chouja Game - Tsukutte! Utte! Oomouke! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146260,7 +153810,8 @@ SLPS-00382:
     multitap: true
     linkCable: false
 SLPS-00381:
-  name: "Shin Fortune Quest - Shokutaku no Kishi-tachi (Japan)"
+  name: "Shin Fortune Quest - Shokutaku no Kishi-tachi"
+  saveName: "Shin Fortune Quest - Shokutaku no Kishi-tachi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146278,7 +153829,8 @@ SLPS-00381:
     multitap: true
     linkCable: false
 SLPM-86177:
-  name: "Shin Jidaigeki Action - Rasetsu no Ken (Japan)"
+  name: "Shin Jidaigeki Action - Rasetsu no Ken"
+  saveName: "Shin Jidaigeki Action - Rasetsu no Ken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146297,7 +153849,8 @@ SLPM-86177:
     multitap: false
     linkCable: false
 SLPS-02319:
-  name: "Shin Masou Kishin - Panzer Warfare (Japan)"
+  name: "Shin Masou Kishin - Panzer Warfare"
+  saveName: "Shin Masou Kishin - Panzer Warfare (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146335,7 +153888,8 @@ SCPS-45450:
     multitap: false
     linkCable: false
 SLPS-03170:
-  name: "Shin Megami Tensei (Japan)"
+  name: "Shin Megami Tensei"
+  saveName: "Shin Megami Tensei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146356,7 +153910,8 @@ SLPS-03170:
     multitap: false
     linkCable: false
 SLPM-87040:
-  name: "Shin Megami Tensei - Devil Children - Kuro no Sho, Aka no Sho (Japan)"
+  name: "Shin Megami Tensei - Devil Children - Kuro no Sho, Aka no Sho"
+  saveName: "Shin Megami Tensei - Devil Children - Kuro no Sho, Aka no Sho (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146375,7 +153930,8 @@ SLPM-87040:
     multitap: false
     linkCable: false
 SLPM-86924:
-  name: "Shin Megami Tensei II (Japan)"
+  name: "Shin Megami Tensei II"
+  saveName: "Shin Megami Tensei II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146396,7 +153952,8 @@ SLPM-86924:
     multitap: false
     linkCable: false
 SLPM-87154:
-  name: "Shin Megami Tensei If... (Japan)"
+  name: "Shin Megami Tensei If..."
+  saveName: "Shin Megami Tensei If... (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146417,7 +153974,8 @@ SLPM-87154:
     multitap: false
     linkCable: false
 SLPM-87153:
-  name: "Shin Megami Tensei If... (Japan) (Anniversary Pack)"
+  name: "Shin Megami Tensei If... (Anniversary Pack)"
+  saveName: "Shin Megami Tensei If... (Japan) (Anniversary Pack)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146438,7 +153996,8 @@ SLPM-87153:
     multitap: false
     linkCable: false
 SLPS-00084:
-  name: "Shin Nihon Pro Wrestling - Toukon Retsuden (Japan)"
+  name: "Shin Nihon Pro Wrestling - Toukon Retsuden"
+  saveName: "Shin Nihon Pro Wrestling - Toukon Retsuden (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -146459,7 +154018,8 @@ SLPS-00084:
     multitap: false
     linkCable: false
 SLPS-00637:
-  name: "Shin Nihon Pro Wrestling - Toukon Retsuden 2 (Japan)"
+  name: "Shin Nihon Pro Wrestling - Toukon Retsuden 2"
+  saveName: "Shin Nihon Pro Wrestling - Toukon Retsuden 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146477,7 +154037,8 @@ SLPS-00637:
     multitap: true
     linkCable: false
 SLPS-01366:
-  name: "Shin Nihon Pro Wrestling - Toukon Retsuden 3 (Japan)"
+  name: "Shin Nihon Pro Wrestling - Toukon Retsuden 3"
+  saveName: "Shin Nihon Pro Wrestling - Toukon Retsuden 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146495,7 +154056,8 @@ SLPS-01366:
     multitap: true
     linkCable: false
 SLPS-01314:
-  name: "Shin Nihon Pro Wrestling - Toukon Retsuden 3 (Japan) (Antonio Inoki Intai Kinen Genteiban)"
+  name: "Shin Nihon Pro Wrestling - Toukon Retsuden 3 (Antonio Inoki Intai Kinen Genteiban)"
+  saveName: "Shin Nihon Pro Wrestling - Toukon Retsuden 3 (Japan) (Antonio Inoki Intai Kinen Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -146513,7 +154075,8 @@ SLPS-01314:
     multitap: true
     linkCable: false
 SLPS-00576:
-  name: "Shin SD Sengokuden - Kidou Musha Taisen (Japan)"
+  name: "Shin SD Sengokuden - Kidou Musha Taisen"
+  saveName: "Shin SD Sengokuden - Kidou Musha Taisen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146587,7 +154150,8 @@ SLPS-01756:
     multitap: false
     linkCable: false
 SLPS-01755:
-  name: "Shin Sedai Robot Senki - Brave Saga (Japan)"
+  name: "Shin Sedai Robot Senki - Brave Saga"
+  saveName: "Shin Sedai Robot Senki - Brave Saga (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146606,9 +154170,11 @@ SLPS-01755:
     multitap: false
     linkCable: false
 SLPM-80275:
-  name: "Shin Sedai Robot Senki - Brave Saga - Yuusha Gentei Koushiki Data Disc - Yuusha no Akashi (Japan)"
+  name: "Shin Sedai Robot Senki - Brave Saga - Yuusha Gentei Koushiki Data Disc - Yuusha no Akashi"
+  saveName: "Shin Sedai Robot Senki - Brave Saga - Yuusha Gentei Koushiki Data Disc - Yuusha no Akashi (Japan)"
 SLPS-01485:
-  name: "Shin Seiki Evangelion - Eva to Yukai na Nakama-tachi (Japan)"
+  name: "Shin Seiki Evangelion - Eva to Yukai na Nakama-tachi"
+  saveName: "Shin Seiki Evangelion - Eva to Yukai na Nakama-tachi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146626,7 +154192,8 @@ SLPS-01485:
     multitap: false
     linkCable: false
 SLPS-01377:
-  name: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Japan) (Disc 1)"
+  name: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Disc 1)"
+  saveName: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Japan) (Disc 1)"
   discSet:
     name: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Japan)"
     serials:
@@ -146649,7 +154216,8 @@ SLPS-01377:
     multitap: false
     linkCable: false
 SLPS-01378:
-  name: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Japan) (Disc 2)"
+  name: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Disc 2)"
+  saveName: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Japan) (Disc 2)"
   discSet:
     name: "Shin Seiki Evangelion - Koutetsu no Girlfriend (Japan)"
     serials:
@@ -146672,7 +154240,8 @@ SLPS-01378:
     multitap: false
     linkCable: false
 SLPS-01958:
-  name: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Japan) (Disc 1)"
+  name: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Disc 1)"
+  saveName: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Japan) (Disc 1)"
   discSet:
     name: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Japan)"
     serials:
@@ -146699,7 +154268,8 @@ SLPS-01958:
     multitap: false
     linkCable: false
 SLPS-01959:
-  name: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Japan) (Disc 2)"
+  name: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Disc 2)"
+  saveName: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Japan) (Disc 2)"
   discSet:
     name: "Shin Seiki GPX Cyber Formula - Aratanaru Chousensha (Japan)"
     serials:
@@ -146726,7 +154296,8 @@ SLPS-01959:
     multitap: false
     linkCable: false
 SLPS-00873:
-  name: "Shin Senki Van-Gale - The War of Neo-Century (Japan)"
+  name: "Shin Senki Van-Gale - The War of Neo-Century"
+  saveName: "Shin Senki Van-Gale - The War of Neo-Century (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146744,7 +154315,8 @@ SLPS-00873:
     multitap: false
     linkCable: false
 SCPS-45069:
-  name: "Shin Shikoutei - The First Emperor (Japan, Asia)"
+  name: "Shin Shikoutei - The First Emperor"
+  saveName: "Shin Shikoutei - The First Emperor (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -146765,7 +154337,8 @@ SCPS-45069:
     multitap: false
     linkCable: false
 SLPS-00550:
-  name: "Shin Super Robot Taisen (Japan)"
+  name: "Shin Super Robot Taisen"
+  saveName: "Shin Super Robot Taisen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146783,7 +154356,8 @@ SLPS-00550:
     multitap: false
     linkCable: false
 SLPS-00787:
-  name: "Shin Super Robot Taisen - Special Disc (Japan)"
+  name: "Shin Super Robot Taisen - Special Disc"
+  saveName: "Shin Super Robot Taisen - Special Disc (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146819,7 +154393,8 @@ SLPS-91084:
     multitap: false
     linkCable: false
 SLPS-00810:
-  name: "Shin Theme Park (Japan)"
+  name: "Shin Theme Park"
+  saveName: "Shin Theme Park (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146837,7 +154412,8 @@ SLPS-00810:
     multitap: false
     linkCable: false
 SLPS-91131:
-  name: "Shin Theme Park (Japan) (Rev 1)"
+  name: "Shin Theme Park"
+  saveName: "Shin Theme Park (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -146873,7 +154449,8 @@ SLPS-91472:
     multitap: false
     linkCable: false
 SLPS-00414:
-  name: "Shingata Kururin Pa! (Japan)"
+  name: "Shingata Kururin Pa!"
+  saveName: "Shingata Kururin Pa! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -146910,7 +154487,8 @@ SCPS-45402:
     multitap: false
     linkCable: false
 SLPS-02877:
-  name: "Shinobi no Roku (Japan)"
+  name: "Shinobi no Roku"
+  saveName: "Shinobi no Roku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146929,7 +154507,8 @@ SLPS-02877:
     multitap: true
     linkCable: false
 SLPS-03174:
-  name: "Shinri Game 10, The (Japan)"
+  name: "Shinri Game 10, The"
+  saveName: "Shinri Game 10, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -146948,7 +154527,8 @@ SLPS-03174:
     multitap: false
     linkCable: false
 SLPS-00851:
-  name: "Shinri Game 2, The (Japan)"
+  name: "Shinri Game 2, The"
+  saveName: "Shinri Game 2, The (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -146969,7 +154549,8 @@ SLPS-00851:
     multitap: false
     linkCable: false
 SLPS-01104:
-  name: "Shinri Game 3, The (Japan)"
+  name: "Shinri Game 3, The"
+  saveName: "Shinri Game 3, The (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -146990,7 +154571,8 @@ SLPS-01104:
     multitap: false
     linkCable: false
 SLPS-02518:
-  name: "Shinri Game 5, The (Japan)"
+  name: "Shinri Game 5, The"
+  saveName: "Shinri Game 5, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147009,7 +154591,8 @@ SLPS-02518:
     multitap: false
     linkCable: false
 SLPS-02668:
-  name: "Shinri Game 6, The (Japan)"
+  name: "Shinri Game 6, The"
+  saveName: "Shinri Game 6, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147028,7 +154611,8 @@ SLPS-02668:
     multitap: false
     linkCable: false
 SLPS-02809:
-  name: "Shinri Game 7, The (Japan)"
+  name: "Shinri Game 7, The"
+  saveName: "Shinri Game 7, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147047,7 +154631,8 @@ SLPS-02809:
     multitap: false
     linkCable: false
 SLPS-02946:
-  name: "Shinri Game 8, The (Japan)"
+  name: "Shinri Game 8, The"
+  saveName: "Shinri Game 8, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147066,7 +154651,8 @@ SLPS-02946:
     multitap: false
     linkCable: false
 SLPS-03109:
-  name: "Shinri Game 9, The (Japan)"
+  name: "Shinri Game 9, The"
+  saveName: "Shinri Game 9, The (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147085,7 +154671,8 @@ SLPS-03109:
     multitap: false
     linkCable: false
 SLPS-01670:
-  name: "Shinri Game IV, The - Itsumo Kokoro ni Hoshizora wo (Japan)"
+  name: "Shinri Game IV, The - Itsumo Kokoro ni Hoshizora wo"
+  saveName: "Shinri Game IV, The - Itsumo Kokoro ni Hoshizora wo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147107,7 +154694,8 @@ SLPS-01670:
     multitap: false
     linkCable: false
 SLPS-00169:
-  name: "Shinri Game, The (Japan)"
+  name: "Shinri Game, The"
+  saveName: "Shinri Game, The (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -147128,7 +154716,8 @@ SLPS-00169:
     multitap: false
     linkCable: false
 SLPS-00925:
-  name: "Shinseiden Megaseed - Fukkatsu-hen (Japan)"
+  name: "Shinseiden Megaseed - Fukkatsu-hen"
+  saveName: "Shinseiden Megaseed - Fukkatsu-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147168,7 +154757,8 @@ SLPS-03558:
     multitap: false
     linkCable: false
 SLPM-86109:
-  name: "Shinsetsu Samurai Spirits - Bushidou Retsuden (Japan)"
+  name: "Shinsetsu Samurai Spirits - Bushidou Retsuden"
+  saveName: "Shinsetsu Samurai Spirits - Bushidou Retsuden (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -147189,7 +154779,8 @@ SLPM-86109:
     multitap: false
     linkCable: false
 SLPS-01114:
-  name: "Shinshuku Taisen - It's a Nony! (Japan)"
+  name: "Shinshuku Taisen - It's a Nony!"
+  saveName: "Shinshuku Taisen - It's a Nony! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -147210,11 +154801,13 @@ SLPS-01114:
     multitap: false
     linkCable: false
 SLPM-80156:
-  name: "Shinshuku Taisen - It's a Nony! (Japan) (Demo)"
+  name: "Shinshuku Taisen - It's a Nony! (Demo)"
+  saveName: "Shinshuku Taisen - It's a Nony! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03312:
-  name: "Shinsou Kaiten!! Wan Wan Umi Monogatari - Sanyo Pachinko Paradise DX (Japan)"
+  name: "Shinsou Kaiten!! Wan Wan Umi Monogatari - Sanyo Pachinko Paradise DX"
+  saveName: "Shinsou Kaiten!! Wan Wan Umi Monogatari - Sanyo Pachinko Paradise DX (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147233,7 +154826,8 @@ SLPS-03312:
     multitap: false
     linkCable: false
 SLUS-00558:
-  name: "Shipwreckers! (USA)"
+  name: "Shipwreckers!"
+  saveName: "Shipwreckers! (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -147251,11 +154845,13 @@ SLUS-00558:
     multitap: true
     linkCable: false
 SLUS-90013:
-  name: "Shipwreckers! (USA) (Demo)"
+  name: "Shipwreckers! (Demo)"
+  saveName: "Shipwreckers! (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01240:
-  name: "Shiritsu Justice Gakuen - Legion of Heroes (Japan) (Disc 1) (Evolution Disc)"
+  name: "Shiritsu Justice Gakuen - Legion of Heroes (Disc 1) (Evolution Disc)"
+  saveName: "Shiritsu Justice Gakuen - Legion of Heroes (Japan) (Disc 1) (Evolution Disc)"
   discSet:
     name: "Shiritsu Justice Gakuen - Legion of Heroes (Japan)"
     serials:
@@ -147279,7 +154875,8 @@ SLPS-01240:
     multitap: true
     linkCable: false
 SLPS-01241:
-  name: "Shiritsu Justice Gakuen - Legion of Heroes (Japan) (Disc 2) (Arcade Disc)"
+  name: "Shiritsu Justice Gakuen - Legion of Heroes (Disc 2) (Arcade Disc)"
+  saveName: "Shiritsu Justice Gakuen - Legion of Heroes (Japan) (Disc 2) (Arcade Disc)"
   discSet:
     name: "Shiritsu Justice Gakuen - Legion of Heroes (Japan)"
     serials:
@@ -147303,7 +154900,8 @@ SLPS-01241:
     multitap: true
     linkCable: false
 SLPM-86750:
-  name: "Shiritsu Justice Gakuen - Nekketsu Seishun Nikki 2 (Japan)"
+  name: "Shiritsu Justice Gakuen - Nekketsu Seishun Nikki 2"
+  saveName: "Shiritsu Justice Gakuen - Nekketsu Seishun Nikki 2 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -147348,7 +154946,8 @@ SLPM-86854:
     multitap: false
     linkCable: false
 SLPS-01648:
-  name: "Shisenfuu Gekikara Mahjong (Japan)"
+  name: "Shisenfuu Gekikara Mahjong"
+  saveName: "Shisenfuu Gekikara Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147366,7 +154965,8 @@ SLPS-01648:
     multitap: false
     linkCable: false
 SLPS-00419:
-  name: "Shock Wave (Japan)"
+  name: "Shock Wave"
+  saveName: "Shock Wave (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147384,7 +154984,8 @@ SLPS-00419:
     multitap: false
     linkCable: false
 SLPS-00516:
-  name: "Shock Wave - Operation JumpGate (Japan)"
+  name: "Shock Wave - Operation JumpGate"
+  saveName: "Shock Wave - Operation JumpGate (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147402,7 +155003,8 @@ SLPS-00516:
     multitap: false
     linkCable: false
 SLES-00071:
-  name: "Shockwave Assault (Europe) (Disc 1) (Shockwave - Invasion Earth)"
+  name: "Shockwave Assault (Disc 1) (Shockwave - Invasion Earth)"
+  saveName: "Shockwave Assault (Europe) (Disc 1) (Shockwave - Invasion Earth)"
   discSet:
     name: "Shockwave Assault (Europe)"
     serials:
@@ -147425,7 +155027,8 @@ SLES-00071:
     multitap: false
     linkCable: false
 SLES-10071:
-  name: "Shockwave Assault (Europe) (Disc 2) (Shockwave - Operation Jumpgate)"
+  name: "Shockwave Assault (Disc 2) (Shockwave - Operation Jumpgate)"
+  saveName: "Shockwave Assault (Europe) (Disc 2) (Shockwave - Operation Jumpgate)"
   discSet:
     name: "Shockwave Assault (Europe)"
     serials:
@@ -147448,7 +155051,8 @@ SLES-10071:
     multitap: false
     linkCable: false
 SLUS-00028:
-  name: "Shockwave Assault (USA) (Disc 1) (Shockwave - Invasion Earth)"
+  name: "Shockwave Assault (Disc 1) (Shockwave - Invasion Earth)"
+  saveName: "Shockwave Assault (USA) (Disc 1) (Shockwave - Invasion Earth)"
   discSet:
     name: "Shockwave Assault (USA)"
     serials:
@@ -147471,7 +155075,8 @@ SLUS-00028:
     multitap: false
     linkCable: false
 SLUS-00137:
-  name: "Shockwave Assault (USA) (Disc 2) (Shockwave - Operation Jumpgate)"
+  name: "Shockwave Assault (Disc 2) (Shockwave - Operation Jumpgate)"
+  saveName: "Shockwave Assault (USA) (Disc 2) (Shockwave - Operation Jumpgate)"
   discSet:
     name: "Shockwave Assault (USA)"
     serials:
@@ -147494,7 +155099,8 @@ SLUS-00137:
     multitap: false
     linkCable: false
 SLES-03807:
-  name: "Shonen Jump's One Piece - Grand Battle (Europe) (En,Fr,De,Es,It)"
+  name: "Shonen Jump's One Piece - Grand Battle"
+  saveName: "Shonen Jump's One Piece - Grand Battle (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147517,7 +155123,8 @@ SLES-03807:
     multitap: false
     linkCable: false
 SLES-04176:
-  name: "Shoot (Germany)"
+  name: "Shoot"
+  saveName: "Shoot (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147536,7 +155143,8 @@ SLES-04176:
     multitap: false
     linkCable: false
 SLPS-00139:
-  name: "Shougi Joryuu Meijin'isen (Japan)"
+  name: "Shougi Joryuu Meijin'isen"
+  saveName: "Shougi Joryuu Meijin'isen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147554,7 +155162,8 @@ SLPS-00139:
     multitap: false
     linkCable: false
 SLPS-01976:
-  name: "Shougi Saikyou - Pro ni Manabu (Japan)"
+  name: "Shougi Saikyou - Pro ni Manabu"
+  saveName: "Shougi Saikyou - Pro ni Manabu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147590,7 +155199,8 @@ SLPS-03081:
     multitap: false
     linkCable: false
 SLPM-86069:
-  name: "Shougi Saikyou 2 (Japan)"
+  name: "Shougi Saikyou 2"
+  saveName: "Shougi Saikyou 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147626,7 +155236,8 @@ SLPS-03083:
     multitap: false
     linkCable: false
 SLPS-00253:
-  name: "Shouryuu Sangoku Engi (Japan)"
+  name: "Shouryuu Sangoku Engi"
+  saveName: "Shouryuu Sangoku Engi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147644,7 +155255,8 @@ SLPS-00253:
     multitap: false
     linkCable: false
 SLES-03996:
-  name: "Shrek Treasure Hunt (Europe) (En,Fr,De,Es)"
+  name: "Shrek Treasure Hunt"
+  saveName: "Shrek Treasure Hunt (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147666,7 +155278,8 @@ SLES-03996:
     multitap: false
     linkCable: false
 SLUS-01463:
-  name: "Shrek Treasure Hunt (USA)"
+  name: "Shrek Treasure Hunt"
+  saveName: "Shrek Treasure Hunt (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -147688,7 +155301,8 @@ SLUS-01463:
     multitap: false
     linkCable: false
 SLPS-01202:
-  name: "Shura no Mon (Japan)"
+  name: "Shura no Mon"
+  saveName: "Shura no Mon (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -147708,7 +155322,8 @@ SLPS-01202:
     multitap: false
     linkCable: false
 SLPS-00276:
-  name: "Shusse Mahjong Daisettai (Japan)"
+  name: "Shusse Mahjong Daisettai"
+  saveName: "Shusse Mahjong Daisettai (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147726,7 +155341,8 @@ SLPS-00276:
     multitap: false
     linkCable: false
 SLPS-00573:
-  name: "Shutokou Battle Gaiden - Super Technic Challenge - Drift King e no Michi (Japan)"
+  name: "Shutokou Battle Gaiden - Super Technic Challenge - Drift King e no Michi"
+  saveName: "Shutokou Battle Gaiden - Super Technic Challenge - Drift King e no Michi (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -147745,7 +155361,8 @@ SLPS-00573:
     multitap: false
     linkCable: false
 SLPS-00828:
-  name: "Shutokou Battle R (Japan)"
+  name: "Shutokou Battle R"
+  saveName: "Shutokou Battle R (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -147768,11 +155385,13 @@ SLPS-00828:
     multitap: false
     linkCable: true
 SLPM-80088:
-  name: "Shutokou Battle R (Japan) (Demo)"
+  name: "Shutokou Battle R (Demo)"
+  saveName: "Shutokou Battle R (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02401:
-  name: "Shuukan Gallop - Blood Master (Japan) (Disc 1)"
+  name: "Shuukan Gallop - Blood Master (Disc 1)"
+  saveName: "Shuukan Gallop - Blood Master (Japan) (Disc 1)"
   discSet:
     name: "Shuukan Gallop - Blood Master (Japan)"
     serials:
@@ -147795,7 +155414,8 @@ SLPS-02401:
     multitap: false
     linkCable: false
 SLPS-02402:
-  name: "Shuukan Gallop - Blood Master (Japan) (Disc 2)"
+  name: "Shuukan Gallop - Blood Master (Disc 2)"
+  saveName: "Shuukan Gallop - Blood Master (Japan) (Disc 2)"
   discSet:
     name: "Shuukan Gallop - Blood Master (Japan)"
     serials:
@@ -147818,7 +155438,8 @@ SLPS-02402:
     multitap: false
     linkCable: false
 SLPS-00881:
-  name: "Shuukan Pro Wres Kanshuu - Pro Wres Sengokuden (Japan)"
+  name: "Shuukan Pro Wres Kanshuu - Pro Wres Sengokuden"
+  saveName: "Shuukan Pro Wres Kanshuu - Pro Wres Sengokuden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147836,7 +155457,8 @@ SLPS-00881:
     multitap: false
     linkCable: false
 SLPS-00336:
-  name: "Sid Meier's Civilization - Shin Sekai Shichidai Bunmei (Japan)"
+  name: "Sid Meier's Civilization - Shin Sekai Shichidai Bunmei"
+  saveName: "Sid Meier's Civilization - Shin Sekai Shichidai Bunmei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147854,7 +155476,8 @@ SLPS-00336:
     multitap: false
     linkCable: false
 SLPS-01079:
-  name: "Side Pocket 3 (Japan)"
+  name: "Side Pocket 3"
+  saveName: "Side Pocket 3 (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -147875,7 +155498,8 @@ SLPS-01079:
     multitap: false
     linkCable: false
 SLPS-01175:
-  name: "Side by Side Special (Japan)"
+  name: "Side by Side Special"
+  saveName: "Side by Side Special (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -147894,11 +155518,13 @@ SLPS-01175:
     multitap: false
     linkCable: false
 SLPM-80145:
-  name: "Side by Side Special (Japan) (Demo)"
+  name: "Side by Side Special (Demo)"
+  saveName: "Side by Side Special (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86344:
-  name: "Side by Side Special 2000 (Japan)"
+  name: "Side by Side Special 2000"
+  saveName: "Side by Side Special 2000 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1740-gbb6af3c8"
@@ -147921,7 +155547,8 @@ SLPM-86344:
     multitap: false
     linkCable: false
 SLPS-00156:
-  name: "Sidewinder (Japan)"
+  name: "Sidewinder"
+  saveName: "Sidewinder (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -147939,7 +155566,8 @@ SLPS-00156:
     multitap: false
     linkCable: true
 SLPS-00954:
-  name: "Sidewinder 2 - Let's Dance in the Sky (Japan) (En,Ja)"
+  name: "Sidewinder 2 - Let's Dance in the Sky"
+  saveName: "Sidewinder 2 - Let's Dance in the Sky (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -147982,7 +155610,8 @@ SCPS-45137:
     multitap: false
     linkCable: false
 SLPS-91010:
-  name: "Sidewinder USA (Japan)"
+  name: "Sidewinder USA"
+  saveName: "Sidewinder USA (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148019,7 +155648,8 @@ SCPS-45437:
     multitap: false
     linkCable: false
 SLES-02792:
-  name: "Silent Bomber (Europe)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148038,7 +155668,8 @@ SLES-02792:
     multitap: false
     linkCable: false
 SLES-02989:
-  name: "Silent Bomber (France)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148057,7 +155688,8 @@ SLES-02989:
     multitap: false
     linkCable: false
 SLES-02990:
-  name: "Silent Bomber (Germany)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148076,7 +155708,8 @@ SLES-02990:
     multitap: false
     linkCable: false
 SLES-02991:
-  name: "Silent Bomber (Italy)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148095,7 +155728,8 @@ SLES-02991:
     multitap: false
     linkCable: false
 SLPS-02334:
-  name: "Silent Bomber (Japan)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148114,11 +155748,13 @@ SLPS-02334:
     multitap: false
     linkCable: false
 SLPM-80494:
-  name: "Silent Bomber (Japan) (Demo)"
+  name: "Silent Bomber (Demo)"
+  saveName: "Silent Bomber (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02992:
-  name: "Silent Bomber (Spain)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148137,7 +155773,8 @@ SLES-02992:
     multitap: false
     linkCable: false
 SLUS-00902:
-  name: "Silent Bomber (USA)"
+  name: "Silent Bomber"
+  saveName: "Silent Bomber (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -148179,15 +155816,18 @@ SCPS-45380:
     multitap: false
     linkCable: false
 SLED-02186:
-  name: "Silent Hill (Australia) (Demo)"
+  name: "Silent Hill (Demo)"
+  saveName: "Silent Hill (Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-01735:
-  name: "Silent Hill (Europe) (Demo)"
+  name: "Silent Hill (Demo)"
+  saveName: "Silent Hill (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01514:
-  name: "Silent Hill (Europe) (En,Fr,De,Es,It)"
+  name: "Silent Hill"
+  saveName: "Silent Hill (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -148216,11 +155856,13 @@ SLES-01514:
     multitap: false
     linkCable: false
 SLED-01774:
-  name: "Silent Hill (Germany) (Demo)"
+  name: "Silent Hill (Demo)"
+  saveName: "Silent Hill (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86192:
-  name: "Silent Hill (Japan)"
+  name: "Silent Hill"
+  saveName: "Silent Hill (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed219"
@@ -148245,11 +155887,13 @@ SLPM-86192:
     multitap: false
     linkCable: false
 SLPM-80363:
-  name: "Silent Hill (Japan) (Demo)"
+  name: "Silent Hill (Demo)"
+  saveName: "Silent Hill (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86498:
-  name: "Silent Hill (Japan) (Rev 1)"
+  name: "Silent Hill"
+  saveName: "Silent Hill (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148272,7 +155916,8 @@ SLPM-86498:
     multitap: false
     linkCable: false
 SLUS-00707:
-  name: "Silent Hill (USA)"
+  name: "Silent Hill"
+  saveName: "Silent Hill (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2499-g770dd5a6"
@@ -148301,18 +155946,21 @@ SLUS-00707:
     multitap: false
     linkCable: false
 SLUS-90050:
-  name: "Silent Hill (USA) (Demo 1)"
+  name: "Silent Hill (Demo 1)"
+  saveName: "Silent Hill (USA) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLUS-80707:
-  name: "Silent Hill (USA) (Demo 2)"
+  name: "Silent Hill (Demo 2)"
+  saveName: "Silent Hill (USA) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
 SLES-04157:
-  name: "Silent Iron (Europe)"
+  name: "Silent Iron"
+  saveName: "Silent Iron (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148331,7 +155979,8 @@ SLES-04157:
     multitap: false
     linkCable: false
 SLPS-01618:
-  name: "Silent Moebius - Case - Titanic (Japan)"
+  name: "Silent Moebius - Case - Titanic"
+  saveName: "Silent Moebius - Case - Titanic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148349,7 +155998,8 @@ SLPS-01618:
     multitap: false
     linkCable: false
 SLPS-01803:
-  name: "Silent Moebius - Gen'ei no Datenshi (Japan)"
+  name: "Silent Moebius - Gen'ei no Datenshi"
+  saveName: "Silent Moebius - Gen'ei no Datenshi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148368,7 +156018,8 @@ SLPS-01803:
     multitap: false
     linkCable: false
 SLUS-00728:
-  name: "Silhouette Mirage (USA)"
+  name: "Silhouette Mirage"
+  saveName: "Silhouette Mirage (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -148390,7 +156041,8 @@ SLUS-00728:
     multitap: false
     linkCable: false
 SLPS-01449:
-  name: "Silhouette Mirage - Reprogrammed Hope (Japan)"
+  name: "Silhouette Mirage - Reprogrammed Hope"
+  saveName: "Silhouette Mirage - Reprogrammed Hope (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148409,7 +156061,8 @@ SLPS-01449:
     multitap: false
     linkCable: false
 SLPS-00374:
-  name: "Silhouette Stories (Japan)"
+  name: "Silhouette Stories"
+  saveName: "Silhouette Stories (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148427,7 +156080,8 @@ SLPS-00374:
     multitap: false
     linkCable: false
 SLPS-02320:
-  name: "Silver Jiken - The Silver (Japan)"
+  name: "Silver Jiken - The Silver"
+  saveName: "Silver Jiken - The Silver (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148449,11 +156103,13 @@ SLPS-02320:
     multitap: false
     linkCable: false
 SLPM-80469:
-  name: "Silver Jiken - The Silver (Japan) (Experience) (Demo)"
+  name: "Silver Jiken - The Silver (Experience) (Demo)"
+  saveName: "Silver Jiken - The Silver (Japan) (Experience) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00050:
-  name: "Silverload (USA)"
+  name: "Silverload"
+  saveName: "Silverload (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -148472,7 +156128,8 @@ SLUS-00050:
     multitap: false
     linkCable: false
 SLPS-00748:
-  name: "Sim Town (Japan)"
+  name: "Sim Town"
+  saveName: "Sim Town (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148490,7 +156147,8 @@ SLPS-00748:
     multitap: false
     linkCable: false
 SLES-00471:
-  name: "SimCity 2000 (Europe) (En,Fr,De,Es)"
+  name: "SimCity 2000"
+  saveName: "SimCity 2000 (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -148512,7 +156170,8 @@ SLES-00471:
     multitap: false
     linkCable: false
 SLPS-00420:
-  name: "SimCity 2000 (Japan)"
+  name: "SimCity 2000"
+  saveName: "SimCity 2000 (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -148534,7 +156193,8 @@ SLPS-00420:
     multitap: false
     linkCable: false
 SLUS-00113:
-  name: "SimCity 2000 (USA)"
+  name: "SimCity 2000"
+  saveName: "SimCity 2000 (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -148553,7 +156213,8 @@ SLUS-00113:
     multitap: false
     linkCable: false
 SLUS-01069:
-  name: "SimTheme Park (USA)"
+  name: "SimTheme Park"
+  saveName: "SimTheme Park (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1485-ge6156e2a"
@@ -148574,7 +156235,8 @@ SLUS-01069:
     multitap: false
     linkCable: false
 SLPS-02842:
-  name: "Simple 1500 Jitsuyou Series Vol. 01 - Norikae Annai - 2000 Nen Ban (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 01 - Norikae Annai - 2000 Nen Ban"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 01 - Norikae Annai - 2000 Nen Ban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148593,7 +156255,8 @@ SLPS-02842:
     multitap: false
     linkCable: false
 SLPS-02843:
-  name: "Simple 1500 Jitsuyou Series Vol. 02 - Katei no Fuusui (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 02 - Katei no Fuusui"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 02 - Katei no Fuusui (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148612,7 +156275,8 @@ SLPS-02843:
     multitap: false
     linkCable: false
 SLPS-02841:
-  name: "Simple 1500 Jitsuyou Series Vol. 03 - Seimei Handan (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 03 - Seimei Handan"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 03 - Seimei Handan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148631,7 +156295,8 @@ SLPS-02841:
     multitap: false
     linkCable: false
 SLPS-02839:
-  name: "Simple 1500 Jitsuyou Series Vol. 04 - Ryouri - Teiban Ryouri Recipe Shuu (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 04 - Ryouri - Teiban Ryouri Recipe Shuu"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 04 - Ryouri - Teiban Ryouri Recipe Shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148650,7 +156315,8 @@ SLPS-02839:
     multitap: false
     linkCable: false
 SLPM-86706:
-  name: "Simple 1500 Jitsuyou Series Vol. 05 - Kusuri no Jiten - Pill Book 2001 Nen Ban (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 05 - Kusuri no Jiten - Pill Book 2001 Nen Ban"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 05 - Kusuri no Jiten - Pill Book 2001 Nen Ban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148668,7 +156334,8 @@ SLPM-86706:
     multitap: false
     linkCable: false
 SLPM-86707:
-  name: "Simple 1500 Jitsuyou Series Vol. 06 - Cocktail no Recipe (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 06 - Cocktail no Recipe"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 06 - Cocktail no Recipe (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148687,7 +156354,8 @@ SLPM-86707:
     multitap: false
     linkCable: false
 SLPM-86797:
-  name: "Simple 1500 Jitsuyou Series Vol. 07 - Tanoshiku Manabu Unten Menkyo (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 07 - Tanoshiku Manabu Unten Menkyo"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 07 - Tanoshiku Manabu Unten Menkyo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148705,7 +156373,8 @@ SLPM-86797:
     multitap: false
     linkCable: false
 SLPM-86708:
-  name: "Simple 1500 Jitsuyou Series Vol. 08 - 1-jikan de Wakaru Kabushiki Toushi (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 08 - 1-jikan de Wakaru Kabushiki Toushi"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 08 - 1-jikan de Wakaru Kabushiki Toushi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148723,7 +156392,8 @@ SLPM-86708:
     multitap: false
     linkCable: false
 SLPM-86843:
-  name: "Simple 1500 Jitsuyou Series Vol. 09 - Watashi Style no Aromatherapy (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 09 - Watashi Style no Aromatherapy"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 09 - Watashi Style no Aromatherapy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148742,7 +156412,8 @@ SLPM-86843:
     multitap: false
     linkCable: false
 SLPM-86913:
-  name: "Simple 1500 Jitsuyou Series Vol. 10 - Tarot Uranai (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 10 - Tarot Uranai"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 10 - Tarot Uranai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148761,7 +156432,8 @@ SLPM-86913:
     multitap: false
     linkCable: false
 SLPM-86968:
-  name: "Simple 1500 Jitsuyou Series Vol. 11 - Katei de Dekiru Tsubo Shiatsu (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 11 - Katei de Dekiru Tsubo Shiatsu"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 11 - Katei de Dekiru Tsubo Shiatsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148780,7 +156452,8 @@ SLPM-86968:
     multitap: false
     linkCable: false
 SLPM-86969:
-  name: "Simple 1500 Jitsuyou Series Vol. 12 - Katei no Igaku - Shindan Jiten (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 12 - Katei no Igaku - Shindan Jiten"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 12 - Katei no Igaku - Shindan Jiten (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148798,7 +156471,8 @@ SLPM-86969:
     multitap: false
     linkCable: false
 SLPM-87016:
-  name: "Simple 1500 Jitsuyou Series Vol. 13 - Shinri Game - Soreike x Kokology - Kokoro no Uso no Makafushigi (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 13 - Shinri Game - Soreike x Kokology - Kokoro no Uso no Makafushigi"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 13 - Shinri Game - Soreike x Kokology - Kokoro no Uso no Makafushigi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148816,7 +156490,8 @@ SLPM-87016:
     multitap: false
     linkCable: false
 SLPM-87022:
-  name: "Simple 1500 Jitsuyou Series Vol. 14 - Kurashi no Manner - Kankon Sousai-hen (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 14 - Kurashi no Manner - Kankon Sousai-hen"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 14 - Kurashi no Manner - Kankon Sousai-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148834,7 +156509,8 @@ SLPM-87022:
     multitap: false
     linkCable: false
 SLPM-87051:
-  name: "Simple 1500 Jitsuyou Series Vol. 15 - Inu no Kai-kata - Sekai no Inu Catalog (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 15 - Inu no Kai-kata - Sekai no Inu Catalog"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 15 - Inu no Kai-kata - Sekai no Inu Catalog (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148852,7 +156528,8 @@ SLPM-87051:
     multitap: false
     linkCable: false
 SLPM-87052:
-  name: "Simple 1500 Jitsuyou Series Vol. 16 - Neko no Kai-kata - Sekai no Neko Catalog (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 16 - Neko no Kai-kata - Sekai no Neko Catalog"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 16 - Neko no Kai-kata - Sekai no Neko Catalog (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148870,7 +156547,8 @@ SLPM-87052:
     multitap: false
     linkCable: false
 SLPM-87049:
-  name: "Simple 1500 Jitsuyou Series Vol. 17 - Planetarium (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 17 - Planetarium"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 17 - Planetarium (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148889,7 +156567,8 @@ SLPM-87049:
     multitap: false
     linkCable: false
 SLPM-87072:
-  name: "Simple 1500 Jitsuyou Series Vol. 18 - Kanji Quiz - Kanji Kentei ni Challenge (Japan)"
+  name: "Simple 1500 Jitsuyou Series Vol. 18 - Kanji Quiz - Kanji Kentei ni Challenge"
+  saveName: "Simple 1500 Jitsuyou Series Vol. 18 - Kanji Quiz - Kanji Kentei ni Challenge (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148908,7 +156587,8 @@ SLPM-87072:
     multitap: false
     linkCable: false
 SLPM-86866:
-  name: "Simple 1500 Series - Hello Kitty Vol. 01 - Bowling (Japan)"
+  name: "Simple 1500 Series - Hello Kitty Vol. 01 - Bowling"
+  saveName: "Simple 1500 Series - Hello Kitty Vol. 01 - Bowling (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148927,7 +156607,8 @@ SLPM-86866:
     multitap: false
     linkCable: false
 SLPM-86867:
-  name: "Simple 1500 Series - Hello Kitty Vol. 02 - Illust Puzzle (Japan)"
+  name: "Simple 1500 Series - Hello Kitty Vol. 02 - Illust Puzzle"
+  saveName: "Simple 1500 Series - Hello Kitty Vol. 02 - Illust Puzzle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -148945,7 +156626,8 @@ SLPM-86867:
     multitap: false
     linkCable: false
 SLPM-86911:
-  name: "Simple 1500 Series - Hello Kitty Vol. 03 - Block Kuzushi (Japan)"
+  name: "Simple 1500 Series - Hello Kitty Vol. 03 - Block Kuzushi"
+  saveName: "Simple 1500 Series - Hello Kitty Vol. 03 - Block Kuzushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148964,7 +156646,8 @@ SLPM-86911:
     multitap: false
     linkCable: false
 SLPM-86910:
-  name: "Simple 1500 Series - Hello Kitty Vol. 04 - Trump (Japan)"
+  name: "Simple 1500 Series - Hello Kitty Vol. 04 - Trump"
+  saveName: "Simple 1500 Series - Hello Kitty Vol. 04 - Trump (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -148983,11 +156666,13 @@ SLPM-86910:
     multitap: false
     linkCable: false
 SLPM-80472:
-  name: "Simple 1500 Series - The Demo (Japan)"
+  name: "Simple 1500 Series - The Demo"
+  saveName: "Simple 1500 Series - The Demo (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPS-02437:
-  name: "Simple 1500 Series Vol. 1 - The Mahjong (Japan)"
+  name: "Simple 1500 Series Vol. 1 - The Mahjong"
+  saveName: "Simple 1500 Series Vol. 1 - The Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149006,7 +156691,8 @@ SLPS-02437:
     multitap: false
     linkCable: false
 SLPS-01631:
-  name: "Simple 1500 Series Vol. 1 - The Mahjong (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 1 - The Mahjong (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 1 - The Mahjong (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149025,7 +156711,8 @@ SLPS-01631:
     multitap: false
     linkCable: false
 SLPS-02446:
-  name: "Simple 1500 Series Vol. 10 - The Billiard (Japan)"
+  name: "Simple 1500 Series Vol. 10 - The Billiard"
+  saveName: "Simple 1500 Series Vol. 10 - The Billiard (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149044,7 +156731,8 @@ SLPS-02446:
     multitap: false
     linkCable: false
 SLPS-02030:
-  name: "Simple 1500 Series Vol. 10 - The Billiard (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 10 - The Billiard (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 10 - The Billiard (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149063,7 +156751,8 @@ SLPS-02030:
     multitap: false
     linkCable: false
 SLPM-87141:
-  name: "Simple 1500 Series Vol. 100 - The Uchuu Hikoushi (Japan)"
+  name: "Simple 1500 Series Vol. 100 - The Uchuu Hikoushi"
+  saveName: "Simple 1500 Series Vol. 100 - The Uchuu Hikoushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149082,7 +156771,8 @@ SLPM-87141:
     multitap: false
     linkCable: false
 SLPM-87142:
-  name: "Simple 1500 Series Vol. 101 - The Sentou (Japan)"
+  name: "Simple 1500 Series Vol. 101 - The Sentou"
+  saveName: "Simple 1500 Series Vol. 101 - The Sentou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149100,7 +156790,8 @@ SLPM-87142:
     multitap: false
     linkCable: false
 SLPM-87144:
-  name: "Simple 1500 Series Vol. 102 - The Densha Untenshu - Densha de Go! Nagoya Tetsudou-hen (Japan)"
+  name: "Simple 1500 Series Vol. 102 - The Densha Untenshu - Densha de Go! Nagoya Tetsudou-hen"
+  saveName: "Simple 1500 Series Vol. 102 - The Densha Untenshu - Densha de Go! Nagoya Tetsudou-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149119,7 +156810,8 @@ SLPM-87144:
     multitap: false
     linkCable: false
 SLPM-87212:
-  name: "Simple 1500 Series Vol. 103 - The Ganso Densha Untenshi - Densha de Go! (Japan)"
+  name: "Simple 1500 Series Vol. 103 - The Ganso Densha Untenshi - Densha de Go!"
+  saveName: "Simple 1500 Series Vol. 103 - The Ganso Densha Untenshi - Densha de Go! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149137,7 +156829,8 @@ SLPM-87212:
     multitap: false
     linkCable: false
 SLPM-87215:
-  name: "Simple 1500 Series Vol. 104 - The Pink Panther - Pinkadelic Pursuit (Japan)"
+  name: "Simple 1500 Series Vol. 104 - The Pink Panther - Pinkadelic Pursuit"
+  saveName: "Simple 1500 Series Vol. 104 - The Pink Panther - Pinkadelic Pursuit (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149156,7 +156849,8 @@ SLPM-87215:
     multitap: false
     linkCable: false
 SLPS-02447:
-  name: "Simple 1500 Series Vol. 11 - The Pinball - 3D (Japan)"
+  name: "Simple 1500 Series Vol. 11 - The Pinball - 3D"
+  saveName: "Simple 1500 Series Vol. 11 - The Pinball - 3D (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149175,7 +156869,8 @@ SLPS-02447:
     multitap: false
     linkCable: false
 SLPS-02178:
-  name: "Simple 1500 Series Vol. 11 - The Pinball - 3D (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 11 - The Pinball - 3D (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 11 - The Pinball - 3D (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149194,7 +156889,8 @@ SLPS-02178:
     multitap: false
     linkCable: false
 SLPS-02448:
-  name: "Simple 1500 Series Vol. 12 - The Quiz (Japan)"
+  name: "Simple 1500 Series Vol. 12 - The Quiz"
+  saveName: "Simple 1500 Series Vol. 12 - The Quiz (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149213,7 +156909,8 @@ SLPS-02448:
     multitap: false
     linkCable: false
 SLPS-02179:
-  name: "Simple 1500 Series Vol. 12 - The Quiz (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 12 - The Quiz (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 12 - The Quiz (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149232,7 +156929,8 @@ SLPS-02179:
     multitap: false
     linkCable: false
 SLPS-02449:
-  name: "Simple 1500 Series Vol. 13 - The Race (Japan)"
+  name: "Simple 1500 Series Vol. 13 - The Race"
+  saveName: "Simple 1500 Series Vol. 13 - The Race (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149252,7 +156950,8 @@ SLPS-02449:
     multitap: false
     linkCable: false
 SLPS-02197:
-  name: "Simple 1500 Series Vol. 13 - The Race (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 13 - The Race (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 13 - The Race (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149272,7 +156971,8 @@ SLPS-02197:
     multitap: false
     linkCable: false
 SLPS-02450:
-  name: "Simple 1500 Series Vol. 14 - The Block Kuzushi (Japan)"
+  name: "Simple 1500 Series Vol. 14 - The Block Kuzushi"
+  saveName: "Simple 1500 Series Vol. 14 - The Block Kuzushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149291,7 +156991,8 @@ SLPS-02450:
     multitap: false
     linkCable: false
 SLPS-02227:
-  name: "Simple 1500 Series Vol. 14 - The Block Kuzushi (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 14 - The Block Kuzushi (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 14 - The Block Kuzushi (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149310,7 +157011,8 @@ SLPS-02227:
     multitap: false
     linkCable: false
 SLPS-02451:
-  name: "Simple 1500 Series Vol. 15 - The Pachinko (Japan)"
+  name: "Simple 1500 Series Vol. 15 - The Pachinko"
+  saveName: "Simple 1500 Series Vol. 15 - The Pachinko (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149329,7 +157031,8 @@ SLPS-02451:
     multitap: false
     linkCable: false
 SLPS-02301:
-  name: "Simple 1500 Series Vol. 15 - The Pachinko (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 15 - The Pachinko (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 15 - The Pachinko (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149348,7 +157051,8 @@ SLPS-02301:
     multitap: false
     linkCable: false
 SLPS-02452:
-  name: "Simple 1500 Series Vol. 16 - The Pachi-Slot (Japan)"
+  name: "Simple 1500 Series Vol. 16 - The Pachi-Slot"
+  saveName: "Simple 1500 Series Vol. 16 - The Pachi-Slot (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149366,7 +157070,8 @@ SLPS-02452:
     multitap: false
     linkCable: false
 SLPS-02453:
-  name: "Simple 1500 Series Vol. 17 - The Bike Race (Japan)"
+  name: "Simple 1500 Series Vol. 17 - The Bike Race"
+  saveName: "Simple 1500 Series Vol. 17 - The Bike Race (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149386,7 +157091,8 @@ SLPS-02453:
     multitap: false
     linkCable: false
 SLPS-02303:
-  name: "Simple 1500 Series Vol. 17 - The Bike Race (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 17 - The Bike Race (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 17 - The Bike Race (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149406,7 +157112,8 @@ SLPS-02303:
     multitap: false
     linkCable: false
 SLPS-02433:
-  name: "Simple 1500 Series Vol. 18 - The Bowling (Japan)"
+  name: "Simple 1500 Series Vol. 18 - The Bowling"
+  saveName: "Simple 1500 Series Vol. 18 - The Bowling (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149425,7 +157132,8 @@ SLPS-02433:
     multitap: false
     linkCable: false
 SLPS-02435:
-  name: "Simple 1500 Series Vol. 19 - The Sugoroku (Japan)"
+  name: "Simple 1500 Series Vol. 19 - The Sugoroku"
+  saveName: "Simple 1500 Series Vol. 19 - The Sugoroku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149444,7 +157152,8 @@ SLPS-02435:
     multitap: false
     linkCable: false
 SLPS-02438:
-  name: "Simple 1500 Series Vol. 2 - The Shougi (Japan)"
+  name: "Simple 1500 Series Vol. 2 - The Shougi"
+  saveName: "Simple 1500 Series Vol. 2 - The Shougi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149463,7 +157172,8 @@ SLPS-02438:
     multitap: false
     linkCable: false
 SLPS-01632:
-  name: "Simple 1500 Series Vol. 2 - The Shougi (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 2 - The Shougi (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 2 - The Shougi (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149482,7 +157192,8 @@ SLPS-01632:
     multitap: false
     linkCable: false
 SLPS-02434:
-  name: "Simple 1500 Series Vol. 20 - The Puzzle (Japan)"
+  name: "Simple 1500 Series Vol. 20 - The Puzzle"
+  saveName: "Simple 1500 Series Vol. 20 - The Puzzle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149500,7 +157211,8 @@ SLPS-02434:
     multitap: false
     linkCable: false
 SLPS-02471:
-  name: "Simple 1500 Series Vol. 21 - The Yakyuu (Japan)"
+  name: "Simple 1500 Series Vol. 21 - The Yakyuu"
+  saveName: "Simple 1500 Series Vol. 21 - The Yakyuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149518,7 +157230,8 @@ SLPS-02471:
     multitap: false
     linkCable: false
 SLPM-86719:
-  name: "Simple 1500 Series Vol. 21 - The Yakyuu - Pro Yakyuu Jitsumeiban (Japan)"
+  name: "Simple 1500 Series Vol. 21 - The Yakyuu - Pro Yakyuu Jitsumeiban"
+  saveName: "Simple 1500 Series Vol. 21 - The Yakyuu - Pro Yakyuu Jitsumeiban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149536,7 +157249,8 @@ SLPM-86719:
     multitap: false
     linkCable: false
 SLPS-02472:
-  name: "Simple 1500 Series Vol. 22 - The Pro Wrestling (Japan)"
+  name: "Simple 1500 Series Vol. 22 - The Pro Wrestling"
+  saveName: "Simple 1500 Series Vol. 22 - The Pro Wrestling (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149555,7 +157269,8 @@ SLPS-02472:
     multitap: false
     linkCable: false
 SLPS-02473:
-  name: "Simple 1500 Series Vol. 23 - The Gateball (Japan)"
+  name: "Simple 1500 Series Vol. 23 - The Gateball"
+  saveName: "Simple 1500 Series Vol. 23 - The Gateball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -149573,7 +157288,8 @@ SLPS-02473:
     multitap: false
     linkCable: false
 SLPS-02474:
-  name: "Simple 1500 Series Vol. 24 - The Gun Shooting (Japan)"
+  name: "Simple 1500 Series Vol. 24 - The Gun Shooting"
+  saveName: "Simple 1500 Series Vol. 24 - The Gun Shooting (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -149596,7 +157312,8 @@ SLPS-02474:
     multitap: false
     linkCable: false
 SLPS-02475:
-  name: "Simple 1500 Series Vol. 25 - The Keiba (Japan)"
+  name: "Simple 1500 Series Vol. 25 - The Keiba"
+  saveName: "Simple 1500 Series Vol. 25 - The Keiba (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149615,7 +157332,8 @@ SLPS-02475:
     multitap: false
     linkCable: false
 SLPS-02228:
-  name: "Simple 1500 Series Vol. 26 - The Tennis (Japan)"
+  name: "Simple 1500 Series Vol. 26 - The Tennis"
+  saveName: "Simple 1500 Series Vol. 26 - The Tennis (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149634,7 +157352,8 @@ SLPS-02228:
     multitap: true
     linkCable: false
 SLPS-02630:
-  name: "Simple 1500 Series Vol. 27 - The Snowboard (Japan)"
+  name: "Simple 1500 Series Vol. 27 - The Snowboard"
+  saveName: "Simple 1500 Series Vol. 27 - The Snowboard (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149653,7 +157372,8 @@ SLPS-02630:
     multitap: false
     linkCable: false
 SLPS-02726:
-  name: "Simple 1500 Series Vol. 28 - The Dungeon RPG (Japan)"
+  name: "Simple 1500 Series Vol. 28 - The Dungeon RPG"
+  saveName: "Simple 1500 Series Vol. 28 - The Dungeon RPG (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149672,7 +157392,8 @@ SLPS-02726:
     multitap: false
     linkCable: false
 SLPS-02755:
-  name: "Simple 1500 Series Vol. 29 - The Tsuri (Japan)"
+  name: "Simple 1500 Series Vol. 29 - The Tsuri"
+  saveName: "Simple 1500 Series Vol. 29 - The Tsuri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149691,7 +157412,8 @@ SLPS-02755:
     multitap: false
     linkCable: false
 SLPS-02439:
-  name: "Simple 1500 Series Vol. 3 - The Gomoku Narabe (Japan)"
+  name: "Simple 1500 Series Vol. 3 - The Gomoku Narabe"
+  saveName: "Simple 1500 Series Vol. 3 - The Gomoku Narabe (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149710,7 +157432,8 @@ SLPS-02439:
     multitap: false
     linkCable: false
 SLPS-01633:
-  name: "Simple 1500 Series Vol. 3 - The Gomoku Narabe (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 3 - The Gomoku Narabe (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 3 - The Gomoku Narabe (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149729,7 +157452,8 @@ SLPS-01633:
     multitap: false
     linkCable: false
 SLPS-02756:
-  name: "Simple 1500 Series Vol. 30 - The Basket - 1 on 1 Plus (Japan)"
+  name: "Simple 1500 Series Vol. 30 - The Basket - 1 on 1 Plus"
+  saveName: "Simple 1500 Series Vol. 30 - The Basket - 1 on 1 Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149748,7 +157472,8 @@ SLPS-02756:
     multitap: true
     linkCable: false
 SLPS-02840:
-  name: "Simple 1500 Series Vol. 31 - The Sound Novel (Japan)"
+  name: "Simple 1500 Series Vol. 31 - The Sound Novel"
+  saveName: "Simple 1500 Series Vol. 31 - The Sound Novel (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149767,7 +157492,8 @@ SLPS-02840:
     multitap: false
     linkCable: false
 SLPS-02922:
-  name: "Simple 1500 Series Vol. 32 - The Boxing (Japan)"
+  name: "Simple 1500 Series Vol. 32 - The Boxing"
+  saveName: "Simple 1500 Series Vol. 32 - The Boxing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149786,7 +157512,8 @@ SLPS-02922:
     multitap: false
     linkCable: false
 SLPS-02908:
-  name: "Simple 1500 Series Vol. 33 - The Takkyuu (Japan)"
+  name: "Simple 1500 Series Vol. 33 - The Takkyuu"
+  saveName: "Simple 1500 Series Vol. 33 - The Takkyuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149805,7 +157532,8 @@ SLPS-02908:
     multitap: false
     linkCable: false
 SLPS-02909:
-  name: "Simple 1500 Series Vol. 34 - The Quiz Bangumi (Japan)"
+  name: "Simple 1500 Series Vol. 34 - The Quiz Bangumi"
+  saveName: "Simple 1500 Series Vol. 34 - The Quiz Bangumi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149824,7 +157552,8 @@ SLPS-02909:
     multitap: true
     linkCable: false
 SLPS-02910:
-  name: "Simple 1500 Series Vol. 35 - The Shooting (Japan)"
+  name: "Simple 1500 Series Vol. 35 - The Shooting"
+  saveName: "Simple 1500 Series Vol. 35 - The Shooting (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149843,7 +157572,8 @@ SLPS-02910:
     multitap: false
     linkCable: false
 SLPS-02923:
-  name: "Simple 1500 Series Vol. 36 - The Ren'ai Simulation - Natsuiro Celebration (Japan)"
+  name: "Simple 1500 Series Vol. 36 - The Ren'ai Simulation - Natsuiro Celebration"
+  saveName: "Simple 1500 Series Vol. 36 - The Ren'ai Simulation - Natsuiro Celebration (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149862,7 +157592,8 @@ SLPS-02923:
     multitap: false
     linkCable: false
 SLPS-02958:
-  name: "Simple 1500 Series Vol. 37 - The Illust Puzzle & Slide Puzzle (Japan)"
+  name: "Simple 1500 Series Vol. 37 - The Illust Puzzle & Slide Puzzle"
+  saveName: "Simple 1500 Series Vol. 37 - The Illust Puzzle & Slide Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149881,7 +157612,8 @@ SLPS-02958:
     multitap: false
     linkCable: false
 SLPS-02959:
-  name: "Simple 1500 Series Vol. 38 - The Real Racing - Toyota (Japan)"
+  name: "Simple 1500 Series Vol. 38 - The Real Racing - Toyota"
+  saveName: "Simple 1500 Series Vol. 38 - The Real Racing - Toyota (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149901,7 +157633,8 @@ SLPS-02959:
     multitap: false
     linkCable: false
 SLPS-03004:
-  name: "Simple 1500 Series Vol. 39 - The Mahjong 2 (Japan)"
+  name: "Simple 1500 Series Vol. 39 - The Mahjong 2"
+  saveName: "Simple 1500 Series Vol. 39 - The Mahjong 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149920,7 +157653,8 @@ SLPS-03004:
     multitap: false
     linkCable: false
 SLPS-02440:
-  name: "Simple 1500 Series Vol. 4 - The Reversi (Japan)"
+  name: "Simple 1500 Series Vol. 4 - The Reversi"
+  saveName: "Simple 1500 Series Vol. 4 - The Reversi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149939,7 +157673,8 @@ SLPS-02440:
     multitap: false
     linkCable: false
 SLPS-01634:
-  name: "Simple 1500 Series Vol. 4 - The Reversi (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 4 - The Reversi (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 4 - The Reversi (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149958,7 +157693,8 @@ SLPS-01634:
     multitap: false
     linkCable: false
 SLPS-03006:
-  name: "Simple 1500 Series Vol. 40 - The Shougi 2 (Japan)"
+  name: "Simple 1500 Series Vol. 40 - The Shougi 2"
+  saveName: "Simple 1500 Series Vol. 40 - The Shougi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149977,7 +157713,8 @@ SLPS-03006:
     multitap: false
     linkCable: false
 SLPS-03010:
-  name: "Simple 1500 Series Vol. 41 - The Reversi 2 (Japan)"
+  name: "Simple 1500 Series Vol. 41 - The Reversi 2"
+  saveName: "Simple 1500 Series Vol. 41 - The Reversi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -149996,7 +157733,8 @@ SLPS-03010:
     multitap: false
     linkCable: false
 SLPS-03005:
-  name: "Simple 1500 Series Vol. 42 - The Igo 2 (Japan)"
+  name: "Simple 1500 Series Vol. 42 - The Igo 2"
+  saveName: "Simple 1500 Series Vol. 42 - The Igo 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150015,7 +157753,8 @@ SLPS-03005:
     multitap: false
     linkCable: false
 SLPS-03009:
-  name: "Simple 1500 Series Vol. 43 - The Hanafuda 2 (Japan)"
+  name: "Simple 1500 Series Vol. 43 - The Hanafuda 2"
+  saveName: "Simple 1500 Series Vol. 43 - The Hanafuda 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150034,7 +157773,8 @@ SLPS-03009:
     multitap: false
     linkCable: false
 SLPS-03007:
-  name: "Simple 1500 Series Vol. 44 - The Card 2 (Japan)"
+  name: "Simple 1500 Series Vol. 44 - The Card 2"
+  saveName: "Simple 1500 Series Vol. 44 - The Card 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150053,7 +157793,8 @@ SLPS-03007:
     multitap: false
     linkCable: false
 SLPS-03036:
-  name: "Simple 1500 Series Vol. 45 - The Block Kuzushi 2 (Japan)"
+  name: "Simple 1500 Series Vol. 45 - The Block Kuzushi 2"
+  saveName: "Simple 1500 Series Vol. 45 - The Block Kuzushi 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150072,7 +157813,8 @@ SLPS-03036:
     multitap: false
     linkCable: false
 SLPS-03035:
-  name: "Simple 1500 Series Vol. 46 - The Mahjong Ochigee - Raku Jongg (Japan)"
+  name: "Simple 1500 Series Vol. 46 - The Mahjong Ochigee - Raku Jongg"
+  saveName: "Simple 1500 Series Vol. 46 - The Mahjong Ochigee - Raku Jongg (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150091,7 +157833,8 @@ SLPS-03035:
     multitap: false
     linkCable: false
 SLPS-03037:
-  name: "Simple 1500 Series Vol. 47 - The Skateboard (Japan)"
+  name: "Simple 1500 Series Vol. 47 - The Skateboard"
+  saveName: "Simple 1500 Series Vol. 47 - The Skateboard (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150110,7 +157853,8 @@ SLPS-03037:
     multitap: false
     linkCable: false
 SLPM-86698:
-  name: "Simple 1500 Series Vol. 48 - The Puzzle 2 (Japan)"
+  name: "Simple 1500 Series Vol. 48 - The Puzzle 2"
+  saveName: "Simple 1500 Series Vol. 48 - The Puzzle 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150129,7 +157873,8 @@ SLPM-86698:
     multitap: false
     linkCable: false
 SLPM-86699:
-  name: "Simple 1500 Series Vol. 49 - The Casino (Japan)"
+  name: "Simple 1500 Series Vol. 49 - The Casino"
+  saveName: "Simple 1500 Series Vol. 49 - The Casino (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150148,7 +157893,8 @@ SLPM-86699:
     multitap: false
     linkCable: false
 SLPS-02441:
-  name: "Simple 1500 Series Vol. 5 - The Igo (Japan)"
+  name: "Simple 1500 Series Vol. 5 - The Igo"
+  saveName: "Simple 1500 Series Vol. 5 - The Igo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -150166,7 +157912,8 @@ SLPS-02441:
     multitap: false
     linkCable: false
 SLPS-01683:
-  name: "Simple 1500 Series Vol. 5 - The Igo (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 5 - The Igo (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 5 - The Igo (Japan) (Culture Publishers)"
   controllers:
     - DigitalController
   metadata:
@@ -150184,7 +157931,8 @@ SLPS-01683:
     multitap: false
     linkCable: false
 SLPM-86697:
-  name: "Simple 1500 Series Vol. 50 - The Billiard 2 (Japan)"
+  name: "Simple 1500 Series Vol. 50 - The Billiard 2"
+  saveName: "Simple 1500 Series Vol. 50 - The Billiard 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150203,7 +157951,8 @@ SLPM-86697:
     multitap: false
     linkCable: false
 SLPM-86700:
-  name: "Simple 1500 Series Vol. 51 - The Jigsaw Puzzle (Japan)"
+  name: "Simple 1500 Series Vol. 51 - The Jigsaw Puzzle"
+  saveName: "Simple 1500 Series Vol. 51 - The Jigsaw Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150222,7 +157971,8 @@ SLPM-86700:
     multitap: false
     linkCable: false
 SLPM-86702:
-  name: "Simple 1500 Series Vol. 52 - The Pro Wrestling 2 (Japan)"
+  name: "Simple 1500 Series Vol. 52 - The Pro Wrestling 2"
+  saveName: "Simple 1500 Series Vol. 52 - The Pro Wrestling 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150241,7 +157991,8 @@ SLPM-86702:
     multitap: false
     linkCable: false
 SLPM-86701:
-  name: "Simple 1500 Series Vol. 53 - The Helicopter (Japan)"
+  name: "Simple 1500 Series Vol. 53 - The Helicopter"
+  saveName: "Simple 1500 Series Vol. 53 - The Helicopter (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150260,7 +158011,8 @@ SLPM-86701:
     multitap: false
     linkCable: false
 SLPM-86713:
-  name: "Simple 1500 Series Vol. 54 - The Volleyball - Break Volley Plus (Japan)"
+  name: "Simple 1500 Series Vol. 54 - The Volleyball - Break Volley Plus"
+  saveName: "Simple 1500 Series Vol. 54 - The Volleyball - Break Volley Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150279,7 +158031,8 @@ SLPM-86713:
     multitap: true
     linkCable: false
 SLPM-86714:
-  name: "Simple 1500 Series Vol. 55 - The Darts (Japan)"
+  name: "Simple 1500 Series Vol. 55 - The Darts"
+  saveName: "Simple 1500 Series Vol. 55 - The Darts (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150298,7 +158051,8 @@ SLPM-86714:
     multitap: true
     linkCable: false
 SLPM-86762:
-  name: "Simple 1500 Series Vol. 56 - The Sniper (Japan)"
+  name: "Simple 1500 Series Vol. 56 - The Sniper"
+  saveName: "Simple 1500 Series Vol. 56 - The Sniper (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150317,7 +158071,8 @@ SLPM-86762:
     multitap: false
     linkCable: false
 SLPM-86715:
-  name: "Simple 1500 Series Vol. 57 - The Meiro (Japan)"
+  name: "Simple 1500 Series Vol. 57 - The Meiro"
+  saveName: "Simple 1500 Series Vol. 57 - The Meiro (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -150335,7 +158090,8 @@ SLPM-86715:
     multitap: false
     linkCable: false
 SLPM-86760:
-  name: "Simple 1500 Series Vol. 58 - The Sumou (Japan)"
+  name: "Simple 1500 Series Vol. 58 - The Sumou"
+  saveName: "Simple 1500 Series Vol. 58 - The Sumou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -150353,7 +158109,8 @@ SLPM-86760:
     multitap: false
     linkCable: false
 SLPM-86709:
-  name: "Simple 1500 Series Vol. 59 - The Suiri - IT Tantei 18 no Jikenbo (Japan)"
+  name: "Simple 1500 Series Vol. 59 - The Suiri - IT Tantei 18 no Jikenbo"
+  saveName: "Simple 1500 Series Vol. 59 - The Suiri - IT Tantei 18 no Jikenbo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -150371,7 +158128,8 @@ SLPM-86709:
     multitap: false
     linkCable: false
 SLPS-02442:
-  name: "Simple 1500 Series Vol. 6 - The Hanafuda (Japan)"
+  name: "Simple 1500 Series Vol. 6 - The Hanafuda"
+  saveName: "Simple 1500 Series Vol. 6 - The Hanafuda (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150390,7 +158148,8 @@ SLPS-02442:
     multitap: false
     linkCable: false
 SLPS-01684:
-  name: "Simple 1500 Series Vol. 6 - The Hanafuda (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 6 - The Hanafuda (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 6 - The Hanafuda (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150409,7 +158168,8 @@ SLPS-01684:
     multitap: false
     linkCable: false
 SLPM-86761:
-  name: "Simple 1500 Series Vol. 60 - The Table Hockey (Japan)"
+  name: "Simple 1500 Series Vol. 60 - The Table Hockey"
+  saveName: "Simple 1500 Series Vol. 60 - The Table Hockey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150428,7 +158188,8 @@ SLPM-86761:
     multitap: true
     linkCable: false
 SLPM-86803:
-  name: "Simple 1500 Series Vol. 61 - The Quiz 2 (Japan)"
+  name: "Simple 1500 Series Vol. 61 - The Quiz 2"
+  saveName: "Simple 1500 Series Vol. 61 - The Quiz 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150447,7 +158208,8 @@ SLPM-86803:
     multitap: false
     linkCable: false
 SLPM-86801:
-  name: "Simple 1500 Series Vol. 62 - The Ski (Japan)"
+  name: "Simple 1500 Series Vol. 62 - The Ski"
+  saveName: "Simple 1500 Series Vol. 62 - The Ski (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150466,7 +158228,8 @@ SLPM-86801:
     multitap: false
     linkCable: false
 SLPM-86816:
-  name: "Simple 1500 Series Vol. 63 - The Gun Shooting 2 (Japan)"
+  name: "Simple 1500 Series Vol. 63 - The Gun Shooting 2"
+  saveName: "Simple 1500 Series Vol. 63 - The Gun Shooting 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150486,7 +158249,8 @@ SLPM-86816:
     multitap: false
     linkCable: false
 SLPM-86841:
-  name: "Simple 1500 Series Vol. 64 - The Kick Boxing (Japan)"
+  name: "Simple 1500 Series Vol. 64 - The Kick Boxing"
+  saveName: "Simple 1500 Series Vol. 64 - The Kick Boxing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150505,7 +158269,8 @@ SLPM-86841:
     multitap: false
     linkCable: false
 SLPM-86842:
-  name: "Simple 1500 Series Vol. 65 - The Golf (Japan)"
+  name: "Simple 1500 Series Vol. 65 - The Golf"
+  saveName: "Simple 1500 Series Vol. 65 - The Golf (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150524,7 +158289,8 @@ SLPM-86842:
     multitap: true
     linkCable: false
 SLPM-86840:
-  name: "Simple 1500 Series Vol. 66 - The Kaiten - Mawasundaa!! (Japan)"
+  name: "Simple 1500 Series Vol. 66 - The Kaiten - Mawasundaa!!"
+  saveName: "Simple 1500 Series Vol. 66 - The Kaiten - Mawasundaa!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150543,7 +158309,8 @@ SLPM-86840:
     multitap: false
     linkCable: false
 SLPM-86864:
-  name: "Simple 1500 Series Vol. 67 - The Soccer - Dynamite Soccer 1500 (Japan)"
+  name: "Simple 1500 Series Vol. 67 - The Soccer - Dynamite Soccer 1500"
+  saveName: "Simple 1500 Series Vol. 67 - The Soccer - Dynamite Soccer 1500 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150562,7 +158329,8 @@ SLPM-86864:
     multitap: true
     linkCable: false
 SLPM-86865:
-  name: "Simple 1500 Series Vol. 68 - The RC Car - RC de Go! (Japan)"
+  name: "Simple 1500 Series Vol. 68 - The RC Car - RC de Go!"
+  saveName: "Simple 1500 Series Vol. 68 - The RC Car - RC de Go! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150582,7 +158350,8 @@ SLPM-86865:
     multitap: false
     linkCable: false
 SLPM-86868:
-  name: "Simple 1500 Series Vol. 69 - The Putter Golf (Japan)"
+  name: "Simple 1500 Series Vol. 69 - The Putter Golf"
+  saveName: "Simple 1500 Series Vol. 69 - The Putter Golf (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150601,7 +158370,8 @@ SLPM-86868:
     multitap: true
     linkCable: false
 SLPS-02443:
-  name: "Simple 1500 Series Vol. 7 - The Card (Japan)"
+  name: "Simple 1500 Series Vol. 7 - The Card"
+  saveName: "Simple 1500 Series Vol. 7 - The Card (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -150619,7 +158389,8 @@ SLPS-02443:
     multitap: false
     linkCable: false
 SLPS-01685:
-  name: "Simple 1500 Series Vol. 7 - The Card (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 7 - The Card (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 7 - The Card (Japan) (Culture Publishers)"
   controllers:
     - DigitalController
   metadata:
@@ -150637,7 +158408,8 @@ SLPS-01685:
     multitap: false
     linkCable: false
 SLPM-86869:
-  name: "Simple 1500 Series Vol. 70 - The War Simulation - Hito no Tsukurishi Mono-tachi (Japan)"
+  name: "Simple 1500 Series Vol. 70 - The War Simulation - Hito no Tsukurishi Mono-tachi"
+  saveName: "Simple 1500 Series Vol. 70 - The War Simulation - Hito no Tsukurishi Mono-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150656,7 +158428,8 @@ SLPM-86869:
     multitap: false
     linkCable: false
 SLPM-86870:
-  name: "Simple 1500 Series Vol. 71 - The Ren'ai Simulation 2 - Fureai (Japan)"
+  name: "Simple 1500 Series Vol. 71 - The Ren'ai Simulation 2 - Fureai"
+  saveName: "Simple 1500 Series Vol. 71 - The Ren'ai Simulation 2 - Fureai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150675,7 +158448,8 @@ SLPM-86870:
     multitap: false
     linkCable: false
 SLPM-86871:
-  name: "Simple 1500 Series Vol. 72 - The Beach Volley (Japan)"
+  name: "Simple 1500 Series Vol. 72 - The Beach Volley"
+  saveName: "Simple 1500 Series Vol. 72 - The Beach Volley (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150694,7 +158468,8 @@ SLPM-86871:
     multitap: true
     linkCable: false
 SLPM-86900:
-  name: "Simple 1500 Series Vol. 73 - The Invaders - Space Invaders 1500 (Japan)"
+  name: "Simple 1500 Series Vol. 73 - The Invaders - Space Invaders 1500"
+  saveName: "Simple 1500 Series Vol. 73 - The Invaders - Space Invaders 1500 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150715,7 +158490,8 @@ SLPM-86900:
     multitap: false
     linkCable: false
 SLPM-86901:
-  name: "Simple 1500 Series Vol. 74 - The Horror Mystery - Sangeki-kan - Kevin Hakushaku no Fukkatsu (Japan)"
+  name: "Simple 1500 Series Vol. 74 - The Horror Mystery - Sangeki-kan - Kevin Hakushaku no Fukkatsu"
+  saveName: "Simple 1500 Series Vol. 74 - The Horror Mystery - Sangeki-kan - Kevin Hakushaku no Fukkatsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150734,7 +158510,8 @@ SLPM-86901:
     multitap: false
     linkCable: false
 SLPM-86912:
-  name: "Simple 1500 Series Vol. 75 - The Double Shooting - RayStorm x RayCrisis (Japan)"
+  name: "Simple 1500 Series Vol. 75 - The Double Shooting - RayStorm x RayCrisis"
+  saveName: "Simple 1500 Series Vol. 75 - The Double Shooting - RayStorm x RayCrisis (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150753,7 +158530,8 @@ SLPM-86912:
     multitap: false
     linkCable: false
 SLPM-86914:
-  name: "Simple 1500 Series Vol. 76 - The Dodgeball (Japan)"
+  name: "Simple 1500 Series Vol. 76 - The Dodgeball"
+  saveName: "Simple 1500 Series Vol. 76 - The Dodgeball (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150772,7 +158550,8 @@ SLPM-86914:
     multitap: false
     linkCable: false
 SLPM-86915:
-  name: "Simple 1500 Series Vol. 77 - The Suiei (Japan)"
+  name: "Simple 1500 Series Vol. 77 - The Suiei"
+  saveName: "Simple 1500 Series Vol. 77 - The Suiei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150791,7 +158570,8 @@ SLPM-86915:
     multitap: true
     linkCable: false
 SLPM-86712:
-  name: "Simple 1500 Series Vol. 78 - The Zeroyon (Japan)"
+  name: "Simple 1500 Series Vol. 78 - The Zeroyon"
+  saveName: "Simple 1500 Series Vol. 78 - The Zeroyon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150811,7 +158591,8 @@ SLPM-86712:
     multitap: false
     linkCable: false
 SLPM-86970:
-  name: "Simple 1500 Series Vol. 79 - The Shisenshou (Japan)"
+  name: "Simple 1500 Series Vol. 79 - The Shisenshou"
+  saveName: "Simple 1500 Series Vol. 79 - The Shisenshou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150830,7 +158611,8 @@ SLPM-86970:
     multitap: false
     linkCable: false
 SLPS-02444:
-  name: "Simple 1500 Series Vol. 8 - The Solitaire (Japan)"
+  name: "Simple 1500 Series Vol. 8 - The Solitaire"
+  saveName: "Simple 1500 Series Vol. 8 - The Solitaire (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150849,7 +158631,8 @@ SLPS-02444:
     multitap: false
     linkCable: false
 SLPS-01686:
-  name: "Simple 1500 Series Vol. 8 - The Solitaire (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 8 - The Solitaire (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 8 - The Solitaire (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150868,7 +158651,8 @@ SLPS-01686:
     multitap: false
     linkCable: false
 SLPM-86971:
-  name: "Simple 1500 Series Vol. 80 - The Jintori (Japan)"
+  name: "Simple 1500 Series Vol. 80 - The Jintori"
+  saveName: "Simple 1500 Series Vol. 80 - The Jintori (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150887,7 +158671,8 @@ SLPM-86971:
     multitap: false
     linkCable: false
 SLPM-86972:
-  name: "Simple 1500 Series Vol. 81 - The Ren'ai Adventure - Okaeri! (Japan)"
+  name: "Simple 1500 Series Vol. 81 - The Ren'ai Adventure - Okaeri!"
+  saveName: "Simple 1500 Series Vol. 81 - The Ren'ai Adventure - Okaeri! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150906,7 +158691,8 @@ SLPM-86972:
     multitap: false
     linkCable: false
 SLPM-86973:
-  name: "Simple 1500 Series Vol. 82 - The Sensuikan (Japan)"
+  name: "Simple 1500 Series Vol. 82 - The Sensuikan"
+  saveName: "Simple 1500 Series Vol. 82 - The Sensuikan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150925,7 +158711,8 @@ SLPM-86973:
     multitap: false
     linkCable: false
 SLPM-86998:
-  name: "Simple 1500 Series Vol. 83 - The Wakeboard - BursTrick Wakeboarding!! (Japan)"
+  name: "Simple 1500 Series Vol. 83 - The Wakeboard - BursTrick Wakeboarding!!"
+  saveName: "Simple 1500 Series Vol. 83 - The Wakeboard - BursTrick Wakeboarding!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150944,7 +158731,8 @@ SLPM-86998:
     multitap: false
     linkCable: false
 SLPM-86974:
-  name: "Simple 1500 Series Vol. 84 - The Intro Quiz (Japan)"
+  name: "Simple 1500 Series Vol. 84 - The Intro Quiz"
+  saveName: "Simple 1500 Series Vol. 84 - The Intro Quiz (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150963,7 +158751,8 @@ SLPM-86974:
     multitap: false
     linkCable: false
 SLPM-87008:
-  name: "Simple 1500 Series Vol. 85 - The Sengoku Bushou - Tenka Touitsu no Yabou (Japan)"
+  name: "Simple 1500 Series Vol. 85 - The Sengoku Bushou - Tenka Touitsu no Yabou"
+  saveName: "Simple 1500 Series Vol. 85 - The Sengoku Bushou - Tenka Touitsu no Yabou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -150982,7 +158771,8 @@ SLPM-87008:
     multitap: false
     linkCable: false
 SLPM-87017:
-  name: "Simple 1500 Series Vol. 86 - The Onigokko (Japan)"
+  name: "Simple 1500 Series Vol. 86 - The Onigokko"
+  saveName: "Simple 1500 Series Vol. 86 - The Onigokko (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151001,7 +158791,8 @@ SLPM-87017:
     multitap: true
     linkCable: false
 SLPM-87026:
-  name: "Simple 1500 Series Vol. 87 - The Kyoutei (Japan)"
+  name: "Simple 1500 Series Vol. 87 - The Kyoutei"
+  saveName: "Simple 1500 Series Vol. 87 - The Kyoutei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151021,7 +158812,8 @@ SLPM-87026:
     multitap: false
     linkCable: false
 SLPM-87023:
-  name: "Simple 1500 Series Vol. 88 - The Gal Mahjong - Love Songs - Idol wa High Rate (Japan)"
+  name: "Simple 1500 Series Vol. 88 - The Gal Mahjong - Love Songs - Idol wa High Rate"
+  saveName: "Simple 1500 Series Vol. 88 - The Gal Mahjong - Love Songs - Idol wa High Rate (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151040,7 +158832,8 @@ SLPM-87023:
     multitap: false
     linkCable: false
 SLPM-87035:
-  name: "Simple 1500 Series Vol. 89 - The Power Shovel ni Norou!! (Japan)"
+  name: "Simple 1500 Series Vol. 89 - The Power Shovel ni Norou!!"
+  saveName: "Simple 1500 Series Vol. 89 - The Power Shovel ni Norou!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151059,7 +158852,8 @@ SLPM-87035:
     multitap: false
     linkCable: false
 SLPS-02445:
-  name: "Simple 1500 Series Vol. 9 - The Chess (Japan)"
+  name: "Simple 1500 Series Vol. 9 - The Chess"
+  saveName: "Simple 1500 Series Vol. 9 - The Chess (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151078,7 +158872,8 @@ SLPS-02445:
     multitap: false
     linkCable: false
 SLPS-01687:
-  name: "Simple 1500 Series Vol. 9 - The Chess (Japan) (Culture Publishers)"
+  name: "Simple 1500 Series Vol. 9 - The Chess (Culture Publishers)"
+  saveName: "Simple 1500 Series Vol. 9 - The Chess (Japan) (Culture Publishers)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151097,7 +158892,8 @@ SLPS-01687:
     multitap: false
     linkCable: false
 SLPM-87044:
-  name: "Simple 1500 Series Vol. 90 - The Sensha (Japan)"
+  name: "Simple 1500 Series Vol. 90 - The Sensha"
+  saveName: "Simple 1500 Series Vol. 90 - The Sensha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151116,7 +158912,8 @@ SLPM-87044:
     multitap: false
     linkCable: false
 SLPM-86975:
-  name: "Simple 1500 Series Vol. 91 - The Gambler - Honoo no Tobaku Densetsu (Japan)"
+  name: "Simple 1500 Series Vol. 91 - The Gambler - Honoo no Tobaku Densetsu"
+  saveName: "Simple 1500 Series Vol. 91 - The Gambler - Honoo no Tobaku Densetsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151134,7 +158931,8 @@ SLPM-86975:
     multitap: false
     linkCable: false
 SLPM-87036:
-  name: "Simple 1500 Series Vol. 92 - The Tozan RPG - Ginrei no Hasha (Japan)"
+  name: "Simple 1500 Series Vol. 92 - The Tozan RPG - Ginrei no Hasha"
+  saveName: "Simple 1500 Series Vol. 92 - The Tozan RPG - Ginrei no Hasha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151153,7 +158951,8 @@ SLPM-87036:
     multitap: false
     linkCable: false
 SLPM-87057:
-  name: "Simple 1500 Series Vol. 93 - The Puzzle Bobble - Puzzle Bobble 4 (Japan)"
+  name: "Simple 1500 Series Vol. 93 - The Puzzle Bobble - Puzzle Bobble 4"
+  saveName: "Simple 1500 Series Vol. 93 - The Puzzle Bobble - Puzzle Bobble 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151172,7 +158971,8 @@ SLPM-87057:
     multitap: false
     linkCable: false
 SLPM-87076:
-  name: "Simple 1500 Series Vol. 94 - The Cameraman - Gekisha Boy Omake Tsuki (Japan)"
+  name: "Simple 1500 Series Vol. 94 - The Cameraman - Gekisha Boy Omake Tsuki"
+  saveName: "Simple 1500 Series Vol. 94 - The Cameraman - Gekisha Boy Omake Tsuki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151190,7 +158990,8 @@ SLPM-87076:
     multitap: false
     linkCable: false
 SLPM-87070:
-  name: "Simple 1500 Series Vol. 95 - The Hikouki (Japan)"
+  name: "Simple 1500 Series Vol. 95 - The Hikouki"
+  saveName: "Simple 1500 Series Vol. 95 - The Hikouki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151209,7 +159010,8 @@ SLPM-87070:
     multitap: false
     linkCable: false
 SLPM-87071:
-  name: "Simple 1500 Series Vol. 96 - The Yakyuu 2 - 2002 Pro Yakyuu (Japan)"
+  name: "Simple 1500 Series Vol. 96 - The Yakyuu 2 - 2002 Pro Yakyuu"
+  saveName: "Simple 1500 Series Vol. 96 - The Yakyuu 2 - 2002 Pro Yakyuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151228,7 +159030,8 @@ SLPM-87071:
     multitap: false
     linkCable: false
 SLPM-87088:
-  name: "Simple 1500 Series Vol. 97 - The Squash (Japan)"
+  name: "Simple 1500 Series Vol. 97 - The Squash"
+  saveName: "Simple 1500 Series Vol. 97 - The Squash (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151247,7 +159050,8 @@ SLPM-87088:
     multitap: false
     linkCable: false
 SLPM-87087:
-  name: "Simple 1500 Series Vol. 98 - The Futsal (Japan)"
+  name: "Simple 1500 Series Vol. 98 - The Futsal"
+  saveName: "Simple 1500 Series Vol. 98 - The Futsal (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151266,7 +159070,8 @@ SLPM-87087:
     multitap: false
     linkCable: false
 SLPM-87140:
-  name: "Simple 1500 Series Vol. 99 - The Kendou - Ken no Hanamichi (Japan)"
+  name: "Simple 1500 Series Vol. 99 - The Kendou - Ken no Hanamichi"
+  saveName: "Simple 1500 Series Vol. 99 - The Kendou - Ken no Hanamichi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151285,7 +159090,8 @@ SLPM-87140:
     multitap: false
     linkCable: false
 SLPS-03309:
-  name: "Simple Character 2000 Series Vol. 01 - Kidou Senshi Gundam - The Gunjin Shougi (Japan)"
+  name: "Simple Character 2000 Series Vol. 01 - Kidou Senshi Gundam - The Gunjin Shougi"
+  saveName: "Simple Character 2000 Series Vol. 01 - Kidou Senshi Gundam - The Gunjin Shougi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151304,7 +159110,8 @@ SLPS-03309:
     multitap: false
     linkCable: false
 SLPS-03307:
-  name: "Simple Character 2000 Series Vol. 02 - Afro-ken - The Puzzle (Japan)"
+  name: "Simple Character 2000 Series Vol. 02 - Afro-ken - The Puzzle"
+  saveName: "Simple Character 2000 Series Vol. 02 - Afro-ken - The Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151323,7 +159130,8 @@ SLPS-03307:
     multitap: false
     linkCable: false
 SLPS-03308:
-  name: "Simple Character 2000 Series Vol. 03 - Kamen Rider - The Bike Race (Japan)"
+  name: "Simple Character 2000 Series Vol. 03 - Kamen Rider - The Bike Race"
+  saveName: "Simple Character 2000 Series Vol. 03 - Kamen Rider - The Bike Race (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151343,7 +159151,8 @@ SLPS-03308:
     multitap: false
     linkCable: false
 SLPS-03350:
-  name: "Simple Character 2000 Series Vol. 04 - Jarinko Chie - The Hanafuda (Japan)"
+  name: "Simple Character 2000 Series Vol. 04 - Jarinko Chie - The Hanafuda"
+  saveName: "Simple Character 2000 Series Vol. 04 - Jarinko Chie - The Hanafuda (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151362,7 +159171,8 @@ SLPS-03350:
     multitap: false
     linkCable: false
 SLPS-03362:
-  name: "Simple Character 2000 Series Vol. 05 - High School Kimengumi - The Table Hockey (Japan)"
+  name: "Simple Character 2000 Series Vol. 05 - High School Kimengumi - The Table Hockey"
+  saveName: "Simple Character 2000 Series Vol. 05 - High School Kimengumi - The Table Hockey (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151381,7 +159191,8 @@ SLPS-03362:
     multitap: true
     linkCable: false
 SLPS-03363:
-  name: "Simple Character 2000 Series Vol. 06 - Dokonjou Gaeru - The Mahjong (Japan)"
+  name: "Simple Character 2000 Series Vol. 06 - Dokonjou Gaeru - The Mahjong"
+  saveName: "Simple Character 2000 Series Vol. 06 - Dokonjou Gaeru - The Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151400,7 +159211,8 @@ SLPS-03363:
     multitap: false
     linkCable: false
 SLPS-03418:
-  name: "Simple Character 2000 Series Vol. 07 - Ikkyuu-san - The Quiz (Japan)"
+  name: "Simple Character 2000 Series Vol. 07 - Ikkyuu-san - The Quiz"
+  saveName: "Simple Character 2000 Series Vol. 07 - Ikkyuu-san - The Quiz (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151419,7 +159231,8 @@ SLPS-03418:
     multitap: false
     linkCable: false
 SLPS-03444:
-  name: "Simple Character 2000 Series Vol. 08 - Kagaku Ninjatai Gatchaman - The Shooting (Japan)"
+  name: "Simple Character 2000 Series Vol. 08 - Kagaku Ninjatai Gatchaman - The Shooting"
+  saveName: "Simple Character 2000 Series Vol. 08 - Kagaku Ninjatai Gatchaman - The Shooting (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -151440,7 +159253,8 @@ SLPS-03444:
     multitap: false
     linkCable: false
 SLPS-03445:
-  name: "Simple Character 2000 Series Vol. 09 - Tsurikichi Sanpei - The Tsuri (Japan)"
+  name: "Simple Character 2000 Series Vol. 09 - Tsurikichi Sanpei - The Tsuri"
+  saveName: "Simple Character 2000 Series Vol. 09 - Tsurikichi Sanpei - The Tsuri (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151459,7 +159273,8 @@ SLPS-03445:
     multitap: false
     linkCable: false
 SLPS-03457:
-  name: "Simple Character 2000 Series Vol. 10 - Sakigake!! Otokojuku - The Dodgeball (Japan)"
+  name: "Simple Character 2000 Series Vol. 10 - Sakigake!! Otokojuku - The Dodgeball"
+  saveName: "Simple Character 2000 Series Vol. 10 - Sakigake!! Otokojuku - The Dodgeball (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151477,7 +159292,8 @@ SLPS-03457:
     multitap: false
     linkCable: false
 SLPS-03458:
-  name: "Simple Character 2000 Series Vol. 11 - Meitantei Conan - The Board Game (Japan)"
+  name: "Simple Character 2000 Series Vol. 11 - Meitantei Conan - The Board Game"
+  saveName: "Simple Character 2000 Series Vol. 11 - Meitantei Conan - The Board Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151496,7 +159312,8 @@ SLPS-03458:
     multitap: true
     linkCable: false
 SLPS-03471:
-  name: "Simple Character 2000 Series Vol. 12 - Kidou Butouden G Gundam - The Battle (Japan)"
+  name: "Simple Character 2000 Series Vol. 12 - Kidou Butouden G Gundam - The Battle"
+  saveName: "Simple Character 2000 Series Vol. 12 - Kidou Butouden G Gundam - The Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151515,7 +159332,8 @@ SLPS-03471:
     multitap: false
     linkCable: false
 SLPS-03472:
-  name: "Simple Character 2000 Series Vol. 13 - Shin Kidou Senki Gundam W - The Battle (Japan)"
+  name: "Simple Character 2000 Series Vol. 13 - Shin Kidou Senki Gundam W - The Battle"
+  saveName: "Simple Character 2000 Series Vol. 13 - Shin Kidou Senki Gundam W - The Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151534,7 +159352,8 @@ SLPS-03472:
     multitap: false
     linkCable: false
 SLPS-03473:
-  name: "Simple Character 2000 Series Vol. 14 - Nantettantei Idol - The Jigsaw Puzzle (Japan)"
+  name: "Simple Character 2000 Series Vol. 14 - Nantettantei Idol - The Jigsaw Puzzle"
+  saveName: "Simple Character 2000 Series Vol. 14 - Nantettantei Idol - The Jigsaw Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151553,7 +159372,8 @@ SLPS-03473:
     multitap: false
     linkCable: false
 SLPS-03474:
-  name: "Simple Character 2000 Series Vol. 15 - Cyborg 009 - The Block Kuzushi (Japan)"
+  name: "Simple Character 2000 Series Vol. 15 - Cyborg 009 - The Block Kuzushi"
+  saveName: "Simple Character 2000 Series Vol. 15 - Cyborg 009 - The Block Kuzushi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151572,7 +159392,8 @@ SLPS-03474:
     multitap: false
     linkCable: false
 SLPS-03546:
-  name: "Simple Character 2000 Series Vol. 16 - Gamba no Bouken - The Puzzle Action (Japan)"
+  name: "Simple Character 2000 Series Vol. 16 - Gamba no Bouken - The Puzzle Action"
+  saveName: "Simple Character 2000 Series Vol. 16 - Gamba no Bouken - The Puzzle Action (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151591,7 +159412,8 @@ SLPS-03546:
     multitap: false
     linkCable: false
 SLPS-03547:
-  name: "Simple Character 2000 Series Vol. 17 - Sentou Mecha Xabungle - The Race in Action (Japan)"
+  name: "Simple Character 2000 Series Vol. 17 - Sentou Mecha Xabungle - The Race in Action"
+  saveName: "Simple Character 2000 Series Vol. 17 - Sentou Mecha Xabungle - The Race in Action (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -151610,7 +159432,8 @@ SLPS-03547:
     multitap: false
     linkCable: false
 SLES-03401:
-  name: "Simpsons Wrestling, The (Europe)"
+  name: "Simpsons Wrestling, The"
+  saveName: "Simpsons Wrestling, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -151629,7 +159452,8 @@ SLES-03401:
     multitap: false
     linkCable: false
 SLUS-01227:
-  name: "Simpsons Wrestling, The (USA)"
+  name: "Simpsons Wrestling, The"
+  saveName: "Simpsons Wrestling, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -151651,7 +159475,8 @@ SLUS-01227:
     multitap: false
     linkCable: false
 SLPS-02102:
-  name: "Simulation Pro Yakyuu '99 (Japan)"
+  name: "Simulation Pro Yakyuu '99"
+  saveName: "Simulation Pro Yakyuu '99 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151669,7 +159494,8 @@ SLPS-02102:
     multitap: false
     linkCable: false
 SLPS-00876:
-  name: "Simulation RPG Tkool (Japan)"
+  name: "Simulation RPG Tkool"
+  saveName: "Simulation RPG Tkool (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151687,7 +159513,8 @@ SLPS-00876:
     multitap: false
     linkCable: false
 SLPS-03346:
-  name: "Simulation RPG Tkool (Japan) (Enterbrain Collection)"
+  name: "Simulation RPG Tkool (Enterbrain Collection)"
+  saveName: "Simulation RPG Tkool (Japan) (Enterbrain Collection)"
   controllers:
     - DigitalController
   metadata:
@@ -151705,7 +159532,8 @@ SLPS-03346:
     multitap: false
     linkCable: false
 SLPS-00458:
-  name: "Simulation Zoo (Japan)"
+  name: "Simulation Zoo"
+  saveName: "Simulation Zoo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151723,7 +159551,8 @@ SLPS-00458:
     multitap: false
     linkCable: false
 SLPS-03156:
-  name: "Sister Princess (Japan) (Disc 1)"
+  name: "Sister Princess (Disc 1)"
+  saveName: "Sister Princess (Japan) (Disc 1)"
   discSet:
     name: "Sister Princess (Japan)"
     serials:
@@ -151749,7 +159578,8 @@ SLPS-03156:
     multitap: false
     linkCable: false
 SLPS-03154:
-  name: "Sister Princess (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Sister Princess (Disc 1) (Shokai Genteiban)"
+  saveName: "Sister Princess (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Sister Princess (Japan) (Shokai Genteiban)"
     serials:
@@ -151772,7 +159602,8 @@ SLPS-03154:
     multitap: false
     linkCable: false
 SLPS-03157:
-  name: "Sister Princess (Japan) (Disc 2)"
+  name: "Sister Princess (Disc 2)"
+  saveName: "Sister Princess (Japan) (Disc 2)"
   discSet:
     name: "Sister Princess (Japan)"
     serials:
@@ -151798,7 +159629,8 @@ SLPS-03157:
     multitap: false
     linkCable: false
 SLPS-03155:
-  name: "Sister Princess (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Sister Princess (Disc 2) (Shokai Genteiban)"
+  saveName: "Sister Princess (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Sister Princess (Japan) (Shokai Genteiban)"
     serials:
@@ -151821,7 +159653,8 @@ SLPS-03155:
     multitap: false
     linkCable: false
 SLPS-03360:
-  name: "Sister Princess - Pure Stories (Japan)"
+  name: "Sister Princess - Pure Stories"
+  saveName: "Sister Princess - Pure Stories (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -151839,7 +159672,8 @@ SLPS-03360:
     multitap: false
     linkCable: false
 SLPS-03523:
-  name: "Sister Princess 2 (Japan) (Disc 1)"
+  name: "Sister Princess 2 (Disc 1)"
+  saveName: "Sister Princess 2 (Japan) (Disc 1)"
   discSet:
     name: "Sister Princess 2 (Japan)"
     serials:
@@ -151862,7 +159696,8 @@ SLPS-03523:
     multitap: false
     linkCable: false
 SLPS-03521:
-  name: "Sister Princess 2 (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Sister Princess 2 (Disc 1) (Shokai Genteiban)"
+  saveName: "Sister Princess 2 (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Sister Princess 2 (Japan) (Shokai Genteiban)"
     serials:
@@ -151888,7 +159723,8 @@ SLPS-03521:
     multitap: false
     linkCable: false
 SLPS-03524:
-  name: "Sister Princess 2 (Japan) (Disc 2)"
+  name: "Sister Princess 2 (Disc 2)"
+  saveName: "Sister Princess 2 (Japan) (Disc 2)"
   discSet:
     name: "Sister Princess 2 (Japan)"
     serials:
@@ -151911,7 +159747,8 @@ SLPS-03524:
     multitap: false
     linkCable: false
 SLPS-03522:
-  name: "Sister Princess 2 (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Sister Princess 2 (Disc 2) (Shokai Genteiban)"
+  saveName: "Sister Princess 2 (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Sister Princess 2 (Japan) (Shokai Genteiban)"
     serials:
@@ -151937,7 +159774,8 @@ SLPS-03522:
     multitap: false
     linkCable: false
 SLPS-03556:
-  name: "Sister Princess 2 - Premium Fan Disc (Japan) (Disc A)"
+  name: "Sister Princess 2 - Premium Fan Disc (Disc A)"
+  saveName: "Sister Princess 2 - Premium Fan Disc (Japan) (Disc A)"
   discSet:
     name: "Sister Princess 2 - Premium Fan Disc (Japan)"
     serials:
@@ -151960,7 +159798,8 @@ SLPS-03556:
     multitap: false
     linkCable: false
 SLPS-03557:
-  name: "Sister Princess 2 - Premium Fan Disc (Japan) (Disc B)"
+  name: "Sister Princess 2 - Premium Fan Disc (Disc B)"
+  saveName: "Sister Princess 2 - Premium Fan Disc (Japan) (Disc B)"
   discSet:
     name: "Sister Princess 2 - Premium Fan Disc (Japan)"
     serials:
@@ -151983,7 +159822,8 @@ SLPS-03557:
     multitap: false
     linkCable: false
 SLES-04152:
-  name: "Sitting Ducks (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Sitting Ducks"
+  saveName: "Sitting Ducks (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152007,7 +159847,8 @@ SLES-04152:
     multitap: false
     linkCable: false
 SLES-00341:
-  name: "Skeleton Warriors (Europe)"
+  name: "Skeleton Warriors"
+  saveName: "Skeleton Warriors (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -152025,7 +159866,8 @@ SLES-00341:
     multitap: false
     linkCable: false
 SLUS-00209:
-  name: "Skeleton Warriors (USA)"
+  name: "Skeleton Warriors"
+  saveName: "Skeleton Warriors (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1529-ga895c027"
@@ -152046,7 +159888,8 @@ SLUS-00209:
     multitap: false
     linkCable: false
 SLES-02947:
-  name: "Ski Air Mix (Europe)"
+  name: "Ski Air Mix"
+  saveName: "Ski Air Mix (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152065,7 +159908,8 @@ SLES-02947:
     multitap: false
     linkCable: false
 SLPS-01476:
-  name: "Ski Air Mix (Japan)"
+  name: "Ski Air Mix"
+  saveName: "Ski Air Mix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152084,7 +159928,8 @@ SLPS-01476:
     multitap: false
     linkCable: false
 SLES-01090:
-  name: "Skullmonkeys (Europe)"
+  name: "Skullmonkeys"
+  saveName: "Skullmonkeys (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -152105,7 +159950,8 @@ SLES-01090:
     multitap: false
     linkCable: false
 SLES-01091:
-  name: "Skullmonkeys (France)"
+  name: "Skullmonkeys"
+  saveName: "Skullmonkeys (France)"
   controllers:
     - DigitalController
   metadata:
@@ -152123,7 +159969,8 @@ SLES-01091:
     multitap: false
     linkCable: false
 SLES-01092:
-  name: "Skullmonkeys (Germany)"
+  name: "Skullmonkeys"
+  saveName: "Skullmonkeys (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -152141,7 +159988,8 @@ SLES-01092:
     multitap: false
     linkCable: false
 SLUS-00601:
-  name: "Skullmonkeys (USA)"
+  name: "Skullmonkeys"
+  saveName: "Skullmonkeys (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -152162,7 +160010,8 @@ SLUS-00601:
     multitap: false
     linkCable: false
 SLES-03776:
-  name: "Sky Sports Football Quiz (Europe)"
+  name: "Sky Sports Football Quiz"
+  saveName: "Sky Sports Football Quiz (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152181,7 +160030,8 @@ SLES-03776:
     multitap: true
     linkCable: false
 SLES-03856:
-  name: "Sky Sports Football Quiz - Season 02 (Europe)"
+  name: "Sky Sports Football Quiz - Season 02"
+  saveName: "Sky Sports Football Quiz - Season 02 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152200,7 +160050,8 @@ SLES-03856:
     multitap: true
     linkCable: false
 SLUS-01392:
-  name: "Skydiving Extreme (USA)"
+  name: "Skydiving Extreme"
+  saveName: "Skydiving Extreme (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152219,7 +160070,8 @@ SLUS-01392:
     multitap: false
     linkCable: false
 SLUS-00022:
-  name: "Slam 'n Jam '96 featuring Magic & Kareem (USA)"
+  name: "Slam 'n Jam '96 featuring Magic & Kareem"
+  saveName: "Slam 'n Jam '96 featuring Magic & Kareem (USA)"
   controllers:
     - DigitalController
   traits:
@@ -152239,7 +160091,8 @@ SLUS-00022:
     multitap: true
     linkCable: false
 SLPS-00246:
-  name: "Slam Dragon (Japan)"
+  name: "Slam Dragon"
+  saveName: "Slam Dragon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -152257,7 +160110,8 @@ SLPS-00246:
     multitap: false
     linkCable: false
 SLES-00427:
-  name: "Slamscape (Europe)"
+  name: "Slamscape"
+  saveName: "Slamscape (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -152275,7 +160129,8 @@ SLES-00427:
     multitap: false
     linkCable: false
 SLUS-00080:
-  name: "Slamscape (USA)"
+  name: "Slamscape"
+  saveName: "Slamscape (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -152296,7 +160151,8 @@ SLUS-00080:
     multitap: false
     linkCable: false
 SLPS-02789:
-  name: "Slap Happy Rhythm Busters (Japan)"
+  name: "Slap Happy Rhythm Busters"
+  saveName: "Slap Happy Rhythm Busters (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed219"
@@ -152324,7 +160180,8 @@ SLPS-02789:
     multitap: false
     linkCable: false
 SLPS-01363:
-  name: "Slayers Royal (Japan)"
+  name: "Slayers Royal"
+  saveName: "Slayers Royal (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152343,7 +160200,8 @@ SLPS-01363:
     multitap: false
     linkCable: false
 SLPS-02115:
-  name: "Slayers Royal 2 (Japan)"
+  name: "Slayers Royal 2"
+  saveName: "Slayers Royal 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152362,7 +160220,8 @@ SLPS-02115:
     multitap: false
     linkCable: false
 SLPS-01599:
-  name: "Slayers Wonderful (Japan)"
+  name: "Slayers Wonderful"
+  saveName: "Slayers Wonderful (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -152380,15 +160239,18 @@ SLPS-01599:
     multitap: false
     linkCable: false
 SLUS-90072:
-  name: "Sled Storm & Medal of Honor Demo CD (USA)"
+  name: "Sled Storm & Medal of Honor Demo CD"
+  saveName: "Sled Storm & Medal of Honor Demo CD (USA)"
   metadata:
     genre: "** DEMO **"
 SLED-02300:
-  name: "Sled Storm (Europe) (Demo)"
+  name: "Sled Storm (Demo)"
+  saveName: "Sled Storm (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02194:
-  name: "Sled Storm (Europe) (En,Fr,De,Es)"
+  name: "Sled Storm"
+  saveName: "Sled Storm (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -152412,7 +160274,8 @@ SLES-02194:
     multitap: true
     linkCable: false
 SLUS-00955:
-  name: "Sled Storm (USA)"
+  name: "Sled Storm"
+  saveName: "Sled Storm (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -152433,9 +160296,11 @@ SLUS-00955:
     multitap: true
     linkCable: false
 SCUS-94472:
-  name: "Slim Jim (USA)"
+  name: "Slim Jim"
+  saveName: "Slim Jim (USA)"
 SLPS-00504:
-  name: "Slime Shiyou! (Japan)"
+  name: "Slime Shiyou!"
+  saveName: "Slime Shiyou! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -152453,7 +160318,8 @@ SLPS-00504:
     multitap: false
     linkCable: false
 SLPS-02997:
-  name: "Slot! Pro - Ooedo Sakura Fubuki 2 (Japan)"
+  name: "Slot! Pro - Ooedo Sakura Fubuki 2"
+  saveName: "Slot! Pro - Ooedo Sakura Fubuki 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152472,7 +160338,8 @@ SLPS-02997:
     multitap: false
     linkCable: false
 SLPS-03179:
-  name: "Slot! Pro 2 - Bakuretsu Oozumou Aka & Murasaki (Japan)"
+  name: "Slot! Pro 2 - Bakuretsu Oozumou Aka & Murasaki"
+  saveName: "Slot! Pro 2 - Bakuretsu Oozumou Aka & Murasaki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152491,7 +160358,8 @@ SLPS-03179:
     multitap: false
     linkCable: false
 SLPS-03253:
-  name: "Slot! Pro 3 - Juggler Special (Japan)"
+  name: "Slot! Pro 3 - Juggler Special"
+  saveName: "Slot! Pro 3 - Juggler Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152510,7 +160378,8 @@ SLPS-03253:
     multitap: false
     linkCable: false
 SLPS-03394:
-  name: "Slot! Pro 4 - Tairyou Special (Japan)"
+  name: "Slot! Pro 4 - Tairyou Special"
+  saveName: "Slot! Pro 4 - Tairyou Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152529,7 +160398,8 @@ SLPS-03394:
     multitap: false
     linkCable: false
 SLPS-03439:
-  name: "Slot! Pro 5 - Naniwa Sakura Fubuki & Shimauta (Japan)"
+  name: "Slot! Pro 5 - Naniwa Sakura Fubuki & Shimauta"
+  saveName: "Slot! Pro 5 - Naniwa Sakura Fubuki & Shimauta (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152548,7 +160418,8 @@ SLPS-03439:
     multitap: false
     linkCable: false
 SLPS-03469:
-  name: "Slot! Pro 6 - Hyper Juggler V (Japan)"
+  name: "Slot! Pro 6 - Hyper Juggler V"
+  saveName: "Slot! Pro 6 - Hyper Juggler V (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152567,9 +160438,11 @@ SLPS-03469:
     multitap: false
     linkCable: false
 SLPS-03485:
-  name: "Slot! Pro 7 - Hana Densetsu (Japan)"
+  name: "Slot! Pro 7 - Hana Densetsu"
+  saveName: "Slot! Pro 7 - Hana Densetsu (Japan)"
 SLPS-03551:
-  name: "Slot! Pro 8 - Shimamusume 30 & Hana Densetsu 25 (Japan)"
+  name: "Slot! Pro 8 - Shimamusume 30 & Hana Densetsu 25"
+  saveName: "Slot! Pro 8 - Shimamusume 30 & Hana Densetsu 25 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152588,7 +160461,8 @@ SLPS-03551:
     multitap: false
     linkCable: false
 SLUS-01555:
-  name: "Slots (USA)"
+  name: "Slots"
+  saveName: "Slots (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -152606,7 +160480,8 @@ SLUS-01555:
     multitap: false
     linkCable: false
 SLPS-03192:
-  name: "Slotter Mania - Gekinetsu Okisuro! Siosai Special (Japan)"
+  name: "Slotter Mania - Gekinetsu Okisuro! Siosai Special"
+  saveName: "Slotter Mania - Gekinetsu Okisuro! Siosai Special (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152625,7 +160500,8 @@ SLPS-03192:
     multitap: false
     linkCable: false
 SLPS-03349:
-  name: "Slotter Mania 2 - Chounetsu 30! Hana Hana & Kingbary & Hai Hai Siesta (Japan)"
+  name: "Slotter Mania 2 - Chounetsu 30! Hana Hana & Kingbary & Hai Hai Siesta"
+  saveName: "Slotter Mania 2 - Chounetsu 30! Hana Hana & Kingbary & Hai Hai Siesta (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152644,7 +160520,8 @@ SLPS-03349:
     multitap: false
     linkCable: false
 SLPS-03414:
-  name: "Slotter Mania 3 - Bakuryou Houshutsu! Uminchu & Fire Element (Japan)"
+  name: "Slotter Mania 3 - Bakuryou Houshutsu! Uminchu & Fire Element"
+  saveName: "Slotter Mania 3 - Bakuryou Houshutsu! Uminchu & Fire Element (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152663,7 +160540,8 @@ SLPS-03414:
     multitap: false
     linkCable: false
 SLPS-03438:
-  name: "Slotter Mania 4 - Gekiatsu Youkou! Siolar & King Castle & Kabuto (Japan)"
+  name: "Slotter Mania 4 - Gekiatsu Youkou! Siolar & King Castle & Kabuto"
+  saveName: "Slotter Mania 4 - Gekiatsu Youkou! Siolar & King Castle & Kabuto (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152682,7 +160560,8 @@ SLPS-03438:
     multitap: false
     linkCable: false
 SLPS-03468:
-  name: "Slotter Mania 5 - Gekiuchi Shinzui! Hyper Juggler V & Kita-chan Country & Wonder Review 2 (Japan)"
+  name: "Slotter Mania 5 - Gekiuchi Shinzui! Hyper Juggler V & Kita-chan Country & Wonder Review 2"
+  saveName: "Slotter Mania 5 - Gekiuchi Shinzui! Hyper Juggler V & Kita-chan Country & Wonder Review 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152701,7 +160580,8 @@ SLPS-03468:
     multitap: false
     linkCable: false
 SLPS-03483:
-  name: "Slotter Mania 6 - Bakuretsu Sairai! Wadatsumi (2 Types) & Blue Lagoon (Japan)"
+  name: "Slotter Mania 6 - Bakuretsu Sairai! Wadatsumi (2 Types) & Blue Lagoon"
+  saveName: "Slotter Mania 6 - Bakuretsu Sairai! Wadatsumi (2 Types) & Blue Lagoon (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152720,7 +160600,8 @@ SLPS-03483:
     multitap: false
     linkCable: false
 SLPS-03511:
-  name: "Slotter Mania 7 - Gekiatsu! Siosai-musume Seizoroi DX + Apache A (Japan)"
+  name: "Slotter Mania 7 - Gekiatsu! Siosai-musume Seizoroi DX + Apache A"
+  saveName: "Slotter Mania 7 - Gekiatsu! Siosai-musume Seizoroi DX + Apache A (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152739,7 +160620,8 @@ SLPS-03511:
     multitap: false
     linkCable: false
 SLPS-03520:
-  name: "Slotter Mania 8 - Miwaku no Takarabako! Jewel Magic 2 & Gold & Silver (Japan)"
+  name: "Slotter Mania 8 - Miwaku no Takarabako! Jewel Magic 2 & Gold & Silver"
+  saveName: "Slotter Mania 8 - Miwaku no Takarabako! Jewel Magic 2 & Gold & Silver (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152758,7 +160640,8 @@ SLPS-03520:
     multitap: false
     linkCable: false
 SLPS-03533:
-  name: "Slotter Mania 9 - Gokunetsu 30 Phi! Haibi & Splash Seven (Japan)"
+  name: "Slotter Mania 9 - Gokunetsu 30 Phi! Haibi & Splash Seven"
+  saveName: "Slotter Mania 9 - Gokunetsu 30 Phi! Haibi & Splash Seven (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152777,7 +160660,8 @@ SLPS-03533:
     multitap: false
     linkCable: false
 SLPS-02960:
-  name: "Slotter Mania Core - Tokonatsu no Atsusa! Oasis (Japan)"
+  name: "Slotter Mania Core - Tokonatsu no Atsusa! Oasis"
+  saveName: "Slotter Mania Core - Tokonatsu no Atsusa! Oasis (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152796,7 +160680,8 @@ SLPS-02960:
     multitap: false
     linkCable: false
 SLPS-03467:
-  name: "Slotter Mania Gaiden - Chouatsu Densetsu! Golden Rookie & Fire V & Ryuuou (Japan)"
+  name: "Slotter Mania Gaiden - Chouatsu Densetsu! Golden Rookie & Fire V & Ryuuou"
+  saveName: "Slotter Mania Gaiden - Chouatsu Densetsu! Golden Rookie & Fire V & Ryuuou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152815,7 +160700,8 @@ SLPS-03467:
     multitap: false
     linkCable: false
 SLES-01580:
-  name: "Small Soldiers (Europe)"
+  name: "Small Soldiers"
+  saveName: "Small Soldiers (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152834,7 +160720,8 @@ SLES-01580:
     multitap: false
     linkCable: false
 SLES-01581:
-  name: "Small Soldiers (France)"
+  name: "Small Soldiers"
+  saveName: "Small Soldiers (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152853,7 +160740,8 @@ SLES-01581:
     multitap: false
     linkCable: false
 SLES-01582:
-  name: "Small Soldiers (Germany)"
+  name: "Small Soldiers"
+  saveName: "Small Soldiers (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152872,7 +160760,8 @@ SLES-01582:
     multitap: false
     linkCable: false
 SLUS-00781:
-  name: "Small Soldiers (USA)"
+  name: "Small Soldiers"
+  saveName: "Small Soldiers (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152891,7 +160780,8 @@ SLUS-00781:
     multitap: false
     linkCable: false
 SLPS-00450:
-  name: "Smash Court (Japan)"
+  name: "Smash Court"
+  saveName: "Smash Court (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -152913,7 +160803,8 @@ SLPS-00450:
     multitap: true
     linkCable: false
 SLPS-01693:
-  name: "Smash Court 2 (Japan)"
+  name: "Smash Court 2"
+  saveName: "Smash Court 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152932,7 +160823,8 @@ SLPS-01693:
     multitap: true
     linkCable: false
 SLPS-03001:
-  name: "Smash Court 3 (Japan)"
+  name: "Smash Court 3"
+  saveName: "Smash Court 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152951,7 +160843,8 @@ SLPS-03001:
     multitap: true
     linkCable: false
 SLUS-01359:
-  name: "Smurf Racer! (USA) (En,Fr,Es)"
+  name: "Smurf Racer!"
+  saveName: "Smurf Racer! (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152973,7 +160866,8 @@ SLUS-01359:
     multitap: false
     linkCable: false
 SLES-01749:
-  name: "Smurfs, The (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Smurfs, The"
+  saveName: "Smurfs, The (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -152997,7 +160891,8 @@ SLES-01749:
     multitap: false
     linkCable: false
 SLUS-01008:
-  name: "Smurfs, The (USA) (En,Fr,Es)"
+  name: "Smurfs, The"
+  saveName: "Smurfs, The (USA) (En,Fr,Es)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -153021,7 +160916,8 @@ SLUS-01008:
     multitap: false
     linkCable: false
 SLPS-00154:
-  name: "Snatcher (Japan)"
+  name: "Snatcher"
+  saveName: "Snatcher (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -153043,7 +160939,8 @@ SLPS-00154:
     multitap: false
     linkCable: false
 SLPS-02650:
-  name: "Sno Pokeler (Japan)"
+  name: "Sno Pokeler"
+  saveName: "Sno Pokeler (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153062,7 +160959,8 @@ SLPS-02650:
     multitap: false
     linkCable: false
 SLES-02763:
-  name: "SnoCross Championship Racing (Europe) (En,Fr,De,Es,It)"
+  name: "SnoCross Championship Racing"
+  saveName: "SnoCross Championship Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153087,7 +160985,8 @@ SLES-02763:
     multitap: false
     linkCable: false
 SLUS-01093:
-  name: "SnoCross Championship Racing (USA)"
+  name: "SnoCross Championship Racing"
+  saveName: "SnoCross Championship Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153107,7 +161006,8 @@ SLUS-01093:
     multitap: false
     linkCable: false
 SLPS-01823:
-  name: "Snobow Kids Plus (Japan)"
+  name: "Snobow Kids Plus"
+  saveName: "Snobow Kids Plus (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153126,7 +161026,8 @@ SLPS-01823:
     multitap: false
     linkCable: false
 SCPS-45157:
-  name: "Snow Break (Japan, Asia)"
+  name: "Snow Break"
+  saveName: "Snow Break (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -153147,7 +161048,8 @@ SCPS-45157:
     multitap: false
     linkCable: false
 SLES-01106:
-  name: "Snow Racer 98 (Europe) (En,Fr,De)"
+  name: "Snow Racer 98"
+  saveName: "Snow Racer 98 (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -153165,7 +161067,8 @@ SLES-01106:
     multitap: false
     linkCable: false
 SLES-03960:
-  name: "Snowboard Racer (Europe)"
+  name: "Snowboard Racer"
+  saveName: "Snowboard Racer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153184,7 +161087,8 @@ SLES-03960:
     multitap: false
     linkCable: false
 SLUS-01287:
-  name: "Snowboarding (USA)"
+  name: "Snowboarding"
+  saveName: "Snowboarding (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153203,7 +161107,8 @@ SLUS-01287:
     multitap: false
     linkCable: false
 SLPS-00140:
-  name: "Snowman, The (Japan)"
+  name: "Snowman, The"
+  saveName: "Snowman, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153221,7 +161126,8 @@ SLPS-00140:
     multitap: false
     linkCable: false
 SLES-00691:
-  name: "Soccer '97 (Europe) (En,Fr,De,Es,It)"
+  name: "Soccer '97"
+  saveName: "Soccer '97 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -153243,7 +161149,8 @@ SLES-00691:
     multitap: true
     linkCable: false
 SLES-04022:
-  name: "Soccer Kid (Europe)"
+  name: "Soccer Kid"
+  saveName: "Soccer Kid (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153262,7 +161169,8 @@ SLES-04022:
     multitap: false
     linkCable: false
 SLPM-86234:
-  name: "Soeldnerschild Special (Japan)"
+  name: "Soeldnerschild Special"
+  saveName: "Soeldnerschild Special (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -153283,7 +161191,8 @@ SLPM-86234:
     multitap: false
     linkCable: false
 SCPS-45260:
-  name: "Sol Divide (Japan, Asia)"
+  name: "Sol Divide"
+  saveName: "Sol Divide (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153305,7 +161214,8 @@ SCPS-45260:
     multitap: false
     linkCable: false
 SLUS-01519:
-  name: "Sol Divide (USA)"
+  name: "Sol Divide"
+  saveName: "Sol Divide (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -153327,7 +161237,8 @@ SLUS-01519:
     multitap: false
     linkCable: false
 SLPS-00597:
-  name: "Sold Out (Japan)"
+  name: "Sold Out"
+  saveName: "Sold Out (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153345,7 +161256,8 @@ SLPS-00597:
     multitap: false
     linkCable: false
 SLPS-03028:
-  name: "Solid Link - Dungeon Side (Japan)"
+  name: "Solid Link - Dungeon Side"
+  saveName: "Solid Link - Dungeon Side (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153364,7 +161276,8 @@ SLPS-03028:
     multitap: false
     linkCable: false
 SLPS-03027:
-  name: "Solid Link - Tower Side (Japan)"
+  name: "Solid Link - Tower Side"
+  saveName: "Solid Link - Tower Side (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153383,11 +161296,13 @@ SLPS-03027:
     multitap: false
     linkCable: false
 SLPM-80381:
-  name: "Sonata (Japan) (Demo)"
+  name: "Sonata (Demo)"
+  saveName: "Sonata (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01843:
-  name: "Sonata (Japan) (Disc 1)"
+  name: "Sonata (Disc 1)"
+  saveName: "Sonata (Japan) (Disc 1)"
   discSet:
     name: "Sonata (Japan)"
     serials:
@@ -153411,7 +161326,8 @@ SLPS-01843:
     multitap: false
     linkCable: false
 SLPS-01844:
-  name: "Sonata (Japan) (Disc 2)"
+  name: "Sonata (Disc 2)"
+  saveName: "Sonata (Japan) (Disc 2)"
   discSet:
     name: "Sonata (Japan)"
     serials:
@@ -153435,9 +161351,11 @@ SLPS-01844:
     multitap: false
     linkCable: false
 SLPM-80318:
-  name: "Sonata (Japan) (Profile Disc)"
+  name: "Sonata (Profile Disc)"
+  saveName: "Sonata (Japan) (Profile Disc)"
 SLES-04102:
-  name: "Sonic Wings Special (Europe)"
+  name: "Sonic Wings Special"
+  saveName: "Sonic Wings Special (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -153455,7 +161373,8 @@ SLES-04102:
     multitap: false
     linkCable: false
 SLPS-00307:
-  name: "Sonic Wings Special (Japan)"
+  name: "Sonic Wings Special"
+  saveName: "Sonic Wings Special (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -153477,11 +161396,14 @@ SLPS-00307:
     multitap: false
     linkCable: false
 SLPM-80355:
-  name: "Sony Computer Entertainment Hyper Fan Book (Japan)"
+  name: "Sony Computer Entertainment Hyper Fan Book"
+  saveName: "Sony Computer Entertainment Hyper Fan Book (Japan)"
 SCED-02204:
-  name: "Sony Double Impact Games (Europe)"
+  name: "Sony Double Impact Games"
+  saveName: "Sony Double Impact Games (Europe)"
 SLES-04086:
-  name: "Sorcerer's Maze (Europe) (En,Fr,De,Es,It)"
+  name: "Sorcerer's Maze"
+  saveName: "Sorcerer's Maze (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -153503,7 +161425,8 @@ SLES-04086:
     multitap: false
     linkCable: false
 SLUS-01495:
-  name: "Sorcerer's Maze (USA)"
+  name: "Sorcerer's Maze"
+  saveName: "Sorcerer's Maze (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -153521,7 +161444,8 @@ SLUS-01495:
     multitap: false
     linkCable: false
 SLPS-01827:
-  name: "Soreike Flyfishing - Let's Go Flyfishing (Japan)"
+  name: "Soreike Flyfishing - Let's Go Flyfishing"
+  saveName: "Soreike Flyfishing - Let's Go Flyfishing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153540,7 +161464,8 @@ SLPS-01827:
     multitap: false
     linkCable: false
 SLPS-00484:
-  name: "Soreike no Kokology - Kokoro ga Oshieru Koi, Kekkon, Jinsei (Japan)"
+  name: "Soreike no Kokology - Kokoro ga Oshieru Koi, Kekkon, Jinsei"
+  saveName: "Soreike no Kokology - Kokoro ga Oshieru Koi, Kekkon, Jinsei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153558,7 +161483,8 @@ SLPS-00484:
     multitap: false
     linkCable: false
 SLPS-00273:
-  name: "Sotsugyou - Crossworld (Japan)"
+  name: "Sotsugyou - Crossworld"
+  saveName: "Sotsugyou - Crossworld (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153576,7 +161502,8 @@ SLPS-00273:
     multitap: false
     linkCable: false
 SLPS-00113:
-  name: "Sotsugyou II - Neo Generation (Japan)"
+  name: "Sotsugyou II - Neo Generation"
+  saveName: "Sotsugyou II - Neo Generation (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153612,7 +161539,8 @@ SLPS-02152:
     multitap: false
     linkCable: false
 SLPS-01332:
-  name: "Sotsugyou III - Wedding Bell (Japan)"
+  name: "Sotsugyou III - Wedding Bell"
+  saveName: "Sotsugyou III - Wedding Bell (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153630,7 +161558,8 @@ SLPS-01332:
     multitap: false
     linkCable: false
 SLPS-01444:
-  name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan) (Disc 1)"
+  name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Disc 1)"
+  saveName: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan) (Disc 1)"
   discSet:
     name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan)"
     serials:
@@ -153653,7 +161582,8 @@ SLPS-01444:
     multitap: false
     linkCable: false
 SLPS-01445:
-  name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan) (Disc 2)"
+  name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Disc 2)"
+  saveName: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan) (Disc 2)"
   discSet:
     name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan)"
     serials:
@@ -153676,7 +161606,8 @@ SLPS-01445:
     multitap: false
     linkCable: false
 SLPM-80233:
-  name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan) (Taikenban)"
+  name: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Taikenban)"
+  saveName: "Sotsugyou M - Seito Kaichou no Karei naru Inbou (Japan) (Taikenban)"
 SLPS-00318:
   name: "Sotsugyou R - Graduation Real"
   controllers:
@@ -153696,7 +161627,8 @@ SLPS-00318:
     multitap: false
     linkCable: false
 SLPS-00261:
-  name: "Sotsugyou R - Graduation Real (Japan)"
+  name: "Sotsugyou R - Graduation Real"
+  saveName: "Sotsugyou R - Graduation Real (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153714,7 +161646,8 @@ SLPS-00261:
     multitap: false
     linkCable: false
 SLPS-00989:
-  name: "Sotsugyou Vacation (Japan)"
+  name: "Sotsugyou Vacation"
+  saveName: "Sotsugyou Vacation (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153732,7 +161665,8 @@ SLPS-00989:
     multitap: false
     linkCable: false
 SLPS-01722:
-  name: "Sougaku Toshi Osaka (Japan) (Disc 1) (Method)"
+  name: "Sougaku Toshi Osaka (Disc 1) (Method)"
+  saveName: "Sougaku Toshi Osaka (Japan) (Disc 1) (Method)"
   discSet:
     name: "Sougaku Toshi Osaka (Japan)"
     serials:
@@ -153755,7 +161689,8 @@ SLPS-01722:
     multitap: false
     linkCable: false
 SLPS-01723:
-  name: "Sougaku Toshi Osaka (Japan) (Disc 2) (Object)"
+  name: "Sougaku Toshi Osaka (Disc 2) (Object)"
+  saveName: "Sougaku Toshi Osaka (Japan) (Disc 2) (Object)"
   discSet:
     name: "Sougaku Toshi Osaka (Japan)"
     serials:
@@ -153778,7 +161713,8 @@ SLPS-01723:
     multitap: false
     linkCable: false
 SLPS-01291:
-  name: "Soukaigi (Japan) (Disc 1)"
+  name: "Soukaigi (Disc 1)"
+  saveName: "Soukaigi (Japan) (Disc 1)"
   discSet:
     name: "Soukaigi (Japan)"
     serials:
@@ -153802,7 +161738,8 @@ SLPS-01291:
     multitap: false
     linkCable: false
 SLPS-01292:
-  name: "Soukaigi (Japan) (Disc 2)"
+  name: "Soukaigi (Disc 2)"
+  saveName: "Soukaigi (Japan) (Disc 2)"
   discSet:
     name: "Soukaigi (Japan)"
     serials:
@@ -153826,7 +161763,8 @@ SLPS-01292:
     multitap: false
     linkCable: false
 SLPS-01293:
-  name: "Soukaigi (Japan) (Disc 3)"
+  name: "Soukaigi (Disc 3)"
+  saveName: "Soukaigi (Japan) (Disc 3)"
   discSet:
     name: "Soukaigi (Japan)"
     serials:
@@ -153850,7 +161788,8 @@ SLPS-01293:
     multitap: false
     linkCable: false
 SLPS-02010:
-  name: "Soukoban - Nanmon Shinan (Japan)"
+  name: "Soukoban - Nanmon Shinan"
+  saveName: "Soukoban - Nanmon Shinan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153887,7 +161826,8 @@ SCPS-45093:
     multitap: false
     linkCable: false
 SLPS-00924:
-  name: "Soukoban Basic (Japan)"
+  name: "Soukoban Basic"
+  saveName: "Soukoban Basic (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153905,7 +161845,8 @@ SLPS-00924:
     multitap: false
     linkCable: false
 SLPS-01519:
-  name: "Soukoban Basic 2 (Japan)"
+  name: "Soukoban Basic 2"
+  saveName: "Soukoban Basic 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -153923,7 +161864,8 @@ SLPS-01519:
     multitap: false
     linkCable: false
 SLPS-02091:
-  name: "Soukou Kidoutai L.A.P.D. (Japan)"
+  name: "Soukou Kidoutai L.A.P.D."
+  saveName: "Soukou Kidoutai L.A.P.D. (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153942,11 +161884,13 @@ SLPS-02091:
     multitap: false
     linkCable: false
 SLPM-80432:
-  name: "Soukou Kidoutai L.A.P.D. (Japan) (Demo)"
+  name: "Soukou Kidoutai L.A.P.D. (Demo)"
+  saveName: "Soukou Kidoutai L.A.P.D. (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02315:
-  name: "Soukou Kihei Votoms - Koutetsu no Gunzei (Japan)"
+  name: "Soukou Kihei Votoms - Koutetsu no Gunzei"
+  saveName: "Soukou Kihei Votoms - Koutetsu no Gunzei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153965,7 +161909,8 @@ SLPS-02315:
     multitap: false
     linkCable: false
 SLPS-02313:
-  name: "Soukou Kihei Votoms - Koutetsu no Gunzei (Japan) (Shokai Seisan Genteiban)"
+  name: "Soukou Kihei Votoms - Koutetsu no Gunzei (Shokai Seisan Genteiban)"
+  saveName: "Soukou Kihei Votoms - Koutetsu no Gunzei (Japan) (Shokai Seisan Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -153984,7 +161929,8 @@ SLPS-02313:
     multitap: false
     linkCable: false
 SLPS-01961:
-  name: "Soukou Kihei Votoms - Lightning Slash (Japan)"
+  name: "Soukou Kihei Votoms - Lightning Slash"
+  saveName: "Soukou Kihei Votoms - Lightning Slash (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154003,11 +161949,13 @@ SLPS-01961:
     multitap: false
     linkCable: false
 SLPM-80360:
-  name: "Soukou Kihei Votoms - Lightning Slash (Japan) (Demo)"
+  name: "Soukou Kihei Votoms - Lightning Slash (Demo)"
+  saveName: "Soukou Kihei Votoms - Lightning Slash (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01960:
-  name: "Soukou Kihei Votoms - Lightning Slash (Japan) (Limited Edition)"
+  name: "Soukou Kihei Votoms - Lightning Slash (Limited Edition)"
+  saveName: "Soukou Kihei Votoms - Lightning Slash (Japan) (Limited Edition)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154026,7 +161974,8 @@ SLPS-01960:
     multitap: false
     linkCable: false
 SLPS-01331:
-  name: "Soukou Kihei Votoms - Woodo Kummen (Japan)"
+  name: "Soukou Kihei Votoms - Woodo Kummen"
+  saveName: "Soukou Kihei Votoms - Woodo Kummen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154045,7 +161994,8 @@ SLPS-01331:
     multitap: false
     linkCable: false
 SLPS-01330:
-  name: "Soukou Kihei Votoms - Woodo Kummen (Japan) (Limited Edition)"
+  name: "Soukou Kihei Votoms - Woodo Kummen (Limited Edition)"
+  saveName: "Soukou Kihei Votoms - Woodo Kummen (Japan) (Limited Edition)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154064,7 +162014,8 @@ SLPS-01330:
     multitap: false
     linkCable: false
 SLPS-00981:
-  name: "Soukou Kihei Votoms Gaiden - Ao no Kishi Berserga Monogatari (Japan) (Limited Edition)"
+  name: "Soukou Kihei Votoms Gaiden - Ao no Kishi Berserga Monogatari (Limited Edition)"
+  saveName: "Soukou Kihei Votoms Gaiden - Ao no Kishi Berserga Monogatari (Japan) (Limited Edition)"
   controllers:
     - DigitalController
   metadata:
@@ -154082,7 +162033,8 @@ SLPS-00981:
     multitap: false
     linkCable: true
 SCPS-45115:
-  name: "Soukou Kihei Votoms Gaiden - Ao no Kishi Berserga Monogatari (Japan, Asia)"
+  name: "Soukou Kihei Votoms Gaiden - Ao no Kishi Berserga Monogatari"
+  saveName: "Soukou Kihei Votoms Gaiden - Ao no Kishi Berserga Monogatari (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -154103,7 +162055,8 @@ SCPS-45115:
     multitap: false
     linkCable: true
 SLPS-01041:
-  name: "Soukuu no Tsubasa - Gotha World (Japan) (Disc 1)"
+  name: "Soukuu no Tsubasa - Gotha World (Disc 1)"
+  saveName: "Soukuu no Tsubasa - Gotha World (Japan) (Disc 1)"
   discSet:
     name: "Soukuu no Tsubasa - Gotha World (Japan)"
     serials:
@@ -154126,7 +162079,8 @@ SLPS-01041:
     multitap: false
     linkCable: false
 SLPS-01042:
-  name: "Soukuu no Tsubasa - Gotha World (Japan) (Disc 2)"
+  name: "Soukuu no Tsubasa - Gotha World (Disc 2)"
+  saveName: "Soukuu no Tsubasa - Gotha World (Japan) (Disc 2)"
   discSet:
     name: "Soukuu no Tsubasa - Gotha World (Japan)"
     serials:
@@ -154149,7 +162103,8 @@ SLPS-01042:
     multitap: false
     linkCable: false
 SLPS-01172:
-  name: "Soukyuu Gurentai - Oubushutsugeki (Japan)"
+  name: "Soukyuu Gurentai - Oubushutsugeki"
+  saveName: "Soukyuu Gurentai - Oubushutsugeki (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2202-ga17e15f1"
@@ -154173,7 +162128,8 @@ SLPS-01172:
     multitap: false
     linkCable: false
 SCES-00577:
-  name: "Soul Blade (Europe)"
+  name: "Soul Blade"
+  saveName: "Soul Blade (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2949-gcd2c581f"
@@ -154201,7 +162157,8 @@ SCES-00577:
     multitap: false
     linkCable: false
 SLUS-00240:
-  name: "Soul Blade (USA)"
+  name: "Soul Blade"
+  saveName: "Soul Blade (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -154229,7 +162186,8 @@ SLUS-00240:
     multitap: false
     linkCable: false
 SLPS-00555:
-  name: "Soul Edge (Japan)"
+  name: "Soul Edge"
+  saveName: "Soul Edge (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2202-ga17e15f1"
@@ -154257,7 +162215,8 @@ SLPS-00555:
     multitap: false
     linkCable: false
 SLPS-00545:
-  name: "Soul Edge (Japan) (Gentei Box)"
+  name: "Soul Edge (Gentei Box)"
+  saveName: "Soul Edge (Japan) (Gentei Box)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2202-ga17e15f1"
@@ -154285,7 +162244,8 @@ SLPS-00545:
     multitap: false
     linkCable: false
 SLPS-91168:
-  name: "Soul Edge (Japan) (Rev 1)"
+  name: "Soul Edge"
+  saveName: "Soul Edge (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154313,7 +162273,8 @@ SLPS-91168:
     multitap: false
     linkCable: false
 SLUS-00822:
-  name: "Soul of the Samurai (USA)"
+  name: "Soul of the Samurai"
+  saveName: "Soul of the Samurai (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1153-g06b329b"
@@ -154335,7 +162296,8 @@ SLUS-00822:
     multitap: false
     linkCable: false
 SLPM-86170:
-  name: "Soulmaster (Japan)"
+  name: "Soulmaster"
+  saveName: "Soulmaster (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -154356,7 +162318,8 @@ SLPM-86170:
     multitap: true
     linkCable: false
 SLPS-02479:
-  name: "Soumatou (Japan)"
+  name: "Soumatou"
+  saveName: "Soumatou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -154374,7 +162337,8 @@ SLPS-02479:
     multitap: false
     linkCable: false
 SLPM-80507:
-  name: "Soumatou (Japan) (Demo)"
+  name: "Soumatou (Demo)"
+  saveName: "Soumatou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-91237:
@@ -154396,7 +162360,8 @@ SLPS-91237:
     multitap: false
     linkCable: false
 SLPS-01645:
-  name: "Sound Novel Evolution 1 - Otogirisou - Sosei-hen (Japan)"
+  name: "Sound Novel Evolution 1 - Otogirisou - Sosei-hen"
+  saveName: "Sound Novel Evolution 1 - Otogirisou - Sosei-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154415,7 +162380,8 @@ SLPS-01645:
     multitap: false
     linkCable: false
 SLPS-91225:
-  name: "Sound Novel Evolution 1 - Otogirisou - Sosei-hen (Japan) (Rev 1)"
+  name: "Sound Novel Evolution 1 - Otogirisou - Sosei-hen"
+  saveName: "Sound Novel Evolution 1 - Otogirisou - Sosei-hen (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154434,7 +162400,8 @@ SLPS-91225:
     multitap: false
     linkCable: false
 SLPS-01794:
-  name: "Sound Novel Evolution 2 - Kamaitachi no Yoru Tokubetsu Hen (Japan)"
+  name: "Sound Novel Evolution 2 - Kamaitachi no Yoru Tokubetsu Hen"
+  saveName: "Sound Novel Evolution 2 - Kamaitachi no Yoru Tokubetsu Hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154456,7 +162423,8 @@ SLPS-01794:
     multitap: false
     linkCable: false
 SLPS-01845:
-  name: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Japan) (Disc 1)"
+  name: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Disc 1)"
+  saveName: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Japan) (Disc 1)"
   discSet:
     name: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Japan)"
     serials:
@@ -154483,7 +162451,8 @@ SLPS-01845:
     multitap: false
     linkCable: false
 SLPS-01846:
-  name: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Japan) (Disc 2)"
+  name: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Disc 2)"
+  saveName: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Japan) (Disc 2)"
   discSet:
     name: "Sound Novel Evolution 3 - Machi - Unmei no Kousaten (Japan)"
     serials:
@@ -154510,7 +162479,8 @@ SLPS-01846:
     multitap: false
     linkCable: false
 SLPS-00882:
-  name: "Sound Novel Tkool 2 (Japan)"
+  name: "Sound Novel Tkool 2"
+  saveName: "Sound Novel Tkool 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -154528,7 +162498,8 @@ SLPS-00882:
     multitap: false
     linkCable: false
 SLPS-01309:
-  name: "Sound Qube (Japan)"
+  name: "Sound Qube"
+  saveName: "Sound Qube (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -154546,7 +162517,8 @@ SLPS-01309:
     multitap: false
     linkCable: false
 SLPS-02716:
-  name: "Sound Qube (Japan) (Best of the Best)"
+  name: "Sound Qube (Best of the Best)"
+  saveName: "Sound Qube (Japan) (Best of the Best)"
   controllers:
     - DigitalController
   metadata:
@@ -154564,7 +162536,8 @@ SLPS-02716:
     multitap: false
     linkCable: false
 SLPS-00642:
-  name: "Souryuu (Japan)"
+  name: "Souryuu"
+  saveName: "Souryuu (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -154585,7 +162558,8 @@ SLPS-00642:
     multitap: false
     linkCable: false
 SCPS-10058:
-  name: "Souten no Shiroki Kami no Kura - Great Peak (Japan)"
+  name: "Souten no Shiroki Kami no Kura - Great Peak"
+  saveName: "Souten no Shiroki Kami no Kura - Great Peak (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -154603,7 +162577,8 @@ SCPS-10058:
     multitap: false
     linkCable: false
 SLES-02158:
-  name: "South Park (Europe)"
+  name: "South Park"
+  saveName: "South Park (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154622,7 +162597,8 @@ SLES-02158:
     multitap: false
     linkCable: false
 SLUS-00936:
-  name: "South Park (USA)"
+  name: "South Park"
+  saveName: "South Park (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -154644,7 +162620,8 @@ SLUS-00936:
     multitap: false
     linkCable: false
 SLES-01972:
-  name: "South Park - Chef's Luv Shack (Europe)"
+  name: "South Park - Chef's Luv Shack"
+  saveName: "South Park - Chef's Luv Shack (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -154662,11 +162639,13 @@ SLES-01972:
     multitap: true
     linkCable: false
 SLED-02576:
-  name: "South Park - Chef's Luv Shack (Europe) (Demo)"
+  name: "South Park - Chef's Luv Shack (Demo)"
+  saveName: "South Park - Chef's Luv Shack (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00997:
-  name: "South Park - Chef's Luv Shack (USA)"
+  name: "South Park - Chef's Luv Shack"
+  saveName: "South Park - Chef's Luv Shack (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -154684,7 +162663,8 @@ SLUS-00997:
     multitap: true
     linkCable: false
 SLES-02352:
-  name: "South Park Rally (Europe)"
+  name: "South Park Rally"
+  saveName: "South Park Rally (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154704,7 +162684,8 @@ SLES-02352:
     multitap: false
     linkCable: false
 SLES-02690:
-  name: "South Park Rally (Europe) (En,Fr,De,Es)"
+  name: "South Park Rally"
+  saveName: "South Park Rally (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154727,7 +162708,8 @@ SLES-02690:
     multitap: false
     linkCable: false
 SLUS-00984:
-  name: "South Park Rally (USA)"
+  name: "South Park Rally"
+  saveName: "South Park Rally (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -154750,7 +162732,8 @@ SLUS-00984:
     multitap: false
     linkCable: false
 SLPM-86408:
-  name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan) (Disc 1) (Museum)"
+  name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Disc 1) (Museum)"
+  saveName: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan) (Disc 1) (Museum)"
   discSet:
     name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan)"
     serials:
@@ -154774,7 +162757,8 @@ SLPM-86408:
     multitap: false
     linkCable: false
 SLPM-86409:
-  name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan) (Disc 2) (Library)"
+  name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Disc 2) (Library)"
+  saveName: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan) (Disc 2) (Library)"
   discSet:
     name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan)"
     serials:
@@ -154798,7 +162782,8 @@ SLPM-86409:
     multitap: false
     linkCable: false
 SLPM-86410:
-  name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan) (Disc 3) (Theater)"
+  name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Disc 3) (Theater)"
+  saveName: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan) (Disc 3) (Theater)"
   discSet:
     name: "Southern All Stars - Space MOSA Space Museum of Southern Art (Japan)"
     serials:
@@ -154822,7 +162807,8 @@ SLPM-86410:
     multitap: false
     linkCable: false
 SLES-00507:
-  name: "Soviet Strike (Europe)"
+  name: "Soviet Strike"
+  saveName: "Soviet Strike (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -154840,7 +162826,8 @@ SLES-00507:
     multitap: false
     linkCable: false
 SLES-00508:
-  name: "Soviet Strike (France)"
+  name: "Soviet Strike"
+  saveName: "Soviet Strike (France)"
   controllers:
     - DigitalController
   metadata:
@@ -154858,7 +162845,8 @@ SLES-00508:
     multitap: false
     linkCable: false
 SLES-00509:
-  name: "Soviet Strike (Germany)"
+  name: "Soviet Strike"
+  saveName: "Soviet Strike (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -154876,7 +162864,8 @@ SLES-00509:
     multitap: false
     linkCable: false
 SLPS-00735:
-  name: "Soviet Strike (Japan)"
+  name: "Soviet Strike"
+  saveName: "Soviet Strike (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -154894,7 +162883,8 @@ SLPS-00735:
     multitap: false
     linkCable: false
 SLUS-00061:
-  name: "Soviet Strike (USA)"
+  name: "Soviet Strike"
+  saveName: "Soviet Strike (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -154912,7 +162902,8 @@ SLUS-00061:
     multitap: false
     linkCable: false
 SLPS-00312:
-  name: "Space Adventure Cobra - The Shooting (Japan)"
+  name: "Space Adventure Cobra - The Shooting"
+  saveName: "Space Adventure Cobra - The Shooting (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -154953,7 +162944,8 @@ SLPS-02733:
     multitap: false
     linkCable: false
 SCES-02290:
-  name: "Space Debris (Europe)"
+  name: "Space Debris"
+  saveName: "Space Debris (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154973,7 +162965,8 @@ SCES-02290:
     multitap: false
     linkCable: false
 SCES-02430:
-  name: "Space Debris (France)"
+  name: "Space Debris"
+  saveName: "Space Debris (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -154993,7 +162986,8 @@ SCES-02430:
     multitap: false
     linkCable: false
 SCES-02431:
-  name: "Space Debris (Germany)"
+  name: "Space Debris"
+  saveName: "Space Debris (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155013,7 +163007,8 @@ SCES-02431:
     multitap: false
     linkCable: false
 SCES-02432:
-  name: "Space Debris (Italy)"
+  name: "Space Debris"
+  saveName: "Space Debris (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155033,7 +163028,8 @@ SCES-02432:
     multitap: false
     linkCable: false
 SCES-02433:
-  name: "Space Debris (Spain)"
+  name: "Space Debris"
+  saveName: "Space Debris (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155053,7 +163049,8 @@ SCES-02433:
     multitap: false
     linkCable: false
 SLPS-00012:
-  name: "Space Griffon VF-9 (Japan)"
+  name: "Space Griffon VF-9"
+  saveName: "Space Griffon VF-9 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -155073,7 +163070,8 @@ SLPS-00012:
     multitap: false
     linkCable: false
 SLUS-00153:
-  name: "Space Griffon VF-9 (USA)"
+  name: "Space Griffon VF-9"
+  saveName: "Space Griffon VF-9 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -155091,7 +163089,8 @@ SLUS-00153:
     multitap: false
     linkCable: false
 SLES-00207:
-  name: "Space Hulk - Vengeance of the Blood Angels (Europe)"
+  name: "Space Hulk - Vengeance of the Blood Angels"
+  saveName: "Space Hulk - Vengeance of the Blood Angels (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -155109,7 +163108,8 @@ SLES-00207:
     multitap: false
     linkCable: false
 SLUS-00205:
-  name: "Space Hulk - Vengeance of the Blood Angels (USA)"
+  name: "Space Hulk - Vengeance of the Blood Angels"
+  saveName: "Space Hulk - Vengeance of the Blood Angels (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -155127,7 +163127,8 @@ SLUS-00205:
     multitap: false
     linkCable: false
 SLES-02144:
-  name: "Space Invaders (Europe)"
+  name: "Space Invaders"
+  saveName: "Space Invaders (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155146,7 +163147,8 @@ SLES-02144:
     multitap: false
     linkCable: false
 SLPS-00940:
-  name: "Space Invaders (Japan)"
+  name: "Space Invaders"
+  saveName: "Space Invaders (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -155164,7 +163166,8 @@ SLPS-00940:
     multitap: false
     linkCable: false
 SLUS-00928:
-  name: "Space Invaders (USA)"
+  name: "Space Invaders"
+  saveName: "Space Invaders (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -155186,7 +163189,8 @@ SLUS-00928:
     multitap: false
     linkCable: false
 SLPM-86153:
-  name: "Space Invaders 2000 (Japan)"
+  name: "Space Invaders 2000"
+  saveName: "Space Invaders 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155205,7 +163209,8 @@ SLPM-86153:
     multitap: false
     linkCable: false
 SLPM-86419:
-  name: "Space Invaders X (Japan)"
+  name: "Space Invaders X"
+  saveName: "Space Invaders X (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155224,7 +163229,8 @@ SLPM-86419:
     multitap: false
     linkCable: false
 SLES-00284:
-  name: "Space Jam (Europe)"
+  name: "Space Jam"
+  saveName: "Space Jam (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -155242,7 +163248,8 @@ SLES-00284:
     multitap: true
     linkCable: false
 SLPS-00697:
-  name: "Space Jam (Japan)"
+  name: "Space Jam"
+  saveName: "Space Jam (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -155260,7 +163267,8 @@ SLPS-00697:
     multitap: true
     linkCable: false
 SLUS-00243:
-  name: "Space Jam (USA)"
+  name: "Space Jam"
+  saveName: "Space Jam (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -155281,7 +163289,8 @@ SLUS-00243:
     multitap: true
     linkCable: false
 SLES-04126:
-  name: "Space Rider (Europe)"
+  name: "Space Rider"
+  saveName: "Space Rider (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155300,7 +163309,8 @@ SLES-04126:
     multitap: false
     linkCable: false
 SLUS-01308:
-  name: "Space Shot (USA)"
+  name: "Space Shot"
+  saveName: "Space Shot (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -155322,7 +163332,8 @@ SLUS-01308:
     multitap: false
     linkCable: false
 SLPS-00074:
-  name: "Sparrow Garden - Namco Mahjong (Japan)"
+  name: "Sparrow Garden - Namco Mahjong"
+  saveName: "Sparrow Garden - Namco Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -155340,7 +163351,8 @@ SLPS-00074:
     multitap: false
     linkCable: false
 SCES-01056:
-  name: "Spawn - The Eternal (Europe)"
+  name: "Spawn - The Eternal"
+  saveName: "Spawn - The Eternal (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -155358,7 +163370,8 @@ SCES-01056:
     multitap: false
     linkCable: false
 SLPS-01400:
-  name: "Spawn - The Eternal (Japan)"
+  name: "Spawn - The Eternal"
+  saveName: "Spawn - The Eternal (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -155376,7 +163389,8 @@ SLPS-01400:
     multitap: false
     linkCable: false
 SCUS-94204:
-  name: "Spawn - The Eternal (USA)"
+  name: "Spawn - The Eternal"
+  saveName: "Spawn - The Eternal (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -155394,7 +163408,8 @@ SCUS-94204:
     multitap: false
     linkCable: false
 SLES-03891:
-  name: "Spec Ops - Airborne Commando (Europe) (En,Fr,De,It)"
+  name: "Spec Ops - Airborne Commando"
+  saveName: "Spec Ops - Airborne Commando (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155416,7 +163431,8 @@ SLES-03891:
     multitap: false
     linkCable: false
 SLUS-01447:
-  name: "Spec Ops - Airborne Commando (USA)"
+  name: "Spec Ops - Airborne Commando"
+  saveName: "Spec Ops - Airborne Commando (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -155438,7 +163454,8 @@ SLUS-01447:
     multitap: false
     linkCable: false
 SLES-03515:
-  name: "Spec Ops - Covert Assault (Europe) (En,Fr,De,Es,It)"
+  name: "Spec Ops - Covert Assault"
+  saveName: "Spec Ops - Covert Assault (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155461,7 +163478,8 @@ SLES-03515:
     multitap: false
     linkCable: false
 SLUS-01420:
-  name: "Spec Ops - Covert Assault (USA)"
+  name: "Spec Ops - Covert Assault"
+  saveName: "Spec Ops - Covert Assault (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155480,7 +163498,8 @@ SLUS-01420:
     multitap: false
     linkCable: false
 SLES-03157:
-  name: "Spec Ops - Ranger Elite (Europe) (En,Fr,De,Es,It)"
+  name: "Spec Ops - Ranger Elite"
+  saveName: "Spec Ops - Ranger Elite (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155503,7 +163522,8 @@ SLES-03157:
     multitap: false
     linkCable: false
 SLUS-01299:
-  name: "Spec Ops - Ranger Elite (USA)"
+  name: "Spec Ops - Ranger Elite"
+  saveName: "Spec Ops - Ranger Elite (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155522,7 +163542,8 @@ SLUS-01299:
     multitap: false
     linkCable: false
 SLES-00844:
-  name: "Spec Ops - Stealth Patrol (Europe) (En,Fr,De,Es,It)"
+  name: "Spec Ops - Stealth Patrol"
+  saveName: "Spec Ops - Stealth Patrol (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155545,7 +163566,8 @@ SLES-00844:
     multitap: false
     linkCable: false
 SLUS-01131:
-  name: "Spec Ops - Stealth Patrol (USA)"
+  name: "Spec Ops - Stealth Patrol"
+  saveName: "Spec Ops - Stealth Patrol (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155564,7 +163586,8 @@ SLUS-01131:
     multitap: false
     linkCable: false
 SLPS-02526:
-  name: "Spectral Blade (Japan)"
+  name: "Spectral Blade"
+  saveName: "Spectral Blade (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155586,7 +163609,8 @@ SLPS-02526:
     multitap: false
     linkCable: false
 SLPS-01056:
-  name: "Spectral Force (Japan)"
+  name: "Spectral Force"
+  saveName: "Spectral Force (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -155607,7 +163631,8 @@ SLPS-01056:
     multitap: false
     linkCable: false
 SLPS-00969:
-  name: "Spectral Force (Japan) (Shokai Gentei Box)"
+  name: "Spectral Force (Shokai Gentei Box)"
+  saveName: "Spectral Force (Japan) (Shokai Gentei Box)"
   controllers:
     - DigitalController
   metadata:
@@ -155625,7 +163650,8 @@ SLPS-00969:
     multitap: false
     linkCable: false
 SLPS-02233:
-  name: "Spectral Force - Itoshiki Jaaku (Japan)"
+  name: "Spectral Force - Itoshiki Jaaku"
+  saveName: "Spectral Force - Itoshiki Jaaku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155647,7 +163673,8 @@ SLPS-02233:
     multitap: false
     linkCable: false
 SLPS-01628:
-  name: "Spectral Force 2 (Japan)"
+  name: "Spectral Force 2"
+  saveName: "Spectral Force 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155669,7 +163696,8 @@ SLPS-01628:
     multitap: false
     linkCable: false
 SLPS-00476:
-  name: "Spectral Tower (Japan)"
+  name: "Spectral Tower"
+  saveName: "Spectral Tower (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -155687,7 +163715,8 @@ SLPS-00476:
     multitap: false
     linkCable: false
 SLPS-01179:
-  name: "Spectral Tower II (Japan)"
+  name: "Spectral Tower II"
+  saveName: "Spectral Tower II (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -155708,11 +163737,13 @@ SLPS-01179:
     multitap: false
     linkCable: false
 SLPM-80209:
-  name: "Spectral Tower II (Japan) (Demo)"
+  name: "Spectral Tower II (Demo)"
+  saveName: "Spectral Tower II (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01763:
-  name: "Speed Freaks (Europe)"
+  name: "Speed Freaks"
+  saveName: "Speed Freaks (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155733,7 +163764,8 @@ SCES-01763:
     multitap: true
     linkCable: false
 SLPM-86013:
-  name: "Speed King - Neo Kobe 2045 (Japan)"
+  name: "Speed King - Neo Kobe 2045"
+  saveName: "Speed King - Neo Kobe 2045 (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -155752,7 +163784,8 @@ SLPM-86013:
     multitap: false
     linkCable: false
 SLES-03930:
-  name: "Speed Machines (Europe)"
+  name: "Speed Machines"
+  saveName: "Speed Machines (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155772,7 +163805,8 @@ SLES-03930:
     multitap: false
     linkCable: false
 SCUS-94563:
-  name: "Speed Punks (USA)"
+  name: "Speed Punks"
+  saveName: "Speed Punks (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -155795,11 +163829,13 @@ SCUS-94563:
     multitap: true
     linkCable: false
 SCUS-94572:
-  name: "Speed Punks (USA) (Demo)"
+  name: "Speed Punks (Demo)"
+  saveName: "Speed Punks (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00613:
-  name: "Speed Racer (USA)"
+  name: "Speed Racer"
+  saveName: "Speed Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -155821,7 +163857,8 @@ SLUS-00613:
     multitap: false
     linkCable: false
 SLES-02782:
-  name: "Speedball 2100 (Europe) (En,Fr,De,Es,It)"
+  name: "Speedball 2100"
+  saveName: "Speedball 2100 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155844,7 +163881,8 @@ SLES-02782:
     multitap: false
     linkCable: false
 SLUS-01218:
-  name: "Speedball 2100 (USA)"
+  name: "Speedball 2100"
+  saveName: "Speedball 2100 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -155863,7 +163901,8 @@ SLUS-01218:
     multitap: false
     linkCable: false
 SLES-00575:
-  name: "Speedster (Europe)"
+  name: "Speedster"
+  saveName: "Speedster (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -155882,11 +163921,13 @@ SLES-00575:
     multitap: false
     linkCable: false
 SLED-01711:
-  name: "Sphere 360 (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Sphere 360 (Demo)"
+  saveName: "Sphere 360 (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00883:
-  name: "Spice World (Europe)"
+  name: "Spice World"
+  saveName: "Spice World (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -155904,7 +163945,8 @@ SCES-00883:
     multitap: false
     linkCable: false
 SCES-01231:
-  name: "Spice World (France)"
+  name: "Spice World"
+  saveName: "Spice World (France)"
   controllers:
     - DigitalController
   metadata:
@@ -155922,7 +163964,8 @@ SCES-01231:
     multitap: false
     linkCable: false
 SCES-01232:
-  name: "Spice World (Germany)"
+  name: "Spice World"
+  saveName: "Spice World (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -155940,7 +163983,8 @@ SCES-01232:
     multitap: false
     linkCable: false
 SCES-01233:
-  name: "Spice World (Italy)"
+  name: "Spice World"
+  saveName: "Spice World (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -155958,7 +164002,8 @@ SCES-01233:
     multitap: false
     linkCable: false
 SCES-01234:
-  name: "Spice World (Spain)"
+  name: "Spice World"
+  saveName: "Spice World (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -155976,7 +164021,8 @@ SCES-01234:
     multitap: false
     linkCable: false
 SLUS-00723:
-  name: "Spice World (USA)"
+  name: "Spice World"
+  saveName: "Spice World (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -155994,7 +164040,8 @@ SLUS-00723:
     multitap: false
     linkCable: false
 SLES-00117:
-  name: "Spider - The Video Game (Europe)"
+  name: "Spider - The Video Game"
+  saveName: "Spider - The Video Game (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -156012,7 +164059,8 @@ SLES-00117:
     multitap: false
     linkCable: false
 SLES-00681:
-  name: "Spider - The Video Game (France)"
+  name: "Spider - The Video Game"
+  saveName: "Spider - The Video Game (France)"
   controllers:
     - DigitalController
   metadata:
@@ -156030,7 +164078,8 @@ SLES-00681:
     multitap: false
     linkCable: false
 SLES-00682:
-  name: "Spider - The Video Game (Germany)"
+  name: "Spider - The Video Game"
+  saveName: "Spider - The Video Game (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -156048,7 +164097,8 @@ SLES-00682:
     multitap: false
     linkCable: false
 SLPS-00852:
-  name: "Spider - The Video Game (Japan)"
+  name: "Spider - The Video Game"
+  saveName: "Spider - The Video Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -156066,7 +164116,8 @@ SLPS-00852:
     multitap: false
     linkCable: false
 SLUS-00230:
-  name: "Spider - The Video Game (USA)"
+  name: "Spider - The Video Game"
+  saveName: "Spider - The Video Game (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -156102,7 +164153,8 @@ SCPS-45068:
     multitap: false
     linkCable: false
 SLES-02886:
-  name: "Spider-Man (Europe)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156126,7 +164178,8 @@ SLES-02886:
     multitap: false
     linkCable: false
 SLES-02887:
-  name: "Spider-Man (France)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156150,7 +164203,8 @@ SLES-02887:
     multitap: false
     linkCable: false
 SLES-02888:
-  name: "Spider-Man (Germany)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156174,7 +164228,8 @@ SLES-02888:
     multitap: false
     linkCable: false
 SLES-02889:
-  name: "Spider-Man (Italy)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156198,7 +164253,8 @@ SLES-02889:
     multitap: false
     linkCable: false
 SLPM-86739:
-  name: "Spider-Man (Japan)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156225,7 +164281,8 @@ SLPM-86739:
     multitap: false
     linkCable: false
 SLES-02890:
-  name: "Spider-Man (Spain)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -156252,7 +164309,8 @@ SLES-02890:
     multitap: false
     linkCable: false
 SLUS-00875:
-  name: "Spider-Man (USA)"
+  name: "Spider-Man"
+  saveName: "Spider-Man (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -156279,7 +164337,8 @@ SLUS-00875:
     multitap: false
     linkCable: false
 SLES-03623:
-  name: "Spider-Man 2 - Enter - Electro (Europe)"
+  name: "Spider-Man 2 - Enter - Electro"
+  saveName: "Spider-Man 2 - Enter - Electro (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156302,7 +164361,8 @@ SLES-03623:
     multitap: false
     linkCable: false
 SLES-03625:
-  name: "Spider-Man 2 - Enter - Electro (Germany)"
+  name: "Spider-Man 2 - Enter - Electro"
+  saveName: "Spider-Man 2 - Enter - Electro (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156325,7 +164385,8 @@ SLES-03625:
     multitap: false
     linkCable: false
 SLPM-87073:
-  name: "Spider-Man 2 - Enter - Electro (Japan)"
+  name: "Spider-Man 2 - Enter - Electro"
+  saveName: "Spider-Man 2 - Enter - Electro (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156348,7 +164409,8 @@ SLPM-87073:
     multitap: false
     linkCable: false
 SLUS-01378:
-  name: "Spider-Man 2 - Enter - Electro (USA)"
+  name: "Spider-Man 2 - Enter - Electro"
+  saveName: "Spider-Man 2 - Enter - Electro (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -156374,7 +164436,8 @@ SLUS-01378:
     multitap: false
     linkCable: false
 SLES-03624:
-  name: "Spider-Man 2 - La Revanche d'Electro (France)"
+  name: "Spider-Man 2 - La Revanche d'Electro"
+  saveName: "Spider-Man 2 - La Revanche d'Electro (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156397,7 +164460,8 @@ SLES-03624:
     multitap: false
     linkCable: false
 SLES-02790:
-  name: "Spin Jam (Europe)"
+  name: "Spin Jam"
+  saveName: "Spin Jam (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156417,7 +164481,8 @@ SLES-02790:
     multitap: false
     linkCable: false
 SLUS-01250:
-  name: "Spin Jam (USA)"
+  name: "Spin Jam"
+  saveName: "Spin Jam (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156437,7 +164502,8 @@ SLUS-01250:
     multitap: false
     linkCable: false
 SLPS-01461:
-  name: "Spin Tail (Japan)"
+  name: "Spin Tail"
+  saveName: "Spin Tail (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156456,7 +164522,8 @@ SLPS-01461:
     multitap: false
     linkCable: false
 SLES-01361:
-  name: "Sports Car GT (Europe)"
+  name: "Sports Car GT"
+  saveName: "Sports Car GT (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156476,7 +164543,8 @@ SLES-01361:
     multitap: false
     linkCable: false
 SLES-01915:
-  name: "Sports Car GT (France)"
+  name: "Sports Car GT"
+  saveName: "Sports Car GT (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156496,7 +164564,8 @@ SLES-01915:
     multitap: false
     linkCable: false
 SLES-01916:
-  name: "Sports Car GT (Germany)"
+  name: "Sports Car GT"
+  saveName: "Sports Car GT (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156516,7 +164585,8 @@ SLES-01916:
     multitap: false
     linkCable: false
 SLUS-00655:
-  name: "Sports Car GT (USA)"
+  name: "Sports Car GT"
+  saveName: "Sports Car GT (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156536,7 +164606,8 @@ SLUS-00655:
     multitap: false
     linkCable: false
 SLES-03057:
-  name: "Sports Superbike (Europe) (En,Fr,De,It)"
+  name: "Sports Superbike"
+  saveName: "Sports Superbike (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156559,7 +164630,8 @@ SLES-03057:
     multitap: false
     linkCable: false
 SLES-03827:
-  name: "Sports Superbike 2 (Europe)"
+  name: "Sports Superbike 2"
+  saveName: "Sports Superbike 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156579,7 +164651,8 @@ SLES-03827:
     multitap: false
     linkCable: false
 SLUS-01459:
-  name: "Sports Superbike 2 (USA)"
+  name: "Sports Superbike 2"
+  saveName: "Sports Superbike 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1520-g0aefdf47"
@@ -156602,7 +164675,8 @@ SLUS-01459:
     multitap: false
     linkCable: false
 SLES-02616:
-  name: "Sportweek Player Manager 2000 (Netherlands) (En,Fr)"
+  name: "Sportweek Player Manager 2000"
+  saveName: "Sportweek Player Manager 2000 (Netherlands) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156622,7 +164696,8 @@ SLES-02616:
     multitap: false
     linkCable: false
 SLES-03569:
-  name: "Sportweek Player Manager 2001 (Netherlands)"
+  name: "Sportweek Player Manager 2001"
+  saveName: "Sportweek Player Manager 2001 (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156641,7 +164716,8 @@ SLES-03569:
     multitap: false
     linkCable: false
 SLES-00330:
-  name: "Spot Goes to Hollywood (Europe)"
+  name: "Spot Goes to Hollywood"
+  saveName: "Spot Goes to Hollywood (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -156659,7 +164735,8 @@ SLES-00330:
     multitap: false
     linkCable: false
 SLPS-00394:
-  name: "Spot Goes to Hollywood (Japan)"
+  name: "Spot Goes to Hollywood"
+  saveName: "Spot Goes to Hollywood (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -156677,7 +164754,8 @@ SLPS-00394:
     multitap: false
     linkCable: false
 SLUS-00014:
-  name: "Spot Goes to Hollywood (USA)"
+  name: "Spot Goes to Hollywood"
+  saveName: "Spot Goes to Hollywood (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -156698,7 +164776,8 @@ SLUS-00014:
     multitap: false
     linkCable: false
 SLPS-02117:
-  name: "Spriggan - Lunar Verse (Japan)"
+  name: "Spriggan - Lunar Verse"
+  saveName: "Spriggan - Lunar Verse (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -156717,13 +164796,16 @@ SLPS-02117:
     multitap: false
     linkCable: false
 SLPM-80447:
-  name: "Spriggan - Lunar Verse (Japan) (Demo)"
+  name: "Spriggan - Lunar Verse (Demo)"
+  saveName: "Spriggan - Lunar Verse (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90034:
-  name: "Spring Special (Japan)"
+  name: "Spring Special"
+  saveName: "Spring Special (Japan)"
 SCES-02835:
-  name: "Spyro - Year of the Dragon (Europe) (En,Fr,De,Es,It)"
+  name: "Spyro - Year of the Dragon"
+  saveName: "Spyro - Year of the Dragon (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -156753,7 +164835,8 @@ SCES-02835:
     multitap: false
     linkCable: false
 SCUS-94467:
-  name: "Spyro - Year of the Dragon (USA)"
+  name: "Spyro - Year of the Dragon"
+  saveName: "Spyro - Year of the Dragon (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -156779,14 +164862,16 @@ SCUS-94467:
     multitap: false
     linkCable: false
 SCUS-94615:
-  name: "Spyro - Year of the Dragon (USA) (Demo)"
+  name: "Spyro - Year of the Dragon (Demo)"
+  saveName: "Spyro - Year of the Dragon (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableCDROMReadSpeedup # Fixes cutscene audio.
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
 SCES-02104:
-  name: "Spyro 2 - Gateway to Glimmer (Europe) (En,Fr,De,Es,It)"
+  name: "Spyro 2 - Gateway to Glimmer"
+  saveName: "Spyro 2 - Gateway to Glimmer (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -156815,7 +164900,8 @@ SCES-02104:
     multitap: false
     linkCable: false
 SCUS-94425:
-  name: "Spyro 2 - Ripto's Rage! (USA)"
+  name: "Spyro 2 - Ripto's Rage!"
+  saveName: "Spyro 2 - Ripto's Rage! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -156841,14 +164927,16 @@ SCUS-94425:
     multitap: false
     linkCable: false
 SCUS-94460:
-  name: "Spyro 2 - Ripto's Rage! (USA) (Demo)"
+  name: "Spyro 2 - Ripto's Rage! (Demo)"
+  saveName: "Spyro 2 - Ripto's Rage! (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableCDROMReadSpeedup # Fixes cutscene audio.
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
 SCUS-94632:
-  name: "Spyro 2 - Ripto's Rage! + Crash Team Racing (USA)"
+  name: "Spyro 2 - Ripto's Rage! + Crash Team Racing"
+  saveName: "Spyro 2 - Ripto's Rage! + Crash Team Racing (USA)"
   traits:
     - DisableCDROMReadSpeedup # Fixes cutscene audio.
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
@@ -156876,7 +164964,8 @@ SCPS-45395:
     multitap: false
     linkCable: false
 SCES-01438:
-  name: "Spyro the Dragon (Europe) (En,Fr,De,Es,It)"
+  name: "Spyro the Dragon"
+  saveName: "Spyro the Dragon (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -156905,7 +164994,8 @@ SCES-01438:
     multitap: false
     linkCable: false
 SCPS-10085:
-  name: "Spyro the Dragon (Japan)"
+  name: "Spyro the Dragon"
+  saveName: "Spyro the Dragon (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -156931,14 +165021,16 @@ SCPS-10085:
     multitap: false
     linkCable: false
 PAPX-90078:
-  name: "Spyro the Dragon (Japan) (Demo)"
+  name: "Spyro the Dragon (Demo)"
+  saveName: "Spyro the Dragon (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
     - DisablePGXPCulling # Fixes geometry corruption when looking at portals.
 SCPS-10083:
-  name: "Spyro the Dragon (Japan) (Shokai Genteiban)"
+  name: "Spyro the Dragon (Shokai Genteiban)"
+  saveName: "Spyro the Dragon (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -156961,7 +165053,8 @@ SCPS-10083:
     multitap: false
     linkCable: false
 SCUS-94228:
-  name: "Spyro the Dragon (USA)"
+  name: "Spyro the Dragon"
+  saveName: "Spyro the Dragon (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -156987,25 +165080,29 @@ SCUS-94228:
     multitap: false
     linkCable: false
 SCUS-94290:
-  name: "Spyro the Dragon (USA) (Demo 1)"
+  name: "Spyro the Dragon (Demo 1)"
+  saveName: "Spyro the Dragon (USA) (Demo 1)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
     - DisablePGXPCulling # Fixes geometry corruption when looking at portals.
 SCUS-94439:
-  name: "Spyro the Dragon (USA) (Demo 2)"
+  name: "Spyro the Dragon (Demo 2)"
+  saveName: "Spyro the Dragon (USA) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
     - DisablePGXPCulling # Fixes geometry corruption when looking at portals.
 SCED-01637:
-  name: "Spyro the Dragon Speciale (France)"
+  name: "Spyro the Dragon Speciale"
+  saveName: "Spyro the Dragon Speciale (France)"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
 SCPS-10128:
-  name: "Spyro x Sparx - Tondemo Tours (Japan)"
+  name: "Spyro x Sparx - Tondemo Tours"
+  saveName: "Spyro x Sparx - Tondemo Tours (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -157025,15 +165122,19 @@ SCPS-10128:
     multitap: false
     linkCable: false
 PCPX-96191:
-  name: "Spyro x Sparx - Tondemo Tours (Japan) (Demo)"
+  name: "Spyro x Sparx - Tondemo Tours (Demo)"
+  saveName: "Spyro x Sparx - Tondemo Tours (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80306:
-  name: "Square Maniacs '98 (Japan)"
+  name: "Square Maniacs '98"
+  saveName: "Square Maniacs '98 (Japan)"
 SLPM-80556:
-  name: "Square Memory Card Data Collection (Japan)"
+  name: "Square Memory Card Data Collection"
+  saveName: "Square Memory Card Data Collection (Japan)"
 SLPS-00401:
-  name: "Square's Preview (Japan)"
+  name: "Square's Preview"
+  saveName: "Square's Preview (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157051,7 +165152,8 @@ SLPS-00401:
     multitap: false
     linkCable: false
 SLPS-00771:
-  name: "Square's Preview 2 (Japan)"
+  name: "Square's Preview 2"
+  saveName: "Square's Preview 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157069,7 +165171,8 @@ SLPS-00771:
     multitap: false
     linkCable: false
 SLPS-01491:
-  name: "Square's Preview 3 (Japan)"
+  name: "Square's Preview 3"
+  saveName: "Square's Preview 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157088,7 +165191,8 @@ SLPS-01491:
     multitap: false
     linkCable: false
 SCPS-45417:
-  name: "Square's Preview 5 (Japan, Asia)"
+  name: "Square's Preview 5"
+  saveName: "Square's Preview 5 (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157110,11 +165214,13 @@ SCPS-45417:
     multitap: false
     linkCable: false
 SLPM-80048:
-  name: "Square's Preview Extra - FF VII Sample & SIGGRAPH '95 Works (Japan)"
+  name: "Square's Preview Extra - FF VII Sample & SIGGRAPH '95 Works"
+  saveName: "Square's Preview Extra - FF VII Sample & SIGGRAPH '95 Works (Japan)"
   metadata:
     genre: "** DEMO **"
 SCPS-45401:
-  name: "Square's Preview Vol. 4 (Japan, Asia)"
+  name: "Square's Preview Vol. 4"
+  saveName: "Square's Preview Vol. 4 (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157136,14 +165242,16 @@ SCPS-45401:
     multitap: false
     linkCable: false
 SLUS-90028:
-  name: "Squaresoft on PlayStation 1998 Collector's CD Vol. 1 (USA)"
+  name: "Squaresoft on PlayStation 1998 Collector's CD Vol. 1"
+  saveName: "Squaresoft on PlayStation 1998 Collector's CD Vol. 1 (USA)"
   metadata:
     genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
 SLUS-90029:
-  name: "Squaresoft on PlayStation 1998 Collector's CD Vol. 2 (USA) (Final Fantasy VIII Demo)"
+  name: "Squaresoft on PlayStation 1998 Collector's CD Vol. 2 (Final Fantasy VIII Demo)"
+  saveName: "Squaresoft on PlayStation 1998 Collector's CD Vol. 2 (USA) (Final Fantasy VIII Demo)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -157171,7 +165279,8 @@ SLUS-90029:
     multitap: false
     linkCable: false
 SLUS-90075:
-  name: "Squaresoft on PlayStation 2000 Collector's CD Vol. 3 (USA)"
+  name: "Squaresoft on PlayStation 2000 Collector's CD Vol. 3"
+  saveName: "Squaresoft on PlayStation 2000 Collector's CD Vol. 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
@@ -157193,9 +165302,11 @@ SLUS-90075:
     multitap: false
     linkCable: false
 SCUS-94256:
-  name: "Squaresoft on PlayStation Collector's CD (USA)"
+  name: "Squaresoft on PlayStation Collector's CD"
+  saveName: "Squaresoft on PlayStation Collector's CD (USA)"
 SLPS-00957:
-  name: "St. Andrews Old Course - Eikou no St. Andrews (Japan)"
+  name: "St. Andrews Old Course - Eikou no St. Andrews"
+  saveName: "St. Andrews Old Course - Eikou no St. Andrews (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157213,7 +165324,8 @@ SLPS-00957:
     multitap: false
     linkCable: false
 SLPS-02638:
-  name: "St. Luminous Jogakuin (Japan)"
+  name: "St. Luminous Jogakuin"
+  saveName: "St. Luminous Jogakuin (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157232,7 +165344,8 @@ SLPS-02638:
     multitap: false
     linkCable: false
 SLES-00574:
-  name: "Stadt der verlorenen Kinder, Die (Germany)"
+  name: "Stadt der verlorenen Kinder, Die"
+  saveName: "Stadt der verlorenen Kinder, Die (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -157250,7 +165363,8 @@ SLES-00574:
     multitap: false
     linkCable: false
 SLPS-00162:
-  name: "Stahlfeder - Tekkou Hikuudan (Japan)"
+  name: "Stahlfeder - Tekkou Hikuudan"
+  saveName: "Stahlfeder - Tekkou Hikuudan (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed219"
@@ -157271,7 +165385,8 @@ SLPS-00162:
     multitap: false
     linkCable: false
 SLPS-00468:
-  name: "Stakes Winner - GI Kanzen Seiha e no Michi (Japan)"
+  name: "Stakes Winner - GI Kanzen Seiha e no Michi"
+  saveName: "Stakes Winner - GI Kanzen Seiha e no Michi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157289,7 +165404,8 @@ SLPS-00468:
     multitap: false
     linkCable: false
 SLPS-00850:
-  name: "Stakes Winner 2 - Saikyouba Densetsu (Japan)"
+  name: "Stakes Winner 2 - Saikyouba Densetsu"
+  saveName: "Stakes Winner 2 - Saikyouba Densetsu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157307,7 +165423,8 @@ SLPS-00850:
     multitap: false
     linkCable: false
 SLPS-00783:
-  name: "Standby Say You! (Japan)"
+  name: "Standby Say You!"
+  saveName: "Standby Say You! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157325,7 +165442,8 @@ SLPS-00783:
     multitap: false
     linkCable: false
 SLPS-01196:
-  name: "Star Bowling DX, The (Japan) (Disc 1)"
+  name: "Star Bowling DX, The (Disc 1)"
+  saveName: "Star Bowling DX, The (Japan) (Disc 1)"
   discSet:
     name: "Star Bowling DX, The (Japan)"
     serials:
@@ -157350,7 +165468,8 @@ SLPS-01196:
     multitap: false
     linkCable: false
 SLPS-01197:
-  name: "Star Bowling DX, The (Japan) (Disc 2)"
+  name: "Star Bowling DX, The (Disc 2)"
+  saveName: "Star Bowling DX, The (Japan) (Disc 2)"
   discSet:
     name: "Star Bowling DX, The (Japan)"
     serials:
@@ -157375,7 +165494,8 @@ SLPS-01197:
     multitap: false
     linkCable: false
 SLPS-01198:
-  name: "Star Bowling DX, The (Japan) (Disc 3)"
+  name: "Star Bowling DX, The (Disc 3)"
+  saveName: "Star Bowling DX, The (Japan) (Disc 3)"
   discSet:
     name: "Star Bowling DX, The (Japan)"
     serials:
@@ -157400,7 +165520,8 @@ SLPS-01198:
     multitap: false
     linkCable: false
 SLPS-01199:
-  name: "Star Bowling DX, The (Japan) (Disc 4)"
+  name: "Star Bowling DX, The (Disc 4)"
+  saveName: "Star Bowling DX, The (Japan) (Disc 4)"
   discSet:
     name: "Star Bowling DX, The (Japan)"
     serials:
@@ -157425,7 +165546,8 @@ SLPS-01199:
     multitap: false
     linkCable: false
 SLUS-00241:
-  name: "Star Fighter (USA)"
+  name: "Star Fighter"
+  saveName: "Star Fighter (USA)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -157444,11 +165566,13 @@ SLUS-00241:
     multitap: false
     linkCable: false
 SLED-00553:
-  name: "Star Gladiator (Europe) (Demo)"
+  name: "Star Gladiator (Demo)"
+  saveName: "Star Gladiator (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00495:
-  name: "Star Gladiator - Episode I - Final Crusade (Europe)"
+  name: "Star Gladiator - Episode I - Final Crusade"
+  saveName: "Star Gladiator - Episode I - Final Crusade (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -157466,7 +165590,8 @@ SLES-00495:
     multitap: false
     linkCable: false
 SLPS-00539:
-  name: "Star Gladiator - Episode I - Final Crusade (Japan)"
+  name: "Star Gladiator - Episode I - Final Crusade"
+  saveName: "Star Gladiator - Episode I - Final Crusade (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157484,11 +165609,13 @@ SLPS-00539:
     multitap: false
     linkCable: false
 SLPM-80056:
-  name: "Star Gladiator - Episode I - Final Crusade (Japan) (Demo)"
+  name: "Star Gladiator - Episode I - Final Crusade (Demo)"
+  saveName: "Star Gladiator - Episode I - Final Crusade (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00372:
-  name: "Star Gladiator - Episode I - Final Crusade (USA)"
+  name: "Star Gladiator - Episode I - Final Crusade"
+  saveName: "Star Gladiator - Episode I - Final Crusade (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -157525,7 +165652,8 @@ SCPS-45432:
     multitap: false
     linkCable: false
 SCES-01707:
-  name: "Star Ixiom (Europe)"
+  name: "Star Ixiom"
+  saveName: "Star Ixiom (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157544,7 +165672,8 @@ SCES-01707:
     multitap: false
     linkCable: false
 SLPS-01680:
-  name: "Star Ixiom (Japan)"
+  name: "Star Ixiom"
+  saveName: "Star Ixiom (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157563,7 +165692,8 @@ SLPS-01680:
     multitap: false
     linkCable: false
 SLPS-01390:
-  name: "Star Monja (Japan)"
+  name: "Star Monja"
+  saveName: "Star Monja (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -157581,11 +165711,13 @@ SLPS-01390:
     multitap: false
     linkCable: false
 SLPM-80274:
-  name: "Star Ocean - The Second Story & Hello Charlie!! (Japan) (Demo)"
+  name: "Star Ocean - The Second Story & Hello Charlie!! (Demo)"
+  saveName: "Star Ocean - The Second Story & Hello Charlie!! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02159:
-  name: "Star Ocean - The Second Story (Europe) (Disc 1)"
+  name: "Star Ocean - The Second Story (Disc 1)"
+  saveName: "Star Ocean - The Second Story (Europe) (Disc 1)"
   discSet:
     name: "Star Ocean - The Second Story (Europe)"
     serials:
@@ -157611,7 +165743,8 @@ SCES-02159:
     multitap: false
     linkCable: false
 SCES-12159:
-  name: "Star Ocean - The Second Story (Europe) (Disc 2)"
+  name: "Star Ocean - The Second Story (Disc 2)"
+  saveName: "Star Ocean - The Second Story (Europe) (Disc 2)"
   discSet:
     name: "Star Ocean - The Second Story (Europe)"
     serials:
@@ -157637,7 +165770,8 @@ SCES-12159:
     multitap: false
     linkCable: false
 SCES-02160:
-  name: "Star Ocean - The Second Story (France) (Disc 1)"
+  name: "Star Ocean - The Second Story (Disc 1)"
+  saveName: "Star Ocean - The Second Story (France) (Disc 1)"
   discSet:
     name: "Star Ocean - The Second Story (France)"
     serials:
@@ -157663,7 +165797,8 @@ SCES-02160:
     multitap: false
     linkCable: false
 SCES-12160:
-  name: "Star Ocean - The Second Story (France) (Disc 2)"
+  name: "Star Ocean - The Second Story (Disc 2)"
+  saveName: "Star Ocean - The Second Story (France) (Disc 2)"
   discSet:
     name: "Star Ocean - The Second Story (France)"
     serials:
@@ -157689,7 +165824,8 @@ SCES-12160:
     multitap: false
     linkCable: false
 SCES-02161:
-  name: "Star Ocean - The Second Story (Germany) (Disc 1)"
+  name: "Star Ocean - The Second Story (Disc 1)"
+  saveName: "Star Ocean - The Second Story (Germany) (Disc 1)"
   discSet:
     name: "Star Ocean - The Second Story (Germany)"
     serials:
@@ -157715,7 +165851,8 @@ SCES-02161:
     multitap: false
     linkCable: false
 SCES-12161:
-  name: "Star Ocean - The Second Story (Germany) (Disc 2)"
+  name: "Star Ocean - The Second Story (Disc 2)"
+  saveName: "Star Ocean - The Second Story (Germany) (Disc 2)"
   discSet:
     name: "Star Ocean - The Second Story (Germany)"
     serials:
@@ -157741,7 +165878,8 @@ SCES-12161:
     multitap: false
     linkCable: false
 SLPM-86105:
-  name: "Star Ocean - The Second Story (Japan) (Disc 1)"
+  name: "Star Ocean - The Second Story (Disc 1)"
+  saveName: "Star Ocean - The Second Story (Japan) (Disc 1)"
   discSet:
     name: "Star Ocean - The Second Story (Japan)"
     serials:
@@ -157767,7 +165905,8 @@ SLPM-86105:
     multitap: false
     linkCable: false
 SLPM-87357:
-  name: "Star Ocean - The Second Story (Japan) (Disc 1) (Rev 1)"
+  name: "Star Ocean - The Second Story (Disc 1)"
+  saveName: "Star Ocean - The Second Story (Japan) (Disc 1) (Rev 1)"
   discSet:
     name: "Star Ocean - The Second Story (Japan) (Rev 1)"
     serials:
@@ -157793,7 +165932,8 @@ SLPM-87357:
     multitap: false
     linkCable: false
 SLPM-86106:
-  name: "Star Ocean - The Second Story (Japan) (Disc 2)"
+  name: "Star Ocean - The Second Story (Disc 2)"
+  saveName: "Star Ocean - The Second Story (Japan) (Disc 2)"
   discSet:
     name: "Star Ocean - The Second Story (Japan)"
     serials:
@@ -157819,7 +165959,8 @@ SLPM-86106:
     multitap: false
     linkCable: false
 SLPM-87358:
-  name: "Star Ocean - The Second Story (Japan) (Disc 2) (Rev 1)"
+  name: "Star Ocean - The Second Story (Disc 2)"
+  saveName: "Star Ocean - The Second Story (Japan) (Disc 2) (Rev 1)"
   discSet:
     name: "Star Ocean - The Second Story (Japan) (Rev 1)"
     serials:
@@ -157845,7 +165986,8 @@ SLPM-87358:
     multitap: false
     linkCable: false
 SCUS-94421:
-  name: "Star Ocean - The Second Story (USA) (Disc 1)"
+  name: "Star Ocean - The Second Story (Disc 1)"
+  saveName: "Star Ocean - The Second Story (USA) (Disc 1)"
   discSet:
     name: "Star Ocean - The Second Story (USA)"
     serials:
@@ -157876,7 +166018,8 @@ SCUS-94421:
     multitap: false
     linkCable: false
 SCUS-94422:
-  name: "Star Ocean - The Second Story (USA) (Disc 2)"
+  name: "Star Ocean - The Second Story (Disc 2)"
+  saveName: "Star Ocean - The Second Story (USA) (Disc 2)"
   discSet:
     name: "Star Ocean - The Second Story (USA)"
     serials:
@@ -157907,7 +166050,8 @@ SCUS-94422:
     multitap: false
     linkCable: false
 SLES-02068:
-  name: "Star Trek - Invasion (Europe)"
+  name: "Star Trek - Invasion"
+  saveName: "Star Trek - Invasion (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157926,7 +166070,8 @@ SLES-02068:
     multitap: false
     linkCable: false
 SLES-02884:
-  name: "Star Trek - Invasion (Germany)"
+  name: "Star Trek - Invasion"
+  saveName: "Star Trek - Invasion (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157945,7 +166090,8 @@ SLES-02884:
     multitap: false
     linkCable: false
 SLUS-00924:
-  name: "Star Trek - Invasion (USA)"
+  name: "Star Trek - Invasion"
+  saveName: "Star Trek - Invasion (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -157964,7 +166110,8 @@ SLUS-00924:
     multitap: false
     linkCable: false
 SLES-00585:
-  name: "Star Wars - Dark Forces (Europe)"
+  name: "Star Wars - Dark Forces"
+  saveName: "Star Wars - Dark Forces (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -157987,7 +166134,8 @@ SLES-00585:
     multitap: false
     linkCable: false
 SLES-00640:
-  name: "Star Wars - Dark Forces (Italy) (En,It)"
+  name: "Star Wars - Dark Forces"
+  saveName: "Star Wars - Dark Forces (Italy) (En,It)"
   controllers:
     - DigitalController
   traits:
@@ -158011,7 +166159,8 @@ SLES-00640:
     multitap: false
     linkCable: false
 SLPS-00685:
-  name: "Star Wars - Dark Forces (Japan)"
+  name: "Star Wars - Dark Forces"
+  saveName: "Star Wars - Dark Forces (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -158034,7 +166183,8 @@ SLPS-00685:
     multitap: false
     linkCable: false
 SLES-00646:
-  name: "Star Wars - Dark Forces (Spain)"
+  name: "Star Wars - Dark Forces"
+  saveName: "Star Wars - Dark Forces (Spain)"
   controllers:
     - DigitalController
   traits:
@@ -158058,7 +166208,8 @@ SLES-00646:
     multitap: false
     linkCable: false
 SLUS-00297:
-  name: "Star Wars - Dark Forces (USA)"
+  name: "Star Wars - Dark Forces"
+  saveName: "Star Wars - Dark Forces (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -158084,7 +166235,8 @@ SLUS-00297:
     multitap: false
     linkCable: false
 SLES-03273:
-  name: "Star Wars - Demolition (Europe)"
+  name: "Star Wars - Demolition"
+  saveName: "Star Wars - Demolition (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -158104,7 +166256,8 @@ SLES-03273:
     multitap: false
     linkCable: false
 SLES-03274:
-  name: "Star Wars - Demolition (France)"
+  name: "Star Wars - Demolition"
+  saveName: "Star Wars - Demolition (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -158124,7 +166277,8 @@ SLES-03274:
     multitap: false
     linkCable: false
 SLES-03275:
-  name: "Star Wars - Demolition (Germany)"
+  name: "Star Wars - Demolition"
+  saveName: "Star Wars - Demolition (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -158144,7 +166298,8 @@ SLES-03275:
     multitap: false
     linkCable: false
 SLUS-01183:
-  name: "Star Wars - Demolition (USA)"
+  name: "Star Wars - Demolition"
+  saveName: "Star Wars - Demolition (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -158167,11 +166322,13 @@ SLUS-01183:
     multitap: false
     linkCable: false
 SLUS-90088:
-  name: "Star Wars - Demolition (USA) (Demo)"
+  name: "Star Wars - Demolition (Demo)"
+  saveName: "Star Wars - Demolition (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02036:
-  name: "Star Wars - Episode I - Die dunkle Bedrohung (Germany)"
+  name: "Star Wars - Episode I - Die dunkle Bedrohung"
+  saveName: "Star Wars - Episode I - Die dunkle Bedrohung (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158190,7 +166347,8 @@ SLES-02036:
     multitap: false
     linkCable: false
 SLES-02607:
-  name: "Star Wars - Episode I - Jedi Power Battles (Europe)"
+  name: "Star Wars - Episode I - Jedi Power Battles"
+  saveName: "Star Wars - Episode I - Jedi Power Battles (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158209,7 +166367,8 @@ SLES-02607:
     multitap: false
     linkCable: false
 SLES-02608:
-  name: "Star Wars - Episode I - Jedi Power Battles (France)"
+  name: "Star Wars - Episode I - Jedi Power Battles"
+  saveName: "Star Wars - Episode I - Jedi Power Battles (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158228,7 +166387,8 @@ SLES-02608:
     multitap: false
     linkCable: false
 SLES-02609:
-  name: "Star Wars - Episode I - Jedi Power Battles (Germany)"
+  name: "Star Wars - Episode I - Jedi Power Battles"
+  saveName: "Star Wars - Episode I - Jedi Power Battles (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158247,7 +166407,8 @@ SLES-02609:
     multitap: false
     linkCable: false
 SLUS-01046:
-  name: "Star Wars - Episode I - Jedi Power Battles (USA)"
+  name: "Star Wars - Episode I - Jedi Power Battles"
+  saveName: "Star Wars - Episode I - Jedi Power Battles (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158266,7 +166427,8 @@ SLUS-01046:
     multitap: false
     linkCable: false
 SLES-02035:
-  name: "Star Wars - Episode I - La Menace Fantome (France)"
+  name: "Star Wars - Episode I - La Menace Fantome"
+  saveName: "Star Wars - Episode I - La Menace Fantome (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158285,15 +166447,18 @@ SLES-02035:
     multitap: false
     linkCable: false
 SLED-02045:
-  name: "Star Wars - Episode I - La Menace Fantome (France) (Demo)"
+  name: "Star Wars - Episode I - La Menace Fantome (Demo)"
+  saveName: "Star Wars - Episode I - La Menace Fantome (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-02044:
-  name: "Star Wars - Episode I - The Phantom Menace (Australia) (Demo)"
+  name: "Star Wars - Episode I - The Phantom Menace (Demo)"
+  saveName: "Star Wars - Episode I - The Phantom Menace (Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02034:
-  name: "Star Wars - Episode I - The Phantom Menace (Europe)"
+  name: "Star Wars - Episode I - The Phantom Menace"
+  saveName: "Star Wars - Episode I - The Phantom Menace (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158312,7 +166477,8 @@ SLES-02034:
     multitap: false
     linkCable: false
 SLPS-02153:
-  name: "Star Wars - Episode I - The Phantom Menace (Japan)"
+  name: "Star Wars - Episode I - The Phantom Menace"
+  saveName: "Star Wars - Episode I - The Phantom Menace (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158331,7 +166497,8 @@ SLPS-02153:
     multitap: false
     linkCable: false
 SLUS-00884:
-  name: "Star Wars - Episode I - The Phantom Menace (USA)"
+  name: "Star Wars - Episode I - The Phantom Menace"
+  saveName: "Star Wars - Episode I - The Phantom Menace (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158350,11 +166517,13 @@ SLUS-00884:
     multitap: false
     linkCable: false
 SLUS-80884:
-  name: "Star Wars - Episode I - The Phantom Menace (USA) (Demo)"
+  name: "Star Wars - Episode I - The Phantom Menace (Demo)"
+  saveName: "Star Wars - Episode I - The Phantom Menace (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02610:
-  name: "Star Wars - Episodio I - Jedi Power Battles (Italy)"
+  name: "Star Wars - Episodio I - Jedi Power Battles"
+  saveName: "Star Wars - Episodio I - Jedi Power Battles (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158373,7 +166542,8 @@ SLES-02610:
     multitap: false
     linkCable: false
 SLES-02611:
-  name: "Star Wars - Episodio I - Jedi Power Battles (Spain)"
+  name: "Star Wars - Episodio I - Jedi Power Battles"
+  saveName: "Star Wars - Episodio I - Jedi Power Battles (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -158395,7 +166565,8 @@ SLES-02611:
     multitap: false
     linkCable: false
 SLES-02038:
-  name: "Star Wars - Episodio I - La Amenaza Fantasma (Spain)"
+  name: "Star Wars - Episodio I - La Amenaza Fantasma"
+  saveName: "Star Wars - Episodio I - La Amenaza Fantasma (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -158417,7 +166588,8 @@ SLES-02038:
     multitap: false
     linkCable: false
 SLES-02037:
-  name: "Star Wars - Episodio I - La Minaccia Fantasma (Italy)"
+  name: "Star Wars - Episodio I - La Minaccia Fantasma"
+  saveName: "Star Wars - Episodio I - La Minaccia Fantasma (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -158436,7 +166608,8 @@ SLES-02037:
     multitap: false
     linkCable: false
 SLES-01111:
-  name: "Star Wars - Masters of Teras Kasi (Europe)"
+  name: "Star Wars - Masters of Teras Kasi"
+  saveName: "Star Wars - Masters of Teras Kasi (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -158454,7 +166627,8 @@ SLES-01111:
     multitap: false
     linkCable: false
 SLPS-01464:
-  name: "Star Wars - Masters of Teras Kasi (Japan)"
+  name: "Star Wars - Masters of Teras Kasi"
+  saveName: "Star Wars - Masters of Teras Kasi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -158472,7 +166646,8 @@ SLPS-01464:
     multitap: false
     linkCable: false
 SLUS-00562:
-  name: "Star Wars - Masters of Teras Kasi (USA)"
+  name: "Star Wars - Masters of Teras Kasi"
+  saveName: "Star Wars - Masters of Teras Kasi (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -158490,7 +166665,8 @@ SLUS-00562:
     multitap: false
     linkCable: false
 SLES-00654:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Europe) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Europe) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Europe)"
     serials:
@@ -158517,7 +166693,8 @@ SLES-00654:
     multitap: false
     linkCable: false
 SLES-10654:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Europe) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Europe) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Europe)"
     serials:
@@ -158544,7 +166721,8 @@ SLES-10654:
     multitap: false
     linkCable: false
 SLES-00656:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (France) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (France) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (France)"
     serials:
@@ -158571,7 +166749,8 @@ SLES-00656:
     multitap: false
     linkCable: false
 SLES-10656:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (France) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (France) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (France)"
     serials:
@@ -158598,7 +166777,8 @@ SLES-10656:
     multitap: false
     linkCable: false
 SLES-00584:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Germany) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Germany) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Germany)"
     serials:
@@ -158625,7 +166805,8 @@ SLES-00584:
     multitap: false
     linkCable: false
 SLES-10584:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Germany) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Germany) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Germany)"
     serials:
@@ -158652,7 +166833,8 @@ SLES-10584:
     multitap: false
     linkCable: false
 SLES-00643:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Italy) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Italy) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Italy)"
     serials:
@@ -158679,7 +166861,8 @@ SLES-00643:
     multitap: false
     linkCable: false
 SLES-10643:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Italy) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Italy) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Italy)"
     serials:
@@ -158706,7 +166889,8 @@ SLES-10643:
     multitap: false
     linkCable: false
 SLPS-00638:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Japan) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Japan) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Japan)"
     serials:
@@ -158733,7 +166917,8 @@ SLPS-00638:
     multitap: false
     linkCable: false
 SLPS-00639:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Japan) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Japan) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Japan)"
     serials:
@@ -158760,7 +166945,8 @@ SLPS-00639:
     multitap: false
     linkCable: false
 SLES-00644:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Spain) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Spain) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Spain)"
     serials:
@@ -158790,7 +166976,8 @@ SLES-00644:
     multitap: false
     linkCable: false
 SLES-10644:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (Spain) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (Spain) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (Spain)"
     serials:
@@ -158820,7 +167007,8 @@ SLES-10644:
     multitap: false
     linkCable: false
 SLUS-00381:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (USA) (Disc 1)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 1)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (USA) (Disc 1)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (USA)"
     serials:
@@ -158850,7 +167038,8 @@ SLUS-00381:
     multitap: false
     linkCable: false
 SLUS-00386:
-  name: "Star Wars - Rebel Assault II - The Hidden Empire (USA) (Disc 2)"
+  name: "Star Wars - Rebel Assault II - The Hidden Empire (Disc 2)"
+  saveName: "Star Wars - Rebel Assault II - The Hidden Empire (USA) (Disc 2)"
   discSet:
     name: "Star Wars - Rebel Assault II - The Hidden Empire (USA)"
     serials:
@@ -158877,7 +167066,8 @@ SLUS-00386:
     multitap: false
     linkCable: false
 SLES-00293:
-  name: "StarFighter 3000 (Europe) (En,Fr,De,Es,It)"
+  name: "StarFighter 3000"
+  saveName: "StarFighter 3000 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -158900,7 +167090,8 @@ SLES-00293:
     multitap: false
     linkCable: false
 SLPS-00487:
-  name: "StarFighter 3000 (Japan)"
+  name: "StarFighter 3000"
+  saveName: "StarFighter 3000 (Japan)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -158919,7 +167110,8 @@ SLPS-00487:
     multitap: false
     linkCable: false
 SLES-02921:
-  name: "StarSweep (Europe)"
+  name: "StarSweep"
+  saveName: "StarSweep (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -158937,7 +167129,8 @@ SLES-02921:
     multitap: false
     linkCable: false
 SLPS-01040:
-  name: "StarSweep (Japan)"
+  name: "StarSweep"
+  saveName: "StarSweep (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -158955,15 +167148,18 @@ SLPS-01040:
     multitap: false
     linkCable: false
 SLPM-80136:
-  name: "StarSweep (Japan) (Demo 1)"
+  name: "StarSweep (Demo 1)"
+  saveName: "StarSweep (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80151:
-  name: "StarSweep (Japan) (Demo 2)"
+  name: "StarSweep (Demo 2)"
+  saveName: "StarSweep (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCES-00034:
-  name: "Starblade Alpha (Europe)"
+  name: "Starblade Alpha"
+  saveName: "Starblade Alpha (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -158983,7 +167179,8 @@ SCES-00034:
     multitap: false
     linkCable: false
 SLPS-00022:
-  name: "Starblade Alpha (Japan)"
+  name: "Starblade Alpha"
+  saveName: "Starblade Alpha (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -159005,7 +167202,8 @@ SLPS-00022:
     multitap: false
     linkCable: false
 SLUS-00057:
-  name: "Starblade Alpha (USA)"
+  name: "Starblade Alpha"
+  saveName: "Starblade Alpha (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -159025,7 +167223,8 @@ SLUS-00057:
     multitap: false
     linkCable: false
 SLPS-00958:
-  name: "Starborders (Japan)"
+  name: "Starborders"
+  saveName: "Starborders (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -159061,7 +167260,8 @@ SLUS-0:
     multitap: false
     linkCable: false
 SLUS-01302:
-  name: "Starfighter Sanvein (USA)"
+  name: "Starfighter Sanvein"
+  saveName: "Starfighter Sanvein (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159080,7 +167280,8 @@ SLUS-01302:
     multitap: false
     linkCable: false
 SLPS-01407:
-  name: "Starlight Scramble - Ren'ai Kouhosei (Japan)"
+  name: "Starlight Scramble - Ren'ai Kouhosei"
+  saveName: "Starlight Scramble - Ren'ai Kouhosei (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -159098,7 +167299,8 @@ SLPS-01407:
     multitap: false
     linkCable: false
 SLPM-86809:
-  name: "Startling Adventures - Kuusou 3x Daibouken (Japan)"
+  name: "Startling Adventures - Kuusou 3x Daibouken"
+  saveName: "Startling Adventures - Kuusou 3x Daibouken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159117,7 +167319,8 @@ SLPM-86809:
     multitap: false
     linkCable: false
 SLPS-02043:
-  name: "Startling Odyssey 1 - Blue Evolution (Japan)"
+  name: "Startling Odyssey 1 - Blue Evolution"
+  saveName: "Startling Odyssey 1 - Blue Evolution (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159136,7 +167339,8 @@ SLPS-02043:
     multitap: false
     linkCable: false
 SLES-00090:
-  name: "Starwinder - The Ultimate Space Race (Europe)"
+  name: "Starwinder - The Ultimate Space Race"
+  saveName: "Starwinder - The Ultimate Space Race (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -159155,7 +167359,8 @@ SLES-00090:
     multitap: false
     linkCable: false
 SLPS-00988:
-  name: "Starwinder - The Ultimate Space Race (Japan)"
+  name: "Starwinder - The Ultimate Space Race"
+  saveName: "Starwinder - The Ultimate Space Race (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -159174,7 +167379,8 @@ SLPS-00988:
     multitap: false
     linkCable: false
 SLUS-00094:
-  name: "Starwinder - The Ultimate Space Race (USA)"
+  name: "Starwinder - The Ultimate Space Race"
+  saveName: "Starwinder - The Ultimate Space Race (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -159193,43 +167399,53 @@ SLUS-00094:
     multitap: false
     linkCable: false
 SLED-01553:
-  name: "Station Demo Disc 1 (Europe)"
+  name: "Station Demo Disc 1"
+  saveName: "Station Demo Disc 1 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-01634:
-  name: "Station Demo Disc 2 (Europe)"
+  name: "Station Demo Disc 2"
+  saveName: "Station Demo Disc 2 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-01696:
-  name: "Station Demo Disc 3 (Europe)"
+  name: "Station Demo Disc 3"
+  saveName: "Station Demo Disc 3 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-01731:
-  name: "Station Demo Disc 4 (Europe)"
+  name: "Station Demo Disc 4"
+  saveName: "Station Demo Disc 4 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-01782:
-  name: "Station Demo Disc 5 (Europe)"
+  name: "Station Demo Disc 5"
+  saveName: "Station Demo Disc 5 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-01895:
-  name: "Station Demo Disc 6 (Europe)"
+  name: "Station Demo Disc 6"
+  saveName: "Station Demo Disc 6 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-01969:
-  name: "Station Demo Disc 7 (Europe)"
+  name: "Station Demo Disc 7"
+  saveName: "Station Demo Disc 7 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-02033:
-  name: "Station Demo Disc 8 (Europe)"
+  name: "Station Demo Disc 8"
+  saveName: "Station Demo Disc 8 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLED-02077:
-  name: "Station Demo Disc 9 (Europe)"
+  name: "Station Demo Disc 9"
+  saveName: "Station Demo Disc 9 (Europe)"
   metadata:
     genre: "** DEMO **"
 SLES-00373:
-  name: "Steel Harbinger (Europe)"
+  name: "Steel Harbinger"
+  saveName: "Steel Harbinger (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -159247,7 +167463,8 @@ SLES-00373:
     multitap: false
     linkCable: false
 SLUS-00093:
-  name: "Steel Harbinger (USA)"
+  name: "Steel Harbinger"
+  saveName: "Steel Harbinger (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -159265,7 +167482,8 @@ SLUS-00093:
     multitap: false
     linkCable: false
 SCES-01023:
-  name: "Steel Reign (Europe)"
+  name: "Steel Reign"
+  saveName: "Steel Reign (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -159285,7 +167503,8 @@ SCES-01023:
     multitap: false
     linkCable: false
 SCUS-94902:
-  name: "Steel Reign (USA)"
+  name: "Steel Reign"
+  saveName: "Steel Reign (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -159305,7 +167524,8 @@ SCUS-94902:
     multitap: false
     linkCable: false
 SLES-03995:
-  name: "Stock Car Racer (Europe)"
+  name: "Stock Car Racer"
+  saveName: "Stock Car Racer (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159325,7 +167545,8 @@ SLES-03995:
     multitap: false
     linkCable: false
 SLPS-00472:
-  name: "Stone Walkers (Japan)"
+  name: "Stone Walkers"
+  saveName: "Stone Walkers (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159348,7 +167569,8 @@ SLPS-00472:
     multitap: false
     linkCable: false
 LSP-99014101:
-  name: "Story Lane Theater 1 (USA)"
+  name: "Story Lane Theater 1"
+  saveName: "Story Lane Theater 1 (USA)"
   codes:
     - LSP99014101
   metadata:
@@ -159358,7 +167580,8 @@ LSP-99014101:
     languages:
       - English
 LSP-99014201:
-  name: "Story Lane Theater 2 (USA)"
+  name: "Story Lane Theater 2"
+  saveName: "Story Lane Theater 2 (USA)"
   codes:
     - LSP99014201
   metadata:
@@ -159368,7 +167591,8 @@ LSP-99014201:
     languages:
       - English
 LSP-99014301:
-  name: "Story Lane Theater 3 (USA)"
+  name: "Story Lane Theater 3"
+  saveName: "Story Lane Theater 3 (USA)"
   codes:
     - LSP99014301
   metadata:
@@ -159378,7 +167602,8 @@ LSP-99014301:
     languages:
       - English
 LSP-99014401:
-  name: "Story Lane Theater 4 (USA)"
+  name: "Story Lane Theater 4"
+  saveName: "Story Lane Theater 4 (USA)"
   codes:
     - LSP99014401
   metadata:
@@ -159388,7 +167613,8 @@ LSP-99014401:
     languages:
       - English
 LSP-99014501:
-  name: "Story Lane Theater 5 (USA)"
+  name: "Story Lane Theater 5"
+  saveName: "Story Lane Theater 5 (USA)"
   codes:
     - LSP99014501
   metadata:
@@ -159398,7 +167624,8 @@ LSP-99014501:
     languages:
       - English
 LSP-907011:
-  name: "Str.at.e.s. 1 - Match-A-Batch (USA)"
+  name: "Str.at.e.s. 1 - Match-A-Batch"
+  saveName: "Str.at.e.s. 1 - Match-A-Batch (USA)"
   codes:
     - LSP907011
     - LSP03010101
@@ -159409,7 +167636,8 @@ LSP-907011:
     languages:
       - English
 LSP-030102:
-  name: "Str.at.e.s. 2 - Matchamania! (USA)"
+  name: "Str.at.e.s. 2 - Matchamania!"
+  saveName: "Str.at.e.s. 2 - Matchamania! (USA)"
   codes:
     - LSP-030102
     - LSP03010201
@@ -159422,7 +167650,8 @@ LSP-030102:
     languages:
       - English
 LSP-030103:
-  name: "Str.at.e.s. 3 - Title This! Title That! (USA)"
+  name: "Str.at.e.s. 3 - Title This! Title That!"
+  saveName: "Str.at.e.s. 3 - Title This! Title That! (USA)"
   codes:
     - LSP-030103
     - LSP03010301
@@ -159435,7 +167664,8 @@ LSP-030103:
     languages:
       - English
 LSP-030104:
-  name: "Str.at.e.s. 4 - Titlerama! (USA)"
+  name: "Str.at.e.s. 4 - Titlerama!"
+  saveName: "Str.at.e.s. 4 - Titlerama! (USA)"
   codes:
     - LSP-030104
     - LSP03010401
@@ -159448,7 +167678,8 @@ LSP-030104:
     languages:
       - English
 LSP-030105:
-  name: "Str.at.e.s. 5 - Parallel Lives! (USA)"
+  name: "Str.at.e.s. 5 - Parallel Lives!"
+  saveName: "Str.at.e.s. 5 - Parallel Lives! (USA)"
   codes:
     - LSP-030105
     - LSP03010501
@@ -159461,7 +167692,8 @@ LSP-030105:
     languages:
       - English
 LSP-030106:
-  name: "Str.at.e.s. 6 - Analogy-ology! (USA)"
+  name: "Str.at.e.s. 6 - Analogy-ology!"
+  saveName: "Str.at.e.s. 6 - Analogy-ology! (USA)"
   codes:
     - LSP-030106
     - LSP03010601
@@ -159474,7 +167706,8 @@ LSP-030106:
     languages:
       - English
 LSP-030107:
-  name: "Str.at.e.s. 7 - Riddle Roundup! (USA)"
+  name: "Str.at.e.s. 7 - Riddle Roundup!"
+  saveName: "Str.at.e.s. 7 - Riddle Roundup! (USA)"
   codes:
     - LSP-030107
     - LSP03010701
@@ -159487,7 +167720,8 @@ LSP-030107:
     languages:
       - English
 LSP-907080:
-  name: "Str.at.e.s. 8 - Riddle Wrangler! (USA)"
+  name: "Str.at.e.s. 8 - Riddle Wrangler!"
+  saveName: "Str.at.e.s. 8 - Riddle Wrangler! (USA)"
   codes:
     - LSP907080
     - LSP03010801
@@ -159498,7 +167732,8 @@ LSP-907080:
     languages:
       - English
 SLPS-01310:
-  name: "Straight Victory - Hoshino Kazuyoshi e no Chousen (Japan)"
+  name: "Straight Victory - Hoshino Kazuyoshi e no Chousen"
+  saveName: "Straight Victory - Hoshino Kazuyoshi e no Chousen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159518,9 +167753,11 @@ SLPS-01310:
     multitap: false
     linkCable: false
 SCED-01528:
-  name: "Strategie Speziale '98 (Germany)"
+  name: "Strategie Speziale '98"
+  saveName: "Strategie Speziale '98 (Germany)"
 SLPS-02035:
-  name: "Stray Sheep - The Adventure of Poe & Merry (Japan)"
+  name: "Stray Sheep - The Adventure of Poe & Merry"
+  saveName: "Stray Sheep - The Adventure of Poe & Merry (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159541,7 +167778,8 @@ SLPS-02035:
     multitap: false
     linkCable: false
 SLPM-86547:
-  name: "Stray Sheep - The Adventure of Poe & Merry (Japan) (Rev 1)"
+  name: "Stray Sheep - The Adventure of Poe & Merry"
+  saveName: "Stray Sheep - The Adventure of Poe & Merry (Japan) (Rev 1)"
 SLPS-03498:
   name: "Stray Sheep - The Adventure of Poe & Merry [Reprint]"
   controllers:
@@ -159562,7 +167800,8 @@ SLPS-03498:
     multitap: false
     linkCable: false
 SLES-01437:
-  name: "Streak Hoverboard Racing (Europe)"
+  name: "Streak Hoverboard Racing"
+  saveName: "Streak Hoverboard Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159581,7 +167820,8 @@ SLES-01437:
     multitap: false
     linkCable: false
 SLUS-00629:
-  name: "Streak Hoverboard Racing (USA)"
+  name: "Streak Hoverboard Racing"
+  saveName: "Streak Hoverboard Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159600,7 +167840,8 @@ SLUS-00629:
     multitap: false
     linkCable: false
 SLPS-01622:
-  name: "Street Boarders (Japan)"
+  name: "Street Boarders"
+  saveName: "Street Boarders (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159619,7 +167860,8 @@ SLPS-01622:
     multitap: false
     linkCable: false
 SLPS-02744:
-  name: "Street Boarders 2 (Japan)"
+  name: "Street Boarders 2"
+  saveName: "Street Boarders 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -159638,7 +167880,8 @@ SLPS-02744:
     multitap: false
     linkCable: false
 SLPS-00070:
-  name: "Street Fighter - Real Battle on Film (Japan)"
+  name: "Street Fighter - Real Battle on Film"
+  saveName: "Street Fighter - Real Battle on Film (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -159656,7 +167899,8 @@ SLPS-00070:
     multitap: false
     linkCable: false
 SLES-00050:
-  name: "Street Fighter - The Movie (Europe)"
+  name: "Street Fighter - The Movie"
+  saveName: "Street Fighter - The Movie (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -159674,7 +167918,8 @@ SLES-00050:
     multitap: false
     linkCable: false
 SLUS-00041:
-  name: "Street Fighter - The Movie (USA)"
+  name: "Street Fighter - The Movie"
+  saveName: "Street Fighter - The Movie (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -159695,7 +167940,8 @@ SLUS-00041:
     multitap: false
     linkCable: false
 SLES-00199:
-  name: "Street Fighter Alpha - Warriors' Dreams (Europe)"
+  name: "Street Fighter Alpha - Warriors' Dreams"
+  saveName: "Street Fighter Alpha - Warriors' Dreams (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -159713,7 +167959,8 @@ SLES-00199:
     multitap: false
     linkCable: false
 SLUS-00197:
-  name: "Street Fighter Alpha - Warriors' Dreams (USA)"
+  name: "Street Fighter Alpha - Warriors' Dreams"
+  saveName: "Street Fighter Alpha - Warriors' Dreams (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -159734,7 +167981,8 @@ SLUS-00197:
     multitap: false
     linkCable: false
 SLES-00496:
-  name: "Street Fighter Alpha 2 (Europe)"
+  name: "Street Fighter Alpha 2"
+  saveName: "Street Fighter Alpha 2 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -159752,7 +168000,8 @@ SLES-00496:
     multitap: false
     linkCable: false
 SLUS-00258:
-  name: "Street Fighter Alpha 2 (USA)"
+  name: "Street Fighter Alpha 2"
+  saveName: "Street Fighter Alpha 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -159773,7 +168022,8 @@ SLUS-00258:
     multitap: false
     linkCable: false
 SLES-01863:
-  name: "Street Fighter Alpha 3 (Europe)"
+  name: "Street Fighter Alpha 3"
+  saveName: "Street Fighter Alpha 3 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -159797,7 +168047,8 @@ SLES-01863:
     multitap: false
     linkCable: false
 SLUS-00821:
-  name: "Street Fighter Alpha 3 (USA)"
+  name: "Street Fighter Alpha 3"
+  saveName: "Street Fighter Alpha 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -159821,7 +168072,8 @@ SLUS-00821:
     multitap: false
     linkCable: false
 SLES-00998:
-  name: "Street Fighter Collection (Europe) (Disc 1)"
+  name: "Street Fighter Collection (Disc 1)"
+  saveName: "Street Fighter Collection (Europe) (Disc 1)"
   discSet:
     name: "Street Fighter Collection (Europe)"
     serials:
@@ -159848,7 +168100,8 @@ SLES-00998:
     multitap: false
     linkCable: false
 SLES-10998:
-  name: "Street Fighter Collection (Europe) (Disc 2)"
+  name: "Street Fighter Collection (Disc 2)"
+  saveName: "Street Fighter Collection (Europe) (Disc 2)"
   discSet:
     name: "Street Fighter Collection (Europe)"
     serials:
@@ -159875,7 +168128,8 @@ SLES-10998:
     multitap: false
     linkCable: false
 SLPM-80154:
-  name: "Street Fighter Collection (Japan) (Demo)"
+  name: "Street Fighter Collection (Demo)"
+  saveName: "Street Fighter Collection (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -159885,7 +168139,8 @@ SLPM-80154:
     - DisableWidescreen # No effect.
     - DisableUpscaling # Health bars rely on texels not being sampled.
 SLPS-00800:
-  name: "Street Fighter Collection (Japan) (Disc 1)"
+  name: "Street Fighter Collection (Disc 1)"
+  saveName: "Street Fighter Collection (Japan) (Disc 1)"
   discSet:
     name: "Street Fighter Collection (Japan)"
     serials:
@@ -159915,7 +168170,8 @@ SLPS-00800:
     multitap: false
     linkCable: false
 SLPS-00801:
-  name: "Street Fighter Collection (Japan) (Disc 2)"
+  name: "Street Fighter Collection (Disc 2)"
+  saveName: "Street Fighter Collection (Japan) (Disc 2)"
   discSet:
     name: "Street Fighter Collection (Japan)"
     serials:
@@ -159945,7 +168201,8 @@ SLPS-00801:
     multitap: false
     linkCable: false
 SLUS-00423:
-  name: "Street Fighter Collection (USA) (Disc 1)"
+  name: "Street Fighter Collection (Disc 1)"
+  saveName: "Street Fighter Collection (USA) (Disc 1)"
   discSet:
     name: "Street Fighter Collection (USA)"
     serials:
@@ -159975,7 +168232,8 @@ SLUS-00423:
     multitap: false
     linkCable: false
 SLUS-00584:
-  name: "Street Fighter Collection (USA) (Disc 2)"
+  name: "Street Fighter Collection (Disc 2)"
+  saveName: "Street Fighter Collection (USA) (Disc 2)"
   discSet:
     name: "Street Fighter Collection (USA)"
     serials:
@@ -160005,7 +168263,8 @@ SLUS-00584:
     multitap: false
     linkCable: false
 SLES-01721:
-  name: "Street Fighter Collection 2 (Europe)"
+  name: "Street Fighter Collection 2"
+  saveName: "Street Fighter Collection 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160028,7 +168287,8 @@ SLES-01721:
     multitap: false
     linkCable: false
 SLUS-00746:
-  name: "Street Fighter Collection 2 (USA)"
+  name: "Street Fighter Collection 2"
+  saveName: "Street Fighter Collection 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -160054,7 +168314,8 @@ SLUS-00746:
     multitap: false
     linkCable: false
 SLED-00473:
-  name: "Street Fighter EX + Alpha (Europe) (Demo)"
+  name: "Street Fighter EX + Alpha (Demo)"
+  saveName: "Street Fighter EX + Alpha (Europe) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -160078,7 +168339,8 @@ SCPS-45074:
     multitap: false
     linkCable: false
 SLES-00939:
-  name: "Street Fighter EX Plus Alpha (Europe)"
+  name: "Street Fighter EX Plus Alpha"
+  saveName: "Street Fighter EX Plus Alpha (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -160096,7 +168358,8 @@ SLES-00939:
     multitap: false
     linkCable: false
 SLPM-86041:
-  name: "Street Fighter EX Plus Alpha (Japan)"
+  name: "Street Fighter EX Plus Alpha"
+  saveName: "Street Fighter EX Plus Alpha (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -160117,7 +168380,8 @@ SLPM-86041:
     multitap: false
     linkCable: false
 SLUS-00548:
-  name: "Street Fighter EX Plus Alpha (USA)"
+  name: "Street Fighter EX Plus Alpha"
+  saveName: "Street Fighter EX Plus Alpha (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -160138,7 +168402,8 @@ SLUS-00548:
     multitap: false
     linkCable: false
 SLES-02598:
-  name: "Street Fighter EX2 Plus (Europe)"
+  name: "Street Fighter EX2 Plus"
+  saveName: "Street Fighter EX2 Plus (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -160156,7 +168421,8 @@ SLES-02598:
     multitap: false
     linkCable: false
 SLPS-02508:
-  name: "Street Fighter EX2 Plus (Japan)"
+  name: "Street Fighter EX2 Plus"
+  saveName: "Street Fighter EX2 Plus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160174,13 +168440,15 @@ SLPS-02508:
     multitap: false
     linkCable: false
 SLPM-80517:
-  name: "Street Fighter EX2 Plus (Japan) (Demo)"
+  name: "Street Fighter EX2 Plus (Demo)"
+  saveName: "Street Fighter EX2 Plus (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SLUS-01105:
-  name: "Street Fighter EX2 Plus (USA)"
+  name: "Street Fighter EX2 Plus"
+  saveName: "Street Fighter EX2 Plus (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -160201,7 +168469,8 @@ SLUS-01105:
     multitap: false
     linkCable: false
 SLPS-00080:
-  name: "Street Fighter II Movie (Japan) (Disc 1)"
+  name: "Street Fighter II Movie (Disc 1)"
+  saveName: "Street Fighter II Movie (Japan) (Disc 1)"
   discSet:
     name: "Street Fighter II Movie (Japan)"
     serials:
@@ -160224,7 +168493,8 @@ SLPS-00080:
     multitap: false
     linkCable: false
 SLPS-00081:
-  name: "Street Fighter II Movie (Japan) (Disc 2)"
+  name: "Street Fighter II Movie (Disc 2)"
+  saveName: "Street Fighter II Movie (Japan) (Disc 2)"
   discSet:
     name: "Street Fighter II Movie (Japan)"
     serials:
@@ -160247,7 +168517,8 @@ SLPS-00081:
     multitap: false
     linkCable: false
 SLPS-00176:
-  name: "Street Fighter Zero (Japan)"
+  name: "Street Fighter Zero"
+  saveName: "Street Fighter Zero (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160265,7 +168536,8 @@ SLPS-00176:
     multitap: false
     linkCable: false
 SLPS-00415:
-  name: "Street Fighter Zero 2 (Japan)"
+  name: "Street Fighter Zero 2"
+  saveName: "Street Fighter Zero 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160283,7 +168555,8 @@ SLPS-00415:
     multitap: false
     linkCable: false
 SLPS-91105:
-  name: "Street Fighter Zero 2' (Japan)"
+  name: "Street Fighter Zero 2'"
+  saveName: "Street Fighter Zero 2' (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160301,7 +168574,8 @@ SLPS-91105:
     multitap: false
     linkCable: false
 SLPM-86877:
-  name: "Street Fighter Zero 3 (Japan)"
+  name: "Street Fighter Zero 3"
+  saveName: "Street Fighter Zero 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160325,7 +168599,8 @@ SLPM-86877:
     multitap: false
     linkCable: false
 SIPS-60019:
-  name: "Street Games '97 (Japan)"
+  name: "Street Games '97"
+  saveName: "Street Games '97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160343,11 +168618,13 @@ SIPS-60019:
     multitap: false
     linkCable: false
 PCPX-96067:
-  name: "Street Games '97 (Japan) (Demo)"
+  name: "Street Games '97 (Demo)"
+  saveName: "Street Games '97 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00296:
-  name: "Street Racer (Europe)"
+  name: "Street Racer"
+  saveName: "Street Racer (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -160366,7 +168643,8 @@ SLES-00296:
     multitap: true
     linkCable: false
 SLUS-00099:
-  name: "Street Racer (USA)"
+  name: "Street Racer"
+  saveName: "Street Racer (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -160385,7 +168663,8 @@ SLUS-00099:
     multitap: true
     linkCable: false
 SLPS-00610:
-  name: "Street Racer Extra (Japan)"
+  name: "Street Racer Extra"
+  saveName: "Street Racer Extra (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -160404,7 +168683,8 @@ SLPS-00610:
     multitap: true
     linkCable: false
 SLUS-01450:
-  name: "Street Racquetball (USA)"
+  name: "Street Racquetball"
+  saveName: "Street Racquetball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160423,7 +168703,8 @@ SLUS-01450:
     multitap: false
     linkCable: false
 SLES-02528:
-  name: "Street Scooters (Europe) (En,Fr,De,Es,It)"
+  name: "Street Scooters"
+  saveName: "Street Scooters (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160447,7 +168728,8 @@ SLES-02528:
     multitap: false
     linkCable: false
 SLPS-02186:
-  name: "Street Scooters (Japan)"
+  name: "Street Scooters"
+  saveName: "Street Scooters (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160467,7 +168749,8 @@ SLPS-02186:
     multitap: false
     linkCable: false
 SLUS-00818:
-  name: "Street Sk8er (USA)"
+  name: "Street Sk8er"
+  saveName: "Street Sk8er (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -160490,7 +168773,8 @@ SLUS-00818:
     multitap: false
     linkCable: false
 SLUS-01083:
-  name: "Street Sk8er 2 (USA)"
+  name: "Street Sk8er 2"
+  saveName: "Street Sk8er 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -160514,7 +168798,8 @@ SLUS-01083:
     multitap: false
     linkCable: false
 SLES-01759:
-  name: "Street Skater (Europe) (En,Fr,De)"
+  name: "Street Skater"
+  saveName: "Street Skater (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   traits:
@@ -160536,7 +168821,8 @@ SLES-01759:
     multitap: false
     linkCable: false
 SLES-02703:
-  name: "Street Skater 2 (Europe) (En,Fr,De)"
+  name: "Street Skater 2"
+  saveName: "Street Skater 2 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160559,7 +168845,8 @@ SLES-02703:
     multitap: false
     linkCable: false
 SLPS-00885:
-  name: "Stressless Lesson - Les Les (Japan)"
+  name: "Stressless Lesson - Les Les"
+  saveName: "Stressless Lesson - Les Les (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160577,7 +168864,8 @@ SLPS-00885:
     multitap: false
     linkCable: false
 SLES-12867:
-  name: "Strider (Europe)"
+  name: "Strider"
+  saveName: "Strider (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -160598,7 +168886,8 @@ SLES-12867:
     multitap: false
     linkCable: false
 SLUS-01142:
-  name: "Strider (USA)"
+  name: "Strider"
+  saveName: "Strider (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -160619,7 +168908,8 @@ SLUS-01142:
     multitap: false
     linkCable: false
 SLES-02867:
-  name: "Strider 2 (Europe)"
+  name: "Strider 2"
+  saveName: "Strider 2 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -160640,7 +168930,8 @@ SLES-02867:
     multitap: false
     linkCable: false
 SLUS-01163:
-  name: "Strider 2 (USA)"
+  name: "Strider 2"
+  saveName: "Strider 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
@@ -160661,11 +168952,13 @@ SLUS-01163:
     multitap: false
     linkCable: false
 SLPM-80537:
-  name: "Strider Hiryuu 1 & 2 (Japan) (Demo)"
+  name: "Strider Hiryuu 1 & 2 (Demo)"
+  saveName: "Strider Hiryuu 1 & 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02620:
-  name: "Strider Hiryuu 1 & 2 (Japan) (Disc 1) (Strider Hiryuu)"
+  name: "Strider Hiryuu 1 & 2 (Disc 1) (Strider Hiryuu)"
+  saveName: "Strider Hiryuu 1 & 2 (Japan) (Disc 1) (Strider Hiryuu)"
   discSet:
     name: "Strider Hiryuu 1 & 2 (Japan)"
     serials:
@@ -160688,7 +168981,8 @@ SLPS-02620:
     multitap: false
     linkCable: false
 SLPS-02621:
-  name: "Strider Hiryuu 1 & 2 (Japan) (Disc 2) (Strider Hiryuu 2)"
+  name: "Strider Hiryuu 1 & 2 (Disc 2) (Strider Hiryuu 2)"
+  saveName: "Strider Hiryuu 1 & 2 (Japan) (Disc 2) (Strider Hiryuu 2)"
   discSet:
     name: "Strider Hiryuu 1 & 2 (Japan)"
     serials:
@@ -160729,7 +169023,8 @@ SLPM-87401:
     multitap: false
     linkCable: false
 SLES-04046:
-  name: "Strike Force Hydra (Europe)"
+  name: "Strike Force Hydra"
+  saveName: "Strike Force Hydra (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -160747,7 +169042,8 @@ SLES-04046:
     multitap: false
     linkCable: false
 SLUS-00139:
-  name: "Strike Point (USA)"
+  name: "Strike Point"
+  saveName: "Strike Point (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -160765,7 +169061,8 @@ SLUS-00139:
     multitap: false
     linkCable: false
 SLES-00425:
-  name: "Strikepoint - The Hex Missions (Europe) (En,Fr,De,Es,It)"
+  name: "Strikepoint - The Hex Missions"
+  saveName: "Strikepoint - The Hex Missions (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -160787,7 +169084,8 @@ SLES-00425:
     multitap: false
     linkCable: false
 SLPS-00127:
-  name: "Striker - World Cup Premiere Stage (Japan)"
+  name: "Striker - World Cup Premiere Stage"
+  saveName: "Striker - World Cup Premiere Stage (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160805,7 +169103,8 @@ SLPS-00127:
     multitap: true
     linkCable: false
 SLES-00023:
-  name: "Striker 96 (Europe)"
+  name: "Striker 96"
+  saveName: "Striker 96 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -160823,7 +169122,8 @@ SLES-00023:
     multitap: true
     linkCable: false
 SLUS-00210:
-  name: "Striker 96 (USA)"
+  name: "Striker 96"
+  saveName: "Striker 96 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -160841,7 +169141,8 @@ SLUS-00210:
     multitap: true
     linkCable: false
 SLUS-01078:
-  name: "Striker Pro 2000 (USA)"
+  name: "Striker Pro 2000"
+  saveName: "Striker Pro 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160860,7 +169161,8 @@ SLUS-01078:
     multitap: true
     linkCable: false
 SLPS-00407:
-  name: "Strikers 1945 (Japan)"
+  name: "Strikers 1945"
+  saveName: "Strikers 1945 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -160878,7 +169180,8 @@ SLPS-00407:
     multitap: false
     linkCable: false
 SLUS-01337:
-  name: "Strikers 1945 (USA)"
+  name: "Strikers 1945"
+  saveName: "Strikers 1945 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160897,7 +169200,8 @@ SLUS-01337:
     multitap: false
     linkCable: false
 SLES-03510:
-  name: "Strikers 1945 II (Europe)"
+  name: "Strikers 1945 II"
+  saveName: "Strikers 1945 II (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160916,7 +169220,8 @@ SLES-03510:
     multitap: false
     linkCable: false
 SLPS-01637:
-  name: "Strikers 1945 II (Japan)"
+  name: "Strikers 1945 II"
+  saveName: "Strikers 1945 II (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -160938,7 +169243,8 @@ SLPS-01637:
     multitap: false
     linkCable: false
 SLKA-02001:
-  name: "Strikers 1945 II (Korea)"
+  name: "Strikers 1945 II"
+  saveName: "Strikers 1945 II (Korea)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160957,7 +169263,8 @@ SLKA-02001:
     multitap: false
     linkCable: false
 SCES-03855:
-  name: "Stuart Little 2 (Denmark)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160976,7 +169283,8 @@ SCES-03855:
     multitap: false
     linkCable: false
 SCES-03819:
-  name: "Stuart Little 2 (Europe)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -160995,7 +169303,8 @@ SCES-03819:
     multitap: false
     linkCable: false
 SCES-03852:
-  name: "Stuart Little 2 (Finland)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161014,7 +169323,8 @@ SCES-03852:
     multitap: false
     linkCable: false
 SCES-03820:
-  name: "Stuart Little 2 (France)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161033,7 +169343,8 @@ SCES-03820:
     multitap: false
     linkCable: false
 SCES-03821:
-  name: "Stuart Little 2 (Germany)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161052,7 +169363,8 @@ SCES-03821:
     multitap: false
     linkCable: false
 SCES-03848:
-  name: "Stuart Little 2 (Italy)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161071,7 +169383,8 @@ SCES-03848:
     multitap: false
     linkCable: false
 SCES-03850:
-  name: "Stuart Little 2 (Netherlands)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161090,7 +169403,8 @@ SCES-03850:
     multitap: false
     linkCable: false
 SCES-03853:
-  name: "Stuart Little 2 (Norway)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161109,7 +169423,8 @@ SCES-03853:
     multitap: false
     linkCable: false
 SCES-03851:
-  name: "Stuart Little 2 (Portugal)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Portugal)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161128,7 +169443,8 @@ SCES-03851:
     multitap: false
     linkCable: false
 SCES-03849:
-  name: "Stuart Little 2 (Spain)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161147,7 +169463,8 @@ SCES-03849:
     multitap: false
     linkCable: false
 SCES-03854:
-  name: "Stuart Little 2 (Sweden)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161166,7 +169483,8 @@ SCES-03854:
     multitap: false
     linkCable: false
 SCUS-94669:
-  name: "Stuart Little 2 (USA)"
+  name: "Stuart Little 2"
+  saveName: "Stuart Little 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -161188,7 +169506,8 @@ SCUS-94669:
     multitap: false
     linkCable: false
 SLPS-00403:
-  name: "Studio P (Japan)"
+  name: "Studio P"
+  saveName: "Studio P (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -161207,7 +169526,8 @@ SLPS-00403:
     multitap: false
     linkCable: false
 SLPS-02725:
-  name: "Study Quest - Keisanjima no Daibouken (Japan)"
+  name: "Study Quest - Keisanjima no Daibouken"
+  saveName: "Study Quest - Keisanjima no Daibouken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -161225,7 +169545,8 @@ SLPS-02725:
     multitap: false
     linkCable: false
 SCES-01223:
-  name: "Sub (France)"
+  name: "Sub"
+  saveName: "Sub (France)"
   controllers:
     - DigitalController
   metadata:
@@ -161243,7 +169564,8 @@ SCES-01223:
     multitap: false
     linkCable: false
 SLPS-03413:
-  name: "Subete ga F ni Naru (Japan)"
+  name: "Subete ga F ni Naru"
+  saveName: "Subete ga F ni Naru (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161262,7 +169584,8 @@ SLPS-03413:
     multitap: false
     linkCable: false
 SLES-02728:
-  name: "Submarine Commander (Europe)"
+  name: "Submarine Commander"
+  saveName: "Submarine Commander (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161281,7 +169604,8 @@ SLES-02728:
     multitap: false
     linkCable: false
 SLPS-02234:
-  name: "Submarine Hunter Shachi (Japan)"
+  name: "Submarine Hunter Shachi"
+  saveName: "Submarine Hunter Shachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161322,7 +169646,8 @@ SLPS-91509:
     multitap: false
     linkCable: false
 SLPS-01264:
-  name: "Suchie-Pai Adventure - Doki Doki Nightmare (Japan) (Disc 1)"
+  name: "Suchie-Pai Adventure - Doki Doki Nightmare (Disc 1)"
+  saveName: "Suchie-Pai Adventure - Doki Doki Nightmare (Japan) (Disc 1)"
   discSet:
     name: "Suchie-Pai Adventure - Doki Doki Nightmare (Japan)"
     serials:
@@ -161346,7 +169671,8 @@ SLPS-01264:
     multitap: true
     linkCable: false
 SLPS-01265:
-  name: "Suchie-Pai Adventure - Doki Doki Nightmare (Japan) (Disc 2)"
+  name: "Suchie-Pai Adventure - Doki Doki Nightmare (Disc 2)"
+  saveName: "Suchie-Pai Adventure - Doki Doki Nightmare (Japan) (Disc 2)"
   discSet:
     name: "Suchie-Pai Adventure - Doki Doki Nightmare (Japan)"
     serials:
@@ -161370,7 +169696,8 @@ SLPS-01265:
     multitap: true
     linkCable: false
 SLPS-00137:
-  name: "Suiko Enbu (Japan)"
+  name: "Suiko Enbu"
+  saveName: "Suiko Enbu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -161388,7 +169715,8 @@ SLPS-00137:
     multitap: false
     linkCable: false
 SCPS-45184:
-  name: "Suikoden (Asia)"
+  name: "Suikoden"
+  saveName: "Suikoden (Asia)"
   controllers:
     - DigitalController
   traits:
@@ -161408,7 +169736,8 @@ SCPS-45184:
     multitap: false
     linkCable: false
 SLES-00527:
-  name: "Suikoden (Europe)"
+  name: "Suikoden"
+  saveName: "Suikoden (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161431,7 +169760,8 @@ SLES-00527:
     multitap: false
     linkCable: false
 SLUS-00292:
-  name: "Suikoden (USA)"
+  name: "Suikoden"
+  saveName: "Suikoden (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161473,7 +169803,8 @@ SLPM-86991:
     multitap: false
     linkCable: false
 SLPM-86308:
-  name: "Suikoden - Tendou Hyaku Hachi-sei (Japan)"
+  name: "Suikoden - Tendou Hyaku Hachi-sei"
+  saveName: "Suikoden - Tendou Hyaku Hachi-sei (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161497,7 +169828,8 @@ SLPM-86308:
     multitap: false
     linkCable: false
 SLPS-00521:
-  name: "Suikoden - Tenmei no Chikai (Japan)"
+  name: "Suikoden - Tenmei no Chikai"
+  saveName: "Suikoden - Tenmei no Chikai (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161518,7 +169850,8 @@ SLPS-00521:
     multitap: false
     linkCable: false
 SLES-02442:
-  name: "Suikoden II (Europe)"
+  name: "Suikoden II"
+  saveName: "Suikoden II (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161539,11 +169872,13 @@ SLES-02442:
     multitap: false
     linkCable: false
 SLED-02742:
-  name: "Suikoden II (Europe) (Demo)"
+  name: "Suikoden II (Demo)"
+  saveName: "Suikoden II (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02443:
-  name: "Suikoden II (France)"
+  name: "Suikoden II"
+  saveName: "Suikoden II (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161564,7 +169899,8 @@ SLES-02443:
     multitap: false
     linkCable: false
 SLES-02444:
-  name: "Suikoden II (Germany)"
+  name: "Suikoden II"
+  saveName: "Suikoden II (Germany)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161585,7 +169921,8 @@ SLES-02444:
     multitap: false
     linkCable: false
 SLES-02446:
-  name: "Suikoden II (Italy)"
+  name: "Suikoden II"
+  saveName: "Suikoden II (Italy)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161606,7 +169943,8 @@ SLES-02446:
     multitap: false
     linkCable: false
 SLES-02445:
-  name: "Suikoden II (Spain)"
+  name: "Suikoden II"
+  saveName: "Suikoden II (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161627,7 +169965,8 @@ SLES-02445:
     multitap: false
     linkCable: false
 SLUS-00958:
-  name: "Suikoden II (USA)"
+  name: "Suikoden II"
+  saveName: "Suikoden II (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161684,7 +170023,8 @@ SLPM-86188:
     multitap: false
     linkCable: false
 SLPS-01809:
-  name: "Suizokukan Project - Fish Hunter e no Michi (Japan)"
+  name: "Suizokukan Project - Fish Hunter e no Michi"
+  saveName: "Suizokukan Project - Fish Hunter e no Michi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161703,7 +170043,8 @@ SLPS-01809:
     multitap: false
     linkCable: false
 SLPS-02542:
-  name: "Summon Night (Japan)"
+  name: "Summon Night"
+  saveName: "Summon Night (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -161728,11 +170069,13 @@ SLPS-02542:
     multitap: false
     linkCable: false
 SLPM-80509:
-  name: "Summon Night (Japan) (Demo)"
+  name: "Summon Night (Demo)"
+  saveName: "Summon Night (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03237:
-  name: "Summon Night 2 (Japan) (Disc 1)"
+  name: "Summon Night 2 (Disc 1)"
+  saveName: "Summon Night 2 (Japan) (Disc 1)"
   discSet:
     name: "Summon Night 2 (Japan)"
     serials:
@@ -161759,7 +170102,8 @@ SLPS-03237:
     multitap: false
     linkCable: false
 SLPS-91517:
-  name: "Summon Night 2 (Japan) (Disc 1) (Rev 1)"
+  name: "Summon Night 2 (Disc 1)"
+  saveName: "Summon Night 2 (Japan) (Disc 1) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161778,7 +170122,8 @@ SLPS-91517:
     multitap: false
     linkCable: false
 SLPS-03238:
-  name: "Summon Night 2 (Japan) (Disc 2)"
+  name: "Summon Night 2 (Disc 2)"
+  saveName: "Summon Night 2 (Japan) (Disc 2)"
   discSet:
     name: "Summon Night 2 (Japan)"
     serials:
@@ -161824,7 +170169,8 @@ SLPS-03275:
     multitap: false
     linkCable: false
 SLPS-02858:
-  name: "Suna no Embrace - Edin no Sato no Navel (Japan)"
+  name: "Suna no Embrace - Edin no Sato no Navel"
+  saveName: "Suna no Embrace - Edin no Sato no Navel (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161843,7 +170189,8 @@ SLPS-02858:
     multitap: false
     linkCable: false
 SLPS-01051:
-  name: "Super Adventure Rockman (Japan) (Disc 1) (Episode 1 Tsuki no Shinden)"
+  name: "Super Adventure Rockman (Disc 1) (Episode 1 Tsuki no Shinden)"
+  saveName: "Super Adventure Rockman (Japan) (Disc 1) (Episode 1 Tsuki no Shinden)"
   discSet:
     name: "Super Adventure Rockman (Japan)"
     serials:
@@ -161870,7 +170217,8 @@ SLPS-01051:
     multitap: false
     linkCable: false
 SLPS-01052:
-  name: "Super Adventure Rockman (Japan) (Disc 2) (Episode 2 Shitou! Wily Numbers)"
+  name: "Super Adventure Rockman (Disc 2) (Episode 2 Shitou! Wily Numbers)"
+  saveName: "Super Adventure Rockman (Japan) (Disc 2) (Episode 2 Shitou! Wily Numbers)"
   discSet:
     name: "Super Adventure Rockman (Japan)"
     serials:
@@ -161897,7 +170245,8 @@ SLPS-01052:
     multitap: false
     linkCable: false
 SLPS-01053:
-  name: "Super Adventure Rockman (Japan) (Disc 3) (Episode 3 Saigo no Tatakai!!)"
+  name: "Super Adventure Rockman (Disc 3) (Episode 3 Saigo no Tatakai!!)"
+  saveName: "Super Adventure Rockman (Japan) (Disc 3) (Episode 3 Saigo no Tatakai!!)"
   discSet:
     name: "Super Adventure Rockman (Japan)"
     serials:
@@ -161924,7 +170273,8 @@ SLPS-01053:
     multitap: false
     linkCable: false
 SLPS-02219:
-  name: "Super Bass Fishing (Japan)"
+  name: "Super Bass Fishing"
+  saveName: "Super Bass Fishing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161943,7 +170293,8 @@ SLPS-02219:
     multitap: false
     linkCable: false
 SLPS-02867:
-  name: "Super Bass Fishing (Japan) (Fukyuuban 1500)"
+  name: "Super Bass Fishing (Fukyuuban 1500)"
+  saveName: "Super Bass Fishing (Japan) (Fukyuuban 1500)"
   controllers:
     - AnalogController
     - DigitalController
@@ -161980,7 +170331,8 @@ SCPS-45084:
     multitap: false
     linkCable: false
 SLPS-00839:
-  name: "Super Black Bass X (Japan)"
+  name: "Super Black Bass X"
+  saveName: "Super Black Bass X (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -162001,7 +170353,8 @@ SLPS-00839:
     multitap: false
     linkCable: false
 SLPM-86717:
-  name: "Super Blackbass X2 (Japan)"
+  name: "Super Blackbass X2"
+  saveName: "Super Blackbass X2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162023,7 +170376,8 @@ SLPM-86717:
     multitap: false
     linkCable: false
 SLUS-01528:
-  name: "Super Bubble Pop (USA)"
+  name: "Super Bubble Pop"
+  saveName: "Super Bubble Pop (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -162045,7 +170399,8 @@ SLUS-01528:
     multitap: false
     linkCable: false
 SLPS-00467:
-  name: "Super Casino Special (Japan)"
+  name: "Super Casino Special"
+  saveName: "Super Casino Special (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162063,7 +170418,8 @@ SLPS-00467:
     multitap: true
     linkCable: false
 SLES-04045:
-  name: "Super Dropzone - Intergalactic Rescue Mission (Europe)"
+  name: "Super Dropzone - Intergalactic Rescue Mission"
+  saveName: "Super Dropzone - Intergalactic Rescue Mission (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -162081,7 +170437,8 @@ SLES-04045:
     multitap: false
     linkCable: false
 SLES-00715:
-  name: "Super Football Champ (Europe)"
+  name: "Super Football Champ"
+  saveName: "Super Football Champ (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -162099,7 +170456,8 @@ SLES-00715:
     multitap: true
     linkCable: false
 SLPS-00569:
-  name: "Super Football Champ (Japan)"
+  name: "Super Football Champ"
+  saveName: "Super Football Champ (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162135,7 +170493,8 @@ SLPM-86620:
     multitap: true
     linkCable: false
 SLPM-87135:
-  name: "Super Gals! Kotobuki Ran Special - Ikemen Get You Gals Party (Japan)"
+  name: "Super Gals! Kotobuki Ran Special - Ikemen Get You Gals Party"
+  saveName: "Super Gals! Kotobuki Ran Special - Ikemen Get You Gals Party (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -162156,7 +170515,8 @@ SLPM-87135:
     multitap: true
     linkCable: false
 SLPS-01776:
-  name: "Super Hero Sakusen (Japan)"
+  name: "Super Hero Sakusen"
+  saveName: "Super Hero Sakusen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162174,11 +170534,13 @@ SLPS-01776:
     multitap: false
     linkCable: false
 SLPM-80358:
-  name: "Super Hero Sakusen (Japan) (Demo)"
+  name: "Super Hero Sakusen (Demo)"
+  saveName: "Super Hero Sakusen (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03020:
-  name: "Super Hero Sakusen - Diedal no Yabou (Japan)"
+  name: "Super Hero Sakusen - Diedal no Yabou"
+  saveName: "Super Hero Sakusen - Diedal no Yabou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162197,7 +170559,8 @@ SLPS-03020:
     multitap: false
     linkCable: false
 SLPS-03019:
-  name: "Super Hero Sakusen - Diedal no Yabou (Japan) (Genteiban)"
+  name: "Super Hero Sakusen - Diedal no Yabou (Genteiban)"
+  saveName: "Super Hero Sakusen - Diedal no Yabou (Japan) (Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162254,7 +170617,8 @@ SLKA-02003:
     multitap: false
     linkCable: false
 SLPM-86019:
-  name: "Super Live Stadium (Japan)"
+  name: "Super Live Stadium"
+  saveName: "Super Live Stadium (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162272,7 +170636,8 @@ SLPM-86019:
     multitap: false
     linkCable: false
 SLES-01175:
-  name: "Super Match Soccer (Europe) (En,Fr,De,Es,It)"
+  name: "Super Match Soccer"
+  saveName: "Super Match Soccer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162295,7 +170660,8 @@ SLES-01175:
     multitap: true
     linkCable: false
 SLES-00043:
-  name: "Super Pang Collection (Europe)"
+  name: "Super Pang Collection"
+  saveName: "Super Pang Collection (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -162313,7 +170679,8 @@ SLES-00043:
     multitap: false
     linkCable: false
 SLPS-00360:
-  name: "Super Pang Collection (Japan)"
+  name: "Super Pang Collection"
+  saveName: "Super Pang Collection (Japan)"
   controllers:
     - DigitalController
   settings:
@@ -162334,7 +170701,8 @@ SLPS-00360:
     multitap: false
     linkCable: false
 SLPS-03226:
-  name: "Super Price Series - Billiards (Japan)"
+  name: "Super Price Series - Billiards"
+  saveName: "Super Price Series - Billiards (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162356,7 +170724,8 @@ SLPS-03226:
     multitap: false
     linkCable: false
 SLPS-03386:
-  name: "Super Price Series - Block & Switch (Japan)"
+  name: "Super Price Series - Block & Switch"
+  saveName: "Super Price Series - Block & Switch (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162378,7 +170747,8 @@ SLPS-03386:
     multitap: false
     linkCable: false
 SLPS-03387:
-  name: "Super Price Series - Hanafuda (Japan)"
+  name: "Super Price Series - Hanafuda"
+  saveName: "Super Price Series - Hanafuda (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162397,7 +170767,8 @@ SLPS-03387:
     multitap: false
     linkCable: false
 SLPS-03225:
-  name: "Super Price Series - Mahjong (Japan)"
+  name: "Super Price Series - Mahjong"
+  saveName: "Super Price Series - Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162419,7 +170790,8 @@ SLPS-03225:
     multitap: false
     linkCable: false
 SLPS-03227:
-  name: "Super Price Series - Paipai (Japan)"
+  name: "Super Price Series - Paipai"
+  saveName: "Super Price Series - Paipai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162438,7 +170810,8 @@ SLPS-03227:
     multitap: false
     linkCable: false
 SLPS-03385:
-  name: "Super Price Series - Reversi (Japan)"
+  name: "Super Price Series - Reversi"
+  saveName: "Super Price Series - Reversi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162457,7 +170830,8 @@ SLPS-03385:
     multitap: false
     linkCable: false
 SLES-00605:
-  name: "Super Puzzle Fighter II Turbo (Europe)"
+  name: "Super Puzzle Fighter II Turbo"
+  saveName: "Super Puzzle Fighter II Turbo (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -162475,7 +170849,8 @@ SLES-00605:
     multitap: false
     linkCable: false
 SLUS-00418:
-  name: "Super Puzzle Fighter II Turbo (USA)"
+  name: "Super Puzzle Fighter II Turbo"
+  saveName: "Super Puzzle Fighter II Turbo (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1419-g34a515cd"
@@ -162497,7 +170872,8 @@ SLUS-00418:
     multitap: false
     linkCable: false
 SLPS-00611:
-  name: "Super Puzzle Fighter II X (Japan)"
+  name: "Super Puzzle Fighter II X"
+  saveName: "Super Puzzle Fighter II X (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162515,7 +170891,8 @@ SLPS-00611:
     multitap: false
     linkCable: false
 SLPS-00554:
-  name: "Super Robot Shooting (Japan)"
+  name: "Super Robot Shooting"
+  saveName: "Super Robot Shooting (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162533,7 +170910,8 @@ SLPS-00554:
     multitap: false
     linkCable: false
 SLPS-00553:
-  name: "Super Robot Shooting (Japan) (Genteiban)"
+  name: "Super Robot Shooting (Genteiban)"
+  saveName: "Super Robot Shooting (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -162551,7 +170929,8 @@ SLPS-00553:
     multitap: false
     linkCable: false
 SLPS-02070:
-  name: "Super Robot Taisen - Complete Box (Japan) (Disc 1) (Super Robot Wars Complete Box)"
+  name: "Super Robot Taisen - Complete Box (Disc 1) (Super Robot Wars Complete Box)"
+  saveName: "Super Robot Taisen - Complete Box (Japan) (Disc 1) (Super Robot Wars Complete Box)"
   discSet:
     name: "Super Robot Taisen - Complete Box (Japan)"
     serials:
@@ -162574,7 +170953,8 @@ SLPS-02070:
     multitap: false
     linkCable: false
 SLPS-02071:
-  name: "Super Robot Taisen - Complete Box (Japan) (Disc 2) (History of Super Robot Wars)"
+  name: "Super Robot Taisen - Complete Box (Disc 2) (History of Super Robot Wars)"
+  saveName: "Super Robot Taisen - Complete Box (Japan) (Disc 2) (History of Super Robot Wars)"
   discSet:
     name: "Super Robot Taisen - Complete Box (Japan)"
     serials:
@@ -162597,7 +170977,8 @@ SLPS-02071:
     multitap: false
     linkCable: false
 SLPS-02636:
-  name: "Super Robot Taisen Alpha (Japan)"
+  name: "Super Robot Taisen Alpha"
+  saveName: "Super Robot Taisen Alpha (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162619,7 +171000,8 @@ SLPS-02636:
     multitap: false
     linkCable: false
 SLPS-02528:
-  name: "Super Robot Taisen Alpha (Japan) (Limited Edition)"
+  name: "Super Robot Taisen Alpha (Limited Edition)"
+  saveName: "Super Robot Taisen Alpha (Japan) (Limited Edition)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162641,7 +171023,8 @@ SLPS-02528:
     multitap: false
     linkCable: false
 SLPS-03148:
-  name: "Super Robot Taisen Alpha Gaiden (Japan)"
+  name: "Super Robot Taisen Alpha Gaiden"
+  saveName: "Super Robot Taisen Alpha Gaiden (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162660,9 +171043,11 @@ SLPS-03148:
     multitap: false
     linkCable: false
 SLPS-03577:
-  name: "Super Robot Taisen Alpha Gaiden (Japan) (Premium Edition)"
+  name: "Super Robot Taisen Alpha Gaiden (Premium Edition)"
+  saveName: "Super Robot Taisen Alpha Gaiden (Japan) (Premium Edition)"
 SLPS-91506:
-  name: "Super Robot Taisen Alpha Gaiden (Japan) (Rev 1)"
+  name: "Super Robot Taisen Alpha Gaiden"
+  saveName: "Super Robot Taisen Alpha Gaiden (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162681,7 +171066,8 @@ SLPS-91506:
     multitap: false
     linkCable: false
 SLPS-03147:
-  name: "Super Robot Taisen Alpha Gaiden (Japan) (Shokai Genteiban)"
+  name: "Super Robot Taisen Alpha Gaiden (Shokai Genteiban)"
+  saveName: "Super Robot Taisen Alpha Gaiden (Japan) (Shokai Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162700,7 +171086,8 @@ SLPS-03147:
     multitap: false
     linkCable: false
 SLPS-02529:
-  name: "Super Robot Taisen EX (Japan)"
+  name: "Super Robot Taisen EX"
+  saveName: "Super Robot Taisen EX (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162718,7 +171105,8 @@ SLPS-02529:
     multitap: false
     linkCable: false
 SLPS-01727:
-  name: "Super Robot Taisen F (Japan)"
+  name: "Super Robot Taisen F"
+  saveName: "Super Robot Taisen F (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -162739,7 +171127,8 @@ SLPS-01727:
     multitap: false
     linkCable: false
 SLPS-01924:
-  name: "Super Robot Taisen F Kanketsuhen (Japan)"
+  name: "Super Robot Taisen F Kanketsuhen"
+  saveName: "Super Robot Taisen F Kanketsuhen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -162798,7 +171187,8 @@ SCPS-45513:
     multitap: false
     linkCable: false
 SLUS-01464:
-  name: "Super Shot Soccer (USA)"
+  name: "Super Shot Soccer"
+  saveName: "Super Shot Soccer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -162820,7 +171210,8 @@ SLUS-01464:
     multitap: false
     linkCable: false
 SLES-03961:
-  name: "Super Slammin' Dodgeball (Europe)"
+  name: "Super Slammin' Dodgeball"
+  saveName: "Super Slammin' Dodgeball (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162839,7 +171230,8 @@ SLES-03961:
     multitap: false
     linkCable: false
 SLPS-02863:
-  name: "Super Tokusatsu Taisen 2001 (Japan)"
+  name: "Super Tokusatsu Taisen 2001"
+  saveName: "Super Tokusatsu Taisen 2001 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162858,7 +171250,8 @@ SLPS-02863:
     multitap: false
     linkCable: false
 SCUS-94453:
-  name: "SuperCross Circuit (USA)"
+  name: "SuperCross Circuit"
+  saveName: "SuperCross Circuit (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -162881,11 +171274,13 @@ SCUS-94453:
     multitap: false
     linkCable: false
 SCUS-94396:
-  name: "SuperCross Circuit (USA) (Demo)"
+  name: "SuperCross Circuit (Demo)"
+  saveName: "SuperCross Circuit (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-87231:
-  name: "SuperLite 1500 Series - A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De)"
+  name: "SuperLite 1500 Series - A Ressha de Ikou 4 - Evolution Global"
+  saveName: "SuperLite 1500 Series - A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -162903,7 +171298,8 @@ SLPM-87231:
     multitap: false
     linkCable: false
 SLPM-87282:
-  name: "SuperLite 1500 Series - A Ressha de Ikou Z - Mezase! Tairiku Oudan (Japan)"
+  name: "SuperLite 1500 Series - A Ressha de Ikou Z - Mezase! Tairiku Oudan"
+  saveName: "SuperLite 1500 Series - A Ressha de Ikou Z - Mezase! Tairiku Oudan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162922,7 +171318,8 @@ SLPM-87282:
     multitap: false
     linkCable: false
 SLPM-87238:
-  name: "SuperLite 1500 Series - A5 - A Ressha de Ikou 5 (Japan)"
+  name: "SuperLite 1500 Series - A5 - A Ressha de Ikou 5"
+  saveName: "SuperLite 1500 Series - A5 - A Ressha de Ikou 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162941,7 +171338,8 @@ SLPM-87238:
     multitap: false
     linkCable: false
 SLPM-87227:
-  name: "SuperLite 1500 Series - Advanced V.G. (Japan)"
+  name: "SuperLite 1500 Series - Advanced V.G."
+  saveName: "SuperLite 1500 Series - Advanced V.G. (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162959,7 +171357,8 @@ SLPM-87227:
     multitap: false
     linkCable: false
 SLPM-87226:
-  name: "SuperLite 1500 Series - Advanced V.G. 2 (Japan)"
+  name: "SuperLite 1500 Series - Advanced V.G. 2"
+  saveName: "SuperLite 1500 Series - Advanced V.G. 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -162978,7 +171377,8 @@ SLPM-87226:
     multitap: false
     linkCable: false
 SLPM-86278:
-  name: "SuperLite 1500 Series - Angolmois 99 (Japan)"
+  name: "SuperLite 1500 Series - Angolmois 99"
+  saveName: "SuperLite 1500 Series - Angolmois 99 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -162996,7 +171396,8 @@ SLPM-86278:
     multitap: false
     linkCable: false
 SLPM-86259:
-  name: "SuperLite 1500 Series - Ano Ko Doko no Ko - Endless Season (Japan)"
+  name: "SuperLite 1500 Series - Ano Ko Doko no Ko - Endless Season"
+  saveName: "SuperLite 1500 Series - Ano Ko Doko no Ko - Endless Season (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163015,7 +171416,8 @@ SLPM-86259:
     multitap: true
     linkCable: false
 SLPM-86239:
-  name: "SuperLite 1500 Series - Asteroids (Japan)"
+  name: "SuperLite 1500 Series - Asteroids"
+  saveName: "SuperLite 1500 Series - Asteroids (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163034,7 +171436,8 @@ SLPM-86239:
     multitap: false
     linkCable: false
 SLPM-87152:
-  name: "SuperLite 1500 Series - Asuka 120% Final - Burning Fest. Final (Japan)"
+  name: "SuperLite 1500 Series - Asuka 120% Final - Burning Fest. Final"
+  saveName: "SuperLite 1500 Series - Asuka 120% Final - Burning Fest. Final (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163053,7 +171456,8 @@ SLPM-87152:
     multitap: false
     linkCable: false
 SLPM-87165:
-  name: "SuperLite 1500 Series - Battle Qix (Japan)"
+  name: "SuperLite 1500 Series - Battle Qix"
+  saveName: "SuperLite 1500 Series - Battle Qix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163072,7 +171476,8 @@ SLPM-87165:
     multitap: false
     linkCable: false
 SLPM-86400:
-  name: "SuperLite 1500 Series - Battle Sugoroku the Hunter - A.R.0062 (Japan)"
+  name: "SuperLite 1500 Series - Battle Sugoroku the Hunter - A.R.0062"
+  saveName: "SuperLite 1500 Series - Battle Sugoroku the Hunter - A.R.0062 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163091,7 +171496,8 @@ SLPM-86400:
     multitap: true
     linkCable: false
 SLPM-87090:
-  name: "SuperLite 1500 Series - Bomboat (Japan)"
+  name: "SuperLite 1500 Series - Bomboat"
+  saveName: "SuperLite 1500 Series - Bomboat (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163110,7 +171516,8 @@ SLPM-87090:
     multitap: false
     linkCable: false
 SLPM-86598:
-  name: "SuperLite 1500 Series - Burn Out (Japan)"
+  name: "SuperLite 1500 Series - Burn Out"
+  saveName: "SuperLite 1500 Series - Burn Out (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163130,7 +171537,8 @@ SLPM-86598:
     multitap: false
     linkCable: false
 SLPM-86298:
-  name: "SuperLite 1500 Series - Card II (Japan)"
+  name: "SuperLite 1500 Series - Card II"
+  saveName: "SuperLite 1500 Series - Card II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163148,7 +171556,8 @@ SLPM-86298:
     multitap: false
     linkCable: false
 SLPM-87239:
-  name: "SuperLite 1500 Series - Carnage Heart (Japan)"
+  name: "SuperLite 1500 Series - Carnage Heart"
+  saveName: "SuperLite 1500 Series - Carnage Heart (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163167,7 +171576,8 @@ SLPM-87239:
     multitap: false
     linkCable: false
 SLPM-87281:
-  name: "SuperLite 1500 Series - Carnage Heart EZ (Easy Zapping) (Japan)"
+  name: "SuperLite 1500 Series - Carnage Heart EZ (Easy Zapping)"
+  saveName: "SuperLite 1500 Series - Carnage Heart EZ (Easy Zapping) (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163185,7 +171595,8 @@ SLPM-87281:
     multitap: false
     linkCable: false
 SLPM-86489:
-  name: "SuperLite 1500 Series - Castrol Honda Super Bike Racing (Japan)"
+  name: "SuperLite 1500 Series - Castrol Honda Super Bike Racing"
+  saveName: "SuperLite 1500 Series - Castrol Honda Super Bike Racing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163205,7 +171616,8 @@ SLPM-86489:
     multitap: false
     linkCable: false
 SLPM-86922:
-  name: "SuperLite 1500 Series - Castrol Honda VTR (Japan)"
+  name: "SuperLite 1500 Series - Castrol Honda VTR"
+  saveName: "SuperLite 1500 Series - Castrol Honda VTR (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163225,7 +171637,8 @@ SLPM-86922:
     multitap: false
     linkCable: false
 SLPM-86630:
-  name: "SuperLite 1500 Series - Chitty Chitty Chicken (Japan)"
+  name: "SuperLite 1500 Series - Chitty Chitty Chicken"
+  saveName: "SuperLite 1500 Series - Chitty Chitty Chicken (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163244,7 +171657,8 @@ SLPM-86630:
     multitap: false
     linkCable: false
 SLPM-86660:
-  name: "SuperLite 1500 Series - Crazy Balloon 2000 (Japan)"
+  name: "SuperLite 1500 Series - Crazy Balloon 2000"
+  saveName: "SuperLite 1500 Series - Crazy Balloon 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163263,7 +171677,8 @@ SLPM-86660:
     multitap: false
     linkCable: false
 SLPM-86426:
-  name: "SuperLite 1500 Series - Crossword (Japan)"
+  name: "SuperLite 1500 Series - Crossword"
+  saveName: "SuperLite 1500 Series - Crossword (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163282,7 +171697,8 @@ SLPM-86426:
     multitap: false
     linkCable: false
 SLPM-86535:
-  name: "SuperLite 1500 Series - Crossword 2 (Japan)"
+  name: "SuperLite 1500 Series - Crossword 2"
+  saveName: "SuperLite 1500 Series - Crossword 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163301,7 +171717,8 @@ SLPM-86535:
     multitap: false
     linkCable: false
 SLPM-86796:
-  name: "SuperLite 1500 Series - Crossword 3 (Japan)"
+  name: "SuperLite 1500 Series - Crossword 3"
+  saveName: "SuperLite 1500 Series - Crossword 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163320,7 +171737,8 @@ SLPM-86796:
     multitap: false
     linkCable: false
 SLPM-86580:
-  name: "SuperLite 1500 Series - Cyber Daisenryaku - Shutsugeki! Haruka Tai (Japan)"
+  name: "SuperLite 1500 Series - Cyber Daisenryaku - Shutsugeki! Haruka Tai"
+  saveName: "SuperLite 1500 Series - Cyber Daisenryaku - Shutsugeki! Haruka Tai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163339,7 +171757,8 @@ SLPM-86580:
     multitap: false
     linkCable: false
 SLPM-86497:
-  name: "SuperLite 1500 Series - Deep Freeze (Japan)"
+  name: "SuperLite 1500 Series - Deep Freeze"
+  saveName: "SuperLite 1500 Series - Deep Freeze (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163359,7 +171778,8 @@ SLPM-86497:
     multitap: false
     linkCable: false
 SLPM-87115:
-  name: "SuperLite 1500 Series - Densetsu-juu no Ana - Monster Complete World Ver. 2 (Japan)"
+  name: "SuperLite 1500 Series - Densetsu-juu no Ana - Monster Complete World Ver. 2"
+  saveName: "SuperLite 1500 Series - Densetsu-juu no Ana - Monster Complete World Ver. 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163378,7 +171798,8 @@ SLPM-87115:
     multitap: false
     linkCable: false
 SLPM-87043:
-  name: "SuperLite 1500 Series - Emmyrea (Japan)"
+  name: "SuperLite 1500 Series - Emmyrea"
+  saveName: "SuperLite 1500 Series - Emmyrea (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163397,7 +171818,8 @@ SLPM-87043:
     multitap: false
     linkCable: false
 SLPM-86366:
-  name: "SuperLite 1500 Series - F1 Grand Prix 1996 - Team Un'ei Simulation (Japan)"
+  name: "SuperLite 1500 Series - F1 Grand Prix 1996 - Team Un'ei Simulation"
+  saveName: "SuperLite 1500 Series - F1 Grand Prix 1996 - Team Un'ei Simulation (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163415,7 +171837,8 @@ SLPM-86366:
     multitap: false
     linkCable: false
 SLPM-86461:
-  name: "SuperLite 1500 Series - Fantastic Night Dreams - Cotton Original (Japan)"
+  name: "SuperLite 1500 Series - Fantastic Night Dreams - Cotton Original"
+  saveName: "SuperLite 1500 Series - Fantastic Night Dreams - Cotton Original (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -163437,7 +171860,8 @@ SLPM-86461:
     multitap: false
     linkCable: false
 SLPM-87237:
-  name: "SuperLite 1500 Series - Farland Saga - Toki no Michishirube (Japan)"
+  name: "SuperLite 1500 Series - Farland Saga - Toki no Michishirube"
+  saveName: "SuperLite 1500 Series - Farland Saga - Toki no Michishirube (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163455,7 +171879,8 @@ SLPM-87237:
     multitap: false
     linkCable: false
 SLPM-87245:
-  name: "SuperLite 1500 Series - Farland Story - Yottsu no Fuuin (Japan)"
+  name: "SuperLite 1500 Series - Farland Story - Yottsu no Fuuin"
+  saveName: "SuperLite 1500 Series - Farland Story - Yottsu no Fuuin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163473,7 +171898,8 @@ SLPM-87245:
     multitap: false
     linkCable: false
 SLPM-86622:
-  name: "SuperLite 1500 Series - Fishing Club - Boat no Tsuri-hen (Japan)"
+  name: "SuperLite 1500 Series - Fishing Club - Boat no Tsuri-hen"
+  saveName: "SuperLite 1500 Series - Fishing Club - Boat no Tsuri-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163492,7 +171918,8 @@ SLPM-86622:
     multitap: false
     linkCable: false
 SLPM-86623:
-  name: "SuperLite 1500 Series - Fishing Club - Bouhatei no Tsuri-hen (Japan)"
+  name: "SuperLite 1500 Series - Fishing Club - Bouhatei no Tsuri-hen"
+  saveName: "SuperLite 1500 Series - Fishing Club - Bouhatei no Tsuri-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163511,7 +171938,8 @@ SLPM-86623:
     multitap: false
     linkCable: false
 SLPM-86624:
-  name: "SuperLite 1500 Series - Fishing Club - Hama no Tsuri-hen (Japan)"
+  name: "SuperLite 1500 Series - Fishing Club - Hama no Tsuri-hen"
+  saveName: "SuperLite 1500 Series - Fishing Club - Hama no Tsuri-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163530,7 +171958,8 @@ SLPM-86624:
     multitap: false
     linkCable: false
 SLPM-86711:
-  name: "SuperLite 1500 Series - Flamberge no Seirei (Japan)"
+  name: "SuperLite 1500 Series - Flamberge no Seirei"
+  saveName: "SuperLite 1500 Series - Flamberge no Seirei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163549,7 +171978,8 @@ SLPM-86711:
     multitap: false
     linkCable: false
 SLPM-86297:
-  name: "SuperLite 1500 Series - Game de Seishun (Japan)"
+  name: "SuperLite 1500 Series - Game de Seishun"
+  saveName: "SuperLite 1500 Series - Game de Seishun (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163567,7 +171997,8 @@ SLPM-86297:
     multitap: true
     linkCable: false
 SLPM-86319:
-  name: "SuperLite 1500 Series - Hanafuda II (Japan)"
+  name: "SuperLite 1500 Series - Hanafuda II"
+  saveName: "SuperLite 1500 Series - Hanafuda II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163585,7 +172016,8 @@ SLPM-86319:
     multitap: false
     linkCable: false
 SLPM-86488:
-  name: "SuperLite 1500 Series - Hooockey!! (Japan)"
+  name: "SuperLite 1500 Series - Hooockey!!"
+  saveName: "SuperLite 1500 Series - Hooockey!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163603,7 +172035,8 @@ SLPM-86488:
     multitap: false
     linkCable: false
 SLPM-86320:
-  name: "SuperLite 1500 Series - Kaette kita Pachio-kun - Dream Collection (Japan)"
+  name: "SuperLite 1500 Series - Kaette kita Pachio-kun - Dream Collection"
+  saveName: "SuperLite 1500 Series - Kaette kita Pachio-kun - Dream Collection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163621,9 +172054,11 @@ SLPM-86320:
     multitap: false
     linkCable: false
 SLPM-86832:
-  name: "SuperLite 1500 Series - Kaiteiban Mark Yazaki no Seiyou Senseijutsu (Japan)"
+  name: "SuperLite 1500 Series - Kaiteiban Mark Yazaki no Seiyou Senseijutsu"
+  saveName: "SuperLite 1500 Series - Kaiteiban Mark Yazaki no Seiyou Senseijutsu (Japan)"
 SLPM-86833:
-  name: "SuperLite 1500 Series - Kaiteiban Shichuu Suimei - Mark Yazaki Kanshuu (Japan)"
+  name: "SuperLite 1500 Series - Kaiteiban Shichuu Suimei - Mark Yazaki Kanshuu"
+  saveName: "SuperLite 1500 Series - Kaiteiban Shichuu Suimei - Mark Yazaki Kanshuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163641,7 +172076,8 @@ SLPM-86833:
     multitap: false
     linkCable: false
 SLPM-87161:
-  name: "SuperLite 1500 Series - KeePer (Japan)"
+  name: "SuperLite 1500 Series - KeePer"
+  saveName: "SuperLite 1500 Series - KeePer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163659,7 +172095,8 @@ SLPM-87161:
     multitap: false
     linkCable: false
 SLPM-87170:
-  name: "SuperLite 1500 Series - Kouyasai - A Sherd of Youthful Memories (Japan)"
+  name: "SuperLite 1500 Series - Kouyasai - A Sherd of Youthful Memories"
+  saveName: "SuperLite 1500 Series - Kouyasai - A Sherd of Youthful Memories (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163677,7 +172114,8 @@ SLPM-87170:
     multitap: false
     linkCable: false
 SLPM-86238:
-  name: "SuperLite 1500 Series - Lode Runner - The Legend Returns (Japan)"
+  name: "SuperLite 1500 Series - Lode Runner - The Legend Returns"
+  saveName: "SuperLite 1500 Series - Lode Runner - The Legend Returns (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163695,7 +172133,8 @@ SLPM-86238:
     multitap: false
     linkCable: false
 SLPM-86460:
-  name: "SuperLite 1500 Series - Lode Runner 2 (Japan)"
+  name: "SuperLite 1500 Series - Lode Runner 2"
+  saveName: "SuperLite 1500 Series - Lode Runner 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163713,7 +172152,8 @@ SLPM-86460:
     multitap: false
     linkCable: false
 SLPM-87219:
-  name: "SuperLite 1500 Series - Lunar Wing - Toki o Koeta Seisen (Japan)"
+  name: "SuperLite 1500 Series - Lunar Wing - Toki o Koeta Seisen"
+  saveName: "SuperLite 1500 Series - Lunar Wing - Toki o Koeta Seisen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163732,7 +172172,8 @@ SLPM-87219:
     multitap: false
     linkCable: false
 SLPM-87211:
-  name: "SuperLite 1500 Series - Maerchen Adventure - Cotton 100% (Japan)"
+  name: "SuperLite 1500 Series - Maerchen Adventure - Cotton 100%"
+  saveName: "SuperLite 1500 Series - Maerchen Adventure - Cotton 100% (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -163753,7 +172194,8 @@ SLPM-87211:
     multitap: false
     linkCable: false
 SLPM-86258:
-  name: "SuperLite 1500 Series - Mahjong II (Japan)"
+  name: "SuperLite 1500 Series - Mahjong II"
+  saveName: "SuperLite 1500 Series - Mahjong II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163772,9 +172214,11 @@ SLPM-86258:
     multitap: false
     linkCable: false
 SLPM-86856:
-  name: "SuperLite 1500 Series - Mahjong Senjutsu - Andou Mitsuru Pro no Akuukan Sappou (Japan)"
+  name: "SuperLite 1500 Series - Mahjong Senjutsu - Andou Mitsuru Pro no Akuukan Sappou"
+  saveName: "SuperLite 1500 Series - Mahjong Senjutsu - Andou Mitsuru Pro no Akuukan Sappou (Japan)"
 SLPM-87143:
-  name: "SuperLite 1500 Series - Mahjong Uranai Fortuna - Tsuki no Megami-tachi (Japan)"
+  name: "SuperLite 1500 Series - Mahjong Uranai Fortuna - Tsuki no Megami-tachi"
+  saveName: "SuperLite 1500 Series - Mahjong Uranai Fortuna - Tsuki no Megami-tachi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163793,7 +172237,8 @@ SLPM-87143:
     multitap: false
     linkCable: false
 SLPM-86817:
-  name: "SuperLite 1500 Series - Makikou (Japan)"
+  name: "SuperLite 1500 Series - Makikou"
+  saveName: "SuperLite 1500 Series - Makikou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163812,7 +172257,8 @@ SLPM-86817:
     multitap: false
     linkCable: false
 SLPM-86443:
-  name: "SuperLite 1500 Series - Mawatte Mucho! (Japan)"
+  name: "SuperLite 1500 Series - Mawatte Mucho!"
+  saveName: "SuperLite 1500 Series - Mawatte Mucho! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163830,7 +172276,8 @@ SLPM-86443:
     multitap: false
     linkCable: false
 SLPM-86583:
-  name: "SuperLite 1500 Series - Memories Off (Japan)"
+  name: "SuperLite 1500 Series - Memories Off"
+  saveName: "SuperLite 1500 Series - Memories Off (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163849,7 +172296,8 @@ SLPM-86583:
     multitap: false
     linkCable: false
 SLPM-87120:
-  name: "SuperLite 1500 Series - Monster Complete World (Japan)"
+  name: "SuperLite 1500 Series - Monster Complete World"
+  saveName: "SuperLite 1500 Series - Monster Complete World (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163868,7 +172316,8 @@ SLPM-87120:
     multitap: false
     linkCable: false
 SLPM-87162:
-  name: "SuperLite 1500 Series - Naniwa Wangan Battle (Japan)"
+  name: "SuperLite 1500 Series - Naniwa Wangan Battle"
+  saveName: "SuperLite 1500 Series - Naniwa Wangan Battle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163888,7 +172337,8 @@ SLPM-87162:
     multitap: false
     linkCable: false
 SLPM-87240:
-  name: "SuperLite 1500 Series - Neo Atlas (Japan)"
+  name: "SuperLite 1500 Series - Neo Atlas"
+  saveName: "SuperLite 1500 Series - Neo Atlas (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163907,7 +172357,8 @@ SLPM-87240:
     multitap: false
     linkCable: false
 SLPM-87283:
-  name: "SuperLite 1500 Series - Neo Atlas II (Japan)"
+  name: "SuperLite 1500 Series - Neo Atlas II"
+  saveName: "SuperLite 1500 Series - Neo Atlas II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163926,7 +172377,8 @@ SLPM-87283:
     multitap: false
     linkCable: false
 SLPM-86632:
-  name: "SuperLite 1500 Series - Nobunaga Hiroku - Geten no Yume (Japan)"
+  name: "SuperLite 1500 Series - Nobunaga Hiroku - Geten no Yume"
+  saveName: "SuperLite 1500 Series - Nobunaga Hiroku - Geten no Yume (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -163944,7 +172396,8 @@ SLPM-86632:
     multitap: false
     linkCable: false
 SLPS-02067:
-  name: "SuperLite 1500 Series - NumCro (Japan)"
+  name: "SuperLite 1500 Series - NumCro"
+  saveName: "SuperLite 1500 Series - NumCro (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163963,7 +172416,8 @@ SLPS-02067:
     multitap: false
     linkCable: false
 SLPM-86427:
-  name: "SuperLite 1500 Series - NumCro 2 (Japan)"
+  name: "SuperLite 1500 Series - NumCro 2"
+  saveName: "SuperLite 1500 Series - NumCro 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -163982,7 +172436,8 @@ SLPM-86427:
     multitap: false
     linkCable: false
 SLPM-86534:
-  name: "SuperLite 1500 Series - NumCro 3 (Japan)"
+  name: "SuperLite 1500 Series - NumCro 3"
+  saveName: "SuperLite 1500 Series - NumCro 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164001,7 +172456,8 @@ SLPM-86534:
     multitap: false
     linkCable: false
 SLPM-86795:
-  name: "SuperLite 1500 Series - NumCro 4 (Japan)"
+  name: "SuperLite 1500 Series - NumCro 4"
+  saveName: "SuperLite 1500 Series - NumCro 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164020,7 +172476,8 @@ SLPM-86795:
     multitap: false
     linkCable: false
 SLPS-02068:
-  name: "SuperLite 1500 Series - Oekaki Puzzle (Japan)"
+  name: "SuperLite 1500 Series - Oekaki Puzzle"
+  saveName: "SuperLite 1500 Series - Oekaki Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164039,7 +172496,8 @@ SLPS-02068:
     multitap: false
     linkCable: false
 SLPM-86428:
-  name: "SuperLite 1500 Series - Oekaki Puzzle 2 (Japan)"
+  name: "SuperLite 1500 Series - Oekaki Puzzle 2"
+  saveName: "SuperLite 1500 Series - Oekaki Puzzle 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164058,7 +172516,8 @@ SLPM-86428:
     multitap: false
     linkCable: false
 SLPM-86533:
-  name: "SuperLite 1500 Series - Oekaki Puzzle 3 (Japan)"
+  name: "SuperLite 1500 Series - Oekaki Puzzle 3"
+  saveName: "SuperLite 1500 Series - Oekaki Puzzle 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164077,7 +172536,8 @@ SLPM-86533:
     multitap: false
     linkCable: false
 SLPM-86675:
-  name: "SuperLite 1500 Series - Oekaki Puzzle 4 (Japan)"
+  name: "SuperLite 1500 Series - Oekaki Puzzle 4"
+  saveName: "SuperLite 1500 Series - Oekaki Puzzle 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164096,7 +172556,8 @@ SLPM-86675:
     multitap: false
     linkCable: false
 SLPM-86800:
-  name: "SuperLite 1500 Series - Oekaki Puzzle 5 (Japan)"
+  name: "SuperLite 1500 Series - Oekaki Puzzle 5"
+  saveName: "SuperLite 1500 Series - Oekaki Puzzle 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164115,7 +172576,8 @@ SLPM-86800:
     multitap: false
     linkCable: false
 SLPM-87164:
-  name: "SuperLite 1500 Series - Option - Tuning Car Battle Spec R (Japan)"
+  name: "SuperLite 1500 Series - Option - Tuning Car Battle Spec R"
+  saveName: "SuperLite 1500 Series - Option - Tuning Car Battle Spec R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164135,7 +172597,8 @@ SLPM-87164:
     multitap: false
     linkCable: false
 SLPM-86318:
-  name: "SuperLite 1500 Series - Pachi-Slot Hisshouhou! Sammy Revolution (Japan)"
+  name: "SuperLite 1500 Series - Pachi-Slot Hisshouhou! Sammy Revolution"
+  saveName: "SuperLite 1500 Series - Pachi-Slot Hisshouhou! Sammy Revolution (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164153,7 +172616,8 @@ SLPM-86318:
     multitap: false
     linkCable: false
 SLPM-86276:
-  name: "SuperLite 1500 Series - Pangaea (Japan)"
+  name: "SuperLite 1500 Series - Pangaea"
+  saveName: "SuperLite 1500 Series - Pangaea (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164172,7 +172636,8 @@ SLPM-86276:
     multitap: true
     linkCable: false
 SLPM-87069:
-  name: "SuperLite 1500 Series - Pao Leeming Kanshuu - Fuusui Nyuumon (Japan)"
+  name: "SuperLite 1500 Series - Pao Leeming Kanshuu - Fuusui Nyuumon"
+  saveName: "SuperLite 1500 Series - Pao Leeming Kanshuu - Fuusui Nyuumon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164190,7 +172655,8 @@ SLPM-87069:
     multitap: false
     linkCable: false
 SLPM-86260:
-  name: "SuperLite 1500 Series - Pinball - Golden Logres (Japan)"
+  name: "SuperLite 1500 Series - Pinball - Golden Logres"
+  saveName: "SuperLite 1500 Series - Pinball - Golden Logres (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164209,7 +172675,8 @@ SLPM-86260:
     multitap: false
     linkCable: false
 SLPM-87194:
-  name: "SuperLite 1500 Series - Prismaticallization (Japan)"
+  name: "SuperLite 1500 Series - Prismaticallization"
+  saveName: "SuperLite 1500 Series - Prismaticallization (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164228,7 +172695,8 @@ SLPM-87194:
     multitap: false
     linkCable: false
 SLPM-86659:
-  name: "SuperLite 1500 Series - Qix 2000 (Japan)"
+  name: "SuperLite 1500 Series - Qix 2000"
+  saveName: "SuperLite 1500 Series - Qix 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164247,7 +172715,8 @@ SLPM-86659:
     multitap: false
     linkCable: false
 SLPM-86517:
-  name: "SuperLite 1500 Series - Quiz Master - Blue (Japan)"
+  name: "SuperLite 1500 Series - Quiz Master - Blue"
+  saveName: "SuperLite 1500 Series - Quiz Master - Blue (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164266,7 +172735,8 @@ SLPM-86517:
     multitap: false
     linkCable: false
 SLPM-86516:
-  name: "SuperLite 1500 Series - Quiz Master - Red (Japan)"
+  name: "SuperLite 1500 Series - Quiz Master - Red"
+  saveName: "SuperLite 1500 Series - Quiz Master - Red (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164285,7 +172755,8 @@ SLPM-86516:
     multitap: false
     linkCable: false
 SLPM-86518:
-  name: "SuperLite 1500 Series - Quiz Master - Yellow (Japan)"
+  name: "SuperLite 1500 Series - Quiz Master - Yellow"
+  saveName: "SuperLite 1500 Series - Quiz Master - Yellow (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164304,7 +172775,8 @@ SLPM-86518:
     multitap: false
     linkCable: false
 SLPM-86282:
-  name: "SuperLite 1500 Series - Reversi II (Japan)"
+  name: "SuperLite 1500 Series - Reversi II"
+  saveName: "SuperLite 1500 Series - Reversi II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164322,7 +172794,8 @@ SLPM-86282:
     multitap: false
     linkCable: false
 SLPM-86579:
-  name: "SuperLite 1500 Series - Ring of Sias (Japan)"
+  name: "SuperLite 1500 Series - Ring of Sias"
+  saveName: "SuperLite 1500 Series - Ring of Sias (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164340,7 +172813,8 @@ SLPM-86579:
     multitap: false
     linkCable: false
 SLPM-86459:
-  name: "SuperLite 1500 Series - Sanvein (Japan)"
+  name: "SuperLite 1500 Series - Sanvein"
+  saveName: "SuperLite 1500 Series - Sanvein (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164359,7 +172833,8 @@ SLPM-86459:
     multitap: false
     linkCable: false
 SLPM-86710:
-  name: "SuperLite 1500 Series - Screen (Japan)"
+  name: "SuperLite 1500 Series - Screen"
+  saveName: "SuperLite 1500 Series - Screen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164378,9 +172853,11 @@ SLPM-86710:
     multitap: false
     linkCable: false
 SLPM-86261:
-  name: "SuperLite 1500 Series - Seiyou Senseijutsu - Mark Yazaki Kanshuu (Japan)"
+  name: "SuperLite 1500 Series - Seiyou Senseijutsu - Mark Yazaki Kanshuu"
+  saveName: "SuperLite 1500 Series - Seiyou Senseijutsu - Mark Yazaki Kanshuu (Japan)"
 SLPM-86764:
-  name: "SuperLite 1500 Series - Shanghai - Dynasty (Japan)"
+  name: "SuperLite 1500 Series - Shanghai - Dynasty"
+  saveName: "SuperLite 1500 Series - Shanghai - Dynasty (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164399,9 +172876,11 @@ SLPM-86764:
     multitap: false
     linkCable: false
 SLPM-86279:
-  name: "SuperLite 1500 Series - Shichuu Suimei - Mark Yazaki Kanshuu (Japan)"
+  name: "SuperLite 1500 Series - Shichuu Suimei - Mark Yazaki Kanshuu"
+  saveName: "SuperLite 1500 Series - Shichuu Suimei - Mark Yazaki Kanshuu (Japan)"
 SLPM-86364:
-  name: "SuperLite 1500 Series - Shinsei Toilet no Hanako-san (Japan)"
+  name: "SuperLite 1500 Series - Shinsei Toilet no Hanako-san"
+  saveName: "SuperLite 1500 Series - Shinsei Toilet no Hanako-san (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164420,7 +172899,8 @@ SLPM-86364:
     multitap: false
     linkCable: false
 SLPM-86275:
-  name: "SuperLite 1500 Series - Shougi II (Japan)"
+  name: "SuperLite 1500 Series - Shougi II"
+  saveName: "SuperLite 1500 Series - Shougi II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164439,7 +172919,8 @@ SLPM-86275:
     multitap: false
     linkCable: false
 SLPM-86839:
-  name: "SuperLite 1500 Series - Slither Link (Japan)"
+  name: "SuperLite 1500 Series - Slither Link"
+  saveName: "SuperLite 1500 Series - Slither Link (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164457,7 +172938,8 @@ SLPM-86839:
     multitap: false
     linkCable: false
 SLPM-86661:
-  name: "SuperLite 1500 Series - Space Chaser 2000 (Japan)"
+  name: "SuperLite 1500 Series - Space Chaser 2000"
+  saveName: "SuperLite 1500 Series - Space Chaser 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164476,7 +172958,8 @@ SLPM-86661:
     multitap: false
     linkCable: false
 SLPM-86440:
-  name: "SuperLite 1500 Series - StarSweep (Japan)"
+  name: "SuperLite 1500 Series - StarSweep"
+  saveName: "SuperLite 1500 Series - StarSweep (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164494,7 +172977,8 @@ SLPM-86440:
     multitap: false
     linkCable: false
 SLPM-86631:
-  name: "SuperLite 1500 Series - Strikers 1945 II (Japan)"
+  name: "SuperLite 1500 Series - Strikers 1945 II"
+  saveName: "SuperLite 1500 Series - Strikers 1945 II (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164513,7 +172997,8 @@ SLPM-86631:
     multitap: false
     linkCable: false
 SLPM-86365:
-  name: "SuperLite 1500 Series - Super Casino Special (Japan)"
+  name: "SuperLite 1500 Series - Super Casino Special"
+  saveName: "SuperLite 1500 Series - Super Casino Special (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164531,7 +173016,8 @@ SLPM-86365:
     multitap: true
     linkCable: false
 SLPS-02066:
-  name: "SuperLite 1500 Series - Suudoku (Japan)"
+  name: "SuperLite 1500 Series - Suudoku"
+  saveName: "SuperLite 1500 Series - Suudoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164550,7 +173036,8 @@ SLPS-02066:
     multitap: false
     linkCable: false
 SLPM-86425:
-  name: "SuperLite 1500 Series - Suudoku 2 (Japan)"
+  name: "SuperLite 1500 Series - Suudoku 2"
+  saveName: "SuperLite 1500 Series - Suudoku 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164568,7 +173055,8 @@ SLPM-86425:
     multitap: false
     linkCable: false
 SLPM-86536:
-  name: "SuperLite 1500 Series - Suudoku 3 (Japan)"
+  name: "SuperLite 1500 Series - Suudoku 3"
+  saveName: "SuperLite 1500 Series - Suudoku 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164586,7 +173074,8 @@ SLPM-86536:
     multitap: false
     linkCable: false
 SLPM-86676:
-  name: "SuperLite 1500 Series - Suudoku 4 (Japan)"
+  name: "SuperLite 1500 Series - Suudoku 4"
+  saveName: "SuperLite 1500 Series - Suudoku 4 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164604,7 +173093,8 @@ SLPM-86676:
     multitap: false
     linkCable: false
 SLPM-86741:
-  name: "SuperLite 1500 Series - Suudoku 5 (Japan)"
+  name: "SuperLite 1500 Series - Suudoku 5"
+  saveName: "SuperLite 1500 Series - Suudoku 5 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164622,7 +173112,8 @@ SLPM-86741:
     multitap: false
     linkCable: false
 SLPM-86240:
-  name: "SuperLite 1500 Series - Tenant Wars Alpha - SuperLite 1500 Version (Japan)"
+  name: "SuperLite 1500 Series - Tenant Wars Alpha - SuperLite 1500 Version"
+  saveName: "SuperLite 1500 Series - Tenant Wars Alpha - SuperLite 1500 Version (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164640,7 +173131,8 @@ SLPM-86240:
     multitap: true
     linkCable: false
 SLPM-86237:
-  name: "SuperLite 1500 Series - The Curling (Japan)"
+  name: "SuperLite 1500 Series - The Curling"
+  saveName: "SuperLite 1500 Series - The Curling (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164658,7 +173150,8 @@ SLPM-86237:
     multitap: false
     linkCable: false
 SLPM-87253:
-  name: "SuperLite 1500 Series - The FamiRes (Japan)"
+  name: "SuperLite 1500 Series - The FamiRes"
+  saveName: "SuperLite 1500 Series - The FamiRes (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164676,7 +173169,8 @@ SLPM-87253:
     multitap: false
     linkCable: false
 SLPM-86441:
-  name: "SuperLite 1500 Series - The Game Maker (Japan)"
+  name: "SuperLite 1500 Series - The Game Maker"
+  saveName: "SuperLite 1500 Series - The Game Maker (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164694,7 +173188,8 @@ SLPM-86441:
     multitap: false
     linkCable: false
 SLPM-86581:
-  name: "SuperLite 1500 Series - The Tetris (Japan)"
+  name: "SuperLite 1500 Series - The Tetris"
+  saveName: "SuperLite 1500 Series - The Tetris (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164713,7 +173208,8 @@ SLPM-86581:
     multitap: false
     linkCable: false
 SLPM-86442:
-  name: "SuperLite 1500 Series - Tower Dream 2 (Japan)"
+  name: "SuperLite 1500 Series - Tower Dream 2"
+  saveName: "SuperLite 1500 Series - Tower Dream 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164731,7 +173227,8 @@ SLPM-86442:
     multitap: true
     linkCable: false
 SLPM-86401:
-  name: "SuperLite 1500 Series - Uno (Japan)"
+  name: "SuperLite 1500 Series - Uno"
+  saveName: "SuperLite 1500 Series - Uno (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164749,7 +173246,8 @@ SLPM-86401:
     multitap: false
     linkCable: false
 SLPM-87189:
-  name: "SuperLite 1500 Series - Wizard's Harmony (Japan)"
+  name: "SuperLite 1500 Series - Wizard's Harmony"
+  saveName: "SuperLite 1500 Series - Wizard's Harmony (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164767,7 +173265,8 @@ SLPM-87189:
     multitap: false
     linkCable: false
 SLPM-87188:
-  name: "SuperLite 1500 Series - Wizard's Harmony 2 (Japan)"
+  name: "SuperLite 1500 Series - Wizard's Harmony 2"
+  saveName: "SuperLite 1500 Series - Wizard's Harmony 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164785,7 +173284,8 @@ SLPM-87188:
     multitap: false
     linkCable: false
 SLPM-87190:
-  name: "SuperLite 1500 Series - Wizard's Harmony R (Japan)"
+  name: "SuperLite 1500 Series - Wizard's Harmony R"
+  saveName: "SuperLite 1500 Series - Wizard's Harmony R (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164803,7 +173303,8 @@ SLPM-87190:
     multitap: false
     linkCable: false
 SLPM-86633:
-  name: "SuperLite 1500 Series - Yoshimoto Mahjong Club Deluxe (Japan)"
+  name: "SuperLite 1500 Series - Yoshimoto Mahjong Club Deluxe"
+  saveName: "SuperLite 1500 Series - Yoshimoto Mahjong Club Deluxe (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164821,7 +173322,8 @@ SLPM-86633:
     multitap: false
     linkCable: false
 SLPM-86984:
-  name: "SuperLite 3in1 Series - Arcade Classic-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Arcade Classic-shuu"
+  saveName: "SuperLite 3in1 Series - Arcade Classic-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164840,7 +173342,8 @@ SLPM-86984:
     multitap: false
     linkCable: false
 SLPM-86982:
-  name: "SuperLite 3in1 Series - Board Game-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Board Game-shuu"
+  saveName: "SuperLite 3in1 Series - Board Game-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164859,7 +173362,8 @@ SLPM-86982:
     multitap: false
     linkCable: false
 SLPM-86983:
-  name: "SuperLite 3in1 Series - Card Game-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Card Game-shuu"
+  saveName: "SuperLite 3in1 Series - Card Game-shuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164877,7 +173381,8 @@ SLPM-86983:
     multitap: false
     linkCable: false
 SLPM-86954:
-  name: "SuperLite 3in1 Series - Crossword-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Crossword-shuu"
+  saveName: "SuperLite 3in1 Series - Crossword-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164896,7 +173401,8 @@ SLPM-86954:
     multitap: false
     linkCable: false
 SLPM-86957:
-  name: "SuperLite 3in1 Series - NumCro-shuu (Japan)"
+  name: "SuperLite 3in1 Series - NumCro-shuu"
+  saveName: "SuperLite 3in1 Series - NumCro-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164915,7 +173421,8 @@ SLPM-86957:
     multitap: false
     linkCable: false
 SLPM-86955:
-  name: "SuperLite 3in1 Series - Oekaki Puzzle-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Oekaki Puzzle-shuu"
+  saveName: "SuperLite 3in1 Series - Oekaki Puzzle-shuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164933,7 +173440,8 @@ SLPM-86955:
     multitap: false
     linkCable: false
 SLPM-86987:
-  name: "SuperLite 3in1 Series - Quiz-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Quiz-shuu"
+  saveName: "SuperLite 3in1 Series - Quiz-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164952,7 +173460,8 @@ SLPM-86987:
     multitap: false
     linkCable: false
 SLPM-86956:
-  name: "SuperLite 3in1 Series - Suudoku-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Suudoku-shuu"
+  saveName: "SuperLite 3in1 Series - Suudoku-shuu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -164970,7 +173479,8 @@ SLPM-86956:
     multitap: false
     linkCable: false
 SLPM-86981:
-  name: "SuperLite 3in1 Series - Tsuri-shuu (Japan)"
+  name: "SuperLite 3in1 Series - Tsuri-shuu"
+  saveName: "SuperLite 3in1 Series - Tsuri-shuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -164989,7 +173499,8 @@ SLPM-86981:
     multitap: false
     linkCable: false
 SLPM-86958:
-  name: "SuperLite Gold Series - Minna no Chess (Japan)"
+  name: "SuperLite Gold Series - Minna no Chess"
+  saveName: "SuperLite Gold Series - Minna no Chess (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165007,7 +173518,8 @@ SLPM-86958:
     multitap: false
     linkCable: false
 SLPM-86921:
-  name: "SuperLite Gold Series - Minna no Igo (Japan)"
+  name: "SuperLite Gold Series - Minna no Igo"
+  saveName: "SuperLite Gold Series - Minna no Igo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165025,7 +173537,8 @@ SLPM-86921:
     multitap: false
     linkCable: false
 SLPM-86799:
-  name: "SuperLite Gold Series - Minna no Mahjong (Japan)"
+  name: "SuperLite Gold Series - Minna no Mahjong"
+  saveName: "SuperLite Gold Series - Minna no Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165044,7 +173557,8 @@ SLPM-86799:
     multitap: true
     linkCable: false
 SLPM-86919:
-  name: "SuperLite Gold Series - Minna no Othello (Japan)"
+  name: "SuperLite Gold Series - Minna no Othello"
+  saveName: "SuperLite Gold Series - Minna no Othello (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165062,7 +173576,8 @@ SLPM-86919:
     multitap: false
     linkCable: false
 SLPM-87009:
-  name: "SuperLite Gold Series - Minna no Shougi - Chuukyuu-hen (Japan)"
+  name: "SuperLite Gold Series - Minna no Shougi - Chuukyuu-hen"
+  saveName: "SuperLite Gold Series - Minna no Shougi - Chuukyuu-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165080,7 +173595,8 @@ SLPM-87009:
     multitap: false
     linkCable: false
 SLPM-87010:
-  name: "SuperLite Gold Series - Minna no Shougi - Joukyuu-hen (Japan)"
+  name: "SuperLite Gold Series - Minna no Shougi - Joukyuu-hen"
+  saveName: "SuperLite Gold Series - Minna no Shougi - Joukyuu-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165098,7 +173614,8 @@ SLPM-87010:
     multitap: false
     linkCable: false
 SLPM-86920:
-  name: "SuperLite Gold Series - Minna no Shougi - Shokyuu-hen (Japan)"
+  name: "SuperLite Gold Series - Minna no Shougi - Shokyuu-hen"
+  saveName: "SuperLite Gold Series - Minna no Shougi - Shokyuu-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165116,7 +173633,8 @@ SLPM-86920:
     multitap: false
     linkCable: false
 SLPM-86819:
-  name: "SuperLite Gold Series - Otenami Haiken (Japan)"
+  name: "SuperLite Gold Series - Otenami Haiken"
+  saveName: "SuperLite Gold Series - Otenami Haiken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165134,7 +173652,8 @@ SLPM-86819:
     multitap: false
     linkCable: false
 SLPM-87037:
-  name: "SuperLite Gold Series - Wizardry - Llylgamyn Saga (Japan)"
+  name: "SuperLite Gold Series - Wizardry - Llylgamyn Saga"
+  saveName: "SuperLite Gold Series - Wizardry - Llylgamyn Saga (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165153,7 +173672,8 @@ SLPM-87037:
     multitap: false
     linkCable: false
 SLPM-86878:
-  name: "SuperLite Gold Series - Wizardry - New Age of Llylgamyn (Japan)"
+  name: "SuperLite Gold Series - Wizardry - New Age of Llylgamyn"
+  saveName: "SuperLite Gold Series - Wizardry - New Age of Llylgamyn (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165173,7 +173693,8 @@ SLPM-86878:
     multitap: false
     linkCable: false
 SLES-04154:
-  name: "Superbike Masters (Europe)"
+  name: "Superbike Masters"
+  saveName: "Superbike Masters (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165193,7 +173714,8 @@ SLES-04154:
     multitap: false
     linkCable: false
 SLES-00080:
-  name: "Supersonic Racers (Europe) (En,Fr,De,Es,It)"
+  name: "Supersonic Racers"
+  saveName: "Supersonic Racers (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - NeGcon
@@ -165216,7 +173738,8 @@ SLES-00080:
     multitap: true
     linkCable: false
 SLES-04088:
-  name: "Superstar Dance Club - 1 Hits!!! (Europe) (En,Fr,De,Es,It)"
+  name: "Superstar Dance Club - 1 Hits!!!"
+  saveName: "Superstar Dance Club - 1 Hits!!! (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165235,7 +173758,8 @@ SLES-04088:
     multitap: false
     linkCable: false
 SLUS-01493:
-  name: "Superstar Dance Club - 1 Hits!!! (USA)"
+  name: "Superstar Dance Club - 1 Hits!!!"
+  saveName: "Superstar Dance Club - 1 Hits!!! (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165254,7 +173778,8 @@ SLUS-01493:
     multitap: false
     linkCable: false
 SLES-02838:
-  name: "Surf Riders (Europe)"
+  name: "Surf Riders"
+  saveName: "Surf Riders (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165273,7 +173798,8 @@ SLES-02838:
     multitap: false
     linkCable: false
 SLUS-01190:
-  name: "Surf Riders (USA)"
+  name: "Surf Riders"
+  saveName: "Surf Riders (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165292,7 +173818,8 @@ SLUS-01190:
     multitap: false
     linkCable: false
 SLPS-01737:
-  name: "Susume! Kaizoku - Be Pirates! (Japan)"
+  name: "Susume! Kaizoku - Be Pirates!"
+  saveName: "Susume! Kaizoku - Be Pirates! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165311,7 +173838,8 @@ SLPS-01737:
     multitap: false
     linkCable: false
 SLPM-80367:
-  name: "Susume! Kaizoku - Be Pirates! (Japan) (Demo)"
+  name: "Susume! Kaizoku - Be Pirates! (Demo)"
+  saveName: "Susume! Kaizoku - Be Pirates! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02467:
@@ -165334,7 +173862,8 @@ SLPS-02467:
     multitap: false
     linkCable: false
 SLPS-00255:
-  name: "Susume! Taisen Puzzle-dama (Japan)"
+  name: "Susume! Taisen Puzzle-dama"
+  saveName: "Susume! Taisen Puzzle-dama (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -165370,7 +173899,8 @@ SLPM-86074:
     multitap: false
     linkCable: false
 SLPS-02730:
-  name: "Suzu Monogatari (Japan)"
+  name: "Suzu Monogatari"
+  saveName: "Suzu Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165389,7 +173919,8 @@ SLPS-02730:
     multitap: false
     linkCable: false
 SLES-02221:
-  name: "Suzuki Alstare Challenge (France)"
+  name: "Suzuki Alstare Challenge"
+  saveName: "Suzuki Alstare Challenge (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165409,7 +173940,8 @@ SLES-02221:
     multitap: false
     linkCable: false
 SLPM-86513:
-  name: "Suzuki Bakuhatsu (Japan)"
+  name: "Suzuki Bakuhatsu"
+  saveName: "Suzuki Bakuhatsu (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -165430,7 +173962,8 @@ SLPM-86513:
     multitap: false
     linkCable: false
 SLES-03867:
-  name: "Sven-Goeran Eriksson's World Challenge (Europe)"
+  name: "Sven-Goeran Eriksson's World Challenge"
+  saveName: "Sven-Goeran Eriksson's World Challenge (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -165448,7 +173981,8 @@ SLES-03867:
     multitap: false
     linkCable: false
 SLES-03826:
-  name: "Sven-Goeran Eriksson's World Manager (Europe)"
+  name: "Sven-Goeran Eriksson's World Manager"
+  saveName: "Sven-Goeran Eriksson's World Manager (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165467,7 +174001,8 @@ SLES-03826:
     multitap: false
     linkCable: false
 SLES-00025:
-  name: "Swagman (Europe) (En,Fr,De)"
+  name: "Swagman"
+  saveName: "Swagman (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -165487,11 +174022,13 @@ SLES-00025:
     multitap: false
     linkCable: false
 SLED-00665:
-  name: "Swagman (Europe) (En,Fr,De) (Demo)"
+  name: "Swagman (Demo)"
+  saveName: "Swagman (Europe) (En,Fr,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00151:
-  name: "Swagman (USA)"
+  name: "Swagman"
+  saveName: "Swagman (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -165512,7 +174049,8 @@ SLUS-00151:
     multitap: false
     linkCable: false
 SLES-02032:
-  name: "Swing (Europe) (En,Fr,De)"
+  name: "Swing"
+  saveName: "Swing (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165533,7 +174071,8 @@ SLES-02032:
     multitap: false
     linkCable: false
 SLES-01626:
-  name: "Swing (Germany)"
+  name: "Swing"
+  saveName: "Swing (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165552,7 +174091,8 @@ SLES-01626:
     multitap: false
     linkCable: false
 SLES-02956:
-  name: "Sword of Camelot, The (Europe) (En,Fr,De,Nl)"
+  name: "Sword of Camelot, The"
+  saveName: "Sword of Camelot, The (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165574,10 +174114,12 @@ SLES-02956:
     multitap: false
     linkCable: false
 SLES-02862:
-  name: "Sydney 2000 (Australia)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (Australia)"
   libcrypt: true
 SLES-02857:
-  name: "Sydney 2000 (Europe)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165597,7 +174139,8 @@ SLES-02857:
     multitap: true
     linkCable: false
 SLES-02858:
-  name: "Sydney 2000 (France)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165617,7 +174160,8 @@ SLES-02858:
     multitap: true
     linkCable: false
 SLES-02859:
-  name: "Sydney 2000 (Germany)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165637,7 +174181,8 @@ SLES-02859:
     multitap: true
     linkCable: false
 SLES-02860:
-  name: "Sydney 2000 (Italy)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165657,7 +174202,8 @@ SLES-02860:
     multitap: true
     linkCable: false
 SLPM-86626:
-  name: "Sydney 2000 (Japan)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165676,7 +174222,8 @@ SLPM-86626:
     multitap: true
     linkCable: false
 SLES-02861:
-  name: "Sydney 2000 (Spain)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -165696,7 +174243,8 @@ SLES-02861:
     multitap: true
     linkCable: false
 SLUS-01177:
-  name: "Sydney 2000 (USA)"
+  name: "Sydney 2000"
+  saveName: "Sydney 2000 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -165718,7 +174266,8 @@ SLUS-01177:
     multitap: true
     linkCable: false
 SLES-00213:
-  name: "Syndicate Wars (Europe) (En,Fr,Es,It,Sv)"
+  name: "Syndicate Wars"
+  saveName: "Syndicate Wars (Europe) (En,Fr,Es,It,Sv)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -165741,7 +174290,8 @@ SLES-00213:
     multitap: true
     linkCable: false
 SLES-00212:
-  name: "Syndicate Wars (Germany)"
+  name: "Syndicate Wars"
+  saveName: "Syndicate Wars (Germany)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -165760,7 +174310,8 @@ SLES-00212:
     multitap: true
     linkCable: false
 SLUS-00262:
-  name: "Syndicate Wars (USA)"
+  name: "Syndicate Wars"
+  saveName: "Syndicate Wars (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -165782,7 +174333,8 @@ SLUS-00262:
     multitap: true
     linkCable: false
 SCES-01910:
-  name: "Syphon Filter (Europe)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
@@ -165805,7 +174357,8 @@ SCES-01910:
     multitap: false
     linkCable: false
 SCES-01911:
-  name: "Syphon Filter (France)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -165825,7 +174378,8 @@ SCES-01911:
     multitap: false
     linkCable: false
 SCES-01912:
-  name: "Syphon Filter (Germany)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -165845,7 +174399,8 @@ SCES-01912:
     multitap: false
     linkCable: false
 SCES-01913:
-  name: "Syphon Filter (Italy)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (Italy)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -165865,7 +174420,8 @@ SCES-01913:
     multitap: false
     linkCable: false
 SLPS-02216:
-  name: "Syphon Filter (Japan)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -165888,11 +174444,13 @@ SLPS-02216:
     multitap: false
     linkCable: false
 SLPM-80448:
-  name: "Syphon Filter (Japan) (Demo)"
+  name: "Syphon Filter (Demo)"
+  saveName: "Syphon Filter (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01914:
-  name: "Syphon Filter (Spain)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -165915,7 +174473,8 @@ SCES-01914:
     multitap: false
     linkCable: false
 SCUS-94240:
-  name: "Syphon Filter (USA)"
+  name: "Syphon Filter"
+  saveName: "Syphon Filter (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -165938,11 +174497,13 @@ SCUS-94240:
     multitap: false
     linkCable: false
 SCUS-94362:
-  name: "Syphon Filter (USA) (Demo)"
+  name: "Syphon Filter (Demo)"
+  saveName: "Syphon Filter (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02285:
-  name: "Syphon Filter 2 (Europe) (Disc 1)"
+  name: "Syphon Filter 2 (Disc 1)"
+  saveName: "Syphon Filter 2 (Europe) (Disc 1)"
   discSet:
     name: "Syphon Filter 2 (Europe)"
     serials:
@@ -165967,7 +174528,8 @@ SCES-02285:
     multitap: false
     linkCable: false
 SCES-12285:
-  name: "Syphon Filter 2 (Europe) (Disc 2)"
+  name: "Syphon Filter 2 (Disc 2)"
+  saveName: "Syphon Filter 2 (Europe) (Disc 2)"
   discSet:
     name: "Syphon Filter 2 (Europe)"
     serials:
@@ -165992,7 +174554,8 @@ SCES-12285:
     multitap: false
     linkCable: false
 SCES-02286:
-  name: "Syphon Filter 2 (France) (Disc 1)"
+  name: "Syphon Filter 2 (Disc 1)"
+  saveName: "Syphon Filter 2 (France) (Disc 1)"
   discSet:
     name: "Syphon Filter 2 (France)"
     serials:
@@ -166017,7 +174580,8 @@ SCES-02286:
     multitap: false
     linkCable: false
 SCES-12286:
-  name: "Syphon Filter 2 (France) (Disc 2)"
+  name: "Syphon Filter 2 (Disc 2)"
+  saveName: "Syphon Filter 2 (France) (Disc 2)"
   discSet:
     name: "Syphon Filter 2 (France)"
     serials:
@@ -166042,7 +174606,8 @@ SCES-12286:
     multitap: false
     linkCable: false
 SCES-02287:
-  name: "Syphon Filter 2 (Germany) (Disc 1)"
+  name: "Syphon Filter 2 (Disc 1)"
+  saveName: "Syphon Filter 2 (Germany) (Disc 1)"
   discSet:
     name: "Syphon Filter 2 (Germany)"
     serials:
@@ -166067,7 +174632,8 @@ SCES-02287:
     multitap: false
     linkCable: false
 SCES-12287:
-  name: "Syphon Filter 2 (Germany) (Disc 2)"
+  name: "Syphon Filter 2 (Disc 2)"
+  saveName: "Syphon Filter 2 (Germany) (Disc 2)"
   discSet:
     name: "Syphon Filter 2 (Germany)"
     serials:
@@ -166092,7 +174658,8 @@ SCES-12287:
     multitap: false
     linkCable: false
 SCES-02288:
-  name: "Syphon Filter 2 (Italy) (Disc 1)"
+  name: "Syphon Filter 2 (Disc 1)"
+  saveName: "Syphon Filter 2 (Italy) (Disc 1)"
   discSet:
     name: "Syphon Filter 2 (Italy)"
     serials:
@@ -166117,7 +174684,8 @@ SCES-02288:
     multitap: false
     linkCable: false
 SCES-12288:
-  name: "Syphon Filter 2 (Italy) (Disc 2)"
+  name: "Syphon Filter 2 (Disc 2)"
+  saveName: "Syphon Filter 2 (Italy) (Disc 2)"
   discSet:
     name: "Syphon Filter 2 (Italy)"
     serials:
@@ -166142,11 +174710,13 @@ SCES-12288:
     multitap: false
     linkCable: false
 SCUS-94393:
-  name: "Syphon Filter 2 (USA) (Demo)"
+  name: "Syphon Filter 2 (Demo)"
+  saveName: "Syphon Filter 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94451:
-  name: "Syphon Filter 2 (USA) (Disc 1)"
+  name: "Syphon Filter 2 (Disc 1)"
+  saveName: "Syphon Filter 2 (USA) (Disc 1)"
   discSet:
     name: "Syphon Filter 2 (USA)"
     serials:
@@ -166175,7 +174745,8 @@ SCUS-94451:
     multitap: false
     linkCable: false
 SCUS-94492:
-  name: "Syphon Filter 2 (USA) (Disc 2)"
+  name: "Syphon Filter 2 (Disc 2)"
+  saveName: "Syphon Filter 2 (USA) (Disc 2)"
   discSet:
     name: "Syphon Filter 2 (USA)"
     serials:
@@ -166204,7 +174775,8 @@ SCUS-94492:
     multitap: false
     linkCable: false
 PSRM-017100:
-  name: "Syphon Filter 2 (USA) (Disc 2) (Beta)"
+  name: "Syphon Filter 2 (Disc 2) (Beta)"
+  saveName: "Syphon Filter 2 (USA) (Disc 2) (Beta)"
   discSet:
     name: "Syphon Filter 2 (USA)"
     serials:
@@ -166212,7 +174784,8 @@ PSRM-017100:
       - SCUS-94492
       - PSRM-017100
 SCES-02289:
-  name: "Syphon Filter 2 - Conspiracion Mortal (Spain) (Disc 1)"
+  name: "Syphon Filter 2 - Conspiracion Mortal (Disc 1)"
+  saveName: "Syphon Filter 2 - Conspiracion Mortal (Spain) (Disc 1)"
   discSet:
     name: "Syphon Filter 2 - Conspiracion Mortal (Spain)"
     serials:
@@ -166240,7 +174813,8 @@ SCES-02289:
     multitap: false
     linkCable: false
 SCES-12289:
-  name: "Syphon Filter 2 - Conspiracion Mortal (Spain) (Disc 2)"
+  name: "Syphon Filter 2 - Conspiracion Mortal (Disc 2)"
+  saveName: "Syphon Filter 2 - Conspiracion Mortal (Spain) (Disc 2)"
   discSet:
     name: "Syphon Filter 2 - Conspiracion Mortal (Spain)"
     serials:
@@ -166268,7 +174842,8 @@ SCES-12289:
     multitap: false
     linkCable: false
 SCES-03697:
-  name: "Syphon Filter 3 (Europe)"
+  name: "Syphon Filter 3"
+  saveName: "Syphon Filter 3 (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -166290,7 +174865,8 @@ SCES-03697:
     multitap: false
     linkCable: false
 SCES-03698:
-  name: "Syphon Filter 3 (France)"
+  name: "Syphon Filter 3"
+  saveName: "Syphon Filter 3 (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -166312,7 +174888,8 @@ SCES-03698:
     multitap: false
     linkCable: false
 SCES-03699:
-  name: "Syphon Filter 3 (Germany)"
+  name: "Syphon Filter 3"
+  saveName: "Syphon Filter 3 (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -166334,7 +174911,8 @@ SCES-03699:
     multitap: false
     linkCable: false
 SCES-03700:
-  name: "Syphon Filter 3 (Italy)"
+  name: "Syphon Filter 3"
+  saveName: "Syphon Filter 3 (Italy)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -166356,7 +174934,8 @@ SCES-03700:
     multitap: false
     linkCable: false
 SCUS-94640:
-  name: "Syphon Filter 3 (USA)"
+  name: "Syphon Filter 3"
+  saveName: "Syphon Filter 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -166381,13 +174960,15 @@ SCUS-94640:
     multitap: false
     linkCable: false
 SCUS-94661:
-  name: "Syphon Filter 3 (USA) (Demo)"
+  name: "Syphon Filter 3 (Demo)"
+  saveName: "Syphon Filter 3 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - ForcePGXPVertexCache
 SCES-03701:
-  name: "Syphon Filter 3 - Sentencia Final (Spain)"
+  name: "Syphon Filter 3 - Sentencia Final"
+  saveName: "Syphon Filter 3 - Sentencia Final (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -166412,7 +174993,8 @@ SCES-03701:
     multitap: false
     linkCable: false
 SCED-03780:
-  name: "Syphon Filter 3 - Sentencia Final (Spain) (Demo)"
+  name: "Syphon Filter 3 - Sentencia Final (Demo)"
+  saveName: "Syphon Filter 3 - Sentencia Final (Spain) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -166436,7 +175018,8 @@ SLPM-87041:
     multitap: false
     linkCable: false
 SLPS-01350:
-  name: "T kara Hajimaru Monogatari (Japan)"
+  name: "T kara Hajimaru Monogatari"
+  saveName: "T kara Hajimaru Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166455,7 +175038,8 @@ SLPS-01350:
     multitap: false
     linkCable: false
 SLES-01473:
-  name: "T'ai Fu - Die Rache des Tigers (Germany)"
+  name: "T'ai Fu - Die Rache des Tigers"
+  saveName: "T'ai Fu - Die Rache des Tigers (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166474,7 +175058,8 @@ SLES-01473:
     multitap: false
     linkCable: false
 SLES-01460:
-  name: "T'ai Fu - Wrath of the Tiger (Europe)"
+  name: "T'ai Fu - Wrath of the Tiger"
+  saveName: "T'ai Fu - Wrath of the Tiger (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166493,11 +175078,13 @@ SLES-01460:
     multitap: false
     linkCable: false
 SLED-01609:
-  name: "T'ai Fu - Wrath of the Tiger (Europe) (Demo)"
+  name: "T'ai Fu - Wrath of the Tiger (Demo)"
+  saveName: "T'ai Fu - Wrath of the Tiger (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01472:
-  name: "T'ai Fu - Wrath of the Tiger (France)"
+  name: "T'ai Fu - Wrath of the Tiger"
+  saveName: "T'ai Fu - Wrath of the Tiger (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166516,7 +175103,8 @@ SLES-01472:
     multitap: false
     linkCable: false
 SLES-01474:
-  name: "T'ai Fu - Wrath of the Tiger (Italy)"
+  name: "T'ai Fu - Wrath of the Tiger"
+  saveName: "T'ai Fu - Wrath of the Tiger (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166535,7 +175123,8 @@ SLES-01474:
     multitap: false
     linkCable: false
 SLUS-00787:
-  name: "T'ai Fu - Wrath of the Tiger (USA)"
+  name: "T'ai Fu - Wrath of the Tiger"
+  saveName: "T'ai Fu - Wrath of the Tiger (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -166557,7 +175146,8 @@ SLUS-00787:
     multitap: false
     linkCable: false
 SLUS-00813:
-  name: "T.R.A.G. - Mission of Mercy (USA)"
+  name: "T.R.A.G. - Mission of Mercy"
+  saveName: "T.R.A.G. - Mission of Mercy (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -166581,7 +175171,8 @@ SLUS-00813:
     multitap: false
     linkCable: false
 SLPS-00510:
-  name: "TFX - Tactical Fighter eXperiment (Japan)"
+  name: "TFX - Tactical Fighter eXperiment"
+  saveName: "TFX - Tactical Fighter eXperiment (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166603,7 +175194,8 @@ SLPS-00510:
     multitap: false
     linkCable: false
 SLPS-00123:
-  name: "TIZ - Tokyo Insect Zoo (Japan)"
+  name: "TIZ - Tokyo Insect Zoo"
+  saveName: "TIZ - Tokyo Insect Zoo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -166621,7 +175213,8 @@ SLPS-00123:
     multitap: false
     linkCable: false
 SLPM-80016:
-  name: "TIZ - Tokyo Insect Zoo (Japan) (Demo)"
+  name: "TIZ - Tokyo Insect Zoo (Demo)"
+  saveName: "TIZ - Tokyo Insect Zoo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
@@ -166630,7 +175223,8 @@ SLPM-80016:
     - SLPM-80025
     - SLPM-80026
 SLUS-00089:
-  name: "TNN Motor Sports HardCore 4X4 (USA)"
+  name: "TNN Motor Sports HardCore 4X4"
+  saveName: "TNN Motor Sports HardCore 4X4 (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -166649,7 +175243,8 @@ SLUS-00089:
     multitap: false
     linkCable: false
 SLUS-00980:
-  name: "TNN Motorsports HardCore TR (USA)"
+  name: "TNN Motorsports HardCore TR"
+  saveName: "TNN Motorsports HardCore TR (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166669,7 +175264,8 @@ SLUS-00980:
     multitap: false
     linkCable: false
 SLUS-00996:
-  name: "TOCA 2 - Touring Car Challenge (USA) (En,Fr,Es)"
+  name: "TOCA 2 - Touring Car Challenge"
+  saveName: "TOCA 2 - Touring Car Challenge (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166691,7 +175287,8 @@ SLUS-00996:
     multitap: false
     linkCable: true
 SLES-01542:
-  name: "TOCA 2 Touring Cars (Europe) (En,Fr,De)"
+  name: "TOCA 2 Touring Cars"
+  saveName: "TOCA 2 Touring Cars (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166713,7 +175310,8 @@ SLES-01542:
     multitap: false
     linkCable: true
 SLES-01547:
-  name: "TOCA 2 Touring Cars (Europe) (Es,It)"
+  name: "TOCA 2 Touring Cars"
+  saveName: "TOCA 2 Touring Cars (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166734,7 +175332,8 @@ SLES-01547:
     multitap: false
     linkCable: true
 SLUS-00611:
-  name: "TOCA Championship Racing (USA) (En,Es)"
+  name: "TOCA Championship Racing"
+  saveName: "TOCA Championship Racing (USA) (En,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166754,7 +175353,8 @@ SLUS-00611:
     multitap: false
     linkCable: false
 SLES-00376:
-  name: "TOCA Touring Car Championship (Europe) (En,Fr,De,Es,It)"
+  name: "TOCA Touring Car Championship"
+  saveName: "TOCA Touring Car Championship (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166774,7 +175374,8 @@ SLES-00376:
     multitap: false
     linkCable: false
 SLPS-01410:
-  name: "TOCA Touring Car Championship (Japan)"
+  name: "TOCA Touring Car Championship"
+  saveName: "TOCA Touring Car Championship (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166794,7 +175395,8 @@ SLPS-01410:
     multitap: false
     linkCable: false
 SLES-02572:
-  name: "TOCA World Touring Cars (Europe) (En,Fr,De)"
+  name: "TOCA World Touring Cars"
+  saveName: "TOCA World Touring Cars (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166817,7 +175419,8 @@ SLES-02572:
     multitap: true
     linkCable: false
 SLES-02573:
-  name: "TOCA World Touring Cars (Europe) (Es,It)"
+  name: "TOCA World Touring Cars"
+  saveName: "TOCA World Touring Cars (Europe) (Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166839,7 +175442,8 @@ SLES-02573:
     multitap: true
     linkCable: false
 SLPS-02626:
-  name: "TRL - The Rail Loaders (Japan)"
+  name: "TRL - The Rail Loaders"
+  saveName: "TRL - The Rail Loaders (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166858,7 +175462,8 @@ SLPS-02626:
     multitap: false
     linkCable: false
 SLPS-03459:
-  name: "TV Animation X - Unmei no Sentaku (Japan)"
+  name: "TV Animation X - Unmei no Sentaku"
+  saveName: "TV Animation X - Unmei no Sentaku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166877,7 +175482,8 @@ SLPS-03459:
     multitap: false
     linkCable: false
 SLPS-02181:
-  name: "Tactical Armor Custom Gasaraki (Japan)"
+  name: "Tactical Armor Custom Gasaraki"
+  saveName: "Tactical Armor Custom Gasaraki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -166896,7 +175502,8 @@ SLPS-02181:
     multitap: false
     linkCable: false
 SLUS-00560:
-  name: "Tactics Ogre (USA)"
+  name: "Tactics Ogre"
+  saveName: "Tactics Ogre (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -166932,7 +175539,8 @@ SLPS-00767:
     multitap: false
     linkCable: false
 SLPS-02524:
-  name: "Tactics Ogre - Let Us Cling Together (Japan)"
+  name: "Tactics Ogre - Let Us Cling Together"
+  saveName: "Tactics Ogre - Let Us Cling Together (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -166950,7 +175558,8 @@ SLPS-02524:
     multitap: false
     linkCable: false
 SLPS-00116:
-  name: "Tadaima Wakusei Kaitaku-chuu! (Japan)"
+  name: "Tadaima Wakusei Kaitaku-chuu!"
+  saveName: "Tadaima Wakusei Kaitaku-chuu! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -166968,7 +175577,8 @@ SLPS-00116:
     multitap: false
     linkCable: false
 SLPM-86782:
-  name: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 1)"
+  name: "Taiho Shichau zo - You're Under Arrest (Disc 1)"
+  saveName: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 1)"
   discSet:
     name: "Taiho Shichau zo - You're Under Arrest (Japan)"
     serials:
@@ -166977,21 +175587,24 @@ SLPM-86782:
   compatibility:
     rating: NoIssues
 SLPM-86780:
-  name: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 1) (Shokai Genteiban)"
+  name: "Taiho Shichau zo - You're Under Arrest (Disc 1) (Shokai Genteiban)"
+  saveName: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 1) (Shokai Genteiban)"
   discSet:
     name: "Taiho Shichau zo - You're Under Arrest (Japan) (Shokai Genteiban)"
     serials:
       - SLPM-86780
       - SLPM-86781
 SLPM-86783:
-  name: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 2)"
+  name: "Taiho Shichau zo - You're Under Arrest (Disc 2)"
+  saveName: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 2)"
   discSet:
     name: "Taiho Shichau zo - You're Under Arrest (Japan)"
     serials:
       - SLPM-86782
       - SLPM-86783
 SLPM-86781:
-  name: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 2) (Shokai Genteiban)"
+  name: "Taiho Shichau zo - You're Under Arrest (Disc 2) (Shokai Genteiban)"
+  saveName: "Taiho Shichau zo - You're Under Arrest (Japan) (Disc 2) (Shokai Genteiban)"
   discSet:
     name: "Taiho Shichau zo - You're Under Arrest (Japan) (Shokai Genteiban)"
     serials:
@@ -167040,11 +175653,14 @@ SLPS-86780:
     multitap: false
     linkCable: false
 SLPM-80415:
-  name: "Taiken Bandai Vol. 2 (Japan)"
+  name: "Taiken Bandai Vol. 2"
+  saveName: "Taiken Bandai Vol. 2 (Japan)"
 SLPM-80305:
-  name: "Taiken Bandai! Vol. 1 (Japan)"
+  name: "Taiken Bandai! Vol. 1"
+  saveName: "Taiken Bandai! Vol. 1 (Japan)"
 SLPS-00202:
-  name: "Taiketsu Rumiizu! Meruhen Land (Japan)"
+  name: "Taiketsu Rumiizu! Meruhen Land"
+  saveName: "Taiketsu Rumiizu! Meruhen Land (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -167062,7 +175678,8 @@ SLPS-00202:
     multitap: true
     linkCable: false
 SLPS-00234:
-  name: "Taikou Risshiden II (Japan)"
+  name: "Taikou Risshiden II"
+  saveName: "Taikou Risshiden II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -167080,7 +175697,8 @@ SLPS-00234:
     multitap: false
     linkCable: false
 SLPM-86268:
-  name: "Taikou Risshiden III (Japan)"
+  name: "Taikou Risshiden III"
+  saveName: "Taikou Risshiden III (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167099,7 +175717,8 @@ SLPM-86268:
     multitap: false
     linkCable: false
 SLPM-86608:
-  name: "Taikou Risshiden III (Japan) (Rev 1)"
+  name: "Taikou Risshiden III"
+  saveName: "Taikou Risshiden III (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167121,7 +175740,8 @@ SLPM-86608:
     multitap: false
     linkCable: false
 SLPS-01131:
-  name: "Taikyoku Igo - Heisei Kiin (Japan)"
+  name: "Taikyoku Igo - Heisei Kiin"
+  saveName: "Taikyoku Igo - Heisei Kiin (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -167139,9 +175759,11 @@ SLPS-01131:
     multitap: false
     linkCable: false
 SLPS-00457:
-  name: "Taikyoku Igo - Shinzui Gosennin (Japan)"
+  name: "Taikyoku Igo - Shinzui Gosennin"
+  saveName: "Taikyoku Igo - Shinzui Gosennin (Japan)"
 SLPM-86467:
-  name: "Taikyoku Igo - Shinzui Gosennin - Nigou (Japan)"
+  name: "Taikyoku Igo - Shinzui Gosennin - Nigou"
+  saveName: "Taikyoku Igo - Shinzui Gosennin - Nigou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167160,7 +175782,8 @@ SLPM-86467:
     multitap: false
     linkCable: false
 SLPS-00059:
-  name: "Taikyoku Shougi - Kiwame (Japan)"
+  name: "Taikyoku Shougi - Kiwame"
+  saveName: "Taikyoku Shougi - Kiwame (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -167178,7 +175801,8 @@ SLPS-00059:
     multitap: false
     linkCable: false
 SLES-01390:
-  name: "Tail Concerto (France)"
+  name: "Tail Concerto"
+  saveName: "Tail Concerto (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167197,7 +175821,8 @@ SLES-01390:
     multitap: false
     linkCable: false
 SLPS-01299:
-  name: "Tail Concerto (Japan)"
+  name: "Tail Concerto"
+  saveName: "Tail Concerto (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167216,7 +175841,8 @@ SLPS-01299:
     multitap: false
     linkCable: false
 SLUS-00660:
-  name: "Tail Concerto (USA)"
+  name: "Tail Concerto"
+  saveName: "Tail Concerto (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -167238,11 +175864,13 @@ SLUS-00660:
     multitap: false
     linkCable: false
 SLUS-90060:
-  name: "Tail Concerto (USA) (Demo)"
+  name: "Tail Concerto (Demo)"
+  saveName: "Tail Concerto (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94607:
-  name: "Tail of the Sun (USA)"
+  name: "Tail of the Sun"
+  saveName: "Tail of the Sun (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -167264,7 +175892,8 @@ SCUS-94607:
     multitap: false
     linkCable: false
 SLPS-02672:
-  name: "Taisen Ren'ai Simulation - Trifers Mahou Gakuen (Japan)"
+  name: "Taisen Ren'ai Simulation - Trifers Mahou Gakuen"
+  saveName: "Taisen Ren'ai Simulation - Trifers Mahou Gakuen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167302,7 +175931,8 @@ SLPS-03304:
     multitap: false
     linkCable: false
 SLPS-02029:
-  name: "Taiyo no Otsuge (Japan)"
+  name: "Taiyo no Otsuge"
+  saveName: "Taiyo no Otsuge (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167340,7 +175970,8 @@ SCPS-45099:
     multitap: false
     linkCable: false
 SLPS-00330:
-  name: "Taiyou no Shippo - Wild, Pure, Simple Life (Japan)"
+  name: "Taiyou no Shippo - Wild, Pure, Simple Life"
+  saveName: "Taiyou no Shippo - Wild, Pure, Simple Life (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167363,7 +175994,8 @@ SLPS-00330:
     multitap: false
     linkCable: false
 SLPS-00593:
-  name: "Taklamakan - Tonkou Denki (Japan)"
+  name: "Taklamakan - Tonkou Denki"
+  saveName: "Taklamakan - Tonkou Denki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -167381,7 +176013,8 @@ SLPS-00593:
     multitap: false
     linkCable: false
 SLPS-01100:
-  name: "Tales of Destiny (Japan)"
+  name: "Tales of Destiny"
+  saveName: "Tales of Destiny (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -167399,15 +176032,18 @@ SLPS-01100:
     multitap: false
     linkCable: false
 SLPM-80133:
-  name: "Tales of Destiny (Japan) (Preview Edition by Namco)"
+  name: "Tales of Destiny (Preview Edition by Namco)"
+  saveName: "Tales of Destiny (Japan) (Preview Edition by Namco)"
   metadata:
     genre: "** DEMO **"
 SLPM-80179:
-  name: "Tales of Destiny (Japan) (Preview Edition) (Famitsuu Version)"
+  name: "Tales of Destiny (Preview Edition) (Famitsuu Version)"
+  saveName: "Tales of Destiny (Japan) (Preview Edition) (Famitsuu Version)"
   metadata:
     genre: "** DEMO **"
 SLPS-91111:
-  name: "Tales of Destiny (Japan) (Rev 1)"
+  name: "Tales of Destiny"
+  saveName: "Tales of Destiny (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -167425,7 +176061,8 @@ SLPS-91111:
     multitap: false
     linkCable: false
 SLUS-00626:
-  name: "Tales of Destiny (USA)"
+  name: "Tales of Destiny"
+  saveName: "Tales of Destiny (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2663-gfd39f09a"
@@ -167446,7 +176083,8 @@ SLUS-00626:
     multitap: false
     linkCable: false
 SLUS-01355:
-  name: "Tales of Destiny II (USA) (Disc 1)"
+  name: "Tales of Destiny II (Disc 1)"
+  saveName: "Tales of Destiny II (USA) (Disc 1)"
   discSet:
     name: "Tales of Destiny II (USA)"
     serials:
@@ -167474,7 +176112,8 @@ SLUS-01355:
     multitap: true
     linkCable: false
 SLUS-01367:
-  name: "Tales of Destiny II (USA) (Disc 2)"
+  name: "Tales of Destiny II (Disc 2)"
+  saveName: "Tales of Destiny II (USA) (Disc 2)"
   discSet:
     name: "Tales of Destiny II (USA)"
     serials:
@@ -167502,7 +176141,8 @@ SLUS-01367:
     multitap: true
     linkCable: false
 SLUS-01368:
-  name: "Tales of Destiny II (USA) (Disc 3)"
+  name: "Tales of Destiny II (Disc 3)"
+  saveName: "Tales of Destiny II (USA) (Disc 3)"
   discSet:
     name: "Tales of Destiny II (USA)"
     serials:
@@ -167553,11 +176193,13 @@ SCPS-45507:
     multitap: true
     linkCable: false
 SLPM-80586:
-  name: "Tales of Eternia (Japan) (Demo)"
+  name: "Tales of Eternia (Demo)"
+  saveName: "Tales of Eternia (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03050:
-  name: "Tales of Eternia (Japan) (Disc 1)"
+  name: "Tales of Eternia (Disc 1)"
+  saveName: "Tales of Eternia (Japan) (Disc 1)"
   discSet:
     name: "Tales of Eternia (Japan)"
     serials:
@@ -167585,7 +176227,8 @@ SLPS-03050:
     multitap: true
     linkCable: false
 SLPS-03045:
-  name: "Tales of Eternia (Japan) (Disc 1) (Premium Box)"
+  name: "Tales of Eternia (Disc 1) (Premium Box)"
+  saveName: "Tales of Eternia (Japan) (Disc 1) (Premium Box)"
   discSet:
     name: "Tales of Eternia (Japan) (Premium Box)"
     serials:
@@ -167610,7 +176253,8 @@ SLPS-03045:
     multitap: true
     linkCable: false
 SLPS-03051:
-  name: "Tales of Eternia (Japan) (Disc 2)"
+  name: "Tales of Eternia (Disc 2)"
+  saveName: "Tales of Eternia (Japan) (Disc 2)"
   discSet:
     name: "Tales of Eternia (Japan)"
     serials:
@@ -167638,7 +176282,8 @@ SLPS-03051:
     multitap: true
     linkCable: false
 SLPS-03046:
-  name: "Tales of Eternia (Japan) (Disc 2) (Premium Box)"
+  name: "Tales of Eternia (Disc 2) (Premium Box)"
+  saveName: "Tales of Eternia (Japan) (Disc 2) (Premium Box)"
   discSet:
     name: "Tales of Eternia (Japan) (Premium Box)"
     serials:
@@ -167663,7 +176308,8 @@ SLPS-03046:
     multitap: true
     linkCable: false
 SLPS-03052:
-  name: "Tales of Eternia (Japan) (Disc 3)"
+  name: "Tales of Eternia (Disc 3)"
+  saveName: "Tales of Eternia (Japan) (Disc 3)"
   discSet:
     name: "Tales of Eternia (Japan)"
     serials:
@@ -167691,7 +176337,8 @@ SLPS-03052:
     multitap: true
     linkCable: false
 SLPS-03047:
-  name: "Tales of Eternia (Japan) (Disc 3) (Premium Box)"
+  name: "Tales of Eternia (Disc 3) (Premium Box)"
+  saveName: "Tales of Eternia (Japan) (Disc 3) (Premium Box)"
   discSet:
     name: "Tales of Eternia (Japan) (Premium Box)"
     serials:
@@ -167716,7 +176363,8 @@ SLPS-03047:
     multitap: true
     linkCable: false
 SLPS-03375:
-  name: "Tales of Fandom Vol. 1 - Cless Version (Japan)"
+  name: "Tales of Fandom Vol. 1 - Cless Version"
+  saveName: "Tales of Fandom Vol. 1 - Cless Version (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167735,7 +176383,8 @@ SLPS-03375:
     multitap: false
     linkCable: true
 SLPS-03376:
-  name: "Tales of Fandom Vol. 1 - Mint Version (Japan)"
+  name: "Tales of Fandom Vol. 1 - Mint Version"
+  saveName: "Tales of Fandom Vol. 1 - Mint Version (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167773,7 +176422,8 @@ SCPS-45367:
     multitap: false
     linkCable: false
 SLPS-01770:
-  name: "Tales of Phantasia (Japan)"
+  name: "Tales of Phantasia"
+  saveName: "Tales of Phantasia (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2498-gd7de578d"
@@ -167798,11 +176448,13 @@ SLPS-01770:
     multitap: false
     linkCable: false
 SLPM-80344:
-  name: "Tales of Phantasia (Japan) (Demo)"
+  name: "Tales of Phantasia (Demo)"
+  saveName: "Tales of Phantasia (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01547:
-  name: "Tall - Infinity (USA)"
+  name: "Tall - Infinity"
+  saveName: "Tall - Infinity (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -167824,7 +176476,8 @@ SLUS-01547:
     multitap: false
     linkCable: false
 SLPS-03021:
-  name: "Tall - Twins Tower (Japan)"
+  name: "Tall - Twins Tower"
+  saveName: "Tall - Twins Tower (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167843,7 +176496,8 @@ SLPS-03021:
     multitap: false
     linkCable: false
 SLPS-02366:
-  name: "Tall Unlimited (Japan)"
+  name: "Tall Unlimited"
+  saveName: "Tall Unlimited (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167862,7 +176516,8 @@ SLPS-02366:
     multitap: false
     linkCable: false
 SLPM-87116:
-  name: "Tall Unlimited (Japan) (Major Wave)"
+  name: "Tall Unlimited (Major Wave)"
+  saveName: "Tall Unlimited (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167881,7 +176536,8 @@ SLPM-87116:
     multitap: false
     linkCable: false
 SLPS-00003:
-  name: "Tama - Adventurous Ball in Giddy Labyrinth (Japan)"
+  name: "Tama - Adventurous Ball in Giddy Labyrinth"
+  saveName: "Tama - Adventurous Ball in Giddy Labyrinth (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -167901,7 +176557,8 @@ SLPS-00003:
     multitap: false
     linkCable: false
 SCPS-10044:
-  name: "Tamago de Puzzle (Japan)"
+  name: "Tamago de Puzzle"
+  saveName: "Tamago de Puzzle (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167920,7 +176577,8 @@ SCPS-10044:
     multitap: false
     linkCable: false
 SLPS-01729:
-  name: "Tamamayu Monogatari (Japan)"
+  name: "Tamamayu Monogatari"
+  saveName: "Tamamayu Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167939,7 +176597,8 @@ SLPS-01729:
     multitap: false
     linkCable: false
 SLPS-91154:
-  name: "Tamamayu Monogatari (Japan) (PlayStation the Best)"
+  name: "Tamamayu Monogatari (PlayStation the Best)"
+  saveName: "Tamamayu Monogatari (Japan) (PlayStation the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -167958,7 +176617,8 @@ SLPS-91154:
     multitap: false
     linkCable: false
 PAPX-90065:
-  name: "Tamamayu Monogatari - Dennou Bijutsukan (Japan)"
+  name: "Tamamayu Monogatari - Dennou Bijutsukan"
+  saveName: "Tamamayu Monogatari - Dennou Bijutsukan (Japan)"
   codes:
     - PAPX-90065
     - SLPM-80325
@@ -167982,7 +176642,8 @@ SLPS-91461:
     multitap: false
     linkCable: false
 SLPS-02261:
-  name: "Tanaka Torahiko no Ultra-ryuu Shougi - Ibisha Anaguma-hen (Japan)"
+  name: "Tanaka Torahiko no Ultra-ryuu Shougi - Ibisha Anaguma-hen"
+  saveName: "Tanaka Torahiko no Ultra-ryuu Shougi - Ibisha Anaguma-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168001,11 +176662,13 @@ SLPS-02261:
     multitap: false
     linkCable: false
 SLED-01942:
-  name: "Tank Racer (Europe) (Demo)"
+  name: "Tank Racer (Demo)"
+  saveName: "Tank Racer (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01248:
-  name: "Tank Racer (Europe) (En,Fr,De,Es,It)"
+  name: "Tank Racer"
+  saveName: "Tank Racer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168029,7 +176692,8 @@ SLES-01248:
     multitap: false
     linkCable: false
 SLPM-86172:
-  name: "Tanoshii Mahjong (Japan)"
+  name: "Tanoshii Mahjong"
+  saveName: "Tanoshii Mahjong (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -168065,7 +176729,8 @@ SLPM-86284:
     multitap: false
     linkCable: false
 SLPS-02157:
-  name: "Tantei Jinguji Saburo - Early Collection (Japan)"
+  name: "Tantei Jinguji Saburo - Early Collection"
+  saveName: "Tantei Jinguji Saburo - Early Collection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -168083,7 +176748,8 @@ SLPS-02157:
     multitap: false
     linkCable: false
 SLPS-03137:
-  name: "Tantei Jinguji Saburo - Early Collection (Japan) (Fukyuuban)"
+  name: "Tantei Jinguji Saburo - Early Collection (Fukyuuban)"
+  saveName: "Tantei Jinguji Saburo - Early Collection (Japan) (Fukyuuban)"
   controllers:
     - DigitalController
   metadata:
@@ -168101,7 +176767,8 @@ SLPS-03137:
     multitap: false
     linkCable: false
 SLPS-00544:
-  name: "Tantei Jinguji Saburo - Mikan no Rupo (Japan)"
+  name: "Tantei Jinguji Saburo - Mikan no Rupo"
+  saveName: "Tantei Jinguji Saburo - Mikan no Rupo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -168119,7 +176786,8 @@ SLPS-00544:
     multitap: false
     linkCable: false
 SLPS-03016:
-  name: "Tantei Jinguji Saburo - Mikan no Rupo (Japan) (Fukyuuban)"
+  name: "Tantei Jinguji Saburo - Mikan no Rupo (Fukyuuban)"
+  saveName: "Tantei Jinguji Saburo - Mikan no Rupo (Japan) (Fukyuuban)"
   controllers:
     - DigitalController
   metadata:
@@ -168137,7 +176805,8 @@ SLPS-03016:
     multitap: false
     linkCable: false
 SLPS-02427:
-  name: "Tantei Jinguji Saburo - Tomoshibi ga Kienu Ma ni (Japan)"
+  name: "Tantei Jinguji Saburo - Tomoshibi ga Kienu Ma ni"
+  saveName: "Tantei Jinguji Saburo - Tomoshibi ga Kienu Ma ni (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168156,7 +176825,8 @@ SLPS-02427:
     multitap: false
     linkCable: false
 SLPS-03015:
-  name: "Tantei Jinguji Saburo - Tomoshibi ga Kienu Ma ni (Japan) (Fukyuuban)"
+  name: "Tantei Jinguji Saburo - Tomoshibi ga Kienu Ma ni (Fukyuuban)"
+  saveName: "Tantei Jinguji Saburo - Tomoshibi ga Kienu Ma ni (Japan) (Fukyuuban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168175,7 +176845,8 @@ SLPS-03015:
     multitap: false
     linkCable: false
 SLPS-01356:
-  name: "Tantei Jinguji Saburo - Yume no Owari ni (Japan)"
+  name: "Tantei Jinguji Saburo - Yume no Owari ni"
+  saveName: "Tantei Jinguji Saburo - Yume no Owari ni (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -168193,7 +176864,8 @@ SLPS-01356:
     multitap: false
     linkCable: false
 SLPS-03014:
-  name: "Tantei Jinguji Saburo - Yume no Owari ni (Japan) (Fukyuuban)"
+  name: "Tantei Jinguji Saburo - Yume no Owari ni (Fukyuuban)"
+  saveName: "Tantei Jinguji Saburo - Yume no Owari ni (Japan) (Fukyuuban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168212,7 +176884,8 @@ SLPS-03014:
     multitap: false
     linkCable: false
 SLPS-02883:
-  name: "Taregoro - Tarepanda no Iru Nichijou (Japan)"
+  name: "Taregoro - Tarepanda no Iru Nichijou"
+  saveName: "Taregoro - Tarepanda no Iru Nichijou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168231,7 +176904,8 @@ SLPS-02883:
     multitap: false
     linkCable: false
 SLPS-00532:
-  name: "Tasogare no Ode (Japan)"
+  name: "Tasogare no Ode"
+  saveName: "Tasogare no Ode (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -168252,7 +176926,8 @@ SLPS-00532:
     multitap: false
     linkCable: false
 SLPS-02939:
-  name: "Tatsunoko Fight (Japan)"
+  name: "Tatsunoko Fight"
+  saveName: "Tatsunoko Fight (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168290,7 +176965,8 @@ SLPM-87243:
     multitap: false
     linkCable: false
 SLES-03597:
-  name: "Taxi 2 (France) (En,Fr)"
+  name: "Taxi 2"
+  saveName: "Taxi 2 (France) (En,Fr)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168310,7 +176986,8 @@ SLES-03597:
     multitap: false
     linkCable: false
 SCES-02986:
-  name: "Team Buddies (Europe) (En,Es,It)"
+  name: "Team Buddies"
+  saveName: "Team Buddies (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168331,7 +177008,8 @@ SCES-02986:
     multitap: true
     linkCable: false
 SCES-01923:
-  name: "Team Buddies (Europe) (En,Fr,De)"
+  name: "Team Buddies"
+  saveName: "Team Buddies (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168352,7 +177030,8 @@ SCES-01923:
     multitap: true
     linkCable: false
 SLUS-00869:
-  name: "Team Buddies (USA)"
+  name: "Team Buddies"
+  saveName: "Team Buddies (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -168374,7 +177053,8 @@ SLUS-00869:
     multitap: true
     linkCable: false
 SLUS-00666:
-  name: "Team Losi RC Racer (USA)"
+  name: "Team Losi RC Racer"
+  saveName: "Team Losi RC Racer (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3862-g8f821c77"
@@ -168397,23 +177077,32 @@ SLUS-00666:
     multitap: false
     linkCable: false
 SLPM-80140:
-  name: "Tech PlayStation 97-10 (Japan)"
+  name: "Tech PlayStation 97-10"
+  saveName: "Tech PlayStation 97-10 (Japan)"
 SLPM-80084:
-  name: "Tech PlayStation 97-4 (Japan)"
+  name: "Tech PlayStation 97-4"
+  saveName: "Tech PlayStation 97-4 (Japan)"
 SLPM-80089:
-  name: "Tech PlayStation 97-5 (Japan)"
+  name: "Tech PlayStation 97-5"
+  saveName: "Tech PlayStation 97-5 (Japan)"
 SLPM-80100:
-  name: "Tech PlayStation 97-6 (Japan)"
+  name: "Tech PlayStation 97-6"
+  saveName: "Tech PlayStation 97-6 (Japan)"
 SLPM-80108:
-  name: "Tech PlayStation 97-7 (Japan)"
+  name: "Tech PlayStation 97-7"
+  saveName: "Tech PlayStation 97-7 (Japan)"
 SLPM-80117:
-  name: "Tech PlayStation 97-8 (Japan)"
+  name: "Tech PlayStation 97-8"
+  saveName: "Tech PlayStation 97-8 (Japan)"
 SLPM-80128:
-  name: "Tech PlayStation 97-9 (Japan)"
+  name: "Tech PlayStation 97-9"
+  saveName: "Tech PlayStation 97-9 (Japan)"
 SLPM-80188:
-  name: "Tech PlayStation Vol. 1 (Japan)"
+  name: "Tech PlayStation Vol. 1"
+  saveName: "Tech PlayStation Vol. 1 (Japan)"
 SLPM-86738:
-  name: "Techno BB (Japan)"
+  name: "Techno BB"
+  saveName: "Techno BB (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168432,7 +177121,8 @@ SLPM-86738:
     multitap: false
     linkCable: false
 SLES-03245:
-  name: "TechnoMage - De Terugkeer der Eeuwigheid (Netherlands)"
+  name: "TechnoMage - De Terugkeer der Eeuwigheid"
+  saveName: "TechnoMage - De Terugkeer der Eeuwigheid (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168452,7 +177142,8 @@ SLES-03245:
     multitap: false
     linkCable: false
 SLES-02831:
-  name: "TechnoMage - Die Rueckkehr der Ewigkeit (Germany)"
+  name: "TechnoMage - Die Rueckkehr der Ewigkeit"
+  saveName: "TechnoMage - Die Rueckkehr der Ewigkeit (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168472,7 +177163,8 @@ SLES-02831:
     multitap: false
     linkCable: false
 SLES-03242:
-  name: "TechnoMage - En Quete de L'Eternite (France)"
+  name: "TechnoMage - En Quete de L'Eternite"
+  saveName: "TechnoMage - En Quete de L'Eternite (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168492,7 +177184,8 @@ SLES-03242:
     multitap: false
     linkCable: false
 SLES-03241:
-  name: "TechnoMage - Return of Eternity (Europe)"
+  name: "TechnoMage - Return of Eternity"
+  saveName: "TechnoMage - Return of Eternity (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168512,7 +177205,8 @@ SLES-03241:
     multitap: false
     linkCable: false
 SLES-03243:
-  name: "TechnoMage - Ritorno all'Eternita (Italy)"
+  name: "TechnoMage - Ritorno all'Eternita"
+  saveName: "TechnoMage - Ritorno all'Eternita (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168532,7 +177226,8 @@ SLES-03243:
     multitap: false
     linkCable: false
 SLES-03244:
-  name: "Technomage - El Retorno de la Eternidad (Spain)"
+  name: "Technomage - El Retorno de la Eternidad"
+  saveName: "Technomage - El Retorno de la Eternidad (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168552,7 +177247,8 @@ SLES-03244:
     multitap: false
     linkCable: false
 SLUS-00315:
-  name: "Tecmo Stackers (USA)"
+  name: "Tecmo Stackers"
+  saveName: "Tecmo Stackers (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168571,7 +177267,8 @@ SLUS-00315:
     multitap: false
     linkCable: false
 SLPS-00565:
-  name: "Tecmo Super Bowl (Japan)"
+  name: "Tecmo Super Bowl"
+  saveName: "Tecmo Super Bowl (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -168589,7 +177286,8 @@ SLPS-00565:
     multitap: false
     linkCable: false
 SLUS-00070:
-  name: "Tecmo Super Bowl (USA)"
+  name: "Tecmo Super Bowl"
+  saveName: "Tecmo Super Bowl (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -168607,7 +177305,8 @@ SLUS-00070:
     multitap: false
     linkCable: false
 SLUS-00299:
-  name: "Tecmo World Golf - Japan (USA)"
+  name: "Tecmo World Golf - Japan"
+  saveName: "Tecmo World Golf - Japan (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -168625,7 +177324,8 @@ SLUS-00299:
     multitap: false
     linkCable: false
 SLUS-00340:
-  name: "Tecmo's Deception - Invitation to Darkness (USA)"
+  name: "Tecmo's Deception - Invitation to Darkness"
+  saveName: "Tecmo's Deception - Invitation to Darkness (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -168646,7 +177346,8 @@ SLUS-00340:
     multitap: false
     linkCable: false
 SLPM-86178:
-  name: "Teitoku no Ketsudan II (Japan)"
+  name: "Teitoku no Ketsudan II"
+  saveName: "Teitoku no Ketsudan II (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -168668,7 +177369,8 @@ SLPM-86178:
     multitap: false
     linkCable: false
 SLPM-86204:
-  name: "Teitoku no Ketsudan III (Japan)"
+  name: "Teitoku no Ketsudan III"
+  saveName: "Teitoku no Ketsudan III (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -168707,7 +177409,8 @@ SLPM-87180:
     multitap: false
     linkCable: false
 SLPS-01216:
-  name: "Teitoku no Ketsudan III with Power-Up Kit (Japan)"
+  name: "Teitoku no Ketsudan III with Power-Up Kit"
+  saveName: "Teitoku no Ketsudan III with Power-Up Kit (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -168725,7 +177428,8 @@ SLPS-01216:
     multitap: false
     linkCable: false
 SCES-00005:
-  name: "Tekken (Europe)"
+  name: "Tekken"
+  saveName: "Tekken (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -168747,7 +177451,8 @@ SCES-00005:
     multitap: false
     linkCable: false
 SLPS-00040:
-  name: "Tekken (Japan)"
+  name: "Tekken"
+  saveName: "Tekken (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -168769,7 +177474,8 @@ SLPS-00040:
     multitap: false
     linkCable: false
 SLUS-00006:
-  name: "Tekken (USA)"
+  name: "Tekken"
+  saveName: "Tekken (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -168791,7 +177497,8 @@ SLUS-00006:
     multitap: false
     linkCable: false
 SCES-00255:
-  name: "Tekken 2 (Europe)"
+  name: "Tekken 2"
+  saveName: "Tekken 2 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -168813,7 +177520,8 @@ SCES-00255:
     multitap: false
     linkCable: false
 SLPS-00300:
-  name: "Tekken 2 (Japan)"
+  name: "Tekken 2"
+  saveName: "Tekken 2 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "9d1eb32"
@@ -168835,7 +177543,8 @@ SLPS-00300:
     multitap: false
     linkCable: false
 SLUS-00213:
-  name: "Tekken 2 (USA)"
+  name: "Tekken 2"
+  saveName: "Tekken 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -168857,11 +177566,14 @@ SLUS-00213:
     multitap: false
     linkCable: false
 SCED-00494:
-  name: "Tekken 2 + Fade to Black + F1 + V-CD (Germany)"
+  name: "Tekken 2 + Fade to Black + F1 + V-CD"
+  saveName: "Tekken 2 + Fade to Black + F1 + V-CD (Germany)"
 SCED-00467:
-  name: "Tekken 2 + Fade to Black + V-CD (France)"
+  name: "Tekken 2 + Fade to Black + V-CD"
+  saveName: "Tekken 2 + Fade to Black + V-CD (France)"
 SCES-01237:
-  name: "Tekken 3 (Europe)"
+  name: "Tekken 3"
+  saveName: "Tekken 3 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -168886,19 +177598,22 @@ SCES-01237:
     multitap: false
     linkCable: false
 SCED-01146:
-  name: "Tekken 3 (Europe) (Demo)"
+  name: "Tekken 3 (Demo)"
+  saveName: "Tekken 3 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SCED-01384:
-  name: "Tekken 3 (France) (Demo)"
+  name: "Tekken 3 (Demo)"
+  saveName: "Tekken 3 (France) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLPS-91202:
-  name: "Tekken 3 (Japan) (Rev 1)"
+  name: "Tekken 3"
+  saveName: "Tekken 3 (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -168920,7 +177635,8 @@ SLPS-91202:
     multitap: false
     linkCable: false
 SCPS-45213:
-  name: "Tekken 3 (Japan, Asia)"
+  name: "Tekken 3"
+  saveName: "Tekken 3 (Japan, Asia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2148-g7078f73e"
@@ -168949,7 +177665,8 @@ SCPS-45213:
     multitap: false
     linkCable: false
 SLUS-00402:
-  name: "Tekken 3 (USA)"
+  name: "Tekken 3"
+  saveName: "Tekken 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-774-g5a1b008"
@@ -168974,7 +177691,8 @@ SLUS-00402:
     multitap: false
     linkCable: false
 SLPS-00365:
-  name: "Tekkyuu - True Pinball (Japan)"
+  name: "Tekkyuu - True Pinball"
+  saveName: "Tekkyuu - True Pinball (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -168994,7 +177712,8 @@ SLPS-00365:
     multitap: false
     linkCable: false
 SLES-02131:
-  name: "Telefoot Manager (France)"
+  name: "Telefoot Manager"
+  saveName: "Telefoot Manager (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169032,7 +177751,8 @@ SLES-03169:
     multitap: false
     linkCable: false
 SLES-00316:
-  name: "Tempest X3 (Europe)"
+  name: "Tempest X3"
+  saveName: "Tempest X3 (Europe)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -169052,7 +177772,8 @@ SLES-00316:
     multitap: false
     linkCable: false
 SLUS-00283:
-  name: "Tempest X3 (USA)"
+  name: "Tempest X3"
+  saveName: "Tempest X3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1969-g671033fd"
@@ -169076,7 +177797,8 @@ SLUS-00283:
     multitap: false
     linkCable: false
 SLES-00534:
-  name: "Ten Pin Alley (Europe)"
+  name: "Ten Pin Alley"
+  saveName: "Ten Pin Alley (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -169094,7 +177816,8 @@ SLES-00534:
     multitap: true
     linkCable: false
 SLUS-00377:
-  name: "Ten Pin Alley (USA)"
+  name: "Ten Pin Alley"
+  saveName: "Ten Pin Alley (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -169112,7 +177835,8 @@ SLUS-00377:
     multitap: true
     linkCable: false
 SLPM-86368:
-  name: "Ten made Jack - Odoroki Mamenoki Daitoubou!! (Japan)"
+  name: "Ten made Jack - Odoroki Mamenoki Daitoubou!!"
+  saveName: "Ten made Jack - Odoroki Mamenoki Daitoubou!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169131,7 +177855,8 @@ SLPM-86368:
     multitap: false
     linkCable: false
 SLPS-01243:
-  name: "Tenant Wars (Japan)"
+  name: "Tenant Wars"
+  saveName: "Tenant Wars (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -169149,7 +177874,8 @@ SLPS-01243:
     multitap: true
     linkCable: false
 SLPS-00451:
-  name: "Tenchi Muyou! Toukou Muyou (Japan) (Disc 1)"
+  name: "Tenchi Muyou! Toukou Muyou (Disc 1)"
+  saveName: "Tenchi Muyou! Toukou Muyou (Japan) (Disc 1)"
   discSet:
     name: "Tenchi Muyou! Toukou Muyou (Japan)"
     serials:
@@ -169172,7 +177898,8 @@ SLPS-00451:
     multitap: false
     linkCable: false
 SLPS-00452:
-  name: "Tenchi Muyou! Toukou Muyou (Japan) (Disc 2)"
+  name: "Tenchi Muyou! Toukou Muyou (Disc 2)"
+  saveName: "Tenchi Muyou! Toukou Muyou (Japan) (Disc 2)"
   discSet:
     name: "Tenchi Muyou! Toukou Muyou (Japan)"
     serials:
@@ -169195,7 +177922,8 @@ SLPS-00452:
     multitap: false
     linkCable: false
 SLPM-87400:
-  name: "Tenchi o Kurau II - Sekiheki no Tatakai (Japan)"
+  name: "Tenchi o Kurau II - Sekiheki no Tatakai"
+  saveName: "Tenchi o Kurau II - Sekiheki no Tatakai (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -169216,7 +177944,8 @@ SLPM-87400:
     multitap: false
     linkCable: false
 SLES-01374:
-  name: "Tenchu - Stealth Assassins (Europe) (En,Fr,It)"
+  name: "Tenchu - Stealth Assassins"
+  saveName: "Tenchu - Stealth Assassins (Europe) (En,Fr,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169237,11 +177966,13 @@ SLES-01374:
     multitap: false
     linkCable: false
 SLED-01467:
-  name: "Tenchu - Stealth Assassins (Europe) (En,Fr,It) (Demo)"
+  name: "Tenchu - Stealth Assassins (Demo)"
+  saveName: "Tenchu - Stealth Assassins (Europe) (En,Fr,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00706:
-  name: "Tenchu - Stealth Assassins (USA)"
+  name: "Tenchu - Stealth Assassins"
+  saveName: "Tenchu - Stealth Assassins (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -169263,7 +177994,8 @@ SLUS-00706:
     multitap: false
     linkCable: false
 SLES-02452:
-  name: "Tenchu 2 - Birth of the Stealth Assassins (Europe)"
+  name: "Tenchu 2 - Birth of the Stealth Assassins"
+  saveName: "Tenchu 2 - Birth of the Stealth Assassins (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169284,7 +178016,8 @@ SLES-02452:
     multitap: false
     linkCable: false
 SLES-02462:
-  name: "Tenchu 2 - Birth of the Stealth Assassins (France)"
+  name: "Tenchu 2 - Birth of the Stealth Assassins"
+  saveName: "Tenchu 2 - Birth of the Stealth Assassins (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169305,7 +178038,8 @@ SLES-02462:
     multitap: false
     linkCable: false
 SLES-02463:
-  name: "Tenchu 2 - Birth of the Stealth Assassins (Germany)"
+  name: "Tenchu 2 - Birth of the Stealth Assassins"
+  saveName: "Tenchu 2 - Birth of the Stealth Assassins (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169326,7 +178060,8 @@ SLES-02463:
     multitap: false
     linkCable: false
 SLES-02464:
-  name: "Tenchu 2 - Birth of the Stealth Assassins (Italy)"
+  name: "Tenchu 2 - Birth of the Stealth Assassins"
+  saveName: "Tenchu 2 - Birth of the Stealth Assassins (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169347,7 +178082,8 @@ SLES-02464:
     multitap: false
     linkCable: false
 SLES-02465:
-  name: "Tenchu 2 - Birth of the Stealth Assassins (Spain)"
+  name: "Tenchu 2 - Birth of the Stealth Assassins"
+  saveName: "Tenchu 2 - Birth of the Stealth Assassins (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -169371,7 +178107,8 @@ SLES-02465:
     multitap: false
     linkCable: false
 SLUS-00939:
-  name: "Tenchu 2 - Birth of the Stealth Assassins (USA)"
+  name: "Tenchu 2 - Birth of the Stealth Assassins"
+  saveName: "Tenchu 2 - Birth of the Stealth Assassins (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -169394,7 +178131,8 @@ SLUS-00939:
     multitap: false
     linkCable: false
 SLPS-00712:
-  name: "Tenga Seiha (Japan)"
+  name: "Tenga Seiha"
+  saveName: "Tenga Seiha (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -169414,7 +178152,8 @@ SLPS-00712:
     multitap: false
     linkCable: false
 SLPS-01678:
-  name: "Tenka Touitsu (Japan) (Rev 1)"
+  name: "Tenka Touitsu"
+  saveName: "Tenka Touitsu (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -169432,7 +178171,8 @@ SLPS-01678:
     multitap: false
     linkCable: false
 SLPS-01015:
-  name: "Tenkuu no Escaflowne (Japan)"
+  name: "Tenkuu no Escaflowne"
+  saveName: "Tenkuu no Escaflowne (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -169450,7 +178190,8 @@ SLPS-01015:
     multitap: false
     linkCable: false
 SLPS-01014:
-  name: "Tenkuu no Escaflowne (Japan) (Genteiban)"
+  name: "Tenkuu no Escaflowne (Genteiban)"
+  saveName: "Tenkuu no Escaflowne (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -169468,7 +178209,8 @@ SLPS-01014:
     multitap: false
     linkCable: false
 SLPM-86584:
-  name: "Tenkuu no Restaurant (Japan)"
+  name: "Tenkuu no Restaurant"
+  saveName: "Tenkuu no Restaurant (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169487,7 +178229,8 @@ SLPM-86584:
     multitap: true
     linkCable: false
 SLPS-91452:
-  name: "Tenkuu no Restaurant (Japan) (Rev 1)"
+  name: "Tenkuu no Restaurant"
+  saveName: "Tenkuu no Restaurant (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169506,7 +178249,8 @@ SLPS-91452:
     multitap: true
     linkCable: false
 SLPM-86734:
-  name: "Tenkuu no Restaurant - Hello! Project Ver. (Japan)"
+  name: "Tenkuu no Restaurant - Hello! Project Ver."
+  saveName: "Tenkuu no Restaurant - Hello! Project Ver. (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169525,7 +178269,8 @@ SLPM-86734:
     multitap: true
     linkCable: false
 SLUS-01348:
-  name: "Tennis (USA)"
+  name: "Tennis"
+  saveName: "Tennis (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169544,7 +178289,8 @@ SLUS-01348:
     multitap: true
     linkCable: false
 SLES-00935:
-  name: "Tennis Arena (Europe) (En,Fr,De,Es,It)"
+  name: "Tennis Arena"
+  saveName: "Tennis Arena (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -169566,7 +178312,8 @@ SLES-00935:
     multitap: true
     linkCable: false
 SLPS-01303:
-  name: "Tennis Arena (Japan)"
+  name: "Tennis Arena"
+  saveName: "Tennis Arena (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -169584,7 +178331,8 @@ SLPS-01303:
     multitap: true
     linkCable: false
 SLUS-00596:
-  name: "Tennis Arena (USA)"
+  name: "Tennis Arena"
+  saveName: "Tennis Arena (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -169621,7 +178369,8 @@ SLPM-87200:
     multitap: false
     linkCable: false
 SLPM-87028:
-  name: "Tennis no Oujisama (Japan)"
+  name: "Tennis no Oujisama"
+  saveName: "Tennis no Oujisama (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169643,7 +178392,8 @@ SLPM-87028:
     multitap: false
     linkCable: false
 SLPM-87155:
-  name: "Tennis no Oujisama - Sweat & Tears (Japan)"
+  name: "Tennis no Oujisama - Sweat & Tears"
+  saveName: "Tennis no Oujisama - Sweat & Tears (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169662,7 +178412,8 @@ SLPM-87155:
     multitap: false
     linkCable: false
 SLPM-87296:
-  name: "Tennis no Oujisama - Sweat & Tears (Japan) (Rev 1)"
+  name: "Tennis no Oujisama - Sweat & Tears"
+  saveName: "Tennis no Oujisama - Sweat & Tears (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169681,7 +178432,8 @@ SLPM-87296:
     multitap: false
     linkCable: false
 SLPS-01278:
-  name: "Tensen Nyannyan Gekijouban (Japan)"
+  name: "Tensen Nyannyan Gekijouban"
+  saveName: "Tensen Nyannyan Gekijouban (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -169699,7 +178451,8 @@ SLPS-01278:
     multitap: false
     linkCable: false
 SLPS-01228:
-  name: "Tenshi Doumei (Japan)"
+  name: "Tenshi Doumei"
+  saveName: "Tenshi Doumei (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169718,7 +178471,8 @@ SLPS-01228:
     multitap: false
     linkCable: false
 SLPS-03466:
-  name: "Tenshi na Konamaiki (Japan)"
+  name: "Tenshi na Konamaiki"
+  saveName: "Tenshi na Konamaiki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169737,7 +178491,8 @@ SLPS-03466:
     multitap: false
     linkCable: false
 SLPS-03132:
-  name: "Tentama (Japan)"
+  name: "Tentama"
+  saveName: "Tentama (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169756,7 +178511,8 @@ SLPS-03132:
     multitap: false
     linkCable: false
 SCES-02836:
-  name: "Terracon (Europe) (En,Fr,De,Es,It)"
+  name: "Terracon"
+  saveName: "Terracon (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169779,7 +178535,8 @@ SCES-02836:
     multitap: false
     linkCable: false
 SCES-00012:
-  name: "Terry Pratchett's Discworld (Europe) (En,Fr,De,Es,It)"
+  name: "Terry Pratchett's Discworld"
+  saveName: "Terry Pratchett's Discworld (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -169802,7 +178559,8 @@ SCES-00012:
     multitap: false
     linkCable: false
 SLES-00193:
-  name: "Terry Pratchett's Discworld (Germany)"
+  name: "Terry Pratchett's Discworld"
+  saveName: "Terry Pratchett's Discworld (Germany)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2152-g70fa4143"
@@ -169824,7 +178582,8 @@ SLES-00193:
     multitap: false
     linkCable: false
 SCUS-94600:
-  name: "Terry Pratchett's Discworld (USA)"
+  name: "Terry Pratchett's Discworld"
+  saveName: "Terry Pratchett's Discworld (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -169843,7 +178602,8 @@ SCUS-94600:
     multitap: false
     linkCable: false
 SLES-00948:
-  name: "Test Drive 4 (Europe) (En,Fr,De,It)"
+  name: "Test Drive 4"
+  saveName: "Test Drive 4 (Europe) (En,Fr,De,It)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -169867,7 +178627,8 @@ SLES-00948:
     multitap: false
     linkCable: true
 SLPS-01288:
-  name: "Test Drive 4 (Japan)"
+  name: "Test Drive 4"
+  saveName: "Test Drive 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169887,7 +178648,8 @@ SLPS-01288:
     multitap: false
     linkCable: true
 SLUS-00487:
-  name: "Test Drive 4 (USA)"
+  name: "Test Drive 4"
+  saveName: "Test Drive 4 (USA)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -169908,7 +178670,8 @@ SLUS-00487:
     multitap: false
     linkCable: true
 SLES-01179:
-  name: "Test Drive 4x4 (Europe) (En,Fr,De)"
+  name: "Test Drive 4x4"
+  saveName: "Test Drive 4x4 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169930,7 +178693,8 @@ SLES-01179:
     multitap: false
     linkCable: false
 SLES-01165:
-  name: "Test Drive 5 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  name: "Test Drive 5"
+  saveName: "Test Drive 5 (Europe) (En,Fr,De,Es,It,Nl,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169956,7 +178720,8 @@ SLES-01165:
     multitap: false
     linkCable: false
 SLPS-01964:
-  name: "Test Drive 5 (Japan)"
+  name: "Test Drive 5"
+  saveName: "Test Drive 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169976,7 +178741,8 @@ SLPS-01964:
     multitap: false
     linkCable: false
 SLUS-00610:
-  name: "Test Drive 5 (USA)"
+  name: "Test Drive 5"
+  saveName: "Test Drive 5 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -169996,7 +178762,8 @@ SLUS-00610:
     multitap: false
     linkCable: false
 SLES-02752:
-  name: "Test Drive 6 (Europe) (En,Fr,De,Es,It)"
+  name: "Test Drive 6"
+  saveName: "Test Drive 6 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170020,7 +178787,8 @@ SLES-02752:
     multitap: false
     linkCable: false
 SLUS-00839:
-  name: "Test Drive 6 (USA)"
+  name: "Test Drive 6"
+  saveName: "Test Drive 6 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-908-g9f22684"
@@ -170043,7 +178811,8 @@ SLUS-00839:
     multitap: false
     linkCable: false
 SLUS-01077:
-  name: "Test Drive Le Mans (USA) (En,Fr,Es)"
+  name: "Test Drive Le Mans"
+  saveName: "Test Drive Le Mans (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170063,7 +178832,8 @@ SLUS-01077:
     multitap: false
     linkCable: false
 SLES-00194:
-  name: "Test Drive Off-Road (Europe)"
+  name: "Test Drive Off-Road"
+  saveName: "Test Drive Off-Road (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -170082,7 +178852,8 @@ SLES-00194:
     multitap: false
     linkCable: false
 SLUS-00396:
-  name: "Test Drive Off-Road (USA)"
+  name: "Test Drive Off-Road"
+  saveName: "Test Drive Off-Road (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -170101,7 +178872,8 @@ SLUS-00396:
     multitap: false
     linkCable: false
 SLPS-01965:
-  name: "Test Drive Off-Road 2 (Japan)"
+  name: "Test Drive Off-Road 2"
+  saveName: "Test Drive Off-Road 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170121,7 +178893,8 @@ SLPS-01965:
     multitap: false
     linkCable: false
 SLUS-00609:
-  name: "Test Drive Off-Road 2 (USA)"
+  name: "Test Drive Off-Road 2"
+  saveName: "Test Drive Off-Road 2 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170141,7 +178914,8 @@ SLUS-00609:
     multitap: false
     linkCable: false
 SLUS-00840:
-  name: "Test Drive Off-Road 3 (USA)"
+  name: "Test Drive Off-Road 3"
+  saveName: "Test Drive Off-Road 3 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170161,7 +178935,8 @@ SLUS-00840:
     multitap: false
     linkCable: false
 SCES-02179:
-  name: "Tetris Magiska Utmaning (Sweden)"
+  name: "Tetris Magiska Utmaning"
+  saveName: "Tetris Magiska Utmaning (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170180,7 +178955,8 @@ SCES-02179:
     multitap: false
     linkCable: false
 SLES-00442:
-  name: "Tetris Plus (Europe)"
+  name: "Tetris Plus"
+  saveName: "Tetris Plus (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -170198,7 +178974,8 @@ SLES-00442:
     multitap: false
     linkCable: false
 SLPS-00466:
-  name: "Tetris Plus (Japan)"
+  name: "Tetris Plus"
+  saveName: "Tetris Plus (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -170219,7 +178996,8 @@ SLPS-00466:
     multitap: false
     linkCable: false
 SLUS-00338:
-  name: "Tetris Plus (USA)"
+  name: "Tetris Plus"
+  saveName: "Tetris Plus (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1064-g73cdd676"
@@ -170240,7 +179018,8 @@ SLUS-00338:
     multitap: false
     linkCable: false
 SLPS-00321:
-  name: "Tetris X (Japan)"
+  name: "Tetris X"
+  saveName: "Tetris X (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -170262,7 +179041,8 @@ SLPS-00321:
     multitap: true
     linkCable: false
 SLPS-02886:
-  name: "Tetris with Cardcaptor Sakura - Eternal Heart (Japan)"
+  name: "Tetris with Cardcaptor Sakura - Eternal Heart"
+  saveName: "Tetris with Cardcaptor Sakura - Eternal Heart (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1057-g7192b8d8"
@@ -170284,7 +179064,8 @@ SLPS-02886:
     multitap: false
     linkCable: false
 SLPS-00164:
-  name: "Tetsudou-ou '96 - Iku ze Okuman Chouja!! (Japan)"
+  name: "Tetsudou-ou '96 - Iku ze Okuman Chouja!!"
+  saveName: "Tetsudou-ou '96 - Iku ze Okuman Chouja!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -170302,7 +179083,8 @@ SLPS-00164:
     multitap: true
     linkCable: false
 SLPS-01012:
-  name: "Tetsudou-ou 2 - Sekai Seifuku no Yabou!! (Japan)"
+  name: "Tetsudou-ou 2 - Sekai Seifuku no Yabou!!"
+  saveName: "Tetsudou-ou 2 - Sekai Seifuku no Yabou!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -170320,7 +179102,8 @@ SLPS-01012:
     multitap: true
     linkCable: false
 SLPS-00675:
-  name: "Tetsuya Komuro - Gaball Screen (Japan)"
+  name: "Tetsuya Komuro - Gaball Screen"
+  saveName: "Tetsuya Komuro - Gaball Screen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -170341,7 +179124,8 @@ SLPS-00675:
     multitap: false
     linkCable: false
 SLPS-01718:
-  name: "Tettei Kaiseki - Hisshou Pachi-Slot Doujou - Yamasa & Pioneer (Japan)"
+  name: "Tettei Kaiseki - Hisshou Pachi-Slot Doujou - Yamasa & Pioneer"
+  saveName: "Tettei Kaiseki - Hisshou Pachi-Slot Doujou - Yamasa & Pioneer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -170359,7 +179143,8 @@ SLPS-01718:
     multitap: false
     linkCable: false
 SLPM-86340:
-  name: "That's QT (Japan)"
+  name: "That's QT"
+  saveName: "That's QT (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170683,7 +179468,8 @@ SLPS-00606:
     multitap: false
     linkCable: false
 SLPS-01768:
-  name: "Theme Aquarium (Japan)"
+  name: "Theme Aquarium"
+  saveName: "Theme Aquarium (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -170721,7 +179507,8 @@ SLPS-91470:
     multitap: false
     linkCable: false
 SLES-00627:
-  name: "Theme Hospital (Europe) (En,Fr,De,Es,It,Sv)"
+  name: "Theme Hospital"
+  saveName: "Theme Hospital (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -170744,7 +179531,8 @@ SLES-00627:
     multitap: false
     linkCable: false
 SLPS-01405:
-  name: "Theme Hospital (Japan)"
+  name: "Theme Hospital"
+  saveName: "Theme Hospital (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -170762,7 +179550,8 @@ SLPS-01405:
     multitap: false
     linkCable: false
 SLUS-00275:
-  name: "Theme Hospital (USA)"
+  name: "Theme Hospital"
+  saveName: "Theme Hospital (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -170780,7 +179569,8 @@ SLUS-00275:
     multitap: false
     linkCable: false
 SLES-00072:
-  name: "Theme Park (Europe) (En,Fr,De,Es,Sv)"
+  name: "Theme Park"
+  saveName: "Theme Park (Europe) (En,Fr,De,Es,Sv)"
   controllers:
     - DigitalController
   metadata:
@@ -170802,7 +179592,8 @@ SLES-00072:
     multitap: false
     linkCable: false
 SLPS-00175:
-  name: "Theme Park (Japan)"
+  name: "Theme Park"
+  saveName: "Theme Park (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -170820,7 +179611,8 @@ SLPS-00175:
     multitap: false
     linkCable: false
 SLPS-91013:
-  name: "Theme Park (Japan) (Rev 1)"
+  name: "Theme Park"
+  saveName: "Theme Park (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -170838,7 +179630,8 @@ SLPS-91013:
     multitap: false
     linkCable: false
 SLUS-00017:
-  name: "Theme Park (USA)"
+  name: "Theme Park"
+  saveName: "Theme Park (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1485-ge6156e2a"
@@ -170859,7 +179652,8 @@ SLUS-00017:
     multitap: false
     linkCable: false
 SLES-02688:
-  name: "Theme Park World (Europe) (En,Fr,De,Es,It,Nl,Sv)"
+  name: "Theme Park World"
+  saveName: "Theme Park World (Europe) (En,Fr,De,Es,It,Nl,Sv)"
   controllers:
     - DigitalController
   libcrypt: true
@@ -170884,7 +179678,8 @@ SLES-02688:
     multitap: false
     linkCable: false
 SLPS-02643:
-  name: "Theme Park World (Japan)"
+  name: "Theme Park World"
+  saveName: "Theme Park World (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -170902,7 +179697,8 @@ SLPS-02643:
     multitap: false
     linkCable: false
 SCES-01700:
-  name: "This Is Football (Europe)"
+  name: "This Is Football"
+  saveName: "This Is Football (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170922,7 +179718,8 @@ SCES-01700:
     multitap: true
     linkCable: false
 SCES-01882:
-  name: "This Is Football (Europe) (Fr,Nl)"
+  name: "This Is Football"
+  saveName: "This Is Football (Europe) (Fr,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170943,7 +179740,8 @@ SCES-01882:
     multitap: true
     linkCable: false
 SCES-01703:
-  name: "This Is Football (Italy)"
+  name: "This Is Football"
+  saveName: "This Is Football (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170963,7 +179761,8 @@ SCES-01703:
     multitap: true
     linkCable: false
 SCES-03236:
-  name: "This Is Football 2 (Belgium)"
+  name: "This Is Football 2"
+  saveName: "This Is Football 2 (Belgium)"
   controllers:
     - AnalogController
     - DigitalController
@@ -170982,11 +179781,13 @@ SCES-03236:
     multitap: true
     linkCable: false
 SCED-03237:
-  name: "This Is Football 2 (Belgium) (Demo)"
+  name: "This Is Football 2 (Demo)"
+  saveName: "This Is Football 2 (Belgium) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03070:
-  name: "This Is Football 2 (Europe)"
+  name: "This Is Football 2"
+  saveName: "This Is Football 2 (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -171007,7 +179808,8 @@ SCES-03070:
     multitap: true
     linkCable: false
 SCES-03075:
-  name: "This Is Football 2 (Italy)"
+  name: "This Is Football 2"
+  saveName: "This Is Football 2 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171026,11 +179828,13 @@ SCES-03075:
     multitap: true
     linkCable: false
 SCED-03204:
-  name: "This Is Football 2 (Italy) (Demo)"
+  name: "This Is Football 2 (Demo)"
+  saveName: "This Is Football 2 (Italy) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03072:
-  name: "This Is Football 2 (Netherlands)"
+  name: "This Is Football 2"
+  saveName: "This Is Football 2 (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171049,15 +179853,18 @@ SCES-03072:
     multitap: true
     linkCable: false
 SCED-03201:
-  name: "This Is Football 2 (Netherlands) (Demo)"
+  name: "This Is Football 2 (Demo)"
+  saveName: "This Is Football 2 (Netherlands) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-03199:
-  name: "This Is Football 2 (UK) (Demo)"
+  name: "This Is Football 2 (Demo)"
+  saveName: "This Is Football 2 (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-02269:
-  name: "This Is Soccer (Australia)"
+  name: "This Is Soccer"
+  saveName: "This Is Soccer (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171076,7 +179883,8 @@ SCES-02269:
     multitap: true
     linkCable: false
 SCES-03071:
-  name: "This Is Soccer 2 (Australia)"
+  name: "This Is Soccer 2"
+  saveName: "This Is Soccer 2 (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171095,11 +179903,13 @@ SCES-03071:
     multitap: true
     linkCable: false
 SCED-03200:
-  name: "This Is Soccer 2 (Australia) (Demo)"
+  name: "This Is Soccer 2 (Demo)"
+  saveName: "This Is Soccer 2 (Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01324:
-  name: "Thoroughbred Breeder - Sekai Seiha-hen (Japan)"
+  name: "Thoroughbred Breeder - Sekai Seiha-hen"
+  saveName: "Thoroughbred Breeder - Sekai Seiha-hen (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -171117,11 +179927,13 @@ SLPS-01324:
     multitap: false
     linkCable: false
 SLPM-80231:
-  name: "Thoroughbred Breeder - Sekai Seiha-hen (Japan) (Demo)"
+  name: "Thoroughbred Breeder - Sekai Seiha-hen (Demo)"
+  saveName: "Thoroughbred Breeder - Sekai Seiha-hen (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00053:
-  name: "Thoroughbred Breeder II Plus (Japan)"
+  name: "Thoroughbred Breeder II Plus"
+  saveName: "Thoroughbred Breeder II Plus (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -171139,7 +179951,8 @@ SLPS-00053:
     multitap: false
     linkCable: false
 SLPS-00177:
-  name: "Thoroughbred-tachi no Eikan - The Victorious Thoroughbreds (Japan)"
+  name: "Thoroughbred-tachi no Eikan - The Victorious Thoroughbreds"
+  saveName: "Thoroughbred-tachi no Eikan - The Victorious Thoroughbreds (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -171157,7 +179970,8 @@ SLPS-00177:
     multitap: false
     linkCable: false
 SLPS-01780:
-  name: "Thousand Arms (Japan) (Disc 1)"
+  name: "Thousand Arms (Disc 1)"
+  saveName: "Thousand Arms (Japan) (Disc 1)"
   discSet:
     name: "Thousand Arms (Japan)"
     serials:
@@ -171181,7 +179995,8 @@ SLPS-01780:
     multitap: false
     linkCable: false
 SLPS-01781:
-  name: "Thousand Arms (Japan) (Disc 2)"
+  name: "Thousand Arms (Disc 2)"
+  saveName: "Thousand Arms (Japan) (Disc 2)"
   discSet:
     name: "Thousand Arms (Japan)"
     serials:
@@ -171205,11 +180020,13 @@ SLPS-01781:
     multitap: false
     linkCable: false
 SLUS-90059:
-  name: "Thousand Arms (USA) (Demo)"
+  name: "Thousand Arms (Demo)"
+  saveName: "Thousand Arms (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00845:
-  name: "Thousand Arms (USA) (Disc 1)"
+  name: "Thousand Arms (Disc 1)"
+  saveName: "Thousand Arms (USA) (Disc 1)"
   discSet:
     name: "Thousand Arms (USA)"
     serials:
@@ -171236,7 +180053,8 @@ SLUS-00845:
     multitap: false
     linkCable: false
 SLUS-00858:
-  name: "Thousand Arms (USA) (Disc 2)"
+  name: "Thousand Arms (Disc 2)"
+  saveName: "Thousand Arms (USA) (Disc 2)"
   discSet:
     name: "Thousand Arms (USA)"
     serials:
@@ -171263,7 +180081,8 @@ SLUS-00858:
     multitap: false
     linkCable: false
 SLPS-02589:
-  name: "Thrasher - SK8 (Japan)"
+  name: "Thrasher - SK8"
+  saveName: "Thrasher - SK8 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171282,7 +180101,8 @@ SLPS-02589:
     multitap: false
     linkCable: false
 SLES-02556:
-  name: "Thrasher - Skate and Destroy (Australia)"
+  name: "Thrasher - Skate and Destroy"
+  saveName: "Thrasher - Skate and Destroy (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171301,7 +180121,8 @@ SLES-02556:
     multitap: false
     linkCable: false
 SLES-02340:
-  name: "Thrasher - Skate and Destroy (Europe) (En,Fr,De,Es,It)"
+  name: "Thrasher - Skate and Destroy"
+  saveName: "Thrasher - Skate and Destroy (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171324,7 +180145,8 @@ SLES-02340:
     multitap: false
     linkCable: false
 SLUS-00935:
-  name: "Thrasher - Skate and Destroy (USA)"
+  name: "Thrasher - Skate and Destroy"
+  saveName: "Thrasher - Skate and Destroy (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171343,11 +180165,13 @@ SLUS-00935:
     multitap: false
     linkCable: false
 SLUS-90067:
-  name: "Thrasher - Skate and Destroy (USA) (Demo)"
+  name: "Thrasher - Skate and Destroy (Demo)"
+  saveName: "Thrasher - Skate and Destroy (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01019:
-  name: "Threads of Fate (USA)"
+  name: "Threads of Fate"
+  saveName: "Threads of Fate (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1419-g34a515cd"
@@ -171371,7 +180195,8 @@ SLUS-01019:
     multitap: false
     linkCable: false
 LSP-903174:
-  name: "Three Decoders 1, The - Riddle of the Ring (USA)"
+  name: "Three Decoders 1, The - Riddle of the Ring"
+  saveName: "Three Decoders 1, The - Riddle of the Ring (USA)"
   codes:
     - LSP-903174
     - LSP-90317401
@@ -171383,7 +180208,8 @@ LSP-903174:
     languages:
       - English
 LSP-903181:
-  name: "Three Decoders 2, The - Key to the Carousel (USA)"
+  name: "Three Decoders 2, The - Key to the Carousel"
+  saveName: "Three Decoders 2, The - Key to the Carousel (USA)"
   codes:
     - LSP-903181
     - LSP-90318101
@@ -171395,7 +180221,8 @@ LSP-903181:
     languages:
       - English
 SLES-00876:
-  name: "Three Lions (UK) (En,Fr,De,Es,It)"
+  name: "Three Lions"
+  saveName: "Three Lions (UK) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171418,7 +180245,8 @@ SLES-00876:
     multitap: false
     linkCable: false
 SLUS-01486:
-  name: "Three Stooges, The (USA)"
+  name: "Three Stooges, The"
+  saveName: "Three Stooges, The (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -171440,12 +180268,14 @@ SLUS-01486:
     multitap: false
     linkCable: false
 SLUS-00752:
-  name: "Thrill Kill (USA) (Beta)"
+  name: "Thrill Kill (Beta)"
+  saveName: "Thrill Kill (USA) (Beta)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
 SLPS-01406:
-  name: "Thunder Force V - Perfect System (Japan)"
+  name: "Thunder Force V - Perfect System"
+  saveName: "Thunder Force V - Perfect System (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed219"
@@ -171470,7 +180300,8 @@ SLPS-01406:
     multitap: false
     linkCable: false
 SLUS-00727:
-  name: "Thunder Force V - Perfect System (USA)"
+  name: "Thunder Force V - Perfect System"
+  saveName: "Thunder Force V - Perfect System (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171489,7 +180320,8 @@ SLUS-00727:
     multitap: false
     linkCable: false
 SLPS-00094:
-  name: "Thunder Storm & Road Blaster (Japan) (Disc 1) (Thunder Storm)"
+  name: "Thunder Storm & Road Blaster (Disc 1) (Thunder Storm)"
+  saveName: "Thunder Storm & Road Blaster (Japan) (Disc 1) (Thunder Storm)"
   discSet:
     name: "Thunder Storm & Road Blaster (Japan)"
     serials:
@@ -171513,7 +180345,8 @@ SLPS-00094:
     multitap: false
     linkCable: false
 SLPS-00095:
-  name: "Thunder Storm & Road Blaster (Japan) (Disc 2) (Road Blaster)"
+  name: "Thunder Storm & Road Blaster (Disc 2) (Road Blaster)"
+  saveName: "Thunder Storm & Road Blaster (Japan) (Disc 2) (Road Blaster)"
   discSet:
     name: "Thunder Storm & Road Blaster (Japan)"
     serials:
@@ -171537,7 +180370,8 @@ SLPS-00095:
     multitap: false
     linkCable: false
 SCUS-94352:
-  name: "Thunder Truck Rally (USA)"
+  name: "Thunder Truck Rally"
+  saveName: "Thunder Truck Rally (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -171556,7 +180390,8 @@ SCUS-94352:
     multitap: false
     linkCable: false
 SLPS-00357:
-  name: "Thunderhawk II (Japan)"
+  name: "Thunderhawk II"
+  saveName: "Thunderhawk II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -171574,7 +180409,8 @@ SLPS-00357:
     multitap: false
     linkCable: false
 SLUS-00191:
-  name: "Thunderstrike 2 (USA)"
+  name: "Thunderstrike 2"
+  saveName: "Thunderstrike 2 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -171592,7 +180428,8 @@ SLUS-00191:
     multitap: false
     linkCable: false
 SLES-01674:
-  name: "Tiger Woods 99 PGA Tour Golf (Europe) (En,Fr,De,Es,Sv)"
+  name: "Tiger Woods 99 PGA Tour Golf"
+  saveName: "Tiger Woods 99 PGA Tour Golf (Europe) (En,Fr,De,Es,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171615,7 +180452,8 @@ SLES-01674:
     multitap: true
     linkCable: false
 SLPS-02012:
-  name: "Tiger Woods 99 PGA Tour Golf (Japan)"
+  name: "Tiger Woods 99 PGA Tour Golf"
+  saveName: "Tiger Woods 99 PGA Tour Golf (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171634,7 +180472,8 @@ SLPS-02012:
     multitap: true
     linkCable: false
 SLUS-00785:
-  name: "Tiger Woods 99 PGA Tour Golf (USA)"
+  name: "Tiger Woods 99 PGA Tour Golf"
+  saveName: "Tiger Woods 99 PGA Tour Golf (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -171656,7 +180495,8 @@ SLUS-00785:
     multitap: true
     linkCable: false
 SLES-01675:
-  name: "Tiger Woods 99 USA Tour Golf (Australia)"
+  name: "Tiger Woods 99 USA Tour Golf"
+  saveName: "Tiger Woods 99 USA Tour Golf (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171674,7 +180514,8 @@ SLES-01675:
     multitap: true
     linkCable: false
 SLES-02551:
-  name: "Tiger Woods PGA Tour 2000 (Europe) (En,Fr,De,Es,Sv)"
+  name: "Tiger Woods PGA Tour 2000"
+  saveName: "Tiger Woods PGA Tour 2000 (Europe) (En,Fr,De,Es,Sv)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171697,7 +180538,8 @@ SLES-02551:
     multitap: true
     linkCable: false
 SLUS-01054:
-  name: "Tiger Woods PGA Tour 2000 (USA)"
+  name: "Tiger Woods PGA Tour 2000"
+  saveName: "Tiger Woods PGA Tour 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171716,7 +180558,8 @@ SLUS-01054:
     multitap: true
     linkCable: false
 SLES-03148:
-  name: "Tiger Woods PGA Tour Golf (Europe)"
+  name: "Tiger Woods PGA Tour Golf"
+  saveName: "Tiger Woods PGA Tour Golf (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171735,7 +180578,8 @@ SLES-03148:
     multitap: true
     linkCable: false
 SLUS-01273:
-  name: "Tiger Woods PGA Tour Golf (USA)"
+  name: "Tiger Woods PGA Tour Golf"
+  saveName: "Tiger Woods PGA Tour Golf (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171754,7 +180598,8 @@ SLUS-01273:
     multitap: true
     linkCable: false
 SLES-02595:
-  name: "Tiger Woods USA Tour 2000 (Australia)"
+  name: "Tiger Woods USA Tour 2000"
+  saveName: "Tiger Woods USA Tour 2000 (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171773,7 +180618,8 @@ SLES-02595:
     multitap: true
     linkCable: false
 SLES-03337:
-  name: "Tiger Woods USA Tour 2001 (Australia)"
+  name: "Tiger Woods USA Tour 2001"
+  saveName: "Tiger Woods USA Tour 2001 (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -171792,7 +180638,8 @@ SLES-03337:
     multitap: true
     linkCable: false
 SLES-00728:
-  name: "Tigershark (Europe)"
+  name: "Tigershark"
+  saveName: "Tigershark (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -171810,7 +180657,8 @@ SLES-00728:
     multitap: false
     linkCable: false
 SLPS-01017:
-  name: "Tigershark (Japan)"
+  name: "Tigershark"
+  saveName: "Tigershark (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -171828,7 +180676,8 @@ SLPS-01017:
     multitap: false
     linkCable: false
 SLUS-00346:
-  name: "Tigershark (USA)"
+  name: "Tigershark"
+  saveName: "Tigershark (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2538-g5c6ee953"
@@ -171849,7 +180698,8 @@ SLUS-00346:
     multitap: false
     linkCable: false
 SLPS-00717:
-  name: "Tilk - Aoi Umi kara Kita Shoujo (Japan)"
+  name: "Tilk - Aoi Umi kara Kita Shoujo"
+  saveName: "Tilk - Aoi Umi kara Kita Shoujo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -171867,7 +180717,8 @@ SLPS-00717:
     multitap: false
     linkCable: false
 SLES-00152:
-  name: "Tilt! (Europe) (En,Fr,De)"
+  name: "Tilt!"
+  saveName: "Tilt! (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -171887,7 +180738,8 @@ SLES-00152:
     multitap: false
     linkCable: false
 SLES-03651:
-  name: "Time Bokan - Yattaman (Italy)"
+  name: "Time Bokan - Yattaman"
+  saveName: "Time Bokan - Yattaman (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -171905,7 +180757,8 @@ SLES-03651:
     multitap: false
     linkCable: false
 SLPS-03133:
-  name: "Time Bokan Series - Bokan GoGoGo (Japan)"
+  name: "Time Bokan Series - Bokan GoGoGo"
+  saveName: "Time Bokan Series - Bokan GoGoGo (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed219"
@@ -171927,7 +180780,8 @@ SLPS-03133:
     multitap: false
     linkCable: false
 SLPS-01211:
-  name: "Time Bokan Series - Bokan desu yo (Japan)"
+  name: "Time Bokan Series - Bokan desu yo"
+  saveName: "Time Bokan Series - Bokan desu yo (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -171950,7 +180804,8 @@ SLPS-01211:
     multitap: false
     linkCable: false
 SLPS-00609:
-  name: "Time Bokan Series - Bokan to Ippatsu! Doronboo (Japan)"
+  name: "Time Bokan Series - Bokan to Ippatsu! Doronboo"
+  saveName: "Time Bokan Series - Bokan to Ippatsu! Doronboo (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -171974,9 +180829,11 @@ SLPS-00609:
     multitap: false
     linkCable: false
 SLPM-80064:
-  name: "Time Bokan Series - Bokan to Ippatsu! Doronboo (Japan) (Taikenban)"
+  name: "Time Bokan Series - Bokan to Ippatsu! Doronboo (Taikenban)"
+  saveName: "Time Bokan Series - Bokan to Ippatsu! Doronboo (Japan) (Taikenban)"
 SLES-00488:
-  name: "Time Commando (Australia)"
+  name: "Time Commando"
+  saveName: "Time Commando (Australia)"
   controllers:
     - DigitalController
   metadata:
@@ -171993,7 +180850,8 @@ SLES-00488:
     multitap: false
     linkCable: false
 SLES-00224:
-  name: "Time Commando (Europe)"
+  name: "Time Commando"
+  saveName: "Time Commando (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -172011,7 +180869,8 @@ SLES-00224:
     multitap: false
     linkCable: false
 SLPS-00556:
-  name: "Time Commando (Japan)"
+  name: "Time Commando"
+  saveName: "Time Commando (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -172029,7 +180888,8 @@ SLPS-00556:
     multitap: false
     linkCable: false
 SLUS-00342:
-  name: "Time Commando (USA)"
+  name: "Time Commando"
+  saveName: "Time Commando (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -172047,7 +180907,8 @@ SLUS-00342:
     multitap: false
     linkCable: false
 SCES-00657:
-  name: "Time Crisis (Europe) (En,Fr,De)"
+  name: "Time Crisis"
+  saveName: "Time Crisis (Europe) (En,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2202-ga17e15f1"
@@ -172072,7 +180933,8 @@ SCES-00657:
     multitap: false
     linkCable: false
 SLPS-00666:
-  name: "Time Crisis (Japan)"
+  name: "Time Crisis"
+  saveName: "Time Crisis (Japan)"
   controllers:
     - DigitalController
     - GunCon
@@ -172095,7 +180957,8 @@ SLPS-00666:
     multitap: false
     linkCable: false
 SLPS-00635:
-  name: "Time Crisis (Japan) (Time Crisis + GunCon)"
+  name: "Time Crisis (Time Crisis + GunCon)"
+  saveName: "Time Crisis (Japan) (Time Crisis + GunCon)"
   controllers:
     - DigitalController
     - GunCon
@@ -172115,7 +180978,8 @@ SLPS-00635:
     multitap: false
     linkCable: false
 SLUS-00405:
-  name: "Time Crisis (USA)"
+  name: "Time Crisis"
+  saveName: "Time Crisis (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1334-g10f23667"
@@ -172158,7 +181022,8 @@ SCPS-45514:
     multitap: false
     linkCable: false
 SCES-02776:
-  name: "Time Crisis - Project Titan (Europe) (En,Fr,De,Es,It)"
+  name: "Time Crisis - Project Titan"
+  saveName: "Time Crisis - Project Titan (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2202-ga17e15f1"
@@ -172185,7 +181050,8 @@ SCES-02776:
     multitap: false
     linkCable: false
 SLPS-03188:
-  name: "Time Crisis - Project Titan (Japan)"
+  name: "Time Crisis - Project Titan"
+  saveName: "Time Crisis - Project Titan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172205,7 +181071,8 @@ SLPS-03188:
     multitap: false
     linkCable: false
 SLUS-01336:
-  name: "Time Crisis - Project Titan (USA)"
+  name: "Time Crisis - Project Titan"
+  saveName: "Time Crisis - Project Titan (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1425-g05f0ce6d"
@@ -172248,7 +181115,8 @@ SCPS-45334:
     multitap: false
     linkCable: false
 SLPS-00383:
-  name: "Time Gal & Ninja Hayate (Japan) (En,Ja) (Disc 1) (Time Gal)"
+  name: "Time Gal & Ninja Hayate (Disc 1) (Time Gal)"
+  saveName: "Time Gal & Ninja Hayate (Japan) (En,Ja) (Disc 1) (Time Gal)"
   discSet:
     name: "Time Gal & Ninja Hayate (Japan) (En,Ja)"
     serials:
@@ -172272,7 +181140,8 @@ SLPS-00383:
     multitap: false
     linkCable: false
 SLPS-00384:
-  name: "Time Gal & Ninja Hayate (Japan) (En,Ja) (Disc 2) (Ninja Hayate)"
+  name: "Time Gal & Ninja Hayate (Disc 2) (Ninja Hayate)"
+  saveName: "Time Gal & Ninja Hayate (Japan) (En,Ja) (Disc 2) (Ninja Hayate)"
   discSet:
     name: "Time Gal & Ninja Hayate (Japan) (En,Ja)"
     serials:
@@ -172296,7 +181165,8 @@ SLPS-00384:
     multitap: false
     linkCable: false
 LSP-907387:
-  name: "Timeless Jade Trade (USA)"
+  name: "Timeless Jade Trade"
+  saveName: "Timeless Jade Trade (USA)"
   codes:
     - LSP-907387
     - LSP90738700
@@ -172308,7 +181178,8 @@ LSP-907387:
     languages:
       - English
 LSP-040110:
-  name: "Timeless Math 1 - Maya, Search and Rescue (USA)"
+  name: "Timeless Math 1 - Maya, Search and Rescue"
+  saveName: "Timeless Math 1 - Maya, Search and Rescue (USA)"
   codes:
     - LSP-040110
     - LSP04011001
@@ -172320,7 +181191,8 @@ LSP-040110:
     languages:
       - English
 LSP-040130:
-  name: "Timeless Math 2 - Maya, Observatory (USA)"
+  name: "Timeless Math 2 - Maya, Observatory"
+  saveName: "Timeless Math 2 - Maya, Observatory (USA)"
   codes:
     - LSP-040130
     - LSP04013001
@@ -172333,7 +181205,8 @@ LSP-040130:
     languages:
       - English
 LSP-040120:
-  name: "Timeless Math 3 - Maya, King Jaguar's Village (USA)"
+  name: "Timeless Math 3 - Maya, King Jaguar's Village"
+  saveName: "Timeless Math 3 - Maya, King Jaguar's Village (USA)"
   codes:
     - LSP-040120
     - LSP04012001
@@ -172346,7 +181219,8 @@ LSP-040120:
     languages:
       - English
 LSP-040410:
-  name: "Timeless Math 4 - Lunar Base (USA)"
+  name: "Timeless Math 4 - Lunar Base"
+  saveName: "Timeless Math 4 - Lunar Base (USA)"
   codes:
     - LSP-040410
     - LSP04041001
@@ -172358,7 +181232,8 @@ LSP-040410:
     languages:
       - English
 LSP-040510:
-  name: "Timeless Math 5 - Space Flight Rescue (USA)"
+  name: "Timeless Math 5 - Space Flight Rescue"
+  saveName: "Timeless Math 5 - Space Flight Rescue (USA)"
   codes:
     - LSP-040510
     - LSP04051001
@@ -172371,7 +181246,8 @@ LSP-040510:
     languages:
       - English
 LSP-907363:
-  name: "Timeless Math 6 - Brainswarm (USA)"
+  name: "Timeless Math 6 - Brainswarm"
+  saveName: "Timeless Math 6 - Brainswarm (USA)"
   codes:
     - LSP-907363
     - LSP90736300
@@ -172383,7 +181259,8 @@ LSP-907363:
     languages:
       - English
 LSP-907370:
-  name: "Timeless Math 7 - Rover Recovery (USA)"
+  name: "Timeless Math 7 - Rover Recovery"
+  saveName: "Timeless Math 7 - Rover Recovery (USA)"
   codes:
     - LSP-907370
     - LSP90737000
@@ -172396,7 +181273,8 @@ LSP-907370:
     languages:
       - English
 SLES-03459:
-  name: "Tintin - Destination Adventure (Europe) (En,Fr,De,Es,It,Nl,Pt)"
+  name: "Tintin - Destination Adventure"
+  saveName: "Tintin - Destination Adventure (Europe) (En,Fr,De,Es,It,Nl,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172421,7 +181299,8 @@ SLES-03459:
     multitap: false
     linkCable: false
 SCPS-10130:
-  name: "Tiny Bullets (Japan)"
+  name: "Tiny Bullets"
+  saveName: "Tiny Bullets (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172440,7 +181319,8 @@ SCPS-10130:
     multitap: false
     linkCable: false
 SCES-01338:
-  name: "Tiny Tank (Europe)"
+  name: "Tiny Tank"
+  saveName: "Tiny Tank (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172459,7 +181339,8 @@ SCES-01338:
     multitap: false
     linkCable: false
 SCES-02072:
-  name: "Tiny Tank (France)"
+  name: "Tiny Tank"
+  saveName: "Tiny Tank (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172478,7 +181359,8 @@ SCES-02072:
     multitap: false
     linkCable: false
 SCES-02073:
-  name: "Tiny Tank (Germany)"
+  name: "Tiny Tank"
+  saveName: "Tiny Tank (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172497,7 +181379,8 @@ SCES-02073:
     multitap: false
     linkCable: false
 SCES-02074:
-  name: "Tiny Tank (Italy)"
+  name: "Tiny Tank"
+  saveName: "Tiny Tank (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172516,7 +181399,8 @@ SCES-02074:
     multitap: false
     linkCable: false
 SCES-02075:
-  name: "Tiny Tank (Spain)"
+  name: "Tiny Tank"
+  saveName: "Tiny Tank (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172535,7 +181419,8 @@ SCES-02075:
     multitap: false
     linkCable: false
 SCUS-94427:
-  name: "Tiny Tank (USA)"
+  name: "Tiny Tank"
+  saveName: "Tiny Tank (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -172557,7 +181442,8 @@ SCUS-94427:
     multitap: false
     linkCable: false
 SCES-01997:
-  name: "Tiny Toon Adventures - Buster and the Beanstalk (Europe) (En,Es,Pt)"
+  name: "Tiny Toon Adventures - Buster and the Beanstalk"
+  saveName: "Tiny Toon Adventures - Buster and the Beanstalk (Europe) (En,Es,Pt)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172581,7 +181467,8 @@ SCES-01997:
     multitap: false
     linkCable: false
 SCES-01996:
-  name: "Tiny Toon Adventures - Buster and the Beanstalk (Europe) (Fr,De,It)"
+  name: "Tiny Toon Adventures - Buster and the Beanstalk"
+  saveName: "Tiny Toon Adventures - Buster and the Beanstalk (Europe) (Fr,De,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172605,7 +181492,8 @@ SCES-01996:
     multitap: false
     linkCable: false
 SCES-01998:
-  name: "Tiny Toon Adventures - Buster and the Beanstalk (Scandinavia) (No,Da)"
+  name: "Tiny Toon Adventures - Buster and the Beanstalk"
+  saveName: "Tiny Toon Adventures - Buster and the Beanstalk (Scandinavia) (No,Da)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172629,7 +181517,8 @@ SCES-01998:
     multitap: false
     linkCable: false
 SLES-03547:
-  name: "Tiny Toon Adventures - Plucky's Big Adventure (Europe) (En,Fr,De)"
+  name: "Tiny Toon Adventures - Plucky's Big Adventure"
+  saveName: "Tiny Toon Adventures - Plucky's Big Adventure (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172650,7 +181539,8 @@ SLES-03547:
     multitap: false
     linkCable: false
 SLUS-01393:
-  name: "Tiny Toon Adventures - Plucky's Big Adventure (USA)"
+  name: "Tiny Toon Adventures - Plucky's Big Adventure"
+  saveName: "Tiny Toon Adventures - Plucky's Big Adventure (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1337-gcaf9943"
@@ -172672,7 +181562,8 @@ SLUS-01393:
     multitap: false
     linkCable: false
 SLUS-00638:
-  name: "Tiny Toon Adventures - The Great Beanstalk (USA)"
+  name: "Tiny Toon Adventures - The Great Beanstalk"
+  saveName: "Tiny Toon Adventures - The Great Beanstalk (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172694,7 +181585,8 @@ SLUS-00638:
     multitap: false
     linkCable: false
 SLES-02923:
-  name: "Tiny Toon Adventures - Toonenstein - Dare to Scare! (Europe)"
+  name: "Tiny Toon Adventures - Toonenstein - Dare to Scare!"
+  saveName: "Tiny Toon Adventures - Toonenstein - Dare to Scare! (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172716,7 +181608,8 @@ SLES-02923:
     multitap: false
     linkCable: false
 SLUS-00967:
-  name: "Tiny Toon Adventures - Toonenstein - Dare to Scare! (USA)"
+  name: "Tiny Toon Adventures - Toonenstein - Dare to Scare!"
+  saveName: "Tiny Toon Adventures - Toonenstein - Dare to Scare! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172738,7 +181631,8 @@ SLUS-00967:
     multitap: false
     linkCable: false
 SLES-02927:
-  name: "Tiny Toon Adventures - Toonenstein - Geisterstunde! (Germany)"
+  name: "Tiny Toon Adventures - Toonenstein - Geisterstunde!"
+  saveName: "Tiny Toon Adventures - Toonenstein - Geisterstunde! (Germany)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172760,7 +181654,8 @@ SLES-02927:
     multitap: false
     linkCable: false
 SLES-02926:
-  name: "Tiny Toon Adventures - Toonenstein - Le Chateau hante (France)"
+  name: "Tiny Toon Adventures - Toonenstein - Le Chateau hante"
+  saveName: "Tiny Toon Adventures - Toonenstein - Le Chateau hante (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172782,11 +181677,13 @@ SLES-02926:
     multitap: false
     linkCable: false
 SLUS-90082:
-  name: "Titan A.E. (USA) (Demo)"
+  name: "Titan A.E. (Demo)"
+  saveName: "Titan A.E. (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00275:
-  name: "Titan Wars (Europe)"
+  name: "Titan Wars"
+  saveName: "Titan Wars (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -172808,7 +181705,8 @@ SLES-00275:
     multitap: false
     linkCable: false
 SLPS-01919:
-  name: "ToHeart (Japan) (Disc 1)"
+  name: "ToHeart (Disc 1)"
+  saveName: "ToHeart (Japan) (Disc 1)"
   discSet:
     name: "ToHeart (Japan)"
     serials:
@@ -172832,7 +181730,8 @@ SLPS-01919:
     multitap: false
     linkCable: false
 SLPS-01920:
-  name: "ToHeart (Japan) (Disc 2)"
+  name: "ToHeart (Disc 2)"
+  saveName: "ToHeart (Japan) (Disc 2)"
   discSet:
     name: "ToHeart (Japan)"
     serials:
@@ -172856,7 +181755,8 @@ SLPS-01920:
     multitap: false
     linkCable: false
 SLPS-00620:
-  name: "ToPoLo (Japan)"
+  name: "ToPoLo"
+  saveName: "ToPoLo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -172874,11 +181774,13 @@ SLPS-00620:
     multitap: false
     linkCable: false
 SLPM-80059:
-  name: "ToPoLo (Japan) (Demo)"
+  name: "ToPoLo (Demo)"
+  saveName: "ToPoLo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00436:
-  name: "Toaplan Shooting Battle 1 (Japan)"
+  name: "Toaplan Shooting Battle 1"
+  saveName: "Toaplan Shooting Battle 1 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -172899,7 +181801,8 @@ SLPS-00436:
     multitap: false
     linkCable: false
 SLPS-02749:
-  name: "Tobaku Mokushiroku Kaiji (Japan)"
+  name: "Tobaku Mokushiroku Kaiji"
+  saveName: "Tobaku Mokushiroku Kaiji (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172918,7 +181821,8 @@ SLPS-02749:
     multitap: false
     linkCable: false
 SLPM-87406:
-  name: "Tobal 2 (Japan) (Rev 1)"
+  name: "Tobal 2"
+  saveName: "Tobal 2 (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -172937,7 +181841,8 @@ SLPM-87406:
     multitap: false
     linkCable: false
 SCPS-45025:
-  name: "Tobal 2 (Japan, Asia)"
+  name: "Tobal 2"
+  saveName: "Tobal 2 (Japan, Asia)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -172961,7 +181866,8 @@ SCPS-45025:
     multitap: false
     linkCable: false
 SCES-00497:
-  name: "Tobal No. 1 (Europe)"
+  name: "Tobal No. 1"
+  saveName: "Tobal No. 1 (Europe)"
   controllers:
     - DigitalController
   codes:
@@ -172982,7 +181888,8 @@ SCES-00497:
     multitap: false
     linkCable: false
 SLPM-80044:
-  name: "Tobal No. 1 (Japan)"
+  name: "Tobal No. 1"
+  saveName: "Tobal No. 1 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2373-gb2de5945"
@@ -173007,7 +181914,8 @@ SLPM-80044:
     multitap: false
     linkCable: false
 SCUS-94208:
-  name: "Tobal No. 1 (USA)"
+  name: "Tobal No. 1"
+  saveName: "Tobal No. 1 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1265-gdd9a419"
@@ -173028,7 +181936,8 @@ SCUS-94208:
     multitap: false
     linkCable: false
 SLPS-01651:
-  name: "Todd McFarlane's Spawn - The Ultimate (Japan)"
+  name: "Todd McFarlane's Spawn - The Ultimate"
+  saveName: "Todd McFarlane's Spawn - The Ultimate (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -173046,7 +181955,8 @@ SLPS-01651:
     multitap: false
     linkCable: false
 SLPM-86053:
-  name: "Tokimeki Memorial - Forever with You (Japan) (PlayStation the Best)"
+  name: "Tokimeki Memorial - Forever with You (PlayStation the Best)"
+  saveName: "Tokimeki Memorial - Forever with You (Japan) (PlayStation the Best)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -173065,7 +181975,8 @@ SLPM-86053:
     multitap: false
     linkCable: false
 SLPS-00065:
-  name: "Tokimeki Memorial - Forever with You (Japan)"
+  name: "Tokimeki Memorial - Forever with You"
+  saveName: "Tokimeki Memorial - Forever with You (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -173088,7 +181999,8 @@ SLPS-00065:
     multitap: false
     linkCable: false
 SLPS-00064:
-  name: "Tokimeki Memorial - Forever with You (Japan) (Shokai Genteiban)"
+  name: "Tokimeki Memorial - Forever with You (Shokai Genteiban)"
+  saveName: "Tokimeki Memorial - Forever with You (Japan) (Shokai Genteiban)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -173125,7 +182037,8 @@ SLPM-87306:
     multitap: false
     linkCable: false
 SLPM-86036:
-  name: "Tokimeki Memorial - Taisen Tokkaedama (Japan)"
+  name: "Tokimeki Memorial - Taisen Tokkaedama"
+  saveName: "Tokimeki Memorial - Taisen Tokkaedama (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -173169,7 +182082,8 @@ SCPS-45451:
     multitap: false
     linkCable: false
 SLPM-86355:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 1)"
+  name: "Tokimeki Memorial 2 (Disc 1)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 1)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173209,7 +182123,8 @@ SLPM-86355:
     multitap: false
     linkCable: false
 SLPM-86350:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 1) (Limited Box)"
+  name: "Tokimeki Memorial 2 (Disc 1) (Limited Box)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 1) (Limited Box)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173249,7 +182164,8 @@ SLPM-86350:
     multitap: false
     linkCable: false
 SLPM-86356:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 2)"
+  name: "Tokimeki Memorial 2 (Disc 2)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 2)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173289,7 +182205,8 @@ SLPM-86356:
     multitap: false
     linkCable: false
 SLPM-86351:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 2) (Limited Box)"
+  name: "Tokimeki Memorial 2 (Disc 2) (Limited Box)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 2) (Limited Box)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173329,7 +182246,8 @@ SLPM-86351:
     multitap: false
     linkCable: false
 SLPM-86357:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 3)"
+  name: "Tokimeki Memorial 2 (Disc 3)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 3)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173369,7 +182287,8 @@ SLPM-86357:
     multitap: false
     linkCable: false
 SLPM-86352:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 3) (Limited Box)"
+  name: "Tokimeki Memorial 2 (Disc 3) (Limited Box)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 3) (Limited Box)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173409,7 +182328,8 @@ SLPM-86352:
     multitap: false
     linkCable: false
 SLPM-86358:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 4)"
+  name: "Tokimeki Memorial 2 (Disc 4)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 4)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173449,7 +182369,8 @@ SLPM-86358:
     multitap: false
     linkCable: false
 SLPM-86353:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 4) (Limited Box)"
+  name: "Tokimeki Memorial 2 (Disc 4) (Limited Box)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 4) (Limited Box)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173489,7 +182410,8 @@ SLPM-86353:
     multitap: false
     linkCable: false
 SLPM-86359:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 5)"
+  name: "Tokimeki Memorial 2 (Disc 5)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 5)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173529,7 +182451,8 @@ SLPM-86359:
     multitap: false
     linkCable: false
 SLPM-86354:
-  name: "Tokimeki Memorial 2 (Japan) (Disc 5) (Limited Box)"
+  name: "Tokimeki Memorial 2 (Disc 5) (Limited Box)"
+  saveName: "Tokimeki Memorial 2 (Japan) (Disc 5) (Limited Box)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173673,7 +182596,8 @@ SLPM-87312:
     multitap: false
     linkCable: false
 SLPM-86753:
-  name: "Tokimeki Memorial 2 - Taisen Puzzledama (Japan)"
+  name: "Tokimeki Memorial 2 - Taisen Puzzledama"
+  saveName: "Tokimeki Memorial 2 - Taisen Puzzledama (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -173692,7 +182616,8 @@ SLPM-86753:
     multitap: false
     linkCable: false
 SLPM-80527:
-  name: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Japan) (Disc 1) (Minadzuki - Kotobuki - Sakura)"
+  name: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Disc 1) (Minadzuki - Kotobuki - Sakura)"
+  saveName: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Japan) (Disc 1) (Minadzuki - Kotobuki - Sakura)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173715,7 +182640,8 @@ SLPM-80527:
       - SLPM-80544 # Append Disc 2
       - SLPM-80550 # Append Disc 3
 SLPM-80544:
-  name: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Japan) (Disc 2) (Akai - Ichimonji - Yae)"
+  name: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Disc 2) (Akai - Ichimonji - Yae)"
+  saveName: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Japan) (Disc 2) (Akai - Ichimonji - Yae)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173738,7 +182664,8 @@ SLPM-80544:
       - SLPM-80544 # Append Disc 2
       - SLPM-80550 # Append Disc 3
 SLPM-80550:
-  name: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Japan) (Disc 3) (Shirayuki - Ijuin - Nozaki)"
+  name: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Disc 3) (Shirayuki - Ijuin - Nozaki)"
+  saveName: "Tokimeki Memorial 2 Emotional Voice System Append Disc (Japan) (Disc 3) (Shirayuki - Ijuin - Nozaki)"
   discSet:
     name: "Tokimeki Memorial 2 (Japan)"
     serials:
@@ -173761,7 +182688,8 @@ SLPM-80550:
       - SLPM-80544 # Append Disc 2
       - SLPM-80550 # Append Disc 3
 SLPM-86549:
-  name: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Japan) (Disc 1)"
+  name: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Disc 1)"
+  saveName: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Japan) (Disc 1)"
   discSet:
     name: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Japan)"
     serials:
@@ -173785,7 +182713,8 @@ SLPM-86549:
     multitap: false
     linkCable: false
 SLPM-86550:
-  name: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Japan) (Disc 2)"
+  name: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Disc 2)"
+  saveName: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Japan) (Disc 2)"
   discSet:
     name: "Tokimeki Memorial 2 Substories - Dancing Summer Vacation (Japan)"
     serials:
@@ -173809,7 +182738,8 @@ SLPM-86550:
     multitap: false
     linkCable: false
 SLPM-86775:
-  name: "Tokimeki Memorial 2 Substories - Leaping School Festival (Japan) (Disc 1)"
+  name: "Tokimeki Memorial 2 Substories - Leaping School Festival (Disc 1)"
+  saveName: "Tokimeki Memorial 2 Substories - Leaping School Festival (Japan) (Disc 1)"
   discSet:
     name: "Tokimeki Memorial 2 Substories - Leaping School Festival (Japan)"
     serials:
@@ -173836,7 +182766,8 @@ SLPM-86775:
     multitap: false
     linkCable: false
 SLPM-86776:
-  name: "Tokimeki Memorial 2 Substories - Leaping School Festival (Japan) (Disc 2)"
+  name: "Tokimeki Memorial 2 Substories - Leaping School Festival (Disc 2)"
+  saveName: "Tokimeki Memorial 2 Substories - Leaping School Festival (Japan) (Disc 2)"
   discSet:
     name: "Tokimeki Memorial 2 Substories - Leaping School Festival (Japan)"
     serials:
@@ -173863,7 +182794,8 @@ SLPM-86776:
     multitap: false
     linkCable: false
 SLPM-86881:
-  name: "Tokimeki Memorial 2 Substories - Memories Ringing On (Japan) (Disc 1)"
+  name: "Tokimeki Memorial 2 Substories - Memories Ringing On (Disc 1)"
+  saveName: "Tokimeki Memorial 2 Substories - Memories Ringing On (Japan) (Disc 1)"
   discSet:
     name: "Tokimeki Memorial 2 Substories - Memories Ringing On (Japan)"
     serials:
@@ -173887,7 +182819,8 @@ SLPM-86881:
     multitap: false
     linkCable: false
 SLPM-86882:
-  name: "Tokimeki Memorial 2 Substories - Memories Ringing On (Japan) (Disc 2)"
+  name: "Tokimeki Memorial 2 Substories - Memories Ringing On (Disc 2)"
+  saveName: "Tokimeki Memorial 2 Substories - Memories Ringing On (Japan) (Disc 2)"
   discSet:
     name: "Tokimeki Memorial 2 Substories - Memories Ringing On (Japan)"
     serials:
@@ -173955,7 +182888,8 @@ SLPM-87308:
     multitap: false
     linkCable: false
 SLPM-86039:
-  name: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun (Japan)"
+  name: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun"
+  saveName: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -173976,11 +182910,13 @@ SLPM-86039:
     multitap: false
     linkCable: false
 SLPM-80123:
-  name: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun (Japan) (Demo)"
+  name: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun (Demo)"
+  saveName: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86070:
-  name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan) (Disc 1)"
+  name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Disc 1)"
+  saveName: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan) (Disc 1)"
   discSet:
     name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan)"
     serials:
@@ -174006,7 +182942,8 @@ SLPM-86070:
     multitap: false
     linkCable: false
 SLPM-86071:
-  name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan) (Disc 2)"
+  name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Disc 2)"
+  saveName: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan) (Disc 2)"
   discSet:
     name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan)"
     serials:
@@ -174032,7 +182969,8 @@ SLPM-86071:
     multitap: false
     linkCable: false
 SLPM-86224:
-  name: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Japan) (Disc 1)"
+  name: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Disc 1)"
+  saveName: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Japan) (Disc 1)"
   discSet:
     name: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Japan)"
     serials:
@@ -174055,7 +182993,8 @@ SLPM-86224:
     multitap: false
     linkCable: false
 SLPM-86225:
-  name: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Japan) (Disc 2)"
+  name: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Disc 2)"
+  saveName: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Japan) (Disc 2)"
   discSet:
     name: "Tokimeki Memorial Drama Series Vol. 3 - Tabidachi no Uta (Japan)"
     serials:
@@ -174219,7 +183158,8 @@ SCPS-45144:
     multitap: false
     linkCable: false
 SLPM-86029:
-  name: "Tokimeki Memorial Selection - Fujisaki Shiori (Japan)"
+  name: "Tokimeki Memorial Selection - Fujisaki Shiori"
+  saveName: "Tokimeki Memorial Selection - Fujisaki Shiori (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -174237,7 +183177,8 @@ SLPM-86029:
     multitap: false
     linkCable: false
 SLPM-86005:
-  name: "Tokimeki Memorial Taisen Puzzledama (Japan)"
+  name: "Tokimeki Memorial Taisen Puzzledama"
+  saveName: "Tokimeki Memorial Taisen Puzzledama (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -174274,7 +183215,8 @@ SLPM-87307:
     multitap: false
     linkCable: false
 SLPM-86094:
-  name: "Tokimeki no Houkago - Ne Quiz Shiyo (Japan)"
+  name: "Tokimeki no Houkago - Ne Quiz Shiyo"
+  saveName: "Tokimeki no Houkago - Ne Quiz Shiyo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -174292,7 +183234,8 @@ SLPM-86094:
     multitap: false
     linkCable: false
 SLPM-86347:
-  name: "Tokimeki no Houkago - Ne Quiz Shiyo (Japan) (Rev 1)"
+  name: "Tokimeki no Houkago - Ne Quiz Shiyo"
+  saveName: "Tokimeki no Houkago - Ne Quiz Shiyo (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174311,7 +183254,8 @@ SLPM-86347:
     multitap: false
     linkCable: false
 SLPS-03528:
-  name: "Toko Toko Trouble - Chikyuu Itadaki! (Japan)"
+  name: "Toko Toko Trouble - Chikyuu Itadaki!"
+  saveName: "Toko Toko Trouble - Chikyuu Itadaki! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -174348,7 +183292,8 @@ SLPM-86664:
     multitap: true
     linkCable: false
 SLPM-86824:
-  name: "Tokoro-san no Daifugou (Japan)"
+  name: "Tokoro-san no Daifugou"
+  saveName: "Tokoro-san no Daifugou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174367,7 +183312,8 @@ SLPM-86824:
     multitap: true
     linkCable: false
 SLPS-01259:
-  name: "Tokyo 23-ku Seifuku Wars (Japan)"
+  name: "Tokyo 23-ku Seifuku Wars"
+  saveName: "Tokyo 23-ku Seifuku Wars (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -174385,7 +183331,8 @@ SLPS-01259:
     multitap: false
     linkCable: false
 SLPS-00174:
-  name: "Tokyo Dungeon (Japan)"
+  name: "Tokyo Dungeon"
+  saveName: "Tokyo Dungeon (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -174403,13 +183350,17 @@ SLPS-00174:
     multitap: false
     linkCable: false
 SLPM-80320:
-  name: "Tokyo Game Show '98 Autumn - Sunsoft Shinsaku Title Taikenban (Japan)"
+  name: "Tokyo Game Show '98 Autumn - Sunsoft Shinsaku Title Taikenban"
+  saveName: "Tokyo Game Show '98 Autumn - Sunsoft Shinsaku Title Taikenban (Japan)"
 PAPX-90095:
-  name: "Tokyo Game Show '99 Aki Special Taikenban (Japan)"
+  name: "Tokyo Game Show '99 Aki Special Taikenban"
+  saveName: "Tokyo Game Show '99 Aki Special Taikenban (Japan)"
 SLPM-80403:
-  name: "Tokyo Game Show '99 Spring Special Version - Tomy Paradise Taikenban (Japan)"
+  name: "Tokyo Game Show '99 Spring Special Version - Tomy Paradise Taikenban"
+  saveName: "Tokyo Game Show '99 Spring Special Version - Tomy Paradise Taikenban (Japan)"
 SLES-00413:
-  name: "Tokyo Highway Battle (Europe)"
+  name: "Tokyo Highway Battle"
+  saveName: "Tokyo Highway Battle (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -174428,7 +183379,8 @@ SLES-00413:
     multitap: false
     linkCable: false
 SLUS-00229:
-  name: "Tokyo Highway Battle (USA)"
+  name: "Tokyo Highway Battle"
+  saveName: "Tokyo Highway Battle (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -174447,11 +183399,13 @@ SLUS-00229:
     multitap: false
     linkCable: false
 SLPM-80622:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Demo)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Demo)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-03333:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 1) (You)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Disc 1) (You)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 1) (You)"
   discSet:
     name: "Tokyo Majin Gakuen - Gehouchou (Japan)"
     serials:
@@ -174476,7 +183430,8 @@ SLPS-03333:
     multitap: false
     linkCable: false
 SLPS-03330:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 1) (You) (Genteiban)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Disc 1) (You) (Genteiban)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 1) (You) (Genteiban)"
   discSet:
     name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Genteiban)"
     serials:
@@ -174501,7 +183456,8 @@ SLPS-03330:
     multitap: false
     linkCable: false
 SLPS-03334:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 2) (In)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Disc 2) (In)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 2) (In)"
   discSet:
     name: "Tokyo Majin Gakuen - Gehouchou (Japan)"
     serials:
@@ -174526,7 +183482,8 @@ SLPS-03334:
     multitap: false
     linkCable: false
 SLPS-03331:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 2) (In) (Genteiban)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Disc 2) (In) (Genteiban)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 2) (In) (Genteiban)"
   discSet:
     name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Genteiban)"
     serials:
@@ -174551,7 +183508,8 @@ SLPS-03331:
     multitap: false
     linkCable: false
 SLPS-03335:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 3) (Ja)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Disc 3)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 3) (Ja)"
   discSet:
     name: "Tokyo Majin Gakuen - Gehouchou (Japan)"
     serials:
@@ -174576,7 +183534,8 @@ SLPS-03335:
     multitap: false
     linkCable: false
 SLPS-03332:
-  name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 3) (Ja) (Genteiban)"
+  name: "Tokyo Majin Gakuen - Gehouchou (Disc 3) (Genteiban)"
+  saveName: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 3) (Ja) (Genteiban)"
   discSet:
     name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Genteiban)"
     serials:
@@ -174601,7 +183560,8 @@ SLPS-03332:
     multitap: false
     linkCable: false
 SLPS-01432:
-  name: "Tokyo Majin Gakuen - Kenpuuchou (Japan) (Disc 1) (You)"
+  name: "Tokyo Majin Gakuen - Kenpuuchou (Disc 1) (You)"
+  saveName: "Tokyo Majin Gakuen - Kenpuuchou (Japan) (Disc 1) (You)"
   discSet:
     name: "Tokyo Majin Gakuen - Kenpuuchou (Japan)"
     serials:
@@ -174628,7 +183588,8 @@ SLPS-01432:
     multitap: false
     linkCable: false
 SLPS-01433:
-  name: "Tokyo Majin Gakuen - Kenpuuchou (Japan) (Disc 2) (In)"
+  name: "Tokyo Majin Gakuen - Kenpuuchou (Disc 2) (In)"
+  saveName: "Tokyo Majin Gakuen - Kenpuuchou (Japan) (Disc 2) (In)"
   discSet:
     name: "Tokyo Majin Gakuen - Kenpuuchou (Japan)"
     serials:
@@ -174655,7 +183616,8 @@ SLPS-01433:
     multitap: false
     linkCable: false
 SLPS-02015:
-  name: "Tokyo Majin Gakuen - Oboro Kitan (Japan)"
+  name: "Tokyo Majin Gakuen - Oboro Kitan"
+  saveName: "Tokyo Majin Gakuen - Oboro Kitan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174677,7 +183639,8 @@ SLPS-02015:
     multitap: false
     linkCable: false
 SLPS-02837:
-  name: "Tokyo Majin Gakuen Denki - Jin no Shou - Tokyo Majin Gakuen Kenpuuchou Emaki (Japan) (Bonus Disc)"
+  name: "Tokyo Majin Gakuen Denki - Jin no Shou - Tokyo Majin Gakuen Kenpuuchou Emaki (Bonus Disc)"
+  saveName: "Tokyo Majin Gakuen Denki - Jin no Shou - Tokyo Majin Gakuen Kenpuuchou Emaki (Japan) (Bonus Disc)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174734,7 +183697,8 @@ SLPM-87177:
     multitap: false
     linkCable: false
 SLPM-87178:
-  name: "Tokyo Mew Mew - Toujou Shin Mew Mew! Minna Issho ni Gohoushi Suru Nyan (Japan)"
+  name: "Tokyo Mew Mew - Toujou Shin Mew Mew! Minna Issho ni Gohoushi Suru Nyan"
+  saveName: "Tokyo Mew Mew - Toujou Shin Mew Mew! Minna Issho ni Gohoushi Suru Nyan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174753,11 +183717,13 @@ SLPM-87178:
     multitap: false
     linkCable: false
 SLPM-80021:
-  name: "Tokyo Shadow (Japan) (Demo)"
+  name: "Tokyo Shadow (Demo)"
+  saveName: "Tokyo Shadow (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00285:
-  name: "Tokyo Shadow (Japan) (Disc 1)"
+  name: "Tokyo Shadow (Disc 1)"
+  saveName: "Tokyo Shadow (Japan) (Disc 1)"
   discSet:
     name: "Tokyo Shadow (Japan)"
     serials:
@@ -174781,7 +183747,8 @@ SLPS-00285:
     multitap: false
     linkCable: false
 SLPS-00286:
-  name: "Tokyo Shadow (Japan) (Disc 2)"
+  name: "Tokyo Shadow (Disc 2)"
+  saveName: "Tokyo Shadow (Japan) (Disc 2)"
   discSet:
     name: "Tokyo Shadow (Japan)"
     serials:
@@ -174805,7 +183772,8 @@ SLPS-00286:
     multitap: false
     linkCable: false
 SLPS-00287:
-  name: "Tokyo Shadow (Japan) (Disc 3)"
+  name: "Tokyo Shadow (Disc 3)"
+  saveName: "Tokyo Shadow (Japan) (Disc 3)"
   discSet:
     name: "Tokyo Shadow (Japan)"
     serials:
@@ -174829,7 +183797,8 @@ SLPS-00287:
     multitap: false
     linkCable: false
 SLPS-02182:
-  name: "Tokyo Wakusei Planetokio (Japan) (Disc 1)"
+  name: "Tokyo Wakusei Planetokio (Disc 1)"
+  saveName: "Tokyo Wakusei Planetokio (Japan) (Disc 1)"
   discSet:
     name: "Tokyo Wakusei Planetokio (Japan)"
     serials:
@@ -174853,7 +183822,8 @@ SLPS-02182:
     multitap: false
     linkCable: false
 SLPS-02183:
-  name: "Tokyo Wakusei Planetokio (Japan) (Disc 2)"
+  name: "Tokyo Wakusei Planetokio (Disc 2)"
+  saveName: "Tokyo Wakusei Planetokio (Japan) (Disc 2)"
   discSet:
     name: "Tokyo Wakusei Planetokio (Japan)"
     serials:
@@ -174877,7 +183847,8 @@ SLPS-02183:
     multitap: false
     linkCable: false
 SLPS-02184:
-  name: "Tokyo Wakusei Planetokio (Japan) (Disc 3)"
+  name: "Tokyo Wakusei Planetokio (Disc 3)"
+  saveName: "Tokyo Wakusei Planetokio (Japan) (Disc 3)"
   discSet:
     name: "Tokyo Wakusei Planetokio (Japan)"
     serials:
@@ -174901,7 +183872,8 @@ SLPS-02184:
     multitap: false
     linkCable: false
 SLES-01136:
-  name: "Tom Clancy's Rainbow Six (Europe) (En,Fr,It)"
+  name: "Tom Clancy's Rainbow Six"
+  saveName: "Tom Clancy's Rainbow Six (Europe) (En,Fr,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174922,7 +183894,8 @@ SLES-01136:
     multitap: false
     linkCable: false
 SLES-02372:
-  name: "Tom Clancy's Rainbow Six (Germany)"
+  name: "Tom Clancy's Rainbow Six"
+  saveName: "Tom Clancy's Rainbow Six (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174941,7 +183914,8 @@ SLES-02372:
     multitap: false
     linkCable: false
 SLUS-00947:
-  name: "Tom Clancy's Rainbow Six (USA)"
+  name: "Tom Clancy's Rainbow Six"
+  saveName: "Tom Clancy's Rainbow Six (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174960,7 +183934,8 @@ SLUS-00947:
     multitap: false
     linkCable: false
 SLES-03888:
-  name: "Tom Clancy's Rainbow Six - Lone Wolf (Europe) (En,Fr,De,Es,It)"
+  name: "Tom Clancy's Rainbow Six - Lone Wolf"
+  saveName: "Tom Clancy's Rainbow Six - Lone Wolf (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -174983,7 +183958,8 @@ SLES-03888:
     multitap: false
     linkCable: false
 SLUS-01473:
-  name: "Tom Clancy's Rainbow Six - Lone Wolf (USA)"
+  name: "Tom Clancy's Rainbow Six - Lone Wolf"
+  saveName: "Tom Clancy's Rainbow Six - Lone Wolf (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175002,7 +183978,8 @@ SLUS-01473:
     multitap: false
     linkCable: false
 SLES-02696:
-  name: "Tom Clancy's Rainbow Six - Rogue Spear (Europe) (En,Fr,De)"
+  name: "Tom Clancy's Rainbow Six - Rogue Spear"
+  saveName: "Tom Clancy's Rainbow Six - Rogue Spear (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175023,7 +184000,8 @@ SLES-02696:
     multitap: false
     linkCable: false
 SLUS-01108:
-  name: "Tom Clancy's Rainbow Six - Rogue Spear (USA)"
+  name: "Tom Clancy's Rainbow Six - Rogue Spear"
+  saveName: "Tom Clancy's Rainbow Six - Rogue Spear (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175042,7 +184020,8 @@ SLUS-01108:
     multitap: false
     linkCable: false
 SLES-03181:
-  name: "Tom and Jerry in House Trap (Europe) (En,Fr,De,Es,It,Nl,Da)"
+  name: "Tom and Jerry in House Trap"
+  saveName: "Tom and Jerry in House Trap (Europe) (En,Fr,De,Es,It,Nl,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175067,7 +184046,8 @@ SLES-03181:
     multitap: false
     linkCable: false
 SLPM-87034:
-  name: "Tom and Jerry in House Trap (Japan)"
+  name: "Tom and Jerry in House Trap"
+  saveName: "Tom and Jerry in House Trap (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175086,7 +184066,8 @@ SLPM-87034:
     multitap: false
     linkCable: false
 SLUS-01191:
-  name: "Tom and Jerry in House Trap (USA)"
+  name: "Tom and Jerry in House Trap"
+  saveName: "Tom and Jerry in House Trap (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175105,11 +184086,13 @@ SLUS-01191:
     multitap: false
     linkCable: false
 SLED-00513:
-  name: "Tomb Raider & Blam! Machinehead (France)"
+  name: "Tomb Raider & Blam! Machinehead"
+  saveName: "Tomb Raider & Blam! Machinehead (France)"
   metadata:
     genre: "** DEMO **"
 SLES-00024:
-  name: "Tomb Raider (Europe)"
+  name: "Tomb Raider"
+  saveName: "Tomb Raider (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2790-gd588c26c"
@@ -175130,11 +184113,13 @@ SLES-00024:
     multitap: false
     linkCable: false
 SLED-00571:
-  name: "Tomb Raider (Europe) (Demo)"
+  name: "Tomb Raider (Demo)"
+  saveName: "Tomb Raider (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00485:
-  name: "Tomb Raider (France)"
+  name: "Tomb Raider"
+  saveName: "Tomb Raider (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -175155,7 +184140,8 @@ SLES-00485:
     multitap: false
     linkCable: false
 SLES-00486:
-  name: "Tomb Raider (Germany)"
+  name: "Tomb Raider"
+  saveName: "Tomb Raider (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -175173,7 +184159,8 @@ SLES-00486:
     multitap: false
     linkCable: false
 SLUS-00152:
-  name: "Tomb Raider (USA)"
+  name: "Tomb Raider"
+  saveName: "Tomb Raider (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -175194,7 +184181,8 @@ SLUS-00152:
     multitap: false
     linkCable: false
 SLES-03334:
-  name: "Tomb Raider - Die Chronik (Germany)"
+  name: "Tomb Raider - Die Chronik"
+  saveName: "Tomb Raider - Die Chronik (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175213,7 +184201,8 @@ SLES-03334:
     multitap: false
     linkCable: false
 SLES-02239:
-  name: "Tomb Raider - La Revelation Finale (France)"
+  name: "Tomb Raider - La Revelation Finale"
+  saveName: "Tomb Raider - La Revelation Finale (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -175235,7 +184224,8 @@ SLES-02239:
     multitap: false
     linkCable: false
 SLES-03333:
-  name: "Tomb Raider - Sur les Traces de Lara Croft (France)"
+  name: "Tomb Raider - Sur les Traces de Lara Croft"
+  saveName: "Tomb Raider - Sur les Traces de Lara Croft (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175254,7 +184244,8 @@ SLES-03333:
     multitap: false
     linkCable: false
 SLES-02238:
-  name: "Tomb Raider - The Last Revelation (Europe, Australia)"
+  name: "Tomb Raider - The Last Revelation"
+  saveName: "Tomb Raider - The Last Revelation (Europe, Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175273,11 +184264,13 @@ SLES-02238:
     multitap: false
     linkCable: false
 SLED-02418:
-  name: "Tomb Raider - The Last Revelation (France) (Demo)"
+  name: "Tomb Raider - The Last Revelation (Demo)"
+  saveName: "Tomb Raider - The Last Revelation (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02241:
-  name: "Tomb Raider - The Last Revelation (Italy)"
+  name: "Tomb Raider - The Last Revelation"
+  saveName: "Tomb Raider - The Last Revelation (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175296,7 +184289,8 @@ SLES-02241:
     multitap: false
     linkCable: false
 SLES-02242:
-  name: "Tomb Raider - The Last Revelation (Spain)"
+  name: "Tomb Raider - The Last Revelation"
+  saveName: "Tomb Raider - The Last Revelation (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175315,7 +184309,8 @@ SLES-02242:
     multitap: false
     linkCable: false
 SLUS-00885:
-  name: "Tomb Raider - The Last Revelation (USA)"
+  name: "Tomb Raider - The Last Revelation"
+  saveName: "Tomb Raider - The Last Revelation (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1415-gdd9705ef"
@@ -175339,7 +184334,8 @@ SLUS-00885:
     multitap: false
     linkCable: false
 SLPS-01200:
-  name: "Tomb Raider 2 (Japan)"
+  name: "Tomb Raider 2"
+  saveName: "Tomb Raider 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -175361,11 +184357,13 @@ SLPS-01200:
     multitap: false
     linkCable: false
 SLPM-80168:
-  name: "Tomb Raider 2 (Japan) (Demo)"
+  name: "Tomb Raider 2 (Demo)"
+  saveName: "Tomb Raider 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03331:
-  name: "Tomb Raider Chronicles (Europe)"
+  name: "Tomb Raider Chronicles"
+  saveName: "Tomb Raider Chronicles (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175384,7 +184382,8 @@ SLES-03331:
     multitap: false
     linkCable: false
 SLES-03336:
-  name: "Tomb Raider Chronicles (Spain)"
+  name: "Tomb Raider Chronicles"
+  saveName: "Tomb Raider Chronicles (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175403,7 +184402,8 @@ SLES-03336:
     multitap: false
     linkCable: false
 SLUS-01311:
-  name: "Tomb Raider Chronicles (USA)"
+  name: "Tomb Raider Chronicles"
+  saveName: "Tomb Raider Chronicles (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-967-gf856a8a"
@@ -175427,7 +184427,8 @@ SLUS-01311:
     multitap: false
     linkCable: false
 SLES-03335:
-  name: "Tomb Raider Chronicles - La Leggenda di Lara Croft (Italy)"
+  name: "Tomb Raider Chronicles - La Leggenda di Lara Croft"
+  saveName: "Tomb Raider Chronicles - La Leggenda di Lara Croft (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175446,7 +184447,8 @@ SLES-03335:
     multitap: false
     linkCable: false
 SLES-00718:
-  name: "Tomb Raider II - Starring Lara Croft (Europe)"
+  name: "Tomb Raider II - Starring Lara Croft"
+  saveName: "Tomb Raider II - Starring Lara Croft (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -175464,7 +184466,8 @@ SLES-00718:
     multitap: false
     linkCable: false
 SLES-00719:
-  name: "Tomb Raider II - Starring Lara Croft (France)"
+  name: "Tomb Raider II - Starring Lara Croft"
+  saveName: "Tomb Raider II - Starring Lara Croft (France)"
   controllers:
     - DigitalController
   metadata:
@@ -175482,11 +184485,13 @@ SLES-00719:
     multitap: false
     linkCable: false
 SLED-01036:
-  name: "Tomb Raider II - Starring Lara Croft (France) (En,Fr,De) (Demo)"
+  name: "Tomb Raider II - Starring Lara Croft (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 (Germany)"
+  name: "Tomb Raider II - Starring Lara Croft"
+  saveName: "Tomb Raider II - Starring Lara Croft (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -175504,7 +184509,8 @@ SLES-00720:
     multitap: false
     linkCable: false
 SLES-00107:
-  name: "Tomb Raider II - Starring Lara Croft (Italy)"
+  name: "Tomb Raider II - Starring Lara Croft"
+  saveName: "Tomb Raider II - Starring Lara Croft (Italy)"
   controllers:
     - DigitalController
   codes:
@@ -175524,7 +184530,8 @@ SLES-00107:
     multitap: false
     linkCable: false
 SLUS-00437:
-  name: "Tomb Raider II - Starring Lara Croft (USA)"
+  name: "Tomb Raider II - Starring Lara Croft"
+  saveName: "Tomb Raider II - Starring Lara Croft (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -175545,7 +184552,8 @@ SLUS-00437:
     multitap: false
     linkCable: false
 SCPS-45385:
-  name: "Tomb Raider III - Adventures of Lara Croft (Asia) (Disc 1) (Japanese Version)"
+  name: "Tomb Raider III - Adventures of Lara Croft (Disc 1) (Japanese Version)"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Asia) (Disc 1) (Japanese Version)"
   discSet:
     name: "Tomb Raider III - Adventures of Lara Croft (Asia)"
     serials:
@@ -175570,7 +184578,8 @@ SCPS-45385:
     multitap: false
     linkCable: false
 SCPS-45386:
-  name: "Tomb Raider III - Adventures of Lara Croft (Asia) (Disc 2) (International Version)"
+  name: "Tomb Raider III - Adventures of Lara Croft (Disc 2) (International Version)"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Asia) (Disc 2) (International Version)"
   discSet:
     name: "Tomb Raider III - Adventures of Lara Croft (Asia)"
     serials:
@@ -175595,7 +184604,8 @@ SCPS-45386:
     multitap: false
     linkCable: false
 SLES-01649:
-  name: "Tomb Raider III - Adventures of Lara Croft (Europe)"
+  name: "Tomb Raider III - Adventures of Lara Croft"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175614,7 +184624,8 @@ SLES-01649:
     multitap: false
     linkCable: false
 SLES-01683:
-  name: "Tomb Raider III - Adventures of Lara Croft (Germany)"
+  name: "Tomb Raider III - Adventures of Lara Croft"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175633,7 +184644,8 @@ SLES-01683:
     multitap: false
     linkCable: false
 SLES-01684:
-  name: "Tomb Raider III - Adventures of Lara Croft (Italy)"
+  name: "Tomb Raider III - Adventures of Lara Croft"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175652,11 +184664,13 @@ SLES-01684:
     multitap: false
     linkCable: false
 SLPM-80385:
-  name: "Tomb Raider III - Adventures of Lara Croft (Japan) (Demo)"
+  name: "Tomb Raider III - Adventures of Lara Croft (Demo)"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86196:
-  name: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 1) (Japanese Version)"
+  name: "Tomb Raider III - Adventures of Lara Croft (Disc 1) (Japanese Version)"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 1) (Japanese Version)"
   discSet:
     name: "Tomb Raider III - Adventures of Lara Croft (Japan)"
     serials:
@@ -175681,7 +184695,8 @@ SLPM-86196:
     multitap: false
     linkCable: false
 SLPM-86197:
-  name: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 2) (International Version)"
+  name: "Tomb Raider III - Adventures of Lara Croft (Disc 2) (International Version)"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 2) (International Version)"
   discSet:
     name: "Tomb Raider III - Adventures of Lara Croft (Japan)"
     serials:
@@ -175706,7 +184721,8 @@ SLPM-86197:
     multitap: false
     linkCable: false
 SLES-01685:
-  name: "Tomb Raider III - Adventures of Lara Croft (Spain)"
+  name: "Tomb Raider III - Adventures of Lara Croft"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175725,7 +184741,8 @@ SLES-01685:
     multitap: false
     linkCable: false
 SLUS-00691:
-  name: "Tomb Raider III - Adventures of Lara Croft (USA)"
+  name: "Tomb Raider III - Adventures of Lara Croft"
+  saveName: "Tomb Raider III - Adventures of Lara Croft (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1580-g136a9d60"
@@ -175747,7 +184764,8 @@ SLUS-00691:
     multitap: false
     linkCable: false
 SLES-01682:
-  name: "Tomb Raider III - Les Aventures de Lara Croft (France)"
+  name: "Tomb Raider III - Les Aventures de Lara Croft"
+  saveName: "Tomb Raider III - Les Aventures de Lara Croft (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175766,11 +184784,13 @@ SLES-01682:
     multitap: false
     linkCable: false
 SLED-01709:
-  name: "Tomb Raider III - Les Aventures de Lara Croft (France) (Demo)"
+  name: "Tomb Raider III - Les Aventures de Lara Croft (Demo)"
+  saveName: "Tomb Raider III - Les Aventures de Lara Croft (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02240:
-  name: "Tomb Raider IV - The Last Revelation (Germany)"
+  name: "Tomb Raider IV - The Last Revelation"
+  saveName: "Tomb Raider IV - The Last Revelation (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175789,7 +184809,8 @@ SLES-02240:
     multitap: false
     linkCable: false
 SLPM-86896:
-  name: "Tomb Raider IV - The Last Revelation (Japan)"
+  name: "Tomb Raider IV - The Last Revelation"
+  saveName: "Tomb Raider IV - The Last Revelation (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175811,7 +184832,8 @@ SLPM-86896:
     multitap: false
     linkCable: false
 SLED-01623:
-  name: "Tomb Raider Trilogy - Demo Disc (Europe)"
+  name: "Tomb Raider Trilogy - Demo Disc"
+  saveName: "Tomb Raider Trilogy - Demo Disc (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPM-87160:
@@ -175834,7 +184856,8 @@ SLPM-87160:
     multitap: false
     linkCable: false
 SLPM-86779:
-  name: "Tomb Raider V - Chronicles (Japan)"
+  name: "Tomb Raider V - Chronicles"
+  saveName: "Tomb Raider V - Chronicles (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175853,7 +184876,8 @@ SLPM-86779:
     multitap: false
     linkCable: false
 SLPS-00617:
-  name: "Tomb Raiders (Japan)"
+  name: "Tomb Raiders"
+  saveName: "Tomb Raiders (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -175875,7 +184899,8 @@ SLPS-00617:
     multitap: false
     linkCable: false
 SCUS-94236:
-  name: "Tomba! (USA)"
+  name: "Tomba!"
+  saveName: "Tomba! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -175897,11 +184922,13 @@ SCUS-94236:
     multitap: false
     linkCable: false
 SCUS-94255:
-  name: "Tomba! (USA) (Demo)"
+  name: "Tomba! (Demo)"
+  saveName: "Tomba! (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCUS-94454:
-  name: "Tomba! 2 - The Evil Swine Return (USA)"
+  name: "Tomba! 2 - The Evil Swine Return"
+  saveName: "Tomba! 2 - The Evil Swine Return (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -175923,11 +184950,13 @@ SCUS-94454:
     multitap: false
     linkCable: false
 SCUS-94464:
-  name: "Tomba! 2 - The Evil Swine Return (USA) (Demo)"
+  name: "Tomba! 2 - The Evil Swine Return (Demo)"
+  saveName: "Tomba! 2 - The Evil Swine Return (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02350:
-  name: "Tomba! The Wild Adventures (Japan)"
+  name: "Tomba! The Wild Adventures"
+  saveName: "Tomba! The Wild Adventures (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175946,14 +184975,16 @@ SLPS-02350:
     multitap: false
     linkCable: false
 PAPX-90096:
-  name: "Tomba! The Wild Adventures (Japan) (Demo)"
+  name: "Tomba! The Wild Adventures (Demo)"
+  saveName: "Tomba! The Wild Adventures (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   codes:
     - PAPX-90096
     - SLPM-80476
 SCES-01331:
-  name: "Tombi! (Europe) (En,Es,Pt,Sv,Da)"
+  name: "Tombi!"
+  saveName: "Tombi! (Europe) (En,Es,Pt,Sv,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175976,7 +185007,8 @@ SCES-01331:
     multitap: false
     linkCable: false
 SCES-01330:
-  name: "Tombi! (Europe) (En,Fr,De,It,Nl)"
+  name: "Tombi!"
+  saveName: "Tombi! (Europe) (En,Fr,De,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -175999,7 +185031,8 @@ SCES-01330:
     multitap: false
     linkCable: false
 SCES-02147:
-  name: "Tombi! 2 (Europe)"
+  name: "Tombi! 2"
+  saveName: "Tombi! 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176018,7 +185051,8 @@ SCES-02147:
     multitap: false
     linkCable: false
 SCES-02684:
-  name: "Tombi! 2 (France)"
+  name: "Tombi! 2"
+  saveName: "Tombi! 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176037,7 +185071,8 @@ SCES-02684:
     multitap: false
     linkCable: false
 SCES-02685:
-  name: "Tombi! 2 (Germany)"
+  name: "Tombi! 2"
+  saveName: "Tombi! 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176056,7 +185091,8 @@ SCES-02685:
     multitap: false
     linkCable: false
 SCES-02686:
-  name: "Tombi! 2 (Italy)"
+  name: "Tombi! 2"
+  saveName: "Tombi! 2 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176075,7 +185111,8 @@ SCES-02686:
     multitap: false
     linkCable: false
 SCES-02687:
-  name: "Tombi! 2 - Contra los cerdiablos (Spain)"
+  name: "Tombi! 2 - Contra los cerdiablos"
+  saveName: "Tombi! 2 - Contra los cerdiablos (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176094,7 +185131,8 @@ SCES-02687:
     multitap: false
     linkCable: false
 SLPS-01935:
-  name: "Tomika Town o Tsukurou! (Japan)"
+  name: "Tomika Town o Tsukurou!"
+  saveName: "Tomika Town o Tsukurou! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176113,7 +185151,8 @@ SLPS-01935:
     multitap: false
     linkCable: false
 SLES-01228:
-  name: "Tommi Maekinen Rally (Europe) (En,Fr,De,Es,Fi)"
+  name: "Tommi Maekinen Rally"
+  saveName: "Tommi Maekinen Rally (Europe) (En,Fr,De,Es,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176137,11 +185176,13 @@ SLES-01228:
     multitap: false
     linkCable: false
 SLED-01329:
-  name: "Tommi Maekinen Rally (Europe) (En,Fr,De,Es,Fi) (Demo)"
+  name: "Tommi Maekinen Rally (Demo)"
+  saveName: "Tommi Maekinen Rally (Europe) (En,Fr,De,Es,Fi) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01235:
-  name: "Tommi Maekinen Rally (Italy)"
+  name: "Tommi Maekinen Rally"
+  saveName: "Tommi Maekinen Rally (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176161,15 +185202,18 @@ SLES-01235:
     multitap: false
     linkCable: false
 PCPX-96105:
-  name: "Tomoyasu Hotei - Stolen Song (Japan) (Demo 1)"
+  name: "Tomoyasu Hotei - Stolen Song (Demo 1)"
+  saveName: "Tomoyasu Hotei - Stolen Song (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PCPX-96112:
-  name: "Tomoyasu Hotei - Stolen Song (Japan) (Demo 2)"
+  name: "Tomoyasu Hotei - Stolen Song (Demo 2)"
+  saveName: "Tomoyasu Hotei - Stolen Song (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-18009:
-  name: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 1)"
+  name: "Tomoyasu Hotei - Stolen Song (Disc 1)"
+  saveName: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 1)"
   discSet:
     name: "Tomoyasu Hotei - Stolen Song (Japan)"
     serials:
@@ -176192,7 +185236,8 @@ SCPS-18009:
     multitap: false
     linkCable: false
 SCPS-18007:
-  name: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 1) (VPick Included)"
+  name: "Tomoyasu Hotei - Stolen Song (Disc 1) (VPick Included)"
+  saveName: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 1) (VPick Included)"
   discSet:
     name: "Tomoyasu Hotei - Stolen Song (Japan) (VPick Included)"
     serials:
@@ -176215,7 +185260,8 @@ SCPS-18007:
     multitap: false
     linkCable: false
 SCPS-18010:
-  name: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 2)"
+  name: "Tomoyasu Hotei - Stolen Song (Disc 2)"
+  saveName: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 2)"
   discSet:
     name: "Tomoyasu Hotei - Stolen Song (Japan)"
     serials:
@@ -176238,7 +185284,8 @@ SCPS-18010:
     multitap: false
     linkCable: false
 SCPS-18008:
-  name: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 2) (VPick Included)"
+  name: "Tomoyasu Hotei - Stolen Song (Disc 2) (VPick Included)"
+  saveName: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 2) (VPick Included)"
   discSet:
     name: "Tomoyasu Hotei - Stolen Song (Japan) (VPick Included)"
     serials:
@@ -176261,7 +185308,8 @@ SCPS-18008:
     multitap: false
     linkCable: false
 SLPS-03347:
-  name: "Tonde! Tonde! Diet - Stepper Action Game (Japan)"
+  name: "Tonde! Tonde! Diet - Stepper Action Game"
+  saveName: "Tonde! Tonde! Diet - Stepper Action Game (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176280,7 +185328,8 @@ SLPS-03347:
     multitap: false
     linkCable: false
 SLPS-02113:
-  name: "Tondemo Crisis! (Japan)"
+  name: "Tondemo Crisis!"
+  saveName: "Tondemo Crisis! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176299,11 +185348,13 @@ SLPS-02113:
     multitap: false
     linkCable: false
 SLPM-80435:
-  name: "Tondemo Crisis! (Japan) (Demo)"
+  name: "Tondemo Crisis! (Demo)"
+  saveName: "Tondemo Crisis! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-01007:
-  name: "Tonka Space Station (USA)"
+  name: "Tonka Space Station"
+  saveName: "Tonka Space Station (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176322,7 +185373,8 @@ SLUS-01007:
     multitap: false
     linkCable: false
 SLPM-86429:
-  name: "Tony Hawk's Pro Skater (Japan)"
+  name: "Tony Hawk's Pro Skater"
+  saveName: "Tony Hawk's Pro Skater (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176344,7 +185396,8 @@ SLPM-86429:
     multitap: false
     linkCable: false
 SLUS-00860:
-  name: "Tony Hawk's Pro Skater (USA)"
+  name: "Tony Hawk's Pro Skater"
+  saveName: "Tony Hawk's Pro Skater (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -176366,15 +185419,18 @@ SLUS-00860:
     multitap: false
     linkCable: false
 SLED-02879:
-  name: "Tony Hawk's Pro Skater 2 (Australia) (Demo)"
+  name: "Tony Hawk's Pro Skater 2 (Demo)"
+  saveName: "Tony Hawk's Pro Skater 2 (Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-03048:
-  name: "Tony Hawk's Pro Skater 2 (Europe) (Demo)"
+  name: "Tony Hawk's Pro Skater 2 (Demo)"
+  saveName: "Tony Hawk's Pro Skater 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02908:
-  name: "Tony Hawk's Pro Skater 2 (Europe, Australia)"
+  name: "Tony Hawk's Pro Skater 2"
+  saveName: "Tony Hawk's Pro Skater 2 (Europe, Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176393,7 +185449,8 @@ SLES-02908:
     multitap: false
     linkCable: false
 SLES-02909:
-  name: "Tony Hawk's Pro Skater 2 (France)"
+  name: "Tony Hawk's Pro Skater 2"
+  saveName: "Tony Hawk's Pro Skater 2 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176412,7 +185469,8 @@ SLES-02909:
     multitap: false
     linkCable: false
 SLES-02910:
-  name: "Tony Hawk's Pro Skater 2 (Germany)"
+  name: "Tony Hawk's Pro Skater 2"
+  saveName: "Tony Hawk's Pro Skater 2 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176431,7 +185489,8 @@ SLES-02910:
     multitap: false
     linkCable: false
 SLPM-86751:
-  name: "Tony Hawk's Pro Skater 2 (Japan)"
+  name: "Tony Hawk's Pro Skater 2"
+  saveName: "Tony Hawk's Pro Skater 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176450,7 +185509,8 @@ SLPM-86751:
     multitap: false
     linkCable: false
 SLUS-01066:
-  name: "Tony Hawk's Pro Skater 2 (USA)"
+  name: "Tony Hawk's Pro Skater 2"
+  saveName: "Tony Hawk's Pro Skater 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -176472,11 +185532,13 @@ SLUS-01066:
     multitap: false
     linkCable: false
 SLUS-90086:
-  name: "Tony Hawk's Pro Skater 2 (USA) (Demo)"
+  name: "Tony Hawk's Pro Skater 2 (Demo)"
+  saveName: "Tony Hawk's Pro Skater 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03645:
-  name: "Tony Hawk's Pro Skater 3 (Europe)"
+  name: "Tony Hawk's Pro Skater 3"
+  saveName: "Tony Hawk's Pro Skater 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176495,7 +185557,8 @@ SLES-03645:
     multitap: false
     linkCable: false
 SLES-03646:
-  name: "Tony Hawk's Pro Skater 3 (France)"
+  name: "Tony Hawk's Pro Skater 3"
+  saveName: "Tony Hawk's Pro Skater 3 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176514,7 +185577,8 @@ SLES-03646:
     multitap: false
     linkCable: false
 SLES-03647:
-  name: "Tony Hawk's Pro Skater 3 (Germany)"
+  name: "Tony Hawk's Pro Skater 3"
+  saveName: "Tony Hawk's Pro Skater 3 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176533,7 +185597,8 @@ SLES-03647:
     multitap: false
     linkCable: false
 SLUS-01419:
-  name: "Tony Hawk's Pro Skater 3 (USA)"
+  name: "Tony Hawk's Pro Skater 3"
+  saveName: "Tony Hawk's Pro Skater 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -176555,7 +185620,8 @@ SLUS-01419:
     multitap: false
     linkCable: false
 SLES-03954:
-  name: "Tony Hawk's Pro Skater 4 (Europe)"
+  name: "Tony Hawk's Pro Skater 4"
+  saveName: "Tony Hawk's Pro Skater 4 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176574,7 +185640,8 @@ SLES-03954:
     multitap: false
     linkCable: false
 SLES-03956:
-  name: "Tony Hawk's Pro Skater 4 (France)"
+  name: "Tony Hawk's Pro Skater 4"
+  saveName: "Tony Hawk's Pro Skater 4 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176593,7 +185660,8 @@ SLES-03956:
     multitap: false
     linkCable: false
 SLES-03955:
-  name: "Tony Hawk's Pro Skater 4 (Germany)"
+  name: "Tony Hawk's Pro Skater 4"
+  saveName: "Tony Hawk's Pro Skater 4 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176612,7 +185680,8 @@ SLES-03955:
     multitap: false
     linkCable: false
 SLUS-01485:
-  name: "Tony Hawk's Pro Skater 4 (USA)"
+  name: "Tony Hawk's Pro Skater 4"
+  saveName: "Tony Hawk's Pro Skater 4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -176634,7 +185703,8 @@ SLUS-01485:
     multitap: false
     linkCable: false
 SLES-02055:
-  name: "Tony Hawk's Skateboarding (Europe)"
+  name: "Tony Hawk's Skateboarding"
+  saveName: "Tony Hawk's Skateboarding (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176653,11 +185723,13 @@ SLES-02055:
     multitap: false
     linkCable: false
 SLED-02054:
-  name: "Tony Hawk's Skateboarding (Europe) (Demo)"
+  name: "Tony Hawk's Skateboarding (Demo)"
+  saveName: "Tony Hawk's Skateboarding (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00430:
-  name: "Tonzura-kun (Japan)"
+  name: "Tonzura-kun"
+  saveName: "Tonzura-kun (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -176675,7 +185747,8 @@ SLPS-00430:
     multitap: false
     linkCable: false
 SLES-00352:
-  name: "Top Gun - Fire at Will! (Europe) (En,Fr,De,Es,It)"
+  name: "Top Gun - Fire at Will!"
+  saveName: "Top Gun - Fire at Will! (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -176697,7 +185770,8 @@ SLES-00352:
     multitap: false
     linkCable: false
 SLPS-00665:
-  name: "Top Gun - Fire at Will! (Japan)"
+  name: "Top Gun - Fire at Will!"
+  saveName: "Top Gun - Fire at Will! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -176715,7 +185789,8 @@ SLPS-00665:
     multitap: false
     linkCable: false
 SLUS-00032:
-  name: "Top Gun - Fire at Will! (USA)"
+  name: "Top Gun - Fire at Will!"
+  saveName: "Top Gun - Fire at Will! (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -176733,7 +185808,8 @@ SLUS-00032:
     multitap: false
     linkCable: false
 SCES-00248:
-  name: "Topolino e le Sue Avventure (Italy)"
+  name: "Topolino e le Sue Avventure"
+  saveName: "Topolino e le Sue Avventure (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -176751,7 +185827,8 @@ SCES-00248:
     multitap: false
     linkCable: false
 SLPS-00855:
-  name: "Tora! Tora! Tora! (Japan)"
+  name: "Tora! Tora! Tora!"
+  saveName: "Tora! Tora! Tora! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -176790,7 +185867,8 @@ SLPS-91421:
     multitap: false
     linkCable: false
 SLES-02493:
-  name: "Toshinden 4 (Europe)"
+  name: "Toshinden 4"
+  saveName: "Toshinden 4 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -176809,11 +185887,13 @@ SLES-02493:
     multitap: false
     linkCable: false
 SLED-02023:
-  name: "Total Activision Demo (France)"
+  name: "Total Activision Demo"
+  saveName: "Total Activision Demo (France)"
   metadata:
     genre: "** DEMO **"
 SLES-00307:
-  name: "Total Drivin (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Total Drivin"
+  saveName: "Total Drivin (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - DigitalController
     - NeGcon
@@ -176836,7 +185916,8 @@ SLES-00307:
     multitap: false
     linkCable: true
 SLES-00046:
-  name: "Total Eclipse Turbo (Europe)"
+  name: "Total Eclipse Turbo"
+  saveName: "Total Eclipse Turbo (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -176854,7 +185935,8 @@ SLES-00046:
     multitap: false
     linkCable: false
 SLPS-00105:
-  name: "Total Eclipse Turbo (Japan)"
+  name: "Total Eclipse Turbo"
+  saveName: "Total Eclipse Turbo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -176872,7 +185954,8 @@ SLPS-00105:
     multitap: false
     linkCable: false
 SLUS-00021:
-  name: "Total Eclipse Turbo (USA)"
+  name: "Total Eclipse Turbo"
+  saveName: "Total Eclipse Turbo (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -176890,7 +185973,8 @@ SLUS-00021:
     multitap: false
     linkCable: false
 SCES-00067:
-  name: "Total NBA '96 (Europe)"
+  name: "Total NBA '96"
+  saveName: "Total NBA '96 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -176908,7 +185992,8 @@ SCES-00067:
     multitap: true
     linkCable: false
 SIPS-60008:
-  name: "Total NBA '96 (Japan)"
+  name: "Total NBA '96"
+  saveName: "Total NBA '96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -176926,7 +186011,8 @@ SIPS-60008:
     multitap: true
     linkCable: false
 SCES-00623:
-  name: "Total NBA '97 (Europe)"
+  name: "Total NBA '97"
+  saveName: "Total NBA '97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -176944,7 +186030,8 @@ SCES-00623:
     multitap: true
     linkCable: false
 SIPS-60015:
-  name: "Total NBA '97 (Japan)"
+  name: "Total NBA '97"
+  saveName: "Total NBA '97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -176962,7 +186049,8 @@ SIPS-60015:
     multitap: true
     linkCable: false
 SCES-01079:
-  name: "Total NBA 98 (Europe)"
+  name: "Total NBA 98"
+  saveName: "Total NBA 98 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -176980,11 +186068,14 @@ SCES-01079:
     multitap: true
     linkCable: false
 SLED-01872:
-  name: "Total Play (France) (SLED-01872)"
+  name: "Total Play (SLED-01872)"
+  saveName: "Total Play (France) (SLED-01872)"
 SLED-02126:
-  name: "Total Play (France) (SLED-02126)"
+  name: "Total Play (SLED-02126)"
+  saveName: "Total Play (France) (SLED-02126)"
 SLPS-00592:
-  name: "Touge Max - Saisoku Drift Master (Japan)"
+  name: "Touge Max - Saisoku Drift Master"
+  saveName: "Touge Max - Saisoku Drift Master (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -177006,7 +186097,8 @@ SLPS-00592:
     multitap: false
     linkCable: false
 SLPM-87093:
-  name: "Touge Max 2 (Japan)"
+  name: "Touge Max 2"
+  saveName: "Touge Max 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177030,7 +186122,8 @@ SLPM-87093:
     multitap: false
     linkCable: false
 SLPS-02361:
-  name: "Touge Max G (Japan)"
+  name: "Touge Max G"
+  saveName: "Touge Max G (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -177054,11 +186147,13 @@ SLPS-02361:
     multitap: false
     linkCable: false
 SLPM-80474:
-  name: "Touge Max G (Japan) (Demo)"
+  name: "Touge Max G (Demo)"
+  saveName: "Touge Max G (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00187:
-  name: "Touhaiden Akagi (Japan)"
+  name: "Touhaiden Akagi"
+  saveName: "Touhaiden Akagi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177076,7 +186171,8 @@ SLPS-00187:
     multitap: false
     linkCable: false
 SLPS-00557:
-  name: "Touhou Chinyuuki - Halfling Hearts (Japan)"
+  name: "Touhou Chinyuuki - Halfling Hearts"
+  saveName: "Touhou Chinyuuki - Halfling Hearts (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177094,7 +186190,8 @@ SLPS-00557:
     multitap: false
     linkCable: false
 SLPS-01168:
-  name: "Touki Denshou - Angel Eyes (Japan)"
+  name: "Touki Denshou - Angel Eyes"
+  saveName: "Touki Denshou - Angel Eyes (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177112,7 +186209,8 @@ SLPS-01168:
     multitap: false
     linkCable: false
 SLPS-01167:
-  name: "Tour Party - Sotsugyou Ryokou ni Ikou (Japan)"
+  name: "Tour Party - Sotsugyou Ryokou ni Ikou"
+  saveName: "Tour Party - Sotsugyou Ryokou ni Ikou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177148,7 +186246,8 @@ SLPS-02567:
     multitap: true
     linkCable: false
 SLPS-00445:
-  name: "Tournament Leader (Japan)"
+  name: "Tournament Leader"
+  saveName: "Tournament Leader (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -177169,7 +186268,8 @@ SLPS-00445:
     multitap: false
     linkCable: false
 SLPS-00025:
-  name: "Toushinden (Japan)"
+  name: "Toushinden"
+  saveName: "Toushinden (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -177195,7 +186295,8 @@ SLPS-00025:
     multitap: false
     linkCable: false
 SLPS-01113:
-  name: "Toushinden - Card Quest (Japan)"
+  name: "Toushinden - Card Quest"
+  saveName: "Toushinden - Card Quest (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177213,13 +186314,16 @@ SLPS-01113:
     multitap: true
     linkCable: false
 SLPM-80001:
-  name: "Toushinden Otanoshimi-Ban (Japan) (Demo)"
+  name: "Toushinden Otanoshimi-Ban (Demo)"
+  saveName: "Toushinden Otanoshimi-Ban (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02022:
-  name: "Toushinden Subaru (Japan)"
+  name: "Toushinden Subaru"
+  saveName: "Toushinden Subaru (Japan)"
 SLPS-01789:
-  name: "Tower Dream 2 (Japan)"
+  name: "Tower Dream 2"
+  saveName: "Tower Dream 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177237,7 +186341,8 @@ SLPS-01789:
     multitap: true
     linkCable: false
 SLPS-00508:
-  name: "Tower, The - Bonus Edition (Japan)"
+  name: "Tower, The - Bonus Edition"
+  saveName: "Tower, The - Bonus Edition (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177255,7 +186360,8 @@ SLPS-00508:
     multitap: false
     linkCable: false
 SLPS-03242:
-  name: "Toyomaru Club Vol. 1 - CR Nanasy (Japan)"
+  name: "Toyomaru Club Vol. 1 - CR Nanasy"
+  saveName: "Toyomaru Club Vol. 1 - CR Nanasy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177274,7 +186380,8 @@ SLPS-03242:
     multitap: false
     linkCable: false
 SLPM-80429:
-  name: "Toyota Netz Racing (Japan)"
+  name: "Toyota Netz Racing"
+  saveName: "Toyota Netz Racing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177294,7 +186401,8 @@ SLPM-80429:
     multitap: false
     linkCable: false
 SLES-04127:
-  name: "Toys (Europe) (En,Fr,De)"
+  name: "Toys"
+  saveName: "Toys (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177315,7 +186423,8 @@ SLES-04127:
     multitap: false
     linkCable: false
 SLPS-01704:
-  name: "Toys Dream (Japan)"
+  name: "Toys Dream"
+  saveName: "Toys Dream (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177333,25 +186442,31 @@ SLPS-01704:
     multitap: false
     linkCable: false
 SCUS-94397:
-  name: "Toys R Us - Attack of the Killer Demos! (USA)"
+  name: "Toys R Us - Attack of the Killer Demos!"
+  saveName: "Toys R Us - Attack of the Killer Demos! (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94371:
-  name: "Toys R Us - Interactive CD Sampler Disc (USA)"
+  name: "Toys R Us - Interactive CD Sampler Disc"
+  saveName: "Toys R Us - Interactive CD Sampler Disc (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94266:
-  name: "Toys R Us Demo Disc (USA)"
+  name: "Toys R Us Demo Disc"
+  saveName: "Toys R Us Demo Disc (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94611:
-  name: "Toys R Us Summer Demo Disc (USA)"
+  name: "Toys R Us Summer Demo Disc"
+  saveName: "Toys R Us Summer Demo Disc (USA)"
   metadata:
     genre: "** DEMO **"
 SCUS-94190:
-  name: "Toys R Us Test Drive Promotion (USA)"
+  name: "Toys R Us Test Drive Promotion"
+  saveName: "Toys R Us Test Drive Promotion (USA)"
 SLPS-01076:
-  name: "Transformers - Beast Wars (Japan)"
+  name: "Transformers - Beast Wars"
+  saveName: "Transformers - Beast Wars (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -177372,7 +186487,8 @@ SLPS-01076:
     multitap: false
     linkCable: false
 SLPS-02468:
-  name: "Transformers - Beast Wars Metals (Japan)"
+  name: "Transformers - Beast Wars Metals"
+  saveName: "Transformers - Beast Wars Metals (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177391,7 +186507,8 @@ SLPS-02468:
     multitap: false
     linkCable: false
 SLUS-01160:
-  name: "Transformers - Beast Wars Transmetals (USA)"
+  name: "Transformers - Beast Wars Transmetals"
+  saveName: "Transformers - Beast Wars Transmetals (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177410,7 +186527,8 @@ SLUS-01160:
     multitap: false
     linkCable: false
 SLES-00262:
-  name: "Transport Tycoon (Europe) (En,Fr,De,Es,It)"
+  name: "Transport Tycoon"
+  saveName: "Transport Tycoon (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -177433,7 +186551,8 @@ SLES-00262:
     multitap: false
     linkCable: false
 SLPS-00694:
-  name: "Transport Tycoon 3D - Sl Kara Hajimeyou!! (Japan)"
+  name: "Transport Tycoon 3D - Sl Kara Hajimeyou!!"
+  saveName: "Transport Tycoon 3D - Sl Kara Hajimeyou!! (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -177452,7 +186571,8 @@ SLPS-00694:
     multitap: false
     linkCable: false
 SLPS-01494:
-  name: "Trap Gunner (Japan)"
+  name: "Trap Gunner"
+  saveName: "Trap Gunner (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177471,7 +186591,8 @@ SLPS-01494:
     multitap: false
     linkCable: false
 SLUS-00679:
-  name: "Trap Gunner (USA)"
+  name: "Trap Gunner"
+  saveName: "Trap Gunner (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177490,7 +186611,8 @@ SLUS-00679:
     multitap: false
     linkCable: false
 SLES-01628:
-  name: "Trap Runner (Europe) (En,Fr,De)"
+  name: "Trap Runner"
+  saveName: "Trap Runner (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177509,7 +186631,8 @@ SLES-01628:
     multitap: false
     linkCable: false
 SLES-00256:
-  name: "Trash It (Europe) (En,Fr,De,Es,It)"
+  name: "Trash It"
+  saveName: "Trash It (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -177531,7 +186654,8 @@ SLES-00256:
     multitap: true
     linkCable: false
 SLPS-00819:
-  name: "Treasure Gear (Japan)"
+  name: "Treasure Gear"
+  saveName: "Treasure Gear (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177549,7 +186673,8 @@ SLPS-00819:
     multitap: false
     linkCable: false
 SCES-00850:
-  name: "Treasures of the Deep (Europe)"
+  name: "Treasures of the Deep"
+  saveName: "Treasures of the Deep (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177568,7 +186693,8 @@ SCES-00850:
     multitap: false
     linkCable: false
 SCES-01070:
-  name: "Treasures of the Deep (France)"
+  name: "Treasures of the Deep"
+  saveName: "Treasures of the Deep (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177587,7 +186713,8 @@ SCES-01070:
     multitap: false
     linkCable: false
 SCES-01071:
-  name: "Treasures of the Deep (Germany)"
+  name: "Treasures of the Deep"
+  saveName: "Treasures of the Deep (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177606,7 +186733,8 @@ SCES-01071:
     multitap: false
     linkCable: false
 SCES-01072:
-  name: "Treasures of the Deep (Italy)"
+  name: "Treasures of the Deep"
+  saveName: "Treasures of the Deep (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177625,7 +186753,8 @@ SCES-01072:
     multitap: false
     linkCable: false
 SCES-01073:
-  name: "Treasures of the Deep (Spain)"
+  name: "Treasures of the Deep"
+  saveName: "Treasures of the Deep (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177644,7 +186773,8 @@ SCES-01073:
     multitap: false
     linkCable: false
 SLUS-00430:
-  name: "Treasures of the Deep (USA)"
+  name: "Treasures of the Deep"
+  saveName: "Treasures of the Deep (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3862-g8f821c77"
@@ -177666,7 +186796,8 @@ SLUS-00430:
     multitap: false
     linkCable: false
 SLES-02304:
-  name: "Trick'n Snowboarder (Europe)"
+  name: "Trick'n Snowboarder"
+  saveName: "Trick'n Snowboarder (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177685,7 +186816,8 @@ SLES-02304:
     multitap: false
     linkCable: true
 SLUS-00979:
-  name: "Trick'n Snowboarder (USA)"
+  name: "Trick'n Snowboarder"
+  saveName: "Trick'n Snowboarder (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177704,7 +186836,8 @@ SLUS-00979:
     multitap: false
     linkCable: true
 SLES-04062:
-  name: "Trickshot (Europe)"
+  name: "Trickshot"
+  saveName: "Trickshot (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177723,7 +186856,8 @@ SLES-04062:
     multitap: false
     linkCable: false
 SLPS-01860:
-  name: "Tricky Sliders - Freestyle Snowboard (Japan)"
+  name: "Tricky Sliders - Freestyle Snowboard"
+  saveName: "Tricky Sliders - Freestyle Snowboard (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177742,7 +186876,8 @@ SLPS-01860:
     multitap: false
     linkCable: true
 SLUS-00827:
-  name: "Triple Play 2000 (USA)"
+  name: "Triple Play 2000"
+  saveName: "Triple Play 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177761,7 +186896,8 @@ SLUS-00827:
     multitap: false
     linkCable: false
 SLUS-01082:
-  name: "Triple Play 2001 (USA)"
+  name: "Triple Play 2001"
+  saveName: "Triple Play 2001 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177780,7 +186916,8 @@ SLUS-01082:
     multitap: false
     linkCable: false
 SLPS-00682:
-  name: "Triple Play 97 (Japan)"
+  name: "Triple Play 97"
+  saveName: "Triple Play 97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177798,7 +186935,8 @@ SLPS-00682:
     multitap: true
     linkCable: false
 SLUS-00237:
-  name: "Triple Play 97 (USA)"
+  name: "Triple Play 97"
+  saveName: "Triple Play 97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -177816,7 +186954,8 @@ SLUS-00237:
     multitap: true
     linkCable: false
 SLPS-00887:
-  name: "Triple Play 98 (Japan)"
+  name: "Triple Play 98"
+  saveName: "Triple Play 98 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1998-g43bafe1a"
@@ -177837,7 +186976,8 @@ SLPS-00887:
     multitap: true
     linkCable: false
 SLUS-00465:
-  name: "Triple Play 98 (USA)"
+  name: "Triple Play 98"
+  saveName: "Triple Play 98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -177855,7 +186995,8 @@ SLUS-00465:
     multitap: true
     linkCable: false
 SLPS-01621:
-  name: "Triple Play 99 (Japan)"
+  name: "Triple Play 99"
+  saveName: "Triple Play 99 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177873,7 +187014,8 @@ SLPS-01621:
     multitap: true
     linkCable: false
 SLUS-00618:
-  name: "Triple Play 99 (USA) (En,Es)"
+  name: "Triple Play 99"
+  saveName: "Triple Play 99 (USA) (En,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -177892,7 +187034,8 @@ SLUS-00618:
     multitap: true
     linkCable: false
 SLUS-01345:
-  name: "Triple Play Baseball (USA)"
+  name: "Triple Play Baseball"
+  saveName: "Triple Play Baseball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177911,7 +187054,8 @@ SLUS-01345:
     multitap: false
     linkCable: false
 SLES-01791:
-  name: "Triple Play Baseball 2000 (Europe)"
+  name: "Triple Play Baseball 2000"
+  saveName: "Triple Play Baseball 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -177930,7 +187074,8 @@ SLES-01791:
     multitap: false
     linkCable: false
 SLPS-00911:
-  name: "Tripuzz (Japan)"
+  name: "Tripuzz"
+  saveName: "Tripuzz (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -177948,7 +187093,8 @@ SLPS-00911:
     multitap: false
     linkCable: false
 SLPS-02108:
-  name: "Tron ni Kobun (Japan)"
+  name: "Tron ni Kobun"
+  saveName: "Tron ni Kobun (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-826-g712168c"
@@ -177992,7 +187138,8 @@ SLPS-91203:
     multitap: false
     linkCable: false
 SLES-03953:
-  name: "Truck Racing (Europe)"
+  name: "Truck Racing"
+  saveName: "Truck Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178012,7 +187159,8 @@ SLES-03953:
     multitap: false
     linkCable: false
 SLES-04128:
-  name: "Truck Rally (Europe)"
+  name: "Truck Rally"
+  saveName: "Truck Rally (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178032,7 +187180,8 @@ SLES-04128:
     multitap: false
     linkCable: false
 SLPS-00586:
-  name: "True Love Story (Japan)"
+  name: "True Love Story"
+  saveName: "True Love Story (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -178053,7 +187202,8 @@ SLPS-00586:
     multitap: false
     linkCable: false
 SLPS-01151:
-  name: "True Love Story - Remember My Heart (Japan)"
+  name: "True Love Story - Remember My Heart"
+  saveName: "True Love Story - Remember My Heart (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178071,7 +187221,8 @@ SLPS-01151:
     multitap: false
     linkCable: false
 SLPS-01743:
-  name: "True Love Story 2 (Japan) (Disc 1)"
+  name: "True Love Story 2 (Disc 1)"
+  saveName: "True Love Story 2 (Japan) (Disc 1)"
   discSet:
     name: "True Love Story 2 (Japan)"
     serials:
@@ -178095,7 +187246,8 @@ SLPS-01743:
     multitap: false
     linkCable: false
 SLPS-01744:
-  name: "True Love Story 2 (Japan) (Disc 2)"
+  name: "True Love Story 2 (Disc 2)"
+  saveName: "True Love Story 2 (Japan) (Disc 2)"
   discSet:
     name: "True Love Story 2 (Japan)"
     serials:
@@ -178119,7 +187271,8 @@ SLPS-01744:
     multitap: false
     linkCable: false
 SLPS-01745:
-  name: "True Love Story 2 (Japan) (Disc 3)"
+  name: "True Love Story 2 (Disc 3)"
+  saveName: "True Love Story 2 (Japan) (Disc 3)"
   discSet:
     name: "True Love Story 2 (Japan)"
     serials:
@@ -178143,7 +187296,8 @@ SLPS-01745:
     multitap: false
     linkCable: false
 SLPS-02404:
-  name: "True Love Story Fan Disc (Japan)"
+  name: "True Love Story Fan Disc"
+  saveName: "True Love Story Fan Disc (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178162,7 +187316,8 @@ SLPS-02404:
     multitap: false
     linkCable: false
 SLES-00052:
-  name: "True Pinball (Europe)"
+  name: "True Pinball"
+  saveName: "True Pinball (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -178182,7 +187337,8 @@ SLES-00052:
     multitap: false
     linkCable: false
 SLUS-00337:
-  name: "True Pinball (USA)"
+  name: "True Pinball"
+  saveName: "True Pinball (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -178206,7 +187362,8 @@ SLUS-00337:
     multitap: false
     linkCable: false
 SLPS-01440:
-  name: "Trump Shiyou yo! (Japan)"
+  name: "Trump Shiyou yo!"
+  saveName: "Trump Shiyou yo! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -178227,7 +187384,8 @@ SLPS-01440:
     multitap: true
     linkCable: false
 SLPS-02612:
-  name: "Trump Shiyou yo! (Japan) (Fukkokuban)"
+  name: "Trump Shiyou yo! (Fukkokuban)"
+  saveName: "Trump Shiyou yo! (Japan) (Fukkokuban)"
   controllers:
     - DigitalController
   metadata:
@@ -178245,7 +187403,8 @@ SLPS-02612:
     multitap: true
     linkCable: false
 SLPS-01746:
-  name: "Tsumu (Japan)"
+  name: "Tsumu"
+  saveName: "Tsumu (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178263,7 +187422,8 @@ SLPS-01746:
     multitap: false
     linkCable: false
 SLPS-02253:
-  name: "Tsumu Light (Japan)"
+  name: "Tsumu Light"
+  saveName: "Tsumu Light (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178281,7 +187441,8 @@ SLPS-02253:
     multitap: false
     linkCable: false
 SLPS-01602:
-  name: "TsunTsun-gumi - Suuji de PuniPuni (Japan)"
+  name: "TsunTsun-gumi - Suuji de PuniPuni"
+  saveName: "TsunTsun-gumi - Suuji de PuniPuni (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178299,7 +187460,8 @@ SLPS-01602:
     multitap: false
     linkCable: false
 SLPS-01694:
-  name: "TsunTsun-gumi 2 - MojiMoji Pakkun (Japan)"
+  name: "TsunTsun-gumi 2 - MojiMoji Pakkun"
+  saveName: "TsunTsun-gumi 2 - MojiMoji Pakkun (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178317,7 +187479,8 @@ SLPS-01694:
     multitap: false
     linkCable: false
 SLPS-01839:
-  name: "TsunTsun-gumi 3 - Kanji Vader (Japan)"
+  name: "TsunTsun-gumi 3 - Kanji Vader"
+  saveName: "TsunTsun-gumi 3 - Kanji Vader (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178336,7 +187499,8 @@ SLPS-01839:
     multitap: false
     linkCable: false
 SLPS-00440:
-  name: "Tsuri Baka Nisshi (Japan)"
+  name: "Tsuri Baka Nisshi"
+  saveName: "Tsuri Baka Nisshi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178354,7 +187518,8 @@ SLPS-00440:
     multitap: false
     linkCable: false
 SLPS-01752:
-  name: "Tsuridou - Keiryuu Mizuumi-hen (Japan)"
+  name: "Tsuridou - Keiryuu Mizuumi-hen"
+  saveName: "Tsuridou - Keiryuu Mizuumi-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178392,7 +187557,8 @@ SLPS-02676:
     multitap: false
     linkCable: false
 SLPS-01139:
-  name: "Tsuridou - Umizuri-hen (Japan)"
+  name: "Tsuridou - Umizuri-hen"
+  saveName: "Tsuridou - Umizuri-hen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178411,7 +187577,8 @@ SLPS-01139:
     multitap: false
     linkCable: false
 SLPS-91125:
-  name: "Tsuridou - Umizuri-hen (Japan) (PlayStation the Best)"
+  name: "Tsuridou - Umizuri-hen (PlayStation the Best)"
+  saveName: "Tsuridou - Umizuri-hen (Japan) (PlayStation the Best)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178430,7 +187597,8 @@ SLPS-91125:
     multitap: false
     linkCable: false
 SLPS-00334:
-  name: "Tsuukai!! Slot Shooting (Japan)"
+  name: "Tsuukai!! Slot Shooting"
+  saveName: "Tsuukai!! Slot Shooting (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178448,7 +187616,8 @@ SLPS-00334:
     multitap: false
     linkCable: false
 SLES-03298:
-  name: "Tunguska - Legend of Faith (Europe) (En,Fr,De,Es,It)"
+  name: "Tunguska - Legend of Faith"
+  saveName: "Tunguska - Legend of Faith (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -178472,7 +187641,8 @@ SLES-03298:
     multitap: false
     linkCable: false
 SLES-00322:
-  name: "Tunnel B1 (Europe) (En,Fr,De,Es,It)"
+  name: "Tunnel B1"
+  saveName: "Tunnel B1 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -178494,7 +187664,8 @@ SLES-00322:
     multitap: false
     linkCable: false
 SLUS-00188:
-  name: "Tunnel B1 (USA)"
+  name: "Tunnel B1"
+  saveName: "Tunnel B1 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -178512,11 +187683,13 @@ SLUS-00188:
     multitap: false
     linkCable: false
 SLED-00514:
-  name: "Tunnel B1 + X2 - No Relief + Break Point + Cheesy (Europe)"
+  name: "Tunnel B1 + X2 - No Relief + Break Point + Cheesy"
+  saveName: "Tunnel B1 + X2 - No Relief + Break Point + Cheesy (Europe)"
   metadata:
     genre: "** DEMO **"
 SCUS-94229:
-  name: "Turbo Prop Racing (USA)"
+  name: "Turbo Prop Racing"
+  saveName: "Turbo Prop Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178538,7 +187711,8 @@ SCUS-94229:
     multitap: false
     linkCable: false
 SLPS-00388:
-  name: "Turf Wind '96 - Take Yutaka Kyousouba Ikusei Game (Japan)"
+  name: "Turf Wind '96 - Take Yutaka Kyousouba Ikusei Game"
+  saveName: "Turf Wind '96 - Take Yutaka Kyousouba Ikusei Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -178556,7 +187730,8 @@ SLPS-00388:
     multitap: false
     linkCable: false
 SLES-04005:
-  name: "Turnabout (Europe)"
+  name: "Turnabout"
+  saveName: "Turnabout (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -178574,7 +187749,8 @@ SLES-04005:
     multitap: false
     linkCable: false
 SLUS-01499:
-  name: "Turnabout (USA)"
+  name: "Turnabout"
+  saveName: "Turnabout (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -178592,7 +187768,8 @@ SLUS-01499:
     multitap: false
     linkCable: false
 SLES-03412:
-  name: "Tweenies - Game Time (Europe)"
+  name: "Tweenies - Game Time"
+  saveName: "Tweenies - Game Time (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178611,11 +187788,13 @@ SLES-03412:
     multitap: false
     linkCable: false
 SLPM-80042:
-  name: "Twilight Syndrome (Japan) (Demo)"
+  name: "Twilight Syndrome (Demo)"
+  saveName: "Twilight Syndrome (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00405:
-  name: "Twilight Syndrome - Kyuumei-hen (Japan)"
+  name: "Twilight Syndrome - Kyuumei-hen"
+  saveName: "Twilight Syndrome - Kyuumei-hen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -178636,7 +187815,8 @@ SLPS-00405:
     multitap: false
     linkCable: false
 SLPS-02850:
-  name: "Twilight Syndrome - Saikai (Japan)"
+  name: "Twilight Syndrome - Saikai"
+  saveName: "Twilight Syndrome - Saikai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178677,7 +187857,8 @@ SLPS-03256:
     multitap: false
     linkCable: false
 SLPS-00102:
-  name: "Twilight Syndrome - Tansaku-hen (Japan)"
+  name: "Twilight Syndrome - Tansaku-hen"
+  saveName: "Twilight Syndrome - Tansaku-hen (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -178698,9 +187879,11 @@ SLPS-00102:
     multitap: false
     linkCable: false
 SLPM-80035:
-  name: "Twilight Syndrome - The Memorize (Japan)"
+  name: "Twilight Syndrome - The Memorize"
+  saveName: "Twilight Syndrome - The Memorize (Japan)"
 SLPS-00018:
-  name: "Twin Goddesses (Japan)"
+  name: "Twin Goddesses"
+  saveName: "Twin Goddesses (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -178720,7 +187903,8 @@ SLPS-00018:
     multitap: false
     linkCable: false
 SCPS-45208:
-  name: "TwinBee RPG (Japan, Asia)"
+  name: "TwinBee RPG"
+  saveName: "TwinBee RPG (Japan, Asia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -178745,7 +187929,8 @@ SCPS-45208:
     multitap: false
     linkCable: false
 SLPS-00015:
-  name: "TwinBee Taisen Puzzle-dama (Japan)"
+  name: "TwinBee Taisen Puzzle-dama"
+  saveName: "TwinBee Taisen Puzzle-dama (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -178803,7 +187988,8 @@ SLPM-87319:
     multitap: false
     linkCable: false
 SLPS-02126:
-  name: "Twins Story - Kimi ni Tsutaetakute... (Japan)"
+  name: "Twins Story - Kimi ni Tsutaetakute..."
+  saveName: "Twins Story - Kimi ni Tsutaetakute... (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -178822,7 +188008,8 @@ SLPS-02126:
     multitap: false
     linkCable: false
 SCES-00061:
-  name: "Twisted Metal (Europe)"
+  name: "Twisted Metal"
+  saveName: "Twisted Metal (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -178841,7 +188028,8 @@ SCES-00061:
     multitap: false
     linkCable: false
 SIPS-60007:
-  name: "Twisted Metal (Japan)"
+  name: "Twisted Metal"
+  saveName: "Twisted Metal (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -178860,7 +188048,8 @@ SIPS-60007:
     multitap: false
     linkCable: false
 SCUS-94304:
-  name: "Twisted Metal (USA)"
+  name: "Twisted Metal"
+  saveName: "Twisted Metal (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -178879,7 +188068,8 @@ SCUS-94304:
     multitap: false
     linkCable: false
 SCUS-94642:
-  name: "Twisted Metal - Small Brawl (USA)"
+  name: "Twisted Metal - Small Brawl"
+  saveName: "Twisted Metal - Small Brawl (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "Android Touch Gliding Preview"
@@ -178902,7 +188092,8 @@ SCUS-94642:
     multitap: false
     linkCable: false
 SCES-00567:
-  name: "Twisted Metal - World Tour (Europe)"
+  name: "Twisted Metal - World Tour"
+  saveName: "Twisted Metal - World Tour (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -178923,7 +188114,8 @@ SCES-00567:
     multitap: false
     linkCable: false
 SCUS-94306:
-  name: "Twisted Metal 2 (USA)"
+  name: "Twisted Metal 2"
+  saveName: "Twisted Metal 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1047-g8ae04f6"
@@ -178947,7 +188139,8 @@ SCUS-94306:
     multitap: false
     linkCable: false
 SCUS-94560:
-  name: "Twisted Metal 4 (USA)"
+  name: "Twisted Metal 4"
+  saveName: "Twisted Metal 4 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -178970,11 +188163,13 @@ SCUS-94560:
     multitap: true
     linkCable: false
 SCUS-94389:
-  name: "Twisted Metal 4 (USA) (Demo)"
+  name: "Twisted Metal 4 (Demo)"
+  saveName: "Twisted Metal 4 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SIPS-60021:
-  name: "Twisted Metal EX - World Tour (Japan)"
+  name: "Twisted Metal EX - World Tour"
+  saveName: "Twisted Metal EX - World Tour (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -178995,7 +188190,8 @@ SIPS-60021:
     multitap: false
     linkCable: false
 SCUS-94249:
-  name: "Twisted Metal III (USA)"
+  name: "Twisted Metal III"
+  saveName: "Twisted Metal III (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179015,15 +188211,18 @@ SCUS-94249:
     multitap: true
     linkCable: false
 SCUS-94378:
-  name: "Twisted Metal III (USA) (Demo)"
+  name: "Twisted Metal III (Demo)"
+  saveName: "Twisted Metal III (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-02540:
-  name: "Two Product Psygnosis Demo (Europe)"
+  name: "Two Product Psygnosis Demo"
+  saveName: "Two Product Psygnosis Demo (Europe)"
   metadata:
     genre: "** DEMO **"
 SLPS-00131:
-  name: "Two-Ten Kaku (Japan)"
+  name: "Two-Ten Kaku"
+  saveName: "Two-Ten Kaku (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -179043,7 +188242,8 @@ SLPS-00131:
     multitap: false
     linkCable: false
 SLUS-01074:
-  name: "Tyco R-C - Assault with a Battery (USA)"
+  name: "Tyco R-C - Assault with a Battery"
+  saveName: "Tyco R-C - Assault with a Battery (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179063,11 +188263,13 @@ SLUS-01074:
     multitap: false
     linkCable: false
 SLUS-90085:
-  name: "Tyco R-C - Assault with a Battery (USA) (Demo)"
+  name: "Tyco R-C - Assault with a Battery (Demo)"
+  saveName: "Tyco R-C - Assault with a Battery (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02693:
-  name: "U-SA (Japan)"
+  name: "U-SA"
+  saveName: "U-SA (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -179085,7 +188287,8 @@ SLPS-02693:
     multitap: false
     linkCable: false
 SLPS-01480:
-  name: "U.P.P. (Japan)"
+  name: "U.P.P."
+  saveName: "U.P.P. (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179104,7 +188307,8 @@ SLPS-01480:
     multitap: false
     linkCable: false
 SLPS-00994:
-  name: "U.S. Navy Fighters (Japan)"
+  name: "U.S. Navy Fighters"
+  saveName: "U.S. Navy Fighters (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -179122,7 +188326,8 @@ SLPS-00994:
     multitap: false
     linkCable: false
 SLES-02806:
-  name: "UEFA Challenge (Europe) (En,Fr,De,Nl)"
+  name: "UEFA Challenge"
+  saveName: "UEFA Challenge (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179144,7 +188349,8 @@ SLES-02806:
     multitap: true
     linkCable: false
 SLES-02807:
-  name: "UEFA Challenge (Europe) (Fr,Es,It,Pt)"
+  name: "UEFA Challenge"
+  saveName: "UEFA Challenge (Europe) (Fr,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179166,7 +188372,8 @@ SLES-02807:
     multitap: true
     linkCable: false
 SLES-01744:
-  name: "UEFA Champions League - Saison 1998-99 (France)"
+  name: "UEFA Champions League - Saison 1998-99"
+  saveName: "UEFA Champions League - Saison 1998-99 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179185,7 +188392,8 @@ SLES-01744:
     multitap: true
     linkCable: false
 SLES-01745:
-  name: "UEFA Champions League - Saison 1998-99 (Germany)"
+  name: "UEFA Champions League - Saison 1998-99"
+  saveName: "UEFA Champions League - Saison 1998-99 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179204,7 +188412,8 @@ SLES-01745:
     multitap: true
     linkCable: false
 SLES-01622:
-  name: "UEFA Champions League - Season 1998-99 (Europe)"
+  name: "UEFA Champions League - Season 1998-99"
+  saveName: "UEFA Champions League - Season 1998-99 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179223,7 +188432,8 @@ SLES-01622:
     multitap: true
     linkCable: false
 SLES-02577:
-  name: "UEFA Champions League - Season 1999-2000 (Europe)"
+  name: "UEFA Champions League - Season 1999-2000"
+  saveName: "UEFA Champions League - Season 1999-2000 (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1998-g43bafe1a"
@@ -179245,7 +188455,8 @@ SLES-02577:
     multitap: true
     linkCable: false
 SLES-02578:
-  name: "UEFA Champions League - Season 1999-2000 (France)"
+  name: "UEFA Champions League - Season 1999-2000"
+  saveName: "UEFA Champions League - Season 1999-2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179264,7 +188475,8 @@ SLES-02578:
     multitap: true
     linkCable: false
 SLES-02579:
-  name: "UEFA Champions League - Season 1999-2000 (Germany)"
+  name: "UEFA Champions League - Season 1999-2000"
+  saveName: "UEFA Champions League - Season 1999-2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179283,7 +188495,8 @@ SLES-02579:
     multitap: true
     linkCable: false
 SLES-02580:
-  name: "UEFA Champions League - Season 1999-2000 (Italy)"
+  name: "UEFA Champions League - Season 1999-2000"
+  saveName: "UEFA Champions League - Season 1999-2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179302,7 +188515,8 @@ SLES-02580:
     multitap: true
     linkCable: false
 SLES-02581:
-  name: "UEFA Champions League - Season 1999-2000 (Spain)"
+  name: "UEFA Champions League - Season 1999-2000"
+  saveName: "UEFA Champions League - Season 1999-2000 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179321,7 +188535,8 @@ SLES-02581:
     multitap: true
     linkCable: false
 SLES-03262:
-  name: "UEFA Champions League - Season 2000-2001 (Europe)"
+  name: "UEFA Champions League - Season 2000-2001"
+  saveName: "UEFA Champions League - Season 2000-2001 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179340,7 +188555,8 @@ SLES-03262:
     multitap: true
     linkCable: false
 SLES-03280:
-  name: "UEFA Champions League - Season 2000-2001 (France)"
+  name: "UEFA Champions League - Season 2000-2001"
+  saveName: "UEFA Champions League - Season 2000-2001 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179359,7 +188575,8 @@ SLES-03280:
     multitap: true
     linkCable: false
 SLES-03281:
-  name: "UEFA Champions League - Season 2000-2001 (Germany)"
+  name: "UEFA Champions League - Season 2000-2001"
+  saveName: "UEFA Champions League - Season 2000-2001 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179378,7 +188595,8 @@ SLES-03281:
     multitap: true
     linkCable: false
 SLES-03282:
-  name: "UEFA Champions League - Season 2000-2001 (Italy)"
+  name: "UEFA Champions League - Season 2000-2001"
+  saveName: "UEFA Champions League - Season 2000-2001 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179397,7 +188615,8 @@ SLES-03282:
     multitap: true
     linkCable: false
 SLES-03283:
-  name: "UEFA Champions League - Season 2000-2001 (Spain)"
+  name: "UEFA Champions League - Season 2000-2001"
+  saveName: "UEFA Champions League - Season 2000-2001 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179416,7 +188635,8 @@ SLES-03283:
     multitap: true
     linkCable: false
 SLES-01746:
-  name: "UEFA Champions League - Stagione 1998-99 (Italy)"
+  name: "UEFA Champions League - Stagione 1998-99"
+  saveName: "UEFA Champions League - Stagione 1998-99 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179435,7 +188655,8 @@ SLES-01746:
     multitap: true
     linkCable: false
 SLES-01747:
-  name: "UEFA Champions League - Temporada 1998-99 (Spain)"
+  name: "UEFA Champions League - Temporada 1998-99"
+  saveName: "UEFA Champions League - Temporada 1998-99 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179454,7 +188675,8 @@ SLES-01747:
     multitap: true
     linkCable: false
 SLES-02704:
-  name: "UEFA Euro 2000 (Europe)"
+  name: "UEFA Euro 2000"
+  saveName: "UEFA Euro 2000 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179474,7 +188696,8 @@ SLES-02704:
     multitap: true
     linkCable: false
 SLES-02705:
-  name: "UEFA Euro 2000 (France)"
+  name: "UEFA Euro 2000"
+  saveName: "UEFA Euro 2000 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179494,7 +188717,8 @@ SLES-02705:
     multitap: true
     linkCable: false
 SLES-02706:
-  name: "UEFA Euro 2000 (Germany)"
+  name: "UEFA Euro 2000"
+  saveName: "UEFA Euro 2000 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179514,7 +188738,8 @@ SLES-02706:
     multitap: true
     linkCable: false
 SLES-02707:
-  name: "UEFA Euro 2000 (Italy)"
+  name: "UEFA Euro 2000"
+  saveName: "UEFA Euro 2000 (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179534,7 +188759,8 @@ SLES-02707:
     multitap: true
     linkCable: false
 SLES-02708:
-  name: "UEFA Euro 2000 (Spain)"
+  name: "UEFA Euro 2000"
+  saveName: "UEFA Euro 2000 (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179554,7 +188780,8 @@ SLES-02708:
     multitap: true
     linkCable: false
 SLES-01733:
-  name: "UEFA Striker (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "UEFA Striker"
+  saveName: "UEFA Striker (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179579,7 +188806,8 @@ SLES-01733:
     multitap: true
     linkCable: false
 SLPM-86722:
-  name: "UFC - Ultimate Fighting Championship (Japan)"
+  name: "UFC - Ultimate Fighting Championship"
+  saveName: "UFC - Ultimate Fighting Championship (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179598,7 +188826,8 @@ SLPM-86722:
     multitap: false
     linkCable: false
 SLPS-02032:
-  name: "UFO - A Day in the Life (Japan)"
+  name: "UFO - A Day in the Life"
+  saveName: "UFO - A Day in the Life (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179654,7 +188883,8 @@ SLPS-01349:
     multitap: false
     linkCable: false
 SLES-03810:
-  name: "US Racer (Europe) (En,Fr,De,Nl)"
+  name: "US Racer"
+  saveName: "US Racer (Europe) (En,Fr,De,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179677,7 +188907,8 @@ SLES-03810:
     multitap: false
     linkCable: false
 SLES-00722:
-  name: "Ubik (Europe) (En,Fr,De)"
+  name: "Ubik"
+  saveName: "Ubik (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179718,7 +188949,8 @@ SCPS-45221:
     multitap: false
     linkCable: false
 SLPM-86190:
-  name: "Uchi ni Pochi ga Yattekita in my Pocket (Japan)"
+  name: "Uchi ni Pochi ga Yattekita in my Pocket"
+  saveName: "Uchi ni Pochi ga Yattekita in my Pocket (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179737,7 +188969,8 @@ SLPM-86190:
     multitap: false
     linkCable: false
 SLPS-00236:
-  name: "Uchuu Goushouden - Bakuretsu Akindo (Japan)"
+  name: "Uchuu Goushouden - Bakuretsu Akindo"
+  saveName: "Uchuu Goushouden - Bakuretsu Akindo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -179755,7 +188988,8 @@ SLPS-00236:
     multitap: true
     linkCable: false
 SLPS-00032:
-  name: "Uchuu Seibutsu Flopon-kun P! (Japan)"
+  name: "Uchuu Seibutsu Flopon-kun P!"
+  saveName: "Uchuu Seibutsu Flopon-kun P! (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -179775,7 +189009,8 @@ SLPS-00032:
     multitap: false
     linkCable: false
 SLPS-02952:
-  name: "Uchuu Senkan Yamato - Eiyuu no Kiseki (Japan)"
+  name: "Uchuu Senkan Yamato - Eiyuu no Kiseki"
+  saveName: "Uchuu Senkan Yamato - Eiyuu no Kiseki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179794,7 +189029,8 @@ SLPS-02952:
     multitap: false
     linkCable: false
 SLPS-01900:
-  name: "Uchuu Senkan Yamato - Haruka naru Hoshi Iscandar (Japan)"
+  name: "Uchuu Senkan Yamato - Haruka naru Hoshi Iscandar"
+  saveName: "Uchuu Senkan Yamato - Haruka naru Hoshi Iscandar (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179813,7 +189049,8 @@ SLPS-01900:
     multitap: false
     linkCable: false
 SLPS-00826:
-  name: "Uchuu no Rendezvous - Rama (Japan) (Disc 1)"
+  name: "Uchuu no Rendezvous - Rama (Disc 1)"
+  saveName: "Uchuu no Rendezvous - Rama (Japan) (Disc 1)"
   discSet:
     name: "Uchuu no Rendezvous - Rama (Japan)"
     serials:
@@ -179836,7 +189073,8 @@ SLPS-00826:
     multitap: false
     linkCable: false
 SLPS-00827:
-  name: "Uchuu no Rendezvous - Rama (Japan) (Disc 2)"
+  name: "Uchuu no Rendezvous - Rama (Disc 2)"
+  saveName: "Uchuu no Rendezvous - Rama (Japan) (Disc 2)"
   discSet:
     name: "Uchuu no Rendezvous - Rama (Japan)"
     serials:
@@ -179859,7 +189097,8 @@ SLPS-00827:
     multitap: false
     linkCable: false
 SLPS-00391:
-  name: "Ugetsu Kitan (Japan)"
+  name: "Ugetsu Kitan"
+  saveName: "Ugetsu Kitan (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -179880,7 +189119,8 @@ SLPS-00391:
     multitap: false
     linkCable: false
 SLPS-02579:
-  name: "Uki Uki Tsuri Tengoku - Gyoshin Densetsu o Oe (Japan)"
+  name: "Uki Uki Tsuri Tengoku - Gyoshin Densetsu o Oe"
+  saveName: "Uki Uki Tsuri Tengoku - Gyoshin Densetsu o Oe (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179899,7 +189139,8 @@ SLPS-02579:
     multitap: false
     linkCable: false
 SLPS-01521:
-  name: "Uki Uki Tsuri Tengoku - Kawa Monogatari (Japan)"
+  name: "Uki Uki Tsuri Tengoku - Kawa Monogatari"
+  saveName: "Uki Uki Tsuri Tengoku - Kawa Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179918,7 +189159,8 @@ SLPS-01521:
     multitap: false
     linkCable: false
 SLPS-00983:
-  name: "Uki Uki Tsuri Tengoku - Ningyo Densetsu no Nazo (Japan)"
+  name: "Uki Uki Tsuri Tengoku - Ningyo Densetsu no Nazo"
+  saveName: "Uki Uki Tsuri Tengoku - Ningyo Densetsu no Nazo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -179936,7 +189178,8 @@ SLPS-00983:
     multitap: false
     linkCable: false
 SLPS-01571:
-  name: "Uki Uki Tsuri Tengoku - Ningyo Densetsu no Nazo (Japan) (Dual Shock Edition)"
+  name: "Uki Uki Tsuri Tengoku - Ningyo Densetsu no Nazo (Dual Shock Edition)"
+  saveName: "Uki Uki Tsuri Tengoku - Ningyo Densetsu no Nazo (Japan) (Dual Shock Edition)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179955,7 +189198,8 @@ SLPS-01571:
     multitap: false
     linkCable: false
 SLPS-00742:
-  name: "Ultima Underworld - The Stygian Abyss (Japan)"
+  name: "Ultima Underworld - The Stygian Abyss"
+  saveName: "Ultima Underworld - The Stygian Abyss (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -179973,7 +189217,8 @@ SLPS-00742:
     multitap: false
     linkCable: false
 SLUS-00864:
-  name: "Ultimate 8 Ball (USA)"
+  name: "Ultimate 8 Ball"
+  saveName: "Ultimate 8 Ball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -179992,7 +189237,8 @@ SLUS-00864:
     multitap: true
     linkCable: false
 SLES-04024:
-  name: "Ultimate Brain Games (Europe)"
+  name: "Ultimate Brain Games"
+  saveName: "Ultimate Brain Games (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180011,7 +189257,8 @@ SLES-04024:
     multitap: false
     linkCable: false
 SLUS-01577:
-  name: "Ultimate Brain Games (USA)"
+  name: "Ultimate Brain Games"
+  saveName: "Ultimate Brain Games (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180030,7 +189277,8 @@ SLUS-01577:
     multitap: false
     linkCable: false
 SLES-02903:
-  name: "Ultimate Fighting Championship (Europe)"
+  name: "Ultimate Fighting Championship"
+  saveName: "Ultimate Fighting Championship (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180049,7 +189297,8 @@ SLES-02903:
     multitap: false
     linkCable: false
 SLUS-01143:
-  name: "Ultimate Fighting Championship (USA)"
+  name: "Ultimate Fighting Championship"
+  saveName: "Ultimate Fighting Championship (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2483-g98d6b499"
@@ -180071,11 +189320,13 @@ SLUS-01143:
     multitap: false
     linkCable: false
 SLUS-81143:
-  name: "Ultimate Fighting Championship (USA) (Demo)"
+  name: "Ultimate Fighting Championship (Demo)"
+  saveName: "Ultimate Fighting Championship (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01248:
-  name: "Ultraman - Fighting Evolution (Japan)"
+  name: "Ultraman - Fighting Evolution"
+  saveName: "Ultraman - Fighting Evolution (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -180099,11 +189350,13 @@ SLPS-01248:
     multitap: false
     linkCable: false
 SLPM-80218:
-  name: "Ultraman - Fighting Evolution (Japan) (Demo)"
+  name: "Ultraman - Fighting Evolution (Demo)"
+  saveName: "Ultraman - Fighting Evolution (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01455:
-  name: "Ultraman Tiga & Ultraman Dyna - Aratanaru Futatsu no Hikari (Japan)"
+  name: "Ultraman Tiga & Ultraman Dyna - Aratanaru Futatsu no Hikari"
+  saveName: "Ultraman Tiga & Ultraman Dyna - Aratanaru Futatsu no Hikari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180122,7 +189375,8 @@ SLPS-01455:
     multitap: false
     linkCable: false
 SLPS-00652:
-  name: "Ultraman Zearth (Japan)"
+  name: "Ultraman Zearth"
+  saveName: "Ultraman Zearth (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -180160,7 +189414,8 @@ SCPS-45391:
     multitap: false
     linkCable: false
 SCES-01753:
-  name: "Um Jammer Lammy (Europe) (En,Fr,De,Es,It)"
+  name: "Um Jammer Lammy"
+  saveName: "Um Jammer Lammy (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180183,7 +189438,8 @@ SCES-01753:
     multitap: false
     linkCable: false
 SCPS-18011:
-  name: "Um Jammer Lammy (Japan)"
+  name: "Um Jammer Lammy"
+  saveName: "Um Jammer Lammy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180206,7 +189462,8 @@ SCPS-18011:
     multitap: false
     linkCable: false
 SCUS-94448:
-  name: "Um Jammer Lammy (USA)"
+  name: "Um Jammer Lammy"
+  saveName: "Um Jammer Lammy (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1304-gc8b6712"
@@ -180228,7 +189485,8 @@ SCUS-94448:
     multitap: false
     linkCable: false
 SCUS-94398:
-  name: "Um Jammer Lammy (USA) (Demo)"
+  name: "Um Jammer Lammy (Demo)"
+  saveName: "Um Jammer Lammy (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-91325:
@@ -180252,7 +189510,8 @@ SCPS-91325:
     multitap: false
     linkCable: false
 SLPM-86403:
-  name: "Umapoly (Japan)"
+  name: "Umapoly"
+  saveName: "Umapoly (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180271,7 +189530,8 @@ SLPM-86403:
     multitap: true
     linkCable: false
 SLPS-01767:
-  name: "Umezawa Yukari no Taikyoku Igo - Heisei Kiin II (Japan)"
+  name: "Umezawa Yukari no Taikyoku Igo - Heisei Kiin II"
+  saveName: "Umezawa Yukari no Taikyoku Igo - Heisei Kiin II (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -180308,7 +189568,8 @@ SLPS-91491:
     multitap: false
     linkCable: false
 SLPS-02172:
-  name: "Umi no Nushi Tsuri - Takarajima ni Mukatte (Japan)"
+  name: "Umi no Nushi Tsuri - Takarajima ni Mukatte"
+  saveName: "Umi no Nushi Tsuri - Takarajima ni Mukatte (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180327,7 +189588,8 @@ SLPS-02172:
     multitap: false
     linkCable: false
 SLPS-01623:
-  name: "Umi no Oh! Yah! (Japan)"
+  name: "Umi no Oh! Yah!"
+  saveName: "Umi no Oh! Yah! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180346,11 +189608,13 @@ SLPS-01623:
     multitap: false
     linkCable: false
 SLPM-80322:
-  name: "Umi no Oh! Yah! (Japan) (Demo)"
+  name: "Umi no Oh! Yah! (Demo)"
+  saveName: "Umi no Oh! Yah! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00643:
-  name: "Umihara Kawase Shun (Japan)"
+  name: "Umihara Kawase Shun"
+  saveName: "Umihara Kawase Shun (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -180370,7 +189634,8 @@ SLPS-00643:
     multitap: false
     linkCable: false
 SLPS-02549:
-  name: "Umihara Kawase Shun - Second Edition (Japan)"
+  name: "Umihara Kawase Shun - Second Edition"
+  saveName: "Umihara Kawase Shun - Second Edition (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -180390,7 +189655,8 @@ SLPS-02549:
     multitap: false
     linkCable: false
 SLPM-87055:
-  name: "UnGro Walker (Japan)"
+  name: "UnGro Walker"
+  saveName: "UnGro Walker (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180409,7 +189675,8 @@ SLPM-87055:
     multitap: false
     linkCable: false
 SLPS-03380:
-  name: "Undou Busoku Kaishou! Punch de Diet (Japan)"
+  name: "Undou Busoku Kaishou! Punch de Diet"
+  saveName: "Undou Busoku Kaishou! Punch de Diet (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180428,11 +189695,13 @@ SLPS-03380:
     multitap: false
     linkCable: false
 SLED-01557:
-  name: "Unholy War, The (Europe) (Demo)"
+  name: "Unholy War, The (Demo)"
+  saveName: "Unholy War, The (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01300:
-  name: "Unholy War, The (Europe) (En,Fr,De,Es,It)"
+  name: "Unholy War, The"
+  saveName: "Unholy War, The (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2814-g8bb4c110"
@@ -180458,7 +189727,8 @@ SLES-01300:
     multitap: false
     linkCable: false
 SLUS-00676:
-  name: "Unholy War, The (USA)"
+  name: "Unholy War, The"
+  saveName: "Unholy War, The (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180477,11 +189747,13 @@ SLUS-00676:
     multitap: false
     linkCable: false
 SLUS-90030:
-  name: "Unholy War, The (USA) (Demo)"
+  name: "Unholy War, The (Demo)"
+  saveName: "Unholy War, The (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-01225:
-  name: "Universal Nuts (Japan)"
+  name: "Universal Nuts"
+  saveName: "Universal Nuts (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -180499,9 +189771,11 @@ SLPS-01225:
     multitap: false
     linkCable: false
 SLPS-00046:
-  name: "Universal Virtua Pachi-Slot - Hisshou Kouryakuhou (Japan)"
+  name: "Universal Virtua Pachi-Slot - Hisshou Kouryakuhou"
+  saveName: "Universal Virtua Pachi-Slot - Hisshou Kouryakuhou (Japan)"
 SLPS-00101:
-  name: "Universal-ki Kanzen Kaiseki - Pachi-Slot Simulator (Japan)"
+  name: "Universal-ki Kanzen Kaiseki - Pachi-Slot Simulator"
+  saveName: "Universal-ki Kanzen Kaiseki - Pachi-Slot Simulator (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -180519,7 +189793,8 @@ SLPS-00101:
     multitap: false
     linkCable: false
 LSP-909015:
-  name: "Unknown Variable 1 - Masque Manor (USA)"
+  name: "Unknown Variable 1 - Masque Manor"
+  saveName: "Unknown Variable 1 - Masque Manor (USA)"
   codes:
     - LSP909015
   metadata:
@@ -180529,7 +189804,8 @@ LSP-909015:
     languages:
       - English
 LSP-909022:
-  name: "Unknown Variable 2 - Raven's Ridge (USA)"
+  name: "Unknown Variable 2 - Raven's Ridge"
+  saveName: "Unknown Variable 2 - Raven's Ridge (USA)"
   controllers:
     - DigitalController
   codes:
@@ -180550,7 +189826,8 @@ LSP-909022:
     multitap: false
     linkCable: false
 SLPS-00846:
-  name: "Unsolved, The - Hyper Science Adventure (Japan) (Disc 1)"
+  name: "Unsolved, The - Hyper Science Adventure (Disc 1)"
+  saveName: "Unsolved, The - Hyper Science Adventure (Japan) (Disc 1)"
   discSet:
     name: "Unsolved, The - Hyper Science Adventure (Japan)"
     serials:
@@ -180574,7 +189851,8 @@ SLPS-00846:
     multitap: false
     linkCable: false
 SLPS-00847:
-  name: "Unsolved, The - Hyper Science Adventure (Japan) (Disc 2)"
+  name: "Unsolved, The - Hyper Science Adventure (Disc 2)"
+  saveName: "Unsolved, The - Hyper Science Adventure (Japan) (Disc 2)"
   discSet:
     name: "Unsolved, The - Hyper Science Adventure (Japan)"
     serials:
@@ -180598,7 +189876,8 @@ SLPS-00847:
     multitap: false
     linkCable: false
 SLPS-00848:
-  name: "Unsolved, The - Hyper Science Adventure (Japan) (Disc 3)"
+  name: "Unsolved, The - Hyper Science Adventure (Disc 3)"
+  saveName: "Unsolved, The - Hyper Science Adventure (Japan) (Disc 3)"
   discSet:
     name: "Unsolved, The - Hyper Science Adventure (Japan)"
     serials:
@@ -180622,7 +189901,8 @@ SLPS-00848:
     multitap: false
     linkCable: false
 SLPS-00302:
-  name: "Unstack (Japan)"
+  name: "Unstack"
+  saveName: "Unstack (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -180640,7 +189920,8 @@ SLPS-00302:
     multitap: false
     linkCable: false
 SLUS-00686:
-  name: "Uprising X (USA)"
+  name: "Uprising X"
+  saveName: "Uprising X (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -180662,7 +189943,8 @@ SLUS-00686:
     multitap: false
     linkCable: false
 SLPS-02399:
-  name: "Uranai 2, The - Mainichi no Tarot Uranai (Japan)"
+  name: "Uranai 2, The - Mainichi no Tarot Uranai"
+  saveName: "Uranai 2, The - Mainichi no Tarot Uranai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180681,7 +189963,8 @@ SLPS-02399:
     multitap: false
     linkCable: false
 SLPS-02898:
-  name: "Uranai 3, The - Mainichi no Houi Uranai (Japan)"
+  name: "Uranai 3, The - Mainichi no Houi Uranai"
+  saveName: "Uranai 3, The - Mainichi no Houi Uranai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180700,7 +189983,8 @@ SLPS-02898:
     multitap: false
     linkCable: false
 SLPS-02899:
-  name: "Uranai 4, The - Harapeko Kuma no Kaiun Kabbalah Uranai (Japan)"
+  name: "Uranai 4, The - Harapeko Kuma no Kaiun Kabbalah Uranai"
+  saveName: "Uranai 4, The - Harapeko Kuma no Kaiun Kabbalah Uranai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180719,7 +190003,8 @@ SLPS-02899:
     multitap: false
     linkCable: false
 SLPS-03053:
-  name: "Uranai 5, The - Shinpi no Rune Uranai (Japan)"
+  name: "Uranai 5, The - Shinpi no Rune Uranai"
+  saveName: "Uranai 5, The - Shinpi no Rune Uranai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180738,7 +190023,8 @@ SLPS-03053:
     multitap: false
     linkCable: false
 SLPS-03054:
-  name: "Uranai 6, The - Suisei-san no Tottemo Kyuusei Senseijutsu (Japan)"
+  name: "Uranai 6, The - Suisei-san no Tottemo Kyuusei Senseijutsu"
+  saveName: "Uranai 6, The - Suisei-san no Tottemo Kyuusei Senseijutsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180757,7 +190043,8 @@ SLPS-03054:
     multitap: false
     linkCable: false
 SLPS-02362:
-  name: "Uranai, The - Ren'ai Seiza Uranai (Japan)"
+  name: "Uranai, The - Ren'ai Seiza Uranai"
+  saveName: "Uranai, The - Ren'ai Seiza Uranai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180814,7 +190101,8 @@ SLPS-03264:
     multitap: false
     linkCable: false
 SLPS-02807:
-  name: "Urawaza Mahjong - Korette Tenwatte Yatsukai (Japan)"
+  name: "Urawaza Mahjong - Korette Tenwatte Yatsukai"
+  saveName: "Urawaza Mahjong - Korette Tenwatte Yatsukai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180833,7 +190121,8 @@ SLPS-02807:
     multitap: false
     linkCable: false
 SLES-02071:
-  name: "Urban Chaos (Europe) (En,Es,It)"
+  name: "Urban Chaos"
+  saveName: "Urban Chaos (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180855,7 +190144,8 @@ SLES-02071:
     multitap: false
     linkCable: false
 SLES-02354:
-  name: "Urban Chaos (France)"
+  name: "Urban Chaos"
+  saveName: "Urban Chaos (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180875,7 +190165,8 @@ SLES-02354:
     multitap: false
     linkCable: false
 SLES-02355:
-  name: "Urban Chaos (Germany)"
+  name: "Urban Chaos"
+  saveName: "Urban Chaos (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180895,7 +190186,8 @@ SLES-02355:
     multitap: false
     linkCable: false
 SLUS-01091:
-  name: "Urban Chaos (USA)"
+  name: "Urban Chaos"
+  saveName: "Urban Chaos (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180916,7 +190208,8 @@ SLUS-01091:
     multitap: false
     linkCable: false
 SLPM-86437:
-  name: "Utauta Woo - Seirei-Songs (Japan)"
+  name: "Utauta Woo - Seirei-Songs"
+  saveName: "Utauta Woo - Seirei-Songs (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -180935,7 +190228,8 @@ SLPM-86437:
     multitap: false
     linkCable: false
 SLPS-01317:
-  name: "Utchan Nanchan no Honoo no Challenger - Denryuu Ira Ira Bou Returns (Japan)"
+  name: "Utchan Nanchan no Honoo no Challenger - Denryuu Ira Ira Bou Returns"
+  saveName: "Utchan Nanchan no Honoo no Challenger - Denryuu Ira Ira Bou Returns (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3109-gfd269ec9"
@@ -180957,7 +190251,8 @@ SLPS-01317:
     multitap: false
     linkCable: false
 SLES-00846:
-  name: "V-Ball - Beach Volley Heroes (Europe)"
+  name: "V-Ball - Beach Volley Heroes"
+  saveName: "V-Ball - Beach Volley Heroes (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -180975,9 +190270,11 @@ SLES-00846:
     multitap: false
     linkCable: false
 SLPM-80635:
-  name: "V-Jump Soukan 9-shuunen Kinen Special Disc!! (Japan)"
+  name: "V-Jump Soukan 9-shuunen Kinen Special Disc!!"
+  saveName: "V-Jump Soukan 9-shuunen Kinen Special Disc!! (Japan)"
 SLES-00250:
-  name: "V-Rally - 97 Championship Edition (Europe) (En,Fr,De)"
+  name: "V-Rally - 97 Championship Edition"
+  saveName: "V-Rally - 97 Championship Edition (Europe) (En,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -181002,7 +190299,8 @@ SLES-00250:
     multitap: false
     linkCable: false
 SLPS-01149:
-  name: "V-Rally - Championship Edition (Japan)"
+  name: "V-Rally - Championship Edition"
+  saveName: "V-Rally - Championship Edition (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -181024,11 +190322,13 @@ SLPS-01149:
     multitap: false
     linkCable: false
 SLED-02124:
-  name: "V-Rally - Championship Edition 2 (Europe) (Demo)"
+  name: "V-Rally - Championship Edition 2 (Demo)"
+  saveName: "V-Rally - Championship Edition 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01907:
-  name: "V-Rally - Championship Edition 2 (Europe) (En,Fr,De)"
+  name: "V-Rally - Championship Edition 2"
+  saveName: "V-Rally - Championship Edition 2 (Europe) (En,Fr,De)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -181056,7 +190356,8 @@ SLES-01907:
     multitap: true
     linkCable: false
 SLPS-02516:
-  name: "V-Rally - Championship Edition 2 (Japan)"
+  name: "V-Rally - Championship Edition 2"
+  saveName: "V-Rally - Championship Edition 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181099,7 +190400,8 @@ SLPS-91430:
     multitap: false
     linkCable: false
 SLES-00285:
-  name: "V-Tennis (Europe)"
+  name: "V-Tennis"
+  saveName: "V-Tennis (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -181117,7 +190419,8 @@ SLES-00285:
     multitap: false
     linkCable: false
 SLPS-00103:
-  name: "V-Tennis (Japan)"
+  name: "V-Tennis"
+  saveName: "V-Tennis (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -181137,7 +190440,8 @@ SLPS-00103:
     multitap: false
     linkCable: false
 SLUS-00218:
-  name: "V-Tennis (USA)"
+  name: "V-Tennis"
+  saveName: "V-Tennis (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -181155,7 +190459,8 @@ SLUS-00218:
     multitap: false
     linkCable: false
 SLPS-00469:
-  name: "V-Tennis 2 (Japan)"
+  name: "V-Tennis 2"
+  saveName: "V-Tennis 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -181173,7 +190478,8 @@ SLPS-00469:
     multitap: true
     linkCable: false
 SLES-03681:
-  name: "V.I.P. (Europe) (En,Fr,De,Es,It)"
+  name: "V.I.P."
+  saveName: "V.I.P. (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181196,7 +190502,8 @@ SLES-03681:
     multitap: false
     linkCable: false
 SLUS-01228:
-  name: "V.I.P. (USA)"
+  name: "V.I.P."
+  saveName: "V.I.P. (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -181218,7 +190525,8 @@ SLUS-01228:
     multitap: false
     linkCable: false
 SLES-00545:
-  name: "V2000 (Europe) (En,Fr,De,Es,It)"
+  name: "V2000"
+  saveName: "V2000 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181241,17 +190549,20 @@ SLES-00545:
     multitap: false
     linkCable: false
 SLED-01548:
-  name: "V2000 (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "V2000 (Demo)"
+  saveName: "V2000 (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00236:
-  name: "VIP Demo (Europe)"
+  name: "VIP Demo"
+  saveName: "VIP Demo (Europe)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SCES-00237:
-  name: "VIP Demo (Germany)"
+  name: "VIP Demo"
+  saveName: "VIP Demo (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -181276,7 +190587,8 @@ SLUS-00657:
     multitap: true
     linkCable: false
 SLES-00552:
-  name: "VMX Racing (Europe)"
+  name: "VMX Racing"
+  saveName: "VMX Racing (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181296,7 +190608,8 @@ SLES-00552:
     multitap: false
     linkCable: false
 SLUS-00123:
-  name: "VMX Racing (USA)"
+  name: "VMX Racing"
+  saveName: "VMX Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181316,7 +190629,8 @@ SLUS-00123:
     multitap: false
     linkCable: false
 SLES-00169:
-  name: "VR Baseball '97 (Europe)"
+  name: "VR Baseball '97"
+  saveName: "VR Baseball '97 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -181334,7 +190648,8 @@ SLES-00169:
     multitap: false
     linkCable: false
 SLUS-00281:
-  name: "VR Baseball '97 (USA)"
+  name: "VR Baseball '97"
+  saveName: "VR Baseball '97 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -181352,7 +190667,8 @@ SLUS-00281:
     multitap: false
     linkCable: false
 SLES-01325:
-  name: "VR Baseball 99 (Europe)"
+  name: "VR Baseball 99"
+  saveName: "VR Baseball 99 (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -181370,7 +190686,8 @@ SLES-01325:
     multitap: false
     linkCable: false
 SLUS-00632:
-  name: "VR Baseball 99 (USA)"
+  name: "VR Baseball 99"
+  saveName: "VR Baseball 99 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -181388,7 +190705,8 @@ SLUS-00632:
     multitap: false
     linkCable: false
 SLUS-00198:
-  name: "VR Golf '97 (USA) (En,Fr)"
+  name: "VR Golf '97"
+  saveName: "VR Golf '97 (USA) (En,Fr)"
   controllers:
     - DigitalController
   metadata:
@@ -181407,7 +190725,8 @@ SLUS-00198:
     multitap: true
     linkCable: false
 SLUS-00199:
-  name: "VR Soccer '96 (USA)"
+  name: "VR Soccer '96"
+  saveName: "VR Soccer '96 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -181425,11 +190744,13 @@ SLUS-00199:
     multitap: false
     linkCable: false
 SLED-00911:
-  name: "VR Sports Powerboat Racing (Europe) (Demo)"
+  name: "VR Sports Powerboat Racing (Demo)"
+  saveName: "VR Sports Powerboat Racing (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00931:
-  name: "VR Sports Powerboat Racing (Europe) (En,Fr,De,Es,It)"
+  name: "VR Sports Powerboat Racing"
+  saveName: "VR Sports Powerboat Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - NeGcon
@@ -181452,7 +190773,8 @@ SLES-00931:
     multitap: false
     linkCable: false
 SLUS-00625:
-  name: "VR Sports Powerboat Racing (USA)"
+  name: "VR Sports Powerboat Racing"
+  saveName: "VR Sports Powerboat Racing (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -181471,7 +190793,8 @@ SLUS-00625:
     multitap: false
     linkCable: false
 SLPS-00352:
-  name: "Vadims (Japan)"
+  name: "Vadims"
+  saveName: "Vadims (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -181489,7 +190812,8 @@ SLPS-00352:
     multitap: false
     linkCable: false
 SLES-02754:
-  name: "Vagrant Story (Europe)"
+  name: "Vagrant Story"
+  saveName: "Vagrant Story (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -181514,7 +190838,8 @@ SLES-02754:
     multitap: false
     linkCable: false
 SLES-02755:
-  name: "Vagrant Story (France)"
+  name: "Vagrant Story"
+  saveName: "Vagrant Story (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181536,7 +190861,8 @@ SLES-02755:
     multitap: false
     linkCable: false
 SLES-02756:
-  name: "Vagrant Story (Germany)"
+  name: "Vagrant Story"
+  saveName: "Vagrant Story (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181558,7 +190884,8 @@ SLES-02756:
     multitap: false
     linkCable: false
 SCPS-45486:
-  name: "Vagrant Story (Japan, Asia)"
+  name: "Vagrant Story"
+  saveName: "Vagrant Story (Japan, Asia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181604,7 +190931,8 @@ SLPS-91457:
     multitap: false
     linkCable: false
 SLUS-01040:
-  name: "Vagrant Story (USA)"
+  name: "Vagrant Story"
+  saveName: "Vagrant Story (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -181628,7 +190956,8 @@ SLUS-01040:
     multitap: false
     linkCable: false
 SLPM-86379:
-  name: "Valkyrie Profile (Japan) (Disc 1)"
+  name: "Valkyrie Profile (Disc 1)"
+  saveName: "Valkyrie Profile (Japan) (Disc 1)"
   discSet:
     name: "Valkyrie Profile (Japan)"
     serials:
@@ -181657,7 +190986,8 @@ SLPM-86379:
     multitap: false
     linkCable: false
 SLPM-86371:
-  name: "Valkyrie Profile (Japan) (Disc 1) (Deluxe Pack)"
+  name: "Valkyrie Profile (Disc 1) (Deluxe Pack)"
+  saveName: "Valkyrie Profile (Japan) (Disc 1) (Deluxe Pack)"
   discSet:
     name: "Valkyrie Profile (Japan) (Deluxe Pack)"
     serials:
@@ -181686,7 +191016,8 @@ SLPM-86371:
     multitap: false
     linkCable: false
 SLPM-86380:
-  name: "Valkyrie Profile (Japan) (Disc 2)"
+  name: "Valkyrie Profile (Disc 2)"
+  saveName: "Valkyrie Profile (Japan) (Disc 2)"
   discSet:
     name: "Valkyrie Profile (Japan)"
     serials:
@@ -181715,7 +191046,8 @@ SLPM-86380:
     multitap: false
     linkCable: false
 SLPM-86372:
-  name: "Valkyrie Profile (Japan) (Disc 2) (Deluxe Pack)"
+  name: "Valkyrie Profile (Disc 2) (Deluxe Pack)"
+  saveName: "Valkyrie Profile (Japan) (Disc 2) (Deluxe Pack)"
   discSet:
     name: "Valkyrie Profile (Japan) (Deluxe Pack)"
     serials:
@@ -181744,7 +191076,8 @@ SLPM-86372:
     multitap: false
     linkCable: false
 SLPM-87355:
-  name: "Valkyrie Profile (Japan) (Disc 2) (Rev 1)"
+  name: "Valkyrie Profile (Disc 2)"
+  saveName: "Valkyrie Profile (Japan) (Disc 2) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181771,7 +191104,8 @@ SLPM-87355:
     multitap: false
     linkCable: false
 SLUS-01156:
-  name: "Valkyrie Profile (USA) (Disc 1)"
+  name: "Valkyrie Profile (Disc 1)"
+  saveName: "Valkyrie Profile (USA) (Disc 1)"
   discSet:
     name: "Valkyrie Profile (USA)"
     serials:
@@ -181803,7 +191137,8 @@ SLUS-01156:
     multitap: false
     linkCable: false
 SLUS-01179:
-  name: "Valkyrie Profile (USA) (Disc 2)"
+  name: "Valkyrie Profile (Disc 2)"
+  saveName: "Valkyrie Profile (USA) (Disc 2)"
   discSet:
     name: "Valkyrie Profile (USA)"
     serials:
@@ -181835,7 +191170,8 @@ SLUS-01179:
     multitap: false
     linkCable: false
 SLPS-02704:
-  name: "Value 1500 - The Murasaki Kinshiro (Japan)"
+  name: "Value 1500 - The Murasaki Kinshiro"
+  saveName: "Value 1500 - The Murasaki Kinshiro (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181854,7 +191190,8 @@ SLPS-02704:
     multitap: false
     linkCable: false
 SLPS-02703:
-  name: "Value 1500 - The Shanghai (Japan)"
+  name: "Value 1500 - The Shanghai"
+  saveName: "Value 1500 - The Shanghai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181873,7 +191210,8 @@ SLPS-02703:
     multitap: false
     linkCable: false
 SLPS-01932:
-  name: "Vampir - Kyuuketsuki Densetsu (Japan)"
+  name: "Vampir - Kyuuketsuki Densetsu"
+  saveName: "Vampir - Kyuuketsuki Densetsu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181892,7 +191230,8 @@ SLPS-01932:
     multitap: false
     linkCable: false
 SLPS-00036:
-  name: "Vampire - The Night Warriors (Japan)"
+  name: "Vampire - The Night Warriors"
+  saveName: "Vampire - The Night Warriors (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -181910,7 +191249,8 @@ SLPS-00036:
     multitap: false
     linkCable: false
 SLES-02731:
-  name: "Vampire Hunter D (Europe) (En,Fr,De)"
+  name: "Vampire Hunter D"
+  saveName: "Vampire Hunter D (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181933,7 +191273,8 @@ SLES-02731:
     multitap: false
     linkCable: false
 SLPS-02477:
-  name: "Vampire Hunter D (Japan)"
+  name: "Vampire Hunter D"
+  saveName: "Vampire Hunter D (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181954,7 +191295,8 @@ SLPS-02477:
     multitap: false
     linkCable: false
 SLPS-03198:
-  name: "Vampire Hunter D (Japan) (Rev 1)"
+  name: "Vampire Hunter D"
+  saveName: "Vampire Hunter D (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -181975,7 +191317,8 @@ SLPS-03198:
     multitap: false
     linkCable: false
 SLUS-01138:
-  name: "Vampire Hunter D (USA)"
+  name: "Vampire Hunter D"
+  saveName: "Vampire Hunter D (USA)"
   compatibility:
     rating: NoIssues
     comments: "Main menu is broken (Issue #121). Could be bypassed by pressing START button."
@@ -182020,7 +191363,8 @@ SLPS-91523:
     multitap: false
     linkCable: false
 SLPS-01700:
-  name: "Vampire Savior - EX Edition (Japan)"
+  name: "Vampire Savior - EX Edition"
+  saveName: "Vampire Savior - EX Edition (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1850-g8342fec2"
@@ -182063,7 +191407,8 @@ SLPM-86815:
     multitap: false
     linkCable: false
 SLUS-01035:
-  name: "Vanark (USA)"
+  name: "Vanark"
+  saveName: "Vanark (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -182086,7 +191431,8 @@ SLUS-01035:
     multitap: false
     linkCable: false
 SCPS-45183:
-  name: "Vandal Hearts (Asia)"
+  name: "Vandal Hearts"
+  saveName: "Vandal Hearts (Asia)"
   controllers:
     - DigitalController
   metadata:
@@ -182104,7 +191450,8 @@ SCPS-45183:
     multitap: false
     linkCable: false
 SLES-00204:
-  name: "Vandal Hearts (Europe) (En,Fr,De)"
+  name: "Vandal Hearts"
+  saveName: "Vandal Hearts (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -182124,7 +191471,8 @@ SLES-00204:
     multitap: false
     linkCable: false
 SLUS-00447:
-  name: "Vandal Hearts (USA)"
+  name: "Vandal Hearts"
+  saveName: "Vandal Hearts (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -182142,7 +191490,8 @@ SLUS-00447:
     multitap: false
     linkCable: false
 SLPM-86007:
-  name: "Vandal Hearts - Ushinawareta Kodai Bunmei (Japan)"
+  name: "Vandal Hearts - Ushinawareta Kodai Bunmei"
+  saveName: "Vandal Hearts - Ushinawareta Kodai Bunmei (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -182181,7 +191530,8 @@ SLPM-87278:
     multitap: false
     linkCable: false
 SLES-02469:
-  name: "Vandal Hearts II (Europe) (En,Fr,De)"
+  name: "Vandal Hearts II"
+  saveName: "Vandal Hearts II (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   traits:
@@ -182203,7 +191553,8 @@ SLES-02469:
     multitap: false
     linkCable: false
 SLES-02497:
-  name: "Vandal Hearts II (Italy)"
+  name: "Vandal Hearts II"
+  saveName: "Vandal Hearts II (Italy)"
   controllers:
     - DigitalController
   traits:
@@ -182223,7 +191574,8 @@ SLES-02497:
     multitap: false
     linkCable: false
 SLES-02496:
-  name: "Vandal Hearts II (Spain)"
+  name: "Vandal Hearts II"
+  saveName: "Vandal Hearts II (Spain)"
   controllers:
     - DigitalController
   traits:
@@ -182243,7 +191595,8 @@ SLES-02496:
     multitap: false
     linkCable: false
 SLUS-00940:
-  name: "Vandal Hearts II (USA)"
+  name: "Vandal Hearts II"
+  saveName: "Vandal Hearts II (USA)"
   controllers:
     - DigitalController
   traits:
@@ -182283,7 +191636,8 @@ SCPS-45415:
     multitap: false
     linkCable: false
 SLPM-86251:
-  name: "Vandal Hearts II - Tenjou no Mon (Japan)"
+  name: "Vandal Hearts II - Tenjou no Mon"
+  saveName: "Vandal Hearts II - Tenjou no Mon (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -182343,7 +191697,8 @@ SLPM-87279:
     multitap: false
     linkCable: false
 SLUS-01070:
-  name: "Vanguard Bandits (USA)"
+  name: "Vanguard Bandits"
+  saveName: "Vanguard Bandits (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182362,7 +191717,8 @@ SLUS-01070:
     multitap: false
     linkCable: false
 SLES-02534:
-  name: "Vanishing Point (Europe) (En,Fr,De,Es)"
+  name: "Vanishing Point"
+  saveName: "Vanishing Point (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182385,9 +191741,11 @@ SLES-02534:
     multitap: false
     linkCable: false
 SLES-02796:
-  name: "Vanishing Point (Italy)"
+  name: "Vanishing Point"
+  saveName: "Vanishing Point (Italy)"
 SLUS-01109:
-  name: "Vanishing Point (USA)"
+  name: "Vanishing Point"
+  saveName: "Vanishing Point (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182407,7 +191765,8 @@ SLUS-01109:
     multitap: false
     linkCable: false
 SLES-02918:
-  name: "Vegas Casino (Europe)"
+  name: "Vegas Casino"
+  saveName: "Vegas Casino (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -182425,7 +191784,8 @@ SLES-02918:
     multitap: true
     linkCable: false
 SLUS-00836:
-  name: "Vegas Games 2000 (USA)"
+  name: "Vegas Games 2000"
+  saveName: "Vegas Games 2000 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182444,7 +191804,8 @@ SLUS-00836:
     multitap: true
     linkCable: false
 SLPS-00232:
-  name: "Vehicle Cavalier (Japan)"
+  name: "Vehicle Cavalier"
+  saveName: "Vehicle Cavalier (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -182462,7 +191823,8 @@ SLPS-00232:
     multitap: false
     linkCable: false
 SCPS-10027:
-  name: "Velldeselba Senki - Tsubasa no Kunshou (Japan)"
+  name: "Velldeselba Senki - Tsubasa no Kunshou"
+  saveName: "Velldeselba Senki - Tsubasa no Kunshou (Japan)"
   controllers:
     - DigitalController
     - AnalogJoystick
@@ -182481,11 +191843,13 @@ SCPS-10027:
     multitap: false
     linkCable: false
 PAPX-90012:
-  name: "Velldeselba Senki - Tsubasa no Kunshou (Japan) (Demo)"
+  name: "Velldeselba Senki - Tsubasa no Kunshou (Demo)"
+  saveName: "Velldeselba Senki - Tsubasa no Kunshou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03483:
-  name: "Vem Vill Bli Miljonaer (Sweden)"
+  name: "Vem Vill Bli Miljonaer"
+  saveName: "Vem Vill Bli Miljonaer (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182504,7 +191868,8 @@ SLES-03483:
     multitap: true
     linkCable: false
 SLPS-00558:
-  name: "Vermin Kids (Japan)"
+  name: "Vermin Kids"
+  saveName: "Vermin Kids (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -182522,7 +191887,8 @@ SLPS-00558:
     multitap: false
     linkCable: false
 SLES-02295:
-  name: "Verrat in der Verbotenen Stadt (Germany)"
+  name: "Verrat in der Verbotenen Stadt"
+  saveName: "Verrat in der Verbotenen Stadt (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -182540,7 +191906,8 @@ SLES-02295:
     multitap: false
     linkCable: false
 SLES-01293:
-  name: "Versailles - A Game of Intrigue (Europe)"
+  name: "Versailles - A Game of Intrigue"
+  saveName: "Versailles - A Game of Intrigue (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182559,7 +191926,8 @@ SLES-01293:
     multitap: false
     linkCable: false
 SLES-01031:
-  name: "Versailles - Complot a la Cour du Roi Soleil (France)"
+  name: "Versailles - Complot a la Cour du Roi Soleil"
+  saveName: "Versailles - Complot a la Cour du Roi Soleil (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182578,7 +191946,8 @@ SLES-01031:
     multitap: false
     linkCable: false
 SLES-01294:
-  name: "Versailles - Complotto alla Corte del Re Sole (Italy)"
+  name: "Versailles - Complotto alla Corte del Re Sole"
+  saveName: "Versailles - Complotto alla Corte del Re Sole (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182597,7 +191966,8 @@ SLES-01294:
     multitap: false
     linkCable: false
 SLES-01730:
-  name: "Versailles - Verschwoerung am Hof (Germany)"
+  name: "Versailles - Verschwoerung am Hof"
+  saveName: "Versailles - Verschwoerung am Hof (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182616,7 +191986,8 @@ SLES-01730:
     multitap: false
     linkCable: false
 SLES-02219:
-  name: "Versalles - Complot en la corte del Rey Sol (Spain)"
+  name: "Versalles - Complot en la corte del Rey Sol"
+  saveName: "Versalles - Complot en la corte del Rey Sol (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182654,7 +192025,8 @@ SCPS-45469:
     multitap: false
     linkCable: false
 SCES-02873:
-  name: "Vib-Ribbon (Europe) (En,Fr,De,Es,It)"
+  name: "Vib-Ribbon"
+  saveName: "Vib-Ribbon (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -182680,7 +192052,8 @@ SCES-02873:
     multitap: false
     linkCable: false
 SCPS-18012:
-  name: "Vib-Ribbon (Japan)"
+  name: "Vib-Ribbon"
+  saveName: "Vib-Ribbon (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -182706,11 +192079,13 @@ SCPS-18012:
     multitap: false
     linkCable: false
 PAPX-90101:
-  name: "Vib-Ribbon (Japan) (Demo)"
+  name: "Vib-Ribbon (Demo)"
+  saveName: "Vib-Ribbon (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02740:
-  name: "Victory Boxing (Japan)"
+  name: "Victory Boxing"
+  saveName: "Victory Boxing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182729,7 +192104,8 @@ SLPS-02740:
     multitap: false
     linkCable: false
 SLES-01393:
-  name: "Victory Boxing 2 (Europe)"
+  name: "Victory Boxing 2"
+  saveName: "Victory Boxing 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182748,11 +192124,13 @@ SLES-01393:
     multitap: false
     linkCable: false
 SLED-01529:
-  name: "Victory Boxing 2 (Europe) (Demo)"
+  name: "Victory Boxing 2 (Demo)"
+  saveName: "Victory Boxing 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-02727:
-  name: "Victory Boxing Challenger (Europe) (En,Fr,De,Es)"
+  name: "Victory Boxing Challenger"
+  saveName: "Victory Boxing Challenger (Europe) (En,Fr,De,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182771,7 +192149,8 @@ SLES-02727:
     multitap: false
     linkCable: false
 SLES-00180:
-  name: "Victory Boxing Champion Edition (Europe)"
+  name: "Victory Boxing Champion Edition"
+  saveName: "Victory Boxing Champion Edition (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -182789,7 +192168,8 @@ SLES-00180:
     multitap: false
     linkCable: false
 SLES-03599:
-  name: "Victory Boxing Contender (Europe)"
+  name: "Victory Boxing Contender"
+  saveName: "Victory Boxing Contender (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -182808,7 +192188,8 @@ SLES-03599:
     multitap: false
     linkCable: false
 SLPS-00372:
-  name: "Victory Spike (Japan)"
+  name: "Victory Spike"
+  saveName: "Victory Spike (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -182826,7 +192207,8 @@ SLPS-00372:
     multitap: false
     linkCable: false
 SCPS-10002:
-  name: "Victory Zone (Japan)"
+  name: "Victory Zone"
+  saveName: "Victory Zone (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -182844,7 +192226,8 @@ SCPS-10002:
     multitap: false
     linkCable: false
 SCPS-10024:
-  name: "Victory Zone 2 (Japan)"
+  name: "Victory Zone 2"
+  saveName: "Victory Zone 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -182880,9 +192263,11 @@ SCPS-10025:
     multitap: false
     linkCable: false
 SCED-00988:
-  name: "Video IDU Test v1.1 (Europe)"
+  name: "Video IDU Test v1.1"
+  saveName: "Video IDU Test v1.1 (Europe)"
 SLES-00123:
-  name: "Viewpoint (Europe)"
+  name: "Viewpoint"
+  saveName: "Viewpoint (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -182900,7 +192285,8 @@ SLES-00123:
     multitap: false
     linkCable: false
 SLUS-00033:
-  name: "Viewpoint (USA)"
+  name: "Viewpoint"
+  saveName: "Viewpoint (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -182921,7 +192307,8 @@ SLUS-00033:
     multitap: false
     linkCable: false
 SLES-01212:
-  name: "Vigilante 8 (Europe)"
+  name: "Vigilante 8"
+  saveName: "Vigilante 8 (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -182942,11 +192329,13 @@ SLES-01212:
     multitap: false
     linkCable: false
 SLED-01250:
-  name: "Vigilante 8 (Europe) (Demo)"
+  name: "Vigilante 8 (Demo)"
+  saveName: "Vigilante 8 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01213:
-  name: "Vigilante 8 (France)"
+  name: "Vigilante 8"
+  saveName: "Vigilante 8 (France)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -182967,7 +192356,8 @@ SLES-01213:
     multitap: false
     linkCable: false
 SLES-01214:
-  name: "Vigilante 8 (Germany)"
+  name: "Vigilante 8"
+  saveName: "Vigilante 8 (Germany)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -182988,7 +192378,8 @@ SLES-01214:
     multitap: false
     linkCable: false
 SLES-01215:
-  name: "Vigilante 8 (Italy)"
+  name: "Vigilante 8"
+  saveName: "Vigilante 8 (Italy)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -183009,7 +192400,8 @@ SLES-01215:
     multitap: false
     linkCable: false
 SLPS-01703:
-  name: "Vigilante 8 (Japan)"
+  name: "Vigilante 8"
+  saveName: "Vigilante 8 (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -183033,11 +192425,13 @@ SLPS-01703:
     multitap: false
     linkCable: false
 SLPM-80316:
-  name: "Vigilante 8 (Japan) (Demo)"
+  name: "Vigilante 8 (Demo)"
+  saveName: "Vigilante 8 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00510:
-  name: "Vigilante 8 (USA)"
+  name: "Vigilante 8"
+  saveName: "Vigilante 8 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3187-gf580dbc6"
@@ -183061,11 +192455,13 @@ SLUS-00510:
     multitap: false
     linkCable: false
 SLUS-90022:
-  name: "Vigilante 8 (USA) (Demo)"
+  name: "Vigilante 8 (Demo)"
+  saveName: "Vigilante 8 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02615:
-  name: "Vigilante 8 - 2nd Battle (Japan)"
+  name: "Vigilante 8 - 2nd Battle"
+  saveName: "Vigilante 8 - 2nd Battle (Japan)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -183086,7 +192482,8 @@ SLPS-02615:
     multitap: false
     linkCable: false
 SLES-02162:
-  name: "Vigilante 8 - 2nd Offense (Europe)"
+  name: "Vigilante 8 - 2nd Offense"
+  saveName: "Vigilante 8 - 2nd Offense (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -183107,7 +192504,8 @@ SLES-02162:
     multitap: false
     linkCable: false
 SLUS-00868:
-  name: "Vigilante 8 - 2nd Offense (USA)"
+  name: "Vigilante 8 - 2nd Offense"
+  saveName: "Vigilante 8 - 2nd Offense (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -183173,9 +192571,11 @@ SLPM-86929:
     multitap: false
     linkCable: false
 SLES-03484:
-  name: "Vil du bli millionaer (Norway)"
+  name: "Vil du bli millionaer"
+  saveName: "Vil du bli millionaer (Norway)"
 SLES-01302:
-  name: "Viper (Europe) (En,Fr,De,Es,It)"
+  name: "Viper"
+  saveName: "Viper (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183198,7 +192598,8 @@ SLES-01302:
     multitap: false
     linkCable: false
 SLPS-01639:
-  name: "Virtua Pachi-Slot - Olympia Special (Japan)"
+  name: "Virtua Pachi-Slot - Olympia Special"
+  saveName: "Virtua Pachi-Slot - Olympia Special (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -183219,7 +192620,8 @@ SLPS-01639:
     multitap: false
     linkCable: false
 SLPS-02896:
-  name: "Virtua Pachi-Slot 7 - Kita Denshi, Olympia (Japan)"
+  name: "Virtua Pachi-Slot 7 - Kita Denshi, Olympia"
+  saveName: "Virtua Pachi-Slot 7 - Kita Denshi, Olympia (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -183237,7 +192639,8 @@ SLPS-02896:
     multitap: false
     linkCable: false
 SLPS-02295:
-  name: "Virtua Pachi-Slot EX (Japan)"
+  name: "Virtua Pachi-Slot EX"
+  saveName: "Virtua Pachi-Slot EX (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183256,7 +192659,8 @@ SLPS-02295:
     multitap: false
     linkCable: false
 SLPS-02235:
-  name: "Virtua Pachi-Slot V - Yamasa, Kita Denshi, Olympia (Japan)"
+  name: "Virtua Pachi-Slot V - Yamasa, Kita Denshi, Olympia"
+  saveName: "Virtua Pachi-Slot V - Yamasa, Kita Denshi, Olympia (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -183292,9 +192696,11 @@ SLPS-03026:
     multitap: false
     linkCable: false
 SLPS-02557:
-  name: "Virtua Pachi-Slot VI (Japan)"
+  name: "Virtua Pachi-Slot VI"
+  saveName: "Virtua Pachi-Slot VI (Japan)"
 SLPS-00892:
-  name: "Virtual Bowling - Ten Pin Alley no Kiseki (Japan)"
+  name: "Virtual Bowling - Ten Pin Alley no Kiseki"
+  saveName: "Virtual Bowling - Ten Pin Alley no Kiseki (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -183312,7 +192718,8 @@ SLPS-00892:
     multitap: true
     linkCable: false
 SLPS-00568:
-  name: "Virtual Gallop - Kishudou (Japan)"
+  name: "Virtual Gallop - Kishudou"
+  saveName: "Virtual Gallop - Kishudou (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -183333,7 +192740,8 @@ SLPS-00568:
     multitap: false
     linkCable: false
 SLPS-00567:
-  name: "Virtual Gallop - Kishudou (Japan) (Genteiban)"
+  name: "Virtual Gallop - Kishudou (Genteiban)"
+  saveName: "Virtual Gallop - Kishudou (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -183351,7 +192759,8 @@ SLPS-00567:
     multitap: false
     linkCable: false
 SLES-00264:
-  name: "Virtual Golf (Europe) (En,Fr,De)"
+  name: "Virtual Golf"
+  saveName: "Virtual Golf (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -183369,7 +192778,8 @@ SLES-00264:
     multitap: false
     linkCable: false
 SLPS-00338:
-  name: "Virtual Hiryuu no Ken (Japan)"
+  name: "Virtual Hiryuu no Ken"
+  saveName: "Virtual Hiryuu no Ken (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -183387,11 +192797,13 @@ SLPS-00338:
     multitap: false
     linkCable: false
 SLPM-80110:
-  name: "Virtual Hiryuu no Ken (Japan) (Demo)"
+  name: "Virtual Hiryuu no Ken (Demo)"
+  saveName: "Virtual Hiryuu no Ken (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03288:
-  name: "Virtual Kasparov (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Virtual Kasparov"
+  saveName: "Virtual Kasparov (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183415,7 +192827,8 @@ SLES-03288:
     multitap: false
     linkCable: false
 SLUS-01341:
-  name: "Virtual Kasparov (USA) (En,Fr,Es)"
+  name: "Virtual Kasparov"
+  saveName: "Virtual Kasparov (USA) (En,Fr,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183455,7 +192868,8 @@ SLPS-03044:
     multitap: false
     linkCable: false
 SLPS-01396:
-  name: "Virtual Kyoutei '98 (Japan)"
+  name: "Virtual Kyoutei '98"
+  saveName: "Virtual Kyoutei '98 (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -183476,7 +192890,8 @@ SLPS-01396:
     multitap: false
     linkCable: false
 SLPS-02014:
-  name: "Virtual Kyoutei '99 (Japan)"
+  name: "Virtual Kyoutei '99"
+  saveName: "Virtual Kyoutei '99 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183495,7 +192910,8 @@ SLPS-02014:
     multitap: false
     linkCable: false
 SLPS-02748:
-  name: "Virtual Kyoutei 2000 (Japan)"
+  name: "Virtual Kyoutei 2000"
+  saveName: "Virtual Kyoutei 2000 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183514,7 +192930,8 @@ SLPS-02748:
     multitap: false
     linkCable: false
 SLPS-03199:
-  name: "Virtual Kyoutei 21 (Japan)"
+  name: "Virtual Kyoutei 21"
+  saveName: "Virtual Kyoutei 21 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183533,7 +192950,8 @@ SLPS-03199:
     multitap: false
     linkCable: false
 SLES-00234:
-  name: "Virtual Pool (Europe)"
+  name: "Virtual Pool"
+  saveName: "Virtual Pool (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -183552,7 +192970,8 @@ SLES-00234:
     multitap: false
     linkCable: false
 SLUS-00034:
-  name: "Virtual Pool (USA)"
+  name: "Virtual Pool"
+  saveName: "Virtual Pool (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -183571,7 +192990,8 @@ SLUS-00034:
     multitap: false
     linkCable: false
 SLUS-01374:
-  name: "Virtual Pool 3 (USA)"
+  name: "Virtual Pool 3"
+  saveName: "Virtual Pool 3 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183590,7 +193010,8 @@ SLUS-01374:
     multitap: false
     linkCable: false
 SLPS-00449:
-  name: "Virtual Pro Wrestling (Japan)"
+  name: "Virtual Pro Wrestling"
+  saveName: "Virtual Pro Wrestling (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -183608,7 +193029,8 @@ SLPS-00449:
     multitap: false
     linkCable: false
 SLES-01317:
-  name: "Virus - It Is Aware (Europe) (En,Fr,De,Es,It)"
+  name: "Virus - It Is Aware"
+  saveName: "Virus - It Is Aware (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183631,7 +193053,8 @@ SLES-01317:
     multitap: false
     linkCable: false
 SLPS-02008:
-  name: "Virus - The Battle Field (Japan)"
+  name: "Virus - The Battle Field"
+  saveName: "Virus - The Battle Field (Japan)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -183651,7 +193074,8 @@ SLPS-02008:
     multitap: false
     linkCable: false
 SLES-02837:
-  name: "Visiteurs, Les - La Relique de Sainte Rolande (France)"
+  name: "Visiteurs, Les - La Relique de Sainte Rolande"
+  saveName: "Visiteurs, Les - La Relique de Sainte Rolande (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183670,7 +193094,8 @@ SLES-02837:
     multitap: false
     linkCable: false
 SLES-00761:
-  name: "Viva Football (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Viva Football"
+  saveName: "Viva Football (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183694,11 +193119,13 @@ SLES-00761:
     multitap: true
     linkCable: false
 SLED-01931:
-  name: "Viva Football (Europe) (En,Fr,De,Es,It,Pt) (Demo)"
+  name: "Viva Football (Demo)"
+  saveName: "Viva Football (Europe) (En,Fr,De,Es,It,Pt) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00953:
-  name: "Viva Soccer (USA) (En,Fr,De,Es,It,Pt)"
+  name: "Viva Soccer"
+  saveName: "Viva Soccer (USA) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183717,9 +193144,11 @@ SLUS-00953:
     multitap: true
     linkCable: false
 SCED-03925:
-  name: "Vivi la Magia di Disney su PlayStation (Italy)"
+  name: "Vivi la Magia di Disney su PlayStation"
+  saveName: "Vivi la Magia di Disney su PlayStation (Italy)"
 SLPS-00747:
-  name: "Voice Fantasia - Ushinawareta Voice Power (Japan)"
+  name: "Voice Fantasia - Ushinawareta Voice Power"
+  saveName: "Voice Fantasia - Ushinawareta Voice Power (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -183737,7 +193166,8 @@ SLPS-00747:
     multitap: false
     linkCable: false
 SLPS-00775:
-  name: "Voice Idol Collection - Pool Bar Story (Japan) (Disc 1)"
+  name: "Voice Idol Collection - Pool Bar Story (Disc 1)"
+  saveName: "Voice Idol Collection - Pool Bar Story (Japan) (Disc 1)"
   discSet:
     name: "Voice Idol Collection - Pool Bar Story (Japan)"
     serials:
@@ -183763,7 +193193,8 @@ SLPS-00775:
     multitap: false
     linkCable: false
 SLPS-00776:
-  name: "Voice Idol Collection - Pool Bar Story (Japan) (Disc 2)"
+  name: "Voice Idol Collection - Pool Bar Story (Disc 2)"
+  saveName: "Voice Idol Collection - Pool Bar Story (Japan) (Disc 2)"
   discSet:
     name: "Voice Idol Collection - Pool Bar Story (Japan)"
     serials:
@@ -183786,7 +193217,8 @@ SLPS-00776:
     multitap: false
     linkCable: false
 SLPS-00590:
-  name: "Voice Paradice Excella (Japan) (Disc 1)"
+  name: "Voice Paradice Excella (Disc 1)"
+  saveName: "Voice Paradice Excella (Japan) (Disc 1)"
   discSet:
     name: "Voice Paradice Excella (Japan)"
     serials:
@@ -183809,7 +193241,8 @@ SLPS-00590:
     multitap: false
     linkCable: false
 SLPS-00591:
-  name: "Voice Paradice Excella (Japan) (Disc 2)"
+  name: "Voice Paradice Excella (Disc 2)"
+  saveName: "Voice Paradice Excella (Japan) (Disc 2)"
   discSet:
     name: "Voice Paradice Excella (Japan)"
     serials:
@@ -183832,7 +193265,8 @@ SLPS-00591:
     multitap: false
     linkCable: false
 SLPS-03140:
-  name: "Volfoss (Japan)"
+  name: "Volfoss"
+  saveName: "Volfoss (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183851,7 +193285,8 @@ SLPS-03140:
     multitap: false
     linkCable: false
 SLES-01104:
-  name: "Vs. (Europe)"
+  name: "Vs."
+  saveName: "Vs. (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -183869,7 +193304,8 @@ SLES-01104:
     multitap: false
     linkCable: false
 SLUS-00513:
-  name: "Vs. (USA)"
+  name: "Vs."
+  saveName: "Vs. (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -183887,7 +193323,8 @@ SLUS-00513:
     multitap: false
     linkCable: false
 SLES-03168:
-  name: "WCW Backstage Assault (Europe)"
+  name: "WCW Backstage Assault"
+  saveName: "WCW Backstage Assault (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -183905,7 +193342,8 @@ SLES-03168:
     multitap: false
     linkCable: false
 SLUS-01274:
-  name: "WCW Backstage Assault (USA)"
+  name: "WCW Backstage Assault"
+  saveName: "WCW Backstage Assault (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -183923,7 +193361,8 @@ SLUS-01274:
     multitap: false
     linkCable: false
 SLES-02193:
-  name: "WCW Mayhem (Europe)"
+  name: "WCW Mayhem"
+  saveName: "WCW Mayhem (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183942,7 +193381,8 @@ SLES-02193:
     multitap: true
     linkCable: false
 SLUS-00963:
-  name: "WCW Mayhem (USA)"
+  name: "WCW Mayhem"
+  saveName: "WCW Mayhem (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -183961,7 +193401,8 @@ SLUS-00963:
     multitap: true
     linkCable: false
 SLES-01137:
-  name: "WCW Nitro (Europe)"
+  name: "WCW Nitro"
+  saveName: "WCW Nitro (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -183979,7 +193420,8 @@ SLES-01137:
     multitap: false
     linkCable: false
 SLUS-00397:
-  name: "WCW Nitro (USA)"
+  name: "WCW Nitro"
+  saveName: "WCW Nitro (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -183997,7 +193439,8 @@ SLUS-00397:
     multitap: false
     linkCable: false
 SLES-00763:
-  name: "WCW vs. the World (Europe)"
+  name: "WCW vs. the World"
+  saveName: "WCW vs. the World (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -184015,7 +193458,8 @@ SLES-00763:
     multitap: false
     linkCable: false
 SLUS-00455:
-  name: "WCW vs. the World (USA)"
+  name: "WCW vs. the World"
+  saveName: "WCW vs. the World (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -184033,7 +193477,8 @@ SLUS-00455:
     multitap: false
     linkCable: false
 SLES-01663:
-  name: "WCW-nWo Thunder (Europe)"
+  name: "WCW-nWo Thunder"
+  saveName: "WCW-nWo Thunder (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184052,7 +193497,8 @@ SLES-01663:
     multitap: false
     linkCable: false
 SLUS-00779:
-  name: "WCW-nWo Thunder (USA)"
+  name: "WCW-nWo Thunder"
+  saveName: "WCW-nWo Thunder (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184071,7 +193517,8 @@ SLUS-00779:
     multitap: false
     linkCable: false
 SLES-03869:
-  name: "WM Nationalspieler (Germany)"
+  name: "WM Nationalspieler"
+  saveName: "WM Nationalspieler (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -184089,7 +193536,8 @@ SLES-03869:
     multitap: false
     linkCable: false
 SCES-03907:
-  name: "WRC - FIA World Rally Championship Arcade (Europe) (En,Fr,De,Es,It,Nl,Pt,Sv,No,Da,Fi)"
+  name: "WRC - FIA World Rally Championship Arcade"
+  saveName: "WRC - FIA World Rally Championship Arcade (Europe) (En,Fr,De,Es,It,Nl,Pt,Sv,No,Da,Fi)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184159,7 +193607,8 @@ SLPS-03303:
     multitap: true
     linkCable: false
 SLPS-02852:
-  name: "WTC World Touring Car Championship (Japan)"
+  name: "WTC World Touring Car Championship"
+  saveName: "WTC World Touring Car Championship (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184179,7 +193628,8 @@ SLPS-02852:
     multitap: true
     linkCable: false
 SLES-01980:
-  name: "WWF Attitude (Europe)"
+  name: "WWF Attitude"
+  saveName: "WWF Attitude (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184198,7 +193648,8 @@ SLES-01980:
     multitap: true
     linkCable: false
 SLES-02255:
-  name: "WWF Attitude (Germany)"
+  name: "WWF Attitude"
+  saveName: "WWF Attitude (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184217,7 +193668,8 @@ SLES-02255:
     multitap: true
     linkCable: false
 SLUS-00831:
-  name: "WWF Attitude (USA)"
+  name: "WWF Attitude"
+  saveName: "WWF Attitude (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184236,7 +193688,8 @@ SLUS-00831:
     multitap: true
     linkCable: false
 SLES-00286:
-  name: "WWF In Your House (Europe)"
+  name: "WWF In Your House"
+  saveName: "WWF In Your House (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -184254,7 +193707,8 @@ SLES-00286:
     multitap: true
     linkCable: false
 SLPS-00695:
-  name: "WWF In Your House (Japan)"
+  name: "WWF In Your House"
+  saveName: "WWF In Your House (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -184272,7 +193726,8 @@ SLPS-00695:
     multitap: true
     linkCable: false
 SLUS-00246:
-  name: "WWF In Your House (USA)"
+  name: "WWF In Your House"
+  saveName: "WWF In Your House (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -184290,7 +193745,8 @@ SLUS-00246:
     multitap: true
     linkCable: false
 SLES-02619:
-  name: "WWF SmackDown! (Europe)"
+  name: "WWF SmackDown!"
+  saveName: "WWF SmackDown! (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184309,7 +193765,8 @@ SLES-02619:
     multitap: true
     linkCable: false
 SLUS-00927:
-  name: "WWF SmackDown! (USA)"
+  name: "WWF SmackDown!"
+  saveName: "WWF SmackDown! (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184328,7 +193785,8 @@ SLUS-00927:
     multitap: true
     linkCable: false
 SLES-03251:
-  name: "WWF SmackDown! 2 - Know Your Role (Europe)"
+  name: "WWF SmackDown! 2 - Know Your Role"
+  saveName: "WWF SmackDown! 2 - Know Your Role (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184347,7 +193805,8 @@ SLES-03251:
     multitap: true
     linkCable: false
 SLUS-01234:
-  name: "WWF SmackDown! 2 - Know Your Role (USA)"
+  name: "WWF SmackDown! 2 - Know Your Role"
+  saveName: "WWF SmackDown! 2 - Know Your Role (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3575-ga8fd4d5b"
@@ -184369,7 +193828,8 @@ SLUS-01234:
     multitap: true
     linkCable: false
 SLES-00804:
-  name: "WWF War Zone (Europe)"
+  name: "WWF War Zone"
+  saveName: "WWF War Zone (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -184387,7 +193847,8 @@ SLES-00804:
     multitap: true
     linkCable: false
 SLUS-00495:
-  name: "WWF War Zone (USA)"
+  name: "WWF War Zone"
+  saveName: "WWF War Zone (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -184405,7 +193866,8 @@ SLUS-00495:
     multitap: true
     linkCable: false
 SLES-00103:
-  name: "WWF WrestleMania - The Arcade Game (Europe)"
+  name: "WWF WrestleMania - The Arcade Game"
+  saveName: "WWF WrestleMania - The Arcade Game (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -184423,7 +193885,8 @@ SLES-00103:
     multitap: false
     linkCable: false
 SLPS-00223:
-  name: "WWF WrestleMania - The Arcade Game (Japan)"
+  name: "WWF WrestleMania - The Arcade Game"
+  saveName: "WWF WrestleMania - The Arcade Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -184441,7 +193904,8 @@ SLPS-00223:
     multitap: false
     linkCable: false
 SLUS-00013:
-  name: "WWF WrestleMania - The Arcade Game (USA)"
+  name: "WWF WrestleMania - The Arcade Game"
+  saveName: "WWF WrestleMania - The Arcade Game (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -184459,7 +193923,8 @@ SLUS-00013:
     multitap: false
     linkCable: false
 SLES-02468:
-  name: "Wacky Races (Europe) (En,Fr,De,Es,It,Nl)"
+  name: "Wacky Races"
+  saveName: "Wacky Races (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184484,7 +193949,8 @@ SLES-02468:
     multitap: false
     linkCable: false
 SLPM-87220:
-  name: "Wagamama Fairy Mirumo de Pon! Mirumo no Mahou Gakkou Monogatari (Japan)"
+  name: "Wagamama Fairy Mirumo de Pon! Mirumo no Mahou Gakkou Monogatari"
+  saveName: "Wagamama Fairy Mirumo de Pon! Mirumo no Mahou Gakkou Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184503,7 +193969,8 @@ SLPM-87220:
     multitap: false
     linkCable: false
 SLPM-86696:
-  name: "Wai Wai 3-nin Uchi Mahjong (Japan)"
+  name: "Wai Wai 3-nin Uchi Mahjong"
+  saveName: "Wai Wai 3-nin Uchi Mahjong (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184541,7 +194008,8 @@ HPS-91:
     multitap: true
     linkCable: false
 SLPM-87225:
-  name: "Wai Wai Bowling (Japan)"
+  name: "Wai Wai Bowling"
+  saveName: "Wai Wai Bowling (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -184559,7 +194027,8 @@ SLPM-87225:
     multitap: false
     linkCable: false
 SLPM-86544:
-  name: "Wai Wai Jansou (Japan)"
+  name: "Wai Wai Jansou"
+  saveName: "Wai Wai Jansou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184578,7 +194047,8 @@ SLPM-86544:
     multitap: true
     linkCable: false
 SLPM-87230:
-  name: "Wai Wai Kart (Japan) (Major Wave)"
+  name: "Wai Wai Kart (Major Wave)"
+  saveName: "Wai Wai Kart (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184598,7 +194068,8 @@ SLPM-87230:
     multitap: false
     linkCable: false
 SLPM-87244:
-  name: "Wai Wai Kusa Yakyuu (Japan)"
+  name: "Wai Wai Kusa Yakyuu"
+  saveName: "Wai Wai Kusa Yakyuu (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184617,7 +194088,8 @@ SLPM-87244:
     multitap: false
     linkCable: false
 SLPM-86657:
-  name: "Wai Wai Trump Taisen (Japan)"
+  name: "Wai Wai Trump Taisen"
+  saveName: "Wai Wai Trump Taisen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184655,7 +194127,8 @@ HPS-105:
     multitap: true
     linkCable: false
 SLPS-01966:
-  name: "Waku Puyo Dungeon - Ketteiban (Japan)"
+  name: "Waku Puyo Dungeon - Ketteiban"
+  saveName: "Waku Puyo Dungeon - Ketteiban (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184674,7 +194147,8 @@ SLPS-01966:
     multitap: false
     linkCable: false
 SLPS-01166:
-  name: "Waku Waku Bowling (Japan)"
+  name: "Waku Waku Bowling"
+  saveName: "Waku Waku Bowling (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -184692,12 +194166,14 @@ SLPS-01166:
     multitap: true
     linkCable: false
 SLPS-01157:
-  name: "Waku Waku Derby (Japan)"
+  name: "Waku Waku Derby"
+  saveName: "Waku Waku Derby (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
 SLPS-01695:
-  name: "Waku Waku Volley (Japan)"
+  name: "Waku Waku Volley"
+  saveName: "Waku Waku Volley (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -184718,9 +194194,11 @@ SLPS-01695:
     multitap: true
     linkCable: false
 SLPM-80342:
-  name: "Waku Waku Volley (Japan) (Taikenban)"
+  name: "Waku Waku Volley (Taikenban)"
+  saveName: "Waku Waku Volley (Japan) (Taikenban)"
 SLPS-01374:
-  name: "Wakusei Koukitai - Little Cats (Japan)"
+  name: "Wakusei Koukitai - Little Cats"
+  saveName: "Wakusei Koukitai - Little Cats (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184739,7 +194217,8 @@ SLPS-01374:
     multitap: false
     linkCable: false
 SCES-03029:
-  name: "Walt Disney El Libro de la Selva - Muevete con Ritmo (Spain)"
+  name: "Walt Disney El Libro de la Selva - Muevete con Ritmo"
+  saveName: "Walt Disney El Libro de la Selva - Muevete con Ritmo (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184758,7 +194237,8 @@ SCES-03029:
     multitap: false
     linkCable: false
 SCES-03026:
-  name: "Walt Disney Il Libro della Giungla - Il Ballo della Giungla (Italy)"
+  name: "Walt Disney Il Libro della Giungla - Il Ballo della Giungla"
+  saveName: "Walt Disney Il Libro della Giungla - Il Ballo della Giungla (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184777,7 +194257,8 @@ SCES-03026:
     multitap: false
     linkCable: false
 SCES-03028:
-  name: "Walt Disney Ksiega Dzungli - Groove Party (Poland)"
+  name: "Walt Disney Ksiega Dzungli - Groove Party"
+  saveName: "Walt Disney Ksiega Dzungli - Groove Party (Poland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184796,7 +194277,8 @@ SCES-03028:
     multitap: false
     linkCable: false
 SCES-03024:
-  name: "Walt Disney Le Livre de la Jungle - Groove Party (France)"
+  name: "Walt Disney Le Livre de la Jungle - Groove Party"
+  saveName: "Walt Disney Le Livre de la Jungle - Groove Party (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184815,7 +194297,8 @@ SCES-03024:
     multitap: false
     linkCable: false
 SLES-02733:
-  name: "Walt Disney World Quest - Magical Racing Tour (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da)"
+  name: "Walt Disney World Quest - Magical Racing Tour"
+  saveName: "Walt Disney World Quest - Magical Racing Tour (Europe) (En,Fr,De,Es,It,Nl,Sv,No,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184844,7 +194327,8 @@ SLES-02733:
     multitap: false
     linkCable: false
 SLUS-01106:
-  name: "Walt Disney World Quest - Magical Racing Tour (USA)"
+  name: "Walt Disney World Quest - Magical Racing Tour"
+  saveName: "Walt Disney World Quest - Magical Racing Tour (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -184867,7 +194351,8 @@ SLUS-01106:
     multitap: false
     linkCable: false
 SCES-03022:
-  name: "Walt Disney's Jungle Boek - Groove Party (Netherlands)"
+  name: "Walt Disney's Jungle Boek - Groove Party"
+  saveName: "Walt Disney's Jungle Boek - Groove Party (Netherlands)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184886,7 +194371,8 @@ SCES-03022:
     multitap: false
     linkCable: false
 SCES-03020:
-  name: "Walt Disney's The Jungle Book - Groove Party (Europe)"
+  name: "Walt Disney's The Jungle Book - Groove Party"
+  saveName: "Walt Disney's The Jungle Book - Groove Party (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184905,7 +194391,8 @@ SCES-03020:
     multitap: false
     linkCable: false
 SLUS-01278:
-  name: "Walt Disney's The Jungle Book - Rhythm n' Groove (USA)"
+  name: "Walt Disney's The Jungle Book - Rhythm n' Groove"
+  saveName: "Walt Disney's The Jungle Book - Rhythm n' Groove (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2632-g14c227a8"
@@ -184927,7 +194414,8 @@ SLUS-01278:
     multitap: false
     linkCable: false
 SCES-03023:
-  name: "Walt Disneyn Viidakkokirja - Svengiseikkailu (Finland)"
+  name: "Walt Disneyn Viidakkokirja - Svengiseikkailu"
+  saveName: "Walt Disneyn Viidakkokirja - Svengiseikkailu (Finland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184946,7 +194434,8 @@ SCES-03023:
     multitap: false
     linkCable: false
 SCES-03025:
-  name: "Walt Disneys Das Dschungelbuch - Groove Party (Germany)"
+  name: "Walt Disneys Das Dschungelbuch - Groove Party"
+  saveName: "Walt Disneys Das Dschungelbuch - Groove Party (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184965,7 +194454,8 @@ SCES-03025:
     multitap: false
     linkCable: false
 SCES-03030:
-  name: "Walt Disneys Djungelboken - Groove Party (Sweden)"
+  name: "Walt Disneys Djungelboken - Groove Party"
+  saveName: "Walt Disneys Djungelboken - Groove Party (Sweden)"
   controllers:
     - AnalogController
     - DigitalController
@@ -184984,7 +194474,8 @@ SCES-03030:
     multitap: false
     linkCable: false
 SCES-03027:
-  name: "Walt Disneys Jungelboken - Groove Party (Norway)"
+  name: "Walt Disneys Jungelboken - Groove Party"
+  saveName: "Walt Disneys Jungelboken - Groove Party (Norway)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185003,7 +194494,8 @@ SCES-03027:
     multitap: false
     linkCable: false
 SCES-03021:
-  name: "Walt Disneys Junglebogen - Groove Party (Denmark)"
+  name: "Walt Disneys Junglebogen - Groove Party"
+  saveName: "Walt Disneys Junglebogen - Groove Party (Denmark)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185022,7 +194514,8 @@ SCES-03021:
     multitap: false
     linkCable: false
 SLPS-02322:
-  name: "Wander Vehicles - Doggy Bone Daisakusen (Japan)"
+  name: "Wander Vehicles - Doggy Bone Daisakusen"
+  saveName: "Wander Vehicles - Doggy Bone Daisakusen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185044,7 +194537,8 @@ SLPS-02322:
     multitap: false
     linkCable: false
 SLPS-01213:
-  name: "Wangan Trial (Japan) (Disc 1)"
+  name: "Wangan Trial (Disc 1)"
+  saveName: "Wangan Trial (Japan) (Disc 1)"
   discSet:
     name: "Wangan Trial (Japan)"
     serials:
@@ -185072,7 +194566,8 @@ SLPS-01213:
     multitap: false
     linkCable: false
 SLPS-01214:
-  name: "Wangan Trial (Japan) (Disc 2)"
+  name: "Wangan Trial (Disc 2)"
+  saveName: "Wangan Trial (Japan) (Disc 2)"
   discSet:
     name: "Wangan Trial (Japan)"
     serials:
@@ -185100,7 +194595,8 @@ SLPS-01214:
     multitap: false
     linkCable: false
 SLES-04158:
-  name: "Wanted (Europe)"
+  name: "Wanted"
+  saveName: "Wanted (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185119,7 +194615,8 @@ SLES-04158:
     multitap: false
     linkCable: false
 SLES-00538:
-  name: "War Gods (Europe)"
+  name: "War Gods"
+  saveName: "War Gods (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -185137,7 +194634,8 @@ SLES-00538:
     multitap: false
     linkCable: false
 SLUS-00328:
-  name: "War Gods (USA)"
+  name: "War Gods"
+  saveName: "War Gods (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -185158,7 +194656,8 @@ SLUS-00328:
     multitap: false
     linkCable: false
 SLES-00878:
-  name: "WarCraft II - The Dark Saga (Europe) (En,Fr,De,Es,It)"
+  name: "WarCraft II - The Dark Saga"
+  saveName: "WarCraft II - The Dark Saga (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -185180,7 +194679,8 @@ SLES-00878:
     multitap: false
     linkCable: false
 SLPS-01098:
-  name: "WarCraft II - The Dark Saga (Japan)"
+  name: "WarCraft II - The Dark Saga"
+  saveName: "WarCraft II - The Dark Saga (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -185198,7 +194698,8 @@ SLPS-01098:
     multitap: false
     linkCable: false
 SLUS-00480:
-  name: "WarCraft II - The Dark Saga (USA) (En,Fr,De,Es,It)"
+  name: "WarCraft II - The Dark Saga"
+  saveName: "WarCraft II - The Dark Saga (USA) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
   metadata:
@@ -185216,7 +194717,8 @@ SLUS-00480:
     multitap: false
     linkCable: false
 SLES-00978:
-  name: "WarGames - Defcon 1 (Europe) (En,Fr,De)"
+  name: "WarGames - Defcon 1"
+  saveName: "WarGames - Defcon 1 (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185239,11 +194741,13 @@ SLES-00978:
     multitap: false
     linkCable: false
 SLED-01366:
-  name: "WarGames - Defcon 1 (Europe, Australia) (Demo)"
+  name: "WarGames - Defcon 1 (Demo)"
+  saveName: "WarGames - Defcon 1 (Europe, Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00599:
-  name: "WarGames - Defcon 1 (USA)"
+  name: "WarGames - Defcon 1"
+  saveName: "WarGames - Defcon 1 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185262,7 +194766,8 @@ SLUS-00599:
     multitap: false
     linkCable: false
 SLPS-02658:
-  name: "Warera Mitsurin Tankentai!! (Japan)"
+  name: "Warera Mitsurin Tankentai!!"
+  saveName: "Warera Mitsurin Tankentai!! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185300,7 +194805,8 @@ SLPS-03287:
     multitap: false
     linkCable: false
 SLPS-00596:
-  name: "Wares 1092 - Souheiden (Japan)"
+  name: "Wares 1092 - Souheiden"
+  saveName: "Wares 1092 - Souheiden (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -185321,7 +194827,8 @@ SLPS-00596:
     multitap: false
     linkCable: false
 SLES-01159:
-  name: "Warhammer - Dark Omen (Europe) (En,Fr,De)"
+  name: "Warhammer - Dark Omen"
+  saveName: "Warhammer - Dark Omen (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -185342,7 +194849,8 @@ SLES-01159:
     multitap: false
     linkCable: false
 SLUS-00550:
-  name: "Warhammer - Dark Omen (USA)"
+  name: "Warhammer - Dark Omen"
+  saveName: "Warhammer - Dark Omen (USA)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -185361,7 +194869,8 @@ SLUS-00550:
     multitap: false
     linkCable: false
 SLES-00028:
-  name: "Warhammer - Shadow of the Horned Rat (Europe) (En,Fr,De)"
+  name: "Warhammer - Shadow of the Horned Rat"
+  saveName: "Warhammer - Shadow of the Horned Rat (Europe) (En,Fr,De)"
   controllers:
     - DigitalController
   metadata:
@@ -185381,7 +194890,8 @@ SLES-00028:
     multitap: false
     linkCable: false
 SLUS-00117:
-  name: "Warhammer - Shadow of the Horned Rat (USA)"
+  name: "Warhammer - Shadow of the Horned Rat"
+  saveName: "Warhammer - Shadow of the Horned Rat (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -185399,7 +194909,8 @@ SLUS-00117:
     multitap: false
     linkCable: false
 SCES-00062:
-  name: "Warhawk - The Red Mercury Missions (Europe)"
+  name: "Warhawk - The Red Mercury Missions"
+  saveName: "Warhawk - The Red Mercury Missions (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -185417,7 +194928,8 @@ SCES-00062:
     multitap: false
     linkCable: false
 SCUS-94305:
-  name: "Warhawk - The Red Mercury Missions (USA)"
+  name: "Warhawk - The Red Mercury Missions"
+  saveName: "Warhawk - The Red Mercury Missions (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -185435,7 +194947,8 @@ SCUS-94305:
     multitap: false
     linkCable: false
 SLES-03247:
-  name: "Warm Up! (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "Warm Up!"
+  saveName: "Warm Up! (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185460,7 +194973,8 @@ SLES-03247:
     multitap: false
     linkCable: false
 SLES-02253:
-  name: "Warpath - Jurassic Park (Europe) (En,Fr,De)"
+  name: "Warpath - Jurassic Park"
+  saveName: "Warpath - Jurassic Park (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185481,7 +194995,8 @@ SLES-02253:
     multitap: false
     linkCable: false
 SLUS-00976:
-  name: "Warpath - Jurassic Park (USA)"
+  name: "Warpath - Jurassic Park"
+  saveName: "Warpath - Jurassic Park (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -185503,7 +195018,8 @@ SLUS-00976:
     multitap: false
     linkCable: false
 SLES-03330:
-  name: "Warriors of Might and Magic (Europe) (En,Es,It)"
+  name: "Warriors of Might and Magic"
+  saveName: "Warriors of Might and Magic (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185524,7 +195040,8 @@ SLES-03330:
     multitap: false
     linkCable: false
 SLES-03263:
-  name: "Warriors of Might and Magic (Europe) (En,Fr,De)"
+  name: "Warriors of Might and Magic"
+  saveName: "Warriors of Might and Magic (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185545,7 +195062,8 @@ SLES-03263:
     multitap: false
     linkCable: false
 SLUS-01204:
-  name: "Warriors of Might and Magic (USA)"
+  name: "Warriors of Might and Magic"
+  saveName: "Warriors of Might and Magic (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185564,7 +195082,8 @@ SLUS-01204:
     multitap: false
     linkCable: false
 SLES-00937:
-  name: "Warzone 2100 (Europe) (En,Es,It)"
+  name: "Warzone 2100"
+  saveName: "Warzone 2100 (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185586,7 +195105,8 @@ SLES-00937:
     multitap: false
     linkCable: false
 SLES-01742:
-  name: "Warzone 2100 (France)"
+  name: "Warzone 2100"
+  saveName: "Warzone 2100 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185606,7 +195126,8 @@ SLES-01742:
     multitap: false
     linkCable: false
 SLES-01743:
-  name: "Warzone 2100 (Germany)"
+  name: "Warzone 2100"
+  saveName: "Warzone 2100 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185626,11 +195147,13 @@ SLES-01743:
     multitap: false
     linkCable: false
 SLED-01787:
-  name: "Warzone 2100 (UK) (Demo)"
+  name: "Warzone 2100 (Demo)"
+  saveName: "Warzone 2100 (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00819:
-  name: "Warzone 2100 (USA)"
+  name: "Warzone 2100"
+  saveName: "Warzone 2100 (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185668,7 +195191,8 @@ SLPM-87086:
     multitap: false
     linkCable: false
 SLPM-87085:
-  name: "Water Summer (Japan)"
+  name: "Water Summer"
+  saveName: "Water Summer (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -185686,7 +195210,8 @@ SLPM-87085:
     multitap: false
     linkCable: false
 SLES-01160:
-  name: "Wayne Gretzky's 3D Hockey '98 (Europe) (En,Fr,De,Es)"
+  name: "Wayne Gretzky's 3D Hockey '98"
+  saveName: "Wayne Gretzky's 3D Hockey '98 (Europe) (En,Fr,De,Es)"
   controllers:
     - DigitalController
   metadata:
@@ -185704,7 +195229,8 @@ SLES-01160:
     multitap: true
     linkCable: false
 SLUS-00147:
-  name: "Wayne Gretzky's 3D Hockey '98 (USA)"
+  name: "Wayne Gretzky's 3D Hockey '98"
+  saveName: "Wayne Gretzky's 3D Hockey '98 (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -185722,7 +195248,8 @@ SLUS-00147:
     multitap: true
     linkCable: false
 SLES-03551:
-  name: "Weakest Link, The (Europe)"
+  name: "Weakest Link, The"
+  saveName: "Weakest Link, The (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185741,7 +195268,8 @@ SLES-03551:
     multitap: false
     linkCable: false
 SLUS-01413:
-  name: "Weakest Link, The (USA)"
+  name: "Weakest Link, The"
+  saveName: "Weakest Link, The (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185760,7 +195288,8 @@ SLUS-01413:
     multitap: false
     linkCable: false
 SLPS-00368:
-  name: "Wedding Peach - Doki Doki Oiro-naoshi (Japan)"
+  name: "Wedding Peach - Doki Doki Oiro-naoshi"
+  saveName: "Wedding Peach - Doki Doki Oiro-naoshi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -185778,9 +195307,11 @@ SLPS-00368:
     multitap: false
     linkCable: false
 SLPM-80187:
-  name: "Weekly the PlayStation Limited No. 1 (Japan)"
+  name: "Weekly the PlayStation Limited No. 1"
+  saveName: "Weekly the PlayStation Limited No. 1 (Japan)"
 SLPS-00190:
-  name: "Welcome House (Japan)"
+  name: "Welcome House"
+  saveName: "Welcome House (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -185800,7 +195331,8 @@ SLPS-00190:
     multitap: false
     linkCable: false
 SLPS-00633:
-  name: "Welcome House 2 - Keaton and His Uncle (Japan)"
+  name: "Welcome House 2 - Keaton and His Uncle"
+  saveName: "Welcome House 2 - Keaton and His Uncle (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -185818,7 +195350,8 @@ SLPS-00633:
     multitap: false
     linkCable: false
 SLPS-01887:
-  name: "Weltorv Estleia (Japan)"
+  name: "Weltorv Estleia"
+  saveName: "Weltorv Estleia (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -185836,7 +195369,8 @@ SLPS-01887:
     multitap: false
     linkCable: false
 SLES-03341:
-  name: "Wer wird Millionaer (Germany)"
+  name: "Wer wird Millionaer"
+  saveName: "Wer wird Millionaer (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185855,7 +195389,8 @@ SLES-03341:
     multitap: true
     linkCable: false
 SLES-03591:
-  name: "Wer wird Millionaer - 2. Edition (Germany)"
+  name: "Wer wird Millionaer - 2. Edition"
+  saveName: "Wer wird Millionaer - 2. Edition (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185874,7 +195409,8 @@ SLES-03591:
     multitap: false
     linkCable: false
 SLES-03916:
-  name: "Wer wird Millionaer - Dritte Edition (Germany)"
+  name: "Wer wird Millionaer - Dritte Edition"
+  saveName: "Wer wird Millionaer - Dritte Edition (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185893,7 +195429,8 @@ SLES-03916:
     multitap: false
     linkCable: false
 SLES-03594:
-  name: "Wer wird Millionaer - Junior (Germany)"
+  name: "Wer wird Millionaer - Junior"
+  saveName: "Wer wird Millionaer - Junior (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185912,7 +195449,8 @@ SLES-03594:
     multitap: true
     linkCable: false
 SLES-03806:
-  name: "Westlife - Fan-O-Mania (Europe)"
+  name: "Westlife - Fan-O-Mania"
+  saveName: "Westlife - Fan-O-Mania (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185931,7 +195469,8 @@ SLES-03806:
     multitap: true
     linkCable: false
 SLES-03779:
-  name: "Westlife - Fan-O-Mania (Europe) (Fr,De)"
+  name: "Westlife - Fan-O-Mania"
+  saveName: "Westlife - Fan-O-Mania (Europe) (Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185951,7 +195490,8 @@ SLES-03779:
     multitap: true
     linkCable: false
 SLUS-00683:
-  name: "Wheel of Fortune (USA)"
+  name: "Wheel of Fortune"
+  saveName: "Wheel of Fortune (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185970,7 +195510,8 @@ SLUS-00683:
     multitap: false
     linkCable: false
 SLUS-01174:
-  name: "Wheel of Fortune - 2nd Edition (USA)"
+  name: "Wheel of Fortune - 2nd Edition"
+  saveName: "Wheel of Fortune - 2nd Edition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -185989,7 +195530,8 @@ SLUS-01174:
     multitap: true
     linkCable: false
 SLPM-87214:
-  name: "Whistle - Fuki Nukeru Kaze (Japan)"
+  name: "Whistle - Fuki Nukeru Kaze"
+  saveName: "Whistle - Fuki Nukeru Kaze (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186027,7 +195569,8 @@ SLPM-87318:
     multitap: false
     linkCable: false
 SLPS-02352:
-  name: "White Diamond (Japan)"
+  name: "White Diamond"
+  saveName: "White Diamond (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186065,7 +195608,8 @@ SLPS-02937:
     multitap: false
     linkCable: false
 SLES-00141:
-  name: "Whizz (Europe)"
+  name: "Whizz"
+  saveName: "Whizz (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -186083,7 +195627,8 @@ SLES-00141:
     multitap: false
     linkCable: false
 SLPS-00939:
-  name: "Whizz (Japan)"
+  name: "Whizz"
+  saveName: "Whizz (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -186101,7 +195646,8 @@ SLPS-00939:
     multitap: false
     linkCable: false
 SLES-02988:
-  name: "Who Wants to Be a Millionaire (Europe)"
+  name: "Who Wants to Be a Millionaire"
+  saveName: "Who Wants to Be a Millionaire (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186120,7 +195666,8 @@ SLES-02988:
     multitap: true
     linkCable: false
 SLES-03589:
-  name: "Who Wants to Be a Millionaire - 2nd Edition (Europe)"
+  name: "Who Wants to Be a Millionaire - 2nd Edition"
+  saveName: "Who Wants to Be a Millionaire - 2nd Edition (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186139,7 +195686,8 @@ SLES-03589:
     multitap: false
     linkCable: false
 SCUS-94567:
-  name: "Who Wants to Be a Millionaire - 2nd Edition (USA)"
+  name: "Who Wants to Be a Millionaire - 2nd Edition"
+  saveName: "Who Wants to Be a Millionaire - 2nd Edition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186158,7 +195706,8 @@ SCUS-94567:
     multitap: false
     linkCable: false
 SCUS-94644:
-  name: "Who Wants to Be a Millionaire - 3rd Edition (USA)"
+  name: "Who Wants to Be a Millionaire - 3rd Edition"
+  saveName: "Who Wants to Be a Millionaire - 3rd Edition (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186177,7 +195726,8 @@ SCUS-94644:
     multitap: false
     linkCable: false
 SLES-03585:
-  name: "Who Wants to Be a Millionaire - Australian Edition (Australia)"
+  name: "Who Wants to Be a Millionaire - Australian Edition"
+  saveName: "Who Wants to Be a Millionaire - Australian Edition (Australia)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186196,7 +195746,8 @@ SLES-03585:
     multitap: true
     linkCable: false
 SLES-03583:
-  name: "Who Wants to Be a Millionaire - Irish Edition (Ireland)"
+  name: "Who Wants to Be a Millionaire - Irish Edition"
+  saveName: "Who Wants to Be a Millionaire - Irish Edition (Ireland)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186215,7 +195766,8 @@ SLES-03583:
     multitap: true
     linkCable: false
 SLES-03592:
-  name: "Who Wants to Be a Millionaire - Junior (Europe)"
+  name: "Who Wants to Be a Millionaire - Junior"
+  saveName: "Who Wants to Be a Millionaire - Junior (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186234,15 +195786,18 @@ SLES-03592:
     multitap: true
     linkCable: false
 SLED-01689:
-  name: "Wild 9 & MDK & Crime Killer (France) (Demo)"
+  name: "Wild 9 & MDK & Crime Killer (Demo)"
+  saveName: "Wild 9 & MDK & Crime Killer (France) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-01496:
-  name: "Wild 9 (Europe) (Demo)"
+  name: "Wild 9 (Demo)"
+  saveName: "Wild 9 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01333:
-  name: "Wild 9 (Europe) (En,Fr,De,Es,It)"
+  name: "Wild 9"
+  saveName: "Wild 9 (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186265,7 +195820,8 @@ SLES-01333:
     multitap: false
     linkCable: false
 SLUS-00425:
-  name: "Wild 9 (USA)"
+  name: "Wild 9"
+  saveName: "Wild 9 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -186307,7 +195863,8 @@ SCPS-45027:
     multitap: false
     linkCable: false
 SCES-00321:
-  name: "Wild Arms (Europe)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -186327,7 +195884,8 @@ SCES-00321:
     multitap: false
     linkCable: false
 SCES-01171:
-  name: "Wild Arms (France)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (France)"
   controllers:
     - DigitalController
   traits:
@@ -186347,7 +195905,8 @@ SCES-01171:
     multitap: false
     linkCable: false
 SCES-01172:
-  name: "Wild Arms (Germany)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (Germany)"
   controllers:
     - DigitalController
   traits:
@@ -186367,7 +195926,8 @@ SCES-01172:
     multitap: false
     linkCable: false
 SCES-01173:
-  name: "Wild Arms (Italy)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (Italy)"
   controllers:
     - DigitalController
   traits:
@@ -186387,7 +195947,8 @@ SCES-01173:
     multitap: false
     linkCable: false
 SCPS-10028:
-  name: "Wild Arms (Japan)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -186407,13 +195968,15 @@ SCPS-10028:
     multitap: false
     linkCable: false
 PCPX-96034:
-  name: "Wild Arms (Japan) (Demo)"
+  name: "Wild Arms (Demo)"
+  saveName: "Wild Arms (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SCPS-91038:
-  name: "Wild Arms (Japan) (Rev 1)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (Japan) (Rev 1)"
   controllers:
     - DigitalController
   traits:
@@ -186436,7 +195999,8 @@ SCPS-91038:
     multitap: false
     linkCable: false
 SCES-01174:
-  name: "Wild Arms (Spain)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (Spain)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4423-g32ab7c13"
@@ -186459,7 +196023,8 @@ SCES-01174:
     multitap: false
     linkCable: false
 SCUS-94608:
-  name: "Wild Arms (USA)"
+  name: "Wild Arms"
+  saveName: "Wild Arms (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1400-gb527118c"
@@ -186482,11 +196047,13 @@ SCUS-94608:
     multitap: false
     linkCable: false
 PCPX-96161:
-  name: "Wild Arms - 2nd Ignition (Japan) (Demo)"
+  name: "Wild Arms - 2nd Ignition (Demo)"
+  saveName: "Wild Arms - 2nd Ignition (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10089:
-  name: "Wild Arms - 2nd Ignition (Japan) (Disc 1)"
+  name: "Wild Arms - 2nd Ignition (Disc 1)"
+  saveName: "Wild Arms - 2nd Ignition (Japan) (Disc 1)"
   discSet:
     name: "Wild Arms - 2nd Ignition (Japan)"
     serials:
@@ -186509,7 +196076,8 @@ SCPS-10089:
     multitap: false
     linkCable: false
 SCPS-91208:
-  name: "Wild Arms - 2nd Ignition (Japan) (Disc 1) (Rev 1)"
+  name: "Wild Arms - 2nd Ignition (Disc 1)"
+  saveName: "Wild Arms - 2nd Ignition (Japan) (Disc 1) (Rev 1)"
   discSet:
     name: "Wild Arms - 2nd Ignition (Japan) (Rev 1)"
     serials:
@@ -186535,7 +196103,8 @@ SCPS-91208:
     multitap: false
     linkCable: false
 SCPS-10090:
-  name: "Wild Arms - 2nd Ignition (Japan) (Disc 2)"
+  name: "Wild Arms - 2nd Ignition (Disc 2)"
+  saveName: "Wild Arms - 2nd Ignition (Japan) (Disc 2)"
   discSet:
     name: "Wild Arms - 2nd Ignition (Japan)"
     serials:
@@ -186558,7 +196127,8 @@ SCPS-10090:
     multitap: false
     linkCable: false
 SCPS-91209:
-  name: "Wild Arms - 2nd Ignition (Japan) (Disc 2) (Rev 1)"
+  name: "Wild Arms - 2nd Ignition (Disc 2)"
+  saveName: "Wild Arms - 2nd Ignition (Japan) (Disc 2) (Rev 1)"
   discSet:
     name: "Wild Arms - 2nd Ignition (Japan) (Rev 1)"
     serials:
@@ -186584,9 +196154,11 @@ SCPS-91209:
     multitap: false
     linkCable: false
 PCPX-96171:
-  name: "Wild Arms - 2nd Ignition (Japan) (Tentou-you Movie Disc)"
+  name: "Wild Arms - 2nd Ignition (Tentou-you Movie Disc)"
+  saveName: "Wild Arms - 2nd Ignition (Japan) (Tentou-you Movie Disc)"
 SCUS-94592:
-  name: "Wild Arms 2 (USA) (Demo)"
+  name: "Wild Arms 2 (Demo)"
+  saveName: "Wild Arms 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
@@ -186594,7 +196166,8 @@ SCUS-94592:
   settings:
     gpuLineDetectMode: Quads
 SCUS-94484:
-  name: "Wild Arms 2 (USA) (Disc 1)"
+  name: "Wild Arms 2 (Disc 1)"
+  saveName: "Wild Arms 2 (USA) (Disc 1)"
   discSet:
     name: "Wild Arms 2 (USA)"
     serials:
@@ -186624,7 +196197,8 @@ SCUS-94484:
     multitap: false
     linkCable: false
 SCUS-94498:
-  name: "Wild Arms 2 (USA) (Disc 2)"
+  name: "Wild Arms 2 (Disc 2)"
+  saveName: "Wild Arms 2 (USA) (Disc 2)"
   discSet:
     name: "Wild Arms 2 (USA)"
     serials:
@@ -186676,7 +196250,8 @@ SCPS-45429:
     multitap: false
     linkCable: false
 SLPS-02174:
-  name: "Wild Boater (Japan)"
+  name: "Wild Boater"
+  saveName: "Wild Boater (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186696,7 +196271,8 @@ SLPS-02174:
     multitap: false
     linkCable: false
 SLES-02631:
-  name: "Wild Rapids (Europe)"
+  name: "Wild Rapids"
+  saveName: "Wild Rapids (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186716,7 +196292,8 @@ SLES-02631:
     multitap: false
     linkCable: false
 SLUS-01128:
-  name: "Wild Thornberrys, The - Animal Adventures (USA)"
+  name: "Wild Thornberrys, The - Animal Adventures"
+  saveName: "Wild Thornberrys, The - Animal Adventures (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186735,7 +196312,8 @@ SLUS-01128:
     multitap: false
     linkCable: false
 SCPS-10080:
-  name: "Wildroid 9 (Japan)"
+  name: "Wildroid 9"
+  saveName: "Wildroid 9 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186754,7 +196332,8 @@ SCPS-10080:
     multitap: false
     linkCable: false
 SLES-00323:
-  name: "Williams Arcade's Greatest Hits (Europe)"
+  name: "Williams Arcade's Greatest Hits"
+  saveName: "Williams Arcade's Greatest Hits (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -186772,7 +196351,8 @@ SLES-00323:
     multitap: false
     linkCable: false
 SLUS-00201:
-  name: "Williams Arcade's Greatest Hits (USA)"
+  name: "Williams Arcade's Greatest Hits"
+  saveName: "Williams Arcade's Greatest Hits (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1645-g42d49426"
@@ -186793,7 +196373,8 @@ SLUS-00201:
     multitap: false
     linkCable: false
 SLES-03329:
-  name: "Windsurfers Paradise (Europe) (En,Fr,De)"
+  name: "Windsurfers Paradise"
+  saveName: "Windsurfers Paradise (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -186814,7 +196395,8 @@ SLES-03329:
     multitap: true
     linkCable: false
 SLES-00074:
-  name: "Wing Commander III - Heart of the Tiger (Europe) (Disc 1)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 1)"
+  saveName: "Wing Commander III - Heart of the Tiger (Europe) (Disc 1)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Europe)"
     serials:
@@ -186839,7 +196421,8 @@ SLES-00074:
     multitap: false
     linkCable: false
 SLES-10074:
-  name: "Wing Commander III - Heart of the Tiger (Europe) (Disc 2)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 2)"
+  saveName: "Wing Commander III - Heart of the Tiger (Europe) (Disc 2)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Europe)"
     serials:
@@ -186864,7 +196447,8 @@ SLES-10074:
     multitap: false
     linkCable: false
 SLES-20074:
-  name: "Wing Commander III - Heart of the Tiger (Europe) (Disc 3)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 3)"
+  saveName: "Wing Commander III - Heart of the Tiger (Europe) (Disc 3)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Europe)"
     serials:
@@ -186889,7 +196473,8 @@ SLES-20074:
     multitap: false
     linkCable: false
 SLES-30074:
-  name: "Wing Commander III - Heart of the Tiger (Europe) (Disc 4)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 4)"
+  saveName: "Wing Commander III - Heart of the Tiger (Europe) (Disc 4)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Europe)"
     serials:
@@ -186914,7 +196499,8 @@ SLES-30074:
     multitap: false
     linkCable: false
 SLES-00104:
-  name: "Wing Commander III - Heart of the Tiger (France) (Disc 1)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 1)"
+  saveName: "Wing Commander III - Heart of the Tiger (France) (Disc 1)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (France)"
     serials:
@@ -186939,7 +196525,8 @@ SLES-00104:
     multitap: false
     linkCable: false
 SLES-10104:
-  name: "Wing Commander III - Heart of the Tiger (France) (Disc 2)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 2)"
+  saveName: "Wing Commander III - Heart of the Tiger (France) (Disc 2)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (France)"
     serials:
@@ -186964,7 +196551,8 @@ SLES-10104:
     multitap: false
     linkCable: false
 SLES-20104:
-  name: "Wing Commander III - Heart of the Tiger (France) (Disc 3)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 3)"
+  saveName: "Wing Commander III - Heart of the Tiger (France) (Disc 3)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (France)"
     serials:
@@ -186989,7 +196577,8 @@ SLES-20104:
     multitap: false
     linkCable: false
 SLES-30104:
-  name: "Wing Commander III - Heart of the Tiger (France) (Disc 4)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 4)"
+  saveName: "Wing Commander III - Heart of the Tiger (France) (Disc 4)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (France)"
     serials:
@@ -187014,7 +196603,8 @@ SLES-30104:
     multitap: false
     linkCable: false
 SLES-00105:
-  name: "Wing Commander III - Heart of the Tiger (Germany) (Disc 1)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 1)"
+  saveName: "Wing Commander III - Heart of the Tiger (Germany) (Disc 1)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Germany)"
     serials:
@@ -187039,7 +196629,8 @@ SLES-00105:
     multitap: false
     linkCable: false
 SLES-10105:
-  name: "Wing Commander III - Heart of the Tiger (Germany) (Disc 2)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 2)"
+  saveName: "Wing Commander III - Heart of the Tiger (Germany) (Disc 2)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Germany)"
     serials:
@@ -187064,7 +196655,8 @@ SLES-10105:
     multitap: false
     linkCable: false
 SLES-20105:
-  name: "Wing Commander III - Heart of the Tiger (Germany) (Disc 3)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 3)"
+  saveName: "Wing Commander III - Heart of the Tiger (Germany) (Disc 3)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Germany)"
     serials:
@@ -187089,7 +196681,8 @@ SLES-20105:
     multitap: false
     linkCable: false
 SLES-30105:
-  name: "Wing Commander III - Heart of the Tiger (Germany) (Disc 4)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 4)"
+  saveName: "Wing Commander III - Heart of the Tiger (Germany) (Disc 4)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Germany)"
     serials:
@@ -187114,7 +196707,8 @@ SLES-30105:
     multitap: false
     linkCable: false
 SLPS-00477:
-  name: "Wing Commander III - Heart of the Tiger (Japan) (Disc 1)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 1)"
+  saveName: "Wing Commander III - Heart of the Tiger (Japan) (Disc 1)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Japan)"
     serials:
@@ -187139,7 +196733,8 @@ SLPS-00477:
     multitap: false
     linkCable: false
 SLPS-00478:
-  name: "Wing Commander III - Heart of the Tiger (Japan) (Disc 2)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 2)"
+  saveName: "Wing Commander III - Heart of the Tiger (Japan) (Disc 2)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Japan)"
     serials:
@@ -187164,7 +196759,8 @@ SLPS-00478:
     multitap: false
     linkCable: false
 SLPS-00479:
-  name: "Wing Commander III - Heart of the Tiger (Japan) (Disc 3)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 3)"
+  saveName: "Wing Commander III - Heart of the Tiger (Japan) (Disc 3)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Japan)"
     serials:
@@ -187189,7 +196785,8 @@ SLPS-00479:
     multitap: false
     linkCable: false
 SLPS-00480:
-  name: "Wing Commander III - Heart of the Tiger (Japan) (Disc 4)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 4)"
+  saveName: "Wing Commander III - Heart of the Tiger (Japan) (Disc 4)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (Japan)"
     serials:
@@ -187214,7 +196811,8 @@ SLPS-00480:
     multitap: false
     linkCable: false
 SLUS-00019:
-  name: "Wing Commander III - Heart of the Tiger (USA) (Disc 1)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 1)"
+  saveName: "Wing Commander III - Heart of the Tiger (USA) (Disc 1)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (USA)"
     serials:
@@ -187239,7 +196837,8 @@ SLUS-00019:
     multitap: false
     linkCable: false
 SLUS-00134:
-  name: "Wing Commander III - Heart of the Tiger (USA) (Disc 2)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 2)"
+  saveName: "Wing Commander III - Heart of the Tiger (USA) (Disc 2)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (USA)"
     serials:
@@ -187264,7 +196863,8 @@ SLUS-00134:
     multitap: false
     linkCable: false
 SLUS-00135:
-  name: "Wing Commander III - Heart of the Tiger (USA) (Disc 3)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 3)"
+  saveName: "Wing Commander III - Heart of the Tiger (USA) (Disc 3)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (USA)"
     serials:
@@ -187289,7 +196889,8 @@ SLUS-00135:
     multitap: false
     linkCable: false
 SLUS-00136:
-  name: "Wing Commander III - Heart of the Tiger (USA) (Disc 4)"
+  name: "Wing Commander III - Heart of the Tiger (Disc 4)"
+  saveName: "Wing Commander III - Heart of the Tiger (USA) (Disc 4)"
   discSet:
     name: "Wing Commander III - Heart of the Tiger (USA)"
     serials:
@@ -187314,7 +196915,8 @@ SLUS-00136:
     multitap: false
     linkCable: false
 SLES-00659:
-  name: "Wing Commander IV - The Price of Freedom (Europe) (Disc 1)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 1)"
+  saveName: "Wing Commander IV - The Price of Freedom (Europe) (Disc 1)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Europe)"
     serials:
@@ -187339,7 +196941,8 @@ SLES-00659:
     multitap: false
     linkCable: false
 SLES-10659:
-  name: "Wing Commander IV - The Price of Freedom (Europe) (Disc 2)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 2)"
+  saveName: "Wing Commander IV - The Price of Freedom (Europe) (Disc 2)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Europe)"
     serials:
@@ -187364,7 +196967,8 @@ SLES-10659:
     multitap: false
     linkCable: false
 SLES-20659:
-  name: "Wing Commander IV - The Price of Freedom (Europe) (Disc 3)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 3)"
+  saveName: "Wing Commander IV - The Price of Freedom (Europe) (Disc 3)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Europe)"
     serials:
@@ -187389,7 +196993,8 @@ SLES-20659:
     multitap: false
     linkCable: false
 SLES-30659:
-  name: "Wing Commander IV - The Price of Freedom (Europe) (Disc 4)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 4)"
+  saveName: "Wing Commander IV - The Price of Freedom (Europe) (Disc 4)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Europe)"
     serials:
@@ -187414,7 +197019,8 @@ SLES-30659:
     multitap: false
     linkCable: false
 SLES-00660:
-  name: "Wing Commander IV - The Price of Freedom (France) (Disc 1)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 1)"
+  saveName: "Wing Commander IV - The Price of Freedom (France) (Disc 1)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (France)"
     serials:
@@ -187439,7 +197045,8 @@ SLES-00660:
     multitap: false
     linkCable: false
 SLES-10660:
-  name: "Wing Commander IV - The Price of Freedom (France) (Disc 2)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 2)"
+  saveName: "Wing Commander IV - The Price of Freedom (France) (Disc 2)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (France)"
     serials:
@@ -187464,7 +197071,8 @@ SLES-10660:
     multitap: false
     linkCable: false
 SLES-20660:
-  name: "Wing Commander IV - The Price of Freedom (France) (Disc 3)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 3)"
+  saveName: "Wing Commander IV - The Price of Freedom (France) (Disc 3)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (France)"
     serials:
@@ -187489,7 +197097,8 @@ SLES-20660:
     multitap: false
     linkCable: false
 SLES-30660:
-  name: "Wing Commander IV - The Price of Freedom (France) (Disc 4)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 4)"
+  saveName: "Wing Commander IV - The Price of Freedom (France) (Disc 4)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (France)"
     serials:
@@ -187514,7 +197123,8 @@ SLES-30660:
     multitap: false
     linkCable: false
 SLES-00661:
-  name: "Wing Commander IV - The Price of Freedom (Germany) (Disc 1)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 1)"
+  saveName: "Wing Commander IV - The Price of Freedom (Germany) (Disc 1)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Germany)"
     serials:
@@ -187539,7 +197149,8 @@ SLES-00661:
     multitap: false
     linkCable: false
 SLES-10661:
-  name: "Wing Commander IV - The Price of Freedom (Germany) (Disc 2)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 2)"
+  saveName: "Wing Commander IV - The Price of Freedom (Germany) (Disc 2)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Germany)"
     serials:
@@ -187564,7 +197175,8 @@ SLES-10661:
     multitap: false
     linkCable: false
 SLES-20661:
-  name: "Wing Commander IV - The Price of Freedom (Germany) (Disc 3)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 3)"
+  saveName: "Wing Commander IV - The Price of Freedom (Germany) (Disc 3)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Germany)"
     serials:
@@ -187589,7 +197201,8 @@ SLES-20661:
     multitap: false
     linkCable: false
 SLES-30661:
-  name: "Wing Commander IV - The Price of Freedom (Germany) (Disc 4)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 4)"
+  saveName: "Wing Commander IV - The Price of Freedom (Germany) (Disc 4)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (Germany)"
     serials:
@@ -187614,7 +197227,8 @@ SLES-30661:
     multitap: false
     linkCable: false
 SLUS-00270:
-  name: "Wing Commander IV - The Price of Freedom (USA) (Disc 1)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 1)"
+  saveName: "Wing Commander IV - The Price of Freedom (USA) (Disc 1)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (USA)"
     serials:
@@ -187639,7 +197253,8 @@ SLUS-00270:
     multitap: false
     linkCable: false
 SLUS-00271:
-  name: "Wing Commander IV - The Price of Freedom (USA) (Disc 2)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 2)"
+  saveName: "Wing Commander IV - The Price of Freedom (USA) (Disc 2)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (USA)"
     serials:
@@ -187664,7 +197279,8 @@ SLUS-00271:
     multitap: false
     linkCable: false
 SLUS-00272:
-  name: "Wing Commander IV - The Price of Freedom (USA) (Disc 3)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 3)"
+  saveName: "Wing Commander IV - The Price of Freedom (USA) (Disc 3)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (USA)"
     serials:
@@ -187689,7 +197305,8 @@ SLUS-00272:
     multitap: false
     linkCable: false
 SLUS-00273:
-  name: "Wing Commander IV - The Price of Freedom (USA) (Disc 4)"
+  name: "Wing Commander IV - The Price of Freedom (Disc 4)"
+  saveName: "Wing Commander IV - The Price of Freedom (USA) (Disc 4)"
   discSet:
     name: "Wing Commander IV - The Price of Freedom (USA)"
     serials:
@@ -187714,7 +197331,8 @@ SLUS-00273:
     multitap: false
     linkCable: false
 SLES-00540:
-  name: "Wing Over (Europe)"
+  name: "Wing Over"
+  saveName: "Wing Over (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -187732,7 +197350,8 @@ SLES-00540:
     multitap: false
     linkCable: true
 SLPS-00598:
-  name: "Wing Over (Japan)"
+  name: "Wing Over"
+  saveName: "Wing Over (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -187750,7 +197369,8 @@ SLPS-00598:
     multitap: false
     linkCable: true
 SLES-01375:
-  name: "Wing Over 2 (Europe)"
+  name: "Wing Over 2"
+  saveName: "Wing Over 2 (Europe)"
   controllers:
     - AnalogController
     - AnalogJoystick
@@ -187770,7 +197390,8 @@ SLES-01375:
     multitap: false
     linkCable: false
 SLES-04070:
-  name: "Winky the Little Bear (Europe) (En,Fr,De)"
+  name: "Winky the Little Bear"
+  saveName: "Winky the Little Bear (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -187791,7 +197412,8 @@ SLES-04070:
     multitap: false
     linkCable: false
 SLPM-86548:
-  name: "Winning Lure (Japan)"
+  name: "Winning Lure"
+  saveName: "Winning Lure (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -187810,7 +197432,8 @@ SLPM-86548:
     multitap: false
     linkCable: false
 SLPS-00293:
-  name: "Winning Post 2 (Japan)"
+  name: "Winning Post 2"
+  saveName: "Winning Post 2 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -187828,7 +197451,8 @@ SLPS-00293:
     multitap: false
     linkCable: false
 SLPS-01020:
-  name: "Winning Post 2 - Final '97 (Japan)"
+  name: "Winning Post 2 - Final '97"
+  saveName: "Winning Post 2 - Final '97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -187846,7 +197470,8 @@ SLPS-01020:
     multitap: false
     linkCable: false
 SLPS-00509:
-  name: "Winning Post 2 - Program '96 (Japan)"
+  name: "Winning Post 2 - Program '96"
+  saveName: "Winning Post 2 - Program '96 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -187864,7 +197489,8 @@ SLPS-00509:
     multitap: false
     linkCable: false
 SLPS-01263:
-  name: "Winning Post 3 (Japan)"
+  name: "Winning Post 3"
+  saveName: "Winning Post 3 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -187882,7 +197508,8 @@ SLPS-01263:
     multitap: false
     linkCable: false
 SLPM-86128:
-  name: "Winning Post 3 - Program '98 (Japan)"
+  name: "Winning Post 3 - Program '98"
+  saveName: "Winning Post 3 - Program '98 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -187959,7 +197586,8 @@ SLPM-86208:
     multitap: false
     linkCable: false
 SLPM-86302:
-  name: "Winning Post 4 (Japan)"
+  name: "Winning Post 4"
+  saveName: "Winning Post 4 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -187977,7 +197605,8 @@ SLPM-86302:
     multitap: false
     linkCable: false
 SLPM-86445:
-  name: "Winning Post 4 - Program 2000 (Japan)"
+  name: "Winning Post 4 - Program 2000"
+  saveName: "Winning Post 4 - Program 2000 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188013,7 +197642,8 @@ SLPM-86995:
     multitap: false
     linkCable: false
 SLPS-00189:
-  name: "Winning Post EX (Japan)"
+  name: "Winning Post EX"
+  saveName: "Winning Post EX (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188031,23 +197661,28 @@ SLPS-00189:
     multitap: false
     linkCable: false
 SCED-01441:
-  name: "Winter Releases '98 (Europe)"
+  name: "Winter Releases '98"
+  saveName: "Winter Releases '98 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02306:
-  name: "Winter Releases (Europe, Australia) (En,Fr,De,Es,It)"
+  name: "Winter Releases"
+  saveName: "Winter Releases (Europe, Australia) (En,Fr,De,Es,It)"
   metadata:
     genre: "** DEMO **"
 SCED-00986:
-  name: "Winter Releases - '97 Demo 01 (Europe)"
+  name: "Winter Releases - '97 Demo 01"
+  saveName: "Winter Releases - '97 Demo 01 (Europe)"
   metadata:
     genre: "** DEMO **"
 SCED-02197:
-  name: "Wip3out (Europe) (Demo)"
+  name: "Wip3out (Demo)"
+  saveName: "Wip3out (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01909:
-  name: "Wip3out (Europe) (En,Fr,De,Es,It)"
+  name: "Wip3out"
+  saveName: "Wip3out (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188075,7 +197710,8 @@ SCES-01909:
     multitap: false
     linkCable: false
 SCES-00010:
-  name: "WipEout (Europe)"
+  name: "WipEout"
+  saveName: "WipEout (Europe)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2790-gd588c26c"
@@ -188099,7 +197735,8 @@ SCES-00010:
     multitap: false
     linkCable: true
 SIPS-60003:
-  name: "WipEout (Japan)"
+  name: "WipEout"
+  saveName: "WipEout (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188123,7 +197760,8 @@ SIPS-60003:
     multitap: false
     linkCable: true
 SCUS-94301:
-  name: "WipEout (USA)"
+  name: "WipEout"
+  saveName: "WipEout (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188147,7 +197785,8 @@ SCUS-94301:
     multitap: false
     linkCable: true
 SLES-00327:
-  name: "WipEout 2097 (Europe)"
+  name: "WipEout 2097"
+  saveName: "WipEout 2097 (Europe)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -188170,13 +197809,15 @@ SLES-00327:
     multitap: false
     linkCable: true
 SLED-00498:
-  name: "WipEout 2097 (Europe) (Demo)"
+  name: "WipEout 2097 (Demo)"
+  saveName: "WipEout 2097 (Europe) (Demo)"
   traits:
     - ForcePGXPCPUMode # Improves sprite jitter.
   metadata:
     genre: "** DEMO **"
 SCPS-10098:
-  name: "WipEout 3 (Japan)"
+  name: "WipEout 3"
+  saveName: "WipEout 3 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188202,7 +197843,8 @@ SCPS-10098:
     multitap: false
     linkCable: false
 SLUS-00865:
-  name: "WipEout 3 (USA)"
+  name: "WipEout 3"
+  saveName: "WipEout 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188228,13 +197870,15 @@ SLUS-00865:
     multitap: false
     linkCable: false
 SLUS-90063:
-  name: "WipEout 3 (USA) (Demo)"
+  name: "WipEout 3 (Demo)"
+  saveName: "WipEout 3 (USA) (Demo)"
   traits:
     - ForcePGXPCPUMode # Improves sprite jitter.
   metadata:
     genre: "** DEMO **"
 SCES-02845:
-  name: "WipEout 3 - Special Edition (Europe) (En,Fr,De,Es,It)"
+  name: "WipEout 3 - Special Edition"
+  saveName: "WipEout 3 - Special Edition (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
@@ -188263,7 +197907,8 @@ SCES-02845:
     multitap: false
     linkCable: true
 SCPS-45078:
-  name: "Wipeout XL (Japan, Asia)"
+  name: "Wipeout XL"
+  saveName: "Wipeout XL (Japan, Asia)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188290,7 +197935,8 @@ SCPS-45078:
     multitap: false
     linkCable: true
 SCUS-94351:
-  name: "Wipeout XL (USA)"
+  name: "Wipeout XL"
+  saveName: "Wipeout XL (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-887-g1eecd50"
@@ -188314,7 +197960,8 @@ SCUS-94351:
     multitap: false
     linkCable: true
 SLPS-00872:
-  name: "Witch of Salzburg, The (Japan)"
+  name: "Witch of Salzburg, The"
+  saveName: "Witch of Salzburg, The (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188332,7 +197979,8 @@ SLPS-00872:
     multitap: false
     linkCable: false
 SLPS-00194:
-  name: "Wizard's Harmony (Japan)"
+  name: "Wizard's Harmony"
+  saveName: "Wizard's Harmony (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188350,7 +197998,8 @@ SLPS-00194:
     multitap: false
     linkCable: false
 SCPS-45135:
-  name: "Wizard's Harmony 2 (Japan, Asia)"
+  name: "Wizard's Harmony 2"
+  saveName: "Wizard's Harmony 2 (Japan, Asia)"
   controllers:
     - DigitalController
   codes:
@@ -188371,7 +198020,8 @@ SCPS-45135:
     multitap: false
     linkCable: false
 SLPS-01716:
-  name: "Wizard's Harmony R (Japan)"
+  name: "Wizard's Harmony R"
+  saveName: "Wizard's Harmony R (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188407,7 +198057,8 @@ SLPS-01877:
     multitap: false
     linkCable: false
 SLPS-02691:
-  name: "Wizardry - Dimguil (Japan)"
+  name: "Wizardry - Dimguil"
+  saveName: "Wizardry - Dimguil (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188425,7 +198076,8 @@ SLPS-02691:
     multitap: false
     linkCable: false
 SLPS-01279:
-  name: "Wizardry - Llylgamyn Saga (Japan) (En,Ja)"
+  name: "Wizardry - Llylgamyn Saga"
+  saveName: "Wizardry - Llylgamyn Saga (Japan) (En,Ja)"
   controllers:
     - DigitalController
   metadata:
@@ -188463,7 +198115,8 @@ SLPS-91118:
     multitap: false
     linkCable: false
 SLPS-02349:
-  name: "Wizardry - New Age of Llylgamyn (Japan) (En,Ja)"
+  name: "Wizardry - New Age of Llylgamyn"
+  saveName: "Wizardry - New Age of Llylgamyn (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188483,7 +198136,8 @@ SLPS-02349:
     multitap: false
     linkCable: false
 SLPM-86689:
-  name: "Wizardry Empire - Inishie no Oujo (Japan)"
+  name: "Wizardry Empire - Inishie no Oujo"
+  saveName: "Wizardry Empire - Inishie no Oujo (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -188522,7 +198176,8 @@ SLPM-87139:
     multitap: false
     linkCable: false
 SLPM-87297:
-  name: "Wizardry Empire II - Oujo no Isan (Japan)"
+  name: "Wizardry Empire II - Oujo no Isan"
+  saveName: "Wizardry Empire II - Oujo no Isan (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188540,7 +198195,8 @@ SLPM-87297:
     multitap: false
     linkCable: false
 SCPS-10010:
-  name: "Wizardry VII - Guardia no Houju (Japan)"
+  name: "Wizardry VII - Guardia no Houju"
+  saveName: "Wizardry VII - Guardia no Houju (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188558,7 +198214,8 @@ SCPS-10010:
     multitap: false
     linkCable: false
 SLPS-00254:
-  name: "Wolf Fang - Kuuga 2001 (Japan)"
+  name: "Wolf Fang - Kuuga 2001"
+  saveName: "Wolf Fang - Kuuga 2001 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188594,7 +198251,8 @@ SLPS-03073:
     multitap: false
     linkCable: false
 SLPS-00197:
-  name: "Wolkenkratzer - Shinpan no Tou (Japan)"
+  name: "Wolkenkratzer - Shinpan no Tou"
+  saveName: "Wolkenkratzer - Shinpan no Tou (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188612,7 +198270,8 @@ SLPS-00197:
     multitap: false
     linkCable: false
 SCPS-10072:
-  name: "Wonder Trek (Japan)"
+  name: "Wonder Trek"
+  saveName: "Wonder Trek (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188631,7 +198290,8 @@ SCPS-10072:
     multitap: false
     linkCable: false
 SLES-02972:
-  name: "Woody Woodpecker Racing (Europe) (En,Fr,De,Es,It)"
+  name: "Woody Woodpecker Racing"
+  saveName: "Woody Woodpecker Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188655,7 +198315,8 @@ SLES-02972:
     multitap: false
     linkCable: false
 SLUS-01188:
-  name: "Woody Woodpecker Racing (USA)"
+  name: "Woody Woodpecker Racing"
+  saveName: "Woody Woodpecker Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188675,7 +198336,8 @@ SLUS-01188:
     multitap: false
     linkCable: false
 SLPM-86730:
-  name: "Woody Woodpecker no Go! Go! Racing (Japan)"
+  name: "Woody Woodpecker no Go! Go! Racing"
+  saveName: "Woody Woodpecker no Go! Go! Racing (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188695,7 +198357,8 @@ SLPM-86730:
     multitap: false
     linkCable: false
 SLES-02196:
-  name: "World Championship Snooker (Europe) (En,Fr,De)"
+  name: "World Championship Snooker"
+  saveName: "World Championship Snooker (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188716,7 +198379,8 @@ SLES-02196:
     multitap: false
     linkCable: false
 SLES-01265:
-  name: "World Cup 98 (Europe) (En,Fr,De,Es,Nl,Sv,Da)"
+  name: "World Cup 98"
+  saveName: "World Cup 98 (Europe) (En,Fr,De,Es,Nl,Sv,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188737,7 +198401,8 @@ SLES-01265:
     multitap: true
     linkCable: false
 SLUS-00644:
-  name: "World Cup 98 (USA)"
+  name: "World Cup 98"
+  saveName: "World Cup 98 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4236-gfe7a195e"
@@ -188762,7 +198427,8 @@ SLUS-00644:
     multitap: true
     linkCable: false
 SLES-01268:
-  name: "World Cup 98 - Coppa del Mondo (Italy)"
+  name: "World Cup 98 - Coppa del Mondo"
+  saveName: "World Cup 98 - Coppa del Mondo (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188781,7 +198447,8 @@ SLES-01268:
     multitap: true
     linkCable: false
 SLPS-00256:
-  name: "World Cup Golf - In Hyatt Dorado Beach (Japan)"
+  name: "World Cup Golf - In Hyatt Dorado Beach"
+  saveName: "World Cup Golf - In Hyatt Dorado Beach (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -188799,7 +198466,8 @@ SLPS-00256:
     multitap: false
     linkCable: false
 SLES-00088:
-  name: "World Cup Golf - Professional Edition (Europe)"
+  name: "World Cup Golf - Professional Edition"
+  saveName: "World Cup Golf - Professional Edition (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -188817,9 +198485,11 @@ SLES-00088:
     multitap: false
     linkCable: false
 SLES-00138:
-  name: "World Cup Golf - Professional Edition (France)"
+  name: "World Cup Golf - Professional Edition"
+  saveName: "World Cup Golf - Professional Edition (France)"
 SLES-00137:
-  name: "World Cup Golf - Professional Edition (Germany)"
+  name: "World Cup Golf - Professional Edition"
+  saveName: "World Cup Golf - Professional Edition (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -188837,7 +198507,8 @@ SLES-00137:
     multitap: false
     linkCable: false
 SLUS-00063:
-  name: "World Cup Golf - Professional Edition (USA)"
+  name: "World Cup Golf - Professional Edition"
+  saveName: "World Cup Golf - Professional Edition (USA)"
   controllers:
     - DigitalController
   metadata:
@@ -188855,7 +198526,8 @@ SLUS-00063:
     multitap: false
     linkCable: false
 SLES-03232:
-  name: "World Destruction League - Thunder Tanks (Europe) (En,Fr,De,Es,It)"
+  name: "World Destruction League - Thunder Tanks"
+  saveName: "World Destruction League - Thunder Tanks (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188878,7 +198550,8 @@ SLES-03232:
     multitap: false
     linkCable: false
 SLUS-01175:
-  name: "World Destruction League - Thunder Tanks (USA)"
+  name: "World Destruction League - Thunder Tanks"
+  saveName: "World Destruction League - Thunder Tanks (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188897,7 +198570,8 @@ SLUS-01175:
     multitap: false
     linkCable: false
 SLES-03359:
-  name: "World Destruction League - WarJetz (Europe) (En,Fr,De,Es,It)"
+  name: "World Destruction League - WarJetz"
+  saveName: "World Destruction League - WarJetz (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188921,7 +198595,8 @@ SLES-03359:
     multitap: false
     linkCable: false
 SLUS-01247:
-  name: "World Destruction League - WarJetz (USA)"
+  name: "World Destruction League - WarJetz"
+  saveName: "World Destruction League - WarJetz (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188941,7 +198616,8 @@ SLUS-01247:
     multitap: false
     linkCable: false
 SLPM-87058:
-  name: "World Greatest Hits Series Vol. 1 - Pro Pinball - Big Race USA (Japan)"
+  name: "World Greatest Hits Series Vol. 1 - Pro Pinball - Big Race USA"
+  saveName: "World Greatest Hits Series Vol. 1 - Pro Pinball - Big Race USA (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188960,7 +198636,8 @@ SLPM-87058:
     multitap: false
     linkCable: true
 SLPM-87045:
-  name: "World Greatest Hits Series Vol. 2 - Pipe Dreams 3D (Japan)"
+  name: "World Greatest Hits Series Vol. 2 - Pipe Dreams 3D"
+  saveName: "World Greatest Hits Series Vol. 2 - Pipe Dreams 3D (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188979,7 +198656,8 @@ SLPM-87045:
     multitap: false
     linkCable: false
 SLPM-87061:
-  name: "World Greatest Hits Series Vol. 3 - Speedball 2100 (Japan)"
+  name: "World Greatest Hits Series Vol. 3 - Speedball 2100"
+  saveName: "World Greatest Hits Series Vol. 3 - Speedball 2100 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -188998,7 +198676,8 @@ SLPM-87061:
     multitap: false
     linkCable: false
 SLPM-87084:
-  name: "World Greatest Hits Series Vol. 4 - Tom Clancy's Rainbow Six (Japan)"
+  name: "World Greatest Hits Series Vol. 4 - Tom Clancy's Rainbow Six"
+  saveName: "World Greatest Hits Series Vol. 4 - Tom Clancy's Rainbow Six (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189017,7 +198696,8 @@ SLPM-87084:
     multitap: false
     linkCable: false
 SLPM-87078:
-  name: "World Greatest Hits Series Vol. 5 - Tyco R-C - Assault with a Battery (Japan)"
+  name: "World Greatest Hits Series Vol. 5 - Tyco R-C - Assault with a Battery"
+  saveName: "World Greatest Hits Series Vol. 5 - Tyco R-C - Assault with a Battery (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189037,7 +198717,8 @@ SLPM-87078:
     multitap: false
     linkCable: false
 SLES-00626:
-  name: "World League Basketball (Europe)"
+  name: "World League Basketball"
+  saveName: "World League Basketball (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -189055,7 +198736,8 @@ SLES-00626:
     multitap: true
     linkCable: false
 SLES-00717:
-  name: "World League Soccer '98 (Europe) (En,Es,It)"
+  name: "World League Soccer '98"
+  saveName: "World League Soccer '98 (Europe) (En,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189076,7 +198758,8 @@ SLES-00717:
     multitap: true
     linkCable: false
 SLES-01166:
-  name: "World League Soccer '98 (France)"
+  name: "World League Soccer '98"
+  saveName: "World League Soccer '98 (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189095,11 +198778,13 @@ SLES-01166:
     multitap: true
     linkCable: false
 SLED-01367:
-  name: "World League Soccer '98 (France) (En,Fr,De,Es,It) (Demo)"
+  name: "World League Soccer '98 (Demo)"
+  saveName: "World League Soccer '98 (France) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-01167:
-  name: "World League Soccer '98 (Germany)"
+  name: "World League Soccer '98"
+  saveName: "World League Soccer '98 (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189118,7 +198803,8 @@ SLES-01167:
     multitap: true
     linkCable: false
 SLPS-01389:
-  name: "World League Soccer (Japan)"
+  name: "World League Soccer"
+  saveName: "World League Soccer (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189140,7 +198826,8 @@ SLPS-01389:
     multitap: true
     linkCable: false
 SLPS-02639:
-  name: "World Never Island (Japan)"
+  name: "World Never Island"
+  saveName: "World Never Island (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189159,7 +198846,8 @@ SLPS-02639:
     multitap: false
     linkCable: false
 SLPS-01037:
-  name: "World Neverland - Olerud Oukoku Monogatari (Japan)"
+  name: "World Neverland - Olerud Oukoku Monogatari"
+  saveName: "World Neverland - Olerud Oukoku Monogatari (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -189180,7 +198868,8 @@ SLPS-01037:
     multitap: false
     linkCable: false
 SLPS-01884:
-  name: "World Neverland 2 - Pluto Kyouwakoku Monogatari (Japan)"
+  name: "World Neverland 2 - Pluto Kyouwakoku Monogatari"
+  saveName: "World Neverland 2 - Pluto Kyouwakoku Monogatari (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189218,7 +198907,8 @@ SLPS-91176:
     multitap: false
     linkCable: false
 SLPS-01379:
-  name: "World Pro Tennis '98 (Japan)"
+  name: "World Pro Tennis '98"
+  saveName: "World Pro Tennis '98 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -189237,7 +198927,8 @@ SLPS-01379:
     multitap: true
     linkCable: false
 SLPM-86600:
-  name: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen (Japan)"
+  name: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen"
+  saveName: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189256,7 +198947,8 @@ SLPM-86600:
     multitap: true
     linkCable: false
 SLPM-86162:
-  name: "World Soccer Jikkyou Winning Eleven 3 - Final Ver. (Japan)"
+  name: "World Soccer Jikkyou Winning Eleven 3 - Final Ver."
+  saveName: "World Soccer Jikkyou Winning Eleven 3 - Final Ver. (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4525-gdfd67664"
@@ -189278,7 +198970,8 @@ SLPM-86162:
     multitap: false
     linkCable: false
 SLPM-86086:
-  name: "World Soccer Jikkyou Winning Eleven 3 - World Cup France '98 (Japan)"
+  name: "World Soccer Jikkyou Winning Eleven 3 - World Cup France '98"
+  saveName: "World Soccer Jikkyou Winning Eleven 3 - World Cup France '98 (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -189298,9 +198991,11 @@ SLPM-86086:
     multitap: false
     linkCable: false
 SLPM-80240:
-  name: "World Soccer Jikkyou Winning Eleven 3 - World Cup France '98 (Japan) (Taikenban)"
+  name: "World Soccer Jikkyou Winning Eleven 3 - World Cup France '98 (Taikenban)"
+  saveName: "World Soccer Jikkyou Winning Eleven 3 - World Cup France '98 (Japan) (Taikenban)"
 SLPM-86291:
-  name: "World Soccer Jikkyou Winning Eleven 4 (Japan)"
+  name: "World Soccer Jikkyou Winning Eleven 4"
+  saveName: "World Soccer Jikkyou Winning Eleven 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189319,7 +199014,8 @@ SLPM-86291:
     multitap: true
     linkCable: false
 SLPM-86035:
-  name: "World Soccer Winning Eleven '97 (Japan)"
+  name: "World Soccer Winning Eleven '97"
+  saveName: "World Soccer Winning Eleven '97 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -189337,7 +199033,8 @@ SLPM-86035:
     multitap: false
     linkCable: false
 SLPS-00272:
-  name: "World Soccer Winning Eleven (Japan)"
+  name: "World Soccer Winning Eleven"
+  saveName: "World Soccer Winning Eleven (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -189355,7 +199052,8 @@ SLPS-00272:
     multitap: false
     linkCable: false
 SLPM-87056:
-  name: "World Soccer Winning Eleven 2002 (Japan)"
+  name: "World Soccer Winning Eleven 2002"
+  saveName: "World Soccer Winning Eleven 2002 (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2153-gedce63bf"
@@ -189377,7 +199075,8 @@ SLPM-87056:
     multitap: true
     linkCable: false
 SLPS-01335:
-  name: "World Stadium 2 (Japan)"
+  name: "World Stadium 2"
+  saveName: "World Stadium 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189397,7 +199096,8 @@ SLPS-01335:
     multitap: false
     linkCable: false
 SLPS-01970:
-  name: "World Stadium 3 (Japan)"
+  name: "World Stadium 3"
+  saveName: "World Stadium 3 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189417,7 +199117,8 @@ SLPS-01970:
     multitap: false
     linkCable: false
 SLPS-02660:
-  name: "World Stadium 4 (Japan)"
+  name: "World Stadium 4"
+  saveName: "World Stadium 4 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189437,7 +199138,8 @@ SLPS-02660:
     multitap: false
     linkCable: false
 SLPS-03180:
-  name: "World Stadium 5 (Japan)"
+  name: "World Stadium 5"
+  saveName: "World Stadium 5 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189457,7 +199159,8 @@ SLPS-03180:
     multitap: false
     linkCable: false
 SLPS-00075:
-  name: "World Stadium EX (Japan)"
+  name: "World Stadium EX"
+  saveName: "World Stadium EX (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -189476,7 +199179,8 @@ SLPS-00075:
     multitap: false
     linkCable: false
 SLES-04039:
-  name: "World Tennis Stars (Europe)"
+  name: "World Tennis Stars"
+  saveName: "World Tennis Stars (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189495,7 +199199,8 @@ SLES-04039:
     multitap: false
     linkCable: false
 SLPS-02231:
-  name: "World Tour Conductor - Sekai Yume Kikou (Japan)"
+  name: "World Tour Conductor - Sekai Yume Kikou"
+  saveName: "World Tour Conductor - Sekai Yume Kikou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189514,7 +199219,8 @@ SLPS-02231:
     multitap: false
     linkCable: false
 SLUS-01181:
-  name: "World of Dragon Warrior - Torneko - The Last Hope (USA)"
+  name: "World of Dragon Warrior - Torneko - The Last Hope"
+  saveName: "World of Dragon Warrior - Torneko - The Last Hope (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189533,7 +199239,8 @@ SLUS-01181:
     multitap: false
     linkCable: false
 SLES-03425:
-  name: "World's Scariest Police Chases (Europe)"
+  name: "World's Scariest Police Chases"
+  saveName: "World's Scariest Police Chases (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189553,7 +199260,8 @@ SLES-03425:
     multitap: false
     linkCable: false
 SLUS-01165:
-  name: "World's Scariest Police Chases (USA)"
+  name: "World's Scariest Police Chases"
+  saveName: "World's Scariest Police Chases (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -189576,7 +199284,8 @@ SLUS-01165:
     multitap: false
     linkCable: false
 SLES-00119:
-  name: "Worms (Europe)"
+  name: "Worms"
+  saveName: "Worms (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -189594,7 +199303,8 @@ SLES-00119:
     multitap: false
     linkCable: false
 SLPS-00547:
-  name: "Worms (Japan)"
+  name: "Worms"
+  saveName: "Worms (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -189612,7 +199322,8 @@ SLPS-00547:
     multitap: false
     linkCable: false
 SLUS-00336:
-  name: "Worms (USA)"
+  name: "Worms"
+  saveName: "Worms (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -189633,7 +199344,8 @@ SLUS-00336:
     multitap: false
     linkCable: false
 SLES-02217:
-  name: "Worms Armageddon (Europe)"
+  name: "Worms Armageddon"
+  saveName: "Worms Armageddon (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189652,7 +199364,8 @@ SLES-02217:
     multitap: false
     linkCable: false
 SLES-02332:
-  name: "Worms Armageddon (Europe) (Fr,Nl,Sv,No,Da)"
+  name: "Worms Armageddon"
+  saveName: "Worms Armageddon (Europe) (Fr,Nl,Sv,No,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189675,7 +199388,8 @@ SLES-02332:
     multitap: false
     linkCable: false
 SLES-02331:
-  name: "Worms Armageddon (Germany)"
+  name: "Worms Armageddon"
+  saveName: "Worms Armageddon (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189694,7 +199408,8 @@ SLES-02331:
     multitap: false
     linkCable: false
 SLUS-00888:
-  name: "Worms Armageddon (USA)"
+  name: "Worms Armageddon"
+  saveName: "Worms Armageddon (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -189716,7 +199431,8 @@ SLUS-00888:
     multitap: false
     linkCable: false
 SLES-00483:
-  name: "Worms Pinball (Europe) (En,Fr,De,Es,It)"
+  name: "Worms Pinball"
+  saveName: "Worms Pinball (Europe) (En,Fr,De,Es,It)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2498-gd7de578d"
@@ -189747,7 +199463,8 @@ SLES-00483:
     multitap: false
     linkCable: false
 SLES-03804:
-  name: "Worms World Party (Europe) (En,Fr,De,Es,It,Nl,Sv,Da)"
+  name: "Worms World Party"
+  saveName: "Worms World Party (Europe) (En,Fr,De,Es,It,Nl,Sv,Da)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189773,7 +199490,8 @@ SLES-03804:
     multitap: false
     linkCable: false
 SLUS-01448:
-  name: "Worms World Party (USA) (En,Fr,De,Es,It,Nl,Sv,Da)"
+  name: "Worms World Party"
+  saveName: "Worms World Party (USA) (En,Fr,De,Es,It,Nl,Sv,Da)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1333-g5a955a4"
@@ -189801,7 +199519,8 @@ SLUS-01448:
     multitap: false
     linkCable: false
 SLES-00489:
-  name: "Wreckin Crew - Drive Dangerously (Europe) (En,Fr,De,Es,It)"
+  name: "Wreckin Crew - Drive Dangerously"
+  saveName: "Wreckin Crew - Drive Dangerously (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189825,7 +199544,8 @@ SLES-00489:
     multitap: false
     linkCable: false
 SLUS-00587:
-  name: "Wreckin Crew - Drive Dangerously (USA) (En,Es)"
+  name: "Wreckin Crew - Drive Dangerously"
+  saveName: "Wreckin Crew - Drive Dangerously (USA) (En,Es)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189846,7 +199566,8 @@ SLUS-00587:
     multitap: false
     linkCable: false
 LSP-17011001:
-  name: "Write Away 1 (USA)"
+  name: "Write Away 1"
+  saveName: "Write Away 1 (USA)"
   codes:
     - LSP17011001
   metadata:
@@ -189856,7 +199577,8 @@ LSP-17011001:
     languages:
       - English
 LSP-99011901:
-  name: "Write Away 10 (USA)"
+  name: "Write Away 10"
+  saveName: "Write Away 10 (USA)"
   codes:
     - LSP99011901
   metadata:
@@ -189866,7 +199588,8 @@ LSP-99011901:
     languages:
       - English
 LSP-17011101:
-  name: "Write Away 2 (USA)"
+  name: "Write Away 2"
+  saveName: "Write Away 2 (USA)"
   codes:
     - LSP17011101
   metadata:
@@ -189876,7 +199599,8 @@ LSP-17011101:
     languages:
       - English
 LSP-17011201:
-  name: "Write Away 3 (USA)"
+  name: "Write Away 3"
+  saveName: "Write Away 3 (USA)"
   codes:
     - LSP17011201
   metadata:
@@ -189886,7 +199610,8 @@ LSP-17011201:
     languages:
       - English
 LSP-17011301:
-  name: "Write Away 4 (USA)"
+  name: "Write Away 4"
+  saveName: "Write Away 4 (USA)"
   codes:
     - LSP99011301
   metadata:
@@ -189896,7 +199621,8 @@ LSP-17011301:
     languages:
       - English
 LSP-99011401:
-  name: "Write Away 5 (USA)"
+  name: "Write Away 5"
+  saveName: "Write Away 5 (USA)"
   codes:
     - LSP99011401
   metadata:
@@ -189906,7 +199632,8 @@ LSP-99011401:
     languages:
       - English
 LSP-99011501:
-  name: "Write Away 6 (USA)"
+  name: "Write Away 6"
+  saveName: "Write Away 6 (USA)"
   codes:
     - LSP99011501
   metadata:
@@ -189916,7 +199643,8 @@ LSP-99011501:
     languages:
       - English
 LSP-99011601:
-  name: "Write Away 7 (USA)"
+  name: "Write Away 7"
+  saveName: "Write Away 7 (USA)"
   codes:
     - LSP99011601
   metadata:
@@ -189926,7 +199654,8 @@ LSP-99011601:
     languages:
       - English
 LSP-99011701:
-  name: "Write Away 8 (USA)"
+  name: "Write Away 8"
+  saveName: "Write Away 8 (USA)"
   codes:
     - LSP99011701
   metadata:
@@ -189936,7 +199665,8 @@ LSP-99011701:
     languages:
       - English
 LSP-99011801:
-  name: "Write Away 9 (USA)"
+  name: "Write Away 9"
+  saveName: "Write Away 9 (USA)"
   codes:
     - LSP99011801
   metadata:
@@ -189946,7 +199676,8 @@ LSP-99011801:
     languages:
       - English
 SLES-02171:
-  name: "Wu-Tang - Shaolin Style (France)"
+  name: "Wu-Tang - Shaolin Style"
+  saveName: "Wu-Tang - Shaolin Style (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189965,7 +199696,8 @@ SLES-02171:
     multitap: true
     linkCable: false
 SLES-02172:
-  name: "Wu-Tang - Shaolin Style (Germany)"
+  name: "Wu-Tang - Shaolin Style"
+  saveName: "Wu-Tang - Shaolin Style (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -189984,7 +199716,8 @@ SLES-02172:
     multitap: true
     linkCable: false
 SLPM-86944:
-  name: "Wu-Tang - Shaolin Style (Japan)"
+  name: "Wu-Tang - Shaolin Style"
+  saveName: "Wu-Tang - Shaolin Style (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190003,7 +199736,8 @@ SLPM-86944:
     multitap: true
     linkCable: false
 SLUS-00929:
-  name: "Wu-Tang - Shaolin Style (USA)"
+  name: "Wu-Tang - Shaolin Style"
+  saveName: "Wu-Tang - Shaolin Style (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190022,7 +199756,8 @@ SLUS-00929:
     multitap: true
     linkCable: false
 SLES-02170:
-  name: "Wu-Tang - Taste the Pain (Europe)"
+  name: "Wu-Tang - Taste the Pain"
+  saveName: "Wu-Tang - Taste the Pain (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190041,7 +199776,8 @@ SLES-02170:
     multitap: true
     linkCable: false
 SLES-02173:
-  name: "Wu-Tang - Taste the Pain (Italy)"
+  name: "Wu-Tang - Taste the Pain"
+  saveName: "Wu-Tang - Taste the Pain (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190079,7 +199815,8 @@ SLPM-86487:
     multitap: true
     linkCable: false
 SCES-01556:
-  name: "X Games Pro Boarder (Europe) (En,Fr,De,Es,It,Sv,No)"
+  name: "X Games Pro Boarder"
+  saveName: "X Games Pro Boarder (Europe) (En,Fr,De,Es,It,Sv,No)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190104,7 +199841,8 @@ SCES-01556:
     multitap: false
     linkCable: false
 SLPS-01944:
-  name: "X Games Pro Boarder (Japan)"
+  name: "X Games Pro Boarder"
+  saveName: "X Games Pro Boarder (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190123,11 +199861,13 @@ SLPS-01944:
     multitap: false
     linkCable: false
 SLPM-80393:
-  name: "X Games Pro Boarder (Japan) (Demo)"
+  name: "X Games Pro Boarder (Demo)"
+  saveName: "X Games Pro Boarder (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00704:
-  name: "X Games Pro Boarder (USA)"
+  name: "X Games Pro Boarder"
+  saveName: "X Games Pro Boarder (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -190148,7 +199888,8 @@ SLUS-00704:
     multitap: false
     linkCable: false
 SLES-03433:
-  name: "X'treme Roller (Europe) (En,Fr,De,Es,It,Pt)"
+  name: "X'treme Roller"
+  saveName: "X'treme Roller (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190173,11 +199914,13 @@ SLES-03433:
     multitap: false
     linkCable: false
 SLUS-90021:
-  name: "X-360 - Surrounding Your World with Sound (USA) (Demo)"
+  name: "X-360 - Surrounding Your World with Sound (Demo)"
+  saveName: "X-360 - Surrounding Your World with Sound (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03815:
-  name: "X-Bladez - Inline Skater (Europe)"
+  name: "X-Bladez - Inline Skater"
+  saveName: "X-Bladez - Inline Skater (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -190196,7 +199939,8 @@ SLES-03815:
     multitap: false
     linkCable: false
 SLUS-01444:
-  name: "X-Bladez - Inline Skater (USA)"
+  name: "X-Bladez - Inline Skater"
+  saveName: "X-Bladez - Inline Skater (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -190218,7 +199962,8 @@ SLUS-01444:
     multitap: false
     linkCable: false
 SLES-00054:
-  name: "X-COM - Enemy Unknown (Europe) (En,Fr,De,Es,It)"
+  name: "X-COM - Enemy Unknown"
+  saveName: "X-COM - Enemy Unknown (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -190241,7 +199986,8 @@ SLES-00054:
     multitap: false
     linkCable: false
 SLPS-00257:
-  name: "X-COM - Michinaru Shinryakusha (Japan)"
+  name: "X-COM - Michinaru Shinryakusha"
+  saveName: "X-COM - Michinaru Shinryakusha (Japan)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -190260,7 +200006,8 @@ SLPS-00257:
     multitap: false
     linkCable: false
 SLES-00077:
-  name: "X-COM - Terror from the Deep (Europe) (En,Fr,De,Es,It)"
+  name: "X-COM - Terror from the Deep"
+  saveName: "X-COM - Terror from the Deep (Europe) (En,Fr,De,Es,It)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -190283,7 +200030,8 @@ SLES-00077:
     multitap: false
     linkCable: false
 SLUS-00141:
-  name: "X-COM - UFO Defense (USA)"
+  name: "X-COM - UFO Defense"
+  saveName: "X-COM - UFO Defense (USA)"
   compatibility:
     rating: NoIssues
   controllers:
@@ -190304,7 +200052,8 @@ SLUS-00141:
     multitap: false
     linkCable: false
 SCES-01565:
-  name: "X-Files, The (Europe) (Disc 1)"
+  name: "X-Files, The (Disc 1)"
+  saveName: "X-Files, The (Europe) (Disc 1)"
   discSet:
     name: "X-Files, The (Europe)"
     serials:
@@ -190332,7 +200081,8 @@ SCES-01565:
     multitap: false
     linkCable: false
 SCES-11565:
-  name: "X-Files, The (Europe) (Disc 2)"
+  name: "X-Files, The (Disc 2)"
+  saveName: "X-Files, The (Europe) (Disc 2)"
   discSet:
     name: "X-Files, The (Europe)"
     serials:
@@ -190360,7 +200110,8 @@ SCES-11565:
     multitap: false
     linkCable: false
 SCES-21565:
-  name: "X-Files, The (Europe) (Disc 3)"
+  name: "X-Files, The (Disc 3)"
+  saveName: "X-Files, The (Europe) (Disc 3)"
   discSet:
     name: "X-Files, The (Europe)"
     serials:
@@ -190388,7 +200139,8 @@ SCES-21565:
     multitap: false
     linkCable: false
 SCES-31565:
-  name: "X-Files, The (Europe) (Disc 4)"
+  name: "X-Files, The (Disc 4)"
+  saveName: "X-Files, The (Europe) (Disc 4)"
   discSet:
     name: "X-Files, The (Europe)"
     serials:
@@ -190416,7 +200168,8 @@ SCES-31565:
     multitap: false
     linkCable: false
 SCES-01566:
-  name: "X-Files, The (France) (Disc 1)"
+  name: "X-Files, The (Disc 1)"
+  saveName: "X-Files, The (France) (Disc 1)"
   discSet:
     name: "X-Files, The (France)"
     serials:
@@ -190444,7 +200197,8 @@ SCES-01566:
     multitap: false
     linkCable: false
 SCES-11566:
-  name: "X-Files, The (France) (Disc 2)"
+  name: "X-Files, The (Disc 2)"
+  saveName: "X-Files, The (France) (Disc 2)"
   discSet:
     name: "X-Files, The (France)"
     serials:
@@ -190472,7 +200226,8 @@ SCES-11566:
     multitap: false
     linkCable: false
 SCES-21566:
-  name: "X-Files, The (France) (Disc 3)"
+  name: "X-Files, The (Disc 3)"
+  saveName: "X-Files, The (France) (Disc 3)"
   discSet:
     name: "X-Files, The (France)"
     serials:
@@ -190500,7 +200255,8 @@ SCES-21566:
     multitap: false
     linkCable: false
 SCES-31566:
-  name: "X-Files, The (France) (Disc 4)"
+  name: "X-Files, The (Disc 4)"
+  saveName: "X-Files, The (France) (Disc 4)"
   discSet:
     name: "X-Files, The (France)"
     serials:
@@ -190528,7 +200284,8 @@ SCES-31566:
     multitap: false
     linkCable: false
 SCES-01567:
-  name: "X-Files, The (Germany) (Disc 1)"
+  name: "X-Files, The (Disc 1)"
+  saveName: "X-Files, The (Germany) (Disc 1)"
   discSet:
     name: "X-Files, The (Germany)"
     serials:
@@ -190556,7 +200313,8 @@ SCES-01567:
     multitap: false
     linkCable: false
 SCES-11567:
-  name: "X-Files, The (Germany) (Disc 2)"
+  name: "X-Files, The (Disc 2)"
+  saveName: "X-Files, The (Germany) (Disc 2)"
   discSet:
     name: "X-Files, The (Germany)"
     serials:
@@ -190584,7 +200342,8 @@ SCES-11567:
     multitap: false
     linkCable: false
 SCES-21567:
-  name: "X-Files, The (Germany) (Disc 3)"
+  name: "X-Files, The (Disc 3)"
+  saveName: "X-Files, The (Germany) (Disc 3)"
   discSet:
     name: "X-Files, The (Germany)"
     serials:
@@ -190612,7 +200371,8 @@ SCES-21567:
     multitap: false
     linkCable: false
 SCES-31567:
-  name: "X-Files, The (Germany) (Disc 4)"
+  name: "X-Files, The (Disc 4)"
+  saveName: "X-Files, The (Germany) (Disc 4)"
   discSet:
     name: "X-Files, The (Germany)"
     serials:
@@ -190640,7 +200400,8 @@ SCES-31567:
     multitap: false
     linkCable: false
 SCES-01568:
-  name: "X-Files, The (Italy) (Disc 1)"
+  name: "X-Files, The (Disc 1)"
+  saveName: "X-Files, The (Italy) (Disc 1)"
   discSet:
     name: "X-Files, The (Italy)"
     serials:
@@ -190668,7 +200429,8 @@ SCES-01568:
     multitap: false
     linkCable: false
 SCES-11568:
-  name: "X-Files, The (Italy) (Disc 2)"
+  name: "X-Files, The (Disc 2)"
+  saveName: "X-Files, The (Italy) (Disc 2)"
   discSet:
     name: "X-Files, The (Italy)"
     serials:
@@ -190696,7 +200458,8 @@ SCES-11568:
     multitap: false
     linkCable: false
 SCES-21568:
-  name: "X-Files, The (Italy) (Disc 3)"
+  name: "X-Files, The (Disc 3)"
+  saveName: "X-Files, The (Italy) (Disc 3)"
   discSet:
     name: "X-Files, The (Italy)"
     serials:
@@ -190724,7 +200487,8 @@ SCES-21568:
     multitap: false
     linkCable: false
 SCES-31568:
-  name: "X-Files, The (Italy) (Disc 4)"
+  name: "X-Files, The (Disc 4)"
+  saveName: "X-Files, The (Italy) (Disc 4)"
   discSet:
     name: "X-Files, The (Italy)"
     serials:
@@ -190752,7 +200516,8 @@ SCES-31568:
     multitap: false
     linkCable: false
 SCES-01569:
-  name: "X-Files, The (Spain) (Disc 1)"
+  name: "X-Files, The (Disc 1)"
+  saveName: "X-Files, The (Spain) (Disc 1)"
   discSet:
     name: "X-Files, The (Spain)"
     serials:
@@ -190780,7 +200545,8 @@ SCES-01569:
     multitap: false
     linkCable: false
 SCES-11569:
-  name: "X-Files, The (Spain) (Disc 2)"
+  name: "X-Files, The (Disc 2)"
+  saveName: "X-Files, The (Spain) (Disc 2)"
   discSet:
     name: "X-Files, The (Spain)"
     serials:
@@ -190808,7 +200574,8 @@ SCES-11569:
     multitap: false
     linkCable: false
 SCES-21569:
-  name: "X-Files, The (Spain) (Disc 3)"
+  name: "X-Files, The (Disc 3)"
+  saveName: "X-Files, The (Spain) (Disc 3)"
   discSet:
     name: "X-Files, The (Spain)"
     serials:
@@ -190836,7 +200603,8 @@ SCES-21569:
     multitap: false
     linkCable: false
 SCES-31569:
-  name: "X-Files, The (Spain) (Disc 4)"
+  name: "X-Files, The (Disc 4)"
+  saveName: "X-Files, The (Spain) (Disc 4)"
   discSet:
     name: "X-Files, The (Spain)"
     serials:
@@ -190864,7 +200632,8 @@ SCES-31569:
     multitap: false
     linkCable: false
 SLUS-00915:
-  name: "X-Files, The (USA) (Disc 1)"
+  name: "X-Files, The (Disc 1)"
+  saveName: "X-Files, The (USA) (Disc 1)"
   discSet:
     name: "X-Files, The (USA)"
     serials:
@@ -190896,7 +200665,8 @@ SLUS-00915:
     multitap: false
     linkCable: false
 SLUS-00949:
-  name: "X-Files, The (USA) (Disc 2)"
+  name: "X-Files, The (Disc 2)"
+  saveName: "X-Files, The (USA) (Disc 2)"
   discSet:
     name: "X-Files, The (USA)"
     serials:
@@ -190924,7 +200694,8 @@ SLUS-00949:
     multitap: false
     linkCable: false
 SLUS-00950:
-  name: "X-Files, The (USA) (Disc 3)"
+  name: "X-Files, The (Disc 3)"
+  saveName: "X-Files, The (USA) (Disc 3)"
   discSet:
     name: "X-Files, The (USA)"
     serials:
@@ -190952,7 +200723,8 @@ SLUS-00950:
     multitap: false
     linkCable: false
 SLUS-00951:
-  name: "X-Files, The (USA) (Disc 4)"
+  name: "X-Files, The (Disc 4)"
+  saveName: "X-Files, The (USA) (Disc 4)"
   discSet:
     name: "X-Files, The (USA)"
     serials:
@@ -190980,7 +200752,8 @@ SLUS-00951:
     multitap: false
     linkCable: false
 SLES-00198:
-  name: "X-Men - Children of the Atom (Europe)"
+  name: "X-Men - Children of the Atom"
+  saveName: "X-Men - Children of the Atom (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -190998,7 +200771,8 @@ SLES-00198:
     multitap: false
     linkCable: false
 SLUS-00044:
-  name: "X-Men - Children of the Atom (USA)"
+  name: "X-Men - Children of the Atom"
+  saveName: "X-Men - Children of the Atom (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -191019,9 +200793,11 @@ SLUS-00044:
     multitap: false
     linkCable: false
 SLPM-80609:
-  name: "X-Men - Mutant Academy & Spider-Man (Japan) (Taikenban)"
+  name: "X-Men - Mutant Academy & Spider-Man (Taikenban)"
+  saveName: "X-Men - Mutant Academy & Spider-Man (Japan) (Taikenban)"
 SLES-02865:
-  name: "X-Men - Mutant Academy (Europe)"
+  name: "X-Men - Mutant Academy"
+  saveName: "X-Men - Mutant Academy (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191040,7 +200816,8 @@ SLES-02865:
     multitap: false
     linkCable: false
 SLES-02866:
-  name: "X-Men - Mutant Academy (Germany)"
+  name: "X-Men - Mutant Academy"
+  saveName: "X-Men - Mutant Academy (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191059,7 +200836,8 @@ SLES-02866:
     multitap: false
     linkCable: false
 SLPM-86765:
-  name: "X-Men - Mutant Academy (Japan)"
+  name: "X-Men - Mutant Academy"
+  saveName: "X-Men - Mutant Academy (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191081,7 +200859,8 @@ SLPM-86765:
     multitap: false
     linkCable: false
 SLUS-00774:
-  name: "X-Men - Mutant Academy (USA)"
+  name: "X-Men - Mutant Academy"
+  saveName: "X-Men - Mutant Academy (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -191103,11 +200882,13 @@ SLUS-00774:
     multitap: false
     linkCable: false
 SLUS-81223:
-  name: "X-Men - Mutant Academy (USA) (Demo)"
+  name: "X-Men - Mutant Academy (Demo)"
+  saveName: "X-Men - Mutant Academy (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-03630:
-  name: "X-Men - Mutant Academy 2 (Europe)"
+  name: "X-Men - Mutant Academy 2"
+  saveName: "X-Men - Mutant Academy 2 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191126,7 +200907,8 @@ SLES-03630:
     multitap: false
     linkCable: false
 SLPM-87077:
-  name: "X-Men - Mutant Academy 2 (Japan)"
+  name: "X-Men - Mutant Academy 2"
+  saveName: "X-Men - Mutant Academy 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191145,7 +200927,8 @@ SLPM-87077:
     multitap: false
     linkCable: false
 SLUS-01382:
-  name: "X-Men - Mutant Academy 2 (USA)"
+  name: "X-Men - Mutant Academy 2"
+  saveName: "X-Men - Mutant Academy 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -191167,7 +200950,8 @@ SLUS-01382:
     multitap: false
     linkCable: false
 SLES-01247:
-  name: "X-Men vs. Street Fighter (Europe)"
+  name: "X-Men vs. Street Fighter"
+  saveName: "X-Men vs. Street Fighter (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -191185,7 +200969,8 @@ SLES-01247:
     multitap: false
     linkCable: false
 SLUS-00627:
-  name: "X-Men vs. Street Fighter (USA)"
+  name: "X-Men vs. Street Fighter"
+  saveName: "X-Men vs. Street Fighter (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1608-g79aaf908"
@@ -191206,7 +200991,8 @@ SLUS-00627:
     multitap: false
     linkCable: false
 SLPS-01284:
-  name: "X-Men vs. Street Fighter - EX Edition (Japan)"
+  name: "X-Men vs. Street Fighter - EX Edition"
+  saveName: "X-Men vs. Street Fighter - EX Edition (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -191224,7 +201010,8 @@ SLPS-01284:
     multitap: false
     linkCable: false
 SLPS-01063:
-  name: "X.Racing (Japan)"
+  name: "X.Racing"
+  saveName: "X.Racing (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -191247,7 +201034,8 @@ SLPS-01063:
     multitap: false
     linkCable: true
 SLES-00455:
-  name: "X2 - No Relief (Europe)"
+  name: "X2 - No Relief"
+  saveName: "X2 - No Relief (Europe)"
   controllers:
     - DigitalController
   traits:
@@ -191269,7 +201057,8 @@ SLES-00455:
     multitap: false
     linkCable: false
 SLPS-00766:
-  name: "X2 - No Relief (Japan)"
+  name: "X2 - No Relief"
+  saveName: "X2 - No Relief (Japan)"
   controllers:
     - DigitalController
   traits:
@@ -191329,11 +201118,13 @@ SCPS-45465:
     multitap: false
     linkCable: false
 PAPX-90037:
-  name: "XI [sai] (Japan) (Demo 2)"
+  name: "XI [sai] (Demo 2)"
+  saveName: "XI [sai] (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-10051:
-  name: "XI [sai] (Japan) (En,Ja)"
+  name: "XI [sai]"
+  saveName: "XI [sai] (Japan) (En,Ja)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191356,11 +201147,13 @@ SCPS-10051:
     multitap: true
     linkCable: false
 PAPX-90032:
-  name: "XI [sai] (Japan) (En,Ja) (Demo 1)"
+  name: "XI [sai] (Demo 1)"
+  saveName: "XI [sai] (Japan) (En,Ja) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SCPS-10123:
-  name: "XI [sai] Jumbo (Japan)"
+  name: "XI [sai] Jumbo"
+  saveName: "XI [sai] Jumbo (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191382,9 +201175,11 @@ SCPS-10123:
     multitap: false
     linkCable: false
 SLPM-80350:
-  name: "XI [sai] Super Play Collection - XI wa Futatabi Nagerareta - Special CD-ROM (Japan)"
+  name: "XI [sai] Super Play Collection - XI wa Futatabi Nagerareta - Special CD-ROM"
+  saveName: "XI [sai] Super Play Collection - XI wa Futatabi Nagerareta - Special CD-ROM (Japan)"
 SLES-04101:
-  name: "XS Airboat Racing (Europe) (En,Fr,De,Es,It)"
+  name: "XS Airboat Racing"
+  saveName: "XS Airboat Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191408,7 +201203,8 @@ SLES-04101:
     multitap: false
     linkCable: false
 SLUS-01566:
-  name: "XS Airboat Racing (USA)"
+  name: "XS Airboat Racing"
+  saveName: "XS Airboat Racing (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191428,7 +201224,8 @@ SLUS-01566:
     multitap: false
     linkCable: false
 SLUS-01560:
-  name: "XS Junior League Dodgeball (USA)"
+  name: "XS Junior League Dodgeball"
+  saveName: "XS Junior League Dodgeball (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191447,7 +201244,8 @@ SLUS-01560:
     multitap: false
     linkCable: false
 SLUS-01554:
-  name: "XS Junior League Football (USA)"
+  name: "XS Junior League Football"
+  saveName: "XS Junior League Football (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191466,7 +201264,8 @@ SLUS-01554:
     multitap: false
     linkCable: false
 SLES-04120:
-  name: "XS Junior League Soccer (Europe) (En,Fr,De,Es,It)"
+  name: "XS Junior League Soccer"
+  saveName: "XS Junior League Soccer (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191489,7 +201288,8 @@ SLES-04120:
     multitap: false
     linkCable: false
 SLUS-01520:
-  name: "XS Junior League Soccer (USA)"
+  name: "XS Junior League Soccer"
+  saveName: "XS Junior League Soccer (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191508,7 +201308,8 @@ SLUS-01520:
     multitap: false
     linkCable: false
 SLES-04095:
-  name: "XS Moto (Europe) (En,Fr,De,Es,It)"
+  name: "XS Moto"
+  saveName: "XS Moto (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191532,7 +201333,8 @@ SLES-04095:
     multitap: false
     linkCable: false
 SLUS-01506:
-  name: "XS Moto (USA)"
+  name: "XS Moto"
+  saveName: "XS Moto (USA)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191552,7 +201354,8 @@ SLUS-01506:
     multitap: false
     linkCable: false
 SLES-02265:
-  name: "Xena - Warrior Princess (Europe)"
+  name: "Xena - Warrior Princess"
+  saveName: "Xena - Warrior Princess (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191571,7 +201374,8 @@ SLES-02265:
     multitap: false
     linkCable: false
 SLES-02266:
-  name: "Xena - Warrior Princess (France)"
+  name: "Xena - Warrior Princess"
+  saveName: "Xena - Warrior Princess (France)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
@@ -191593,7 +201397,8 @@ SLES-02266:
     multitap: false
     linkCable: false
 SLES-02267:
-  name: "Xena - Warrior Princess (Germany)"
+  name: "Xena - Warrior Princess"
+  saveName: "Xena - Warrior Princess (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191612,7 +201417,8 @@ SLES-02267:
     multitap: false
     linkCable: false
 SLES-02268:
-  name: "Xena - Warrior Princess (Spain)"
+  name: "Xena - Warrior Princess"
+  saveName: "Xena - Warrior Princess (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191631,7 +201437,8 @@ SLES-02268:
     multitap: false
     linkCable: false
 SLUS-00977:
-  name: "Xena - Warrior Princess (USA)"
+  name: "Xena - Warrior Princess"
+  saveName: "Xena - Warrior Princess (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
@@ -191653,7 +201460,8 @@ SLUS-00977:
     multitap: false
     linkCable: false
 SLES-00811:
-  name: "Xenocracy - The Ultimate Solar War (Europe)"
+  name: "Xenocracy - The Ultimate Solar War"
+  saveName: "Xenocracy - The Ultimate Solar War (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191672,7 +201480,8 @@ SLES-00811:
     multitap: false
     linkCable: false
 SLES-00812:
-  name: "Xenocracy - The Ultimate Solar War (France)"
+  name: "Xenocracy - The Ultimate Solar War"
+  saveName: "Xenocracy - The Ultimate Solar War (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191691,7 +201500,8 @@ SLES-00812:
     multitap: false
     linkCable: false
 SLES-00813:
-  name: "Xenocracy - The Ultimate Solar War (Germany)"
+  name: "Xenocracy - The Ultimate Solar War"
+  saveName: "Xenocracy - The Ultimate Solar War (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191710,7 +201520,8 @@ SLES-00813:
     multitap: false
     linkCable: false
 SLES-00814:
-  name: "Xenocracy - The Ultimate Solar War (Italy)"
+  name: "Xenocracy - The Ultimate Solar War"
+  saveName: "Xenocracy - The Ultimate Solar War (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191729,7 +201540,8 @@ SLES-00814:
     multitap: false
     linkCable: false
 SLES-00815:
-  name: "Xenocracy - The Ultimate Solar War (Spain)"
+  name: "Xenocracy - The Ultimate Solar War"
+  saveName: "Xenocracy - The Ultimate Solar War (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -191796,7 +201608,8 @@ SLPS-02773:
     multitap: false
     linkCable: false
 SLPS-01160:
-  name: "Xenogears (Japan) (Disc 1)"
+  name: "Xenogears (Disc 1)"
+  saveName: "Xenogears (Japan) (Disc 1)"
   discSet:
     name: "Xenogears (Japan)"
     serials:
@@ -191827,7 +201640,8 @@ SLPS-01160:
     multitap: false
     linkCable: false
 SLPS-01161:
-  name: "Xenogears (Japan) (Disc 2)"
+  name: "Xenogears (Disc 2)"
+  saveName: "Xenogears (Japan) (Disc 2)"
   discSet:
     name: "Xenogears (Japan)"
     serials:
@@ -191856,7 +201670,8 @@ SLPS-01161:
     multitap: false
     linkCable: false
 SLUS-00664:
-  name: "Xenogears (USA) (Disc 1)"
+  name: "Xenogears (Disc 1)"
+  saveName: "Xenogears (USA) (Disc 1)"
   discSet:
     name: "Xenogears (USA)"
     serials:
@@ -191885,7 +201700,8 @@ SLUS-00664:
     multitap: false
     linkCable: false
 SLUS-00669:
-  name: "Xenogears (USA) (Disc 2)"
+  name: "Xenogears (Disc 2)"
+  saveName: "Xenogears (USA) (Disc 2)"
   discSet:
     name: "Xenogears (USA)"
     serials:
@@ -191914,7 +201730,8 @@ SLUS-00669:
     multitap: false
     linkCable: false
 SCES-00736:
-  name: "Xevious 3D-G+ (Europe)"
+  name: "Xevious 3D-G+"
+  saveName: "Xevious 3D-G+ (Europe)"
   controllers:
     - DigitalController
     - NeGcon
@@ -191933,7 +201750,8 @@ SCES-00736:
     multitap: false
     linkCable: false
 SLPS-00750:
-  name: "Xevious 3D-G+ (Japan)"
+  name: "Xevious 3D-G+"
+  saveName: "Xevious 3D-G+ (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -191952,7 +201770,8 @@ SLPS-00750:
     multitap: false
     linkCable: false
 SLUS-00461:
-  name: "Xevious 3D-G+ (USA)"
+  name: "Xevious 3D-G+"
+  saveName: "Xevious 3D-G+ (USA)"
   controllers:
     - DigitalController
     - NeGcon
@@ -191971,7 +201790,8 @@ SLUS-00461:
     multitap: false
     linkCable: false
 SLPS-02064:
-  name: "Yagami Hiroki no Game-Taste - Munasawagi no Yokan (Japan)"
+  name: "Yagami Hiroki no Game-Taste - Munasawagi no Yokan"
+  saveName: "Yagami Hiroki no Game-Taste - Munasawagi no Yokan (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192009,7 +201829,8 @@ SLPS-03519:
     multitap: false
     linkCable: false
 SLPS-03209:
-  name: "Yakiniku Bugyou (Japan)"
+  name: "Yakiniku Bugyou"
+  saveName: "Yakiniku Bugyou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192028,7 +201849,8 @@ SLPS-03209:
     multitap: false
     linkCable: false
 SLPS-03435:
-  name: "Yakitori Musume - Sugoude Hanjouki (Japan)"
+  name: "Yakitori Musume - Sugoude Hanjouki"
+  saveName: "Yakitori Musume - Sugoude Hanjouki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192047,11 +201869,13 @@ SLPS-03435:
     multitap: false
     linkCable: false
 SLPM-80634:
-  name: "Yakitori Musume - Sugoude Hanjouki (Japan) (Demo)"
+  name: "Yakitori Musume - Sugoude Hanjouki (Demo)"
+  saveName: "Yakitori Musume - Sugoude Hanjouki (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00152:
-  name: "Yaku - Yuujou Dangi (Japan)"
+  name: "Yaku - Yuujou Dangi"
+  saveName: "Yaku - Yuujou Dangi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -192069,7 +201893,8 @@ SLPS-00152:
     multitap: false
     linkCable: false
 SLPS-00689:
-  name: "Yaku Tsuu - Noroi no Game (Japan)"
+  name: "Yaku Tsuu - Noroi no Game"
+  saveName: "Yaku Tsuu - Noroi no Game (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -192087,7 +201912,8 @@ SLPS-00689:
     multitap: false
     linkCable: false
 SLPS-02393:
-  name: "Yamagata Digital Museum (Japan) (Disc 1) (Spring)"
+  name: "Yamagata Digital Museum (Disc 1) (Spring)"
+  saveName: "Yamagata Digital Museum (Japan) (Disc 1) (Spring)"
   discSet:
     name: "Yamagata Digital Museum (Japan)"
     serials:
@@ -192112,7 +201938,8 @@ SLPS-02393:
     multitap: false
     linkCable: false
 SLPS-02394:
-  name: "Yamagata Digital Museum (Japan) (Disc 2) (Summer)"
+  name: "Yamagata Digital Museum (Disc 2) (Summer)"
+  saveName: "Yamagata Digital Museum (Japan) (Disc 2) (Summer)"
   discSet:
     name: "Yamagata Digital Museum (Japan)"
     serials:
@@ -192137,7 +201964,8 @@ SLPS-02394:
     multitap: false
     linkCable: false
 SLPS-02395:
-  name: "Yamagata Digital Museum (Japan) (Disc 3) (Autumn)"
+  name: "Yamagata Digital Museum (Disc 3) (Autumn)"
+  saveName: "Yamagata Digital Museum (Japan) (Disc 3) (Autumn)"
   discSet:
     name: "Yamagata Digital Museum (Japan)"
     serials:
@@ -192162,7 +201990,8 @@ SLPS-02395:
     multitap: false
     linkCable: false
 SLPS-02396:
-  name: "Yamagata Digital Museum (Japan) (Disc 4) (Winter)"
+  name: "Yamagata Digital Museum (Disc 4) (Winter)"
+  saveName: "Yamagata Digital Museum (Japan) (Disc 4) (Winter)"
   discSet:
     name: "Yamagata Digital Museum (Japan)"
     serials:
@@ -192187,7 +202016,8 @@ SLPS-02396:
     multitap: false
     linkCable: false
 SLPS-03120:
-  name: "Yamasa Digi Guide - Faust (Japan)"
+  name: "Yamasa Digi Guide - Faust"
+  saveName: "Yamasa Digi Guide - Faust (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192206,7 +202036,8 @@ SLPS-03120:
     multitap: false
     linkCable: false
 SLPS-02989:
-  name: "Yamasa Digi Guide - Hyper Rush (Japan)"
+  name: "Yamasa Digi Guide - Hyper Rush"
+  saveName: "Yamasa Digi Guide - Hyper Rush (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192225,7 +202056,8 @@ SLPS-02989:
     multitap: false
     linkCable: false
 SLPS-03038:
-  name: "Yamasa Digi Guide - M771 (Japan)"
+  name: "Yamasa Digi Guide - M771"
+  saveName: "Yamasa Digi Guide - M771 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192244,7 +202076,8 @@ SLPS-03038:
     multitap: false
     linkCable: false
 SLPS-02980:
-  name: "Yamasa Digi Guide - New Pulsar R (Japan)"
+  name: "Yamasa Digi Guide - New Pulsar R"
+  saveName: "Yamasa Digi Guide - New Pulsar R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192263,7 +202096,8 @@ SLPS-02980:
     multitap: false
     linkCable: false
 SLPS-03096:
-  name: "Yamasa Digi Guide - Umekagetsu R (Japan)"
+  name: "Yamasa Digi Guide - Umekagetsu R"
+  saveName: "Yamasa Digi Guide - Umekagetsu R (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192282,7 +202116,8 @@ SLPS-03096:
     multitap: false
     linkCable: false
 SLPS-03429:
-  name: "Yamasa Digi Selection (Japan)"
+  name: "Yamasa Digi Selection"
+  saveName: "Yamasa Digi Selection (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192301,7 +202136,8 @@ SLPS-03429:
     multitap: false
     linkCable: false
 SLPS-03428:
-  name: "Yamasa Digi Selection (Japan) (DX)"
+  name: "Yamasa Digi Selection (DX)"
+  saveName: "Yamasa Digi Selection (Japan) (DX)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192320,7 +202156,8 @@ SLPS-03428:
     multitap: false
     linkCable: false
 SLPS-03484:
-  name: "Yamasa Digi Selection 2 (Japan)"
+  name: "Yamasa Digi Selection 2"
+  saveName: "Yamasa Digi Selection 2 (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192339,7 +202176,8 @@ SLPS-03484:
     multitap: false
     linkCable: false
 SLPS-03212:
-  name: "Yamasa Digi World - Tetra Master (Japan)"
+  name: "Yamasa Digi World - Tetra Master"
+  saveName: "Yamasa Digi World - Tetra Master (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192358,7 +202196,8 @@ SLPS-03212:
     multitap: false
     linkCable: false
 SLPS-01878:
-  name: "Yamifuku Natsu - Teito Monogatari Futatabi (Japan)"
+  name: "Yamifuku Natsu - Teito Monogatari Futatabi"
+  saveName: "Yamifuku Natsu - Teito Monogatari Futatabi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192377,7 +202216,8 @@ SLPS-01878:
     multitap: false
     linkCable: false
 SLPS-00054:
-  name: "Yaoi Junichi Gokuhi Project - UFO o Oe!! (Japan)"
+  name: "Yaoi Junichi Gokuhi Project - UFO o Oe!!"
+  saveName: "Yaoi Junichi Gokuhi Project - UFO o Oe!! (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -192395,23 +202235,28 @@ SLPS-00054:
     multitap: false
     linkCable: false
 PAPX-90058:
-  name: "Yarudora (Japan) (Demo)"
+  name: "Yarudora (Demo)"
+  saveName: "Yarudora (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96128:
-  name: "Yarudora - Yukiwari no Hana & Sampaguita (Japan) (Demo)"
+  name: "Yarudora - Yukiwari no Hana & Sampaguita (Demo)"
+  saveName: "Yarudora - Yukiwari no Hana & Sampaguita (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90033:
-  name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Demo 1)"
+  name: "Yarudora Series Vol. 1 - Double Cast (Demo 1)"
+  saveName: "Yarudora Series Vol. 1 - Double Cast (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PAPX-90035:
-  name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Demo 2)"
+  name: "Yarudora Series Vol. 1 - Double Cast (Demo 2)"
+  saveName: "Yarudora Series Vol. 1 - Double Cast (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-10053:
-  name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Disc 1)"
+  name: "Yarudora Series Vol. 1 - Double Cast (Disc 1)"
+  saveName: "Yarudora Series Vol. 1 - Double Cast (Japan) (Disc 1)"
   discSet:
     name: "Yarudora Series Vol. 1 - Double Cast (Japan)"
     serials:
@@ -192435,7 +202280,8 @@ SCPS-10053:
     multitap: false
     linkCable: false
 SCPS-10054:
-  name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Disc 2)"
+  name: "Yarudora Series Vol. 1 - Double Cast (Disc 2)"
+  saveName: "Yarudora Series Vol. 1 - Double Cast (Japan) (Disc 2)"
   discSet:
     name: "Yarudora Series Vol. 1 - Double Cast (Japan)"
     serials:
@@ -192459,11 +202305,13 @@ SCPS-10054:
     multitap: false
     linkCable: false
 PAPX-90036:
-  name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Demo)"
+  name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Demo)"
+  saveName: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10056:
-  name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Disc 1)"
+  name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Disc 1)"
+  saveName: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Disc 1)"
   discSet:
     name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan)"
     serials:
@@ -192487,7 +202335,8 @@ SCPS-10056:
     multitap: false
     linkCable: false
 SCPS-10057:
-  name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Disc 2)"
+  name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Disc 2)"
+  saveName: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Disc 2)"
   discSet:
     name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan)"
     serials:
@@ -192511,11 +202360,13 @@ SCPS-10057:
     multitap: false
     linkCable: false
 PAPX-90042:
-  name: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
+  name: "Yarudora Series Vol. 3 - Sampaguita (Demo)"
+  saveName: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPS-10067:
-  name: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Disc 1)"
+  name: "Yarudora Series Vol. 3 - Sampaguita (Disc 1)"
+  saveName: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Disc 1)"
   discSet:
     name: "Yarudora Series Vol. 3 - Sampaguita (Japan)"
     serials:
@@ -192542,7 +202393,8 @@ SCPS-10067:
     multitap: false
     linkCable: false
 SCPS-10068:
-  name: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Disc 2)"
+  name: "Yarudora Series Vol. 3 - Sampaguita (Disc 2)"
+  saveName: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Disc 2)"
   discSet:
     name: "Yarudora Series Vol. 3 - Sampaguita (Japan)"
     serials:
@@ -192569,7 +202421,8 @@ SCPS-10068:
     multitap: false
     linkCable: false
 SCPS-10069:
-  name: "Yarudora Series Vol. 4 - Yukiwari no Hana (Japan) (Disc 1)"
+  name: "Yarudora Series Vol. 4 - Yukiwari no Hana (Disc 1)"
+  saveName: "Yarudora Series Vol. 4 - Yukiwari no Hana (Japan) (Disc 1)"
   discSet:
     name: "Yarudora Series Vol. 4 - Yukiwari no Hana (Japan)"
     serials:
@@ -192593,7 +202446,8 @@ SCPS-10069:
     multitap: false
     linkCable: false
 SCPS-10070:
-  name: "Yarudora Series Vol. 4 - Yukiwari no Hana (Japan) (Disc 2)"
+  name: "Yarudora Series Vol. 4 - Yukiwari no Hana (Disc 2)"
+  saveName: "Yarudora Series Vol. 4 - Yukiwari no Hana (Japan) (Disc 2)"
   discSet:
     name: "Yarudora Series Vol. 4 - Yukiwari no Hana (Japan)"
     serials:
@@ -192683,7 +202537,8 @@ SCPS-91244:
     multitap: false
     linkCable: false
 SLES-02272:
-  name: "Yeh Yeh Tennis (Europe) (En,Fr,De)"
+  name: "Yeh Yeh Tennis"
+  saveName: "Yeh Yeh Tennis (Europe) (En,Fr,De)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192704,7 +202559,8 @@ SLES-02272:
     multitap: true
     linkCable: false
 SLPS-00443:
-  name: "Yellow Brick Road (Japan)"
+  name: "Yellow Brick Road"
+  saveName: "Yellow Brick Road (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -192722,7 +202578,8 @@ SLPS-00443:
     multitap: false
     linkCable: false
 SLPM-86473:
-  name: "Yellow Monkey, The - Trancemission VJ Remix (Japan)"
+  name: "Yellow Monkey, The - Trancemission VJ Remix"
+  saveName: "Yellow Monkey, The - Trancemission VJ Remix (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192741,7 +202598,8 @@ SLPM-86473:
     multitap: false
     linkCable: false
 SLES-04164:
-  name: "Yetisports Deluxe (Europe) (En,Fr,De,Es,It)"
+  name: "Yetisports Deluxe"
+  saveName: "Yetisports Deluxe (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192764,7 +202622,8 @@ SLES-04164:
     multitap: false
     linkCable: false
 SLES-04170:
-  name: "Yetisports World Tour (Europe) (En,Fr,De,Es,It)"
+  name: "Yetisports World Tour"
+  saveName: "Yetisports World Tour (Europe) (En,Fr,De,Es,It)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192787,7 +202646,8 @@ SLES-04170:
     multitap: false
     linkCable: false
 SLES-01784:
-  name: "YoYo's Puzzle Park (Europe)"
+  name: "YoYo's Puzzle Park"
+  saveName: "YoYo's Puzzle Park (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192806,11 +202666,14 @@ SLES-01784:
     multitap: false
     linkCable: false
 PAPX-90022:
-  name: "Yoi Ko to Yoi Otona no. PlayStation Taikenban Vol. 1 (Japan)"
+  name: "Yoi Ko to Yoi Otona no. PlayStation Taikenban Vol. 1"
+  saveName: "Yoi Ko to Yoi Otona no. PlayStation Taikenban Vol. 1 (Japan)"
 PAPX-90023:
-  name: "Yoi Ko to Yoi Otona no. PlayStation Taikenban Vol. 2 (Japan)"
+  name: "Yoi Ko to Yoi Otona no. PlayStation Taikenban Vol. 2"
+  saveName: "Yoi Ko to Yoi Otona no. PlayStation Taikenban Vol. 2 (Japan)"
 SLPS-01758:
-  name: "Yoshimoto Mahjong Club Deluxe (Japan)"
+  name: "Yoshimoto Mahjong Club Deluxe"
+  saveName: "Yoshimoto Mahjong Club Deluxe (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -192828,7 +202691,8 @@ SLPS-01758:
     multitap: false
     linkCable: false
 SLPS-02308:
-  name: "Yoshimoto Muchicco Dai-kessen - Minami no Umi no Gorongo-tou (Japan)"
+  name: "Yoshimoto Muchicco Dai-kessen - Minami no Umi no Gorongo-tou"
+  saveName: "Yoshimoto Muchicco Dai-kessen - Minami no Umi no Gorongo-tou (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192847,7 +202711,8 @@ SLPS-02308:
     multitap: false
     linkCable: false
 SLPM-86076:
-  name: "Yoshimura Shougi (Japan)"
+  name: "Yoshimura Shougi"
+  saveName: "Yoshimura Shougi (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -192865,7 +202730,8 @@ SLPM-86076:
     multitap: false
     linkCable: false
 SLES-03499:
-  name: "You Don't Know Jack (Germany)"
+  name: "You Don't Know Jack"
+  saveName: "You Don't Know Jack (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192884,11 +202750,13 @@ SLES-03499:
     multitap: true
     linkCable: false
 SLUS-90061:
-  name: "You Don't Know Jack (USA) (Demo)"
+  name: "You Don't Know Jack (Demo)"
+  saveName: "You Don't Know Jack (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLUS-00716:
-  name: "You Don't Know Jack (USA) (Disc 1)"
+  name: "You Don't Know Jack (Disc 1)"
+  saveName: "You Don't Know Jack (USA) (Disc 1)"
   discSet:
     name: "You Don't Know Jack (USA)"
     serials:
@@ -192915,7 +202783,8 @@ SLUS-00716:
     multitap: false
     linkCable: false
 SLUS-00762:
-  name: "You Don't Know Jack (USA) (Disc 2)"
+  name: "You Don't Know Jack (Disc 2)"
+  saveName: "You Don't Know Jack (USA) (Disc 2)"
   discSet:
     name: "You Don't Know Jack (USA)"
     serials:
@@ -192939,7 +202808,8 @@ SLUS-00762:
     multitap: false
     linkCable: false
 SLUS-01194:
-  name: "You Don't Know Jack - Mock 2 (USA)"
+  name: "You Don't Know Jack - Mock 2"
+  saveName: "You Don't Know Jack - Mock 2 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2553-g3ed42977"
@@ -192961,7 +202831,8 @@ SLUS-01194:
     multitap: false
     linkCable: false
 SLPS-03098:
-  name: "Youchien Gaiden - Karei naru Casino Club - Double Draw (Japan)"
+  name: "Youchien Gaiden - Karei naru Casino Club - Double Draw"
+  saveName: "Youchien Gaiden - Karei naru Casino Club - Double Draw (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192980,7 +202851,8 @@ SLPS-03098:
     multitap: true
     linkCable: false
 SLPM-86857:
-  name: "Youkai Hana Asobi (Japan)"
+  name: "Youkai Hana Asobi"
+  saveName: "Youkai Hana Asobi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -192999,7 +202871,8 @@ SLPM-86857:
     multitap: false
     linkCable: false
 SLES-03947:
-  name: "Yu-Gi-Oh! Forbidden Memories (Europe)"
+  name: "Yu-Gi-Oh! Forbidden Memories"
+  saveName: "Yu-Gi-Oh! Forbidden Memories (Europe)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193018,7 +202891,8 @@ SLES-03947:
     multitap: false
     linkCable: false
 SLES-03948:
-  name: "Yu-Gi-Oh! Forbidden Memories (France)"
+  name: "Yu-Gi-Oh! Forbidden Memories"
+  saveName: "Yu-Gi-Oh! Forbidden Memories (France)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193037,7 +202911,8 @@ SLES-03948:
     multitap: false
     linkCable: false
 SLES-03949:
-  name: "Yu-Gi-Oh! Forbidden Memories (Germany)"
+  name: "Yu-Gi-Oh! Forbidden Memories"
+  saveName: "Yu-Gi-Oh! Forbidden Memories (Germany)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193056,7 +202931,8 @@ SLES-03949:
     multitap: false
     linkCable: false
 SLES-03950:
-  name: "Yu-Gi-Oh! Forbidden Memories (Italy)"
+  name: "Yu-Gi-Oh! Forbidden Memories"
+  saveName: "Yu-Gi-Oh! Forbidden Memories (Italy)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193075,7 +202951,8 @@ SLES-03950:
     multitap: false
     linkCable: false
 SLES-03951:
-  name: "Yu-Gi-Oh! Forbidden Memories (Spain)"
+  name: "Yu-Gi-Oh! Forbidden Memories"
+  saveName: "Yu-Gi-Oh! Forbidden Memories (Spain)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193094,7 +202971,8 @@ SLES-03951:
     multitap: false
     linkCable: false
 SLUS-01411:
-  name: "Yu-Gi-Oh! Forbidden Memories (USA)"
+  name: "Yu-Gi-Oh! Forbidden Memories"
+  saveName: "Yu-Gi-Oh! Forbidden Memories (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-941-g2e64f77"
@@ -193116,7 +202994,8 @@ SLUS-01411:
     multitap: false
     linkCable: false
 SLPM-86096:
-  name: "Yu-Gi-Oh! Monster Capsule Breed & Battle (Japan)"
+  name: "Yu-Gi-Oh! Monster Capsule Breed & Battle"
+  saveName: "Yu-Gi-Oh! Monster Capsule Breed & Battle (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193155,7 +203034,8 @@ SLPM-87065:
     multitap: false
     linkCable: false
 SLPM-86398:
-  name: "Yu-Gi-Oh! Shin Duel Monsters - Fuuin Sareshi Kioku (Japan)"
+  name: "Yu-Gi-Oh! Shin Duel Monsters - Fuuin Sareshi Kioku"
+  saveName: "Yu-Gi-Oh! Shin Duel Monsters - Fuuin Sareshi Kioku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193178,7 +203058,8 @@ SLPM-86398:
     multitap: false
     linkCable: false
 SLPM-86396:
-  name: "Yu-Gi-Oh! Shin Duel Monsters - Fuuin Sareshi Kioku (Japan) (Genteiban)"
+  name: "Yu-Gi-Oh! Shin Duel Monsters - Fuuin Sareshi Kioku (Genteiban)"
+  saveName: "Yu-Gi-Oh! Shin Duel Monsters - Fuuin Sareshi Kioku (Japan) (Genteiban)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193197,7 +203078,8 @@ SLPM-86396:
     multitap: false
     linkCable: false
 SLPM-87013:
-  name: "Yukinko Burning (Japan)"
+  name: "Yukinko Burning"
+  saveName: "Yukinko Burning (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193215,7 +203097,8 @@ SLPM-87013:
     multitap: false
     linkCable: false
 SLPS-01401:
-  name: "Yume Iroiro (Japan)"
+  name: "Yume Iroiro"
+  saveName: "Yume Iroiro (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193233,7 +203116,8 @@ SLPS-01401:
     multitap: false
     linkCable: false
 SLPS-02954:
-  name: "Yume no Tsubasa (Japan)"
+  name: "Yume no Tsubasa"
+  saveName: "Yume no Tsubasa (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193252,7 +203136,8 @@ SLPS-02954:
     multitap: false
     linkCable: false
 SLES-00713:
-  name: "Yusha - Heaven's Gate (Europe)"
+  name: "Yusha - Heaven's Gate"
+  saveName: "Yusha - Heaven's Gate (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -193270,7 +203155,8 @@ SLES-00713:
     multitap: false
     linkCable: false
 SLPS-03177:
-  name: "Yutona Eiyuu Senki - TearRingSaga (Japan)"
+  name: "Yutona Eiyuu Senki - TearRingSaga"
+  saveName: "Yutona Eiyuu Senki - TearRingSaga (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-4599-ga542fa85"
@@ -193292,11 +203178,13 @@ SLPS-03177:
     multitap: false
     linkCable: false
 SLPM-80610:
-  name: "Yutona Eiyuu Senki - TearRingSaga - Prelude (Japan) (Demo)"
+  name: "Yutona Eiyuu Senki - TearRingSaga - Prelude (Demo)"
+  saveName: "Yutona Eiyuu Senki - TearRingSaga - Prelude (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02722:
-  name: "Yuugen Gaisha Chikyuu Boueitai (Japan)"
+  name: "Yuugen Gaisha Chikyuu Boueitai"
+  saveName: "Yuugen Gaisha Chikyuu Boueitai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193334,7 +203222,8 @@ SLPS-02024:
     multitap: false
     linkCable: false
 SLPS-00956:
-  name: "Yuukyuu Gensoukyoku (Japan)"
+  name: "Yuukyuu Gensoukyoku"
+  saveName: "Yuukyuu Gensoukyoku (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193355,7 +203244,8 @@ SLPS-00956:
     multitap: false
     linkCable: false
 SLPS-00955:
-  name: "Yuukyuu Gensoukyoku (Japan) (Genteiban)"
+  name: "Yuukyuu Gensoukyoku (Genteiban)"
+  saveName: "Yuukyuu Gensoukyoku (Japan) (Genteiban)"
   controllers:
     - DigitalController
   metadata:
@@ -193373,7 +203263,8 @@ SLPS-00955:
     multitap: false
     linkCable: false
 SLPS-01258:
-  name: "Yuukyuu Gensoukyoku 2nd Album (Japan)"
+  name: "Yuukyuu Gensoukyoku 2nd Album"
+  saveName: "Yuukyuu Gensoukyoku 2nd Album (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193394,7 +203285,8 @@ SLPS-01258:
     multitap: false
     linkCable: false
 SLPS-02517:
-  name: "Yuukyuu Gensoukyoku 3 - Perpetual Blue (Japan)"
+  name: "Yuukyuu Gensoukyoku 3 - Perpetual Blue"
+  saveName: "Yuukyuu Gensoukyoku 3 - Perpetual Blue (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193413,7 +203305,8 @@ SLPS-02517:
     multitap: false
     linkCable: false
 SLPS-02329:
-  name: "Yuukyuu Gensoukyoku 3 - Perpetual Blue - Visual Collection (Japan)"
+  name: "Yuukyuu Gensoukyoku 3 - Perpetual Blue - Visual Collection"
+  saveName: "Yuukyuu Gensoukyoku 3 - Perpetual Blue - Visual Collection (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193431,7 +203324,8 @@ SLPS-02329:
     multitap: false
     linkCable: false
 SLPS-01742:
-  name: "Yuukyuu Gensoukyoku Ensemble (Japan)"
+  name: "Yuukyuu Gensoukyoku Ensemble"
+  saveName: "Yuukyuu Gensoukyoku Ensemble (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193452,7 +203346,8 @@ SLPS-01742:
     multitap: false
     linkCable: false
 SLPS-01875:
-  name: "Yuukyuu Gensoukyoku Ensemble 2 (Japan)"
+  name: "Yuukyuu Gensoukyoku Ensemble 2"
+  saveName: "Yuukyuu Gensoukyoku Ensemble 2 (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193473,7 +203368,8 @@ SLPS-01875:
     multitap: false
     linkCable: false
 SLPS-02911:
-  name: "Yuukyuu Kumikyoku - All Star Project (Japan)"
+  name: "Yuukyuu Kumikyoku - All Star Project"
+  saveName: "Yuukyuu Kumikyoku - All Star Project (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193492,7 +203388,8 @@ SLPS-02911:
     multitap: false
     linkCable: false
 SLPS-01928:
-  name: "Yuukyuu no Eden - The Eternal Eden (Japan)"
+  name: "Yuukyuu no Eden - The Eternal Eden"
+  saveName: "Yuukyuu no Eden - The Eternal Eden (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193510,7 +203407,8 @@ SLPS-01928:
     multitap: false
     linkCable: false
 SLPS-02987:
-  name: "Yuukyuu no Eden - The Eternal Eden (Japan) (Rev 1)"
+  name: "Yuukyuu no Eden - The Eternal Eden"
+  saveName: "Yuukyuu no Eden - The Eternal Eden (Japan) (Rev 1)"
   controllers:
     - DigitalController
   metadata:
@@ -193528,7 +203426,8 @@ SLPS-02987:
     multitap: false
     linkCable: false
 SLPS-01980:
-  name: "Yuusha-ou GaoGaiGar - Blockaded Numbers (Japan)"
+  name: "Yuusha-ou GaoGaiGar - Blockaded Numbers"
+  saveName: "Yuusha-ou GaoGaiGar - Blockaded Numbers (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193547,7 +203446,8 @@ SLPS-01980:
     multitap: false
     linkCable: false
 SLPS-01460:
-  name: "Yuuwaku Office Ren'ai-ka (Japan)"
+  name: "Yuuwaku Office Ren'ai-ka"
+  saveName: "Yuuwaku Office Ren'ai-ka (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193568,7 +203468,8 @@ SLPS-01460:
     multitap: false
     linkCable: false
 SLPS-02274:
-  name: "Yuuyami Doori Tankentai (Japan)"
+  name: "Yuuyami Doori Tankentai"
+  saveName: "Yuuyami Doori Tankentai (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193587,11 +203488,13 @@ SLPS-02274:
     multitap: false
     linkCable: false
 SLPM-80444:
-  name: "Yuuyami Doori Tankentai (Japan) (Demo)"
+  name: "Yuuyami Doori Tankentai (Demo)"
+  saveName: "Yuuyami Doori Tankentai (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-00600:
-  name: "Z (Europe)"
+  name: "Z"
+  saveName: "Z (Europe)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -193610,7 +203513,8 @@ SCES-00600:
     multitap: false
     linkCable: false
 SCES-00601:
-  name: "Z (France)"
+  name: "Z"
+  saveName: "Z (France)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -193629,7 +203533,8 @@ SCES-00601:
     multitap: false
     linkCable: false
 SCES-00602:
-  name: "Z (Germany)"
+  name: "Z"
+  saveName: "Z (Germany)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -193648,7 +203553,8 @@ SCES-00602:
     multitap: false
     linkCable: false
 SCES-00603:
-  name: "Z (Italy)"
+  name: "Z"
+  saveName: "Z (Italy)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -193667,7 +203573,8 @@ SCES-00603:
     multitap: false
     linkCable: false
 SCES-00604:
-  name: "Z (Spain)"
+  name: "Z"
+  saveName: "Z (Spain)"
   controllers:
     - DigitalController
     - PlayStationMouse
@@ -193686,7 +203593,8 @@ SCES-00604:
     multitap: false
     linkCable: false
 SLPS-00424:
-  name: "ZXE-D - Legend of Plasmatlite (Japan)"
+  name: "ZXE-D - Legend of Plasmatlite"
+  saveName: "ZXE-D - Legend of Plasmatlite (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193704,7 +203612,8 @@ SLPS-00424:
     multitap: false
     linkCable: false
 SLPS-03354:
-  name: "Zanac x Zanac (Japan)"
+  name: "Zanac x Zanac"
+  saveName: "Zanac x Zanac (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1115-g0b261e8"
@@ -193726,11 +203635,13 @@ SLPS-03354:
     multitap: false
     linkCable: false
 SLPM-80626:
-  name: "Zanac x Zanac (Japan) (Demo)"
+  name: "Zanac x Zanac (Demo)"
+  saveName: "Zanac x Zanac (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-00909:
-  name: "Zap! Snowboarding Trix '98 (Japan)"
+  name: "Zap! Snowboarding Trix '98"
+  saveName: "Zap! Snowboarding Trix '98 (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193748,7 +203659,8 @@ SLPS-00909:
     multitap: false
     linkCable: false
 SLPS-03034:
-  name: "Zap! Snowboarding Trix (Japan) (Fukyuuban 1500)"
+  name: "Zap! Snowboarding Trix (Fukyuuban 1500)"
+  saveName: "Zap! Snowboarding Trix (Japan) (Fukyuuban 1500)"
   controllers:
     - DigitalController
   metadata:
@@ -193766,7 +203678,8 @@ SLPS-03034:
     multitap: false
     linkCable: false
 SLPS-00575:
-  name: "Zeiramzone (Japan)"
+  name: "Zeiramzone"
+  saveName: "Zeiramzone (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -193784,7 +203697,8 @@ SLPS-00575:
     multitap: false
     linkCable: false
 SLPS-00034:
-  name: "Zeitgeist (Japan)"
+  name: "Zeitgeist"
+  saveName: "Zeitgeist (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -193804,7 +203718,8 @@ SLPS-00034:
     multitap: false
     linkCable: false
 SLPS-00219:
-  name: "Zen Nihon GT Senshuken Kai (Japan)"
+  name: "Zen Nihon GT Senshuken Kai"
+  saveName: "Zen Nihon GT Senshuken Kai (Japan)"
   controllers:
     - DigitalController
     - NeGcon
@@ -193823,7 +203738,8 @@ SLPS-00219:
     multitap: false
     linkCable: false
 SLPS-00715:
-  name: "Zen Nihon GT Senshuken Max Rev. (Japan) (Disc 1)"
+  name: "Zen Nihon GT Senshuken Max Rev. (Disc 1)"
+  saveName: "Zen Nihon GT Senshuken Max Rev. (Japan) (Disc 1)"
   discSet:
     name: "Zen Nihon GT Senshuken Max Rev. (Japan)"
     serials:
@@ -193847,7 +203763,8 @@ SLPS-00715:
     multitap: false
     linkCable: false
 SLPS-00716:
-  name: "Zen Nihon GT Senshuken Max Rev. (Japan) (Disc 2)"
+  name: "Zen Nihon GT Senshuken Max Rev. (Disc 2)"
+  saveName: "Zen Nihon GT Senshuken Max Rev. (Japan) (Disc 2)"
   discSet:
     name: "Zen Nihon GT Senshuken Max Rev. (Japan)"
     serials:
@@ -193871,7 +203788,8 @@ SLPS-00716:
     multitap: false
     linkCable: false
 SLPS-01475:
-  name: "Zen Nihon Joshi Pro Wrestling - Joou Densetsu - Yume no Taikousen (Japan)"
+  name: "Zen Nihon Joshi Pro Wrestling - Joou Densetsu - Yume no Taikousen"
+  saveName: "Zen Nihon Joshi Pro Wrestling - Joou Densetsu - Yume no Taikousen (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193890,7 +203808,8 @@ SLPS-01475:
     multitap: false
     linkCable: false
 SLPS-01849:
-  name: "Zen Nihon Pro Wres - Ouja no Tamashii (Japan)"
+  name: "Zen Nihon Pro Wres - Ouja no Tamashii"
+  saveName: "Zen Nihon Pro Wres - Ouja no Tamashii (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193909,7 +203828,8 @@ SLPS-01849:
     multitap: true
     linkCable: false
 SLPS-02934:
-  name: "Zen Nihon Pro Wres - Ouja no Tamashii (Japan) (Spike Library)"
+  name: "Zen Nihon Pro Wres - Ouja no Tamashii (Spike Library)"
+  saveName: "Zen Nihon Pro Wres - Ouja no Tamashii (Japan) (Spike Library)"
   controllers:
     - AnalogController
     - DigitalController
@@ -193931,7 +203851,8 @@ SLPS-02934:
     multitap: true
     linkCable: false
 SLPS-01657:
-  name: "Zen Super Robot Taisen Denshi Daihyakka (Japan) (Disc 1)"
+  name: "Zen Super Robot Taisen Denshi Daihyakka (Disc 1)"
+  saveName: "Zen Super Robot Taisen Denshi Daihyakka (Japan) (Disc 1)"
   discSet:
     name: "Zen Super Robot Taisen Denshi Daihyakka (Japan)"
     serials:
@@ -193954,7 +203875,8 @@ SLPS-01657:
     multitap: false
     linkCable: false
 SLPS-01658:
-  name: "Zen Super Robot Taisen Denshi Daihyakka (Japan) (Disc 2)"
+  name: "Zen Super Robot Taisen Denshi Daihyakka (Disc 2)"
+  saveName: "Zen Super Robot Taisen Denshi Daihyakka (Japan) (Disc 2)"
   discSet:
     name: "Zen Super Robot Taisen Denshi Daihyakka (Japan)"
     serials:
@@ -193977,7 +203899,8 @@ SLPS-01658:
     multitap: false
     linkCable: false
 SLPS-01811:
-  name: "Zen'yasai - Kouyasai Special Preview Disc (Japan) (Demo)"
+  name: "Zen'yasai - Kouyasai Special Preview Disc (Demo)"
+  saveName: "Zen'yasai - Kouyasai Special Preview Disc (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
@@ -193995,7 +203918,8 @@ SLPS-01811:
     multitap: false
     linkCable: false
 SLPS-03167:
-  name: "Zera-chan Puzzle - Pitatto Pair (Japan)"
+  name: "Zera-chan Puzzle - Pitatto Pair"
+  saveName: "Zera-chan Puzzle - Pitatto Pair (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194014,7 +203938,8 @@ SLPS-03167:
     multitap: false
     linkCable: false
 SLES-00159:
-  name: "Zero Divide (Europe)"
+  name: "Zero Divide"
+  saveName: "Zero Divide (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -194032,7 +203957,8 @@ SLES-00159:
     multitap: false
     linkCable: false
 SLPS-00083:
-  name: "Zero Divide (Japan)"
+  name: "Zero Divide"
+  saveName: "Zero Divide (Japan)"
   controllers:
     - DigitalController
   codes:
@@ -194052,7 +203978,8 @@ SLPS-00083:
     multitap: false
     linkCable: false
 SLUS-00183:
-  name: "Zero Divide (USA)"
+  name: "Zero Divide"
+  saveName: "Zero Divide (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -194094,7 +204021,8 @@ SCPS-45079:
     multitap: false
     linkCable: false
 SCES-01094:
-  name: "Zero Divide 2 - The Secret Wish (Europe)"
+  name: "Zero Divide 2 - The Secret Wish"
+  saveName: "Zero Divide 2 - The Secret Wish (Europe)"
   controllers:
     - DigitalController
   metadata:
@@ -194112,7 +204040,8 @@ SCES-01094:
     multitap: false
     linkCable: false
 SCES-01287:
-  name: "Zero Divide 2 - The Secret Wish (France)"
+  name: "Zero Divide 2 - The Secret Wish"
+  saveName: "Zero Divide 2 - The Secret Wish (France)"
   controllers:
     - DigitalController
   metadata:
@@ -194130,7 +204059,8 @@ SCES-01287:
     multitap: false
     linkCable: false
 SCES-01288:
-  name: "Zero Divide 2 - The Secret Wish (Germany)"
+  name: "Zero Divide 2 - The Secret Wish"
+  saveName: "Zero Divide 2 - The Secret Wish (Germany)"
   controllers:
     - DigitalController
   metadata:
@@ -194148,7 +204078,8 @@ SCES-01288:
     multitap: false
     linkCable: false
 SCES-01289:
-  name: "Zero Divide 2 - The Secret Wish (Italy)"
+  name: "Zero Divide 2 - The Secret Wish"
+  saveName: "Zero Divide 2 - The Secret Wish (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -194166,7 +204097,8 @@ SCES-01289:
     multitap: false
     linkCable: false
 SLPS-00891:
-  name: "Zero Divide 2 - The Secret Wish (Japan)"
+  name: "Zero Divide 2 - The Secret Wish"
+  saveName: "Zero Divide 2 - The Secret Wish (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -194184,11 +204116,13 @@ SLPS-00891:
     multitap: false
     linkCable: false
 PCPX-96081:
-  name: "Zero Divide 2 - The Secret Wish (Japan) (Demo)"
+  name: "Zero Divide 2 - The Secret Wish (Demo)"
+  saveName: "Zero Divide 2 - The Secret Wish (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-01290:
-  name: "Zero Divide 2 - The Secret Wish (Spain)"
+  name: "Zero Divide 2 - The Secret Wish"
+  saveName: "Zero Divide 2 - The Secret Wish (Spain)"
   controllers:
     - DigitalController
   metadata:
@@ -194206,7 +204140,8 @@ SCES-01290:
     multitap: false
     linkCable: false
 SCPS-10049:
-  name: "Zero Pilot - Gin'yoku no Senshi (Japan)"
+  name: "Zero Pilot - Gin'yoku no Senshi"
+  saveName: "Zero Pilot - Gin'yoku no Senshi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194225,7 +204160,8 @@ SCPS-10049:
     multitap: false
     linkCable: true
 SCPS-91127:
-  name: "Zero Pilot - Gin'yoku no Senshi (Japan) (Rev 1)"
+  name: "Zero Pilot - Gin'yoku no Senshi"
+  saveName: "Zero Pilot - Gin'yoku no Senshi (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194244,7 +204180,8 @@ SCPS-91127:
     multitap: false
     linkCable: true
 SLPS-00755:
-  name: "Zero4 Champ DooZy-J (Japan)"
+  name: "Zero4 Champ DooZy-J"
+  saveName: "Zero4 Champ DooZy-J (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -194262,7 +204199,8 @@ SLPS-00755:
     multitap: false
     linkCable: false
 SLPS-01666:
-  name: "Zeus - Carnage Heart Second (Japan)"
+  name: "Zeus - Carnage Heart Second"
+  saveName: "Zeus - Carnage Heart Second (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194281,11 +204219,13 @@ SLPS-01666:
     multitap: false
     linkCable: false
 SLPM-80335:
-  name: "Zeus - Carnage Heart Second (Japan) (Demo)"
+  name: "Zeus - Carnage Heart Second (Demo)"
+  saveName: "Zeus - Carnage Heart Second (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPS-02318:
-  name: "Zeus II - Carnage Heart (Japan)"
+  name: "Zeus II - Carnage Heart"
+  saveName: "Zeus II - Carnage Heart (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194304,7 +204244,8 @@ SLPS-02318:
     multitap: false
     linkCable: false
 SLPS-01483:
-  name: "ZigZagBall (Japan)"
+  name: "ZigZagBall"
+  saveName: "ZigZagBall (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194323,7 +204264,8 @@ SLPS-01483:
     multitap: true
     linkCable: false
 SLPM-86311:
-  name: "Zill O'll (Japan)"
+  name: "Zill O'll"
+  saveName: "Zill O'll (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194342,7 +204284,8 @@ SLPM-86311:
     multitap: false
     linkCable: false
 SLPM-86703:
-  name: "Zill O'll (Japan) (Rev 1)"
+  name: "Zill O'll"
+  saveName: "Zill O'll (Japan) (Rev 1)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194361,7 +204304,8 @@ SLPM-86703:
     multitap: false
     linkCable: false
 SLPS-02244:
-  name: "Zipangu - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
+  name: "Zipangu - Unmei wa Saikoro ga Kimeru! (Demo)"
+  saveName: "Zipangu - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194380,7 +204324,8 @@ SLPS-02244:
     multitap: false
     linkCable: false
 SLPS-02260:
-  name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan)"
+  name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru!"
+  saveName: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194399,11 +204344,13 @@ SLPS-02260:
     multitap: true
     linkCable: false
 SLPM-80488:
-  name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
+  name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Demo)"
+  saveName: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-86643:
-  name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan) (Major Wave)"
+  name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Major Wave)"
+  saveName: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan) (Major Wave)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194422,7 +204369,8 @@ SLPM-86643:
     multitap: true
     linkCable: false
 SLUS-01401:
-  name: "Zoboomafoo - Leapin' Lemurs! (USA)"
+  name: "Zoboomafoo - Leapin' Lemurs!"
+  saveName: "Zoboomafoo - Leapin' Lemurs! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -194444,7 +204392,8 @@ SLUS-01401:
     multitap: false
     linkCable: false
 SLPS-03255:
-  name: "Zoids - Battle Card Game - Seihou Tairiku Senki (Japan)"
+  name: "Zoids - Battle Card Game - Seihou Tairiku Senki"
+  saveName: "Zoids - Battle Card Game - Seihou Tairiku Senki (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194463,7 +204412,8 @@ SLPS-03255:
     multitap: false
     linkCable: false
 SLPS-02982:
-  name: "Zoids - Teikoku vs Kyouwakoku - Meka Seitai no Idenshi (Japan)"
+  name: "Zoids - Teikoku vs Kyouwakoku - Meka Seitai no Idenshi"
+  saveName: "Zoids - Teikoku vs Kyouwakoku - Meka Seitai no Idenshi (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194482,7 +204432,8 @@ SLPS-02982:
     multitap: false
     linkCable: false
 SLPS-03389:
-  name: "Zoids 2 - Heric Kyouwakoku vs. Guylos Teikoku (Japan)"
+  name: "Zoids 2 - Heric Kyouwakoku vs. Guylos Teikoku"
+  saveName: "Zoids 2 - Heric Kyouwakoku vs. Guylos Teikoku (Japan)"
   controllers:
     - AnalogController
     - DigitalController
@@ -194501,7 +204452,8 @@ SLPS-03389:
     multitap: false
     linkCable: false
 SLPS-00488:
-  name: "Zoku Gussun Oyoyo (Japan)"
+  name: "Zoku Gussun Oyoyo"
+  saveName: "Zoku Gussun Oyoyo (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -194519,7 +204471,8 @@ SLPS-00488:
     multitap: false
     linkCable: false
 SLPS-01326:
-  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 1)"
+  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Disc 1)"
+  saveName: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 1)"
   discSet:
     name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan)"
     serials:
@@ -194545,7 +204498,8 @@ SLPS-01326:
     multitap: false
     linkCable: false
 SLPS-01327:
-  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 2)"
+  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Disc 2)"
+  saveName: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 2)"
   discSet:
     name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan)"
     serials:
@@ -194571,7 +204525,8 @@ SLPS-01327:
     multitap: false
     linkCable: false
 SLPS-01328:
-  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 3)"
+  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Disc 3)"
+  saveName: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 3)"
   discSet:
     name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan)"
     serials:
@@ -194597,7 +204552,8 @@ SLPS-01328:
     multitap: false
     linkCable: false
 SLPS-01329:
-  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 4)"
+  name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Disc 4)"
+  saveName: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan) (Disc 4)"
   discSet:
     name: "Zoku Hatsukoi Monogatari - Shuugaku Ryokou (Japan)"
     serials:
@@ -194623,7 +204579,8 @@ SLPS-01329:
     multitap: false
     linkCable: false
 SLPS-02266:
-  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 1)"
+  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Disc 1)"
+  saveName: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 1)"
   discSet:
     name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan)"
     serials:
@@ -194651,7 +204608,8 @@ SLPS-02266:
     multitap: false
     linkCable: false
 SLPS-02267:
-  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 2)"
+  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Disc 2)"
+  saveName: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 2)"
   discSet:
     name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan)"
     serials:
@@ -194677,7 +204635,8 @@ SLPS-02267:
     multitap: false
     linkCable: false
 SLPS-02268:
-  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 3)"
+  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Disc 3)"
+  saveName: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 3)"
   discSet:
     name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan)"
     serials:
@@ -194703,7 +204662,8 @@ SLPS-02268:
     multitap: false
     linkCable: false
 SLPS-02269:
-  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 4)"
+  name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Disc 4)"
+  saveName: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan) (Disc 4)"
   discSet:
     name: "Zoku Mikagura Shoujo Tanteidan - Kanketsuhen (Japan)"
     serials:
@@ -194753,7 +204713,8 @@ SLPS-02927:
     multitap: false
     linkCable: false
 SLPS-00534:
-  name: "Zoop (Japan)"
+  name: "Zoop"
+  saveName: "Zoop (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -194774,7 +204735,8 @@ SLPS-00534:
     multitap: false
     linkCable: false
 SLUS-00078:
-  name: "Zoop - America's Largest Killer of Time! (USA)"
+  name: "Zoop - America's Largest Killer of Time!"
+  saveName: "Zoop - America's Largest Killer of Time! (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-884-g096ed21"
@@ -194795,7 +204757,8 @@ SLUS-00078:
     multitap: false
     linkCable: false
 SLPS-00271:
-  name: "Zork I - The Great Underground Empire (Japan)"
+  name: "Zork I - The Great Underground Empire"
+  saveName: "Zork I - The Great Underground Empire (Japan)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -194816,7 +204779,8 @@ SLPS-00271:
     multitap: false
     linkCable: false
 SLPS-01238:
-  name: "Zutto Issho - With Me Everytime... (Japan)"
+  name: "Zutto Issho - With Me Everytime..."
+  saveName: "Zutto Issho - With Me Everytime... (Japan)"
   controllers:
     - DigitalController
   metadata:
@@ -194834,7 +204798,8 @@ SLPS-01238:
     multitap: false
     linkCable: false
 SLPM-86523:
-  name: "Zutto Issho - With Me Everytime... (Japan) (Major Wave)"
+  name: "Zutto Issho - With Me Everytime... (Major Wave)"
+  saveName: "Zutto Issho - With Me Everytime... (Japan) (Major Wave)"
   controllers:
     - DigitalController
   metadata:
@@ -194852,108 +204817,137 @@ SLPM-86523:
     multitap: false
     linkCable: false
 SLUS-0009:
-  name: "Defcon 5 - Peace Has a Price... (USA)"
+  name: "Defcon 5 - Peace Has a Price..."
+  saveName: "Defcon 5 - Peace Has a Price... (USA)"
 SCPS-91312:
-  name: "PoPoRoGue (Japan) (Rev 1)"
+  name: "PoPoRoGue"
+  saveName: "PoPoRoGue (Japan) (Rev 1)"
 SCUS-01232:
-  name: "MTV Sports - Skateboarding featuring Andy Macdonald (USA)"
+  name: "MTV Sports - Skateboarding featuring Andy Macdonald"
+  saveName: "MTV Sports - Skateboarding featuring Andy Macdonald (USA)"
 PCPX-96033:
-  name: "Total NBA '96 (Japan) (Demo)"
+  name: "Total NBA '96 (Demo)"
+  saveName: "Total NBA '96 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80548:
-  name: "Puzz Loop (Japan) (Demo)"
+  name: "Puzz Loop (Demo)"
+  saveName: "Puzz Loop (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80226:
-  name: "NBA Live 98 (Japan) (Demo)"
+  name: "NBA Live 98 (Demo)"
+  saveName: "NBA Live 98 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80436:
-  name: "Grandia - Prelude (Japan) (Demo 2)"
+  name: "Grandia - Prelude (Demo 2)"
+  saveName: "Grandia - Prelude (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 PAPX-90100:
-  name: "PokeTan (Japan) (Demo 1)"
+  name: "PokeTan (Demo 1)"
+  saveName: "PokeTan (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80500:
-  name: "V-Rally - Championship Edition 2 (Japan) (Demo)"
+  name: "V-Rally - Championship Edition 2 (Demo)"
+  saveName: "V-Rally - Championship Edition 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80003:
-  name: "Nise Flopon-kun P! Famitsuu Nottori Version (Japan)"
+  name: "Nise Flopon-kun P! Famitsuu Nottori Version"
+  saveName: "Nise Flopon-kun P! Famitsuu Nottori Version (Japan)"
 PCPX-96155:
-  name: "MiruMiru PlayStation Vol. 34 (Japan)"
+  name: "MiruMiru PlayStation Vol. 34"
+  saveName: "MiruMiru PlayStation Vol. 34 (Japan)"
 SLPM-80347:
-  name: "Gensou Suikoden II (Japan) (Demo 2)"
+  name: "Gensou Suikoden II (Demo 2)"
+  saveName: "Gensou Suikoden II (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLPM-80323:
-  name: "Ridegear Guybrave II (Japan) (Demo)"
+  name: "Ridegear Guybrave II (Demo)"
+  saveName: "Ridegear Guybrave II (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80491:
-  name: "Pac-Man World - 20th Anniversary (Japan) (Demo)"
+  name: "Pac-Man World - 20th Anniversary (Demo)"
+  saveName: "Pac-Man World - 20th Anniversary (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96193:
-  name: "Beat Planet Music (Japan) (Demo)"
+  name: "Beat Planet Music (Demo)"
+  saveName: "Beat Planet Music (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96188:
-  name: "Toro Channel - Zoukangou nano nya! SCEI Nenmatsu Shinsaku Soft Information Movie Disc (Japan)"
+  name: "Toro Channel - Zoukangou nano nya! SCEI Nenmatsu Shinsaku Soft Information Movie Disc"
+  saveName: "Toro Channel - Zoukangou nano nya! SCEI Nenmatsu Shinsaku Soft Information Movie Disc (Japan)"
 SLPM-80492:
-  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Demo)"
+  name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Demo)"
+  saveName: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80428:
-  name: "Remote Control Dandy (Japan) (Demo 1)"
+  name: "Remote Control Dandy (Demo 1)"
+  saveName: "Remote Control Dandy (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PCPX-96129:
-  name: "Navit (Japan) (Demo)"
+  name: "Navit (Demo)"
+  saveName: "Navit (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80419:
-  name: "Lunar 2 - Eternal Blue (Japan) (Demo)"
+  name: "Lunar 2 - Eternal Blue (Demo)"
+  saveName: "Lunar 2 - Eternal Blue (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96184:
-  name: "Legend of Dragoon, The (Japan) (Demo 2)"
+  name: "Legend of Dragoon, The (Demo 2)"
+  saveName: "Legend of Dragoon, The (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen
     - DisableTextureFiltering
 SLPM-80441:
-  name: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Demo)"
+  name: "Maria 2 - Jutai Kokuchi no Nazo (Demo)"
+  saveName: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90098:
-  name: "Robbit mon Dieu (Japan) (Demo)"
+  name: "Robbit mon Dieu (Demo)"
+  saveName: "Robbit mon Dieu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80564:
-  name: "F1 2000 (Japan) (Demo)"
+  name: "F1 2000 (Demo)"
+  saveName: "F1 2000 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80034:
-  name: "CyberSpeed (Japan) (Demo)"
+  name: "CyberSpeed (Demo)"
+  saveName: "CyberSpeed (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80254:
-  name: "Metal Gear Solid (Japan) (Demo 1)"
+  name: "Metal Gear Solid (Demo 1)"
+  saveName: "Metal Gear Solid (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 PCPX-96096:
-  name: "Gran Turismo (Japan) (Demo 2)"
+  name: "Gran Turismo (Demo 2)"
+  saveName: "Gran Turismo (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLED-02415:
-  name: "Compilation 02 (Australia)"
+  name: "Compilation 02"
+  saveName: "Compilation 02 (Australia)"
 SLES-00687:
-  name: "Perfect Weapon (Italy)"
+  name: "Perfect Weapon"
+  saveName: "Perfect Weapon (Italy)"
   controllers:
     - DigitalController
   metadata:
@@ -194971,327 +204965,413 @@ SLES-00687:
     multitap: false
     linkCable: false
 SLED-01533:
-  name: "Assault (Europe) (En,Fr,De,Es,It) (Demo)"
+  name: "Assault (Demo)"
+  saveName: "Assault (Europe) (En,Fr,De,Es,It) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-01342:
-  name: "Heart of Darkness (Europe) (Demo)"
+  name: "Heart of Darkness (Demo)"
+  saveName: "Heart of Darkness (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80570:
-  name: "Exciting Pro Wres (Japan) (Demo)"
+  name: "Exciting Pro Wres (Demo)"
+  saveName: "Exciting Pro Wres (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80137:
-  name: "Farland Story - Yottsu no Fuuin (Japan) (Demo)"
+  name: "Farland Story - Yottsu no Fuuin (Demo)"
+  saveName: "Farland Story - Yottsu no Fuuin (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCES-03031:
-  name: "Livro da Selva, O - Uma Festa Divertida (Portugal)"
+  name: "Livro da Selva, O - Uma Festa Divertida"
+  saveName: "Livro da Selva, O - Uma Festa Divertida (Portugal)"
 SLPM-80054:
-  name: "Darius Gaiden (Japan) (Demo)"
+  name: "Darius Gaiden (Demo)"
+  saveName: "Darius Gaiden (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80571:
-  name: "Power Shovel ni Norou!! (Japan) (Demo)"
+  name: "Power Shovel ni Norou!! (Demo)"
+  saveName: "Power Shovel ni Norou!! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80229:
-  name: "Utchan Nanchan no Honoo no Challenger - Denryuu Iraira-bou Returns (Japan) (Demo)"
+  name: "Utchan Nanchan no Honoo no Challenger - Denryuu Iraira-bou Returns (Demo)"
+  saveName: "Utchan Nanchan no Honoo no Challenger - Denryuu Iraira-bou Returns (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80242:
-  name: "King of Fighters '97, The (Japan) (Demo)"
+  name: "King of Fighters '97, The (Demo)"
+  saveName: "King of Fighters '97, The (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96035:
-  name: "Tobal No. 1 (Japan) (Demo)"
+  name: "Tobal No. 1 (Demo)"
+  saveName: "Tobal No. 1 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80057:
-  name: "Vandal Hearts - Ushinawareta Kodai Bunmei (Japan) (Demo)"
+  name: "Vandal Hearts - Ushinawareta Kodai Bunmei (Demo)"
+  saveName: "Vandal Hearts - Ushinawareta Kodai Bunmei (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCED-03927:
-  name: "Erlebe den Zauber von Disney auf der PlayStation (Germany)"
+  name: "Erlebe den Zauber von Disney auf der PlayStation"
+  saveName: "Erlebe den Zauber von Disney auf der PlayStation (Germany)"
 PCPX-96083:
-  name: "Linda^3 Again (Japan) (Demo)"
+  name: "Linda^3 Again (Demo)"
+  saveName: "Linda^3 Again (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96130:
-  name: "Legaia Densetsu (Japan) (Demo 1)"
+  name: "Legaia Densetsu (Demo 1)"
+  saveName: "Legaia Densetsu (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80047:
-  name: "Kowloon's Gate (Japan) (Demo)"
+  name: "Kowloon's Gate (Demo)"
+  saveName: "Kowloon's Gate (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80091:
-  name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Demo)"
+  name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Demo)"
+  saveName: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80097:
-  name: "Formula Circus (Japan) (Demo)"
+  name: "Formula Circus (Demo)"
+  saveName: "Formula Circus (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80135:
-  name: "Robo-Pit 2 (Japan) (Demo 2)"
+  name: "Robo-Pit 2 (Demo 2)"
+  saveName: "Robo-Pit 2 (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLPM-80213:
-  name: "Choro Q 3 (Japan) (Demo)"
+  name: "Choro Q 3 (Demo)"
+  saveName: "Choro Q 3 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80220:
-  name: "Toshiba Emi Egg & Zutto Issho Demo Disc (Japan)"
+  name: "Toshiba Emi Egg & Zutto Issho Demo Disc"
+  saveName: "Toshiba Emi Egg & Zutto Issho Demo Disc (Japan)"
   metadata:
     genre: "** DEMO **"
 SLPM-80244:
-  name: "Hello Kitty no Cube de Cute (Japan) (Demo)"
+  name: "Hello Kitty no Cube de Cute (Demo)"
+  saveName: "Hello Kitty no Cube de Cute (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80252:
-  name: "Hit Back (Japan) (Demo)"
+  name: "Hit Back (Demo)"
+  saveName: "Hit Back (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80301:
-  name: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai (Japan) (Demo)"
+  name: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai (Demo)"
+  saveName: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80353:
-  name: "Lunatic Dawn III & Susume! Kaizoku Promotion Disc (Japan)"
+  name: "Lunatic Dawn III & Susume! Kaizoku Promotion Disc"
+  saveName: "Lunatic Dawn III & Susume! Kaizoku Promotion Disc (Japan)"
 SLPM-80368:
-  name: "Next Tetris, The (Japan) (Demo)"
+  name: "Next Tetris, The (Demo)"
+  saveName: "Next Tetris, The (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80528:
-  name: "Hexamoon Guardians (Japan) (Demo)"
+  name: "Hexamoon Guardians (Demo)"
+  saveName: "Hexamoon Guardians (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80565:
-  name: "Suzuki Bakuhatsu (Japan) (Demo)"
+  name: "Suzuki Bakuhatsu (Demo)"
+  saveName: "Suzuki Bakuhatsu (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80575:
-  name: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen (Japan) (Demo)"
+  name: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen (Demo)"
+  saveName: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80613:
-  name: "Yakiniku Action Game - Yakiniku Bugyou (Japan) (Demo)"
+  name: "Yakiniku Action Game - Yakiniku Bugyou (Demo)"
+  saveName: "Yakiniku Action Game - Yakiniku Bugyou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80631:
-  name: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Japan) (Demo)"
+  name: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Demo)"
+  saveName: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80270:
-  name: "OverBlood 2 - The East Edge File (Japan)"
+  name: "OverBlood 2 - The East Edge File"
+  saveName: "OverBlood 2 - The East Edge File (Japan)"
 SLES-03609:
-  name: "Worms World Party (Europe) (En,Fr,De,Es,It,Nl,Sv,Da) (Beta)"
+  name: "Worms World Party (Beta)"
+  saveName: "Worms World Party (Europe) (En,Fr,De,Es,It,Nl,Sv,Da) (Beta)"
 SCED-04013:
-  name: "Gratis! Demo Disc! (Spain)"
+  name: "Gratis! Demo Disc!"
+  saveName: "Gratis! Demo Disc! (Spain)"
   metadata:
     genre: "** DEMO **"
 SLED-01650:
-  name: "Music - Music Creation for the PlayStation (Europe) (En,Fr,De) (Demo)"
+  name: "Music - Music Creation for the PlayStation (Demo)"
+  saveName: "Music - Music Creation for the PlayStation (Europe) (En,Fr,De) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96160:
-  name: "Ore no Shikabane o Koete Yuke (Japan) (Demo)"
+  name: "Ore no Shikabane o Koete Yuke (Demo)"
+  saveName: "Ore no Shikabane o Koete Yuke (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90086:
-  name: "Doko Demo Issho (Japan) (Demo 2)"
+  name: "Doko Demo Issho (Demo 2)"
+  saveName: "Doko Demo Issho (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 PCPX-96053:
-  name: "MiruMiru PlayStation Vol. 4 (Japan) (Disc 3)"
+  name: "MiruMiru PlayStation Vol. 4 (Disc 3)"
+  saveName: "MiruMiru PlayStation Vol. 4 (Japan) (Disc 3)"
 SLPM-80563:
-  name: "RC de Go! (Japan) (Demo)"
+  name: "RC de Go! (Demo)"
+  saveName: "RC de Go! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80408:
-  name: "Kagayaku Kisetsu e (Japan) (Demo)"
+  name: "Kagayaku Kisetsu e (Demo)"
+  saveName: "Kagayaku Kisetsu e (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96192:
-  name: "MiruMiru PlayStation Vol. 42 (Japan)"
+  name: "MiruMiru PlayStation Vol. 42"
+  saveName: "MiruMiru PlayStation Vol. 42 (Japan)"
 SLPM-80541:
-  name: "RayCrisis (Japan) (Demo)"
+  name: "RayCrisis (Demo)"
+  saveName: "RayCrisis (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-84003:
-  name: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! Waku Waku-shou (Japan) (Demo)"
+  name: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! Waku Waku-shou (Demo)"
+  saveName: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! Waku Waku-shou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-02138:
-  name: "Play Power 5 (Spain)"
+  name: "Play Power 5"
+  saveName: "Play Power 5 (Spain)"
 SLPM-80203:
-  name: "Option - Tuning Car Battle (Japan) (Demo 1)"
+  name: "Option - Tuning Car Battle (Demo 1)"
+  saveName: "Option - Tuning Car Battle (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80206:
-  name: "Option - Tuning Car Battle (Japan) (Demo 2)"
+  name: "Option - Tuning Car Battle (Demo 2)"
+  saveName: "Option - Tuning Car Battle (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLPM-80148:
-  name: "Sony Music Entertainment - PlayStation Title Digest (Japan)"
+  name: "Sony Music Entertainment - PlayStation Title Digest"
+  saveName: "Sony Music Entertainment - PlayStation Title Digest (Japan)"
 SLPM-80391:
-  name: "Cinema Eikaiwa Series - Tengoku ni Ikenai Papa (Japan) (Demo)"
+  name: "Cinema Eikaiwa Series - Tengoku ni Ikenai Papa (Demo)"
+  saveName: "Cinema Eikaiwa Series - Tengoku ni Ikenai Papa (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80345:
-  name: "Cool Boarders 3 (Japan) (Demo)"
+  name: "Cool Boarders 3 (Demo)"
+  saveName: "Cool Boarders 3 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96180:
-  name: "Pet in TV - With My Dear Dog (Japan) (Demo)"
+  name: "Pet in TV - With My Dear Dog (Demo)"
+  saveName: "Pet in TV - With My Dear Dog (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80616:
-  name: "Yamasa Digi World - Tetra Master (Japan) (Demo)"
+  name: "Yamasa Digi World - Tetra Master (Demo)"
+  saveName: "Yamasa Digi World - Tetra Master (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90093:
-  name: "Arc the Lad III (Japan) (Demo 1)"
+  name: "Arc the Lad III (Demo 1)"
+  saveName: "Arc the Lad III (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SCED-04012:
-  name: "Free Spin Demo Disc! Voellig Gratis Demo Disc! (Germany)"
+  name: "Free Spin Demo Disc! Voellig Gratis Demo Disc!"
+  saveName: "Free Spin Demo Disc! Voellig Gratis Demo Disc! (Germany)"
   metadata:
     genre: "** DEMO **"
 PAPX-90073:
-  name: "Circadia (Japan) (Demo 2)"
+  name: "Circadia (Demo 2)"
+  saveName: "Circadia (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SLPM-80043:
-  name: "Street Fighter Zero 2 (Japan) (Demo)"
+  name: "Street Fighter Zero 2 (Demo)"
+  saveName: "Street Fighter Zero 2 (Japan) (Demo)"
   controllers:
     - DigitalController
   metadata:
     genre: "** DEMO **"
 SLED-02048:
-  name: "Star Wars - Episodio I - La Amenaza Fantasma (Spain) (Demo)"
+  name: "Star Wars - Episodio I - La Amenaza Fantasma (Demo)"
+  saveName: "Star Wars - Episodio I - La Amenaza Fantasma (Spain) (Demo)"
   metadata:
     genre: "** DEMO **"
 SCPM-85005:
-  name: "Arc the Lad II - Characters & World CG Movie Collection (Japan)"
+  name: "Arc the Lad II - Characters & World CG Movie Collection"
+  saveName: "Arc the Lad II - Characters & World CG Movie Collection (Japan)"
 SLED-02741:
-  name: "WWF SmackDown! (Europe) (Demo)"
+  name: "WWF SmackDown! (Demo)"
+  saveName: "WWF SmackDown! (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80561:
-  name: "Macross Plus - Game Edition (Japan) (Demo)"
+  name: "Macross Plus - Game Edition (Demo)"
+  saveName: "Macross Plus - Game Edition (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80210:
-  name: "Gundam the Battle Master 2 (Japan) (Demo)"
+  name: "Gundam the Battle Master 2 (Demo)"
+  saveName: "Gundam the Battle Master 2 (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80107:
-  name: "Gundam the Battle Master (Japan) (Demo 2)"
+  name: "Gundam the Battle Master (Demo 2)"
+  saveName: "Gundam the Battle Master (Japan) (Demo 2)"
   metadata:
     genre: "** DEMO **"
 SCPS-46001:
-  name: "R4 - Ridge Racer Type 4 (Korea)"
+  name: "R4 - Ridge Racer Type 4"
+  saveName: "R4 - Ridge Racer Type 4 (Korea)"
 SLPM-80328:
-  name: "End Sector (Japan) (Demo)"
+  name: "End Sector (Demo)"
+  saveName: "End Sector (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-01271:
-  name: "WCW Nitro (Europe) (Demo)"
+  name: "WCW Nitro (Demo)"
+  saveName: "WCW Nitro (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-02046:
-  name: "Star Wars - Episode I - Die Dunkle Bedrohung (Germany) (Demo)"
+  name: "Star Wars - Episode I - Die Dunkle Bedrohung (Demo)"
+  saveName: "Star Wars - Episode I - Die Dunkle Bedrohung (Germany) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-02276:
-  name: "Wu-Tang - Taste the Pain (UK) (Demo)"
+  name: "Wu-Tang - Taste the Pain (Demo)"
+  saveName: "Wu-Tang - Taste the Pain (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90088:
-  name: "Back to School Special - PlayStation Demo Disc (Asia)"
+  name: "Back to School Special - PlayStation Demo Disc"
+  saveName: "Back to School Special - PlayStation Demo Disc (Asia)"
   metadata:
     genre: "** DEMO **"
 PCPX-96150:
-  name: "Um Jammer Lammy (Japan) (Demo)"
+  name: "Um Jammer Lammy (Demo)"
+  saveName: "Um Jammer Lammy (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80405:
-  name: "Lord of Fist (Japan) (Demo)"
+  name: "Lord of Fist (Demo)"
+  saveName: "Lord of Fist (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80466:
-  name: "Zipangu - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
+  name: "Zipangu - Unmei wa Saikoro ga Kimeru! (Demo)"
+  saveName: "Zipangu - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80493:
-  name: "Jojo no Kimyou na Bouken (Japan) (Demo)"
+  name: "Jojo no Kimyou na Bouken (Demo)"
+  saveName: "Jojo no Kimyou na Bouken (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80566:
-  name: "Menkyo o Torou (Japan) (Demo)"
+  name: "Menkyo o Torou (Demo)"
+  saveName: "Menkyo o Torou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80178:
-  name: "Thoroughbred Breeder - Sekai Seiha-hen (Japan) (Demo 1)"
+  name: "Thoroughbred Breeder - Sekai Seiha-hen (Demo 1)"
+  saveName: "Thoroughbred Breeder - Sekai Seiha-hen (Japan) (Demo 1)"
   metadata:
     genre: "** DEMO **"
 SLPM-80008:
-  name: "Zero Divide (Japan) (Demo)"
+  name: "Zero Divide (Demo)"
+  saveName: "Zero Divide (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80074:
-  name: "Ninja Jajamaru-kun - Onigiri Ninpouchou (Japan) (Demo)"
+  name: "Ninja Jajamaru-kun - Onigiri Ninpouchou (Demo)"
+  saveName: "Ninja Jajamaru-kun - Onigiri Ninpouchou (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96153:
-  name: "Tamago de Puzzle (Japan) (Demo)"
+  name: "Tamago de Puzzle (Demo)"
+  saveName: "Tamago de Puzzle (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-01755:
-  name: "Nickelodeon Rugrats - Search for Reptar (Europe) (Demo)"
+  name: "Nickelodeon Rugrats - Search for Reptar (Demo)"
+  saveName: "Nickelodeon Rugrats - Search for Reptar (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-00179:
-  name: "Adidas Power Soccer 2 (Europe) (Demo)"
+  name: "Adidas Power Soccer 2 (Demo)"
+  saveName: "Adidas Power Soccer 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLES-00066:
-  name: "Adidas Power Soccer (UK) (Demo)"
+  name: "Adidas Power Soccer (Demo)"
+  saveName: "Adidas Power Soccer (UK) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLED-00406:
-  name: "Resident Evil (France) (Demo)"
+  name: "Resident Evil (Demo)"
+  saveName: "Resident Evil (France) (Demo)"
   metadata:
     genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLPM-80241:
-  name: "Frogger (Japan) (Demo)"
+  name: "Frogger (Demo)"
+  saveName: "Frogger (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80191:
-  name: "V-Rally - Championship Edition (Japan) (Demo)"
+  name: "V-Rally - Championship Edition (Demo)"
+  saveName: "V-Rally - Championship Edition (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PCPX-96154:
-  name: "Sony Computer Entertainment Inc. Monthly Software Information - 6-gatsu Hatsubai Yotei Title (Japan)"
+  name: "Sony Computer Entertainment Inc. Monthly Software Information - 6-gatsu Hatsubai Yotei Title"
+  saveName: "Sony Computer Entertainment Inc. Monthly Software Information - 6-gatsu Hatsubai Yotei Title (Japan)"
 SLPM-80245:
-  name: "King of Fighters Kyou, The (Japan) (Demo)"
+  name: "King of Fighters Kyou, The (Demo)"
+  saveName: "King of Fighters Kyou, The (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80459:
-  name: "Umi no Nushi-tsuri - Takarajima ni Mukatte (Japan) (Demo)"
+  name: "Umi no Nushi-tsuri - Takarajima ni Mukatte (Demo)"
+  saveName: "Umi no Nushi-tsuri - Takarajima ni Mukatte (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 PAPX-90089:
-  name: "Ore no Ryouri (Japan) (Demo)"
+  name: "Ore no Ryouri (Demo)"
+  saveName: "Ore no Ryouri (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80638:
-  name: "Inuyasha - Sengoku Otogi Gassen (Japan) (Demo)"
+  name: "Inuyasha - Sengoku Otogi Gassen (Demo)"
+  saveName: "Inuyasha - Sengoku Otogi Gassen (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 NYMC-02020: