diff --git a/.gitattributes b/.gitattributes
index b0c99665965..a549b49f237 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1239,6 +1239,8 @@ src/mame/drivers/aerofgt.c svneol=native#text/plain
 src/mame/drivers/airbustr.c svneol=native#text/plain
 src/mame/drivers/ajax.c svneol=native#text/plain
 src/mame/drivers/aladbl.c svneol=native#text/plain
+src/mame/drivers/albazc.c svneol=native#text/plain
+src/mame/drivers/albazg.c svneol=native#text/plain
 src/mame/drivers/aleck64.c svneol=native#text/plain
 src/mame/drivers/alg.c svneol=native#text/plain
 src/mame/drivers/aliens.c svneol=native#text/plain
@@ -1583,7 +1585,6 @@ src/mame/drivers/gunsmoke.c svneol=native#text/plain
 src/mame/drivers/gyruss.c svneol=native#text/plain
 src/mame/drivers/halleys.c svneol=native#text/plain
 src/mame/drivers/hanaawas.c svneol=native#text/plain
-src/mame/drivers/hanaroku.c svneol=native#text/plain
 src/mame/drivers/harddriv.c svneol=native#text/plain
 src/mame/drivers/hcastle.c svneol=native#text/plain
 src/mame/drivers/hexa.c svneol=native#text/plain
@@ -2228,7 +2229,6 @@ src/mame/drivers/xxmissio.c svneol=native#text/plain
 src/mame/drivers/xybots.c svneol=native#text/plain
 src/mame/drivers/xyonix.c svneol=native#text/plain
 src/mame/drivers/yiear.c svneol=native#text/plain
-src/mame/drivers/yumefuda.c svneol=native#text/plain
 src/mame/drivers/yunsun16.c svneol=native#text/plain
 src/mame/drivers/yunsung8.c svneol=native#text/plain
 src/mame/drivers/zac2650.c svneol=native#text/plain
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/albazc.c
similarity index 99%
rename from src/mame/drivers/hanaroku.c
rename to src/mame/drivers/albazc.c
index 3d89b0cfb29..49bc3f31cb0 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/albazc.c
@@ -1,4 +1,4 @@
-/* Hanaroku */
+/* Hanaroku - Alba ZC HW */
 
 /*
 TODO:
@@ -212,7 +212,6 @@ static const gfx_layout hanaroku_charlayout =
 
 static GFXDECODE_START( hanaroku )
 	GFXDECODE_ENTRY( "gfx1", 0, hanaroku_charlayout,   0, 32  )
-
 GFXDECODE_END
 
 
diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/albazg.c
similarity index 98%
rename from src/mame/drivers/yumefuda.c
rename to src/mame/drivers/albazg.c
index 445658109e8..b42cef7562a 100644
--- a/src/mame/drivers/yumefuda.c
+++ b/src/mame/drivers/albazg.c
@@ -1,12 +1,12 @@
 /*******************************************************************************************
 
-Yumefuda (c) 1991 Alba
+ZG board (c) 1991 Alba
 
 driver by Angelo Salese
 
 Notes:
--I think the name of this hardware is "Alba ZG board",a newer revision of the
- "Alba ZC board" used by Hanaroku (hanaroku.c driver).Test mode says clearly that this is
+-The name of this hardware is "Alba ZG board",a newer revision of the
+ "Alba ZC board" used by Hanaroku (albazc.c driver). Test mode says clearly that this is
  from 1991.
 
 TODO:
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 7f2f253e04d..94b8ba377c1 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -1138,6 +1138,9 @@ ROM_START( tknight )
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "tkni3.bin",    0x0000, 0x10000, CRC(15623ec7) SHA1(db43fe6c417117d7cd90a26e12a52efb0e1a5ca6) )   /* Audio CPU is a Z80  */
 
+	ROM_REGION( 0x1000, "mcu", 0 )	/* protection NEC D8749 */
+	ROM_LOAD( "a-6v.mcu",         0x00000, 0x1000, NO_DUMP )
+
 	ROM_REGION( 0x010000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "tkni5.bin",    0x000000, 0x10000, CRC(5ed15896) SHA1(87bdddb26934af0b2c4e704e6d85c69a7531aeb1) )	/* 8x8 tiles */
 
@@ -1163,6 +1166,9 @@ ROM_START( wildfang )
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "tkni3.bin",    0x0000, 0x10000, CRC(15623ec7) SHA1(db43fe6c417117d7cd90a26e12a52efb0e1a5ca6) )   /* Audio CPU is a Z80  */
 
+	ROM_REGION( 0x1000, "mcu", 0 )	/* protection NEC D8749 */
+	ROM_LOAD( "a-6v.mcu",         0x00000, 0x1000, NO_DUMP )
+
 	ROM_REGION( 0x010000, "gfx1", ROMREGION_DISPOSE )
 	ROM_LOAD( "tkni5.bin",    0x000000, 0x10000, CRC(5ed15896) SHA1(87bdddb26934af0b2c4e704e6d85c69a7531aeb1) )	/* 8x8 tiles */
 
@@ -1191,7 +1197,7 @@ ROM_START( stratof )
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "a-4b.3",           0x00000, 0x10000, CRC(18655c95) SHA1(8357e0520565a201bb930cadffc759463931ec41) )
 
-	ROM_REGION( 0x1000, "cpu2", 0 )	/* protection NEC D8749 */
+	ROM_REGION( 0x1000, "mcu", 0 )	/* protection NEC D8749 */
 	ROM_LOAD( "a-6v.mcu",         0x00000, 0x1000, NO_DUMP )
 
 	ROM_REGION( 0x10000, "gfx1", ROMREGION_DISPOSE )
@@ -1219,7 +1225,7 @@ ROM_START( raiga )
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "a-4b.3",           0x00000, 0x10000, CRC(18655c95) SHA1(8357e0520565a201bb930cadffc759463931ec41) )
 
-	ROM_REGION( 0x1000, "cpu2", 0 )	/* protection NEC D8749 */
+	ROM_REGION( 0x1000, "mcu", 0 )	/* protection NEC D8749 */
 	ROM_LOAD( "a-6v.mcu",         0x00000, 0x1000, NO_DUMP )
 
 	ROM_REGION( 0x10000, "gfx1", ROMREGION_DISPOSE )
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 1268a54fed5..9e82d5a8543 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -341,9 +341,9 @@ $(MAMEOBJ)/shared.a: \
 #-------------------------------------------------
 
 $(MAMEOBJ)/alba.a: \
-	$(DRIVERS)/hanaroku.o \
+	$(DRIVERS)/albazc.o \
+	$(DRIVERS)/albazg.o \
 	$(DRIVERS)/rmhaihai.o \
-	$(DRIVERS)/yumefuda.o \
 
 $(MAMEOBJ)/alliedl.a: \
 	$(DRIVERS)/ace.o \