diff --git a/src/burn/drv/capcom/cps2_crpt.cpp b/src/burn/drv/capcom/cps2_crpt.cpp
index 7119ce2ad..8e52859d7 100644
--- a/src/burn/drv/capcom/cps2_crpt.cpp
+++ b/src/burn/drv/capcom/cps2_crpt.cpp
@@ -1002,7 +1002,7 @@ static const struct game_keys keys_table[] =
 	{ "mpangu",     { 0x95f741c6,0xe547a21b }, 0x100000 },	// 0C84 347D 89A3  cmpi.l  #$347D89A3,D4
 	{ "mpangj",     { 0x95f741c6,0xe547a21b }, 0x100000 },	// 0C84 347D 89A3  cmpi.l  #$347D89A3,D4
 	{ "pzloop2",    { 0xa054f812,0xc40d36b4 }, 0x400000 },	// 0C82 9A73 15F1  cmpi.l  #$9A7315F1,D2
-	{ "pzloop2j",   { 0xa054f812,0xc40d36b4 }, 0x400000 },	// 0C82 9A73 15F1  cmpi.l  #$9A7315F1,D2
+	{ "pzloop2jr1", { 0xa054f812,0xc40d36b4 }, 0x400000 },	// 0C82 9A73 15F1  cmpi.l  #$9A7315F1,D2
 	{ "choko",      { 0xd3fb12c6,0x7f8e17b5 }, 0x400000 },	// 0C86 4D17 5B3C  cmpi.l  #$4D175B3C,D6
 	{ "dimahoo",    { 0x0ddb8e40,0x2817fd2b }, 0x080000 },	// BE4C B244 B6C5  cmp.w   A4,D7   cmp.w   D4,D1   cmpa.w  D5,A3
 	{ "dimahoou",   { 0x6575af59,0xb0fea691 }, 0x080000 },	// BE4C B244 B6C5  cmp.w   A4,D7   cmp.w   D4,D1   cmpa.w  D5,A3
diff --git a/src/burn/drv/capcom/d_cps2.cpp b/src/burn/drv/capcom/d_cps2.cpp
index fe22454b1..ae3817ca3 100644
--- a/src/burn/drv/capcom/d_cps2.cpp
+++ b/src/burn/drv/capcom/d_cps2.cpp
@@ -4278,7 +4278,7 @@ static struct BurnRomInfo Pzloop2RomDesc[] = {
 STD_ROM_PICK(Pzloop2)
 STD_ROM_FN(Pzloop2)
 
-static struct BurnRomInfo Pzloop2jRomDesc[] = {
+static struct BurnRomInfo Pzloop2jr1RomDesc[] = {
 	{ "pl2j.03a",      0x080000, 0x0a751bd0,  1 | BRF_ESS | BRF_PRG },
 	{ "pl2j.04a",      0x080000, 0xc3f72afe,  1 | BRF_ESS | BRF_PRG },
 	{ "pl2j.05a",      0x080000, 0x6ea9dbfc,  1 | BRF_ESS | BRF_PRG },
@@ -4299,8 +4299,8 @@ static struct BurnRomInfo Pzloop2jRomDesc[] = {
 	{ "pl2-simm.05b",  0x200000, 0x1ed62584, 13 | BRF_SND },
 };
 
-STD_ROM_PICK(Pzloop2j)
-STD_ROM_FN(Pzloop2j)
+STD_ROM_PICK(Pzloop2jr1)
+STD_ROM_FN(Pzloop2jr1)
 
 static struct BurnRomInfo QndreamRomDesc[] = {
 	{ "tqzj.03a",      0x080000, 0x7acf3e30, 1 | BRF_ESS | BRF_PRG },
@@ -8343,12 +8343,12 @@ struct BurnDriver BurnDrvCpsPzloop2 = {
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
 
-struct BurnDriver BurnDrvCpsPzloop2j = {
-	"pzloop2j", "pzloop2", NULL, NULL, "2001",
+struct BurnDriver BurnDrvCpsPzloop2jr1 = {
+	"pzloop2jr1", "pzloop2", NULL, NULL, "2001",
 	"Puzz Loop 2 (010205 Japan)\0", NULL, "Mitchell, distritued by Capcom", "CPS2",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS2 | HARDWARE_CAPCOM_CPS2_SIMM, GBF_PUZZLE, 0,
-	NULL, Pzloop2jRomInfo, Pzloop2jRomName, NULL, NULL, Pzloop2InputInfo, NULL,
+	NULL, Pzloop2jr1RomInfo, Pzloop2jr1RomName, NULL, NULL, Pzloop2InputInfo, NULL,
 	Pzloop2Init, DrvExit, Cps2Frame, CpsRedraw, CpsAreaScan,
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
diff --git a/src/burn/drv/galaxian/d_galaxian.cpp b/src/burn/drv/galaxian/d_galaxian.cpp
index f48870a9e..edb62116d 100644
--- a/src/burn/drv/galaxian/d_galaxian.cpp
+++ b/src/burn/drv/galaxian/d_galaxian.cpp
@@ -11949,7 +11949,7 @@ static struct BurnRomInfo MshuttleRomDesc[] = {
 	{ "mscprom1.bin",  0x00020, 0xea0d1af0, BRF_GRA | GAL_ROM_PROM },
 	
 	{ "my07",          0x01000, 0x522a2920, BRF_SND | BRF_OPT },	// Samples
-	{ "my06e",         0x01000, 0x466415f2, BRF_SND | BRF_OPT },
+	{ "my06(__eng)",   0x01000, 0x466415f2, BRF_SND | BRF_OPT },
 };
 
 STD_ROM_PICK(Mshuttle)
@@ -11959,11 +11959,11 @@ static struct BurnRomInfo Mshuttle2RomDesc[] = {
 	{ "my05",          0x01000, 0x83574af1, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
 	{ "my04",          0x01000, 0x1cfae2c8, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
 	{ "my03",          0x01000, 0xc8b8a368, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
-	{ "my02-2",        0x01000, 0x9804061c, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
-	{ "my01-2",        0x01000, 0xca746a61, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	{ "my02(__mshuttle2)", 0x01000, 0x9804061c, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
+	{ "my01(__mshuttle2)", 0x01000, 0xca746a61, BRF_ESS | BRF_PRG | GAL_ROM_Z80_PROG1 },
 	
 	{ "my09",          0x01000, 0x3601b380, BRF_GRA | GAL_ROM_TILES_SHARED },
-	{ "my11-2",        0x00800, 0xd860e6ce, BRF_GRA | GAL_ROM_TILES_SHARED },
+	{ "my11(__mshuttle2)", 0x00800, 0xd860e6ce, BRF_GRA | GAL_ROM_TILES_SHARED },
 	{ "my08",          0x01000, 0x992b06cd, BRF_GRA | GAL_ROM_TILES_SHARED },
 	{ "my10",          0x00800, 0xd860e6ce, BRF_GRA | GAL_ROM_TILES_SHARED },
 	
diff --git a/src/burn/drv/sega/d_sys16b.cpp b/src/burn/drv/sega/d_sys16b.cpp
index 5d59993b3..9d27f316e 100644
--- a/src/burn/drv/sega/d_sys16b.cpp
+++ b/src/burn/drv/sega/d_sys16b.cpp
@@ -2048,7 +2048,7 @@ static struct BurnRomInfo Altbeast4RomDesc[] = {
 STD_ROM_PICK(Altbeast4)
 STD_ROM_FN(Altbeast4)
 
-static struct BurnRomInfo Altbeast5RomDesc[] = {
+static struct BurnRomInfo Altbeast6RomDesc[] = {
 	{ "epr-11883.a7",   0x20000, 0xc5b3e8f7, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	{ "epr-11882.a5",   0x20000, 0x9c01170b, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 
@@ -2083,8 +2083,8 @@ static struct BurnRomInfo Altbeast5RomDesc[] = {
 };
 
 
-STD_ROM_PICK(Altbeast5)
-STD_ROM_FN(Altbeast5)
+STD_ROM_PICK(Altbeast6)
+STD_ROM_FN(Altbeast6)
 
 static struct BurnRomInfo AtomicpRomDesc[] = {
 	{ "ap-t2.bin",      0x10000, 0x97421047, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
@@ -6017,7 +6017,7 @@ void Altbeastj_Sim8751()
 	}
 }
 
-void Altbeast5_Sim8751()
+void Altbeast6_Sim8751()
 {
 	// System Inputs
 	*((UINT16*)(System16Ram + 0x3096)) = BURN_ENDIAN_SWAP_INT16((UINT16)(System16Input[0] << 8));
@@ -6074,9 +6074,9 @@ static INT32 AltbeastjInit()
 	return nRet;
 }
 
-static INT32 Altbeast5Init()
+static INT32 Altbeast6Init()
 {
-	Simulate8751 = Altbeast5_Sim8751;
+	Simulate8751 = Altbeast6_Sim8751;
 	
 	// Start off with some sprite rom and let the load routine add on the rest
 	System16SpriteRomSize = 0x1a0000 - 0xe0000;
@@ -7756,13 +7756,13 @@ struct BurnDriver BurnDrvAltbeast4 = {
 	NULL, 0x1800, 320, 224, 4, 3
 };
 
-struct BurnDriver BurnDrvAltbeast5 = {
-	"altbeast5", "altbeast", NULL, NULL, "1988",
-	"Altered Beast (set 5, 8751 317-0076)\0", NULL, "Sega", "System 16B",
+struct BurnDriver BurnDrvAltbeast6 = {
+	"altbeast6", "altbeast", NULL, NULL, "1988",
+	"Altered Beast (set 6, 8751 317-0076)\0", NULL, "Sega", "System 16B",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_SEGA_SYSTEM16B | HARDWARE_SEGA_5521, GBF_SCRFIGHT, 0,
-	NULL, Altbeast5RomInfo, Altbeast5RomName, NULL, NULL, System16bfire3InputInfo, AltbeastDIPInfo,
-	Altbeast5Init, System16Exit, System16BFrame, NULL, System16Scan,
+	NULL, Altbeast6RomInfo, Altbeast6RomName, NULL, NULL, System16bfire3InputInfo, AltbeastDIPInfo,
+	Altbeast6Init, System16Exit, System16BFrame, NULL, System16Scan,
 	NULL, 0x1800, 320, 224, 4, 3
 };
 
diff --git a/src/burn/drv/taito/d_taitomisc.cpp b/src/burn/drv/taito/d_taitomisc.cpp
index 8bb90dad3..d3b61e925 100644
--- a/src/burn/drv/taito/d_taitomisc.cpp
+++ b/src/burn/drv/taito/d_taitomisc.cpp
@@ -1829,9 +1829,9 @@ STD_ROM_FN(Rastanu2)
 static struct BurnRomInfo RastsagaRomDesc[] = {
 	{ "b04-38.19",   0x10000, 0xa38ac909, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b04-37.7",    0x10000, 0xbad60872, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "rs_b04-40.20",0x10000, 0x6bcf70dc, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "b04-40(__rastsaga).20", 0x10000, 0x6bcf70dc, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b04-39.8",    0x10000, 0x8838ecc5, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
-	{ "rs_b04-42.21",0x10000, 0xb626c439, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
+	{ "b04-42(__rastsaga).21", 0x10000, 0xb626c439, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 	{ "b04-43.9",    0x10000, 0xc928a516, BRF_ESS | BRF_PRG | TAITO_68KROM1_BYTESWAP },
 
 	{ "b04-19.49",   0x10000, 0xee81fdd8, BRF_ESS | BRF_PRG | TAITO_Z80ROM1 },