diff --git a/dist/info/vice_x128_libretro.info b/dist/info/vice_x128_libretro.info
index 43595b62..48a788df 100644
--- a/dist/info/vice_x128_libretro.info
+++ b/dist/info/vice_x128_libretro.info
@@ -11,3 +11,20 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
+firmware_count = 5
+firmware0_desc = "vice/JiffyDOS_C128.bin (JiffyDOS C128 Kernal)"
+firmware0_path = "vice/JiffyDOS_C128.bin"
+firmware0_opt = "true"
+firmware1_desc = "vice/JiffyDOS_C64.bin (JiffyDOS C64 Kernal)"
+firmware1_path = "vice/JiffyDOS_C64.bin"
+firmware1_opt = "true"
+firmware2_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 drive BIOS)"
+firmware2_path = "vice/JiffyDOS_1541-II.bin"
+firmware2_opt = "true"
+firmware3_desc = "vice/JiffyDOS_1571_repl310654.bin (JiffyDOS 1571 drive BIOS)"
+firmware3_path = "vice/JiffyDOS_1571_repl310654.bin"
+firmware3_opt = "true"
+firmware4_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 drive BIOS)"
+firmware4_path = "vice/JiffyDOS_1581.bin"
+firmware4_opt = "true"
+notes = "(!) JiffyDOS_C128.bin (md5): cbbd1bbcb5e4fd8046b6030ab71fc021|(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1571_repl310654.bin (md5): 41c6cc528e9515ffd0ed9b180f8467c0|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
diff --git a/dist/info/vice_x64_libretro.info b/dist/info/vice_x64_libretro.info
index ee958f02..c3b39e43 100644
--- a/dist/info/vice_x64_libretro.info
+++ b/dist/info/vice_x64_libretro.info
@@ -11,14 +11,17 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
-firmware_count = 3
-firmware0_desc = "vice/JiffyDOS_C64.bin (JiffyDOS Kernal)"
+firmware_count = 4
+firmware0_desc = "vice/JiffyDOS_C64.bin (JiffyDOS C64 Kernal)"
 firmware0_path = "vice/JiffyDOS_C64.bin"
 firmware0_opt = "true"
-firmware1_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 Floppy BIOS)"
+firmware1_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 drive BIOS)"
 firmware1_path = "vice/JiffyDOS_1541-II.bin"
 firmware1_opt = "true"
-firmware2_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 Floppy BIOS)"
-firmware2_path = "vice/JiffyDOS_1581.bin"
+firmware2_desc = "vice/JiffyDOS_1571_repl310654.bin (JiffyDOS 1571 drive BIOS)"
+firmware2_path = "vice/JiffyDOS_1571_repl310654.bin"
 firmware2_opt = "true"
-notes = "(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
+firmware3_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 drive BIOS)"
+firmware3_path = "vice/JiffyDOS_1581.bin"
+firmware3_opt = "true"
+notes = "(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1571_repl310654.bin (md5): 41c6cc528e9515ffd0ed9b180f8467c0|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
diff --git a/dist/info/vice_x64sc_libretro.info b/dist/info/vice_x64sc_libretro.info
index e5047ef2..2153132e 100644
--- a/dist/info/vice_x64sc_libretro.info
+++ b/dist/info/vice_x64sc_libretro.info
@@ -11,14 +11,17 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
-firmware_count = 3
-firmware0_desc = "vice/JiffyDOS_C64.bin (JiffyDOS Kernal)"
+firmware_count = 4
+firmware0_desc = "vice/JiffyDOS_C64.bin (JiffyDOS C64 Kernal)"
 firmware0_path = "vice/JiffyDOS_C64.bin"
 firmware0_opt = "true"
-firmware1_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 Floppy BIOS)"
+firmware1_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 drive BIOS)"
 firmware1_path = "vice/JiffyDOS_1541-II.bin"
 firmware1_opt = "true"
-firmware2_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 Floppy BIOS)"
-firmware2_path = "vice/JiffyDOS_1581.bin"
+firmware2_desc = "vice/JiffyDOS_1571_repl310654.bin (JiffyDOS 1571 drive BIOS)"
+firmware2_path = "vice/JiffyDOS_1571_repl310654.bin"
 firmware2_opt = "true"
-notes = "(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
+firmware3_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 drive BIOS)"
+firmware3_path = "vice/JiffyDOS_1581.bin"
+firmware3_opt = "true"
+notes = "(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1571_repl310654.bin (md5): 41c6cc528e9515ffd0ed9b180f8467c0|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
diff --git a/dist/info/vice_xcbm2_libretro.info b/dist/info/vice_xcbm2_libretro.info
index eb7a3168..6e7e8124 100644
--- a/dist/info/vice_xcbm2_libretro.info
+++ b/dist/info/vice_xcbm2_libretro.info
@@ -4,9 +4,9 @@ supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "CBM2"
+systemname = "CBM-II"
 systemid = "commodore_cbm2"
-database = "Commodore - CBM2"
+database = "Commodore - CBM-II"
 license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
diff --git a/dist/info/vice_xpet_libretro.info b/dist/info/vice_xpet_libretro.info
index bf4d01a0..1173ec2c 100644
--- a/dist/info/vice_xpet_libretro.info
+++ b/dist/info/vice_xpet_libretro.info
@@ -11,26 +11,3 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
-firmware_count = 7
-firmware0_desc = "chargen (PET BIOS)"
-firmware0_path = "vice/PET/chargen"
-firmware0_opt = "false"
-firmware1_desc = "edit1g (PET BIOS)"
-firmware1_path = "vice/PET/edit1g"
-firmware1_opt = "false"
-firmware2_desc = "edit2b (PET BIOS)"
-firmware2_path = "vice/PET/edit2b"
-firmware2_opt = "false"
-firmware3_desc = "edit2g (PET BIOS)"
-firmware3_path = "vice/PET/edit2g"
-firmware3_opt = "false"
-firmware4_desc = "edit4b40 (PET BIOS)"
-firmware4_path = "vice/PET/edit4b40"
-firmware4_opt = "false"
-firmware5_desc = "edit4b80 (PET BIOS)"
-firmware5_path = "vice/PET/edit4b80"
-firmware5_opt = "false"
-firmware6_desc = "edit4g40 (PET BIOS)"
-firmware6_path = "vice/PET/edit4g40"
-firmware6_opt = "false"
-notes = "(i) Place BIOS files in system/vice/PET folder."
diff --git a/dist/info/vice_xplus4_libretro.info b/dist/info/vice_xplus4_libretro.info
index fde6017e..0b2f83b9 100644
--- a/dist/info/vice_xplus4_libretro.info
+++ b/dist/info/vice_xplus4_libretro.info
@@ -1,12 +1,12 @@
-display_name = "Commodore - PLUS4 (VICE xplus4)"
+display_name = "Commodore - PLUS/4 (VICE xplus4)"
 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|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "PLUS4"
+systemname = "PLUS/4"
 systemid = "commodore_plus_4"
-database = "Commodore - PLUS4"
+database = "Commodore - PLUS-4"
 license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
diff --git a/dist/info/vice_xvic_libretro.info b/dist/info/vice_xvic_libretro.info
index 5c98ea71..af09f989 100644
--- a/dist/info/vice_xvic_libretro.info
+++ b/dist/info/vice_xvic_libretro.info
@@ -1,12 +1,12 @@
-display_name = "Commodore - VIC20 (VICE xvic)"
+display_name = "Commodore - VIC-20 (VICE xvic)"
 authors = "VICE Core Team Members"
 supported_extensions = "20|40|60|a0|b0|d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "VIC20"
+systemname = "VIC-20"
 systemid = "commodore_vic_20"
-database = "Commodore - VIC20"
+database = "Commodore - VIC-20"
 license = "GPLv2"
 permissions = ""
 display_version = "v3.3"