diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp
index 2968d9f5a7..d91b469381 100644
--- a/src/burn/drv/capcom/d_cps1.cpp
+++ b/src/burn/drv/capcom/d_cps1.cpp
@@ -24063,7 +24063,7 @@ struct BurnDriver BurnDrvCpsSf2ceuab4 = {
 };
 
 struct BurnDriver BurnDrvCpsSf2re = {
-	"sf2re", "sf2ce", NULL, NULL, "1992",
+	"sf2re", "sf2", NULL, NULL, "1992",
 	"Street Fighter II': Champion Edition (RE, bootleg)\0", "imperfect graphics", "bootleg", "CPS1",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF,
@@ -24073,7 +24073,7 @@ struct BurnDriver BurnDrvCpsSf2re = {
 };
 
 struct BurnDriver BurnDrvCpsSf2mkot = {
-	"sf2mkot", "sf2ce", NULL, NULL, "1992",
+	"sf2mkot", "sf2", NULL, NULL, "1992",
 	"Street Fighter II': Magic KO Turbo!! - Nightmare Crack\0", NULL, "bootleg", "CPS1",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF,
diff --git a/src/burn/drv/konami/d_nemesis.cpp b/src/burn/drv/konami/d_nemesis.cpp
index 6260fc1a16..2f5b730d9f 100644
--- a/src/burn/drv/konami/d_nemesis.cpp
+++ b/src/burn/drv/konami/d_nemesis.cpp
@@ -4527,10 +4527,10 @@ STDROMPICKEXT(gradiusb, gradiusb, bubsys)
 STD_ROM_FN(gradiusb)
 
 struct BurnDriver BurnDrvGradiusb = {
-	"gradiusb", "nemesis", "bubsys", NULL, "1985",
+	"gradiusb", NULL, "bubsys", NULL, "1985",
 	"Gradius (Bubble System)\0", NULL, "Konami", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_KONAMI_68K_Z80, GBF_HORSHOOT, 0,
+	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_KONAMI_68K_Z80, GBF_HORSHOOT, 0,
 	NULL, gradiusbRomInfo, gradiusbRomName, NULL, NULL, NULL, NULL, BubsysInputInfo, BubsysDIPInfo,
 	BubsysInit, DrvExit, Gx400Frame, DrvDraw, DrvScan, &DrvRecalc, 0x800,
 	256, 224, 4, 3
@@ -4556,10 +4556,10 @@ STD_ROM_PICK(twinbeeb)
 STD_ROM_FN(twinbeeb)
 
 struct BurnDriver BurnDrvTwinbeeb = {
-	"twinbeeb", "twinbee", NULL, NULL, "1985",
+	"twinbeeb", NULL, NULL, NULL, "1985",
 	"TwinBee (Bubble System)\0", NULL, "Konami", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_KONAMI_68K_Z80, GBF_VERSHOOT, 0,
+	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_KONAMI_68K_Z80, GBF_VERSHOOT, 0,
 	NULL, twinbeebRomInfo, twinbeebRomName, NULL, NULL, NULL, NULL, BubsysInputInfo, BubsysDIPInfo,
 	TwinbeebInit, DrvExit, Gx400Frame, DrvDraw, DrvScan, &DrvRecalc, 0x800,
 	224, 256, 3, 4
diff --git a/src/burn/drv/midway/d_wunit.cpp b/src/burn/drv/midway/d_wunit.cpp
index 5e992791eb..b274f5395f 100644
--- a/src/burn/drv/midway/d_wunit.cpp
+++ b/src/burn/drv/midway/d_wunit.cpp
@@ -1491,10 +1491,10 @@ STD_ROM_PICK(nbamht)
 STD_ROM_FN(nbamht)
 
 struct BurnDriver BurnDrvNbamht = {
-	"nbamht", NULL, NULL, NULL, "1996",
+	"nbamht", "nbahangt", NULL, NULL, "1996",
 	"NBA Maximum Hangtime (ver L1.03 06/09/97)\0", NULL, "Midway", "MIDWAY Wolf-Unit",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING, 4, HARDWARE_MIDWAY_WUNIT, GBF_MISC, 0,
+	BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_MIDWAY_WUNIT, GBF_MISC, 0,
 	NULL, nbamhtRomInfo, nbamhtRomName, NULL, NULL, NULL, NULL, NbahangtInputInfo, NbahangtDIPInfo,
     WolfUnitInit, WolfUnitExit, WolfUnitFrame, WolfUnitDraw, WolfUnitScan, &nWolfUnitRecalc, 0x8000,
     400, 256, 4, 3
@@ -1544,7 +1544,7 @@ STD_ROM_PICK(nbamhtl10)
 STD_ROM_FN(nbamhtl10)
 
 struct BurnDriver BurnDrvNbamhtl10 = {
-	"nbamhtl10", "nbamht", NULL, NULL, "1996",
+	"nbamhtl10", "nbahangt", NULL, NULL, "1996",
 	"NBA Maximum Hangtime (ver L1.0 11/08/96)\0", NULL, "Midway", "MIDWAY Wolf-Unit",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_MIDWAY_WUNIT, GBF_MISC, 0,
@@ -1597,7 +1597,7 @@ STD_ROM_PICK(nbamhtm10)
 STD_ROM_FN(nbamhtm10)
 
 struct BurnDriver BurnDrvNbamhtm10 = {
-	"nbamhtm10", "nbamht", NULL, NULL, "1996",
+	"nbamhtm10", "nbahangt", NULL, NULL, "1996",
 	"NBA Maximum Hangtime (ver M1.0 11/08/96)\0", NULL, "Midway", "MIDWAY Wolf-Unit",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_MIDWAY_WUNIT, GBF_MISC, 0,
@@ -1650,7 +1650,7 @@ STD_ROM_PICK(nbamhtp)
 STD_ROM_FN(nbamhtp)
 
 struct BurnDriver BurnDrvNbamhtp = {
-	"nbamhtp", "nbamht", NULL, NULL, "1996",
+	"nbamhtp", "nbahangt", NULL, NULL, "1996",
 	"NBA Maximum Hangtime (ver L0.9 10/30/96)\0", NULL, "Midway", "MIDWAY Wolf-Unit",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_MIDWAY_WUNIT, GBF_MISC, 0,
diff --git a/src/burn/drv/pre90s/d_olibochu.cpp b/src/burn/drv/pre90s/d_olibochu.cpp
index 7d3a06ea02..340d9749f1 100644
--- a/src/burn/drv/pre90s/d_olibochu.cpp
+++ b/src/burn/drv/pre90s/d_olibochu.cpp
@@ -666,10 +666,10 @@ STD_ROM_PICK(punchkid)
 STD_ROM_FN(punchkid)
 
 struct BurnDriver BurnDrvPunchkid = {
-	"punchkid", NULL, NULL, NULL, "1981",
+	"punchkid", "olibochu", NULL, NULL, "1981",
 	"Punching Kid (Japan)\0", NULL, "Irem", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_IREM_MISC, GBF_MAZE, 0,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_IREM_MISC, GBF_MAZE, 0,
 	NULL, punchkidRomInfo, punchkidRomName, NULL, NULL, NULL, NULL, OlibochuInputInfo, PunchkidDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200,
 	240, 256, 3, 4
@@ -711,10 +711,10 @@ STD_ROM_PICK(olibochu)
 STD_ROM_FN(olibochu)
 
 struct BurnDriver BurnDrvOlibochu = {
-	"olibochu", "punchkid", NULL, NULL, "1981",
+	"olibochu", NULL, NULL, NULL, "1981",
 	"Oli-Boo-Chu (USA)\0", NULL, "Irem (GDI license)", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_IREM_MISC, GBF_MAZE, 0,
+	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_IREM_MISC, GBF_MAZE, 0,
 	NULL, olibochuRomInfo, olibochuRomName, NULL, NULL, NULL, NULL, OlibochuInputInfo, OlibochuDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200,
 	240, 256, 3, 4
diff --git a/src/burn/drv/pst90s/d_gaelco.cpp b/src/burn/drv/pst90s/d_gaelco.cpp
index c5812a8f14..5006c9021b 100644
--- a/src/burn/drv/pst90s/d_gaelco.cpp
+++ b/src/burn/drv/pst90s/d_gaelco.cpp
@@ -1359,10 +1359,10 @@ STD_ROM_PICK(maniacsp)
 STD_ROM_FN(maniacsp)
 
 struct BurnDriver BurnDrvManiacsp = {
-	"maniacsp", "maniacsq", NULL, NULL, "1996",
+	"maniacsp", NULL, NULL, NULL, "1996",
 	"Maniac Square (ver 1.0, checksum b602, prototype)\0", NULL, "Gaelco", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
+	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
 	NULL, maniacspRomInfo, maniacspRomName, NULL, NULL, NULL, NULL, DrvInputInfo, ManiacsqDIPInfo,
 	ManiacspInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	320, 240, 4, 3
diff --git a/src/burn/drv/pst90s/d_itech32.cpp b/src/burn/drv/pst90s/d_itech32.cpp
index d72353ea2f..57e1ede12d 100644
--- a/src/burn/drv/pst90s/d_itech32.cpp
+++ b/src/burn/drv/pst90s/d_itech32.cpp
@@ -4385,10 +4385,10 @@ static INT32 WcbowldxInit()
 }
 
 struct BurnDriver BurnDrvWcbowldx = {
-	"wcbowldx", NULL, NULL, NULL, "1999",
+	"wcbowldx", "wcbowl", NULL, NULL, "1999",
 	"World Class Bowling Deluxe (v2.00)\0", NULL, "Incredible Technologies", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0,
+	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0,
 	NULL, wcbowldxRomInfo, wcbowldxRomName, NULL, NULL, NULL, NULL, WcbowlInputInfo, WcbowldxDIPInfo,
 	WcbowldxInit, DrvExit, DrvFrame, DrvDraw32, DrvScan, &DrvRecalc, 0x8000,
 	384, 256, 4, 3
@@ -4439,7 +4439,7 @@ static INT32 Wcbowl140Init()
 }
 
 struct BurnDriver BurnDrvWcbowl140 = {
-	"wcbowl140", "wcbowldx", NULL, NULL, "1997",
+	"wcbowl140", "wcbowl", NULL, NULL, "1997",
 	"World Class Bowling Tournament (v1.40)\0", NULL, "Incredible Technologies", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0,
@@ -4486,7 +4486,7 @@ STD_ROM_PICK(wcbowl130)
 STD_ROM_FN(wcbowl130)
 
 struct BurnDriver BurnDrvWcbowl130 = {
-	"wcbowl130", "wcbowldx", NULL, NULL, "1997",
+	"wcbowl130", "wcbowl", NULL, NULL, "1997",
 	"World Class Bowling Tournament (v1.30)\0", NULL, "Incredible Technologies", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0,
diff --git a/src/burn/drv/taito/d_taitob.cpp b/src/burn/drv/taito/d_taitob.cpp
index 990d155047..27e27376d0 100644
--- a/src/burn/drv/taito/d_taitob.cpp
+++ b/src/burn/drv/taito/d_taitob.cpp
@@ -4155,10 +4155,10 @@ static INT32 PbobbleInit()
 }
 
 struct BurnDriver BurnDrvBublbust = {
-	"bublbust", NULL, NULL, NULL, "1994",
+	"bublbust", 'pbobble', NULL, NULL, "1994",
 	"Bubble Buster (USA, B-System)\0", NULL, "Taito America Corporation", "Taito B System",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOB, GBF_BREAKOUT, 0,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOB, GBF_BREAKOUT, 0,
 	NULL, bublbustRomInfo, bublbustRomName, NULL, NULL, NULL, NULL, PbobbleInputInfo, NULL,
 	PbobbleInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x1000,
 	320, 224, 4, 3
@@ -4183,10 +4183,10 @@ STD_ROM_PICK(pbobble)
 STD_ROM_FN(pbobble)
 
 struct BurnDriver BurnDrvPbobble = {
-	"pbobble", "bublbust", NULL, NULL, "1994",
+	"pbobble", NULL, NULL, NULL, "1994",
 	"Puzzle Bobble (Japan, B-System)\0", NULL, "Taito Corporation", "Taito B System",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOB, GBF_BREAKOUT, 0,
+	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_TAITOB, GBF_BREAKOUT, 0,
 	NULL, pbobbleRomInfo, pbobbleRomName, NULL, NULL, NULL, NULL, PbobbleInputInfo, NULL,
 	PbobbleInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x1000,
 	320, 224, 4, 3