diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp
index 339abab619..01c0149fce 100644
--- a/Source/Core/DiscIO/Enums.cpp
+++ b/Source/Core/DiscIO/Enums.cpp
@@ -410,20 +410,20 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"01", "Nintendo"},
       {"02", "Nintendo"},
       {"08", "Capcom"},
-      {"0A", "Jaleco Entertainment"},
+      {"0A", "Jaleco / Jaleco Entertainment"},
       {"0L", "Warashi"},
       {"0M", "Entertainment Software Publishing"},
       {"0Q", "IE Institute"},
-      {"13", "Electronic Arts / EA Sports"},
-      {"18", "Hudson Entertainment"},
+      {"13", "Electronic Arts Japan"},
+      {"18", "Hudson Soft / Hudson Entertainment"},
       {"1K", "Titus Software"},
       {"20", "DSI Games / ZOO Digital Publishing"},
-      {"28", "Kemco"},
-      {"29", "SETA"},
+      {"28", "Kemco Japan"},
+      {"29", "SETA Corporation"},
       {"2K", "NEC Interchannel"},
       {"2L", "Agatsuma Entertainment"},
       {"2M", "Jorudan"},
-      {"2N", "Rocket Company"},
+      {"2N", "Smilesoft / Rocket Company"},
       {"2Q", "MediaKite"},
       {"36", "Codemasters"},
       {"41", "Ubisoft"},
@@ -431,19 +431,19 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"4Q", "Disney Interactive Studios / Buena Vista Games"},
       {"4Z", "Crave Entertainment / Red Wagon Games"},
       {"51", "Acclaim Entertainment"},
-      {"52", "Activision / Activision Value / RedOctane"},
-      {"54", "Rockstar Games / 2K Play / Global Star Software"},
-      {"5D", "Midway Games"},
+      {"52", "Activision"},
+      {"54", "Take-Two Interactive / GameTek / Rockstar Games / Global Star Software"},
+      {"5D", "Midway Games / Tradewest"},
       {"5G", "Majesco Entertainment"},
       {"5H", "3DO / Global Star Software"},
       {"5L", "NewKidCo"},
       {"5S", "Evolved Games / Xicat Interactive"},
       {"5V", "Agetec"},
-      {"5Z", "Conspiracy Entertainment"},
-      {"60", "Titus Software"},
+      {"5Z", "Data Design / Conspiracy Entertainment"},
+      {"60", "Titus Interactive / Titus Software"},
       {"64", "LucasArts"},
       {"68", "Bethesda Softworks / Mud Duck Productions / Vir2L Studios"},
-      {"69", "Electronic Arts / EA Sports / MTV Games"},
+      {"69", "Electronic Arts"},
       {"6E", "Sega"},
       {"6K", "UFO Interactive Games"},
       {"6L", "BAM! Entertainment"},
@@ -455,9 +455,9 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"6W", "Sega"},
       {"6X", "Wanadoo Edition"},
       {"6Z", "NDS Software"},
-      {"70", "Atari"},
+      {"70", "Atari (Infogrames)"},
       {"71", "Interplay Entertainment"},
-      {"75", "SCi"},
+      {"75", "SCi Games"},
       {"78", "THQ / Play THQ"},
       {"7D", "Sierra Entertainment / Vivendi Games / Universal Interactive Studios"},
       {"7F", "Kemco"},
@@ -466,7 +466,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"7J", "Zushi Games / ZOO Digital Publishing"},
       {"7K", "Kiddinx Entertainment"},
       {"7L", "Simon & Schuster Interactive"},
-      {"7M", "Le Cortex"},
+      {"7M", "Badland Games"},
       {"7N", "Empire Interactive / Xplosiv"},
       {"7S", "Rockstar Games"},
       {"7T", "Scholastic"},
@@ -480,27 +480,28 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"91", "Chunsoft"},
       {"99", "Marvelous Entertainment / Victor Entertainment / Pack-In-Video / Rising Star Games"},
       {"9B", "Tecmo"},
-      {"9G", "Take-Two Interactive / Gotham Games / Gathering of Developers"},
+      {"9G",
+       "Take-Two Interactive / Global Star Software / Gotham Games / Gathering of Developers"},
       {"9S", "Brother International"},
       {"9Z", "Crunchyroll"},
       {"A4", "Konami"},
-      {"A7", "Takara / Takara Tomy"},
+      {"A7", "Takara"},
       {"AF", "Namco Bandai Games"},
       {"AU", "Alternative Software"},
       {"AX", "Vivendi"},
-      {"B0", "Acclaim Entertainment"},
+      {"B0", "Acclaim Japan"},
       {"B2", "Bandai Games"},
-      {"BB", "Gaijinworks"},
+      {"BB", "Sunsoft"},
       {"BL", "MTO"},
       {"BM", "XING"},
       {"BN", "Sunrise Interactive"},
       {"BP", "Global A Entertainment"},
       {"C0", "Taito"},
       {"C8", "Koei"},
-      {"CM", "Konami"},
+      {"CM", "Konami Computer Entertainment Osaka"},
       {"CQ", "From Software"},
       {"D9", "Banpresto"},
-      {"DA", "Takara Tomy"},
+      {"DA", "Tomy / Takara Tomy"},
       {"DQ", "Compile Heart / Idea Factory"},
       {"E5", "Epoch"},
       {"E6", "Game Arts"},
@@ -509,9 +510,9 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"E9", "Natsume"},
       {"EB", "Atlus"},
       {"EL", "Spike"},
-      {"EM", "Konami"},
+      {"EM", "Konami Computer Entertainment Tokyo"},
       {"EP", "Sting Entertainment"},
-      {"ES", "Starfish SD"},
+      {"ES", "Starfish-SD"},
       {"EY", "Vblank Entertainment"},
       {"FH", "Easy Interactive"},
       {"FJ", "Virtual Toys"},
@@ -527,7 +528,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"GD", "Square Enix"},
       {"GE", "Kids Station"},
       {"GG", "O3 Entertainment"},
-      {"GJ", "Detn8"},
+      {"GJ", "Detn8 Games"},
       {"GK", "Genki"},
       {"GL", "Gameloft / Ubisoft"},
       {"GM", "Gamecock Media Group"},
@@ -577,7 +578,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"K2", "Coca-Cola (Japan) Company"},
       {"K3", "Yudo"},
       {"K6", "Nihon System"},
-      {"KB", "Nippon Ichi Software America"},
+      {"KB", "Nippon Ichi Software"},
       {"KG", "Kando Games"},
       {"KH", "Joju Games"},
       {"KJ", "Studio Zan"},
@@ -605,7 +606,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"LT", "Legacy Interactive"},
       {"LU", "Lexis Num\xc3\xa9rique"},  // We can't use a u8 prefix due to C++20's u8string
       {"LW", "Grendel Games"},
-      {"LY", "Icon Games"},
+      {"LY", "Icon Games / Super Icon"},
       {"M0", "Studio Zan"},
       {"M1", "Grand Prix Games"},
       {"M2", "HomeMedia"},
@@ -613,7 +614,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"M6", "Perpetuum"},
       {"MB", "Agenda"},
       {"MD", "Ateam"},
-      {"ME", "SilverStar"},
+      {"ME", "Silver Star Japan"},
       {"MF", "Yamasa"},
       {"MH", "Mentor Interactive"},
       {"MJ", "Mumbo Jumbo"},
@@ -641,8 +642,8 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"NN", "Nnooo"},
       {"NP", "Nobilis"},
       {"NQ", "Namco Bandai Partners"},
-      {"NR", "Bold Games / Destineer Games"},
-      {"NS", "Nippon Ichi Software"},
+      {"NR", "Destineer Publishing / Bold Games"},
+      {"NS", "Nippon Ichi Software America"},
       {"NT", "Nocturnal Entertainment"},
       {"NV", "Nicalis"},
       {"NW", "Deep Fried Entertainment"},
@@ -699,7 +700,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"SS", "Sanuk Games"},
       {"ST", "Stickmen Studios"},
       {"SU", "Slitherine"},
-      {"SV", "7G//AMES"},
+      {"SV", "SevenOne Intermedia"},
       {"SZ", "Storm City Games"},
       {"TH", "Kolkom"},
       {"TJ", "Broken Rules"},
@@ -766,13 +767,13 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"Y9", "RadiationBurn"},
       {"YC", "NECA"},
       {"YD", "Infinite Dreams"},
-      {"YF", "Oxygene"},
+      {"YF", "O2 Games"},
       {"YG", "Maximum Family Games"},
       {"YJ", "Frozen Codebase"},
       {"YK", "MAD Multimedia"},
       {"YN", "Game Factory"},
       {"YS", "Yullaby"},
-      {"YT", "Valcon Games"},
+      {"YT", "Corecell Technology"},
       {"YV", "KnapNok Games"},
       {"YX", "Selectsoft"},
       {"YY", "FDG Entertainment"},