diff --git a/data/resources/discdb.yaml b/data/resources/discdb.yaml
index 07a73a357..519989b1c 100644
--- a/data/resources/discdb.yaml
+++ b/data/resources/discdb.yaml
@@ -67487,13 +67487,13 @@ PAPX-90044:
         - size: 331662576
           md5: "de973cbfc9516106adac69984041f7be"
 SCPS-45317:
-  name: "Metal Gear Solid (Asia) (Disc 1)"
+  name: "Metal Gear Solid (Japan, Asia) (Disc 1) (Ichi) (Premium Package)"
   trackData:
     - tracks:
         - size: 710005296
           md5: "d3b48095ed5d2a81a51d2b8ccd2ef766"
 SCPS-45318:
-  name: "Metal Gear Solid (Asia) (Disc 2)"
+  name: "Metal Gear Solid (Japan, Asia) (Disc 2) (Ni) (Premium Package)"
   trackData:
     - tracks:
         - size: 735526848
@@ -67658,18 +67658,6 @@ SLUS-90062:
     - tracks:
         - size: 123924528
           md5: "794c18d04a31d1e7c5b39bbe4d088afa"
-SLPM-86111:
-  name: "Metal Gear Solid [Premium Package Sai Hakkou Kinen]"
-  trackData:
-    - tracks:
-        - size: 710005296
-          md5: "d3b48095ed5d2a81a51d2b8ccd2ef766"
-    - tracks:
-        - size: 735526848
-          md5: "7c43ca912cdbde3f0e23d90f2a799ffa"
-    - tracks:
-        - size: 225474480
-          md5: "c55b7888dee7b6c471d25a0000c4dc32"
 SLPS-00008:
   name: "Metal Jacket (Japan)"
   trackData:
diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index 6c41a2b4a..e6fd3c763 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -99027,9 +99027,9 @@ PAPX-90044:
   traits:
     - ForcePGXPCPUMode
 SCPS-45317:
-  name: "Metal Gear Solid (Asia) (Disc 1)"
+  name: "Metal Gear Solid (Japan, Asia) (Disc 1) (Ichi) (Premium Package)"
   discSet:
-    name: "Metal Gear Solid (Asia)"
+    name: "Metal Gear Solid (Japan, Asia) (Premium Package)"
     serials:
       - SCPS-45317
       - SCPS-45318
@@ -99038,6 +99038,9 @@ SCPS-45317:
     - DigitalController
   traits:
     - ForcePGXPCPUMode
+  codes:
+    - SCPS-45317
+    - SLPM-86111
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -99053,9 +99056,9 @@ SCPS-45317:
     multitap: false
     linkCable: false
 SCPS-45318:
-  name: "Metal Gear Solid (Asia) (Disc 2)"
+  name: "Metal Gear Solid (Japan, Asia) (Disc 2) (Ni) (Premium Package)"
   discSet:
-    name: "Metal Gear Solid (Asia)"
+    name: "Metal Gear Solid (Japan, Asia) (Premium Package)"
     serials:
       - SCPS-45317
       - SCPS-45318
@@ -99064,6 +99067,9 @@ SCPS-45318:
     - DigitalController
   traits:
     - ForcePGXPCPUMode
+  codes:
+    - SCPS-45318
+    - SLPM-86112
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -99714,34 +99720,6 @@ SLPM-87030:
     vibration: true
     multitap: false
     linkCable: false
-SLPM-86111:
-  name: "Metal Gear Solid [Premium Package Sai Hakkou Kinen]"
-  compatibility:
-    rating: NoIssues
-    versionTested: "0.1-905-g237f469"
-  controllers:
-    - AnalogController
-    - DigitalController
-  traits:
-    - ForcePGXPCPUMode
-  codes:
-    - SLPM-86111
-    - SLPM-86112
-    - SLPM-86113
-  metadata:
-    publisher: "Konami"
-    developer: "KCE Japan"
-    releaseDate: "1998-09-03"
-    genre: "Action / Adventure / Strategy / Shooter"
-    languages:
-      - Japanese
-    minPlayers: 1
-    maxPlayers: 1
-    minBlocks: 1
-    maxBlocks: 1
-    vibration: true
-    multitap: false
-    linkCable: false
 SLPS-00008:
   name: "Metal Jacket (Japan)"
   controllers: