diff --git a/00_example_libretro.info b/00_example_libretro.info
index 95ba613..d4b9e59 100644
--- a/00_example_libretro.info
+++ b/00_example_libretro.info
@@ -1,7 +1,7 @@
 ## All data is optional, but helps improve user experience.
 
 # Name displayed when the user is selecting the core:
-# display_name = "NES / Famicom"
+# display_name = "Nintendo - Game Boy (Core Name)"
 
 # Name of the authors who wrote the core:
 # authors = "Martin Freij|R. Belmont|R. Danbrook"
diff --git a/4do_libretro.info b/4do_libretro.info
index ba67afe..f00c26c 100644
--- a/4do_libretro.info
+++ b/4do_libretro.info
@@ -1,4 +1,4 @@
-display_name = "3DO (4DO)"
+display_name = "The 3DO Company - 3DO (4DO)"
 authors = "JohnnyDude|FreeDO team"
 supported_extensions = "iso|cue"
 corename = "4DO"
diff --git a/81_libretro.info b/81_libretro.info
index afccdf0..c2bd5ac 100644
--- a/81_libretro.info
+++ b/81_libretro.info
@@ -1,4 +1,4 @@
-display_name = "ZX81 (EightyOne)"
+display_name = "Sinclair - ZX 81 (EightyOne)"
 authors = "Michael D Wynne"
 supported_extensions = "p|tzx|t81"
 corename = "81"
diff --git a/atari800_libretro.info b/atari800_libretro.info
index 57ac882..717c125 100644
--- a/atari800_libretro.info
+++ b/atari800_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari 8-bit computer systems and 5200 (Atari800)"
+display_name = "Atari - 5200 (Atari800)"
 authors = "Petr Stehlik"
 supported_extensions = "xfd|atr|atx|cdm|cas|bin|a52|xex|zip"
 corename = "Atari800"
diff --git a/blastem_libretro.info b/blastem_libretro.info
index 4801633..2e4d9d8 100644
--- a/blastem_libretro.info
+++ b/blastem_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega MD (BlastEm)"
+display_name = "Sega - Mega Drive - Genesis (BlastEm)"
 authors = "Mike Pavone"
 supported_extensions = "md|bin|smd"
 corename = "BlastEm"
diff --git a/bluemsx_libretro.info b/bluemsx_libretro.info
index a55225c..03300b5 100644
--- a/bluemsx_libretro.info
+++ b/bluemsx_libretro.info
@@ -1,11 +1,11 @@
 display_name = "MSX/SVI/ColecoVision/SG-1000 (blueMSX)"
 authors = "Daniel Vik"
-supported_extensions = "rom|ri|mx1|mx2|col|dsk|cas|sg|sc"
+supported_extensions = "rom|ri|mx1|mx2|col|dsk|cas|sg|sc|m3u"
 corename = "blueMSX"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MSX/SVI/ColecoVision/SG-1000"
-database = "Microsoft - MSX|Microsoft - MSX2"
+database = "Microsoft - MSX|Microsoft - MSX2|Coleco - ColecoVision|Sega - SG-1000"
 license = "GPLv2"
 permissions = ""
 display_version = "SVN"
diff --git a/bnes_libretro.info b/bnes_libretro.info
index 17754eb..ad4d386 100644
--- a/bnes_libretro.info
+++ b/bnes_libretro.info
@@ -1,4 +1,4 @@
-display_name = "NES / Famicom (bnes)"
+display_name = "Nintendo - NES / Famicom (bnes)"
 authors = "byuu|Ryphecha"
 supported_extensions = "nes"
 corename = "bnes/higan"
diff --git a/bsnes_accuracy_libretro.info b/bsnes_accuracy_libretro.info
index 44b42c0..75ae617 100644
--- a/bsnes_accuracy_libretro.info
+++ b/bsnes_accuracy_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes Accuracy)"
+display_name = "Nintendo - SNES / Famicom (bsnes Accuracy)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes/higan Accuracy"
diff --git a/bsnes_balanced_libretro.info b/bsnes_balanced_libretro.info
index 7808413..9a15a53 100644
--- a/bsnes_balanced_libretro.info
+++ b/bsnes_balanced_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes Balanced)"
+display_name = "Nintendo - SNES / Famicom (bsnes Balanced)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes/higan Balanced"
diff --git a/bsnes_cplusplus98_libretro.info b/bsnes_cplusplus98_libretro.info
index 2e6192f..bf67182 100644
--- a/bsnes_cplusplus98_libretro.info
+++ b/bsnes_cplusplus98_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes C++98 (v085))"
+display_name = "Nintendo - SNES / Famicom (bsnes C++98 (v085))"
 authors = "byuu|Themaister|Ver GreenEyes"
 supported_extensions = "sfc|smc"
 corename = "bsnes C++98 (v085)"
diff --git a/bsnes_mercury_accuracy_libretro.info b/bsnes_mercury_accuracy_libretro.info
index e114e69..7fc6abd 100644
--- a/bsnes_mercury_accuracy_libretro.info
+++ b/bsnes_mercury_accuracy_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes-mercury Accuracy)"
+display_name = "Nintendo - SNES / Famicom (bsnes-mercury Accuracy)"
 authors = "byuu|Alcaro"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes-mercury Accuracy"
diff --git a/bsnes_mercury_balanced_libretro.info b/bsnes_mercury_balanced_libretro.info
index 3ec534c..68c7f74 100644
--- a/bsnes_mercury_balanced_libretro.info
+++ b/bsnes_mercury_balanced_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes-mercury Balanced)"
+display_name = "Nintendo - SNES / Famicom (bsnes-mercury Balanced)"
 authors = "byuu|Alcaro"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes-mercury Balanced"
diff --git a/bsnes_mercury_performance_libretro.info b/bsnes_mercury_performance_libretro.info
index 9981519..cec6479 100644
--- a/bsnes_mercury_performance_libretro.info
+++ b/bsnes_mercury_performance_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes-mercury Performance)"
+display_name = "Nintendo - SNES / Famicom (bsnes-mercury Performance)"
 authors = "byuu|Alcaro"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes-mercury Performance"
diff --git a/bsnes_performance_libretro.info b/bsnes_performance_libretro.info
index 5ea527b..9b69c6a 100644
--- a/bsnes_performance_libretro.info
+++ b/bsnes_performance_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bsnes Performance)"
+display_name = "Nintendo - SNES / Famicom (bsnes Performance)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes/higan Performance"
diff --git a/cap32_libretro.info b/cap32_libretro.info
index 6126aa8..f84f26f 100644
--- a/cap32_libretro.info
+++ b/cap32_libretro.info
@@ -1,10 +1,11 @@
-display_name = "Amstrad CPC (Caprice32)"
+display_name = "Amstrad - CPC (Caprice32)"
 authors = "Ulrich Doewich|dantoine"
 supported_extensions = "dsk|sna|zip|tap|cdt|voc"
 corename = "Caprice32"
 manufacturer = "Amstrad"
 categories = "Emulator"
 systemname = "CPC"
+database = "Amstrad - CPC"
 license = "GPLv2"
 permissions = ""
 display_version = "v4.2.0"
diff --git a/citra_libretro.info b/citra_libretro.info
index 72962b2..8745d3d 100644
--- a/citra_libretro.info
+++ b/citra_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo 3DS (Citra)"
+display_name = "Nintendo - 3DS (Citra)"
 authors = "Citra Emulation Project"
 supported_extensions = "3ds|3dsx|elf|axf|cci|cxi|app"
 corename = "Citra"
diff --git a/crocods_libretro.info b/crocods_libretro.info
index 96c0265..ac27166 100644
--- a/crocods_libretro.info
+++ b/crocods_libretro.info
@@ -1,10 +1,11 @@
-display_name = "Amstrad CPC (CrocoDS)"
+display_name = "Amstrad - CPC (CrocoDS)"
 authors = "RedBug"
 supported_extensions = "dsk|sna|kcr"
 corename = "CrocoDS"
 manufacturer = "Amstrad"
 categories = "Emulator"
 systemname = "CPC"
+database = "Amstrad - CPC"
 license = "MIT"
 permissions = ""
 display_version = "v1"
diff --git a/desmume_libretro.info b/desmume_libretro.info
index c32495a..78c10e1 100644
--- a/desmume_libretro.info
+++ b/desmume_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo DS (DeSmuME)"
+display_name = "Nintendo - DS (DeSmuME)"
 authors = "YopYop156|Zeromus"
 supported_extensions = "nds|bin"
 corename = "DeSmuME"
diff --git a/dolphin_libretro.info b/dolphin_libretro.info
index 922e5c9..a081b68 100644
--- a/dolphin_libretro.info
+++ b/dolphin_libretro.info
@@ -1,4 +1,4 @@
-display_name = "GameCube / Wii (Dolphin)"
+display_name = "Nintendo - GameCube / Wii (Dolphin)"
 authors = "Team Dolphin"
 supported_extensions = "gcm|iso|wbfs|ciso|gcz|elf|dol|dff|tgc|wad"
 corename = "Dolphin"
diff --git a/emux_gb_libretro.info b/emux_gb_libretro.info
index 697db95..99feff1 100644
--- a/emux_gb_libretro.info
+++ b/emux_gb_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy / Game Boy Color (Emux GB)"
+display_name = "Nintendo - Game Boy / Color (Emux GB)"
 authors = "Sebastien Ronsse"
 supported_extensions = "gb|bin|rom"
 corename = "Emux GB"
@@ -11,7 +11,7 @@ permissions = ""
 display_version = "Git"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "DMG_ROM.bin (Game Boy Boot ROM)"
-firmware0_path = "DMG_ROM.bin"
+firmware0_desc = "dmg_boot.bin (Game Boy Boot ROM)"
+firmware0_path = "dmg_boot.bin"
 firmware0_opt = "false"
-notes = "(!) DMG_ROM.bin (md5): 32fbbd84168d3482956eb3c5051637f5"
+notes = "(!) dmg_boot.bin (md5): 32fbbd84168d3482956eb3c5051637f5"
diff --git a/emux_nes_libretro.info b/emux_nes_libretro.info
index 42b4cd0..21471ea 100644
--- a/emux_nes_libretro.info
+++ b/emux_nes_libretro.info
@@ -1,4 +1,4 @@
-display_name = "NES / Famicom (Emux NES)"
+display_name = "Nintendo - NES / Famicom (Emux NES)"
 authors = "Sebastien Ronsse"
 supported_extensions = "nes|bin|rom"
 corename = "Emux NES"
diff --git a/emux_sms_libretro.info b/emux_sms_libretro.info
index 0c0a7da..f0ba055 100644
--- a/emux_sms_libretro.info
+++ b/emux_sms_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega Master System (Emux SMS)"
+display_name = "Sega - Master System (Emux SMS)"
 authors = "Sebastien Ronsse"
 supported_extensions = "sms|bin|rom"
 corename = "Emux SMS"
diff --git a/fceumm_libretro.info b/fceumm_libretro.info
index aa54ed3..617dbab 100644
--- a/fceumm_libretro.info
+++ b/fceumm_libretro.info
@@ -1,4 +1,4 @@
-display_name = "NES / Famicom (FCEUmm)"
+display_name = "Nintendo - NES / Famicom (FCEUmm)"
 authors = "FCEU Team|CaH4e3"
 supported_extensions = "fds|nes|unif|unf"
 corename = "FCEUmm"
diff --git a/fmsx_libretro.info b/fmsx_libretro.info
index d197928..00377d6 100644
--- a/fmsx_libretro.info
+++ b/fmsx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "MSX (fMSX)"
+display_name = "Microsoft - MSX (fMSX)"
 authors = "Marat Fayzullin"
 supported_extensions = "rom|mx1|mx2|dsk|cas"
 corename = "fMSX"
diff --git a/freeintv_libretro.info b/freeintv_libretro.info
new file mode 100644
index 0000000..e0fc5f8
--- /dev/null
+++ b/freeintv_libretro.info
@@ -0,0 +1,20 @@
+display_name = "Mattel - Intellivision (FreeIntv)"
+authors = "David Richardson"
+supported_extensions = "int|bin|rom"
+corename = "FreeIntv"
+manufacturer = "Mattel"
+categories = "Emulator"
+systemname = "Intellivision"
+database = "Mattel - Intellivision"
+license = "GPLv3"
+permissions = ""
+display_version = "2018.1.5"
+supports_no_game = "false"
+firmware_count = 2
+firmware0_desc = "exec.bin"
+firmware0_path = "exec.bin"
+firmware0_opt = "false"
+firmware1_desc = "grom.bin"
+firmware1_path = "grom.bin"
+firmware1_opt = "false"
+notes = "(!) exec.bin (md5): 62e761035cb657903761800f4437b8af|(!) grom.bin (md5): 0cd5946c6473e42e8e4c2137785e427f"
diff --git a/fsuae_libretro.info b/fsuae_libretro.info
index 2a0562b..bc63691 100644
--- a/fsuae_libretro.info
+++ b/fsuae_libretro.info
@@ -1,10 +1,11 @@
-display_name = "Amiga (FS-UAE)"
+display_name = "Commodore - Amiga (FS-UAE)"
 authors = "FrodeSolheim"
 supported_extensions = "adf|ipf|fs-uae"
 corename = "FS-UAE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "Commodore Amiga"
+systemname = "Amiga"
+database = "Commodore - Amiga"
 license = "GPLv2"
 permissions = ""
 display_version = "v2.7.15"
diff --git a/gambatte_libretro.info b/gambatte_libretro.info
index 340abeb..43145a8 100644
--- a/gambatte_libretro.info
+++ b/gambatte_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy / Game Boy Color (Gambatte)"
+display_name = "Nintendo - Game Boy / Color (Gambatte)"
 authors = "Sinamas"
 supported_extensions = "gb|gbc|dmg"
 corename = "Gambatte"
diff --git a/gearboy_libretro.info b/gearboy_libretro.info
index 274614e..97354b4 100644
--- a/gearboy_libretro.info
+++ b/gearboy_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy / Game Boy Color (Gearboy)"
+display_name = "Nintendo - Game Boy / Color (Gearboy)"
 authors = "Ignacio Sanchez"
 supported_extensions = "gb|dmg|gbc|cgb|sgb"
 corename = "Gearboy"
diff --git a/genesis_plus_gx_libretro.info b/genesis_plus_gx_libretro.info
index d6b0159..1e3ddc2 100644
--- a/genesis_plus_gx_libretro.info
+++ b/genesis_plus_gx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega MS/GG/MD/CD (Genesis Plus GX)"
+display_name = "Sega - MS/GG/MD/CD (Genesis Plus GX)"
 authors = "Charles McDonald|Eke-Eke"
 supported_extensions = "mdx|md|smd|gen|bin|cue|iso|sms|gg|sg|68k|chd"
 corename = "Genesis Plus GX"
diff --git a/gpsp_libretro.info b/gpsp_libretro.info
index bf50c5b..11459cd 100644
--- a/gpsp_libretro.info
+++ b/gpsp_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy Advance (gpSP)"
+display_name = "Nintendo - Game Boy Advance (gpSP)"
 authors = "Exophase"
 supported_extensions = "gba|bin"
 corename = "gpSP"
diff --git a/handy_libretro.info b/handy_libretro.info
index 857735a..4fabeb9 100644
--- a/handy_libretro.info
+++ b/handy_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari Lynx (Handy)"
+display_name = "Atari - Lynx (Handy)"
 authors = "K. Wilkins"
 supported_extensions = "lnx"
 corename = "Handy"
diff --git a/hatari_libretro.info b/hatari_libretro.info
index 986444c..323bd1e 100644
--- a/hatari_libretro.info
+++ b/hatari_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari ST/STE/TT/Falcon (Hatari)"
+display_name = "Atari - ST/STE/TT/Falcon (Hatari)"
 authors = "Nicolas Pomarède"
 supported_extensions = "st|msa|zip|stx|dim|ipf"
 corename = "Hatari"
diff --git a/higan_sfc_balanced_libretro.info b/higan_sfc_balanced_libretro.info
index 72c85ca..3501965 100644
--- a/higan_sfc_balanced_libretro.info
+++ b/higan_sfc_balanced_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (nSide Balanced)"
+display_name = "Nintendo - SNES / Famicom (nSide Balanced)"
 authors = "hex-usr"
 supported_extensions = "sfc|smc|gb|gbc|bml|rom"
 corename = "nSide (Super Famicom Balanced)"
diff --git a/higan_sfc_libretro.info b/higan_sfc_libretro.info
index d1ebba9..a7fa47a 100644
--- a/higan_sfc_libretro.info
+++ b/higan_sfc_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (higan Accuracy)"
+display_name = "Nintendo - SNES / Famicom (higan Accuracy)"
 authors = "byuu"
 supported_extensions = "sfc|smc|gb|gbc|bml|rom"
 corename = "higan (Super Famicom Accuracy)"
diff --git a/mame2016_libretro.info b/mame2016_libretro.info
index 8d604c7..2eb76f7 100644
--- a/mame2016_libretro.info
+++ b/mame2016_libretro.info
@@ -6,7 +6,7 @@ manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
 database = "MAME 2016"
-license = "MAME"
+license = "GPLv2+"
 permissions = ""
 display_version = "0.174"
 supports_no_game = "false"
diff --git a/mednafen_gba_libretro.info b/mednafen_gba_libretro.info
index f74b9e5..bb83451 100644
--- a/mednafen_gba_libretro.info
+++ b/mednafen_gba_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy Advance (Beetle GBA)"
+display_name = "Nintendo - Game Boy Advance (Beetle GBA)"
 authors = "Forgotten|Mednafen Team"
 supported_extensions = "gba|agb|bin"
 corename = "Beetle GBA"
diff --git a/mednafen_lynx_libretro.info b/mednafen_lynx_libretro.info
index fefc5e6..1e18b1b 100644
--- a/mednafen_lynx_libretro.info
+++ b/mednafen_lynx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari Lynx (Beetle Handy)"
+display_name = "Atari - Lynx (Beetle Handy)"
 authors = "K. Wilkins|Mednafen Team"
 supported_extensions = "lnx"
 corename = "Beetle Lynx"
diff --git a/mednafen_ngp_libretro.info b/mednafen_ngp_libretro.info
index 95a78d5..92bd25c 100644
--- a/mednafen_ngp_libretro.info
+++ b/mednafen_ngp_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Neo Geo Pocket/Color (Beetle NeoPop)"
+display_name = "SNK - Neo Geo Pocket / Color (Beetle NeoPop)"
 authors = "neopop_uk|Mednafen Team"
 supported_extensions = "ngp|ngc|ngpc"
 corename = "Beetle NeoPop"
diff --git a/mednafen_pce_fast_libretro.info b/mednafen_pce_fast_libretro.info
index 3184b40..4e953e4 100644
--- a/mednafen_pce_fast_libretro.info
+++ b/mednafen_pce_fast_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PC Engine/PCE-CD (Beetle PCE FAST)"
+display_name = "NEC - PC Engine / CD (Beetle PCE FAST)"
 authors = "Mednafen Team"
 supported_extensions = "pce|cue|ccd|iso|img|bin|chd"
 corename = "Beetle PCE Fast"
diff --git a/mednafen_pcfx_libretro.info b/mednafen_pcfx_libretro.info
index 0bb3826..f280753 100644
--- a/mednafen_pcfx_libretro.info
+++ b/mednafen_pcfx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PC-FX (Beetle PC-FX)"
+display_name = "NEC - PC-FX (Beetle PC-FX)"
 authors = "Mednafen Team"
 supported_extensions = "cue|ccd|toc|chd"
 corename = "Beetle PC-FX"
diff --git a/mednafen_psx_hw_libretro.info b/mednafen_psx_hw_libretro.info
index 80f0e50..0c897f0 100644
--- a/mednafen_psx_hw_libretro.info
+++ b/mednafen_psx_hw_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (Beetle PSX HW)"
+display_name = "Sony - PlayStation (Beetle PSX HW)"
 authors = "Mednafen Team"
 supported_extensions = "cue|toc|m3u|ccd|exe|pbp|chd"
 corename = "Beetle PSX HW"
diff --git a/mednafen_psx_libretro.info b/mednafen_psx_libretro.info
index b30c227..e039c41 100644
--- a/mednafen_psx_libretro.info
+++ b/mednafen_psx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (Beetle PSX)"
+display_name = "Sony - PlayStation (Beetle PSX)"
 authors = "Mednafen Team"
 supported_extensions = "cue|toc|m3u|ccd|exe|pbp|chd"
 corename = "Beetle PSX"
diff --git a/mednafen_saturn_libretro.info b/mednafen_saturn_libretro.info
index ea43fe0..501beba 100644
--- a/mednafen_saturn_libretro.info
+++ b/mednafen_saturn_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega Saturn (Beetle Saturn)"
+display_name = "Sega - Saturn (Beetle Saturn)"
 authors = "Mednafen Team"
 supported_extensions = "cue|toc|m3u|ccd|chd"
 corename = "Beetle Saturn"
diff --git a/mednafen_snes_libretro.info b/mednafen_snes_libretro.info
index 09f587b..9afc852 100644
--- a/mednafen_snes_libretro.info
+++ b/mednafen_snes_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Beetle bsnes)"
+display_name = "Nintendo - SNES / Famicom (Beetle bsnes)"
 authors = "byuu|Mednafen Team"
 supported_extensions = "smc|fig|bs|st|sfc"
 corename = "Beetle bsnes"
diff --git a/mednafen_supergrafx_libretro.info b/mednafen_supergrafx_libretro.info
index 6c213b0..10eeb7e 100644
--- a/mednafen_supergrafx_libretro.info
+++ b/mednafen_supergrafx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PC Engine SuperGrafx (Beetle SGX)"
+display_name = "NEC - PC Engine SuperGrafx (Beetle SGX)"
 authors = "Mednafen Team"
 supported_extensions = "pce|sgx|cue|ccd|chd"
 corename = "Beetle SGX"
diff --git a/mednafen_vb_libretro.info b/mednafen_vb_libretro.info
index ea099ae..527d8b0 100644
--- a/mednafen_vb_libretro.info
+++ b/mednafen_vb_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Virtual Boy (Beetle VB)"
+display_name = "Nintendo - Virtual Boy (Beetle VB)"
 authors = "Mednafen Team"
 supported_extensions = "vb|vboy|bin"
 corename = "Beetle VB"
diff --git a/mednafen_wswan_libretro.info b/mednafen_wswan_libretro.info
index 7c96c25..ff0aa59 100644
--- a/mednafen_wswan_libretro.info
+++ b/mednafen_wswan_libretro.info
@@ -1,4 +1,4 @@
-display_name = "WonderSwan/Color (Beetle Cygne)"
+display_name = "Bandai - WonderSwan/Color (Beetle Cygne)"
 authors = "Dox|Mednafen Team"
 supported_extensions = "ws|wsc"
 corename = "Beetle WonderSwan"
diff --git a/melonds_libretro.info b/melonds_libretro.info
index 139ba0b..caab544 100644
--- a/melonds_libretro.info
+++ b/melonds_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo DS (melonDS)"
+display_name = "Nintendo - DS (melonDS)"
 authors = "StapleButter"
 supported_extensions = "nds"
 corename = "melonDS"
diff --git a/mesen_libretro.info b/mesen_libretro.info
new file mode 100644
index 0000000..44d0d0a
--- /dev/null
+++ b/mesen_libretro.info
@@ -0,0 +1,17 @@
+display_name = "Nintendo - NES / Famicom (Mesen)"
+authors = "M. Bibaud (aka Sour)"
+supported_extensions = "nes|fds|unf|unif"
+corename = "Mesen"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
+license = "GPLv3"
+permissions = ""
+display_version = "0.9.4"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "disksys.rom (Family Computer Disk System BIOS)"
+firmware0_path = "disksys.rom"
+firmware0_opt = "false"
+notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|Press Retropad R1 to switch disk side.|HD Packs go in %system%/HdPacks/%game_name%|Custom palette in %system%/MesenPalette.pal"
diff --git a/meteor_libretro.info b/meteor_libretro.info
index c030e53..a189e72 100644
--- a/meteor_libretro.info
+++ b/meteor_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy Advance (Meteor)"
+display_name = "Nintendo - Game Boy Advance (Meteor)"
 authors = "Philippe Daouadi"
 supported_extensions = "gba"
 corename = "Meteor"
diff --git a/mgba_libretro.info b/mgba_libretro.info
index 0ee4bd2..d3132f7 100644
--- a/mgba_libretro.info
+++ b/mgba_libretro.info
@@ -1,5 +1,5 @@
-display_name = "Game Boy Advance (mGBA)"
-authors = "Jeffrey Pfau"
+display_name = "Nintendo - Game Boy Advance (mGBA)"
+authors = "endrift"
 supported_extensions = "gb|gbc|gba"
 corename = "mGBA"
 manufacturer = "Nintendo"
diff --git a/mrboom_libretro.info b/mrboom_libretro.info
index 93ecd13..9e2651e 100644
--- a/mrboom_libretro.info
+++ b/mrboom_libretro.info
@@ -1,5 +1,5 @@
 display_name = "Mr.Boom (Bomberman)"
-authors = ""
+authors = "Remdy"
 supported_extensions = ""
 corename = "Mr.Boom"
 categories = "Game"
diff --git a/mupen64plus_gles3_libretro.info b/mupen64plus_gles3_libretro.info
index 468c72c..dfd90c6 100644
--- a/mupen64plus_gles3_libretro.info
+++ b/mupen64plus_gles3_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo 64 (Mupen64Plus GLES3)"
+display_name = "Nintendo - Nintendo 64 (Mupen64Plus GLES3)"
 authors = "Hacktarux|Mupen64Plus Team"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
 corename = "Mupen64Plus"
diff --git a/mupen64plus_libretro.info b/mupen64plus_libretro.info
index 189dbd6..003f5c3 100644
--- a/mupen64plus_libretro.info
+++ b/mupen64plus_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo 64 (Mupen64Plus)"
+display_name = "Nintendo - Nintendo 64 (Mupen64Plus)"
 authors = "Hacktarux|Mupen64Plus Team"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
 corename = "Mupen64Plus OpenGL"
diff --git a/nekop2_libretro.info b/nekop2_libretro.info
index 4ed148d..48749cb 100644
--- a/nekop2_libretro.info
+++ b/nekop2_libretro.info
@@ -1,4 +1,4 @@
-display_name = "NEC PC-98 (Neko Project II)"
+display_name = "NEC - PC-98 (Neko Project II)"
 authors = "Neko Project II Team"
 supported_extensions = "d98|zip|98d|fdi|fdd|2hd|tfd|d88|88d|hdm|xdf|dup|cmd|hdi|thd|nhd|hdd"
 corename = "Neko Project II"
diff --git a/nestopia_libretro.info b/nestopia_libretro.info
index 4e53b87..daf02ec 100644
--- a/nestopia_libretro.info
+++ b/nestopia_libretro.info
@@ -1,4 +1,4 @@
-display_name = "NES / Famicom (Nestopia UE)"
+display_name = "Nintendo - NES / Famicom (Nestopia UE)"
 authors = "Martin Freij|R. Belmont|R. Danbrook"
 supported_extensions = "nes|fds|unf|unif"
 corename = "Nestopia"
diff --git a/np2kai_libretro.info b/np2kai_libretro.info
index dcfc8af..510111d 100644
--- a/np2kai_libretro.info
+++ b/np2kai_libretro.info
@@ -1,4 +1,4 @@
-display_name = "NEC PC-98 (Neko Project II Kai)"
+display_name = "NEC - PC-98 (Neko Project II Kai)"
 authors = "Neko Project II Team, Tomohiro Yoshidomi"
 supported_extensions = "d98|zip|98d|fdi|fdd|2hd|tfd|d88|88d|hdm|xdf|dup|cmd|hdi|thd|nhd|hdd|hdn"
 corename = "Neko Project II"
@@ -12,18 +12,18 @@ display_version = "0.86"
 supports_no_game = "false"
 firmware_count = 5
 firmware0_desc = "font.bmp (needed to display text)"
-firmware0_path = "np2/font.bmp"
+firmware0_path = "np2kai/font.bmp"
 firmware0_opt = "true"
 firmware1_desc = "FONT.ROM (alt font file)"
-firmware1_path = "np2/FONT.ROM"
+firmware1_path = "np2kai/FONT.ROM"
 firmware1_opt = "true"
 firmware2_desc = "bios.rom"
-firmware2_path = "np2/bios.rom"
+firmware2_path = "np2kai/bios.rom"
 firmware2_opt = "true"
 firmware3_desc = "itf.rom"
-firmware3_path = "np2/itf.rom"
+firmware3_path = "np2kai/itf.rom"
 firmware3_opt = "true"
 firmware4_desc = "sound.rom"
-firmware4_path = "np2/sound.rom"
+firmware4_path = "np2kai/sound.rom"
 firmware4_opt = "true"
-notes = " YM2608 RYTHM samples present in the np2 folder will be used:|2608_bd.wav, 2608_sd.wav, 2608_top.wav, 2608_hh.wav, 2608_tom.wav, 2608_rim.wav|JOY2KEY buttons mapping: A=x B=z X=space Y=lctrl|L=backspace R=rshift SELECT=escape START=return|Keep 'end' key down when booting for machine options.|Many games need GDC set as 2.5Mhz there."
+notes = " YM2608 RYTHM samples present in the np2kai folder will be used:|2608_bd.wav, 2608_sd.wav, 2608_top.wav, 2608_hh.wav, 2608_tom.wav, 2608_rim.wav|JOY2KEY buttons mapping: A=x B=z X=space Y=lctrl|L=backspace R=rshift SELECT=escape START=return|Keep 'end' key down when booting for machine options.|Many games need GDC set as 2.5Mhz there."
diff --git a/o2em_libretro.info b/o2em_libretro.info
index 46a6d1f..ec8308a 100644
--- a/o2em_libretro.info
+++ b/o2em_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Odyssey2 / Videopac+ (O2EM)"
+display_name = "Magnavox - Odyssey2 / Phillips Videopac+ (O2EM)"
 authors = "Daniel Boris|Andre de la Rocha|Arlindo M. de Oliveira"
 supported_extensions = "bin"
 corename = "O2EM"
diff --git a/opentyrian_libretro.info b/opentyrian_libretro.info
index 366e250..23bf1f8 100644
--- a/opentyrian_libretro.info
+++ b/opentyrian_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Tyrian (Open Tyrian)"
+display_name = "Tyrian (OpenTyrian)"
 authors = ""
 supported_extensions = ""
 corename = "OpenTyrian"
diff --git a/parallel_n64_debug_libretro.info b/parallel_n64_debug_libretro.info
index fe455cb..0297349 100644
--- a/parallel_n64_debug_libretro.info
+++ b/parallel_n64_debug_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo 64 (ParaLLEl) (Debug)"
+display_name = "Nintendo - Nintendo 64 (ParaLLEl) (Debug)"
 authors = "Hacktarux|Mupen64Plus Team|TinyTiger|Libretro"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
 corename = "ParaLLEl (Debug)"
diff --git a/parallel_n64_libretro.info b/parallel_n64_libretro.info
index 5850852..4ace2c0 100644
--- a/parallel_n64_libretro.info
+++ b/parallel_n64_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Nintendo 64 (ParaLLEl N64)"
+display_name = "Nintendo - Nintendo 64 (ParaLLEl N64)"
 authors = "Hacktarux|Mupen64Plus Team|TinyTiger|Libretro"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
 corename = "ParaLLEl N64"
diff --git a/pcsx1_libretro.info b/pcsx1_libretro.info
index cb4abfa..72c1e2d 100644
--- a/pcsx1_libretro.info
+++ b/pcsx1_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (PCSX1)"
+display_name = "Sony - PlayStation (PCSX1)"
 authors = "PCSX Team|notaz|Exophase"
 supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u"
 corename = "PCSX1"
diff --git a/pcsx_rearmed_interpreter_libretro.info b/pcsx_rearmed_interpreter_libretro.info
index b6a3d9b..c68ff95 100644
--- a/pcsx_rearmed_interpreter_libretro.info
+++ b/pcsx_rearmed_interpreter_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (PCSX ReARMed) [Interpreter]"
+display_name = "Sony - PlayStation (PCSX ReARMed) [Interpreter]"
 authors = "PCSX Team|notaz|Exophase"
 supported_extensions = "bin|cue|img|mdf|pbp|cbn|toc"
 corename = "PCSX ReARMed [Interpreter]"
diff --git a/pcsx_rearmed_libretro.info b/pcsx_rearmed_libretro.info
index ea4dfb8..6a668fa 100644
--- a/pcsx_rearmed_libretro.info
+++ b/pcsx_rearmed_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (PCSX ReARMed)"
+display_name = "Sony - PlayStation (PCSX ReARMed)"
 authors = "PCSX Team|notaz|Exophase"
 supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u"
 corename = "PCSX ReARMed"
diff --git a/pcsx_rearmed_libretro_neon.info b/pcsx_rearmed_libretro_neon.info
index 13c17a1..0bc9ccb 100644
--- a/pcsx_rearmed_libretro_neon.info
+++ b/pcsx_rearmed_libretro_neon.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (PCSX ReARMed) [NEON]"
+display_name = "Sony - PlayStation (PCSX ReARMed) [NEON]"
 authors = "PCSX Team|notaz|Exophase"
 supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u"
 corename = "PCSX ReARMed [NEON]"
diff --git a/picodrive_libretro.info b/picodrive_libretro.info
index 0ff8698..8bbfdef 100644
--- a/picodrive_libretro.info
+++ b/picodrive_libretro.info
@@ -1,11 +1,11 @@
-display_name = "Sega MS/MD/CD/32X (PicoDrive)"
+display_name = "Sega - MS/MD/CD/32X (PicoDrive)"
 authors = "notaz|fdave"
 supported_extensions = "bin|gen|smd|md|32x|cue|iso|sms|68k"
 corename = "PicoDrive"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega 8/16-bit + 32X (Various)"
-database = "Sega - Master System - Mark III|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
+database = "Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
 license = "MAME"
 permissions = "dynarec_optional"
 display_version = "1.91"
diff --git a/pokemini_libretro.info b/pokemini_libretro.info
index d4e1b78..b5b2970 100644
--- a/pokemini_libretro.info
+++ b/pokemini_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Pokémon Mini (PokeMini)"
+display_name = "Nintendo - Pokémon Mini (PokeMini)"
 authors = "JustBurn"
 supported_extensions = "min"
 corename = "PokeMini"
diff --git a/ppsspp_libretro.info b/ppsspp_libretro.info
index 3120d80..2c9464d 100644
--- a/ppsspp_libretro.info
+++ b/ppsspp_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PSP (PPSSPP)"
+display_name = "Sony - PlayStation Portable (PPSSPP)"
 authors = "Henrik Hrydgard"
 supported_extensions = "elf|iso|cso|prx|pbp"
 corename = "PPSSPP"
diff --git a/prosystem_libretro.info b/prosystem_libretro.info
index ac8ce59..a6330cf 100644
--- a/prosystem_libretro.info
+++ b/prosystem_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari 7800 (ProSystem)"
+display_name = "Atari - 7800 (ProSystem)"
 authors = "Greg Stanton|Brian Berlin|Leonis|Greg DeMent"
 supported_extensions = "a78|bin"
 corename = "ProSystem"
diff --git a/puae_libretro.info b/puae_libretro.info
index 41b2166..a3f1c95 100644
--- a/puae_libretro.info
+++ b/puae_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Amiga (P-UAE)"
+display_name = "Commodore - Amiga (P-UAE)"
 authors = "GnoStiC"
 supported_extensions = "adf|dms|fdi|ipf|zip|uae"
 corename = "PUAE"
diff --git a/px68k_libretro.info b/px68k_libretro.info
index 0c6ff46..9433e7d 100644
--- a/px68k_libretro.info
+++ b/px68k_libretro.info
@@ -1,6 +1,6 @@
-display_name = "Sharp X68000 (PX68k)"
+display_name = "Sharp - X68000 (PX68k)"
 authors = "hissorii"
-supported_extensions = "dim|zip|img|d88|88d|hdm|dup|2hd|xdf|hdf|cmd"
+supported_extensions = "dim|zip|img|d88|88d|hdm|dup|2hd|xdf|hdf|cmd|m3u"
 corename = "PX68k"
 manufacturer = "Sharp"
 categories = "Emulator"
diff --git a/quicknes_libretro.info b/quicknes_libretro.info
index 26df51b..0292e6b 100644
--- a/quicknes_libretro.info
+++ b/quicknes_libretro.info
@@ -1,11 +1,11 @@
-display_name = "NES / Famicom (QuickNES)"
+display_name = "Nintendo - NES / Famicom (QuickNES)"
 authors = "blargg|kode54"
 supported_extensions = "nes"
 corename = "QuickNES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
+database = "Nintendo - Nintendo Entertainment System"
 license = "LGPLv2.1+"
 permissions = ""
 display_version = "Git"
diff --git a/redream_libretro.info b/redream_libretro.info
index 32e0b06..2d83735 100644
--- a/redream_libretro.info
+++ b/redream_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega Dreamcast (Redream)"
+display_name = "Sega - Dreamcast (Redream)"
 authors = "inolen"
 supported_extensions = "gdi|chd|cdi"
 corename = "Redream"
diff --git a/reicast_libretro.info b/reicast_libretro.info
index 7e95789..da332f9 100644
--- a/reicast_libretro.info
+++ b/reicast_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega Dreamcast (Reicast)"
+display_name = "Sega - Dreamcast (Reicast)"
 authors = "skmp"
 supported_extensions = "cdi|gdi|chd|cue"
 corename = "Reicast"
diff --git a/reicast_naomi_libretro.info b/reicast_naomi_libretro.info
index 6c8f671..2a0f39c 100644
--- a/reicast_naomi_libretro.info
+++ b/reicast_naomi_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega NAOMI (Reicast NAOMI)"
+display_name = "Sega - NAOMI (Reicast NAOMI)"
 authors = "skmp"
 supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi"
 corename = "Reicast NAOMI"
diff --git a/rustation_libretro.info b/rustation_libretro.info
index 996be7d..eec4587 100644
--- a/rustation_libretro.info
+++ b/rustation_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PlayStation (Rustation)"
+display_name = "Sony - PlayStation (Rustation)"
 authors = "Simias"
 supported_extensions = "cue|toc|m3u|ccd|exe"
 corename = "Rustation"
diff --git a/sameboy_libretro.info b/sameboy_libretro.info
index 89d3682..ec60c3c 100644
--- a/sameboy_libretro.info
+++ b/sameboy_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy / Game Boy Color (SameBoy)"
+display_name = "Nintendo - Game Boy / Color (SameBoy)"
 authors = "LIJI32"
 supported_extensions = "gb|gbc"
 corename = "SameBoy"
diff --git a/snes9x2002_libretro.info b/snes9x2002_libretro.info
index 5051419..75ccbfb 100644
--- a/snes9x2002_libretro.info
+++ b/snes9x2002_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Snes9x 2002)"
+display_name = "Nintendo - SNES / Famicom (Snes9x 2002)"
 authors = "Snes9x Team|PocketSNES Team|Toadking"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 corename = "Snes9x 2002"
diff --git a/snes9x2005_libretro.info b/snes9x2005_libretro.info
index c9ebd10..bde5805 100644
--- a/snes9x2005_libretro.info
+++ b/snes9x2005_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Snes9x 2005)"
+display_name = "Nintendo - SNES / Famicom (Snes9x 2005)"
 authors = "Snes9x Team|dking|BassAceGold|ShadauxCat|Nebuleon"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 corename = "Snes9x 2005"
diff --git a/snes9x2005_plus_libretro.info b/snes9x2005_plus_libretro.info
index 19bc07f..13a7af2 100644
--- a/snes9x2005_plus_libretro.info
+++ b/snes9x2005_plus_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Snes9x 2005 Plus)"
+display_name = "Nintendo - SNES / Famicom (Snes9x 2005 Plus)"
 authors = "Snes9x Team|dking|BassAceGold|ShadauxCat|Nebuleon"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 corename = "Snes9x 2005 Plus"
diff --git a/snes9x2010_libretro.info b/snes9x2010_libretro.info
index 9533171..38b8a48 100644
--- a/snes9x2010_libretro.info
+++ b/snes9x2010_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Snes9x 2010)"
+display_name = "Nintendo - SNES / Famicom (Snes9x 2010)"
 authors = "Snes9x Team|Squarepusher"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 corename = "Snes9x 2010"
diff --git a/snes9x_libretro.info b/snes9x_libretro.info
index 338b2bf..b722085 100644
--- a/snes9x_libretro.info
+++ b/snes9x_libretro.info
@@ -1,11 +1,11 @@
-display_name = "SNES / Super Famicom (Snes9x)"
+display_name = "Nintendo - SNES / Famicom (Snes9x)"
 authors = "Snes9x Team"
-supported_extensions = "smc|sfc|swc|fig"
+supported_extensions = "smc|sfc|swc|fig|bs"
 corename = "Snes9x"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 license = "Non-commercial"
 permissions = ""
 display_version = "1.53"
diff --git a/stella_libretro.info b/stella_libretro.info
index 37c486c..159e586 100644
--- a/stella_libretro.info
+++ b/stella_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari 2600 (Stella)"
+display_name = "Atari - 2600 (Stella)"
 authors = "Stephen Anthony|Bradford Mott|Eckhard Stolberg|Brian Watson"
 supported_extensions = "a26|bin"
 corename = "Stella"
diff --git a/tempgba_libretro.info b/tempgba_libretro.info
index 001f262..1da513c 100644
--- a/tempgba_libretro.info
+++ b/tempgba_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy Advance (TempGBA)"
+display_name = "Nintendo - Game Boy Advance (TempGBA)"
 authors = "Exophase|Takka|Nebuleon|Normmatt|BassAceGold"
 supported_extensions = "gba|bin|agb|gbz"
 corename = "TempGBA"
diff --git a/tgbdual_libretro.info b/tgbdual_libretro.info
index 31f7d03..2af7c9c 100644
--- a/tgbdual_libretro.info
+++ b/tgbdual_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy / Game Boy Color (TGB Dual)"
+display_name = "Nintendo - Game Boy / Color (TGB Dual)"
 authors = "GIGO|Hii"
 supported_extensions = "gb|gbc|sgb"
 corename = "TGB Dual"
diff --git a/uae4arm_libretro.info b/uae4arm_libretro.info
index bbe42f9..794635b 100644
--- a/uae4arm_libretro.info
+++ b/uae4arm_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Amiga (UAE4ARM)"
+display_name = "Commodore - Amiga (UAE4ARM)"
 authors = "GnoStiC"
 supported_extensions = "adf|dms|zip|ipf|adz|uae"
 corename = "UAE4ARM"
diff --git a/vba_next_libretro.info b/vba_next_libretro.info
index 9f26fc3..f8a4ab1 100644
--- a/vba_next_libretro.info
+++ b/vba_next_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy Advance (VBA Next)"
+display_name = "Nintendo - Game Boy Advance (VBA Next)"
 authors = "Forgotten|VBA-M Team|Squarepusher"
 supported_extensions = "gba"
 corename = "VBA Next"
diff --git a/vbam_libretro.info b/vbam_libretro.info
index bd0c03d..591afb6 100644
--- a/vbam_libretro.info
+++ b/vbam_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Game Boy Advance (VBA-M)"
+display_name = "Nintendo - Game Boy Advance (VBA-M)"
 authors = "Forgotten|VBA-M Team"
 supported_extensions = "gba"
 corename = "VBA-M"
diff --git a/vecx_libretro.info b/vecx_libretro.info
index 305d3a8..b92373e 100644
--- a/vecx_libretro.info
+++ b/vecx_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Vectrex (vecx)"
+display_name = "GCE - Vectrex (vecx)"
 authors = "Valavan Manohararajah|John Hawthorn|Nikita Zimin|Demeth"
 supported_extensions = "bin|vec"
 corename = "vecx"
diff --git a/vemulator_libretro.info b/vemulator_libretro.info
new file mode 100644
index 0000000..4b1846e
--- /dev/null
+++ b/vemulator_libretro.info
@@ -0,0 +1,10 @@
+display_name = "VeMUlator"
+authors = "Mahmoud Jaoune"
+supported_extensions = "vms|dci|bin"
+corename = "VeMUlator"
+categories = "Game"
+systemname = "SEGA Visual Memory Unit"
+license = "GPL v3"
+permissions = ""
+display_version = "0.1"
+supports_no_game = "false"
diff --git a/vice_x128_libretro.info b/vice_x128_libretro.info
index 1d261cb..a6059a2 100644
--- a/vice_x128_libretro.info
+++ b/vice_x128_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Commodore 128 (VICE C128)"
+display_name = "Commodore - C128 (VICE C128)"
 authors = "VICE Core Team Members"
 supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z"
 corename = "VICE"
diff --git a/vice_x64_libretro.info b/vice_x64_libretro.info
index 11852b1..95a181f 100644
--- a/vice_x64_libretro.info
+++ b/vice_x64_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Commodore 64 (VICE C64)"
+display_name = "Commodore - C64 (VICE C64)"
 authors = "VICE Core Team Members"
 supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z"
 corename = "VICE"
diff --git a/vice_xplus4_libretro.info b/vice_xplus4_libretro.info
index 2e4af67..a30bcf9 100644
--- a/vice_xplus4_libretro.info
+++ b/vice_xplus4_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Commodore PLUS4 (VICE PLUS4)"
+display_name = "Commodore - PLUS4 (VICE PLUS4)"
 authors = "VICE Core Team Members"
 supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z"
 corename = "VICE"
diff --git a/vice_xvic_libretro.info b/vice_xvic_libretro.info
index 9fe1196..3d712e2 100644
--- a/vice_xvic_libretro.info
+++ b/vice_xvic_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Commodore VIC20 (VICE VIC20)"
+display_name = "Commodore - VIC20 (VICE VIC20)"
 authors = "VICE Core Team Members"
 supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z"
 corename = "VICE"
diff --git a/virtualjaguar_libretro.info b/virtualjaguar_libretro.info
index 40fbd39..5c376d8 100644
--- a/virtualjaguar_libretro.info
+++ b/virtualjaguar_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Atari Jaguar (Virtual Jaguar)"
+display_name = "Atari - Jaguar (Virtual Jaguar)"
 authors = "David Raingeard|Shamus"
 supported_extensions = "j64|jag|rom|abs|cof|bin|prg"
 corename = "Virtual Jaguar"
diff --git a/yabause_libretro.info b/yabause_libretro.info
index 796ef81..9098f5c 100644
--- a/yabause_libretro.info
+++ b/yabause_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Sega Saturn (Yabause)"
+display_name = "Sega - Saturn (Yabause)"
 authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen"
 supported_extensions = "bin|cue|iso"
 corename = "Yabause"