diff --git a/.gitattributes b/.gitattributes
index efc98e915ca..7933e5c9c74 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1969,10 +1969,10 @@ src/mame/audio/m72.h svneol=native#text/plain
 src/mame/audio/m79amb.c svneol=native#text/plain
 src/mame/audio/madalien.c svneol=native#text/plain
 src/mame/audio/mario.c svneol=native#text/plain
-src/mame/audio/mcr.c svneol=native#text/plain
-src/mame/audio/mcr.h svneol=native#text/plain
 src/mame/audio/meadows.c svneol=native#text/plain
 src/mame/audio/micro3d.c svneol=native#text/plain
+src/mame/audio/midway.c svneol=native#text/plain
+src/mame/audio/midway.h svneol=native#text/plain
 src/mame/audio/mw8080bw.c svneol=native#text/plain
 src/mame/audio/n8080.c svneol=native#text/plain
 src/mame/audio/namco52.c svneol=native#text/plain
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/midway.c
similarity index 99%
rename from src/mame/audio/mcr.c
rename to src/mame/audio/midway.c
index 6d70d0ab73d..1f185eaf1f1 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/midway.c
@@ -40,7 +40,7 @@
 #include "emu.h"
 #include "audio/williams.h"
 #include "includes/mcr.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 
 
 
diff --git a/src/mame/audio/mcr.h b/src/mame/audio/midway.h
similarity index 99%
rename from src/mame/audio/mcr.h
rename to src/mame/audio/midway.h
index 3dbc52f9d7b..985cd2501c8 100644
--- a/src/mame/audio/mcr.h
+++ b/src/mame/audio/midway.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 
-    audio/mcr.h
+    audio/midway.h
 
     Functions to emulate general the various Midway sound cards.
 
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 6f008f69999..6e6b96e635e 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -283,7 +283,7 @@
 
 
 #include "emu.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 #include "sound/samples.h"
 #include "machine/nvram.h"
 #include "includes/mcr.h"
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 1a7b50d6910..a9ab15de489 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -104,7 +104,7 @@
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "machine/z80ctc.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 #include "machine/nvram.h"
 #include "includes/mcr.h"
 #include "includes/mcr3.h"
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index ac7f3883fdc..f03275fec1b 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -55,7 +55,7 @@
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 #include "audio/williams.h"
 #include "machine/nvram.h"
 #include "includes/mcr.h"
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index bc02f5938c8..bc3bab25356 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -9,7 +9,7 @@
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
 #include "machine/z80sio.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 
 /* constants */
 #define MAIN_OSC_MCR_I		XTAL_19_968MHz
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 8a13a4f6d9a..414ceae814e 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -5,7 +5,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 #include "includes/mcr.h"
 
 #define VERBOSE 0
diff --git a/src/mame/machine/mcr68.c b/src/mame/machine/mcr68.c
index 63e685666e5..7b64a0c12cf 100644
--- a/src/mame/machine/mcr68.c
+++ b/src/mame/machine/mcr68.c
@@ -5,7 +5,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "audio/mcr.h"
+#include "audio/midway.h"
 #include "includes/mcr.h"
 #include "includes/mcr68.h"
 
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index d8c652044b5..ea0de345e06 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -976,7 +976,7 @@ $(MAMEOBJ)/midway.a: \
 	$(DRIVERS)/astrocde.o $(VIDEO)/astrocde.o \
 	$(DRIVERS)/balsente.o $(MACHINE)/balsente.o $(VIDEO)/balsente.o \
 	$(DRIVERS)/gridlee.o $(AUDIO)/gridlee.o $(VIDEO)/gridlee.o \
-	$(DRIVERS)/mcr.o $(MACHINE)/mcr.o $(AUDIO)/mcr.o $(VIDEO)/mcr.o \
+	$(DRIVERS)/mcr.o $(MACHINE)/mcr.o $(VIDEO)/mcr.o \
 	$(DRIVERS)/mcr3.o $(VIDEO)/mcr3.o \
 	$(DRIVERS)/mcr68.o $(MACHINE)/mcr68.o $(VIDEO)/mcr68.o \
 	$(DRIVERS)/midqslvr.o \
@@ -994,6 +994,7 @@ $(MAMEOBJ)/midway.a: \
 	$(MACHINE)/midwayic.o \
 	$(AUDIO)/dcs.o \
 	$(AUDIO)/gorf.o \
+	$(AUDIO)/midway.o \
 	$(AUDIO)/wow.o \
 
 $(MAMEOBJ)/namco.a: \