diff --git a/dist/info/bsnes_accuracy_libretro.info b/dist/info/bsnes_accuracy_libretro.info
index 804df0ca..1e7ea826 100644
--- a/dist/info/bsnes_accuracy_libretro.info
+++ b/dist/info/bsnes_accuracy_libretro.info
@@ -1,9 +1,9 @@
-display_name = "SNES / Super Famicom (bSNES Accuracy)"
+display_name = "SNES / Super Famicom (bsnes Accuracy)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes/higan Accuracy"
 manufacturer = "Nintendo"
-categoryname = "Emulator"
+categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
 license = "GPLv3"
 permissions = ""
@@ -50,14 +50,14 @@ firmware11_opt = "true"
 firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
-firmware13_path = "st011.program.rom"
+firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
 firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
-firmware15_path = "st018.program.rom"
+firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
 firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
 firmware16_path = "st018.program.rom"
diff --git a/dist/info/bsnes_balanced_libretro.info b/dist/info/bsnes_balanced_libretro.info
index 72e932b5..964de470 100644
--- a/dist/info/bsnes_balanced_libretro.info
+++ b/dist/info/bsnes_balanced_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bSNES Balanced)"
+display_name = "SNES / Super Famicom (bsnes Balanced)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes/higan Balanced"
@@ -50,14 +50,14 @@ firmware11_opt = "true"
 firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
-firmware13_path = "st011.program.rom"
+firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
 firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
-firmware15_path = "st018.program.rom"
+firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
 firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
 firmware16_path = "st018.program.rom"
diff --git a/dist/info/bsnes_mercury_accuracy_libretro.info b/dist/info/bsnes_mercury_accuracy_libretro.info
index 030d1a21..6338c73b 100644
--- a/dist/info/bsnes_mercury_accuracy_libretro.info
+++ b/dist/info/bsnes_mercury_accuracy_libretro.info
@@ -1,7 +1,7 @@
-display_name = "SNES / Super Famicom (bSNES Mercury Accuracy)"
+display_name = "SNES / Super Famicom (bsnes-mercury Accuracy)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
-corename = "bsnes/higan Mercury Accuracy"
+corename = "bsnes-mercury Accuracy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
@@ -50,14 +50,14 @@ firmware11_opt = "true"
 firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
-firmware13_path = "st011.program.rom"
+firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
 firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
-firmware15_path = "st018.program.rom"
+firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
 firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
 firmware16_path = "st018.program.rom"
diff --git a/dist/info/bsnes_mercury_balanced_libretro.info b/dist/info/bsnes_mercury_balanced_libretro.info
index 5dc5f487..54145032 100644
--- a/dist/info/bsnes_mercury_balanced_libretro.info
+++ b/dist/info/bsnes_mercury_balanced_libretro.info
@@ -1,7 +1,7 @@
-display_name = "SNES / Super Famicom (bSNES Mercury Balanced)"
+display_name = "SNES / Super Famicom (bsnes-mercury Balanced)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
-corename = "bsnes/higan Mercury Balanced"
+corename = "bsnes-mercury Balanced"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
@@ -50,14 +50,14 @@ firmware11_opt = "true"
 firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
-firmware13_path = "st011.program.rom"
+firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
 firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
-firmware15_path = "st018.program.rom"
+firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
 firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
 firmware16_path = "st018.program.rom"
diff --git a/dist/info/bsnes_mercury_performance_libretro.info b/dist/info/bsnes_mercury_performance_libretro.info
index 80cd78f7..cdc629ce 100644
--- a/dist/info/bsnes_mercury_performance_libretro.info
+++ b/dist/info/bsnes_mercury_performance_libretro.info
@@ -1,13 +1,13 @@
-display_name = "SNES / Super Famicom (bSNES Mercury Performance)"
+display_name = "SNES / Super Famicom (bsnes-mercury Performance)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
-corename = "bsnes/higan Mercury Performance"
+corename = "bsnes-mercury Performance"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
 license = "GPLv3"
 permissions = ""
-display:version = "v094 (Mercury Performance)"
+display_version = "v094 (Mercury Performance)"
 supports_no_game = "false"
 
 firmware_count = 17
@@ -47,14 +47,14 @@ firmware10_opt = "true"
 firmware11_desc = "st010.program.rom (ST-0010 PROGRAM)"
 firmware11_path = "st010.program.rom"
 firmware11_opt = "true"
-firmware12_desc = "st011.program.rom (ST-0011 PROGRAM)"
-firmware12_path = "st011.program.rom"
+firmware12_desc = "st011.data.rom (ST-0011 DATA)"
+firmware12_path = "st011.data.rom"
 firmware12_opt = "true"
 firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
 firmware13_path = "st011.program.rom"
 firmware13_opt = "true"
-firmware14_desc = "st018.program.rom (ST-0018 PROGRAM)"
-firmware14_path = "st018.program.rom"
+firmware14_desc = "st018.data.rom (ST-0018 DATA)"
+firmware14_path = "st018.data.rom"
 firmware14_opt = "true"
 firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
 firmware15_path = "st018.program.rom"
@@ -63,4 +63,4 @@ firmware16_desc = "sgb.boot.rom (SGB BOOT)"
 firmware16_path = "sgb.boot.rom"
 firmware16_opt = "true"
 
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- Cx4 emulation broken|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000"
+notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- Cx4 emulation broken"
diff --git a/dist/info/bsnes_performance_libretro.info b/dist/info/bsnes_performance_libretro.info
index c98a2be9..9adad42f 100644
--- a/dist/info/bsnes_performance_libretro.info
+++ b/dist/info/bsnes_performance_libretro.info
@@ -1,4 +1,4 @@
-display_name = "SNES / Super Famicom (bSNES Performance)"
+display_name = "SNES / Super Famicom (bsnes Performance)"
 authors = "byuu"
 supported_extensions = "sfc|smc|bml"
 corename = "bsnes/higan Performance"
@@ -7,7 +7,7 @@ categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
 license = "GPLv3"
 permissions = ""
-display:version = "v094 (Performance)"
+display_version = "v094 (Performance)"
 supports_no_game = "false"
 
 firmware_count = 17
@@ -47,14 +47,14 @@ firmware10_opt = "true"
 firmware11_desc = "st010.program.rom (ST-0010 PROGRAM)"
 firmware11_path = "st010.program.rom"
 firmware11_opt = "true"
-firmware12_desc = "st011.program.rom (ST-0011 PROGRAM)"
-firmware12_path = "st011.program.rom"
+firmware12_desc = "st011.data.rom (ST-0011 DATA)"
+firmware12_path = "st011.data.rom"
 firmware12_opt = "true"
 firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
 firmware13_path = "st011.program.rom"
 firmware13_opt = "true"
-firmware14_desc = "st018.program.rom (ST-0018 PROGRAM)"
-firmware14_path = "st018.program.rom"
+firmware14_desc = "st018.data.rom (ST-0018 DATA)"
+firmware14_path = "st018.data.rom"
 firmware14_opt = "true"
 firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
 firmware15_path = "st018.program.rom"
@@ -63,4 +63,4 @@ firmware16_desc = "sgb.boot.rom (SGB BOOT)"
 firmware16_path = "sgb.boot.rom"
 firmware16_opt = "true"
 
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- Cx4 emulation broken|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000"
+notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- Cx4 emulation broken"