summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2022-06-29 16:31:56 +0200
committer hap <happppp@users.noreply.github.com>2022-06-29 16:31:56 +0200
commitda028cd724b3c50c6493b1b3fa6301268646ff65 (patch)
treeeb7db49d4d6decba4260e45963246119af3ecb92
parent307f0ab11b9babe59084410d50dea274929c96db (diff)
source org: remove obsolete filename prefix from aci,cxg,hegener,fidelity,novag,saitek
-rw-r--r--src/mame/aci/boris.cpp (renamed from src/mame/aci/aci_boris.cpp)0
-rw-r--r--src/mame/aci/borisdpl.cpp (renamed from src/mame/aci/aci_borisdpl.cpp)0
-rw-r--r--src/mame/aci/ggm.cpp (renamed from src/mame/aci/aci_ggm.cpp)0
-rw-r--r--src/mame/aci/prodigy.cpp (renamed from src/mame/aci/aci_prodigy.cpp)0
-rw-r--r--src/mame/cxg/ch2001.cpp (renamed from src/mame/cxg/cxg_ch2001.cpp)0
-rw-r--r--src/mame/cxg/dominator.cpp (renamed from src/mame/cxg/cxg_dominator.cpp)0
-rw-r--r--src/mame/cxg/scptchess.cpp (renamed from src/mame/cxg/cxg_scptchess.cpp)0
-rw-r--r--src/mame/cxg/sphinx40.cpp (renamed from src/mame/cxg/cxg_sphinx40.cpp)0
-rw-r--r--src/mame/fidelity/as12.cpp (renamed from src/mame/fidelity/fidel_as12.cpp)6
-rw-r--r--src/mame/fidelity/card.cpp (renamed from src/mame/fidelity/fidel_card.cpp)0
-rw-r--r--src/mame/fidelity/cc1.cpp (renamed from src/mame/fidelity/fidel_cc1.cpp)0
-rw-r--r--src/mame/fidelity/cc10.cpp (renamed from src/mame/fidelity/fidel_cc10.cpp)2
-rw-r--r--src/mame/fidelity/cc7.cpp (renamed from src/mame/fidelity/fidel_cc7.cpp)0
-rw-r--r--src/mame/fidelity/checkc2.cpp (renamed from src/mame/fidelity/fidel_checkc2.cpp)2
-rw-r--r--src/mame/fidelity/chesster.cpp (renamed from src/mame/fidelity/fidel_chesster.cpp)0
-rw-r--r--src/mame/fidelity/clockdiv.cpp (renamed from src/mame/fidelity/fidel_clockdiv.cpp)2
-rw-r--r--src/mame/fidelity/clockdiv.h (renamed from src/mame/fidelity/fidel_clockdiv.h)0
-rw-r--r--src/mame/fidelity/csc.cpp (renamed from src/mame/fidelity/fidel_csc.cpp)2
-rw-r--r--src/mame/fidelity/dames.cpp (renamed from src/mame/fidelity/fidel_dames.cpp)0
-rw-r--r--src/mame/fidelity/desdis.cpp (renamed from src/mame/fidelity/fidel_desdis.cpp)2
-rw-r--r--src/mame/fidelity/eag68k.cpp (renamed from src/mame/fidelity/fidel_eag68k.cpp)2
-rw-r--r--src/mame/fidelity/eldorado.cpp (renamed from src/mame/fidelity/fidel_eldorado.cpp)0
-rw-r--r--src/mame/fidelity/elite.cpp (renamed from src/mame/fidelity/fidel_elite.cpp)6
-rw-r--r--src/mame/fidelity/excel.cpp (renamed from src/mame/fidelity/fidel_excel.cpp)4
-rw-r--r--src/mame/fidelity/msc.cpp (renamed from src/mame/fidelity/fidel_msc.cpp)4
-rw-r--r--src/mame/fidelity/phantom.cpp (renamed from src/mame/fidelity/fidel_phantom.cpp)0
-rw-r--r--src/mame/fidelity/sc12.cpp (renamed from src/mame/fidelity/fidel_sc12.cpp)4
-rw-r--r--src/mame/fidelity/sc6.cpp (renamed from src/mame/fidelity/fidel_sc6.cpp)4
-rw-r--r--src/mame/fidelity/sc8.cpp (renamed from src/mame/fidelity/fidel_sc8.cpp)0
-rw-r--r--src/mame/fidelity/sc9.cpp (renamed from src/mame/fidelity/fidel_sc9.cpp)0
-rw-r--r--src/mame/fidelity/vcc.cpp (renamed from src/mame/fidelity/fidel_vcc.cpp)0
-rw-r--r--src/mame/fidelity/vsc.cpp (renamed from src/mame/fidelity/fidel_vsc.cpp)0
-rw-r--r--src/mame/hegener/academy.cpp (renamed from src/mame/hegener/mephisto_academy.cpp)0
-rw-r--r--src/mame/hegener/amsterdam.cpp (renamed from src/mame/hegener/mephisto_amsterdam.cpp)0
-rw-r--r--src/mame/hegener/berlin.cpp (renamed from src/mame/hegener/mephisto_berlin.cpp)0
-rw-r--r--src/mame/hegener/brikett.cpp (renamed from src/mame/hegener/mephisto_brikett.cpp)0
-rw-r--r--src/mame/hegener/glasgow.cpp (renamed from src/mame/hegener/mephisto_glasgow.cpp)0
-rw-r--r--src/mame/hegener/milano.cpp (renamed from src/mame/hegener/mephisto_milano.cpp)0
-rw-r--r--src/mame/hegener/mm1.cpp (renamed from src/mame/hegener/mephisto_mm1.cpp)0
-rw-r--r--src/mame/hegener/mm2.cpp (renamed from src/mame/hegener/mephisto_mm2.cpp)0
-rw-r--r--src/mame/hegener/modena.cpp (renamed from src/mame/hegener/mephisto_modena.cpp)0
-rw-r--r--src/mame/hegener/modular.cpp (renamed from src/mame/hegener/mephisto_modular.cpp)2
-rw-r--r--src/mame/hegener/modular_tm.cpp (renamed from src/mame/hegener/mephisto_modular_tm.cpp)0
-rw-r--r--src/mame/hegener/mondial.cpp (renamed from src/mame/hegener/mephisto_mondial.cpp)0
-rw-r--r--src/mame/hegener/mondial2.cpp (renamed from src/mame/hegener/mephisto_mondial2.cpp)0
-rw-r--r--src/mame/hegener/mondial68k.cpp (renamed from src/mame/hegener/mephisto_mondial68k.cpp)0
-rw-r--r--src/mame/hegener/montec.cpp (renamed from src/mame/hegener/mephisto_montec.cpp)0
-rw-r--r--src/mame/hegener/polgar.cpp (renamed from src/mame/hegener/mephisto_polgar.cpp)0
-rw-r--r--src/mame/hegener/risc.cpp (renamed from src/mame/hegener/mephisto_risc.cpp)0
-rw-r--r--src/mame/hegener/smondial.cpp (renamed from src/mame/hegener/mephisto_smondial.cpp)0
-rw-r--r--src/mame/mame.lst150
-rw-r--r--src/mame/mess.flt150
-rw-r--r--src/mame/novag/cexpert.cpp (renamed from src/mame/novag/novag_cexpert.cpp)0
-rw-r--r--src/mame/novag/cforte.cpp (renamed from src/mame/novag/novag_cforte.cpp)0
-rw-r--r--src/mame/novag/const.cpp (renamed from src/mame/novag/novag_const.cpp)0
-rw-r--r--src/mame/novag/diablo.cpp (renamed from src/mame/novag/novag_diablo.cpp)0
-rw-r--r--src/mame/novag/micro.cpp (renamed from src/mame/novag/novag_micro.cpp)0
-rw-r--r--src/mame/novag/micro2.cpp (renamed from src/mame/novag/novag_micro2.cpp)0
-rw-r--r--src/mame/novag/savant.cpp (renamed from src/mame/novag/novag_savant.cpp)0
-rw-r--r--src/mame/novag/sexpert.cpp (renamed from src/mame/novag/novag_sexpert.cpp)0
-rw-r--r--src/mame/novag/snova.cpp (renamed from src/mame/novag/novag_snova.cpp)0
-rw-r--r--src/mame/saitek/ccompan.cpp (renamed from src/mame/saitek/saitek_ccompan.cpp)0
-rw-r--r--src/mame/saitek/chesstrv.cpp (renamed from src/mame/saitek/saitek_chesstrv.cpp)0
-rw-r--r--src/mame/saitek/corona.cpp (renamed from src/mame/saitek/saitek_corona.cpp)6
-rw-r--r--src/mame/saitek/cp2000.cpp (renamed from src/mame/saitek/saitek_cp2000.cpp)0
-rw-r--r--src/mame/saitek/delta1.cpp (renamed from src/mame/saitek/saitek_delta1.cpp)0
-rw-r--r--src/mame/saitek/exchess.cpp (renamed from src/mame/saitek/saitek_exchess.cpp)0
-rw-r--r--src/mame/saitek/intchess.cpp (renamed from src/mame/saitek/saitek_intchess.cpp)0
-rw-r--r--src/mame/saitek/leonardo.cpp (renamed from src/mame/saitek/saitek_leonardo.cpp)0
-rw-r--r--src/mame/saitek/mark5.cpp (renamed from src/mame/saitek/saitek_mark5.cpp)0
-rw-r--r--src/mame/saitek/minichess.cpp (renamed from src/mame/saitek/saitek_minichess.cpp)0
-rw-r--r--src/mame/saitek/prschess.cpp (renamed from src/mame/saitek/saitek_prschess.cpp)0
-rw-r--r--src/mame/saitek/renaissance.cpp (renamed from src/mame/saitek/saitek_renaissance.cpp)2
-rw-r--r--src/mame/saitek/risc2500.cpp (renamed from src/mame/saitek/saitek_risc2500.cpp)0
-rw-r--r--src/mame/saitek/schess.cpp (renamed from src/mame/saitek/saitek_schess.cpp)0
-rw-r--r--src/mame/saitek/simultano.cpp (renamed from src/mame/saitek/saitek_simultano.cpp)2
-rw-r--r--src/mame/saitek/ssystem3.cpp (renamed from src/mame/saitek/saitek_ssystem3.cpp)0
-rw-r--r--src/mame/saitek/stratos.cpp (renamed from src/mame/saitek/saitek_stratos.cpp)2
-rw-r--r--src/mame/saitek/stratos.h (renamed from src/mame/saitek/saitek_stratos.h)0
-rw-r--r--src/mame/saitek/superstar.cpp (renamed from src/mame/saitek/saitek_superstar.cpp)0
80 files changed, 177 insertions, 177 deletions
diff --git a/src/mame/aci/aci_boris.cpp b/src/mame/aci/boris.cpp
index f1730abd0fc..f1730abd0fc 100644
--- a/src/mame/aci/aci_boris.cpp
+++ b/src/mame/aci/boris.cpp
diff --git a/src/mame/aci/aci_borisdpl.cpp b/src/mame/aci/borisdpl.cpp
index f6bd43a8dc7..f6bd43a8dc7 100644
--- a/src/mame/aci/aci_borisdpl.cpp
+++ b/src/mame/aci/borisdpl.cpp
diff --git a/src/mame/aci/aci_ggm.cpp b/src/mame/aci/ggm.cpp
index 011adfc976a..011adfc976a 100644
--- a/src/mame/aci/aci_ggm.cpp
+++ b/src/mame/aci/ggm.cpp
diff --git a/src/mame/aci/aci_prodigy.cpp b/src/mame/aci/prodigy.cpp
index 8fc5530a496..8fc5530a496 100644
--- a/src/mame/aci/aci_prodigy.cpp
+++ b/src/mame/aci/prodigy.cpp
diff --git a/src/mame/cxg/cxg_ch2001.cpp b/src/mame/cxg/ch2001.cpp
index 7989629ba83..7989629ba83 100644
--- a/src/mame/cxg/cxg_ch2001.cpp
+++ b/src/mame/cxg/ch2001.cpp
diff --git a/src/mame/cxg/cxg_dominator.cpp b/src/mame/cxg/dominator.cpp
index a3ff19b21a7..a3ff19b21a7 100644
--- a/src/mame/cxg/cxg_dominator.cpp
+++ b/src/mame/cxg/dominator.cpp
diff --git a/src/mame/cxg/cxg_scptchess.cpp b/src/mame/cxg/scptchess.cpp
index a0b0931c177..a0b0931c177 100644
--- a/src/mame/cxg/cxg_scptchess.cpp
+++ b/src/mame/cxg/scptchess.cpp
diff --git a/src/mame/cxg/cxg_sphinx40.cpp b/src/mame/cxg/sphinx40.cpp
index 71f4e749118..71f4e749118 100644
--- a/src/mame/cxg/cxg_sphinx40.cpp
+++ b/src/mame/cxg/sphinx40.cpp
diff --git a/src/mame/fidelity/fidel_as12.cpp b/src/mame/fidelity/as12.cpp
index 106d79a4240..765ef049460 100644
--- a/src/mame/fidelity/fidel_as12.cpp
+++ b/src/mame/fidelity/as12.cpp
@@ -11,12 +11,12 @@ Hardware notes:
- PCB label 510-1084B01
This is on the SC12B board, with enough modifications to support more leds and
-magnetic chess board sensors. See fidel_sc12.cpp for a more technical description.
+magnetic chess board sensors. See sc12.cpp for a more technical description.
******************************************************************************/
#include "emu.h"
-#include "fidel_clockdiv.h"
+#include "clockdiv.h"
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
@@ -35,7 +35,7 @@ magnetic chess board sensors. See fidel_sc12.cpp for a more technical descriptio
namespace {
-// note: sub-class of fidel_clockdiv_state (see mame/machine/fidel_clockdiv.*)
+// note: sub-class of fidel_clockdiv_state (see clockdiv.*)
class as12_state : public fidel_clockdiv_state
{
diff --git a/src/mame/fidelity/fidel_card.cpp b/src/mame/fidelity/card.cpp
index b653c8b86e1..b653c8b86e1 100644
--- a/src/mame/fidelity/fidel_card.cpp
+++ b/src/mame/fidelity/card.cpp
diff --git a/src/mame/fidelity/fidel_cc1.cpp b/src/mame/fidelity/cc1.cpp
index c4afe7b5c54..c4afe7b5c54 100644
--- a/src/mame/fidelity/fidel_cc1.cpp
+++ b/src/mame/fidelity/cc1.cpp
diff --git a/src/mame/fidelity/fidel_cc10.cpp b/src/mame/fidelity/cc10.cpp
index 0bde02ba46b..88ccabcf1dd 100644
--- a/src/mame/fidelity/fidel_cc10.cpp
+++ b/src/mame/fidelity/cc10.cpp
@@ -14,7 +14,7 @@ TODO:
Fidelity Chess Challenger 10 (CCX)
-------------------
3 versions are known to exist: A,B,C. Strangely, version C(UCC10) has an 8080
-instead of Z80 and no beeper, it's on CC1-based hardware (see fidel_cc1.cpp).
+instead of Z80 and no beeper, it's on CC1-based hardware (see cc1.cpp).
Z80A CPU @ 4MHz, NEC D8255C
4KB ROM(NEC 2332A), 2*256 bytes RAM(4*NEC 2111AL-4)
diff --git a/src/mame/fidelity/fidel_cc7.cpp b/src/mame/fidelity/cc7.cpp
index 0446a0a1977..0446a0a1977 100644
--- a/src/mame/fidelity/fidel_cc7.cpp
+++ b/src/mame/fidelity/cc7.cpp
diff --git a/src/mame/fidelity/fidel_checkc2.cpp b/src/mame/fidelity/checkc2.cpp
index ce164a95299..642a01263a3 100644
--- a/src/mame/fidelity/fidel_checkc2.cpp
+++ b/src/mame/fidelity/checkc2.cpp
@@ -6,7 +6,7 @@
Fidelity Checker Challenger (CR)
Even though it has fewer levels and presumedly a weaker program, this one
-is a couple of months newer than model ACR (see fidel_cc10.cpp).
+is a couple of months newer than model ACR (see cc10.cpp).
Hardware notes:
- PCB label: P261A
diff --git a/src/mame/fidelity/fidel_chesster.cpp b/src/mame/fidelity/chesster.cpp
index b46e41eabe2..b46e41eabe2 100644
--- a/src/mame/fidelity/fidel_chesster.cpp
+++ b/src/mame/fidelity/chesster.cpp
diff --git a/src/mame/fidelity/fidel_clockdiv.cpp b/src/mame/fidelity/clockdiv.cpp
index fcd0192a467..e57932c4825 100644
--- a/src/mame/fidelity/fidel_clockdiv.cpp
+++ b/src/mame/fidelity/clockdiv.cpp
@@ -15,7 +15,7 @@ TODO:
******************************************************************************/
#include "emu.h"
-#include "fidel_clockdiv.h"
+#include "clockdiv.h"
// machine start
diff --git a/src/mame/fidelity/fidel_clockdiv.h b/src/mame/fidelity/clockdiv.h
index c52e33c52c7..c52e33c52c7 100644
--- a/src/mame/fidelity/fidel_clockdiv.h
+++ b/src/mame/fidelity/clockdiv.h
diff --git a/src/mame/fidelity/fidel_csc.cpp b/src/mame/fidelity/csc.cpp
index 7fe22ee04cd..617460f956d 100644
--- a/src/mame/fidelity/fidel_csc.cpp
+++ b/src/mame/fidelity/csc.cpp
@@ -37,7 +37,7 @@ C000-DFFF: 101-1025A02 ROM
E000-FDFF: 101-1025A01 ROM
FE00-FFFF: 512 byte 74S474 or N82S141N PROM
-*: 101-64019 is also used on the VSC(fidel_vsc.cpp). It contains the opening book
+*: 101-64019 is also used on the VSC(vsc.cpp). It contains the opening book
and "64 greatest games", as well as some Z80 code. Obviously the latter is unused
on the CSC. Also seen with 101-1025A04 label, same ROM contents.
diff --git a/src/mame/fidelity/fidel_dames.cpp b/src/mame/fidelity/dames.cpp
index 4f97f02bec2..4f97f02bec2 100644
--- a/src/mame/fidelity/fidel_dames.cpp
+++ b/src/mame/fidelity/dames.cpp
diff --git a/src/mame/fidelity/fidel_desdis.cpp b/src/mame/fidelity/desdis.cpp
index 0442aff0b44..41637901276 100644
--- a/src/mame/fidelity/fidel_desdis.cpp
+++ b/src/mame/fidelity/desdis.cpp
@@ -4,7 +4,7 @@
/******************************************************************************
Fidelity Designer Display series, 6502 and 68000
-(6502-based displayless Designer is in fidel_excel.cpp)
+(6502-based displayless Designer is in excel.cpp)
*******************************************************************************
diff --git a/src/mame/fidelity/fidel_eag68k.cpp b/src/mame/fidelity/eag68k.cpp
index 45fa127fb21..ede806a4e08 100644
--- a/src/mame/fidelity/fidel_eag68k.cpp
+++ b/src/mame/fidelity/eag68k.cpp
@@ -4,7 +4,7 @@
/******************************************************************************
Fidelity 68000-based Elite Avant Garde driver
-For 6502-based EAG, see fidel_elite.cpp
+For 6502-based EAG, see elite.cpp
Excel 68000 I/O is very similar to EAG, so it's handled in this driver as well
diff --git a/src/mame/fidelity/fidel_eldorado.cpp b/src/mame/fidelity/eldorado.cpp
index be3ac413d9e..be3ac413d9e 100644
--- a/src/mame/fidelity/fidel_eldorado.cpp
+++ b/src/mame/fidelity/eldorado.cpp
diff --git a/src/mame/fidelity/fidel_elite.cpp b/src/mame/fidelity/elite.cpp
index 894805bed6c..c4f9647ca65 100644
--- a/src/mame/fidelity/fidel_elite.cpp
+++ b/src/mame/fidelity/elite.cpp
@@ -4,7 +4,7 @@
/******************************************************************************
Fidelity Elite A/S series hardware (EAS, EAG, PC)
-see fidel_eag68k.cpp for 68000-based EAG hardware
+see eag68k.cpp for 68000-based EAG hardware
TODO:
- verify fpres/feas irq active time
@@ -59,7 +59,7 @@ uninteresting to emulate as separate drivers.
******************************************************************************/
#include "emu.h"
-#include "fidel_clockdiv.h"
+#include "clockdiv.h"
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
@@ -84,7 +84,7 @@ uninteresting to emulate as separate drivers.
namespace {
-// note: sub-class of fidel_clockdiv_state (see mame/machine/fidel_clockdiv.*)
+// note: sub-class of fidel_clockdiv_state (see clockdiv.*)
// EAS / shared
diff --git a/src/mame/fidelity/fidel_excel.cpp b/src/mame/fidelity/excel.cpp
index c05a6b585a4..4485ea088b7 100644
--- a/src/mame/fidelity/fidel_excel.cpp
+++ b/src/mame/fidelity/excel.cpp
@@ -4,7 +4,7 @@
/******************************************************************************
Fidelity Excellence series hardware
-(for Excel 68000, see fidel_eag68k.cpp)
+(for Excel 68000, see eag68k.cpp)
TODO:
- granits gives error beeps at start, need to press clear to play.
@@ -126,7 +126,7 @@ basically same as (Par) Excellence hardware, reskinned board
Designer 2100 (model 6103): exactly same, but running at 5MHz
-(Designer 1500 is on 80C50 hardware, same ROM as The Gambit, see fidel_sc6.cpp)
+(Designer 1500 is on 80C50 hardware, same ROM as The Gambit, see sc6.cpp)
******************************************************************************/
diff --git a/src/mame/fidelity/fidel_msc.cpp b/src/mame/fidelity/msc.cpp
index 97135eee9d0..407afbfe2d4 100644
--- a/src/mame/fidelity/fidel_msc.cpp
+++ b/src/mame/fidelity/msc.cpp
@@ -7,8 +7,8 @@ Fidelity Mini Sensory Chess Challenger (model MSC, 1981 version)
Two versions exist, both of them are model MSC. The 1981 version has a Z8 MCU,
the 1982 version has an I8049. They can also be distinguished from the button
-panel design, the 2nd version has rectangular buttons. See fidel_sc6.cpp for
-the 2nd version.
+panel design, the 2nd version has rectangular buttons. See sc6.cpp for the
+2nd version.
Hardware notes:
- Zilog Z8 MCU(custom label, probably Z8601), 8MHz XTAL
diff --git a/src/mame/fidelity/fidel_phantom.cpp b/src/mame/fidelity/phantom.cpp
index dba7549e32a..dba7549e32a 100644
--- a/src/mame/fidelity/fidel_phantom.cpp
+++ b/src/mame/fidelity/phantom.cpp
diff --git a/src/mame/fidelity/fidel_sc12.cpp b/src/mame/fidelity/sc12.cpp
index f6bbc9d084b..ef0bbafc1bc 100644
--- a/src/mame/fidelity/fidel_sc12.cpp
+++ b/src/mame/fidelity/sc12.cpp
@@ -45,7 +45,7 @@ If control Q4 is set, printer data can be read from I0.
******************************************************************************/
#include "emu.h"
-#include "fidel_clockdiv.h"
+#include "clockdiv.h"
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
@@ -64,7 +64,7 @@ If control Q4 is set, printer data can be read from I0.
namespace {
-// note: sub-class of fidel_clockdiv_state (see mame/machine/fidel_clockdiv.*)
+// note: sub-class of fidel_clockdiv_state (see clockdiv.*)
class sc12_state : public fidel_clockdiv_state
{
diff --git a/src/mame/fidelity/fidel_sc6.cpp b/src/mame/fidelity/sc6.cpp
index 5cc4eb6f661..c96a03eb4aa 100644
--- a/src/mame/fidelity/fidel_sc6.cpp
+++ b/src/mame/fidelity/sc6.cpp
@@ -37,8 +37,8 @@ MSC hardware notes:
MCU ports I/O is identical to SC6.
-It accepts the same modules as the 1st MSC version. See fidel_msc.cpp for known
-modules. The module overrides the internal ROM, by asserting the EA pin.
+It accepts the same modules as the 1st MSC version. See msc.cpp for known modules.
+The module overrides the internal ROM, by asserting the EA pin.
-------------------------------------------------------------------------------
diff --git a/src/mame/fidelity/fidel_sc8.cpp b/src/mame/fidelity/sc8.cpp
index c053884d392..c053884d392 100644
--- a/src/mame/fidelity/fidel_sc8.cpp
+++ b/src/mame/fidelity/sc8.cpp
diff --git a/src/mame/fidelity/fidel_sc9.cpp b/src/mame/fidelity/sc9.cpp
index cb16007ebaf..cb16007ebaf 100644
--- a/src/mame/fidelity/fidel_sc9.cpp
+++ b/src/mame/fidelity/sc9.cpp
diff --git a/src/mame/fidelity/fidel_vcc.cpp b/src/mame/fidelity/vcc.cpp
index 495dd5d298a..495dd5d298a 100644
--- a/src/mame/fidelity/fidel_vcc.cpp
+++ b/src/mame/fidelity/vcc.cpp
diff --git a/src/mame/fidelity/fidel_vsc.cpp b/src/mame/fidelity/vsc.cpp
index 3d9523c9be4..3d9523c9be4 100644
--- a/src/mame/fidelity/fidel_vsc.cpp
+++ b/src/mame/fidelity/vsc.cpp
diff --git a/src/mame/hegener/mephisto_academy.cpp b/src/mame/hegener/academy.cpp
index 439caff2368..439caff2368 100644
--- a/src/mame/hegener/mephisto_academy.cpp
+++ b/src/mame/hegener/academy.cpp
diff --git a/src/mame/hegener/mephisto_amsterdam.cpp b/src/mame/hegener/amsterdam.cpp
index d8cbdba3a42..d8cbdba3a42 100644
--- a/src/mame/hegener/mephisto_amsterdam.cpp
+++ b/src/mame/hegener/amsterdam.cpp
diff --git a/src/mame/hegener/mephisto_berlin.cpp b/src/mame/hegener/berlin.cpp
index 5a1d32073e8..5a1d32073e8 100644
--- a/src/mame/hegener/mephisto_berlin.cpp
+++ b/src/mame/hegener/berlin.cpp
diff --git a/src/mame/hegener/mephisto_brikett.cpp b/src/mame/hegener/brikett.cpp
index 492baa41c5c..492baa41c5c 100644
--- a/src/mame/hegener/mephisto_brikett.cpp
+++ b/src/mame/hegener/brikett.cpp
diff --git a/src/mame/hegener/mephisto_glasgow.cpp b/src/mame/hegener/glasgow.cpp
index f4b79cb76de..f4b79cb76de 100644
--- a/src/mame/hegener/mephisto_glasgow.cpp
+++ b/src/mame/hegener/glasgow.cpp
diff --git a/src/mame/hegener/mephisto_milano.cpp b/src/mame/hegener/milano.cpp
index 3523bb4b67c..3523bb4b67c 100644
--- a/src/mame/hegener/mephisto_milano.cpp
+++ b/src/mame/hegener/milano.cpp
diff --git a/src/mame/hegener/mephisto_mm1.cpp b/src/mame/hegener/mm1.cpp
index b7e71e50ca4..b7e71e50ca4 100644
--- a/src/mame/hegener/mephisto_mm1.cpp
+++ b/src/mame/hegener/mm1.cpp
diff --git a/src/mame/hegener/mephisto_mm2.cpp b/src/mame/hegener/mm2.cpp
index efc0da63e8b..efc0da63e8b 100644
--- a/src/mame/hegener/mephisto_mm2.cpp
+++ b/src/mame/hegener/mm2.cpp
diff --git a/src/mame/hegener/mephisto_modena.cpp b/src/mame/hegener/modena.cpp
index f221f9e1714..f221f9e1714 100644
--- a/src/mame/hegener/mephisto_modena.cpp
+++ b/src/mame/hegener/modena.cpp
diff --git a/src/mame/hegener/mephisto_modular.cpp b/src/mame/hegener/modular.cpp
index 0c3aa1878b9..2a40585bae7 100644
--- a/src/mame/hegener/mephisto_modular.cpp
+++ b/src/mame/hegener/modular.cpp
@@ -36,7 +36,7 @@ Display Modul:
- 8KB RAM (TC5565APL-15L), battery
- piezo speaker
-For the dedicated tournament machines, see mephisto_modular_tm.cpp
+For the dedicated tournament machines, see modular_tm.cpp
Undocumented buttons:
- holding ENTER and LEFT cursor on boot runs diagnostics
diff --git a/src/mame/hegener/mephisto_modular_tm.cpp b/src/mame/hegener/modular_tm.cpp
index cbd169e1d47..cbd169e1d47 100644
--- a/src/mame/hegener/mephisto_modular_tm.cpp
+++ b/src/mame/hegener/modular_tm.cpp
diff --git a/src/mame/hegener/mephisto_mondial.cpp b/src/mame/hegener/mondial.cpp
index f863e8535d0..f863e8535d0 100644
--- a/src/mame/hegener/mephisto_mondial.cpp
+++ b/src/mame/hegener/mondial.cpp
diff --git a/src/mame/hegener/mephisto_mondial2.cpp b/src/mame/hegener/mondial2.cpp
index 5cefdf4113b..5cefdf4113b 100644
--- a/src/mame/hegener/mephisto_mondial2.cpp
+++ b/src/mame/hegener/mondial2.cpp
diff --git a/src/mame/hegener/mephisto_mondial68k.cpp b/src/mame/hegener/mondial68k.cpp
index fb4116b8bef..fb4116b8bef 100644
--- a/src/mame/hegener/mephisto_mondial68k.cpp
+++ b/src/mame/hegener/mondial68k.cpp
diff --git a/src/mame/hegener/mephisto_montec.cpp b/src/mame/hegener/montec.cpp
index 5239bbb1136..5239bbb1136 100644
--- a/src/mame/hegener/mephisto_montec.cpp
+++ b/src/mame/hegener/montec.cpp
diff --git a/src/mame/hegener/mephisto_polgar.cpp b/src/mame/hegener/polgar.cpp
index 3f9aa1749ce..3f9aa1749ce 100644
--- a/src/mame/hegener/mephisto_polgar.cpp
+++ b/src/mame/hegener/polgar.cpp
diff --git a/src/mame/hegener/mephisto_risc.cpp b/src/mame/hegener/risc.cpp
index 1e20f5284e9..1e20f5284e9 100644
--- a/src/mame/hegener/mephisto_risc.cpp
+++ b/src/mame/hegener/risc.cpp
diff --git a/src/mame/hegener/mephisto_smondial.cpp b/src/mame/hegener/smondial.cpp
index c54f5823cf7..c54f5823cf7 100644
--- a/src/mame/hegener/mephisto_smondial.cpp
+++ b/src/mame/hegener/smondial.cpp
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index d2e1cb23c0c..2772b22f690 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -911,17 +911,17 @@ sp_zigzgk //
sp_zigzgl //
sp_zigzgm //
-@source:aci/aci_boris.cpp
+@source:aci/boris.cpp
boris //
borisa //
-@source:aci/aci_borisdpl.cpp
+@source:aci/borisdpl.cpp
borisdpl //
-@source:aci/aci_ggm.cpp
+@source:aci/ggm.cpp
ggm
-@source:aci/aci_prodigy.cpp
+@source:aci/prodigy.cpp
prodigy
@source:jaleco/acommand.cpp
@@ -11748,18 +11748,18 @@ wallst // (c) 1982 Century
@source:misc/cwheel.cpp
cwheel // (c) 19?? Gamebar
-@source:cxg/cxg_ch2001.cpp
+@source:cxg/ch2001.cpp
ch2001
-@source:cxg/cxg_dominator.cpp
+@source:cxg/dominator.cpp
scmder
sdtor
-@source:cxg/cxg_scptchess.cpp
+@source:cxg/scptchess.cpp
prtchess
scptchess
-@source:cxg/cxg_sphinx40.cpp
+@source:cxg/sphinx40.cpp
sphinx40
@source:skeleton/cxhumax.cpp
@@ -13973,59 +13973,59 @@ ffantasym //
fgoal // TF (c) 1979 Taito Corporation
fgoala // MF (c) 1979 Taito Corporation
-@source:fidelity/fidel_as12.cpp
+@source:fidelity/as12.cpp
feleg
felega
-@source:fidelity/fidel_card.cpp
+@source:fidelity/card.cpp
bridgec
bridgec3
bridgeca
gincribc
vbrc
-@source:fidelity/fidel_cc1.cpp
+@source:fidelity/cc1.cpp
cc1 //
cc3 //
cc10c
-@source:fidelity/fidel_cc10.cpp
+@source:fidelity/cc10.cpp
cc10 //
cc10a //
checkc4 //
-@source:fidelity/fidel_cc7.cpp
+@source:fidelity/cc7.cpp
backgamc //
cc7 //
cc7a //
-@source:fidelity/fidel_checkc2.cpp
+@source:fidelity/checkc2.cpp
checkc2
-@source:fidelity/fidel_chesster.cpp
+@source:fidelity/chesster.cpp
chesster //
chesstera //
kishon //
kishona //
-@source:fidelity/fidel_csc.cpp
+@source:fidelity/csc.cpp
csc //
csce //
cscet //
reversic //
super9cc //
-@source:fidelity/fidel_dames.cpp
+@source:fidelity/dames.cpp
damesc //
-@source:fidelity/fidel_desdis.cpp
+@source:fidelity/desdis.cpp
fdes2000d //
fdes2100d //
fdes2265 //
fdes2265a //
fdes2325 //
-@source:fidelity/fidel_eag68k.cpp
+@source:fidelity/eag68k.cpp
feagv10 //
feagv11 //
feagv2 //
@@ -14042,10 +14042,10 @@ fex68km2a //
fex68km3 //
fex68km4 //
-@source:fidelity/fidel_eldorado.cpp
+@source:fidelity/eldorado.cpp
feldo
-@source:fidelity/fidel_elite.cpp
+@source:fidelity/elite.cpp
feas //
feasbu //
feasbua //
@@ -14059,7 +14059,7 @@ fpres //
fpresbu //
fpresgla //
-@source:fidelity/fidel_excel.cpp
+@source:fidelity/excel.cpp
fdes2000 //
fdes2100 //
fexcel //
@@ -14072,36 +14072,36 @@ fexcelpb //
fexcelv //
granits // RCS
-@source:fidelity/fidel_msc.cpp
+@source:fidelity/msc.cpp
miniscco
-@source:fidelity/fidel_phantom.cpp
+@source:fidelity/phantom.cpp
cphantom //
fphantom //
-@source:fidelity/fidel_sc12.cpp
+@source:fidelity/sc12.cpp
fscc12 //
fscc12b //
-@source:fidelity/fidel_sc6.cpp
+@source:fidelity/sc6.cpp
fscc6 //
gambit
miniscc
-@source:fidelity/fidel_sc8.cpp
+@source:fidelity/sc8.cpp
fscc8 //
-@source:fidelity/fidel_sc9.cpp
+@source:fidelity/sc9.cpp
fscc9 //
fscc9b //
fscc9c //
fscc9ps //
-@source:fidelity/fidel_vcc.cpp
+@source:fidelity/vcc.cpp
uvc //
vcc //
-@source:fidelity/fidel_vsc.cpp
+@source:fidelity/vsc.cpp
vsc //
@source:konami/finalizr.cpp
@@ -23271,26 +23271,26 @@ mekd5 // 1980 Motorola Evaluation Kit
crzyddz2 // 2006 Sealy
menghong // 2004? Sealy
-@source:hegener/mephisto_academy.cpp
+@source:hegener/academy.cpp
academy
academyg
academyga
-@source:hegener/mephisto_amsterdam.cpp
+@source:hegener/amsterdam.cpp
amsterd // Amsterdam
dallas16 // Dallas
dallas32 // Dallas
roma16 // Roma
roma32 // Roma
-@source:hegener/mephisto_berlin.cpp
+@source:hegener/berlin.cpp
berl16 // 1992 Mephisto Berlin 68000
berl16a // 1992 Mephisto Berlin 68000
berlinp // 1994 Mephisto Berlin Pro 68020
berl16l // 1996 Mephisto Berlin 68000 London Upgrade
berlinpl // 1996 Mephisto Berlin Pro London Upgrade
-@source:hegener/mephisto_brikett.cpp
+@source:hegener/brikett.cpp
mephisto
mephisto1x
mephisto2
@@ -23302,23 +23302,23 @@ mephisto3b
mephisto3c
mephistoj
-@source:hegener/mephisto_glasgow.cpp
+@source:hegener/glasgow.cpp
amsterda // Amsterdam
dallas16a // Dallas
glasgow // Glasgow
roma16a // Roma
-@source:hegener/mephisto_milano.cpp
+@source:hegener/milano.cpp
milano // 1991 Mephisto Milano
milanoa // 1991 Mephisto Milano
nshort // 1993 Mephisto Nigel Short
-@source:hegener/mephisto_mm1.cpp
+@source:hegener/mm1.cpp
mm1
mm1b
mmirage
-@source:hegener/mephisto_mm2.cpp
+@source:hegener/mm2.cpp
mm2 // Mephisto MM II
mm2a // Mephisto MM II
mm2b // Mephisto MM II
@@ -23337,12 +23337,12 @@ mm5p
rebel5 // Mephisto Rebell 5.0
rebel5a // Mephisto Rebell 5.0
-@source:hegener/mephisto_modena.cpp
+@source:hegener/modena.cpp
modena // 1992 Mephisto Modena
modenaa // 1992 Mephisto Modena
modenab // 1992 Mephisto Modena
-@source:hegener/mephisto_modular.cpp
+@source:hegener/modular.cpp
alm16 // 1988 Mephisto Almeria 16 Bit
alm32 // 1988 Mephisto Almeria 32 Bit
port16 // 1989 Mephisto Portorose 16 Bit
@@ -23359,7 +23359,7 @@ gen32l // 1996 Mephisto Genius 68030 London Upgrade
lond16 // 1996 Mephisto London 16 Bit
lond32 // 1996 Mephisto London 32 Bit
-@source:hegener/mephisto_modular_tm.cpp
+@source:hegener/modular_tm.cpp
port32t
lyon32t
lyon32t8
@@ -23369,32 +23369,32 @@ berl32t8p
lond32t
lond32t8
-@source:hegener/mephisto_mondial.cpp
+@source:hegener/mondial.cpp
mondial // 1985 Mephisto Mondial
-@source:hegener/mephisto_mondial2.cpp
+@source:hegener/mondial2.cpp
mondial2 // 1987 Mephisto Mondial II
-@source:hegener/mephisto_mondial68k.cpp
+@source:hegener/mondial68k.cpp
mondl68k // 1988 Mephisto Mondial 68000XL
-@source:hegener/mephisto_montec.cpp
+@source:hegener/montec.cpp
montec // 1987 Mephisto Monte Carlo
monteca // 1987 Mephisto Monte Carlo
montec4 // 1989 Mephisto Monte Carlo IV
montec4le // 1990 Mephisto Monte Carlo IV LE
-@source:hegener/mephisto_polgar.cpp
+@source:hegener/polgar.cpp
polgar // 1990 Mephisto Polgar
polgara // 1989 Mephisto Polgar
polgar10 // 1990 Mephisto Polgar 10MHz
polgar101 // 1990 Mephisto Polgar 10MHz
-@source:hegener/mephisto_risc.cpp
+@source:hegener/risc.cpp
mrisc // 1992 Mephisto RISC 1MB
mrisc2 // 1994 Mephisto RISC II
-@source:hegener/mephisto_smondial.cpp
+@source:hegener/smondial.cpp
mega4 // 1989 Mephisto Mega IV
mega4a // 1989 Mephisto Mega IV
smondial // 1986 Mephisto Super Mondial (Ver A)
@@ -33755,14 +33755,14 @@ unkfr004c
@source:novadesitec/novadesitec_fr009.cpp
unkfr009
-@source:novag/novag_cexpert.cpp
+@source:novag/cexpert.cpp
cexpert
-@source:novag/novag_cforte.cpp
+@source:novag/cforte.cpp
cfortea
cforteb
-@source:novag/novag_const.cpp
+@source:novag/const.cpp
const
const36
const36a
@@ -33770,22 +33770,22 @@ constq
ssensor4
supercon
-@source:novag/novag_diablo.cpp
+@source:novag/diablo.cpp
diablo68
diablo68a
scorpio68
-@source:novag/novag_micro.cpp
+@source:novag/micro.cpp
nmicro
-@source:novag/novag_micro2.cpp
+@source:novag/micro2.cpp
nmicro2
-@source:novag/novag_savant.cpp
+@source:novag/savant.cpp
savant //
savant2 //
-@source:novag/novag_sexpert.cpp
+@source:novag/sexpert.cpp
sexperta //
sexperta1 //
sexperta2 //
@@ -33800,7 +33800,7 @@ sforteb //
sfortec //
sfortec1 //
-@source:novag/novag_snova.cpp
+@source:novag/snova.cpp
nsnova
supremo
@@ -37237,75 +37237,75 @@ sag
@source:sage/sage2.cpp
sage2
-@source:saitek/saitek_ccompan.cpp
+@source:saitek/ccompan.cpp
ccompan
-@source:saitek/saitek_chesstrv.cpp
+@source:saitek/chesstrv.cpp
chesstrv
chesstrvi
-@source:saitek/saitek_corona.cpp
+@source:saitek/corona.cpp
corona
coronaa
coronab
-@source:saitek/saitek_cp2000.cpp
+@source:saitek/cp2000.cpp
cp2000
-@source:saitek/saitek_delta1.cpp
+@source:saitek/delta1.cpp
ccdelta1
-@source:saitek/saitek_exchess.cpp
+@source:saitek/exchess.cpp
exchess
-@source:saitek/saitek_intchess.cpp
+@source:saitek/intchess.cpp
intchess
-@source:saitek/saitek_leonardo.cpp
+@source:saitek/leonardo.cpp
galileo
leonardo
leonardoa
leonardob
-@source:saitek/saitek_mark5.cpp
+@source:saitek/mark5.cpp
ccmk5
ccmk6
-@source:saitek/saitek_minichess.cpp
+@source:saitek/minichess.cpp
smchess
-@source:saitek/saitek_prschess.cpp
+@source:saitek/prschess.cpp
prschess
-@source:saitek/saitek_renaissance.cpp
+@source:saitek/renaissance.cpp
renaissa
renaissaa
-@source:saitek/saitek_risc2500.cpp
+@source:saitek/risc2500.cpp
montreux
risc2500
risc2500a
-@source:saitek/saitek_schess.cpp
+@source:saitek/schess.cpp
schess
-@source:saitek/saitek_simultano.cpp
+@source:saitek/simultano.cpp
cc2150
simultano
simultanoa
-@source:saitek/saitek_ssystem3.cpp
+@source:saitek/ssystem3.cpp
ssystem3
ssystem4
-@source:saitek/saitek_stratos.cpp
+@source:saitek/stratos.cpp
stratos
stratosa
tking
tkinga
tkingb
-@source:saitek/saitek_superstar.cpp
+@source:saitek/superstar.cpp
sstar28k
sstar36k
tstar432
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 5359947708d..af4e27613d8 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -1,8 +1,8 @@
access/acvirus.cpp
-aci/aci_boris.cpp
-aci/aci_borisdpl.cpp
-aci/aci_ggm.cpp
-aci/aci_prodigy.cpp
+aci/boris.cpp
+aci/borisdpl.cpp
+aci/ggm.cpp
+aci/prodigy.cpp
acorn/aa310.cpp
acorn/accomm.cpp
acorn/acrnsys.cpp
@@ -176,10 +176,10 @@ conitec/prof80.cpp
consumenta/conchess.cpp
cromemco/c10.cpp
cromemco/mcb216.cpp
-cxg/cxg_ch2001.cpp
-cxg/cxg_dominator.cpp
-cxg/cxg_scptchess.cpp
-cxg/cxg_sphinx40.cpp
+cxg/ch2001.cpp
+cxg/dominator.cpp
+cxg/scptchess.cpp
+cxg/sphinx40.cpp
cybiko/cybiko.cpp
dai/dai.cpp
dcs/compuchess.cpp
@@ -262,28 +262,28 @@ fairlight/cmi.cpp
falco/falco500.cpp
falco/falcots.cpp
falco/falcots28.cpp
-fidelity/fidel_as12.cpp
-fidelity/fidel_card.cpp
-fidelity/fidel_cc1.cpp
-fidelity/fidel_cc10.cpp
-fidelity/fidel_cc7.cpp
-fidelity/fidel_checkc2.cpp
-fidelity/fidel_chesster.cpp
-fidelity/fidel_csc.cpp
-fidelity/fidel_dames.cpp
-fidelity/fidel_desdis.cpp
-fidelity/fidel_eag68k.cpp
-fidelity/fidel_eldorado.cpp
-fidelity/fidel_elite.cpp
-fidelity/fidel_excel.cpp
-fidelity/fidel_msc.cpp
-fidelity/fidel_phantom.cpp
-fidelity/fidel_sc12.cpp
-fidelity/fidel_sc6.cpp
-fidelity/fidel_sc8.cpp
-fidelity/fidel_sc9.cpp
-fidelity/fidel_vcc.cpp
-fidelity/fidel_vsc.cpp
+fidelity/as12.cpp
+fidelity/card.cpp
+fidelity/cc1.cpp
+fidelity/cc10.cpp
+fidelity/cc7.cpp
+fidelity/checkc2.cpp
+fidelity/chesster.cpp
+fidelity/csc.cpp
+fidelity/dames.cpp
+fidelity/desdis.cpp
+fidelity/eag68k.cpp
+fidelity/eldorado.cpp
+fidelity/elite.cpp
+fidelity/excel.cpp
+fidelity/msc.cpp
+fidelity/phantom.cpp
+fidelity/sc12.cpp
+fidelity/sc6.cpp
+fidelity/sc8.cpp
+fidelity/sc9.cpp
+fidelity/vcc.cpp
+fidelity/vsc.cpp
force/fccpu20.cpp
force/fccpu30.cpp
force/force68k.cpp
@@ -318,24 +318,24 @@ heathkit/h19.cpp
heathkit/h8.cpp
heathkit/h89.cpp
hec2hrp/hec2hrp.cpp
-hegener/mephisto_academy.cpp
-hegener/mephisto_amsterdam.cpp
-hegener/mephisto_berlin.cpp
-hegener/mephisto_brikett.cpp
-hegener/mephisto_glasgow.cpp
-hegener/mephisto_milano.cpp
-hegener/mephisto_mm1.cpp
-hegener/mephisto_mm2.cpp
-hegener/mephisto_modena.cpp
-hegener/mephisto_modular.cpp
-hegener/mephisto_modular_tm.cpp
-hegener/mephisto_mondial.cpp
-hegener/mephisto_mondial2.cpp
-hegener/mephisto_mondial68k.cpp
-hegener/mephisto_montec.cpp
-hegener/mephisto_polgar.cpp
-hegener/mephisto_risc.cpp
-hegener/mephisto_smondial.cpp
+hegener/academy.cpp
+hegener/amsterdam.cpp
+hegener/berlin.cpp
+hegener/brikett.cpp
+hegener/glasgow.cpp
+hegener/milano.cpp
+hegener/mm1.cpp
+hegener/mm2.cpp
+hegener/modena.cpp
+hegener/modular.cpp
+hegener/modular_tm.cpp
+hegener/mondial.cpp
+hegener/mondial2.cpp
+hegener/mondial68k.cpp
+hegener/montec.cpp
+hegener/polgar.cpp
+hegener/risc.cpp
+hegener/smondial.cpp
heurikon/hk68v10.cpp
hitachi/b16.cpp
hitachi/bmjr.cpp
@@ -551,15 +551,15 @@ nokia/dbox.cpp
nokia/mikromik.cpp
nokia/nokia_3310.cpp
northstar/horizon.cpp
-novag/novag_cexpert.cpp
-novag/novag_cforte.cpp
-novag/novag_const.cpp
-novag/novag_diablo.cpp
-novag/novag_micro.cpp
-novag/novag_micro2.cpp
-novag/novag_savant.cpp
-novag/novag_sexpert.cpp
-novag/novag_snova.cpp
+novag/cexpert.cpp
+novag/cforte.cpp
+novag/const.cpp
+novag/diablo.cpp
+novag/micro.cpp
+novag/micro2.cpp
+novag/savant.cpp
+novag/sexpert.cpp
+novag/snova.cpp
novation/basssta.cpp
novation/drumsta.cpp
olivetti/m20.cpp
@@ -668,24 +668,24 @@ roland/roland_u20.cpp
rolm/r9751.cpp
rtpc/rtpc.cpp
sage/sage2.cpp
-saitek/saitek_ccompan.cpp
-saitek/saitek_chesstrv.cpp
-saitek/saitek_corona.cpp
-saitek/saitek_cp2000.cpp
-saitek/saitek_delta1.cpp
-saitek/saitek_exchess.cpp
-saitek/saitek_intchess.cpp
-saitek/saitek_leonardo.cpp
-saitek/saitek_mark5.cpp
-saitek/saitek_minichess.cpp
-saitek/saitek_prschess.cpp
-saitek/saitek_renaissance.cpp
-saitek/saitek_risc2500.cpp
-saitek/saitek_schess.cpp
-saitek/saitek_simultano.cpp
-saitek/saitek_ssystem3.cpp
-saitek/saitek_stratos.cpp
-saitek/saitek_superstar.cpp
+saitek/ccompan.cpp
+saitek/chesstrv.cpp
+saitek/corona.cpp
+saitek/cp2000.cpp
+saitek/delta1.cpp
+saitek/exchess.cpp
+saitek/intchess.cpp
+saitek/leonardo.cpp
+saitek/mark5.cpp
+saitek/minichess.cpp
+saitek/prschess.cpp
+saitek/renaissance.cpp
+saitek/risc2500.cpp
+saitek/schess.cpp
+saitek/simultano.cpp
+saitek/ssystem3.cpp
+saitek/stratos.cpp
+saitek/superstar.cpp
samcoupe/samcoupe.cpp
samsung/spc1000.cpp
samsung/spc1500.cpp
diff --git a/src/mame/novag/novag_cexpert.cpp b/src/mame/novag/cexpert.cpp
index 6aea37cbe00..6aea37cbe00 100644
--- a/src/mame/novag/novag_cexpert.cpp
+++ b/src/mame/novag/cexpert.cpp
diff --git a/src/mame/novag/novag_cforte.cpp b/src/mame/novag/cforte.cpp
index 3e102a80948..3e102a80948 100644
--- a/src/mame/novag/novag_cforte.cpp
+++ b/src/mame/novag/cforte.cpp
diff --git a/src/mame/novag/novag_const.cpp b/src/mame/novag/const.cpp
index a3aa5f1501b..a3aa5f1501b 100644
--- a/src/mame/novag/novag_const.cpp
+++ b/src/mame/novag/const.cpp
diff --git a/src/mame/novag/novag_diablo.cpp b/src/mame/novag/diablo.cpp
index 4e641d3d89b..4e641d3d89b 100644
--- a/src/mame/novag/novag_diablo.cpp
+++ b/src/mame/novag/diablo.cpp
diff --git a/src/mame/novag/novag_micro.cpp b/src/mame/novag/micro.cpp
index 10754f2729d..10754f2729d 100644
--- a/src/mame/novag/novag_micro.cpp
+++ b/src/mame/novag/micro.cpp
diff --git a/src/mame/novag/novag_micro2.cpp b/src/mame/novag/micro2.cpp
index 027d45474e1..027d45474e1 100644
--- a/src/mame/novag/novag_micro2.cpp
+++ b/src/mame/novag/micro2.cpp
diff --git a/src/mame/novag/novag_savant.cpp b/src/mame/novag/savant.cpp
index 5330255e3f3..5330255e3f3 100644
--- a/src/mame/novag/novag_savant.cpp
+++ b/src/mame/novag/savant.cpp
diff --git a/src/mame/novag/novag_sexpert.cpp b/src/mame/novag/sexpert.cpp
index b795f690611..b795f690611 100644
--- a/src/mame/novag/novag_sexpert.cpp
+++ b/src/mame/novag/sexpert.cpp
diff --git a/src/mame/novag/novag_snova.cpp b/src/mame/novag/snova.cpp
index d51c7758527..d51c7758527 100644
--- a/src/mame/novag/novag_snova.cpp
+++ b/src/mame/novag/snova.cpp
diff --git a/src/mame/saitek/saitek_ccompan.cpp b/src/mame/saitek/ccompan.cpp
index 679dce3c18a..679dce3c18a 100644
--- a/src/mame/saitek/saitek_ccompan.cpp
+++ b/src/mame/saitek/ccompan.cpp
diff --git a/src/mame/saitek/saitek_chesstrv.cpp b/src/mame/saitek/chesstrv.cpp
index 1e5553ded0f..1e5553ded0f 100644
--- a/src/mame/saitek/saitek_chesstrv.cpp
+++ b/src/mame/saitek/chesstrv.cpp
diff --git a/src/mame/saitek/saitek_corona.cpp b/src/mame/saitek/corona.cpp
index 961eeae3111..4f8a2f001a4 100644
--- a/src/mame/saitek/saitek_corona.cpp
+++ b/src/mame/saitek/corona.cpp
@@ -3,7 +3,7 @@
// thanks-to:Berger
/***************************************************************************
-Saitek Corona. Please refer to saitek_stratos.cpp for driver notes.
+Saitek Corona. Please refer to stratos.cpp for driver notes.
To be brief, Saitek Corona has two "HELIOS" chips, I/O addressing is completely
different compared to Stratos/Turbo King.
@@ -11,7 +11,7 @@ different compared to Stratos/Turbo King.
***************************************************************************/
#include "emu.h"
-#include "saitek_stratos.h"
+#include "stratos.h"
#include "cpu/m6502/m65c02.h"
#include "machine/nvram.h"
@@ -29,7 +29,7 @@ different compared to Stratos/Turbo King.
namespace {
-// note: sub-class of saitek_stratos_state (see mame/includes/saitek_stratos.h, mame/drivers/saitek_stratos.cpp)
+// note: sub-class of saitek_stratos_state (see stratos.h, stratos.cpp)
class corona_state : public saitek_stratos_state
{
diff --git a/src/mame/saitek/saitek_cp2000.cpp b/src/mame/saitek/cp2000.cpp
index 7a859615626..7a859615626 100644
--- a/src/mame/saitek/saitek_cp2000.cpp
+++ b/src/mame/saitek/cp2000.cpp
diff --git a/src/mame/saitek/saitek_delta1.cpp b/src/mame/saitek/delta1.cpp
index 1b9d504cc67..1b9d504cc67 100644
--- a/src/mame/saitek/saitek_delta1.cpp
+++ b/src/mame/saitek/delta1.cpp
diff --git a/src/mame/saitek/saitek_exchess.cpp b/src/mame/saitek/exchess.cpp
index ec47eb3f388..ec47eb3f388 100644
--- a/src/mame/saitek/saitek_exchess.cpp
+++ b/src/mame/saitek/exchess.cpp
diff --git a/src/mame/saitek/saitek_intchess.cpp b/src/mame/saitek/intchess.cpp
index 9901fe598b8..9901fe598b8 100644
--- a/src/mame/saitek/saitek_intchess.cpp
+++ b/src/mame/saitek/intchess.cpp
diff --git a/src/mame/saitek/saitek_leonardo.cpp b/src/mame/saitek/leonardo.cpp
index ce63c52bb89..ce63c52bb89 100644
--- a/src/mame/saitek/saitek_leonardo.cpp
+++ b/src/mame/saitek/leonardo.cpp
diff --git a/src/mame/saitek/saitek_mark5.cpp b/src/mame/saitek/mark5.cpp
index 0c68a64f820..0c68a64f820 100644
--- a/src/mame/saitek/saitek_mark5.cpp
+++ b/src/mame/saitek/mark5.cpp
diff --git a/src/mame/saitek/saitek_minichess.cpp b/src/mame/saitek/minichess.cpp
index 9642b5d212c..9642b5d212c 100644
--- a/src/mame/saitek/saitek_minichess.cpp
+++ b/src/mame/saitek/minichess.cpp
diff --git a/src/mame/saitek/saitek_prschess.cpp b/src/mame/saitek/prschess.cpp
index bbbf299030d..bbbf299030d 100644
--- a/src/mame/saitek/saitek_prschess.cpp
+++ b/src/mame/saitek/prschess.cpp
diff --git a/src/mame/saitek/saitek_renaissance.cpp b/src/mame/saitek/renaissance.cpp
index 4bda748d676..a3e0d2e1291 100644
--- a/src/mame/saitek/saitek_renaissance.cpp
+++ b/src/mame/saitek/renaissance.cpp
@@ -25,7 +25,7 @@ pushed in to hide the chessboard display.
TODO:
- fart noise at boot if maestroa module is inserted
- weird beep at boot if sparc module is inserted (related to above?)
-- make it a subdriver of saitek_leonardo.cpp? or too many differences
+- make it a subdriver of leonardo.cpp? or too many differences
- same TODO list as saitek_leonardo.cpp
******************************************************************************/
diff --git a/src/mame/saitek/saitek_risc2500.cpp b/src/mame/saitek/risc2500.cpp
index 36afd69a4b6..36afd69a4b6 100644
--- a/src/mame/saitek/saitek_risc2500.cpp
+++ b/src/mame/saitek/risc2500.cpp
diff --git a/src/mame/saitek/saitek_schess.cpp b/src/mame/saitek/schess.cpp
index 12311f8f61f..12311f8f61f 100644
--- a/src/mame/saitek/saitek_schess.cpp
+++ b/src/mame/saitek/schess.cpp
diff --git a/src/mame/saitek/saitek_simultano.cpp b/src/mame/saitek/simultano.cpp
index 9dd32bd9681..c084fa8eefa 100644
--- a/src/mame/saitek/saitek_simultano.cpp
+++ b/src/mame/saitek/simultano.cpp
@@ -3,7 +3,7 @@
// thanks-to:Achim, bataais, Berger
/***************************************************************************
-Saitek Simultano, it is related to Saitek Stratos, see saitek_stratos.cpp
+Saitek Simultano, it is related to Saitek Stratos, see stratos.cpp
But it's not similar enough to be a subdriver of it.
Two versions are known: "B" from 1988/1989, and "C" from 1989.
diff --git a/src/mame/saitek/saitek_ssystem3.cpp b/src/mame/saitek/ssystem3.cpp
index c06b6de1405..c06b6de1405 100644
--- a/src/mame/saitek/saitek_ssystem3.cpp
+++ b/src/mame/saitek/ssystem3.cpp
diff --git a/src/mame/saitek/saitek_stratos.cpp b/src/mame/saitek/stratos.cpp
index d96ce234e16..b85419cc184 100644
--- a/src/mame/saitek/saitek_stratos.cpp
+++ b/src/mame/saitek/stratos.cpp
@@ -50,7 +50,7 @@ very few bytes difference between revisions. The first Corona is engine version
******************************************************************************/
#include "emu.h"
-#include "saitek_stratos.h"
+#include "stratos.h"
#include "cpu/m6502/m65c02.h"
#include "machine/nvram.h"
diff --git a/src/mame/saitek/saitek_stratos.h b/src/mame/saitek/stratos.h
index 23a0bf694fe..23a0bf694fe 100644
--- a/src/mame/saitek/saitek_stratos.h
+++ b/src/mame/saitek/stratos.h
diff --git a/src/mame/saitek/saitek_superstar.cpp b/src/mame/saitek/superstar.cpp
index c72a19c5b48..c72a19c5b48 100644
--- a/src/mame/saitek/saitek_superstar.cpp
+++ b/src/mame/saitek/superstar.cpp