diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index f235d30aa8c..81a2fe0f993 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -3210,10 +3210,10 @@ files {
 
 createMESSProjects(_target, _subtarget, "roland")
 files {
-	MAME_DIR .. "src/mame/drivers/rmt32.cpp",
-	MAME_DIR .. "src/mame/drivers/rcm32p.cpp",
-	MAME_DIR .. "src/mame/drivers/rd110.cpp",
-	MAME_DIR .. "src/mame/drivers/rsc55.cpp",
+	MAME_DIR .. "src/mame/drivers/roland_cm32p.cpp",
+	MAME_DIR .. "src/mame/drivers/roland_d110.cpp",
+	MAME_DIR .. "src/mame/drivers/roland_mt32.cpp",
+	MAME_DIR .. "src/mame/drivers/roland_sc55.cpp",
 	MAME_DIR .. "src/mame/drivers/tb303.cpp",
 	MAME_DIR .. "src/mame/drivers/tr606.cpp",
 }
diff --git a/src/mame/drivers/rcm32p.cpp b/src/mame/drivers/roland_cm32p.cpp
similarity index 100%
rename from src/mame/drivers/rcm32p.cpp
rename to src/mame/drivers/roland_cm32p.cpp
diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/roland_d110.cpp
similarity index 100%
rename from src/mame/drivers/rd110.cpp
rename to src/mame/drivers/roland_d110.cpp
diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/roland_mt32.cpp
similarity index 100%
rename from src/mame/drivers/rmt32.cpp
rename to src/mame/drivers/roland_mt32.cpp
diff --git a/src/mame/drivers/rsc55.cpp b/src/mame/drivers/roland_sc55.cpp
similarity index 100%
rename from src/mame/drivers/rsc55.cpp
rename to src/mame/drivers/roland_sc55.cpp
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 722b504f6a4..e9b22b5c3ef 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -34342,9 +34342,6 @@ rcorsair                        // (c) 1984 Nakasawa
 @source:rd100.cpp
 rd100                           //
 
-@source:rd110.cpp
-d110                            //
-
 @source:re900.cpp
 bs94                            // (c) 1994 Entretenimientos GEMINIS
 re900                           // (c) 1993 Entretenimientos GEMINIS
@@ -34434,13 +34431,6 @@ themj                           // (c) 1987 Visco
 @source:rmnimbus.cpp
 nimbus                          // RM Nimbus 186
 
-@source:rmt32.cpp
-cm32l                           //
-mt32                            //
-
-@source:rcm32p.cpp
-cm32p                           //
-
 @source:rockrage.cpp
 rockrage                        // GX620 (c) 1986 (World?)
 rockragea                       // GX620 (c) 1986 (Prototype?)
@@ -34467,6 +34457,19 @@ wizdfireu                       // MAS (c) 1992 Data East Corporation (US)
 wolffang                        // MAM (c) 1991 Data East Corporation (Japan)
 hangzo
 
+@source:roland_cm32p.cpp
+cm32p                           //
+
+@source:roland_d110.cpp
+d110                            //
+
+@source:roland_mt32.cpp
+cm32l                           //
+mt32                            //
+
+@source:roland_sc55.cpp
+sc55                            // 1991 Sound Canvas SC-55
+
 @source:rollerg.cpp
 rollerg                         // GX999 (c) 1991 (US)
 rollergj                        // GX999 (c) 1991 (Japan)
@@ -34563,9 +34566,6 @@ svolleybl                       // bootleg
 svolleyk                        // (c) 1989 V-System Co. (Korea)
 svolleyu                        // (c) 1989 V-System Co. + Data East license (US)
 
-@source:rsc55.cpp
-sc55                            // 1991 Sound Canvas SC-55
-
 @source:rt1715.cpp
 rt1715                          //
 rt1715lc                        // (latin/cyrillic)
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index c834077f2a3..1770bfb5909 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -731,17 +731,17 @@ rambo.cpp
 ravens.cpp
 rc702.cpp
 rc759.cpp
-rcm32p.cpp
 rd100.cpp
-rd110.cpp
 regence.cpp
 replicator.cpp
 rex6000.cpp
 riscpc.cpp
 rm380z.cpp
 rmnimbus.cpp
-rmt32.cpp
-rsc55.cpp
+roland_cm32p.cpp
+roland_d110.cpp
+roland_mt32.cpp
+roland_sc55.cpp
 rt1715.cpp
 rvoice.cpp
 rx78.cpp