diff --git a/hash/vgmplay.xml b/hash/vgmplay.xml
index 8f1bfdbc10b..839cfdf3991 100644
--- a/hash/vgmplay.xml
+++ b/hash/vgmplay.xml
@@ -11,7 +11,7 @@ license:CC0
      and http://vgmrips.net/files/VGMRips_all_of_them_20180807-update.zip -->
 
 	<software name="bombcoll_gb">
-		<description>Bomberman Collection (1996)(Hudson) (GameBoy)</description>
+		<description>Bomberman Collection (1996)(Hudson) (Game Boy)</description>
 		<year>1996</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -1743,8 +1743,8 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="sagaia">
-		<description>Sagaia (Arcade)</description>
+	<software name="sagaia_gb">
+		<description>Sagaia (Game Boy)</description>
 		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -34935,7 +34935,7 @@ license:CC0
 	</software>
 
 	<software name="gng">
-		<description>Ghosts'N Goblins (Ghosts'N Goblins)</description>
+		<description>Ghosts 'N Goblins (Ghosts 'N Goblins)</description>
 		<year>1985</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="2�xYM2203"/>
@@ -35104,7 +35104,7 @@ license:CC0
 	</software>
 
 	<software name="ghouls">
-		<description>Ghouls'n Ghosts (CP System)</description>
+		<description>Ghouls 'N Ghosts (CP System)</description>
 		<year>1988</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="YM2151"/>
@@ -80529,7 +80529,7 @@ license:CC0
 	</software>
 
 	<software name="gameboy">
-		<description>Game Boy BIOS (GameBoy)</description>
+		<description>Game Boy BIOS (Game Boy)</description>
 		<year>1989</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -80568,7 +80568,7 @@ license:CC0
 	</software>
 
 	<software name="gargoyle_gb">
-		<description>Gargoyle's Quest - Ghosts'n Goblins (Game Boy)</description>
+		<description>Gargoyle's Quest - Ghosts 'N Goblins (Game Boy)</description>
 		<year>1990</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="Game Boy DMG (LR35902)"/>
@@ -81134,7 +81134,7 @@ license:CC0
 	</software>
 
 	<software name="kirby">
-		<description>Kirby's Dream Land (GameBoy)_</description>
+		<description>Kirby's Dream Land (Nintendo Game Boy)</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -81768,7 +81768,7 @@ license:CC0
 	</software>
 
 	<software name="klaxj_gb">
-		<description>Klax (JP) (GameBoy)</description>
+		<description>Klax (JP) (Game Boy)</description>
 		<year>1990</year>
 		<publisher>Hudson</publisher>
 		<info name="cores" value="GB DMG (LR35902)"/>
@@ -95828,7 +95828,7 @@ license:CC0
 	</software>
 
 	<software name="galaxyfg">
-		<description>Galaxy Fight - Universal  Warriors (SNK Neo Geo)</description>
+		<description>Galaxy Fight - Universal Warriors (SNK Neo Geo)</description>
 		<year>1995</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="YM2610"/>
@@ -119222,7 +119222,7 @@ license:CC0
 	</software>
 
 	<software name="gng_nes">
-		<description>Ghosts 'n Goblins (NES)</description>
+		<description>Ghosts 'N Goblins (NES)</description>
 		<year>1986</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
@@ -233457,7 +233457,7 @@ license:CC0
 	</software>
 
 	<software name="turok3_gbc">
-		<description>Turok 3 -  Shadow of Oblivion (Nintendo Game Boy Color)</description>
+		<description>Turok 3 - Shadow of Oblivion (Nintendo Game Boy Color)</description>
 		<year>2000</year>
 		<publisher>Acclaim</publisher>
 		<info name="cores" value="Game Boy DMG (LR35902)"/>
@@ -242687,7 +242687,7 @@ license:CC0
 <!-- 1 updated set and 31 new sets -->
 
 	<software name="46okunen_pc98">
-		<description>46 Okunen Monogatari  ~The Shinka Ron~ (NEC PC-9801)</description>
+		<description>46 Okunen Monogatari ~The Shinka Ron~ (NEC PC-9801)</description>
 		<year>1990</year>
 		<publisher>Enix</publisher>
 		<info name="cores" value="NEC PC-9801-26K (YM2203)"/>
@@ -279409,7 +279409,7 @@ license:CC0
 	</software>
 
 	<software name="ghouls_md">
-		<description>Ghouls 'n Ghosts (GEN/MD)</description>
+		<description>Ghouls 'N Ghosts (GEN/MD)</description>
 		<year>1989</year>
 		<publisher>Capcom, Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
@@ -342093,7 +342093,7 @@ license:CC0
 	</software>
 
 	<software name="ghouls_sms">
-		<description>Ghouls N Ghosts (SMS)</description>
+		<description>Ghouls 'N Ghosts (SMS)</description>
 		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>