diff --git a/DATabase/Mappings/MAME.xml b/DATabase/Mappings/MAME.xml
index 6ca46c96..9c312f98 100644
--- a/DATabase/Mappings/MAME.xml
+++ b/DATabase/Mappings/MAME.xml
@@ -128,6 +128,7 @@
 	<mapping from="ec1841" to="MPO BT - EC 1841" />
 	<mapping from="einstein" to="Tatung - Einstein TC-01" />
 	<mapping from="electron_cart" to="Acorn - BBC, Electron" />
+	<mapping from="electron_cass" to="Acorn - BBC, Electron" />
 	<mapping from="ep64_cart" to="Enterprise - 64" />
 	<mapping from="ep64_cass" to="Enterprise - 64" />
 	<mapping from="ep64_flop" to="Enterprise - 64" />
@@ -135,6 +136,7 @@
 	<mapping from="exl100" to="Exelvision Exeltel, EXL100" />
 	<mapping from="famicom_cass" to="Nintendo - Famicom BASIC" />
 	<mapping from="famicom_flop" to="Nintendo - Famicom Disk System" />
+	<mapping from="fidel_scc" to="Fidelity - SCC" />
 	<mapping from="fm77av" to="Fujitsu - FM-77AV" />
 	<mapping from="fm7_cass" to="Fujitsu - FM-7" />
 	<mapping from="fm7_disk" to="Fujitsu - FM-7" />
@@ -143,7 +145,7 @@
 	<mapping from="galaxy" to="Galaksija  - Galaksija, Galaksija Plus" />
 	<mapping from="gamate" to="Bit Corp - Gamate" />
 	<mapping from="gameboy" to="Nintendo - Game Boy" />
-	<mapping from="gamecom" to="Tiger - Game.com" />
+	<mapping from="gamecom" to="Tiger Electronics - Game.com" />
 	<mapping from="gamegear" to="Sega - Game Gear" />
 	<mapping from="gameking" to="TimeTop - GameKing" />
 	<mapping from="gameking3" to="TimeTop - GameKing" />
@@ -184,6 +186,7 @@
 	<mapping from="jaguar" to="Atari - Jaguar" />
 	<mapping from="juicebox" to="Mattel - Juice Box" />
 	<mapping from="jupace_cass" to="Jupiter Cantab - Jupiter Ace" />
+	<mapping from="k28m2" to="Tiger Electronics - K28" />
 	<mapping from="kayproii" to="Kaypro - II" />
 	<mapping from="kc_cart" to="Robotron - KC85" />
 	<mapping from="kc_cass" to="Robotron - KC85" />
@@ -198,6 +201,7 @@
 	<mapping from="m20" to="Olivetti - M20" />
 	<mapping from="m5_cart" to="Sord - M5" />
 	<mapping from="m5_cass" to="Sord - M5" />
+	<mapping from="m5_flop" to="Sord - M5" />
 	<mapping from="mac_flop" to="Apple - Macintosh" />
 	<mapping from="mac_hdd" to="Apple - Macintosh" />
 	<mapping from="mbc200" to="Sanyo - MBC-200, MBC-1200" />
@@ -292,6 +296,8 @@
 	<mapping from="plus4_cass" to="Commodore - Plus-4" />
 	<mapping from="plus4_flop" to="Commodore - Plus-4" />
 	<mapping from="pmd85_cass" to="Tesla - PMD 85" />
+	<mapping from="pockchalv1" to="Benesse - Pocket Challenge V" />
+	<mapping from="pockchalv2" to="Benesse - Pocket Challenge V" />
 	<mapping from="pokemini" to="Nintendo - Pokemon Mini" />
 	<mapping from="pro128_cart" to="Olivetti - Prodest PC 128" />
 	<mapping from="pro128s_flop" to="Olivetti - Prodest PC 128" />
diff --git a/DATabase/Mappings/NoIntro.xml b/DATabase/Mappings/NoIntro.xml
index df8d80fa..7396f644 100644
--- a/DATabase/Mappings/NoIntro.xml
+++ b/DATabase/Mappings/NoIntro.xml
@@ -77,8 +77,8 @@
 	<mapping from="Sony - PlayStation Portable (UMD Video)" to="Sony - PlayStation Portable" />
 	<mapping from="SNK - Neo Geo Pocket" to="SNK - Neo Geo Pocket" />
 	<mapping from="SNK - Neo Geo Pocket Color" to="SNK - Neo Geo Pocket Color" />
-	<mapping from="Tiger - Game.com" to="Tiger - Game.com" />
-	<mapping from="Tiger - Gizmondo" to="Tiger - Gizmondo" />
+	<mapping from="Tiger - Game.com" to="Tiger Electronics - Game.com" />
+	<mapping from="Tiger - Gizmondo" to="Tiger Telematics - Gizmondo" />
 	<mapping from="VTech - CreatiVision" to="VTech - CreatiVision" />
 	<mapping from="VTech - V.Smile" to="VTech - V.Smile, V.Disc" />
 	<mapping from="Watara - Supervision" to="Watara - Supervision" />
diff --git a/DATabase/Mappings/Redump.xml b/DATabase/Mappings/Redump.xml
index 76126fce..063ace59 100644
--- a/DATabase/Mappings/Redump.xml
+++ b/DATabase/Mappings/Redump.xml
@@ -24,8 +24,8 @@
 	<mapping from="NEC - PC-FX - PC-FXGA" to="NEC - PC FX, PC FXGA" />
 	<mapping from="Nintendo - GameCube - BIOS Images" to="Nintendo - GameCube" />
 	<mapping from="Nintendo - GameCube" to="Nintendo - GameCube" />
-	<mapping from="Nintendo - Wii" to="Nintendo - Wii" />
-	<mapping from="Nintendo - Wii U" to="Nintendo - Wii U" />
+	<mapping from="Nintendo - Wii" to="Nintendo - Nintendo Wii" />
+	<mapping from="Nintendo - Wii U" to="Nintendo - Nintendo Wii U" />
 	<mapping from="Palm" to="Hewlett-Packard - Palm" />
 	<mapping from="Panasonic - 3DO Interactive Multiplayer" to="Panasonic - 3DO Interactive Multiplayer" />
 	<mapping from="Philips - CD-i" to="Philips - CD-i" />
diff --git a/DATabase/Mappings/TOSEC.xml b/DATabase/Mappings/TOSEC.xml
index 330beea7..e2bb6978 100644
--- a/DATabase/Mappings/TOSEC.xml
+++ b/DATabase/Mappings/TOSEC.xml
@@ -283,7 +283,7 @@
 	<mapping from="Thomson TO7" to="Thomson - 8bit" />
 	<mapping from="Thomson TO8" to="Thomson - 8bit" />
 	<mapping from="Thomson TO9+" to="Thomson - 8bit" />
-	<mapping from="Tiger Game.com" to="Tiger - Game.com" />
+	<mapping from="Tiger Game.com" to="Tiger Electronics - Game.com" />
 	<mapping from="Tiki Data Kontiki-100 &amp; Tiki-100" to="Tiki Data - Kontiki-100, Tiki-100" />
 	<mapping from="Tomy KISS-Site" to="Tomy - Kiss-site" />
 	<mapping from="Tomy Tutor &amp; Pyuuta" to="Tomy - Tutor, Pyuuta" />
diff --git a/DATabase/Mappings/TruRip.xml b/DATabase/Mappings/TruRip.xml
index 45e20dd4..015d4613 100644
--- a/DATabase/Mappings/TruRip.xml
+++ b/DATabase/Mappings/TruRip.xml
@@ -55,7 +55,7 @@
 	<mapping from="Sord CGL M 5 (M 5, Game M 5)" to="Sord - M5" />
 	<mapping from="Spectravideo SV-318 &amp; SV-328" to="Spectravideo - SVI-318, SVI-328" />
 	<mapping from="Tesla PMD-85" to="Tesla - PMD 85" />
-	<mapping from="Tiger Game.com" to="Tiger - Game.com" />
+	<mapping from="Tiger Game.com" to="Tiger Electronics - Game.com" />
 	<mapping from="Tomy Grandstand Tutor (Tutor, Pyuuta)" to="Tomy - Tutor, Pyuuta" />
 	<mapping from="Tomy Kiss-site" to="Tomy - Kiss-site" />
 	<mapping from="Tsukuda Original Othello Multivision" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />