diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 0e1fdcbbac6..3b9133d0a46 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -846,7 +846,7 @@ files {
 	MAME_DIR .. "src/mame/machine/amiga.c",
 	MAME_DIR .. "src/mame/video/amiga.c",
 	MAME_DIR .. "src/mame/video/amigaaga.c",
-	MAME_DIR .. "src/mame/drivers/arcadia.c",
+	MAME_DIR .. "src/mame/drivers/arsystems.c",
 	MAME_DIR .. "src/mame/drivers/cubo.c",
 	MAME_DIR .. "src/mame/drivers/mquake.c",
 	MAME_DIR .. "src/mame/drivers/upscope.c",
@@ -2814,9 +2814,9 @@ files {
 	MAME_DIR .. "src/mame/machine/qix.c",
 	MAME_DIR .. "src/mame/audio/qix.c",
 	MAME_DIR .. "src/mame/video/qix.c",
-	MAME_DIR .. "src/mame/drivers/rainbow.c",
-	MAME_DIR .. "src/mame/machine/rainbow.c",
-	MAME_DIR .. "src/mame/video/rainbow.c",
+	MAME_DIR .. "src/mame/drivers/rbisland.c",
+	MAME_DIR .. "src/mame/machine/rbisland.c",
+	MAME_DIR .. "src/mame/video/rbisland.c",
 	MAME_DIR .. "src/mame/drivers/rastan.c",
 	MAME_DIR .. "src/mame/video/rastan.c",
 	MAME_DIR .. "src/mame/drivers/retofinv.c",
@@ -3212,7 +3212,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/kissproto.c",
 	MAME_DIR .. "src/mame/drivers/ltd.c",
 	MAME_DIR .. "src/mame/drivers/micropin.c",
-	MAME_DIR .. "src/mame/drivers/mephisto.c",
+	MAME_DIR .. "src/mame/drivers/mephistp.c",
 	MAME_DIR .. "src/mame/drivers/mrgame.c",
 	MAME_DIR .. "src/mame/drivers/nsm.c",
 	MAME_DIR .. "src/mame/drivers/peyper.c",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 0f443f6e91f..e9719710161 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1184,7 +1184,7 @@ files {
 
 createMESSProjects(_target, _subtarget, "bally")
 files {
-	MAME_DIR .. "src/mess/drivers/astrocde.c",
+	MAME_DIR .. "src/mess/drivers/astrohome.c",
 }
 
 createMESSProjects(_target, _subtarget, "banctec")
@@ -1246,7 +1246,7 @@ files {
 
 createMESSProjects(_target, _subtarget, "cantab")
 files {
-	MAME_DIR .. "src/mess/drivers/ace.c",
+	MAME_DIR .. "src/mess/drivers/jupace.c",
 }
 
 createMESSProjects(_target, _subtarget, "casio")
@@ -1472,7 +1472,7 @@ files {
 	MAME_DIR .. "src/mess/drivers/esqasr.c",
 	MAME_DIR .. "src/mess/drivers/esqkt.c",
 	MAME_DIR .. "src/mess/drivers/esqmr.c",
-	MAME_DIR .. "src/mess/drivers/mirage.c",
+	MAME_DIR .. "src/mess/drivers/enmirage.c",
 	MAME_DIR .. "src/mess/machine/esqpanel.c",
 	MAME_DIR .. "src/mess/machine/esqvfd.c",
 }
@@ -2719,7 +2719,7 @@ files {
 	MAME_DIR .. "src/mess/drivers/rvoice.c",
 	MAME_DIR .. "src/mess/drivers/sacstate.c",
 	MAME_DIR .. "src/mess/drivers/sbrain.c",
-	MAME_DIR .. "src/mess/drivers/seattle.c",
+	MAME_DIR .. "src/mess/drivers/seattlecmp.c",
 	MAME_DIR .. "src/mess/drivers/sh4robot.c",
 	MAME_DIR .. "src/mess/drivers/softbox.c",
 	MAME_DIR .. "src/mess/drivers/swtpc.c",