diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp
index 68657bc9e..36c0b77e7 100644
--- a/src/burn/drv/capcom/d_cps1.cpp
+++ b/src/burn/drv/capcom/d_cps1.cpp
@@ -9879,34 +9879,28 @@ STD_ROM_PICK(Sf2amf)
 STD_ROM_FN(Sf2amf)
 
 static struct BurnRomInfo Sf2amf2RomDesc[] = {
-	// this set was previously known as sf2m5
-	{ "u222",         0x0080000, 0x03991fba, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-	{ "u196",         0x0080000, 0x39f15a1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-	{ "s92_21a.bin",  0x0080000, 0x925a7877, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
-
-	{ "s92_01.bin",   0x0080000, 0x03b0d852, BRF_GRA | CPS1_TILES },
-	{ "s92_02.bin",   0x0080000, 0x840289ec, BRF_GRA | CPS1_TILES },
-	{ "s92_03.bin",   0x0080000, 0xcdb5f027, BRF_GRA | CPS1_TILES },
-	{ "s92_04.bin",   0x0080000, 0xe2799472, BRF_GRA | CPS1_TILES },
-	{ "s92_05.bin",   0x0080000, 0xba8a2761, BRF_GRA | CPS1_TILES },
-	{ "s92_06.bin",   0x0080000, 0xe584bfb5, BRF_GRA | CPS1_TILES },
-	{ "s92_07.bin",   0x0080000, 0x21e3f87d, BRF_GRA | CPS1_TILES },
-	{ "s92_08.bin",   0x0080000, 0xbefc47df, BRF_GRA | CPS1_TILES },
-	{ "s92_10.bin",   0x0080000, 0x960687d5, BRF_GRA | CPS1_TILES },
-	{ "s92_11.bin",   0x0080000, 0x978ecd18, BRF_GRA | CPS1_TILES },
-	{ "s92_12.bin",   0x0080000, 0xd6ec9a0a, BRF_GRA | CPS1_TILES },
-	{ "s92_13.bin",   0x0080000, 0xed2c67f6, BRF_GRA | CPS1_TILES },
-
-	{ "s92_09.bin",   0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM },
-
-	{ "s92_18.bin",   0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
-	{ "s92_19.bin",   0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
+	{ "m5m27c401.u222", 0x080000, 0x03991fba, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "m5m27c401.u196", 0x080000, 0x39f15a1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },  
+	{ "27020.u221",  	0x040000, 0xaa4d55a6, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, 
+	{ "27020.u195",  	0x040000, 0x2bffa6f9, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+		
+	{ "fun-u70.bin",   0x100000, 0xa94a8b19, BRF_GRA | CPS1_TILES },
+	{ "fun-u68.bin",   0x100000, 0x0405f21f, BRF_GRA | CPS1_TILES },
+	{ "fun-u69.bin",   0x100000, 0x05dc2043, BRF_GRA | CPS1_TILES },
+	{ "fun-u67.bin",   0x100000, 0x055b64f1, BRF_GRA | CPS1_TILES },
+	{ "fun-u19.bin",   0x100000, 0x1a518609, BRF_GRA | CPS1_TILES },
+	{ "fun-u18.bin",   0x100000, 0x84f9354f, BRF_GRA | CPS1_TILES },
 	
-	// these weren't present with this set, but extra graphics are required (see bike's on Chun-Li stage)
-	{ "6.amf",        0x020000, 0x3a85a275, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
-	{ "9.amf",        0x020000, 0x9156472f, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
-	{ "8.amf",        0x020000, 0xecdb083b, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
-	{ "10.amf",       0x020000, 0x8fea8384, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
+	{ "27512.u191",    0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
+
+	{ "fun-u210.bin",  0x040000, 0x6cfffb11, BRF_SND | CPS1_OKIM6295_SAMPLES },
+	
+	{ "grp1.u31",      0x020000, 0x6de44671, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
+	{ "grp3.u29",      0x020000, 0xe8f14362, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
+	{ "grp2.u30",      0x020000, 0xbf0cd819, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
+	{ "grp4.u28",      0x020000, 0x76f9f91f, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
+	
+	{ "27512.u133",    0x010000, 0x13ea1c44, BRF_OPT }, // unknown
 };
 
 STD_ROM_PICK(Sf2amf2)
@@ -10091,30 +10085,34 @@ STD_ROM_PICK(Sf2amf7)
 STD_ROM_FN(Sf2amf7)
 
 static struct BurnRomInfo Sf2amf8RomDesc[] = {
-// this set is known as sf2amf2 in MAME 0.153
-	
-	{ "m5m27c401.u222", 0x080000, 0x03991fba, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-	{ "m5m27c401.u196", 0x080000, 0x39f15a1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },  
-	{ "27020.u221",  	0x040000, 0xaa4d55a6, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, 
-	{ "27020.u195",  	0x040000, 0x2bffa6f9, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-		
-	{ "fun-u70.bin",   0x100000, 0xa94a8b19, BRF_GRA | CPS1_TILES },
-	{ "fun-u68.bin",   0x100000, 0x0405f21f, BRF_GRA | CPS1_TILES },
-	{ "fun-u69.bin",   0x100000, 0x05dc2043, BRF_GRA | CPS1_TILES },
-	{ "fun-u67.bin",   0x100000, 0x055b64f1, BRF_GRA | CPS1_TILES },
-	{ "fun-u19.bin",   0x100000, 0x1a518609, BRF_GRA | CPS1_TILES },
-	{ "fun-u18.bin",   0x100000, 0x84f9354f, BRF_GRA | CPS1_TILES },
-	
-	{ "27512.u191",    0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
+	// this set was previously known as sf2m5
+	{ "u222",         0x0080000, 0x03991fba, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "u196",         0x0080000, 0x39f15a1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "s92_21a.bin",  0x0080000, 0x925a7877, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
 
-	{ "fun-u210.bin",  0x040000, 0x6cfffb11, BRF_SND | CPS1_OKIM6295_SAMPLES },
+	{ "s92_01.bin",   0x0080000, 0x03b0d852, BRF_GRA | CPS1_TILES },
+	{ "s92_02.bin",   0x0080000, 0x840289ec, BRF_GRA | CPS1_TILES },
+	{ "s92_03.bin",   0x0080000, 0xcdb5f027, BRF_GRA | CPS1_TILES },
+	{ "s92_04.bin",   0x0080000, 0xe2799472, BRF_GRA | CPS1_TILES },
+	{ "s92_05.bin",   0x0080000, 0xba8a2761, BRF_GRA | CPS1_TILES },
+	{ "s92_06.bin",   0x0080000, 0xe584bfb5, BRF_GRA | CPS1_TILES },
+	{ "s92_07.bin",   0x0080000, 0x21e3f87d, BRF_GRA | CPS1_TILES },
+	{ "s92_08.bin",   0x0080000, 0xbefc47df, BRF_GRA | CPS1_TILES },
+	{ "s92_10.bin",   0x0080000, 0x960687d5, BRF_GRA | CPS1_TILES },
+	{ "s92_11.bin",   0x0080000, 0x978ecd18, BRF_GRA | CPS1_TILES },
+	{ "s92_12.bin",   0x0080000, 0xd6ec9a0a, BRF_GRA | CPS1_TILES },
+	{ "s92_13.bin",   0x0080000, 0xed2c67f6, BRF_GRA | CPS1_TILES },
+
+	{ "s92_09.bin",   0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM },
+
+	{ "s92_18.bin",   0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
+	{ "s92_19.bin",   0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
 	
-	{ "grp1.u31",      0x020000, 0x6de44671, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
-	{ "grp3.u29",      0x020000, 0xe8f14362, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
-	{ "grp2.u30",      0x020000, 0xbf0cd819, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
-	{ "grp4.u28",      0x020000, 0x76f9f91f, BRF_GRA | CPS1_EXTRA_TILES_SF2B_400000 },
-	
-	{ "27512.u133",    0x010000, 0x13ea1c44, BRF_OPT }, // unknown
+	// these weren't present with this set, but extra graphics are required (see bike's on Chun-Li stage)
+	{ "6.amf",        0x020000, 0x3a85a275, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
+	{ "9.amf",        0x020000, 0x9156472f, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
+	{ "8.amf",        0x020000, 0xecdb083b, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
+	{ "10.amf",       0x020000, 0x8fea8384, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 },
 };
 
 STD_ROM_PICK(Sf2amf8)
@@ -10645,35 +10643,35 @@ static struct BurnRomInfo Sf2ceuab7RomDesc[] = {
 	{ "prg28.bin",    0x0040000, 0xb7ad5214, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
 	{ "prg33.bin",    0x0040000, 0x6340b914, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },	
 
-    { "gfx24.bin",    0x0040000, 0xa8b5633a, BRF_GRA | CPS1_TILES },
-    { "gfx20.bin",    0x0040000, 0x8d5d0045, BRF_GRA | CPS1_TILES },
-    { "gfx25.bin",    0x0040000, 0x72e923df, BRF_GRA | CPS1_TILES },
-    { "gfx21.bin",    0x0040000, 0x55c2b455, BRF_GRA | CPS1_TILES },
-    { "gfx14.bin",    0x0040000, 0x5db24ca7, BRF_GRA | CPS1_TILES },
-    { "gfx10.bin",    0x0040000, 0xeb48f7f2, BRF_GRA | CPS1_TILES },
-    { "gfx15.bin",    0x0040000, 0x9a96be48, BRF_GRA | CPS1_TILES },
-    { "gfx11.bin",    0x0040000, 0xff36859e, BRF_GRA | CPS1_TILES },
-    { "gfx26.bin",    0x0040000, 0x82e8e384, BRF_GRA | CPS1_TILES },
-    { "gfx22.bin",    0x0040000, 0x4109d637, BRF_GRA | CPS1_TILES },
-    { "gfx27.bin",    0x0040000, 0x4a3a8d09, BRF_GRA | CPS1_TILES },
-    { "gfx23.bin",    0x0040000, 0xef9c2d4d, BRF_GRA | CPS1_TILES },
-    { "gfx16.bin",    0x0040000, 0x1fd98ad0, BRF_GRA | CPS1_TILES },
-    { "gfx12.bin",    0x0040000, 0x5d21d8b3, BRF_GRA | CPS1_TILES },
-    { "gfx17.bin",    0x0040000, 0xa917a922, BRF_GRA | CPS1_TILES },
-    { "gfx13.bin",    0x0040000, 0xbc937c96, BRF_GRA | CPS1_TILES },
-    { "gfx6.bin",     0x0040000, 0x023baa18, BRF_GRA | CPS1_TILES },
-    { "gfx1.bin",     0x0040000, 0x877b2b18, BRF_GRA | CPS1_TILES },
-    { "gfx8.bin",     0x0040000, 0x26fb340c, BRF_GRA | CPS1_TILES },
-    { "gfx4.bin",     0x0040000, 0xf2c400b4, BRF_GRA | CPS1_TILES },
-    { "gfx5.bin",     0x0040000, 0xa6ad6ef3, BRF_GRA | CPS1_TILES },
-    { "gfx2.bin",     0x0040000, 0x144aa4c9, BRF_GRA | CPS1_TILES },
-    { "gfx7.bin",     0x0040000, 0xf56085ba, BRF_GRA | CPS1_TILES },
-    { "gfx3.bin",     0x0040000, 0x8053335d, BRF_GRA | CPS1_TILES },
+    { "24.bin",       0x0040000, 0xa8b5633a, BRF_GRA | CPS1_TILES },
+    { "20.bin",       0x0040000, 0x8d5d0045, BRF_GRA | CPS1_TILES },
+    { "25.bin",       0x0040000, 0x72e923df, BRF_GRA | CPS1_TILES },
+    { "21.bin",       0x0040000, 0x55c2b455, BRF_GRA | CPS1_TILES },
+    { "14.bin",       0x0040000, 0x5db24ca7, BRF_GRA | CPS1_TILES },
+    { "10.bin",       0x0040000, 0xeb48f7f2, BRF_GRA | CPS1_TILES },
+    { "15.bin",       0x0040000, 0x9a96be48, BRF_GRA | CPS1_TILES },
+    { "11.bin",       0x0040000, 0xff36859e, BRF_GRA | CPS1_TILES },
+    { "26.bin",       0x0040000, 0x82e8e384, BRF_GRA | CPS1_TILES },
+    { "22.bin",       0x0040000, 0x4109d637, BRF_GRA | CPS1_TILES },
+    { "27.bin",       0x0040000, 0x4a3a8d09, BRF_GRA | CPS1_TILES },
+    { "23.bin",       0x0040000, 0xef9c2d4d, BRF_GRA | CPS1_TILES },
+    { "16.bin",       0x0040000, 0x1fd98ad0, BRF_GRA | CPS1_TILES },
+    { "12.bin",       0x0040000, 0x5d21d8b3, BRF_GRA | CPS1_TILES },
+    { "17.bin",       0x0040000, 0xa917a922, BRF_GRA | CPS1_TILES },
+    { "13.bin",       0x0040000, 0xbc937c96, BRF_GRA | CPS1_TILES },
+    { "6.bin",        0x0040000, 0x023baa18, BRF_GRA | CPS1_TILES },
+    { "1.bin",        0x0040000, 0x877b2b18, BRF_GRA | CPS1_TILES },
+    { "8.bin",        0x0040000, 0x26fb340c, BRF_GRA | CPS1_TILES },
+    { "4.bin",        0x0040000, 0xf2c400b4, BRF_GRA | CPS1_TILES },
+    { "5.bin",        0x0040000, 0xa6ad6ef3, BRF_GRA | CPS1_TILES },
+    { "2.bin",        0x0040000, 0x144aa4c9, BRF_GRA | CPS1_TILES },
+    { "7.bin",        0x0040000, 0xf56085ba, BRF_GRA | CPS1_TILES },
+    { "3.bin",        0x0040000, 0x8053335d, BRF_GRA | CPS1_TILES },
 
-    { "snd6.bin",     0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM },
+    { "s92_09.bin",   0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM },
 
-    { "snd18.bin",    0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
-    { "snd19.bin",    0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
+    { "s92_18.bin",   0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
+    { "s92_19.bin",   0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
 
     { "pic16c55",     0x0002000, 0xf22e2311, BRF_OPT }, // PIC
 };
@@ -14681,7 +14679,7 @@ static INT32 Sf2amfInit()
 	return Sf2koryu2Init();
 }
 
-static INT32 Sf2amf8Init()
+static INT32 Sf2amf2Init()
 {
 	Cps1GfxLoadCallbackFunction = CpsLoadTilesSf2stt;
 	
@@ -18074,7 +18072,7 @@ struct BurnDriver BurnDrvCpsSf2amf2 = {
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF,
 	NULL, Sf2amf2RomInfo, Sf2amf2RomName, NULL, NULL, Sf2yycInputInfo, Sf2amfDIPInfo,
-	Sf2koryu2Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
+	Sf2amf2Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
 
@@ -18134,7 +18132,7 @@ struct BurnDriver BurnDrvCpsSf2amf8 = {
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF,
 	NULL, Sf2amf8RomInfo, Sf2amf8RomName, NULL, NULL, Sf2yycInputInfo, Sf2amfDIPInfo,
-	Sf2amf8Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
+	Sf2koryu2Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
 
diff --git a/src/burn/drv/cave/d_uopoko.cpp b/src/burn/drv/cave/d_uopoko.cpp
index 4407b0e48..1360b5124 100644
--- a/src/burn/drv/cave/d_uopoko.cpp
+++ b/src/burn/drv/cave/d_uopoko.cpp
@@ -558,7 +558,7 @@ static struct BurnRomInfo uopokoRomDesc[] = {
 
 	{ "cave_cv-02_u49.u49",     0x400000, 0x12fb11bb, BRF_GRA }, //  3 Layer 0 Tile data
 
-	{ "cave_cv-02_u4.u4",       0x200000, 0xa2d0d755, BRF_SND }, //  4 YMZ280B (AD)PCM data
+	{ "came_cv-02_u4.u4",       0x200000, 0xa2d0d755, BRF_SND }, //  4 YMZ280B (AD)PCM data
 	
 	{ "eeprom-uopoko.bin", 		0x0080, 0xf4a24b95, BRF_ESS | BRF_PRG },
 };
@@ -575,7 +575,7 @@ static struct BurnRomInfo uopokojRomDesc[] = {
 
 	{ "cave_cv-02_u49.u49",     0x400000, 0x12fb11bb, BRF_GRA }, //  3 Layer 0 Tile data
 
-	{ "cave_cv-02_u4.u4",       0x200000, 0xa2d0d755, BRF_SND }, //  4 YMZ280B (AD)PCM data
+	{ "came_cv-02_u4.u4",       0x200000, 0xa2d0d755, BRF_SND }, //  4 YMZ280B (AD)PCM data
 	
 	{ "eeprom-uopoko.bin", 		0x0080, 0xf4a24b95, BRF_ESS | BRF_PRG },
 };
diff --git a/src/burn/drv/konami/d_tmnt.cpp b/src/burn/drv/konami/d_tmnt.cpp
index 204384577..d6fb67766 100644
--- a/src/burn/drv/konami/d_tmnt.cpp
+++ b/src/burn/drv/konami/d_tmnt.cpp
@@ -1852,22 +1852,22 @@ STD_ROM_PICK(trigon)
 STD_ROM_FN(trigon)
 
 static struct BurnRomInfo tmnt2RomDesc[] = {
-	{ "063uaa02.e8",	0x020000, 0x58d5c93d, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
-	{ "063uaa03.g8",	0x020000, 0x0541fec9, BRF_ESS | BRF_PRG }, //  1
-	{ "063uaa04.e10",	0x020000, 0x1d441a7d, BRF_ESS | BRF_PRG }, //  2
-	{ "063uaa05.g10",	0x020000, 0x9c428273, BRF_ESS | BRF_PRG }, //  3
+	{ "063uaa02.8e",	0x020000, 0x58d5c93d, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
+	{ "063uaa03.8g",	0x020000, 0x0541fec9, BRF_ESS | BRF_PRG }, //  1
+	{ "063uaa04.10e",	0x020000, 0x1d441a7d, BRF_ESS | BRF_PRG }, //  2
+	{ "063uaa05.10g",	0x020000, 0x9c428273, BRF_ESS | BRF_PRG }, //  3
 
-	{ "063b01",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
+	{ "063b01.2f",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
 
-	{ "063b12",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
-	{ "063b11",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
+	{ "063b12.16k",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
+	{ "063b11.12k",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
 
-	{ "063b09",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
-	{ "063b10",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
-	{ "063b07",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
-	{ "063b08",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
+	{ "063b09.7l",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
+	{ "063b10.7k",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
+	{ "063b07.3l",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
+	{ "063b08.3k",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
 
-	{ "063b06",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
+	{ "063b06.1d",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
 
 	{ "tmnt2_uaa.nv",  0x000080, 0x284357bd, BRF_OPT },
 };
@@ -1876,22 +1876,22 @@ STD_ROM_PICK(tmnt2)
 STD_ROM_FN(tmnt2)
 
 static struct BurnRomInfo tmnt22puRomDesc[] = {
-	{ "063uda02.e8",	0x020000, 0xaadffe3a, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
-	{ "063uda03.g8",	0x020000, 0x125687a8, BRF_ESS | BRF_PRG }, //  1
-	{ "063uda04.e10",	0x020000, 0xfb5c7ded, BRF_ESS | BRF_PRG }, //  2
-	{ "063uda05.g10",	0x020000, 0x3c40fe66, BRF_ESS | BRF_PRG }, //  3
+	{ "063uda02.8e",	0x020000, 0xaadffe3a, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
+	{ "063uda03.8g",	0x020000, 0x125687a8, BRF_ESS | BRF_PRG }, //  1
+	{ "063uda04.10e",	0x020000, 0xfb5c7ded, BRF_ESS | BRF_PRG }, //  2
+	{ "063uda05.10g",	0x020000, 0x3c40fe66, BRF_ESS | BRF_PRG }, //  3
 
-	{ "063b01",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
+	{ "063b01.2f",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
 
-	{ "063b12",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
-	{ "063b11",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
+	{ "063b12.16k",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
+	{ "063b11.12k",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
 
-	{ "063b09",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
-	{ "063b10",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
-	{ "063b07",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
-	{ "063b08",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
+	{ "063b09.7l",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
+	{ "063b10.7k",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
+	{ "063b07.3l",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
+	{ "063b08.3k",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
 
-	{ "063b06",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
+	{ "063b06.1d",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
 
 	{ "tmnt2_uda.nv",  0x000080, 0x44928d33, BRF_OPT },
 };
@@ -1900,22 +1900,22 @@ STD_ROM_PICK(tmnt22pu)
 STD_ROM_FN(tmnt22pu)
 
 static struct BurnRomInfo tmht22peRomDesc[] = {
-	{ "063eba02.e8",	0x020000, 0x99409094, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
-	{ "063eba03.g8",	0x020000, 0x4d65650f, BRF_ESS | BRF_PRG }, //  1
-	{ "063eba04.e10",	0x020000, 0xf6e3b9c7, BRF_ESS | BRF_PRG }, //  2
-	{ "063eba05.g10",	0x020000, 0x1bad6696, BRF_ESS | BRF_PRG }, //  3
+	{ "063eba02.8e",	0x020000, 0x99409094, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
+	{ "063eba03.8g",	0x020000, 0x4d65650f, BRF_ESS | BRF_PRG }, //  1
+	{ "063eba04.10e",	0x020000, 0xf6e3b9c7, BRF_ESS | BRF_PRG }, //  2
+	{ "063eba05.10g",	0x020000, 0x1bad6696, BRF_ESS | BRF_PRG }, //  3
 
-	{ "063b01",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
+	{ "063b01.2f",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
 
-	{ "063b12",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
-	{ "063b11",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
+	{ "063b12.16k",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
+	{ "063b11.12k",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
 
-	{ "063b09",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
-	{ "063b10",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
-	{ "063b07",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
-	{ "063b08",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
+	{ "063b09.7l",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
+	{ "063b10.7k",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
+	{ "063b07.3l",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
+	{ "063b08.3k",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
 
-	{ "063b06",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
+	{ "063b06.1d",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
 
 	{ "tmnt2_eba.nv",  0x000080, 0xc0a3ed50, BRF_OPT },
 };
@@ -1924,22 +1924,22 @@ STD_ROM_PICK(tmht22pe)
 STD_ROM_FN(tmht22pe)
 
 static struct BurnRomInfo tmnt2aRomDesc[] = {
-	{ "063ada02.e8",	0x020000, 0x4f11b587, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
-	{ "063ada03.g8",	0x020000, 0x82a1b9ac, BRF_ESS | BRF_PRG }, //  1
-	{ "063ada04.e10",	0x020000, 0x05ad187a, BRF_ESS | BRF_PRG }, //  2
-	{ "063ada05.g10",	0x020000, 0xd4826547, BRF_ESS | BRF_PRG }, //  3
+	{ "063ada02.8e",	0x020000, 0x4f11b587, BRF_ESS | BRF_PRG }, //  0 	68000 Program Code
+	{ "063ada03.8g",	0x020000, 0x82a1b9ac, BRF_ESS | BRF_PRG }, //  1
+	{ "063ada04.10e",	0x020000, 0x05ad187a, BRF_ESS | BRF_PRG }, //  2
+	{ "063ada05.10g",	0x020000, 0xd4826547, BRF_ESS | BRF_PRG }, //  3
 
-	{ "063b01",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
+	{ "063b01.2f",		0x010000, 0x364f548a, BRF_ESS | BRF_PRG }, //  4 	Z80 Code
 
-	{ "063b12",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
-	{ "063b11",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
+	{ "063b12.16k",		0x080000, 0xd3283d19, BRF_GRA },           //  5	Tiles
+	{ "063b11.12k",		0x080000, 0x6ebc0c15, BRF_GRA },           //  6
 
-	{ "063b09",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
-	{ "063b10",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
-	{ "063b07",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
-	{ "063b08",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
+	{ "063b09.7l",		0x100000, 0x2d7a9d2a, BRF_GRA },           //  7	Sprites
+	{ "063b10.7k",		0x080000, 0xf2dd296e, BRF_GRA },           //  8
+	{ "063b07.3l",		0x100000, 0xd9bee7bf, BRF_GRA },           //  9
+	{ "063b08.3k",		0x080000, 0x3b1ae36f, BRF_GRA },           // 10
 
-	{ "063b06",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
+	{ "063b06.1d",		0x200000, 0x1e510aa5, BRF_SND },           // 11	K053260 Samples
 
 	{ "tmnt2_ada.nv",  0x000080, 0x063068a0, BRF_OPT },
 };
diff --git a/src/burn/drv/pgm/d_pgm.cpp b/src/burn/drv/pgm/d_pgm.cpp
index 88e1e2f3c..faf3c85e1 100644
--- a/src/burn/drv/pgm/d_pgm.cpp
+++ b/src/burn/drv/pgm/d_pgm.cpp
@@ -3595,25 +3595,25 @@ struct BurnDriver BurnDrvoldsplus = {
 // The Killing Blade Plus (V300)
 
 static struct BurnRomInfo killbldpRomDesc[] = {
-	{ "v300xx.u6",       	0x080000, 0xb7fb8ec9, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
+	{ "v300x.u6",       	0x080000, 0xb7fb8ec9, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
 	
-	{ "t05701w032.u33", 	0x400000, 0x567c714f, 2 | BRF_GRA },			//  1 Tile data
+	{ "t05701w032.bin", 	0x400000, 0x567c714f, 2 | BRF_GRA },			//  1 Tile data
 
-	{ "a05701w064.u3", 		0x800000, 0x8c0c992c, 3 | BRF_GRA },			//  3 Sprite Color Data
-	{ "a05702w064.u4", 		0x800000, 0x7e5b0f27, 3 | BRF_GRA },			//  4
-	{ "a05703w064.u6", 		0x800000, 0xaccbdb44, 3 | BRF_GRA },			//  5
+	{ "a05701w064.bin",		0x800000, 0x8c0c992c, 3 | BRF_GRA },			//  3 Sprite Color Data
+	{ "a05702w064.bin",		0x800000, 0x7e5b0f27, 3 | BRF_GRA },			//  4
+	{ "a05703w064.bin",		0x800000, 0xaccbdb44, 3 | BRF_GRA },			//  5
 	
-	{ "b05701w064.u9", 		0x800000, 0xa20cdcef, 4 | BRF_GRA },			//  6 Sprite Masks & Color Indexes
-	{ "b05702w016.u11", 	0x200000, 0xfe7457df, 4 | BRF_GRA },			//  7
+	{ "b05701w064.bin",		0x800000, 0xa20cdcef, 4 | BRF_GRA },			//  6 Sprite Masks & Color Indexes
+	{ "b05702w016.bin", 	0x200000, 0xfe7457df, 4 | BRF_GRA },			//  7
 	
-	{ "w05701b032.u5", 		0x400000, 0x2d3ae593, 5 | BRF_SND },			//  8 Samples
+	{ "w05701b032.bin",		0x400000, 0x2d3ae593, 5 | BRF_SND },			//  8 Samples
 
 // this is the original rom with the first 0x268 bytes from the bootleg - but it doesn't work?
 //	{ "killbldp_igs027a.bin",	0x004000, 0xc7868d90, 7 | BRF_PRG }, 		//  9 Internal ARM7 Rom
 // from a bootleg
 	{ "killbldp_igs027a_alt.bin",	0x004000, 0x98316b06, 7 | BRF_PRG }, 	//  9 Internal ARM7 Rom
 	
-	{ "v300xx.u26",			0x200000, 0x144388c8, 8 | BRF_PRG | BRF_ESS },	// 10 External ARM7 Rom
+	{ "v300x.u26",			0x200000, 0x144388c8, 8 | BRF_PRG | BRF_ESS },	// 10 External ARM7 Rom
 };
 
 STDROMPICKEXT(killbldp, killbldp, pgm)
@@ -3986,7 +3986,7 @@ struct BurnDriver BurnDrvKet = {
 
 // Ketsui Kizuna Jigoku Tachi (Revision 2? alt, Japan)
 
-static struct BurnRomInfo ketaRomDesc[] = {
+static struct BurnRomInfo ketaltRomDesc[] = {
 	// alt version with 0xff fill in the unused area after 0x1443bc rather than random data, there are no code changes.
 	{ "ketsui_v100_alt.u38",	0x200000, 0xe140f8a4, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
 	
@@ -4004,15 +4004,15 @@ static struct BurnRomInfo ketaRomDesc[] = {
 	{ "ket_defaults.nv",	0x020000, 0x3ca892d8, 0 | BRF_OPT },				//  7 NV RAM
 };
 
-STDROMPICKEXT(keta, keta, ketsuiBios) // custom bios
-STD_ROM_FN(keta)
+STDROMPICKEXT(ketalt, ketalt, ketsuiBios) // custom bios
+STD_ROM_FN(ketalt)
 
-struct BurnDriver BurnDrvKeta = {
-	"keta", "ket", NULL, NULL, "2002",
+struct BurnDriver BurnDrvKetakt = {
+	"ketalt", "ket", NULL, NULL, "2002",
 	"Ketsui Kizuna Jigoku Tachi (Revision 2? alt, Japan)\0", NULL, "CAVE / AMI", "PolyGameMaster based",
 	L"Ketsui Kizuna Jigoku Tachi\0\u30B1\u30C4\u30A4~\u7D46\u5730\u7344\u305F\u3061 (Revision 2? alt, Japan)\0", NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_JAMMAPCB/* | HARDWARE_IGS_USE_ARM_CPU*/, GBF_VERSHOOT, 0,
-	NULL, ketaRomInfo, ketaRomName, NULL, NULL, pgmInputInfo, jammaDIPInfo,
+	NULL, ketaltRomInfo, ketaltRomName, NULL, NULL, pgmInputInfo, jammaDIPInfo,
 	ketsuiInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
 	224, 448, 3, 4
 };
@@ -4020,7 +4020,7 @@ struct BurnDriver BurnDrvKeta = {
 
 // Ketsui Kizuna Jigoku Tachi (Revision 1?, Japan)
 
-static struct BurnRomInfo ketbRomDesc[] = {
+static struct BurnRomInfo ketaRomDesc[] = {
 	{ "ketsui_prg_revised.bin",	0x200000, 0x69fcf5eb, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
 
 	{ "t04701w064.u19", 	0x800000, 0x2665b041, 2 | BRF_GRA },				//  1 Tile data
@@ -4037,15 +4037,15 @@ static struct BurnRomInfo ketbRomDesc[] = {
 	{ "ket_defaults.nv",	0x020000, 0x3ca892d8, 0 | BRF_OPT },				//  7 NV RAM
 };
 
-STDROMPICKEXT(ketb, ketb, ketsuiBios) // custom bios
-STD_ROM_FN(ketb)
+STDROMPICKEXT(keta, keta, ketsuiBios) // custom bios
+STD_ROM_FN(keta)
 
-struct BurnDriver BurnDrvKetb = {
-	"ketb", "ket", NULL, NULL, "2002",
+struct BurnDriver BurnDrvKeta = {
+	"keta", "ket", NULL, NULL, "2002",
 	"Ketsui Kizuna Jigoku Tachi (Revision 1?, Japan)\0", NULL, "CAVE / AMI", "PolyGameMaster based",
 	L"Ketsui Kizuna Jigoku Tachi\0\u30B1\u30C4\u30A4~\u7D46\u5730\u7344\u305F\u3061 (Revision 1?, Japan)\0", NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_JAMMAPCB/* | HARDWARE_IGS_USE_ARM_CPU*/, GBF_VERSHOOT, 0,
-	NULL, ketbRomInfo, ketbRomName, NULL, NULL, pgmInputInfo, jammaDIPInfo,
+	NULL, ketaRomInfo, ketaRomName, NULL, NULL, pgmInputInfo, jammaDIPInfo,
 	ketsuiInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
 	224, 448, 3, 4
 };
@@ -4053,7 +4053,7 @@ struct BurnDriver BurnDrvKetb = {
 
 // Ketsui Kizuna Jigoku Tachi (Original?, Japan)
 
-static struct BurnRomInfo ketcRomDesc[] = {
+static struct BurnRomInfo ketbRomDesc[] = {
 	{ "ketsui_prg_original.bin",	0x200000, 0xcca5e153, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
 
 	{ "t04701w064.u19", 	0x800000, 0x2665b041, 2 | BRF_GRA },					//  1 Tile data
@@ -4070,15 +4070,15 @@ static struct BurnRomInfo ketcRomDesc[] = {
 	{ "ket_defaults.nv",	0x020000, 0x3ca892d8, 0 | BRF_OPT },					//  7 NV RAM
 };
 
-STDROMPICKEXT(ketc, ketc, ketsuiBios) // custom bios
-STD_ROM_FN(ketc)
+STDROMPICKEXT(ketb, ketb, ketsuiBios) // custom bios
+STD_ROM_FN(ketb)
 
-struct BurnDriver BurnDrvKetc = {
-	"ketc", "ket", NULL, NULL, "2002",
+struct BurnDriver BurnDrvKetb = {
+	"ketb", "ket", NULL, NULL, "2002",
 	"Ketsui Kizuna Jigoku Tachi (Original?, Japan)\0", NULL, "CAVE / AMI", "PolyGameMaster based",
 	L"Ketsui Kizuna Jigoku Tachi\0\u30B1\u30C4\u30A4~\u7D46\u5730\u7344\u305F\u3061 (Original?, Japan)\0", NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_JAMMAPCB/* | HARDWARE_IGS_USE_ARM_CPU*/, GBF_VERSHOOT, 0,
-	NULL, ketcRomInfo, ketcRomName, NULL, NULL, pgmInputInfo, jammaDIPInfo,
+	NULL, ketbRomInfo, ketbRomName, NULL, NULL, pgmInputInfo, jammaDIPInfo,
 	ketsuiInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
 	224, 448, 3, 4
 };
@@ -4258,7 +4258,7 @@ struct BurnDriver BurnDrvEspgal = {
 // The Gladiator - Road Of The Sword / Shen Jian (V100, Japan, PCB Version)
 
 static struct BurnRomInfo thegladpcbRomDesc[] = {
-	{ "v100.u43",			0x080000, 0xbcf3b172, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
+	{ "glad_v100.43",		0x080000, 0xbcf3b172, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
 
 	{ "t04601.u71",			0x800000, 0xe5dab371, 2 | BRF_GRA },			//  1 Tile data
 
@@ -4271,13 +4271,13 @@ static struct BurnRomInfo thegladpcbRomDesc[] = {
 
 	{ "w04601.u8",			0x800000, 0x5f15ddb3, 5 | BRF_SND },			//  7 Samples
 	// these contain samples for the japan region
-	{ "wave.u29",     		0x200000, 0x51acb395, 5 | BRF_SND },			//  8
+	{ "igs29.bin",     		0x200000, 0x51acb395, 5 | BRF_SND },			//  8
 
 //	{ "thegladpcb_igs027a.bin",					0x004000, 0x00000000, 7 | BRF_PRG | BRF_ESS | BRF_NODUMP },  //  8 Internal ARM7 Rom
 	{ "thegladpcb_igs027a_execute_only_area",	0x000188, 0x00000000, 0 | BRF_PRG | BRF_ESS | BRF_NODUMP },  //  8 Internal ARM7 Rom
 	{ "thegladpcb_igs027a_v100_japan.bin",      0x003e78, 0xd7f06e2d, 7 | BRF_PRG | BRF_ESS },  //  9
 
-	{ "v100.u62",		    0x200000, 0x0f3f511e, 8 | BRF_PRG | BRF_ESS },	// 10 External ARM7 Rom
+	{ "igs_v100.62",	    0x200000, 0x0f3f511e, 8 | BRF_PRG | BRF_ESS },	// 10 External ARM7 Rom
 };
 
 STDROMPICKEXT(thegladpcb, thegladpcb, thegladBIOS) // custom bios
@@ -4348,8 +4348,8 @@ static struct BurnRomInfo svgpcbRomDesc[] = {
 	{ "w05602b032.bin",		0x400000, 0x0685166d, 5 | BRF_SND },			//  9
 
 //	{ "svgpcb_igs027a.bin",			   0x004000, 0x00000000, 7 | BRF_PRG | BRF_ESS | BRF_NODUMP },	// 10 Internal ARM7 Rom
-	{ "svg_igs027a_execute_only_area", 0x000188, 0x00000000, 0 | BRF_OPT | BRF_NODUMP },	// 10 Internal ARM7 Rom
-	{ "svgpcb_igs027a_v100_japan.bin", 0x003e78, 0x7a59da5d, 7 | BRF_PRG | BRF_ESS },		// 11 Internal ARM7 Rom
+	{ "svgpcb_igs027a_execute_only_area", 0x000188, 0x00000000, 0 | BRF_OPT | BRF_NODUMP },	// 10 Internal ARM7 Rom
+	{ "svgcpb_igs027a_v100_japan.bin", 0x003e78, 0x7a59da5d, 7 | BRF_PRG | BRF_ESS },		// 11 Internal ARM7 Rom
 
 	{ "svg_v100jp.u64",		0x400000, 0x399d4a8b, 8 | BRF_PRG | BRF_ESS },	// 12 External ARM7 Rom
 	{ "svg_v100jp.u65",		0x400000, 0x6e1c33b1, 8 | BRF_PRG | BRF_ESS },	// 13
@@ -5074,4 +5074,4 @@ struct BurnDriver BurnDrvkovshpeh = {
 	NULL, kovshpehRomInfo, kovshpehRomName, NULL, NULL, pgmInputInfo, kovshxasDIPInfo,
 	kovshpInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
 	448, 224, 4, 3
-};
\ No newline at end of file
+};
diff --git a/src/burn/drv/pre90s/d_4enraya.cpp b/src/burn/drv/pre90s/d_4enraya.cpp
index eb8a8d56b..1b4823459 100644
--- a/src/burn/drv/pre90s/d_4enraya.cpp
+++ b/src/burn/drv/pre90s/d_4enraya.cpp
@@ -462,7 +462,7 @@ static struct BurnRomInfo enraya4RomDesc[] = {
 	{ "5.bin",   0x8000, 0xcf1cd151, BRF_ESS | BRF_PRG }, //  0 Z80 Code
 	{ "4.bin",   0x4000, 0xf9ec1be7, BRF_ESS | BRF_PRG }, //  1
 
-	{ "1.bin",   0x2000, 0x87f92552, BRF_GRA },	      //  2 Graphics
+	{ "1.bin",   0x2000, 0x0e5072fd, BRF_GRA },	      //  2 Graphics
 	{ "2.bin",   0x2000, 0x2b0a3793, BRF_GRA },	      //  3
 	{ "3.bin",   0x2000, 0xf6940836, BRF_GRA },	      //  4
 
@@ -494,7 +494,7 @@ static struct BurnRomInfo enrayaa4RomDesc[] = {
 	{ "(__4enrayaa)5.bin",   0x8000, 0x76e8656c, BRF_ESS | BRF_PRG }, //  0 Z80 Code
 	{ "4.bin",   			 0x4000, 0xf9ec1be7, BRF_ESS | BRF_PRG }, //  1
 
-	{ "(__4enrayaa)1.bin",   0x2000, 0x0e5072fd, BRF_GRA },	      //  2 Graphics
+	{ "1.bin",               0x2000, 0x0e5072fd, BRF_GRA },	      //  2 Graphics
 	{ "2.bin",   			 0x2000, 0x2b0a3793, BRF_GRA },	      //  3
 	{ "3.bin",   			 0x2000, 0xf6940836, BRF_GRA },	      //  4
 
diff --git a/src/burn/drv/pre90s/d_punchout.cpp b/src/burn/drv/pre90s/d_punchout.cpp
index 6f365c178..d032fe7a6 100644
--- a/src/burn/drv/pre90s/d_punchout.cpp
+++ b/src/burn/drv/pre90s/d_punchout.cpp
@@ -1387,19 +1387,19 @@ struct BurnDriver BurnDrvPunchoutj = {
 // Punch-Out!! (Italian bootleg)
 
 static struct BurnRomInfo punchitaRomDesc[] = {
-	{ "chp1-c.8l",	0x2000, 0x1d595ce2, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 Code
-	{ "chp1-c.8k",	0x2000, 0xc062fa5c, 1 | BRF_PRG | BRF_ESS }, //  1
-	{ "chp1-c.8j",	0x2000, 0x48d453ef, 1 | BRF_PRG | BRF_ESS }, //  2
-	{ "chp1-c.8h",	0x2000, 0x67f5aedc, 1 | BRF_PRG | BRF_ESS }, //  3
-	{ "chp1-c.8f",	0x4000, 0x761de4f3, 1 | BRF_PRG | BRF_ESS }, //  4
+	{ "chp1-c(__ita).8l",	0x2000, 0x1d595ce2, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 Code
+	{ "chp1-c(__ita).8k",	0x2000, 0xc062fa5c, 1 | BRF_PRG | BRF_ESS }, //  1
+	{ "chp1-c(__ita).8j",	0x2000, 0x48d453ef, 1 | BRF_PRG | BRF_ESS }, //  2
+	{ "chp1-c(__ita).8h",	0x2000, 0x67f5aedc, 1 | BRF_PRG | BRF_ESS }, //  3
+	{ "chp1-c(__ita).8f",	0x4000, 0x761de4f3, 1 | BRF_PRG | BRF_ESS }, //  4
 
 	{ "chp1-c.4k",	0x2000, 0xcb6ef376, 2 | BRF_PRG | BRF_ESS }, //  5 N2A03 Code
 
-	{ "chp1-b.4c",	0x2000, 0x9a9ff1d3, 3 | BRF_GRA },           //  6 Top Screen Background Characters
-	{ "chp1-b.4d",	0x2000, 0x4c23350f, 3 | BRF_GRA },           //  7
+	{ "chp1-b(__ita).4c",	0x2000, 0x9a9ff1d3, 3 | BRF_GRA },           //  6 Top Screen Background Characters
+	{ "chp1-b(__ita).4d",	0x2000, 0x4c23350f, 3 | BRF_GRA },           //  7
 
-	{ "chp1-b.4a",	0x2000, 0xc075f831, 4 | BRF_GRA },           //  8 Bottom Screen Background Characters
-	{ "chp1-b.4b",	0x2000, 0xc4cc2b5a, 4 | BRF_GRA },           //  9
+	{ "chp1-b(__ita).4a",	0x2000, 0xc075f831, 4 | BRF_GRA },           //  8 Bottom Screen Background Characters
+	{ "chp1-b(__ita).4b",	0x2000, 0xc4cc2b5a, 4 | BRF_GRA },           //  9
 
 	{ "chp1-v.2r",	0x4000, 0xbd1d4b2e, 5 | BRF_GRA },           // 10 Big Sprite Characters
 	{ "chp1-v.2t",	0x4000, 0xdd9a688a, 5 | BRF_GRA },           // 11
@@ -1413,10 +1413,10 @@ static struct BurnRomInfo punchitaRomDesc[] = {
 	{ "chp1-v.4t",	0x4000, 0x37ffc940, 5 | BRF_GRA },           // 19
 	{ "chp1-v.4u",	0x2000, 0x1a7521d4, 5 | BRF_GRA },           // 20
 
-	{ "chp1-v.6p",	0x2000, 0x75be7aae, 6 | BRF_GRA },           // 21 Bottom Screen Big Sprite Characters
-	{ "chp1-v.6n",	0x2000, 0xdaf74de0, 6 | BRF_GRA },           // 22
-	{ "chp1-v.8p",	0x2000, 0x4cb7ea82, 6 | BRF_GRA },           // 23
-	{ "chp1-v.8n",	0x2000, 0x1c0d09aa, 6 | BRF_GRA },           // 24
+	{ "chp1-v(__ita).6p",	0x2000, 0x75be7aae, 6 | BRF_GRA },           // 21 Bottom Screen Big Sprite Characters
+	{ "chp1-v(__ita).6n",	0x2000, 0xdaf74de0, 6 | BRF_GRA },           // 22
+	{ "chp1-v(__ita).8p",	0x2000, 0x4cb7ea82, 6 | BRF_GRA },           // 23
+	{ "chp1-v(__ita).8n",	0x2000, 0x1c0d09aa, 6 | BRF_GRA },           // 24
 
 	{ "chp1-b.6e",	0x0200, 0xe9ca3ac6, 7 | BRF_GRA },           // 25 Color PROMs
 	{ "chp1-b.6f",	0x0200, 0x02be56ab, 7 | BRF_GRA },           // 26
diff --git a/src/burn/drv/pre90s/d_scregg.cpp b/src/burn/drv/pre90s/d_scregg.cpp
index 33f179716..be73b195d 100644
--- a/src/burn/drv/pre90s/d_scregg.cpp
+++ b/src/burn/drv/pre90s/d_scregg.cpp
@@ -648,7 +648,7 @@ static struct BurnRomInfo screggRomDesc[] = {
 	{ "d90.g12",      0x1000, 0xff3c2894, 2 | BRF_GRA },	       //  9
 	{ "da0.g10",      0x1000, 0x9c20214a, 2 | BRF_GRA },	       // 10
 
-	{ "dc0.c6 ",      0x0020, 0xff23bdd6, 3 | BRF_GRA },	       // 11 Palette
+	{ "dc0.c6",       0x0020, 0xff23bdd6, 3 | BRF_GRA },	       // 11 Palette
 
 	{ "db1.b4",       0x0020, 0x7cc4824b, 0 | BRF_OPT },	       // 12
 };
diff --git a/src/burn/drv/pst90s/d_galpanic.cpp b/src/burn/drv/pst90s/d_galpanic.cpp
index f970cf5cf..16b75f297 100644
--- a/src/burn/drv/pst90s/d_galpanic.cpp
+++ b/src/burn/drv/pst90s/d_galpanic.cpp
@@ -725,7 +725,7 @@ static struct BurnRomInfo PgalvipaRomDesc[] = {
 	{ "pgalvip_3.ue17", 	0x80000, 0xa48e8255, BRF_ESS | BRF_PRG }, // 68000 code
 	{ "pgalvip_4.ud17",		0x80000, 0x829a2085, BRF_ESS | BRF_PRG },
 
-	{ "pgalvip_5.u5",		0x80000, 0xa8a50745, BRF_GRA },			  // graphics
+	{ "pgalvip_5.u5",		0x80000, 0x2d6e5a90, BRF_GRA },			  // graphics
 
 	{ "pgalvip_1.ub6",		0x20000, 0xd32a6c0c, BRF_SND },			  // PCM
 	{ "pgalvip_2.uc6",		0x80000, 0x2168e54a, BRF_SND },
diff --git a/src/burn/drv/pst90s/d_kaneko16.cpp b/src/burn/drv/pst90s/d_kaneko16.cpp
index ff1402e97..fef866924 100644
--- a/src/burn/drv/pst90s/d_kaneko16.cpp
+++ b/src/burn/drv/pst90s/d_kaneko16.cpp
@@ -740,25 +740,25 @@ ROM Descriptions
 ===============================================================================================*/
 
 static struct BurnRomInfo BerlwallRomDesc[] = {
-	{ "u23_01.bin",        0x020000, 0x76b526ce, BRF_ESS | BRF_PRG }, //  0	68000 Program Code
-	{ "u39_01.bin",        0x020000, 0x78fa7ef2, BRF_ESS | BRF_PRG }, //  1	68000 Program Code
+	{ "u23_01.u23",        0x020000, 0x76b526ce, BRF_ESS | BRF_PRG }, //  0	68000 Program Code
+	{ "u39_01.u39",        0x020000, 0x78fa7ef2, BRF_ESS | BRF_PRG }, //  1	68000 Program Code
 	
-	{ "bw001",             0x080000, 0xbc927260, BRF_GRA },		  //  2	Sprites
-	{ "bw002",             0x080000, 0x223f5465, BRF_GRA },		  //  3	Sprites
-	{ "bw300",             0x020000, 0xb258737a, BRF_GRA },		  //  4	Sprites
+	{ "bw001.u84",         0x080000, 0xbc927260, BRF_GRA },		  //  2	Sprites
+	{ "bw002.u83",         0x080000, 0x223f5465, BRF_GRA },		  //  3	Sprites
+	{ "bw300.u82",         0x020000, 0xb258737a, BRF_GRA },		  //  4	Sprites
 	
-	{ "bw003",             0x080000, 0xfbb4b72d, BRF_GRA },		  //  5 Tiles
+	{ "bw003.u77",         0x080000, 0xfbb4b72d, BRF_GRA },		  //  5 Tiles
 	
-	{ "bw004",             0x080000, 0x5300c34d, BRF_GRA },		  //  6 High colour background
-	{ "bw008",             0x080000, 0x9aaf2f2f, BRF_GRA },		  //  7 High colour background
-	{ "bw005",             0x080000, 0x16db6d43, BRF_GRA },		  //  8 High colour background
-	{ "bw009",             0x080000, 0x1151a0b0, BRF_GRA },		  //  9 High colour background
-	{ "bw006",             0x080000, 0x73a35d1f, BRF_GRA },		  //  10 High colour background
-	{ "bw00a",             0x080000, 0xf447dfc2, BRF_GRA },		  //  11 High colour background
-	{ "bw007",             0x080000, 0x97f85c87, BRF_GRA },		  //  12 High colour background
-	{ "bw00b",             0x080000, 0xb0a48225, BRF_GRA },		  //  13 High colour background
+	{ "bw004.u73",         0x080000, 0x5300c34d, BRF_GRA },		  //  6 High colour background
+	{ "bw008.u65",         0x080000, 0x9aaf2f2f, BRF_GRA },		  //  7 High colour background
+	{ "bw005.u74",         0x080000, 0x16db6d43, BRF_GRA },		  //  8 High colour background
+	{ "bw009.u66",         0x080000, 0x1151a0b0, BRF_GRA },		  //  9 High colour background
+	{ "bw006.u75",         0x080000, 0x73a35d1f, BRF_GRA },		  //  10 High colour background
+	{ "bw00a.u67",         0x080000, 0xf447dfc2, BRF_GRA },		  //  11 High colour background
+	{ "bw007.u76",         0x080000, 0x97f85c87, BRF_GRA },		  //  12 High colour background
+	{ "bw00b.u68",         0x080000, 0xb0a48225, BRF_GRA },		  //  13 High colour background
 
-	{ "bw000",             0x040000, 0xd8fe869d, BRF_SND },		  //  14 Samples
+	{ "bw000.u46",         0x040000, 0xd8fe869d, BRF_SND },		  //  14 Samples
 };
 
 
@@ -766,25 +766,25 @@ STD_ROM_PICK(Berlwall)
 STD_ROM_FN(Berlwall)
 
 static struct BurnRomInfo BerlwalltRomDesc[] = {
-	{ "bw100a",            0x020000, 0xe6bcb4eb, BRF_ESS | BRF_PRG }, //  0	68000 Program Code
-	{ "bw101a",            0x020000, 0x38056fb2, BRF_ESS | BRF_PRG }, //  1	68000 Program Code
+	{ "bw100a.u23",        0x020000, 0xe6bcb4eb, BRF_ESS | BRF_PRG }, //  0	68000 Program Code
+	{ "bw101a.u39",        0x020000, 0x38056fb2, BRF_ESS | BRF_PRG }, //  1	68000 Program Code
 	
-	{ "bw001",             0x080000, 0xbc927260, BRF_GRA },		  //  2	Sprites
-	{ "bw002",             0x080000, 0x223f5465, BRF_GRA },		  //  3	Sprites
-	{ "bw300",             0x020000, 0xb258737a, BRF_GRA },		  //  4	Sprites
+	{ "bw001.u84",         0x080000, 0xbc927260, BRF_GRA },		  //  2	Sprites
+	{ "bw002.u83",         0x080000, 0x223f5465, BRF_GRA },		  //  3	Sprites
+	{ "bw300.u82",         0x020000, 0xb258737a, BRF_GRA },		  //  4	Sprites
 	
-	{ "bw003",             0x080000, 0xfbb4b72d, BRF_GRA },		  //  5 Tiles
+	{ "bw003.u77",         0x080000, 0xfbb4b72d, BRF_GRA },		  //  5 Tiles
 	
-	{ "bw004",             0x080000, 0x5300c34d, BRF_GRA },		  //  6 High colour background
-	{ "bw008",             0x080000, 0x9aaf2f2f, BRF_GRA },		  //  7 High colour background
-	{ "bw005",             0x080000, 0x16db6d43, BRF_GRA },		  //  8 High colour background
-	{ "bw009",             0x080000, 0x1151a0b0, BRF_GRA },		  //  9 High colour background
-	{ "bw006",             0x080000, 0x73a35d1f, BRF_GRA },		  //  10 High colour background
-	{ "bw00a",             0x080000, 0xf447dfc2, BRF_GRA },		  //  11 High colour background
-	{ "bw007",             0x080000, 0x97f85c87, BRF_GRA },		  //  12 High colour background
-	{ "bw00b",             0x080000, 0xb0a48225, BRF_GRA },		  //  13 High colour background
+	{ "bw004.u73",         0x080000, 0x5300c34d, BRF_GRA },		  //  6 High colour background
+	{ "bw008.u65",         0x080000, 0x9aaf2f2f, BRF_GRA },		  //  7 High colour background
+	{ "bw005.u74",         0x080000, 0x16db6d43, BRF_GRA },		  //  8 High colour background
+	{ "bw009.u66",         0x080000, 0x1151a0b0, BRF_GRA },		  //  9 High colour background
+	{ "bw006.u75",         0x080000, 0x73a35d1f, BRF_GRA },		  //  10 High colour background
+	{ "bw00a.u67",         0x080000, 0xf447dfc2, BRF_GRA },		  //  11 High colour background
+	{ "bw007.u76",         0x080000, 0x97f85c87, BRF_GRA },		  //  12 High colour background
+	{ "bw00b.u68",         0x080000, 0xb0a48225, BRF_GRA },		  //  13 High colour background
 
-	{ "bw000",             0x040000, 0xd8fe869d, BRF_SND },		  //  14 Samples
+	{ "bw000.u46",         0x040000, 0xd8fe869d, BRF_SND },		  //  14 Samples
 };
 
 
diff --git a/src/burn/drv/pst90s/d_seta.cpp b/src/burn/drv/pst90s/d_seta.cpp
index 0165c4d66..be06475b7 100644
--- a/src/burn/drv/pst90s/d_seta.cpp
+++ b/src/burn/drv/pst90s/d_seta.cpp
@@ -8918,6 +8918,32 @@ struct BurnDriver BurnDrvOrbs = {
 // Kero Kero Keroppi no Issyoni Asobou (Japan)
 
 static struct BurnRomInfo keroppiRomDesc[] = {
+	{ "keroppi jr. code (u10) v1.0.u10", 0x40000, 0x1fc2e895, 0x01 | BRF_PRG | BRF_ESS }, //  0 68k Code
+	{ "keroppi jr. code (u9) v1.0.u9", 0x40000, 0xe0599e7b, 0x01 | BRF_PRG | BRF_ESS }, //  1
+
+	{ "keroppi jr. chr(u12) v1.0.u12", 0x80000, 0x6f4dae98, 0x03 | BRF_GRA },           //  2
+	{ "keroppi jr. chr(u11) v1.0.u11", 0x80000, 0x74148c23, 0x03 | BRF_GRA },           //  3
+
+	{ "keroppi jr. snd (u15) v1.0.u15",	0x80000, 0xc98dacf0, 0x06 | BRF_SND },           //  4 x1-010 Samples
+	{ "keroppi jr. snd (u16) v1.0.u16",	0x80000, 0xd61e5a32, 0x06 | BRF_SND },           //  5
+};
+
+STD_ROM_PICK(keroppi)
+STD_ROM_FN(keroppi)
+
+struct BurnDriver BurnDrvKeroppi = {
+	"keroppi", NULL, NULL, NULL, "1993",
+	"Kero Kero Keroppi no Issyoni Asobou (Japan)\0", NULL, "Sammy Industries", "Seta",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING, 1, HARDWARE_SETA1, GBF_MISC, 0,
+	NULL, keroppiRomInfo, keroppiRomName, NULL, NULL, KeroppiInputInfo, KeroppiDIPInfo,
+	orbsInit, DrvExit, DrvFrame, setaNoLayersDraw, DrvScan, &DrvRecalc, 0x200,
+	320, 240, 4, 3
+};
+
+// Kero Kero Keroppi no Issyoni Asobou (Japan)
+
+static struct BurnRomInfo keroppijRomDesc[] = {
 	{ "ft-001-001.u10",	0x80000, 0x37861e7d, 0x01 | BRF_PRG | BRF_ESS }, //  0 68k Code
 	{ "ft-001-002.u9",	0x80000, 0xf531d4ef, 0x01 | BRF_PRG | BRF_ESS }, //  1
 
@@ -8930,15 +8956,15 @@ static struct BurnRomInfo keroppiRomDesc[] = {
 	{ "ft-001-008.u16",	0x80000, 0xb9c4b637, 0x06 | BRF_SND },           //  7
 };
 
-STD_ROM_PICK(keroppi)
-STD_ROM_FN(keroppi)
+STD_ROM_PICK(keroppij)
+STD_ROM_FN(keroppij)
 
-struct BurnDriver BurnDrvKeroppi = {
-	"keroppi", NULL, NULL, NULL, "1993",
+struct BurnDriver BurnDrvKeroppij = {
+	"keroppij", "keroppi", NULL, NULL, "1993",
 	"Kero Kero Keroppi no Issyoni Asobou (Japan)\0", NULL, "Sammy Industries", "Seta",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING, 1, HARDWARE_SETA1, GBF_MISC, 0,
-	NULL, keroppiRomInfo, keroppiRomName, NULL, NULL, KeroppiInputInfo, KeroppiDIPInfo,
+	BDF_GAME_WORKING | BDF_CLONE, 1, HARDWARE_SETA1, GBF_MISC, 0,
+	NULL, keroppijRomInfo, keroppijRomName, NULL, NULL, KeroppiInputInfo, KeroppiDIPInfo,
 	orbsInit, DrvExit, DrvFrame, setaNoLayersDraw, DrvScan, &DrvRecalc, 0x200,
 	320, 240, 4, 3
 };
diff --git a/src/burn/drv/sega/d_sys16b.cpp b/src/burn/drv/sega/d_sys16b.cpp
index ad3f87c35..6ea92b377 100644
--- a/src/burn/drv/sega/d_sys16b.cpp
+++ b/src/burn/drv/sega/d_sys16b.cpp
@@ -2686,8 +2686,8 @@ STD_ROM_PICK(Ddux1)
 STD_ROM_FN(Ddux1)
 
 static struct BurnRomInfo DduxjRomDesc[] = {
-	{ "epr-11114.a7",   0x20000, 0xa3eedc3b, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
-	{ "epr-11112.a5",   0x20000, 0x05989323, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
+	{ "epr-11914.a7",   0x20000, 0xa3eedc3b, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
+	{ "epr-11912.a5",   0x20000, 0x05989323, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	{ "epr-11915.a8",   0x20000, 0xd8ed3132, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	{ "epr-11913.a6",   0x20000, 0x30c6cb92, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	
@@ -2824,7 +2824,7 @@ STD_ROM_FN(Eswatj)
 static struct BurnRomInfo Eswatj1RomDesc[] = {
 	{ "epr-12683.a7",   0x20000, 0x33c34cfd, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	{ "epr-12681.a5",   0x20000, 0x6b2feb09, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
-	{ "epr-12683.a8",   0x20000, 0x2e5b866b, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
+	{ "epr-12684.a8",   0x20000, 0x2e5b866b, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	{ "epr-12682.a6",   0x20000, 0x8e1f57d2, SYS16_ROM_PROG | BRF_ESS | BRF_PRG },
 	
 	{ "epr-12688.a14",  0x20000, 0x12f898db, SYS16_ROM_TILES | BRF_GRA },
@@ -2850,7 +2850,7 @@ static struct BurnRomInfo Eswatj1RomDesc[] = {
 	{ "epr-12685.a10",  0x08000, 0x5d0c16d7, SYS16_ROM_Z80PROG | BRF_ESS | BRF_PRG },
 	
 	{ "mpr-12686.a11",  0x20000, 0xf451705e, SYS16_ROM_UPD7759DATA | BRF_SND },
-	{ "mpr-12686.a12",  0x20000, 0x9e87571f, SYS16_ROM_UPD7759DATA | BRF_SND },
+	{ "mpr-12687.a12",  0x20000, 0x9e87571f, SYS16_ROM_UPD7759DATA | BRF_SND },
 	
 	{ "317-0131.key",   0x02000, 0x8f71726d, SYS16_ROM_KEY | BRF_ESS | BRF_PRG },
 };
diff --git a/src/burn/drv/sega/d_ybrd.cpp b/src/burn/drv/sega/d_ybrd.cpp
index f8abd38a4..28aae79ad 100644
--- a/src/burn/drv/sega/d_ybrd.cpp
+++ b/src/burn/drv/sega/d_ybrd.cpp
@@ -554,6 +554,8 @@ static struct BurnRomInfo Gforce2RomDesc[] = {
 	{ "mpr-11465.107",    0x80000, 0xe1436dab, SYS16_ROM_PCMDATA | BRF_SND },
 	{ "epr-11516.106",    0x20000, 0x19d0e17f, SYS16_ROM_PCMDATA | BRF_SND },
 	{ "epr-11814.105",    0x20000, 0x0b05d376, SYS16_ROM_PCMDATA | BRF_SND },
+	
+	{ "motorpcb.prg",     0x08000, 0xfecee31e, BRF_OPT },
 };
 
 
diff --git a/src/burn/drv/toaplan/d_tigerheli.cpp b/src/burn/drv/toaplan/d_tigerheli.cpp
index ddbd81024..4276cba64 100644
--- a/src/burn/drv/toaplan/d_tigerheli.cpp
+++ b/src/burn/drv/toaplan/d_tigerheli.cpp
@@ -1981,12 +1981,12 @@ static INT32 tigerhInit()
 	if (strcmp(BurnDrvGetTextA(DRV_NAME), "tigerh") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "tigerhj") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "tigerhb1") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "tigerhb2") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "tigerhb3") == 0) {
 		nWhichGame = 0;
 	}
-	if (strcmp(BurnDrvGetTextA(DRV_NAME), "getstar") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "getstarj") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb1") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb2") == 0) {
+	if (strcmp(BurnDrvGetTextA(DRV_NAME), "grdian") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "getstarj") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb1") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb2") == 0) {
 		nWhichGame = 1;
-		if (strcmp(BurnDrvGetTextA(DRV_NAME), "getstar") == 0) GetStarType = GETSTAR;
+		if (strcmp(BurnDrvGetTextA(DRV_NAME), "grdian") == 0) GetStarType = GETSTAR;
 		if (strcmp(BurnDrvGetTextA(DRV_NAME), "getstarj") == 0) GetStarType = GETSTARJ;
-		if (strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb1") == 0) GetStarType = GETSTARB1;
-		if (strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb2") == 0) GetStarType = GETSTARB2;
+		if (strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb1") == 0) GetStarType = GETSTARB1;
+		if (strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb2") == 0) GetStarType = GETSTARB2;
 	}
 	if (strcmp(BurnDrvGetTextA(DRV_NAME), "alcon") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "slapfigh") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "slapfighb1") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "slapfighb2") == 0 || strcmp(BurnDrvGetTextA(DRV_NAME), "slapfighb3") == 0) {
 		nWhichGame = 2;
@@ -2007,7 +2007,7 @@ static INT32 tigerhInit()
 		return 1;
 	}
 	
-	if (!strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb1")) Rom01[0x6d56] = 0xc3;
+	if (!strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb1")) Rom01[0x6d56] = 0xc3;
 
 	{
 		ZetInit(0);
@@ -2028,7 +2028,7 @@ static INT32 tigerhInit()
 		ZetMapArea(0xC000, 0xC7FF, 2, Ram01);
 
 		// Shared RAM
-		if (strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb1")) {
+		if (strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb1")) {
 			ZetMapArea(0xC800, 0xCFFF, 0, RamShared);
 		}
 		ZetMapArea(0xC800, 0xCFFF, 1, RamShared);
@@ -2066,7 +2066,7 @@ static INT32 tigerhInit()
 			ZetSetWriteHandler(tigerhWriteCPU0);
 		}
 		
-		if (!strcmp(BurnDrvGetTextA(DRV_NAME), "gtstarb1")) {
+		if (!strcmp(BurnDrvGetTextA(DRV_NAME), "getstarb1")) {
 			ZetSetInHandler(tigerhInCPU0_gtstarba);
 		} else {
 			ZetSetInHandler(tigerhInCPU0);
@@ -2803,7 +2803,7 @@ struct BurnDriver BurnDrvTigerHB3 = {
 };
 
 struct BurnDriver BurnDrvGetStar = {
-	"getstar", NULL, NULL, NULL, "1986",
+	"grdian", NULL, NULL, NULL, "1986",
 	"Guardian\0", NULL, "Toaplan / Taito America Corporation (Kitkorp license)", "Early Toaplan",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING, 2, HARDWARE_TOAPLAN_MISC, GBF_SCRFIGHT, 0,
@@ -2813,7 +2813,7 @@ struct BurnDriver BurnDrvGetStar = {
 };
 
 struct BurnDriver BurnDrvGetStarj = {
-	"getstarj", "getstar", NULL, NULL, "1986",
+	"getstarj", "grdian", NULL, NULL, "1986",
 	"Get Star (Japan)\0", NULL, "Toaplan / Taito", "Early Toaplan",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TOAPLAN_MISC, GBF_SCRFIGHT, 0,
@@ -2823,7 +2823,7 @@ struct BurnDriver BurnDrvGetStarj = {
 };
 
 struct BurnDriver BurnDrvGetStarb2 = {
-	"gtstarb2", "getstar", NULL, NULL, "1986",
+	"getstarb2", "grdian", NULL, NULL, "1986",
 	"Get Star (bootleg, set 2)\0", NULL, "Taito", "Early Toaplan",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TOAPLAN_MISC, GBF_SCRFIGHT, 0,
@@ -2833,7 +2833,7 @@ struct BurnDriver BurnDrvGetStarb2 = {
 };
 
 struct BurnDriver BurnDrvGetStarb1 = {
-	"gtstarb1", "getstar", NULL, NULL, "1986",
+	"getstarb1", "grdian", NULL, NULL, "1986",
 	"Get Star (bootleg, set 1)\0", NULL, "Taito", "Early Toaplan",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TOAPLAN_MISC, GBF_SCRFIGHT, 0,