diff --git a/dist/info/dolphin_libretro.info b/dist/info/dolphin_libretro.info
index a6c7d48d..d6e57cf7 100644
--- a/dist/info/dolphin_libretro.info
+++ b/dist/info/dolphin_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "gcm|iso|wbfs|ciso|gcz|elf|dol|dff"
 corename = "Dolphin"
 manufacturer = "Nintendo"
 categories = "Emulator"
-systemname = "Gamecube / Wii"
+systemname = "GameCube / Wii"
 database = "Nintendo - GameCube|Nintendo - Wii"
 license = "GPLv2+"
 permissions = ""
diff --git a/dist/info/fba_cores_cps1_libretro.info b/dist/info/fba_cores_cps1_libretro.info
index 6a029b78..c7a206bf 100644
--- a/dist/info/fba_cores_cps1_libretro.info
+++ b/dist/info/fba_cores_cps1_libretro.info
@@ -1,7 +1,7 @@
-display_name = "CPS1 (FBA)"
+display_name = "CPS-1 (FB Alpha)"
 authors = "Team FB Alpha"
 supported_extensions = "zip"
-corename = "Final Burn Alpha - CPS1"
+corename = "Final Burn Alpha - CPS-1"
 manufacturer = "Capcom"
 categories = "Emulator"
 systemname = "CP System I"
diff --git a/dist/info/fba_cores_cps2_libretro.info b/dist/info/fba_cores_cps2_libretro.info
index a991d43b..9f4520e2 100644
--- a/dist/info/fba_cores_cps2_libretro.info
+++ b/dist/info/fba_cores_cps2_libretro.info
@@ -1,7 +1,7 @@
-display_name = "CPS2 (FBA)"
+display_name = "CPS-2 (FB Alpha)"
 authors = "Team FB Alpha"
 supported_extensions = "zip"
-corename = "Final Burn Alpha - CPS2"
+corename = "Final Burn Alpha - CPS-2"
 manufacturer = "Capcom"
 categories = "Emulator"
 systemname = "CP System II"
diff --git a/dist/info/fba_cores_neo_libretro.info b/dist/info/fba_cores_neo_libretro.info
index 0a604620..2846ed1c 100644
--- a/dist/info/fba_cores_neo_libretro.info
+++ b/dist/info/fba_cores_neo_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Neo Geo (FBA)"
+display_name = "Neo Geo (FB Alpha)"
 authors = "Team FB Alpha"
 supported_extensions = "zip"
 corename = "Final Burn Alpha - Neo Geo"
diff --git a/dist/info/fb_alpha_libretro.info b/dist/info/fba_libretro.info
similarity index 90%
rename from dist/info/fb_alpha_libretro.info
rename to dist/info/fba_libretro.info
index bd91da36..943c422a 100644
--- a/dist/info/fb_alpha_libretro.info
+++ b/dist/info/fba_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Arcade (FBA)"
+display_name = "Arcade (FB Alpha)"
 authors = "Team FB Alpha"
 supported_extensions = "iso|zip"
 corename = "Final Burn Alpha"
diff --git a/dist/info/genesis_plus_gx_libretro.info b/dist/info/genesis_plus_gx_libretro.info
index 92be3353..bade3cdd 100644
--- a/dist/info/genesis_plus_gx_libretro.info
+++ b/dist/info/genesis_plus_gx_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "mdx|md|smd|gen|bin|cue|iso|sms|gg|sg"
 corename = "Genesis Plus GX"
 manufacturer = "Sega"
 categories = "Emulator"
-systemname = "Sega 8/16bit (Various)"
+systemname = "Sega 8/16-bit (Various)"
 database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/nestopia_libretro.info b/dist/info/nestopia_libretro.info
index e877420b..5c12002d 100644
--- a/dist/info/nestopia_libretro.info
+++ b/dist/info/nestopia_libretro.info
@@ -1,7 +1,7 @@
-display_name = "NES / Famicom (Nestopia)"
+display_name = "NES / Famicom (Nestopia UE)"
 authors = "Martin Freij|R. Belmont|R. Danbrook"
 supported_extensions = "nes|fds"
-corename = "Nestopia"
+corename = "Nestopia UE"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
diff --git a/dist/info/o2em_libretro.info b/dist/info/o2em_libretro.info
index c165690a..ddaa66fe 100644
--- a/dist/info/o2em_libretro.info
+++ b/dist/info/o2em_libretro.info
@@ -1,16 +1,16 @@
-display_name = "Odyssey 2/VideoPac (O2EM)"
+display_name = "Odyssey2 / Videopac+ (O2EM)"
 authors = "Daniel Boris|Andre de la Rocha|Arlindo M. de Oliveira"
 supported_extensions = "bin"
 corename = "O2EM"
 manufacturer = "Magnavox|Philips"
 categories = "Emulator"
-systemname = "Magnavox Odyssey 2/VideoPac"
+systemname = "Magnavox Odyssey2 / Videopac+"
 database = "Magnavox - Odyssey2"
 license = "Artistic License"
 permissions = ""
 display_version = "1.18"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "o2rom.bin (Odyssey 2 BIOS)"
+firmware0_desc = "o2rom.bin (Odyssey2 BIOS)"
 firmware0_path = "o2rom.bin"
 firmware0_opt = "false"
diff --git a/dist/info/picodrive_libretro.info b/dist/info/picodrive_libretro.info
index 6246e844..324a89b2 100644
--- a/dist/info/picodrive_libretro.info
+++ b/dist/info/picodrive_libretro.info
@@ -1,10 +1,10 @@
-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"
-corename = "Picodrive"
+corename = "PicoDrive"
 manufacturer = "Sega"
 categories = "Emulator"
-systemname = "Sega 16-bit + 32X (Various)"
+systemname = "Sega 8/16-bit + 32X (Various)"
 database = "Sega - Master System - Mark III|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
 license = "MAME"
 permissions = "dynarec_optional"
diff --git a/dist/info/pocketsnes_libretro.info b/dist/info/pocketsnes_libretro.info
index 2aa72c1a..57f8bdfa 100644
--- a/dist/info/pocketsnes_libretro.info
+++ b/dist/info/pocketsnes_libretro.info
@@ -1,5 +1,5 @@
 display_name = "SNES / Super Famicom (PocketSNES)"
-authors = "Snes9X Team|PocketSNES Team|Toadking"
+authors = "Snes9x Team|PocketSNES Team|Toadking"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 corename = "PocketSNES"
 manufacturer = "Nintendo"
diff --git a/dist/info/ppsspp_libretro.info b/dist/info/ppsspp_libretro.info
index bd42e823..1c3b4d6a 100644
--- a/dist/info/ppsspp_libretro.info
+++ b/dist/info/ppsspp_libretro.info
@@ -1,4 +1,4 @@
-display_name = "PSP (PlayStation Portable)"
+display_name = "PSP (PPSSPP)"
 authors = "Henrik Hrydgard"
 supported_extensions = "elf|iso|cso|prx|pbp"
 corename = "PPSSPP"
diff --git a/dist/info/snes9x_libretro.info b/dist/info/snes9x_libretro.info
index fb90f5f9..d7b3eb9f 100644
--- a/dist/info/snes9x_libretro.info
+++ b/dist/info/snes9x_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Snes9X)"
+display_name = "SNES / Super Famicom (Snes9x)"
 authors = "Snes9x Team"
 supported_extensions = "smc|sfc|swc|fig"
 corename = "Snes9x"
diff --git a/dist/info/snes9x_next_libretro.info b/dist/info/snes9x_next_libretro.info
index b95b4305..407e1e08 100644
--- a/dist/info/snes9x_next_libretro.info
+++ b/dist/info/snes9x_next_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (Snes9X Next)"
+display_name = "SNES / Super Famicom (Snes9x Next)"
 authors = "Snes9x Team|Squarepusher"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 corename = "Snes9x Next"