diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arsystems.c
similarity index 100%
rename from src/mame/drivers/arcadia.c
rename to src/mame/drivers/arsystems.c
diff --git a/src/mame/drivers/mephisto.c b/src/mame/drivers/mephistp.c
similarity index 100%
rename from src/mame/drivers/mephisto.c
rename to src/mame/drivers/mephistp.c
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rbisland.c
similarity index 99%
rename from src/mame/drivers/rainbow.c
rename to src/mame/drivers/rbisland.c
index 598d2b7b41b..922e7f48dad 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rbisland.c
@@ -326,7 +326,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 #include "audio/taitosnd.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
-#include "includes/rainbow.h"
+#include "includes/rbisland.h"
 
 
 
diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rbisland.h
similarity index 100%
rename from src/mame/includes/rainbow.h
rename to src/mame/includes/rbisland.h
diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rbisland.c
similarity index 99%
rename from src/mame/machine/rainbow.c
rename to src/mame/machine/rbisland.c
index 8688ce4ee4f..fa86c0ff800 100644
--- a/src/mame/machine/rainbow.c
+++ b/src/mame/machine/rbisland.c
@@ -50,7 +50,7 @@
 *************************************************************************/
 
 #include "emu.h"
-#include "includes/rainbow.h"
+#include "includes/rbisland.h"
 
 
 /*************************************
diff --git a/src/mame/video/rainbow.c b/src/mame/video/rbisland.c
similarity index 99%
rename from src/mame/video/rainbow.c
rename to src/mame/video/rbisland.c
index e51a1f3cdd1..f8122c06fa9 100644
--- a/src/mame/video/rainbow.c
+++ b/src/mame/video/rbisland.c
@@ -9,7 +9,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "includes/rainbow.h"
+#include "includes/rbisland.h"
 
 /***************************************************************************/
 
diff --git a/src/mess/drivers/astrocde.c b/src/mess/drivers/astrohome.c
similarity index 100%
rename from src/mess/drivers/astrocde.c
rename to src/mess/drivers/astrohome.c
diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/enmirage.c
similarity index 100%
rename from src/mess/drivers/mirage.c
rename to src/mess/drivers/enmirage.c
diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/jupace.c
similarity index 100%
rename from src/mess/drivers/ace.c
rename to src/mess/drivers/jupace.c
diff --git a/src/mess/drivers/seattle.c b/src/mess/drivers/seattlecmp.c
similarity index 100%
rename from src/mess/drivers/seattle.c
rename to src/mess/drivers/seattlecmp.c