diff --git a/.gitattributes b/.gitattributes
index 6dc0bab1b36..7968575db74 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1620,8 +1620,6 @@ 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/harddriv.c svneol=native#text/plain
-src/mame/drivers/hazemd_s.c svneol=native#text/plain
-src/mame/drivers/hazemd_s.h svneol=native#text/plain
 src/mame/drivers/hcastle.c svneol=native#text/plain
 src/mame/drivers/hexa.c svneol=native#text/plain
 src/mame/drivers/hexion.c svneol=native#text/plain
@@ -2009,6 +2007,8 @@ src/mame/drivers/segag80r.c svneol=native#text/plain
 src/mame/drivers/segag80v.c svneol=native#text/plain
 src/mame/drivers/segahang.c svneol=native#text/plain
 src/mame/drivers/segald.c svneol=native#text/plain
+src/mame/drivers/segamsys.c svneol=native#text/plain
+src/mame/drivers/segamsys.h svneol=native#text/plain
 src/mame/drivers/segaorun.c svneol=native#text/plain
 src/mame/drivers/segas16a.c svneol=native#text/plain
 src/mame/drivers/segas16b.c svneol=native#text/plain
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 25970571603..ca63969ccd2 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -56,7 +56,7 @@ Bugs:
 #include "deprecat.h"
 #include "genesis.h"
 #include "megadriv.h"
-#include "hazemd_s.h"
+#include "segamsys.h"
 
 #define MASTER_CLOCK		53693100
 
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 75d3c07f0ec..6ea939c88ac 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -91,7 +91,7 @@ Sonic Hedgehog 2           171-6215A   837-6963-62       610-0239-62         MPR
 #include "sound/sn76496.h"
 #include "rendlay.h"
 
-#include "hazemd_s.h"
+#include "segamsys.h"
 #include "genesis.h"
 #include "megadriv.h"
 
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index bbe7fa8df14..ff9aaa1a376 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -298,7 +298,7 @@ covert megatech / megaplay drivers to use new code etc. etc.
 #include "sound/sn76496.h"
 #include "machine/mc8123.h"
 #include "machine/segacrpt.h"
-#include "hazemd_s.h"
+#include "segamsys.h"
 
 /****************************************************************************************
  Memory Maps
diff --git a/src/mame/drivers/hazemd_s.c b/src/mame/drivers/segamsys.c
similarity index 99%
rename from src/mame/drivers/hazemd_s.c
rename to src/mame/drivers/segamsys.c
index 8e05d1c0e43..989fdc26510 100644
--- a/src/mame/drivers/hazemd_s.c
+++ b/src/mame/drivers/segamsys.c
@@ -14,7 +14,7 @@
 #include "sound/sn76496.h"
 #include "machine/mc8123.h"
 #include "machine/segacrpt.h"
-#include "hazemd_s.h"
+#include "segamsys.h"
 
 
 //static UINT8* sms_rom;
diff --git a/src/mame/drivers/hazemd_s.h b/src/mame/drivers/segamsys.h
similarity index 100%
rename from src/mame/drivers/hazemd_s.h
rename to src/mame/drivers/segamsys.h
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 3b3fc52a831..8315c06b3c8 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1128,7 +1128,7 @@ $(MAMEOBJ)/sega.a: \
 	$(DRIVERS)/segas18.o $(VIDEO)/segas18.o \
 	$(DRIVERS)/segas24.o $(MACHINE)/segas24.o $(VIDEO)/segas24.o \
 	$(DRIVERS)/segas32.o $(MACHINE)/segas32.o $(VIDEO)/segas32.o \
-	$(DRIVERS)/hazemd_s.o $(DRIVERS)/segae.o \
+	$(DRIVERS)/segamsys.o $(DRIVERS)/segae.o \
 	$(DRIVERS)/segaxbd.o $(VIDEO)/segaxbd.o \
 	$(DRIVERS)/segaybd.o $(VIDEO)/segaybd.o \
 	$(DRIVERS)/ssf2md.o \