diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp
index 8154519fb..50a91ca66 100644
--- a/src/burn/drv/capcom/d_cps1.cpp
+++ b/src/burn/drv/capcom/d_cps1.cpp
@@ -4251,12 +4251,6 @@ static struct BurnRomInfo Wonder3bRomDesc[] = {
 	{ "27512.2",       0x010000, 0xabfca165, BRF_PRG | CPS1_Z80_PROGRAM },
 
 	{ "27020.1",       0x040000, 0x3c4348cf, BRF_SND | CPS1_OKIM6295_SAMPLES },
-		
-	A_BOARD_PLDS
-	
-	{ "rt24b.1a",      0x000117, 0x54b85159, BRF_OPT },	// b-board PLDs
-	{ "iob1.11e",      0x000117, 0x3abc0700, BRF_OPT },
-	{ "ioc1.ic1",      0x000117, 0x0d182081, BRF_OPT },	// c-board PLDs
 };
 
 STD_ROM_PICK(Wonder3b)
@@ -5510,7 +5504,7 @@ static struct BurnRomInfo Ffightj3RomDesc[] = {
 	A_BOARD_PLDS
 	
 	{ "s222b.1a",      0x000117, 0x6d86b45e, BRF_OPT }, // b-board PLDs
-	{ "lwio.12c",      0x000117, 0xad52b90c, BRF_OPT },
+	{ "lwio.12e",      0x000117, 0xad52b90c, BRF_OPT },
 };
 
 STD_ROM_PICK(Ffightj3)
@@ -8276,8 +8270,8 @@ static struct BurnRomInfo Sf2jRomDesc[] = {
 	{ "sf2j38.bin",    0x020000, 0x38614d70, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
 	{ "sf2j28.bin",    0x020000, 0xd283187a, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
 	{ "sf2j35.bin",    0x020000, 0xd28158e4, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-	{ "sf2j_29a.10e",  0x020000, 0xbb4af315, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-	{ "sf2j_36a.10f",  0x020000, 0xc02a13eb, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "sf2_29a.bin",   0x020000, 0xbb4af315, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "sf2_36a.bin",   0x020000, 0xc02a13eb, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
 
 	{ "sf2_06.8a",     0x080000, 0x22c9cc8e, BRF_GRA | CPS1_TILES },
 	{ "sf2_08.10a",    0x080000, 0x57213be8, BRF_GRA | CPS1_TILES },
@@ -8292,10 +8286,10 @@ static struct BurnRomInfo Sf2jRomDesc[] = {
 	{ "sf2_24.7d",     0x080000, 0xc1befaa8, BRF_GRA | CPS1_TILES },
 	{ "sf2_26.9d",     0x080000, 0x0627c831, BRF_GRA | CPS1_TILES },
 
-	{ "sf2_09.12a",    0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
+	{ "sf2_09.bin",    0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
 
-	{ "sf2_18.11c",    0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
-	{ "sf2_19.12c",    0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
+	{ "sf2_18.bin",    0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
+	{ "sf2_19.bin",    0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
 	
 	A_BOARD_PLDS
 	
diff --git a/src/burn/drv/capcom/d_cps2.cpp b/src/burn/drv/capcom/d_cps2.cpp
index b6c016615..f82e43602 100644
--- a/src/burn/drv/capcom/d_cps2.cpp
+++ b/src/burn/drv/capcom/d_cps2.cpp
@@ -2063,8 +2063,8 @@ static struct BurnRomInfo DdtodaRomDesc[] = {
 	{ "dada.03c",      0x080000, 0xbf243e15, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
 	{ "dada.04c",      0x080000, 0x76551eec, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
 	{ "dada.05c",      0x080000, 0x0a0ad827, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
-	{ "dada.06a",      0x080000, 0x6225495a, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
-	{ "dada.07a",      0x080000, 0xb3480ec3, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
+	{ "dad.06a",       0x080000, 0x6225495a, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
+	{ "dad.07a",       0x080000, 0xb3480ec3, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
 
 	{ "dad.13m",       0x200000, 0xda3cb7d6, CPS2_GFX | BRF_GRA },
 	{ "dad.15m",       0x200000, 0x92b63172, CPS2_GFX | BRF_GRA },
diff --git a/src/burn/drv/dataeast/d_dietgogo.cpp b/src/burn/drv/dataeast/d_dietgogo.cpp
index 278e93346..2b8a2163f 100644
--- a/src/burn/drv/dataeast/d_dietgogo.cpp
+++ b/src/burn/drv/dataeast/d_dietgogo.cpp
@@ -507,12 +507,12 @@ static struct BurnRomInfo dietgouRomDesc[] = {
 
 	{ "jx_02.14m",			0x010000, 0x4e3492a5, 2 | BRF_PRG | BRF_ESS }, //  2 Huc6280 Code
 
-	{ "may00",				0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
+	{ "may-00.10a",			0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
 
-	{ "may01",				0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
-	{ "may02",				0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
+	{ "may-01.14a",			0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
+	{ "may-02.16a",			0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
 
-	{ "may03",				0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
+	{ "may-03.11l",			0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
 
 	{ "pal16l8b_vd-00.6h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  7 PLDs
 	{ "pal16l8b_vd-01.7h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  8
@@ -539,14 +539,14 @@ static struct BurnRomInfo dietgoeRomDesc[] = {
 	{ "jy_00-1.4h",			0x040000, 0x8bce137d, 1 | BRF_PRG | BRF_ESS }, //  0 68k Code
 	{ "jy_01-1.5h",			0x040000, 0xeca50450, 1 | BRF_PRG | BRF_ESS }, //  1
 
-	{ "jy_02.m14",			0x010000, 0x4e3492a5, 2 | BRF_PRG | BRF_ESS }, //  2 Huc6280 Code
+	{ "jy_02.14m",			0x010000, 0x4e3492a5, 2 | BRF_PRG | BRF_ESS }, //  2 Huc6280 Code
 
-	{ "may00",				0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
+	{ "may-00.10a",			0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
 
-	{ "may01",				0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
-	{ "may02",				0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
+	{ "may-01.14a",			0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
+	{ "may-02.16a",			0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
 
-	{ "may03",				0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
+	{ "may-03.11l",			0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
 
 	{ "pal16l8b_vd-00.6h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  7 PLDs
 	{ "pal16l8b_vd-01.7h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  8
@@ -570,17 +570,17 @@ struct BurnDriver BurnDrvDietgoe = {
 // Diet Go Go (Euro v1.1 1992.09.26)
 
 static struct BurnRomInfo dietgoRomDesc[] = {
-	{ "jy_00-2.h4",			0x040000, 0x014dcf62, 1 | BRF_PRG | BRF_ESS }, //  0 68k Code
-	{ "jy_01-2.h5",			0x040000, 0x793ebd83, 1 | BRF_PRG | BRF_ESS }, //  1
+	{ "jy_00-2.4h",			0x040000, 0x014dcf62, 1 | BRF_PRG | BRF_ESS }, //  0 68k Code
+	{ "jy_01-2.5h",			0x040000, 0x793ebd83, 1 | BRF_PRG | BRF_ESS }, //  1
 
-	{ "jy_02.m14",			0x010000, 0x4e3492a5, 2 | BRF_PRG | BRF_ESS }, //  2 Huc6280 Code
+	{ "jy_02.14m",			0x010000, 0x4e3492a5, 2 | BRF_PRG | BRF_ESS }, //  2 Huc6280 Code
 
-	{ "may00",				0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
+	{ "may-00.10a",			0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
 
-	{ "may01",				0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
-	{ "may02",				0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
+	{ "may-01.14a",			0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
+	{ "may-02.16a",			0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
 
-	{ "may03",				0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
+	{ "may-03.11l",			0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
 
 	{ "pal16l8b_vd-00.6h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  7 PLDs
 	{ "pal16l8b_vd-01.7h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  8
@@ -609,12 +609,12 @@ static struct BurnRomInfo dietgojRomDesc[] = {
 
 	{ "jw_02.14m",			0x010000, 0x4e3492a5, 2 | BRF_PRG | BRF_ESS }, //  2 Huc6280 Code
 
-	{ "may00",				0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
+	{ "may-00.10a",			0x100000, 0x234d1f8d, 3 | BRF_GRA },           //  3 Characters & Background Tiles
 
-	{ "may01",				0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
-	{ "may02",				0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
+	{ "may-01.14a",			0x100000, 0x2da57d04, 4 | BRF_GRA },           //  4 Sprites
+	{ "may-02.16a",			0x100000, 0x3a66a713, 4 | BRF_GRA },           //  5
 
-	{ "may03",				0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
+	{ "may-03.11l",			0x080000, 0xb6e42bae, 5 | BRF_SND },           //  6 OKI M6295 Samples
 	
 	{ "pal16l8b_vd-00.6h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  7 PLDs
 	{ "pal16l8b_vd-01.7h",	0x000104, 0x00000000, 6 | BRF_NODUMP },        //  8
diff --git a/src/burn/drv/konami/d_mainevt.cpp b/src/burn/drv/konami/d_mainevt.cpp
index 70d2bb0c1..637eca58d 100644
--- a/src/burn/drv/konami/d_mainevt.cpp
+++ b/src/burn/drv/konami/d_mainevt.cpp
@@ -1186,7 +1186,7 @@ struct BurnDriver BurnDrvDevstors2 = {
 // Devastators (ver. V)
 
 static struct BurnRomInfo devstors3RomDesc[] = {
-	{ "890k02.k11",		0x10000, 0x52f4ccdd, 1 | BRF_PRG | BRF_ESS }, //  0 HD6309 Code
+	{ "890v02.k11",		0x10000, 0x52f4ccdd, 1 | BRF_PRG | BRF_ESS }, //  0 HD6309 Code
 
 	{ "890k01.f7",		0x08000, 0xd44b3eb0, 2 | BRF_PRG | BRF_ESS }, //  1 Z80 Code
 
diff --git a/src/burn/drv/konami/d_simpsons.cpp b/src/burn/drv/konami/d_simpsons.cpp
index 155b4abaa..29851bbc6 100644
--- a/src/burn/drv/konami/d_simpsons.cpp
+++ b/src/burn/drv/konami/d_simpsons.cpp
@@ -794,7 +794,7 @@ static struct BurnRomInfo simpsonsRomDesc[] = {
 	{ "072-d05.1f",		0x100000, 0x1397a73b, 5 | BRF_SND },           // 11 K053260 Samples
 	{ "072-d04.1d",		0x040000, 0x78778013, 5 | BRF_SND },           // 12
 
-	{ "simpsons.nv",  0x000080, 0xec3f0449, BRF_OPT },
+	{ "simpsons.12c.nv",  0x000080, 0xec3f0449, BRF_OPT },
 };
 
 STD_ROM_PICK(simpsons)
@@ -832,7 +832,7 @@ static struct BurnRomInfo simpsons4paRomDesc[] = {
 	{ "072-d05.1f",		0x100000, 0x1397a73b, 5 | BRF_SND },           // 11 K053260 Samples
 	{ "072-d04.1d",		0x040000, 0x78778013, 5 | BRF_SND },           // 12
 
-	{ "simpsons4pa.nv",  0x000080, 0xec3f0449, BRF_OPT },
+	{ "simpsons4pa.12c.nv",  0x000080, 0xec3f0449, BRF_OPT },
 };
 
 STD_ROM_PICK(simpsons4pa)
@@ -870,7 +870,7 @@ static struct BurnRomInfo simpsons2pRomDesc[] = {
 	{ "072-d05.1f",		0x100000, 0x1397a73b, 5 | BRF_SND },           // 11 K053260 Samples
 	{ "072-d04.1d",		0x040000, 0x78778013, 5 | BRF_SND },           // 12
 
-	{ "simpsons2p.nv",  0x000080, 0xfbac4e30, BRF_OPT },
+	{ "simpsons2p.12c.nv",  0x000080, 0xfbac4e30, BRF_OPT },
 };
 
 STD_ROM_PICK(simpsons2p)
@@ -908,7 +908,7 @@ static struct BurnRomInfo simpsons2p2RomDesc[] = {
 	{ "072-d05.1f",		0x100000, 0x1397a73b, 5 | BRF_SND },           // 11 K053260 Samples
 	{ "072-d04.1d",		0x040000, 0x78778013, 5 | BRF_SND },           // 12
 
-	{ "simpsons2p2.nv",  0x000080, 0xfbac4e30, BRF_OPT },
+	{ "simpsons2p2.12c.nv",  0x000080, 0xfbac4e30, BRF_OPT },
 };
 
 STD_ROM_PICK(simpsons2p2)
@@ -946,7 +946,7 @@ static struct BurnRomInfo simpsons2paRomDesc[] = {
 	{ "072-d05.1f",		0x100000, 0x1397a73b, 5 | BRF_SND },           // 11 K053260 Samples
 	{ "072-d04.1d",		0x040000, 0x78778013, 5 | BRF_SND },           // 12
 
-	{ "simpsons2pa.nv",  0x000080, 0xfbac4e30, BRF_OPT },
+	{ "simpsons2pa.12c.nv",  0x000080, 0xfbac4e30, BRF_OPT },
 };
 
 STD_ROM_PICK(simpsons2pa)
@@ -984,7 +984,7 @@ static struct BurnRomInfo simpsons2pjRomDesc[] = {
 	{ "072-d05.1f",		0x100000, 0x1397a73b, 5 | BRF_SND },           // 11 K053260 Samples
 	{ "072-d04.1d",		0x040000, 0x78778013, 5 | BRF_SND },           // 12
 
-	{ "simpsons2pj.nv",  0x000080, 0x3550a54e, BRF_OPT },
+	{ "simpsons2pj.12c.nv",  0x000080, 0x3550a54e, BRF_OPT },
 };
 
 STD_ROM_PICK(simpsons2pj)
diff --git a/src/burn/drv/neogeo/d_neogeo.cpp b/src/burn/drv/neogeo/d_neogeo.cpp
index 8a88f75ec..27abc47ab 100644
--- a/src/burn/drv/neogeo/d_neogeo.cpp
+++ b/src/burn/drv/neogeo/d_neogeo.cpp
@@ -1028,7 +1028,8 @@ static struct BurnRomInfo neotrackballRomDesc[] = {
 	{ "236-bios.sp1",      0x20000, 0x853e6b96, BRF_ESS | BRF_PRG | BRF_BIOS                        }, // 26 Trackball BIOS
 	{ "",                  0x00000, 0x00000000, 0                                                   }, // 27
 
-	{ "sm1.sm1",           0x20000, 0x94416d67, BRF_ESS | BRF_PRG | BRF_BIOS                        }, // 28 Z80 BIOS
+//	{ "sm1.sm1",           0x20000, 0x94416d67, BRF_ESS | BRF_PRG | BRF_BIOS                        }, // 28 Z80 BIOS
+	{ "",                  0x00000, 0x00000000, 0                                                   }, // 28 Z80 BIOS
 	{ "sfix.sfix",         0x20000, 0xc2ea0cfd, BRF_GRA | BRF_BIOS                                  }, // 29 Text layer tiles
 	{ "000-lo.lo",         0x20000, 0x5a86cff2, BRF_ESS | BRF_BIOS                                  }, // 30 Zoom table
 };
diff --git a/src/burn/drv/pre90s/d_commando.cpp b/src/burn/drv/pre90s/d_commando.cpp
index 754bb4117..79e94376f 100644
--- a/src/burn/drv/pre90s/d_commando.cpp
+++ b/src/burn/drv/pre90s/d_commando.cpp
@@ -357,7 +357,7 @@ static struct BurnRomInfo Drvb2RomDesc[] = {
 	{ "vtb5.6l",       0x00100, 0x712ac508, BRF_GRA },	     //  20
 	{ "vtb6.6e",       0x00100, 0x0eaf5158, BRF_GRA },	     //  21
 	
-	{ "commandob2_pal16l8a.bin", 0x00104, 0x00000000, BRF_OPT | BRF_NODUMP },		// 22 PLDs
+	{ "commandob2_pal16l8.bin", 0x00104, 0xbdbcaf02, BRF_OPT },		// 22 PLDs
 };
 
 STD_ROM_PICK(Drvb2)
diff --git a/src/burn/drv/pre90s/d_ddragon.cpp b/src/burn/drv/pre90s/d_ddragon.cpp
index b9eb703dc..19e4181df 100644
--- a/src/burn/drv/pre90s/d_ddragon.cpp
+++ b/src/burn/drv/pre90s/d_ddragon.cpp
@@ -404,8 +404,8 @@ static struct BurnRomInfo DrvwRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvw)
@@ -440,8 +440,8 @@ static struct BurnRomInfo Drvw1RomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvw1)
@@ -476,8 +476,8 @@ static struct BurnRomInfo DrvuRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvu)
@@ -512,8 +512,8 @@ static struct BurnRomInfo DrvuaRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvua)
@@ -548,8 +548,8 @@ static struct BurnRomInfo DrvubRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvub)
@@ -584,8 +584,8 @@ static struct BurnRomInfo Drvb2RomDesc[] = {
 	{ "b2_1.bin",      0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "2.bin",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvb2)
@@ -620,8 +620,8 @@ static struct BurnRomInfo DrvbRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Drvb)
@@ -655,8 +655,8 @@ static struct BurnRomInfo DrvbaRomDesc[] = {
 	{ "8.bin",         0x10000, 0x34755de3, BRF_GRA },	     //  18	Samples
 	{ "7.bin",         0x10000, 0xf9311f72, BRF_GRA },	     //  19
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  20	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  21
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  20	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  21
 };
 
 STD_ROM_PICK(Drvba)
@@ -745,8 +745,8 @@ static struct BurnRomInfo DdungeonRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  10	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  11
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  12	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  13
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  12	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  13
 };
 
 STD_ROM_PICK(Ddungeon)
@@ -782,8 +782,8 @@ static struct BurnRomInfo DarktowrRomDesc[] = {
 	{ "21j-6",         0x10000, 0x34755de3, BRF_GRA },	     //  19	Samples
 	{ "21j-7",         0x10000, 0x904de6f8, BRF_GRA },	     //  20
 	
-	{ "21j-k-0",       0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
-	{ "21j-l-0",       0x00200, 0x46339529, BRF_GRA },	     //  22
+	{ "21j-k-0.101",   0x00100, 0xfdb130a9, BRF_GRA },	     //  21	PROMs
+	{ "21j-l-0.16",    0x00200, 0x46339529, BRF_GRA },	     //  22
 };
 
 STD_ROM_PICK(Darktowr)
diff --git a/src/burn/drv/pre90s/d_dkong.cpp b/src/burn/drv/pre90s/d_dkong.cpp
index e1f9d1f19..d1dab5a63 100644
--- a/src/burn/drv/pre90s/d_dkong.cpp
+++ b/src/burn/drv/pre90s/d_dkong.cpp
@@ -2635,9 +2635,9 @@ struct BurnDriverD BurnDrvDkongjre = {
 // Donkey Kong Junior (P Kit, bootleg)
 
 static struct BurnRomInfo dkongjrpbRomDesc[] = {
-	{ "djr1-c.5b-p",	0x2000, 0x8d99b3e0, 1 }, //  0 maincpu
-	{ "djr1-c.5c-p",	0x2000, 0xb92d258c, 1 }, //  1
-	{ "djr1-c.5e",		0x2000, 0x24c3d325, 1 }, //  2
+	{ "dkjr1-c.5b-p",	0x2000, 0x8d99b3e0, 1 }, //  0 maincpu
+	{ "dkjr1-c.5c-p",	0x2000, 0xb92d258c, 1 }, //  1
+	{ "dkjr1-c.5e",		0x2000, 0xd042b6a8, 1 }, //  2
 
 	{ "c_3h.bin",	0x1000, 0x715da5f8, 2 }, //  3 soundcpu
 
diff --git a/src/burn/drv/pre90s/d_gng.cpp b/src/burn/drv/pre90s/d_gng.cpp
index 7764b7f94..a26b3fd97 100644
--- a/src/burn/drv/pre90s/d_gng.cpp
+++ b/src/burn/drv/pre90s/d_gng.cpp
@@ -527,30 +527,30 @@ STD_ROM_PICK(Drvprot)
 STD_ROM_FN(Drvprot)
 
 static struct BurnRomInfo DrvtRomDesc[] = {
-	{ "mm04",          0x04000, 0x652406f6, BRF_ESS | BRF_PRG }, //  0	M6809 Program Code
-	{ "mm03",          0x08000, 0xfb040b42, BRF_ESS | BRF_PRG }, //	 1
-	{ "mm05",          0x08000, 0x8f7cff61, BRF_ESS | BRF_PRG }, //	 2
+	{ "mmt04d.10n",    0x04000, 0x652406f6, BRF_ESS | BRF_PRG }, //  0	M6809 Program Code
+	{ "mmt03d.8n",     0x08000, 0xfb040b42, BRF_ESS | BRF_PRG }, //	 1
+	{ "mmt05d.13n",    0x08000, 0x8f7cff61, BRF_ESS | BRF_PRG }, //	 2
 	
-	{ "gg2.bin",       0x08000, 0x615f5b6f, BRF_ESS | BRF_PRG }, //  3	Z80 Program 
+	{ "mm02.14h",      0x08000, 0x615f5b6f, BRF_ESS | BRF_PRG }, //  3	Z80 Program 
 	
-	{ "gg1.bin",       0x04000, 0xecfccf07, BRF_GRA },	     //  4	Characters
+	{ "mm01.11e",      0x04000, 0xecfccf07, BRF_GRA },	     //  4	Characters
 	
-	{ "gg11.bin",      0x04000, 0xddd56fa9, BRF_GRA },	     //  5	Tiles
-	{ "gg10.bin",      0x04000, 0x7302529d, BRF_GRA },	     //  6
-	{ "gg9.bin",       0x04000, 0x20035bda, BRF_GRA },	     //  7
-	{ "gg8.bin",       0x04000, 0xf12ba271, BRF_GRA },	     //  8
-	{ "gg7.bin",       0x04000, 0xe525207d, BRF_GRA },	     //  9
-	{ "gg6.bin",       0x04000, 0x2d77e9b2, BRF_GRA },	     //  10
+	{ "mm11.3e",       0x04000, 0xddd56fa9, BRF_GRA },	     //  5	Tiles
+	{ "mm10.1e",       0x04000, 0x7302529d, BRF_GRA },	     //  6
+	{ "mm09.3c",       0x04000, 0x20035bda, BRF_GRA },	     //  7
+	{ "mm08.1c",       0x04000, 0xf12ba271, BRF_GRA },	     //  8
+	{ "mm07.3b",       0x04000, 0xe525207d, BRF_GRA },	     //  9
+	{ "mm06.1b",       0x04000, 0x2d77e9b2, BRF_GRA },	     //  10
 	
-	{ "gg17.bin",      0x04000, 0x93e50a8f, BRF_GRA },	     //  11	Sprites
-	{ "gg16.bin",      0x04000, 0x06d7e5ca, BRF_GRA },	     //  12
-	{ "gg15.bin",      0x04000, 0xbc1fe02d, BRF_GRA },	     //  13
-	{ "gg14.bin",      0x04000, 0x6aaf12f9, BRF_GRA },	     //  14
-	{ "gg13.bin",      0x04000, 0xe80c3fca, BRF_GRA },	     //  15
-	{ "gg12.bin",      0x04000, 0x7780a925, BRF_GRA },	     //  16
+	{ "mm17.4n",       0x04000, 0x93e50a8f, BRF_GRA },	     //  11	Sprites
+	{ "mm16.3n",       0x04000, 0x06d7e5ca, BRF_GRA },	     //  12
+	{ "mm15.1n",       0x04000, 0xbc1fe02d, BRF_GRA },	     //  13
+	{ "mm14.4l",       0x04000, 0x6aaf12f9, BRF_GRA },	     //  14
+	{ "mm13.3l",       0x04000, 0xe80c3fca, BRF_GRA },	     //  15
+	{ "mm12.1l",       0x04000, 0x7780a925, BRF_GRA },	     //  16
 	
-	{ "tbp24s10.14k",  0x00100, 0x0eaf5158, BRF_GRA },	     //  17	PROMs
-	{ "63s141.2e",     0x00100, 0x4a1285a4, BRF_GRA },	     //  18
+	{ "m-02.14k",      0x00100, 0x0eaf5158, BRF_GRA },	     //  17	PROMs
+	{ "m-01.2e",       0x00100, 0x4a1285a4, BRF_GRA },	     //  18
 };
 
 STD_ROM_PICK(Drvt)
diff --git a/src/burn/drv/pre90s/d_sf.cpp b/src/burn/drv/pre90s/d_sf.cpp
index 453d654e2..3304396d3 100644
--- a/src/burn/drv/pre90s/d_sf.cpp
+++ b/src/burn/drv/pre90s/d_sf.cpp
@@ -1397,10 +1397,10 @@ static struct BurnRomInfo sfRomDesc[] = {
 	{ "sf-32.bin",  0x10000, 0x72df2bd9, 8 | BRF_GRA },           // 38
 	{ "sf-33.bin",  0x10000, 0x3e99d3d5, 8 | BRF_GRA },           // 39
 
-	{ "mb7114h.12k", 0x0100, 0x75af3553, 0 | BRF_OPT },           // 40 Proms
-	{ "mb7114h.11h", 0x0100, 0xc0e56586, 0 | BRF_OPT },           // 41
-	{ "mb7114h.12j", 0x0100, 0x4c734b64, 0 | BRF_OPT },           // 42
-	{ "mmi-7603.13h",0x0020, 0x06bcda53, 0 | BRF_OPT },           // 43
+	{ "sfb05(__sf).mb7114h.12k", 0x0100, 0x75af3553, 0 | BRF_OPT },           // 40 Proms
+	{ "sfb10(__sf).mb7114h.11h", 0x0100, 0xc0e56586, 0 | BRF_OPT },           // 41
+	{ "sfb04(__sf).mb7114h.12j", 0x0100, 0x4c734b64, 0 | BRF_OPT },           // 42
+	{ "sfb00(__sf).mb7051.13h",0x0020, 0x06bcda53, 0 | BRF_OPT },           // 43
 };
 
 STD_ROM_PICK(sf)
diff --git a/src/burn/drv/pre90s/d_snk68.cpp b/src/burn/drv/pre90s/d_snk68.cpp
index eb2ace78e..2d4c8efde 100644
--- a/src/burn/drv/pre90s/d_snk68.cpp
+++ b/src/burn/drv/pre90s/d_snk68.cpp
@@ -1788,7 +1788,7 @@ static struct BurnRomInfo ikari3uRomDesc[] = {
 	{ "ik3-1.c8",   0x10000, 0x47e4d256, 1 | BRF_PRG }, //  2
 	{ "ik3-4.c12",  0x10000, 0xa43af6b5, 1 | BRF_PRG }, //  3
 
-	{ "ik3-5.16d",  0x10000, 0xce6706fc, 2 | BRF_PRG }, //  4 Z80 Code
+	{ "ik3-5.15d",  0x10000, 0xce6706fc, 2 | BRF_PRG }, //  4 Z80 Code
 
 	{ "ik3-7.16l",  0x08000, 0x0b4804df, 3 | BRF_GRA }, //  5 Characters
 	{ "ik3-8.16m",  0x08000, 0x10ab4e50, 3 | BRF_GRA }, //  6
diff --git a/src/burn/drv/pst90s/d_galpanic.cpp b/src/burn/drv/pst90s/d_galpanic.cpp
index 084f60e4a..e21f2eb17 100644
--- a/src/burn/drv/pst90s/d_galpanic.cpp
+++ b/src/burn/drv/pst90s/d_galpanic.cpp
@@ -2019,10 +2019,10 @@ struct BurnDriver BurnDrvNewfanta = {
 };
 
 struct BurnDriver BurnDrvFantsy95 = {
-	"fantsy95", NULL, NULL, NULL, "1995",
+	"fantsy95", "newfant", NULL, NULL, "1995",
 	"Fantasy '95\0", NULL, "Hi-max Technology Inc.", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
 	NULL, Fantsy95RomInfo, Fantsy95RomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo,
 	FantasiaInit, GalpanicExit, ComadFrame, ComadDraw, GalpanicScan, &RecalcBgPalette, 0x400,
 	224, 256, 3, 4
diff --git a/src/burn/drv/pst90s/d_hyperpac.cpp b/src/burn/drv/pst90s/d_hyperpac.cpp
index 9ccad204f..f42b2aa15 100644
--- a/src/burn/drv/pst90s/d_hyperpac.cpp
+++ b/src/burn/drv/pst90s/d_hyperpac.cpp
@@ -1074,8 +1074,8 @@ STD_ROM_PICK(Wintbob)
 STD_ROM_FN(Wintbob)
 
 static struct BurnRomInfo SnowbroswbRomDesc[] = {
-	{ "toa03.bin",     0x10000, 0x55d302da, BRF_ESS | BRF_PRG }, //  0	68000 Program Code
-	{ "toa01.bin",     0x10000, 0x3c64e145, BRF_ESS | BRF_PRG }, //  1	68000 Program Code
+	{ "toa3.bin",      0x10000, 0x55d302da, BRF_ESS | BRF_PRG }, //  0	68000 Program Code
+	{ "toa1.bin",      0x10000, 0x3c64e145, BRF_ESS | BRF_PRG }, //  1	68000 Program Code
 	{ "wb04.bin",      0x10000, 0x53be758d, BRF_ESS | BRF_PRG }, //  2	68000 Program Code
 	{ "wb02.bin",      0x10000, 0xfc8e292e, BRF_ESS | BRF_PRG }, //  3	68000 Program Code
 
diff --git a/src/burn/drv/pst90s/d_nmk16.cpp b/src/burn/drv/pst90s/d_nmk16.cpp
index f8a41490d..336f6ea0b 100644
--- a/src/burn/drv/pst90s/d_nmk16.cpp
+++ b/src/burn/drv/pst90s/d_nmk16.cpp
@@ -4024,7 +4024,7 @@ static INT32 MemIndex()
 	DrvGfxROM1		= Next; Next += 0x800000;
 	DrvGfxROM2		= Next; Next += 0x800000;
 
-	if (strcmp(BurnDrvGetTextA(DRV_NAME), "raphero") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "arcadia") == 0) {
+	if (strcmp(BurnDrvGetTextA(DRV_NAME), "raphero") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "arcadian") == 0) {
 					Next += 0x800000;
 	}
 
@@ -4035,7 +4035,7 @@ static INT32 MemIndex()
 	DrvSndROM0		= Next; Next += 0x300000;
 	DrvSndROM1		= Next; Next += 0x300000;
 
-	if (strcmp(BurnDrvGetTextA(DRV_NAME), "raphero") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "arcadia") == 0) {
+	if (strcmp(BurnDrvGetTextA(DRV_NAME), "raphero") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "arcadian") == 0) {
 					Next += 0x600000;
 	}
 
@@ -9161,10 +9161,10 @@ static INT32 RapheroInit()
 }
 
 struct BurnDriver BurnDrvRaphero = {
-	"raphero", NULL, NULL, NULL, "1994",
+	"raphero", "arcadian", NULL, NULL, "1994",
 	"Rapid Hero\0", "Incomplete sound", "Media Trading Corp", "NMK16",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
 	NULL, rapheroRomInfo, rapheroRomName, NULL, NULL, Tdragon2InputInfo, RapheroDIPInfo,
 	RapheroInit, NMK004Exit, NMK004Frame, RapheroDraw, NULL, NULL, 0x400,
 	224, 384, 3, 4
@@ -9172,7 +9172,7 @@ struct BurnDriver BurnDrvRaphero = {
 
 // Aracdia
 
-static struct BurnRomInfo arcadiaRomDesc[] = {
+static struct BurnRomInfo arcadianRomDesc[] = {
 	{ "arcadia.3",		0x080000, 0x8b46d609, 1 | BRF_PRG | BRF_ESS }, //  0 68k code
 
 	{ "rhp94099.2",		0x020000, 0xfe01ece1, 2 | BRF_PRG | BRF_ESS }, //  1 Tmp90c841 Code
@@ -9197,15 +9197,15 @@ static struct BurnRomInfo arcadiaRomDesc[] = {
 	{ "prom3.u60",		0x000100, 0x304f98c6, 0 | BRF_OPT },           // 14
 };
 
-STD_ROM_PICK(arcadia)
-STD_ROM_FN(arcadia)
+STD_ROM_PICK(arcadian)
+STD_ROM_FN(arcadian)
 
-struct BurnDriver BurnDrvArcadia = {
-	"arcadia", "raphero", NULL, NULL, "1994",
-	"Arcadia\0", "Incomplete sound", "NMK", "NMK16",
+struct BurnDriver BurnDrvArcadian = {
+	"arcadian", NULL, NULL, NULL, "1994",
+	"Arcadia (NMK)\0", "Incomplete sound", "NMK", "NMK16",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
-	NULL, arcadiaRomInfo, arcadiaRomName, NULL, NULL, Tdragon2InputInfo, RapheroDIPInfo,
+	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
+	NULL, arcadianRomInfo, arcadianRomName, NULL, NULL, Tdragon2InputInfo, RapheroDIPInfo,
 	RapheroInit, NMK004Exit, NMK004Frame, RapheroDraw, NULL, NULL, 0x400,
 	224, 384, 3, 4
 };
diff --git a/src/burn/drv/sega/d_sys1.cpp b/src/burn/drv/sega/d_sys1.cpp
index 796a7d854..8f85a1ec2 100644
--- a/src/burn/drv/sega/d_sys1.cpp
+++ b/src/burn/drv/sega/d_sys1.cpp
@@ -2721,8 +2721,8 @@ STD_ROM_PICK(Wboy3)
 STD_ROM_FN(Wboy3)
 
 static struct BurnRomInfo Wboy4RomDesc[] = {
-	{ "ic2.bin",           0x008000, 0x48b2c006, BRF_ESS | BRF_PRG }, //  0	Z80 #1 Program Code
-	{ "ic3.bin",           0x008000, 0x466cae31, BRF_ESS | BRF_PRG }, //  1	Z80 #1 Program Code
+	{ "epr7622.ic1",       0x008000, 0x48b2c006, BRF_ESS | BRF_PRG }, //  0	Z80 #1 Program Code
+	{ "epr7621.ic2",       0x008000, 0x466cae31, BRF_ESS | BRF_PRG }, //  1	Z80 #1 Program Code
 	
 	{ "7583.126",          0x008000, 0x99334b3c, BRF_ESS | BRF_PRG }, //  2	Z80 #2 Program Code
 	
diff --git a/src/burn/drv/sega/d_sys16b.cpp b/src/burn/drv/sega/d_sys16b.cpp
index c863ec226..3f74ba08a 100644
--- a/src/burn/drv/sega/d_sys16b.cpp
+++ b/src/burn/drv/sega/d_sys16b.cpp
@@ -2831,9 +2831,9 @@ static struct BurnRomInfo EswatblRomDesc[] = {
 	{ "eswat_a.rom",   0x08000, 0x2af4fc62, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	{ "eswat_d.rom",   0x08000, 0xb4751e19, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	
-	{ "mpr12624.b11",  0x40000, 0x375a5ec4, SYS16_ROM_TILES | BRF_GRA },
-	{ "mpr12625.b12",  0x40000, 0x3b8c757e, SYS16_ROM_TILES | BRF_GRA },
-	{ "mpr12626.b13",  0x40000, 0x3efca25c, SYS16_ROM_TILES | BRF_GRA },
+	{ "ic19",          0x40000, 0x375a5ec4, SYS16_ROM_TILES | BRF_GRA },
+	{ "ic20",          0x40000, 0x3b8c757e, SYS16_ROM_TILES | BRF_GRA },
+	{ "ic21",          0x40000, 0x3efca25c, SYS16_ROM_TILES | BRF_GRA },
 	
 	{ "ic9",           0x40000, 0x0d1530bf, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "ic12",          0x40000, 0x18ff0799, SYS16_ROM_SPRITES | BRF_GRA },
@@ -2842,9 +2842,9 @@ static struct BurnRomInfo EswatblRomDesc[] = {
 	{ "ic11",          0x40000, 0xf6b096e0, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "ic14",          0x40000, 0x6773fef6, SYS16_ROM_SPRITES | BRF_GRA },
 
-	{ "epr12617.a13",  0x08000, 0x7efecf23, SYS16_ROM_Z80PROG | BRF_ESS | BRF_PRG },
+	{ "ic8",           0x08000, 0x7efecf23, SYS16_ROM_Z80PROG | BRF_ESS | BRF_PRG },
 	
-	{ "mpr12616.a11",  0x40000, 0x254347c2, SYS16_ROM_UPD7759DATA | BRF_SND },
+	{ "ic6",           0x40000, 0x254347c2, SYS16_ROM_UPD7759DATA | BRF_SND },
 };
 
 
@@ -3849,8 +3849,8 @@ static struct BurnRomInfo Tetris2RomDesc[] = {
 	{ "epr-12166.b10", 0x10000, 0x9abd183b, SYS16_ROM_TILES | BRF_GRA },
 	{ "epr-12167.b11", 0x10000, 0x2495fd4e, SYS16_ROM_TILES | BRF_GRA },
 	
-	{ "obj0-o.rom",    0x10000, 0x2fb38880, SYS16_ROM_SPRITES | BRF_GRA },
-	{ "obj0-e.rom",    0x10000, 0xd6a02cba, SYS16_ROM_SPRITES | BRF_GRA },
+	{ "epr-12194.b1",  0x10000, 0x2fb38880, SYS16_ROM_SPRITES | BRF_GRA },
+	{ "epr-12195.b5",  0x10000, 0xd6a02cba, SYS16_ROM_SPRITES | BRF_GRA },
 
 	{ "epr-12168.a7",  0x08000, 0xbd9ba01b, SYS16_ROM_Z80PROG | BRF_ESS | BRF_PRG },
 	
diff --git a/src/burn/drv/sega/d_xbrd.cpp b/src/burn/drv/sega/d_xbrd.cpp
index 77c80993b..5bbad1356 100644
--- a/src/burn/drv/sega/d_xbrd.cpp
+++ b/src/burn/drv/sega/d_xbrd.cpp
@@ -761,10 +761,10 @@ static struct BurnRomInfo Aburner2gRomDesc[] = {
 	{ "mpr-10935.95",     0x20000, 0xc1e23521, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "mpr-10937.99",     0x20000, 0xf0199658, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "mpr-10939.103",    0x20000, 0xa0d49480, SYS16_ROM_SPRITES | BRF_GRA },
-	{ "epr-11103.92",     0x20000, 0xbdd60da2, SYS16_ROM_SPRITES | BRF_GRA },
-	{ "epr-11104.96",     0x20000, 0x06a35fce, SYS16_ROM_SPRITES | BRF_GRA },
-	{ "epr-11105.100",    0x20000, 0x027b0689, SYS16_ROM_SPRITES | BRF_GRA },
-	{ "epr-11106.104",    0x20000, 0x9e1fec09, SYS16_ROM_SPRITES | BRF_GRA },
+	{ "epr-11094.92",     0x20000, 0xbdd60da2, SYS16_ROM_SPRITES | BRF_GRA },
+	{ "epr-11095.96",     0x20000, 0x06a35fce, SYS16_ROM_SPRITES | BRF_GRA },
+	{ "epr-11096.100",    0x20000, 0x027b0689, SYS16_ROM_SPRITES | BRF_GRA },
+	{ "epr-11097.104",    0x20000, 0x9e1fec09, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "epr-11116.93",     0x20000, 0x49b4c1ba, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "epr-11117.97",     0x20000, 0x821fbb71, SYS16_ROM_SPRITES | BRF_GRA },
 	{ "epr-11118.101",    0x20000, 0x8f38540b, SYS16_ROM_SPRITES | BRF_GRA },
diff --git a/src/burn/drv/taito/d_taitob.cpp b/src/burn/drv/taito/d_taitob.cpp
index 883d0f2f3..be6949efd 100644
--- a/src/burn/drv/taito/d_taitob.cpp
+++ b/src/burn/drv/taito/d_taitob.cpp
@@ -2982,7 +2982,7 @@ static struct BurnRomInfo masterwRomDesc[] = {
 
 	{ "b72_07.30",			0x010000, 0x2b1a946f, TAITO_Z80ROM1 },		//  4 Z80 code
 
-	{ "b72-02.rom",			0x080000, 0xc519f65a, TAITO_CHARS },		//  5 Graphics Tiles
+	{ "b72-02.6",			0x080000, 0x843444eb, TAITO_CHARS },		//  5 Graphics Tiles
 	{ "b72-01.5",			0x080000, 0xa24ac26e, TAITO_CHARS },		//  6
 };
 
@@ -3015,7 +3015,7 @@ static struct BurnRomInfo masterwuRomDesc[] = {
 
 	{ "b72_07.30",			0x010000, 0x2b1a946f, TAITO_Z80ROM1 },		//  4 Z80 code
 
-	{ "b72-02.rom",			0x080000, 0xc519f65a, TAITO_CHARS },		//  5 Graphics Tiles
+	{ "b72-02.6",			0x080000, 0x843444eb, TAITO_CHARS },		//  5 Graphics Tiles
 	{ "b72-01.5",			0x080000, 0xa24ac26e, TAITO_CHARS },		//  6
 };
 
@@ -3394,12 +3394,19 @@ struct BurnDriver BurnDrvCrimecj = {
 // Tetris (Japan, B-System, YM2610)
 
 static struct BurnRomInfo tetristRomDesc[] = {
-	{ "c12-03.bin",			0x020000, 0x38f1ed41, TAITO_68KROM1_BYTESWAP }, //  0 68k Code
-	{ "c12-02.bin",			0x020000, 0xed9530bc, TAITO_68KROM1_BYTESWAP }, //  1
-	{ "c12-05.bin",			0x020000, 0x128e9927, TAITO_68KROM1_BYTESWAP }, //  2
-	{ "c12-04.bin",			0x020000, 0x5da7a319, TAITO_68KROM1_BYTESWAP }, //  3
+	{ "c12-03.50",			0x020000, 0x38f1ed41, TAITO_68KROM1_BYTESWAP }, //  0 68k Code
+	{ "c12-02.31",			0x020000, 0xed9530bc, TAITO_68KROM1_BYTESWAP }, //  1
+	{ "c12-05.49",			0x020000, 0x128e9927, TAITO_68KROM1_BYTESWAP }, //  2
+	{ "c12-04.30",			0x020000, 0x5da7a319, TAITO_68KROM1_BYTESWAP }, //  3
 
-	{ "c12-06.bin",			0x010000, 0xf2814b38, TAITO_Z80ROM1 },		//  4 Z80 Code
+	{ "c12-06.37",			0x010000, 0xf2814b38, TAITO_Z80ROM1 },		//  4 Z80 Code
+	
+	{ "b81-03.14",			0x080000, 0x551b75e6, BRF_OPT },
+	{ "b81-04.15",			0x080000, 0xcf734e12, BRF_OPT },
+
+	{ "b81-02.2",			0x080000, 0x20ec3b86, BRF_OPT },
+
+	{ "b81-01.1",			0x080000, 0xb33f796b, BRF_OPT },
 };
 
 STD_ROM_PICK(tetrist)
@@ -3424,15 +3431,15 @@ struct BurnDriver BurnDrvTetrist = {
 // Tetris (Japan, B-System, YM2203)
 
 static struct BurnRomInfo tetristaRomDesc[] = {
-	{ "c35-04.bin",			0x020000, 0xfa6e42ff, TAITO_68KROM1_BYTESWAP }, //  0 68k Code
-	{ "c35-03.bin",			0x020000, 0xaebd8539, TAITO_68KROM1_BYTESWAP }, //  1
-	{ "c35-02.bin",			0x020000, 0x128e9927, TAITO_68KROM1_BYTESWAP }, //  2
-	{ "c35-01.bin",			0x020000, 0x5da7a319, TAITO_68KROM1_BYTESWAP }, //  3
+	{ "c35-04.33",			0x020000, 0xfa6e42ff, TAITO_68KROM1_BYTESWAP }, //  0 68k Code
+	{ "c35-03.24",			0x020000, 0xaebd8539, TAITO_68KROM1_BYTESWAP }, //  1
+	{ "c35-02.34",			0x020000, 0x128e9927, TAITO_68KROM1_BYTESWAP }, //  2
+	{ "c35-01.25",			0x020000, 0x5da7a319, TAITO_68KROM1_BYTESWAP }, //  3
 
-	{ "c35-05.bin",			0x010000, 0x785c63fb, TAITO_Z80ROM1 },		//  4 Z80 Code
+	{ "c35-05.30",			0x010000, 0x785c63fb, TAITO_Z80ROM1 },		//  4 Z80 Code
 
-	{ "b72-02.rom",			0x080000, 0x843444eb, BRF_OPT },		//  5 Graphics Tiles (not used)
-	{ "b72-01.rom",			0x080000, 0xa24ac26e, BRF_OPT },		//  6
+	{ "b72-02.6",			0x080000, 0x843444eb, BRF_OPT },		//  5 Graphics Tiles (not used)
+	{ "b72-01.5",			0x080000, 0xa24ac26e, BRF_OPT },		//  6
 };
 
 STD_ROM_PICK(tetrista)
diff --git a/src/burn/drv/taito/d_taitomisc.cpp b/src/burn/drv/taito/d_taitomisc.cpp
index 073e7492d..52c0ee853 100644
--- a/src/burn/drv/taito/d_taitomisc.cpp
+++ b/src/burn/drv/taito/d_taitomisc.cpp
@@ -1939,8 +1939,8 @@ STD_ROM_PICK(Rastsagaa)
 STD_ROM_FN(Rastsagaa)
 
 static struct BurnRomInfo TopspeedRomDesc[] = {
-	{ "b14-67-1.11",   0x10000, 0x23f17616, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "b14-68-1.9",    0x10000, 0x835659d9, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "b14-67-1.9",    0x10000, 0x23f17616, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "b14-68-1.11",   0x10000, 0x835659d9, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b14-54.24",     0x20000, 0x172924d5, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b14-52.26",     0x20000, 0xe1b5b2a1, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b14-55.23",     0x20000, 0xa1f15499, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
diff --git a/src/burn/drv/toaplan/d_fixeight.cpp b/src/burn/drv/toaplan/d_fixeight.cpp
index eb6d7ea90..bff73f205 100644
--- a/src/burn/drv/toaplan/d_fixeight.cpp
+++ b/src/burn/drv/toaplan/d_fixeight.cpp
@@ -471,8 +471,8 @@ static INT32 LoadRoms()
 	// Load MSM6295 ADPCM data
 	BurnLoadRom(MSM6295ROM, 3, 1);
 
-	BurnLoadRom(EEPROM,     4, 1); // dumped version
-	BurnLoadRom(EEPROM,     5, 1); // load over dumped version
+//	BurnLoadRom(EEPROM,     4, 1); // dumped version
+	BurnLoadRom(EEPROM,     4, 1); // load over dumped version
 
 	return 0;
 }
@@ -619,14 +619,14 @@ static INT32 DrvInit(INT32 region)
 // FixEight (Europe)
 
 static struct BurnRomInfo fixeightRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeight.nv",	0x000080, 0x02e925d0, BRF_PRG | BRF_ESS }, //  5 EEPROM
 };
 
@@ -649,14 +649,14 @@ struct BurnDriver BurnDrvFixeight = {
 // FixEight (Korea, Taito license)
 
 static struct BurnRomInfo fixeightktRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightkt.nv",	0x000080, 0x08fa73ba, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -679,14 +679,14 @@ struct BurnDriver BurnDrvFixeightkt = {
 // FixEight (Korea)
 
 static struct BurnRomInfo fixeightkRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightk.nv",	0x000080, 0xcac91c6f, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -709,14 +709,14 @@ struct BurnDriver BurnDrvFixeightk = {
 // FixEight (Hong Kong, Taito license)
 
 static struct BurnRomInfo fixeighthtRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightht.nv",	0x000080, 0x57edaa51, BRF_PRG | BRF_ESS }, //  5 EEPROM
 };
 
@@ -739,14 +739,14 @@ struct BurnDriver BurnDrvFixeightht = {
 // FixEight (Hong Kong)
 
 static struct BurnRomInfo fixeighthRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeighth.nv",	0x000080, 0x95dec584, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -769,14 +769,14 @@ struct BurnDriver BurnDrvFixeighth = {
 // FixEight (Taiwan, Taito license)
 
 static struct BurnRomInfo fixeighttwtRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeighttwt.nv",	0x000080, 0xb6d5c06c, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -799,14 +799,14 @@ struct BurnDriver BurnDrvFixeighttwt = {
 // FixEight (Taiwan)
 
 static struct BurnRomInfo fixeighttwRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeighttw.nv",	0x000080, 0x74e6afb9, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -830,14 +830,14 @@ struct BurnDriver BurnDrvFixeighttw = {
 // FixEight (Southeast Asia, Taito license)
 
 static struct BurnRomInfo fixeightatRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightat.nv",	0x000080, 0xe9c21987, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -860,14 +860,14 @@ struct BurnDriver BurnDrvFixeightat = {
 // FixEight (Southeast Asia)
 
 static struct BurnRomInfo fixeightaRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeighta.nv",	0x000080, 0x2bf17652, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -890,14 +890,14 @@ struct BurnDriver BurnDrvFixeighta = {
 // FixEight (Europe, Taito license)
 
 static struct BurnRomInfo fixeighttRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightt.nv",	0x000080, 0xc0da4a05, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -920,14 +920,14 @@ struct BurnDriver BurnDrvFixeightt = {
 // FixEight (USA, Taito license)
 
 static struct BurnRomInfo fixeightutRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightut.nv",	0x000080, 0x9fcd93ee, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -950,14 +950,14 @@ struct BurnDriver BurnDrvFixeightut = {
 // FixEight (USA)
 
 static struct BurnRomInfo fixeightuRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightu.nv",	0x000080, 0x5dfefc3b, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -980,14 +980,14 @@ struct BurnDriver BurnDrvFixeightu = {
 // FixEight (Japan, Taito license)
 
 static struct BurnRomInfo fixeightjtRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightjt.nv",	0x000080, 0xe3d14fed, BRF_PRG | BRF_ESS }, //  5
 };
 
@@ -1010,14 +1010,14 @@ struct BurnDriver BurnDrvFixeightjt = {
 // FixEight (Japan)
 
 static struct BurnRomInfo fixeightjRomDesc[] = {
-	{ "tp-026-1.u27",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
+	{ "tp-026-1",	0x080000, 0xf7b1746a, BRF_PRG | BRF_ESS }, //  0 CPU #0 code
 
 	{ "tp-026-3",		0x200000, 0xe5578d98, BRF_GRA },           //  1 GP9001 Tile data
 	{ "tp-026-4",		0x200000, 0xb760cb53, BRF_GRA },           //  2
 
 	{ "tp-026-2",		0x040000, 0x85063f1f, BRF_SND },           //  3 MSM6295 ADPCM data
 
-	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
+//	{ "93c45.u23",		0x000080, 0xea419312, BRF_PRG | BRF_ESS }, //  4 EEPROM (dumped)
 	{ "fixeightj.nv",	0x000080, 0x21e22038, BRF_PRG | BRF_ESS }, //  5
 };
 
diff --git a/src/burn/drv/toaplan/d_hellfire.cpp b/src/burn/drv/toaplan/d_hellfire.cpp
index 0996fa8de..d4da0ea9e 100644
--- a/src/burn/drv/toaplan/d_hellfire.cpp
+++ b/src/burn/drv/toaplan/d_hellfire.cpp
@@ -796,8 +796,8 @@ struct BurnDriver BurnDrvHellfire = {
 };
 
 struct BurnDriver BurnDrvHellfir1 = {
-	"hellfire1", "hellfire", NULL, NULL, "1989",
-	"Hellfire (1P Ver.)\0", NULL, "Toaplan (Taito License)", "Toaplan BCU-2 / FCU-2 based",
+	"hellfire1a", "hellfire", NULL, NULL, "1989",
+	"Hellfire (1P Ver., older)\0", NULL, "Toaplan (Taito License)", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TOAPLAN_RAIZING, GBF_HORSHOOT, 0,
 	NULL, hellfir1RomInfo, hellfir1RomName, NULL, NULL, hellfireInputInfo, hellfir1DIPInfo,
@@ -816,8 +816,8 @@ struct BurnDriver BurnDrvHellfir2 = {
 };
 
 struct BurnDriver BurnDrvHellfir3 = {
-	"hellfire3", "hellfire", NULL, NULL, "1989",
-	"Hellfire (1P Ver., alt)\0", NULL, "Toaplan (Taito License)", "Toaplan BCU-2 / FCU-2 based",
+	"hellfire1", "hellfire", NULL, NULL, "1989",
+	"Hellfire (1P Ver.)\0", NULL, "Toaplan (Taito License)", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TOAPLAN_RAIZING, GBF_HORSHOOT, 0,
 	NULL, hellfir3RomInfo, hellfir3RomName, NULL, NULL, hellfireInputInfo, hellfireDIPInfo,
diff --git a/src/burn/drv/toaplan/d_outzone.cpp b/src/burn/drv/toaplan/d_outzone.cpp
index 61419c472..07434c5c6 100644
--- a/src/burn/drv/toaplan/d_outzone.cpp
+++ b/src/burn/drv/toaplan/d_outzone.cpp
@@ -965,10 +965,10 @@ static INT32 DrvFrame()
 }
 
 struct BurnDriver BurnDrvOutZone = {
-	"outzone", NULL, NULL, NULL, "1990",
-	"Out Zone (set 1)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
+	"outzoneh", "outzone", NULL, NULL, "1990",
+	"Out Zone (harder)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
+	BDF_GAME_WORKING | BDF_CLONE | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
 	NULL, outzoneRomInfo, outzoneRomName, NULL, NULL, outzoneInputInfo, outzoneDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &ToaRecalcPalette, 0x400,
 	240, 320, 3, 4
@@ -985,8 +985,8 @@ struct BurnDriver BurnDrvOutZonea = {
 };
 
 struct BurnDriver BurnDrvOutZoneb = {
-	"outzoneb", "outzone", NULL, NULL, "1990",
-	"Out Zone (set 3, prototype?)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
+	"outzonec", "outzone", NULL, NULL, "1990",
+	"Out Zone (oldest set)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
 	NULL, outzonebRomInfo, outzonebRomName, NULL, NULL, outzoneInputInfo, outzonebDIPInfo,
@@ -995,18 +995,18 @@ struct BurnDriver BurnDrvOutZoneb = {
 };
 
 struct BurnDriver BurnDrvOutZonec = {
-	"outzonec", "outzone", NULL, NULL, "1990",
-	"Out Zone (set 4)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
+	"outzone", NULL, NULL, NULL, "1990",
+	"Out Zone\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
+	BDF_GAME_WORKING | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
 	NULL, outzonecRomInfo, outzonecRomName, NULL, NULL, outzoneInputInfo, outzonecDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &ToaRecalcPalette, 0x400,
 	240, 320, 3, 4
 };
 
 struct BurnDriver BurnDrvOutZoned = {
-	"outzoned", "outzone", NULL, NULL, "1990",
-	"Out Zone (set 5)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
+	"outzoneb", "outzone", NULL, NULL, "1990",
+	"Out Zone (older set)\0", NULL, "Toaplan", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
 	NULL, outzonedRomInfo, outzonedRomName, NULL, NULL, outzoneInputInfo, outzonedDIPInfo,
diff --git a/src/burn/drv/toaplan/d_truxton.cpp b/src/burn/drv/toaplan/d_truxton.cpp
index 765ef1442..a3f0fa99a 100644
--- a/src/burn/drv/toaplan/d_truxton.cpp
+++ b/src/burn/drv/toaplan/d_truxton.cpp
@@ -31,7 +31,7 @@ static struct BurnRomInfo truxtonRomDesc[] = {
 	{ "b65_02.bin",   0x020000, 0x1dd55161, BRF_GRA },			 //  8
 	{ "b65_01.bin",   0x020000, 0xe974937f, BRF_GRA },			 //  9
 
-	{ "b65_09.bin",   0x008000, 0xf1c0f410, BRF_ESS | BRF_PRG }, //  10 Z80 program
+	{ "b65_09.bin",   0x008000, 0x1bdd4ddc, BRF_ESS | BRF_PRG }, //  10 Z80 program
 
 	{ "b65_12.bpr",   0x000020, 0xbc88cced, BRF_SND },			 // 11 Sprite attribute PROM
 	{ "b65_13.bpr",   0x000020, 0xa1e17492, BRF_SND },			 // 12 ???