From da028cd724b3c50c6493b1b3fa6301268646ff65 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 29 Jun 2022 16:31:56 +0200
Subject: [PATCH] source org: remove obsolete filename prefix from
 aci,cxg,hegener,fidelity,novag,saitek

---
 src/mame/aci/{aci_boris.cpp => boris.cpp}     |   0
 .../aci/{aci_borisdpl.cpp => borisdpl.cpp}    |   0
 src/mame/aci/{aci_ggm.cpp => ggm.cpp}         |   0
 src/mame/aci/{aci_prodigy.cpp => prodigy.cpp} |   0
 src/mame/cxg/{cxg_ch2001.cpp => ch2001.cpp}   |   0
 .../cxg/{cxg_dominator.cpp => dominator.cpp}  |   0
 .../cxg/{cxg_scptchess.cpp => scptchess.cpp}  |   0
 .../cxg/{cxg_sphinx40.cpp => sphinx40.cpp}    |   0
 .../fidelity/{fidel_as12.cpp => as12.cpp}     |   6 +-
 .../fidelity/{fidel_card.cpp => card.cpp}     |   0
 src/mame/fidelity/{fidel_cc1.cpp => cc1.cpp}  |   0
 .../fidelity/{fidel_cc10.cpp => cc10.cpp}     |   2 +-
 src/mame/fidelity/{fidel_cc7.cpp => cc7.cpp}  |   0
 .../{fidel_checkc2.cpp => checkc2.cpp}        |   2 +-
 .../{fidel_chesster.cpp => chesster.cpp}      |   0
 .../{fidel_clockdiv.cpp => clockdiv.cpp}      |   2 +-
 .../fidelity/{fidel_clockdiv.h => clockdiv.h} |   0
 src/mame/fidelity/{fidel_csc.cpp => csc.cpp}  |   2 +-
 .../fidelity/{fidel_dames.cpp => dames.cpp}   |   0
 .../fidelity/{fidel_desdis.cpp => desdis.cpp} |   2 +-
 .../fidelity/{fidel_eag68k.cpp => eag68k.cpp} |   2 +-
 .../{fidel_eldorado.cpp => eldorado.cpp}      |   0
 .../fidelity/{fidel_elite.cpp => elite.cpp}   |   6 +-
 .../fidelity/{fidel_excel.cpp => excel.cpp}   |   4 +-
 src/mame/fidelity/{fidel_msc.cpp => msc.cpp}  |   4 +-
 .../{fidel_phantom.cpp => phantom.cpp}        |   0
 .../fidelity/{fidel_sc12.cpp => sc12.cpp}     |   4 +-
 src/mame/fidelity/{fidel_sc6.cpp => sc6.cpp}  |   4 +-
 src/mame/fidelity/{fidel_sc8.cpp => sc8.cpp}  |   0
 src/mame/fidelity/{fidel_sc9.cpp => sc9.cpp}  |   0
 src/mame/fidelity/{fidel_vcc.cpp => vcc.cpp}  |   0
 src/mame/fidelity/{fidel_vsc.cpp => vsc.cpp}  |   0
 .../{mephisto_academy.cpp => academy.cpp}     |   0
 .../{mephisto_amsterdam.cpp => amsterdam.cpp} |   0
 .../{mephisto_berlin.cpp => berlin.cpp}       |   0
 .../{mephisto_brikett.cpp => brikett.cpp}     |   0
 .../{mephisto_glasgow.cpp => glasgow.cpp}     |   0
 .../{mephisto_milano.cpp => milano.cpp}       |   0
 .../hegener/{mephisto_mm1.cpp => mm1.cpp}     |   0
 .../hegener/{mephisto_mm2.cpp => mm2.cpp}     |   0
 .../{mephisto_modena.cpp => modena.cpp}       |   0
 .../{mephisto_modular.cpp => modular.cpp}     |   2 +-
 ...mephisto_modular_tm.cpp => modular_tm.cpp} |   0
 .../{mephisto_mondial.cpp => mondial.cpp}     |   0
 .../{mephisto_mondial2.cpp => mondial2.cpp}   |   0
 ...mephisto_mondial68k.cpp => mondial68k.cpp} |   0
 .../{mephisto_montec.cpp => montec.cpp}       |   0
 .../{mephisto_polgar.cpp => polgar.cpp}       |   0
 .../hegener/{mephisto_risc.cpp => risc.cpp}   |   0
 .../{mephisto_smondial.cpp => smondial.cpp}   |   0
 src/mame/mame.lst                             | 150 +++++++++---------
 src/mame/mess.flt                             | 150 +++++++++---------
 .../novag/{novag_cexpert.cpp => cexpert.cpp}  |   0
 .../novag/{novag_cforte.cpp => cforte.cpp}    |   0
 src/mame/novag/{novag_const.cpp => const.cpp} |   0
 .../novag/{novag_diablo.cpp => diablo.cpp}    |   0
 src/mame/novag/{novag_micro.cpp => micro.cpp} |   0
 .../novag/{novag_micro2.cpp => micro2.cpp}    |   0
 .../novag/{novag_savant.cpp => savant.cpp}    |   0
 .../novag/{novag_sexpert.cpp => sexpert.cpp}  |   0
 src/mame/novag/{novag_snova.cpp => snova.cpp} |   0
 .../{saitek_ccompan.cpp => ccompan.cpp}       |   0
 .../{saitek_chesstrv.cpp => chesstrv.cpp}     |   0
 .../saitek/{saitek_corona.cpp => corona.cpp}  |   6 +-
 .../saitek/{saitek_cp2000.cpp => cp2000.cpp}  |   0
 .../saitek/{saitek_delta1.cpp => delta1.cpp}  |   0
 .../{saitek_exchess.cpp => exchess.cpp}       |   0
 .../{saitek_intchess.cpp => intchess.cpp}     |   0
 .../{saitek_leonardo.cpp => leonardo.cpp}     |   0
 .../saitek/{saitek_mark5.cpp => mark5.cpp}    |   0
 .../{saitek_minichess.cpp => minichess.cpp}   |   0
 .../{saitek_prschess.cpp => prschess.cpp}     |   0
 ...saitek_renaissance.cpp => renaissance.cpp} |   2 +-
 .../{saitek_risc2500.cpp => risc2500.cpp}     |   0
 .../saitek/{saitek_schess.cpp => schess.cpp}  |   0
 .../{saitek_simultano.cpp => simultano.cpp}   |   2 +-
 .../{saitek_ssystem3.cpp => ssystem3.cpp}     |   0
 .../{saitek_stratos.cpp => stratos.cpp}       |   2 +-
 .../saitek/{saitek_stratos.h => stratos.h}    |   0
 .../{saitek_superstar.cpp => superstar.cpp}   |   0
 80 files changed, 177 insertions(+), 177 deletions(-)
 rename src/mame/aci/{aci_boris.cpp => boris.cpp} (100%)
 rename src/mame/aci/{aci_borisdpl.cpp => borisdpl.cpp} (100%)
 rename src/mame/aci/{aci_ggm.cpp => ggm.cpp} (100%)
 rename src/mame/aci/{aci_prodigy.cpp => prodigy.cpp} (100%)
 rename src/mame/cxg/{cxg_ch2001.cpp => ch2001.cpp} (100%)
 rename src/mame/cxg/{cxg_dominator.cpp => dominator.cpp} (100%)
 rename src/mame/cxg/{cxg_scptchess.cpp => scptchess.cpp} (100%)
 rename src/mame/cxg/{cxg_sphinx40.cpp => sphinx40.cpp} (100%)
 rename src/mame/fidelity/{fidel_as12.cpp => as12.cpp} (97%)
 rename src/mame/fidelity/{fidel_card.cpp => card.cpp} (100%)
 rename src/mame/fidelity/{fidel_cc1.cpp => cc1.cpp} (100%)
 rename src/mame/fidelity/{fidel_cc10.cpp => cc10.cpp} (99%)
 rename src/mame/fidelity/{fidel_cc7.cpp => cc7.cpp} (100%)
 rename src/mame/fidelity/{fidel_checkc2.cpp => checkc2.cpp} (99%)
 rename src/mame/fidelity/{fidel_chesster.cpp => chesster.cpp} (100%)
 rename src/mame/fidelity/{fidel_clockdiv.cpp => clockdiv.cpp} (99%)
 rename src/mame/fidelity/{fidel_clockdiv.h => clockdiv.h} (100%)
 rename src/mame/fidelity/{fidel_csc.cpp => csc.cpp} (99%)
 rename src/mame/fidelity/{fidel_dames.cpp => dames.cpp} (100%)
 rename src/mame/fidelity/{fidel_desdis.cpp => desdis.cpp} (99%)
 rename src/mame/fidelity/{fidel_eag68k.cpp => eag68k.cpp} (99%)
 rename src/mame/fidelity/{fidel_eldorado.cpp => eldorado.cpp} (100%)
 rename src/mame/fidelity/{fidel_elite.cpp => elite.cpp} (99%)
 rename src/mame/fidelity/{fidel_excel.cpp => excel.cpp} (99%)
 rename src/mame/fidelity/{fidel_msc.cpp => msc.cpp} (98%)
 rename src/mame/fidelity/{fidel_phantom.cpp => phantom.cpp} (100%)
 rename src/mame/fidelity/{fidel_sc12.cpp => sc12.cpp} (98%)
 rename src/mame/fidelity/{fidel_sc6.cpp => sc6.cpp} (98%)
 rename src/mame/fidelity/{fidel_sc8.cpp => sc8.cpp} (100%)
 rename src/mame/fidelity/{fidel_sc9.cpp => sc9.cpp} (100%)
 rename src/mame/fidelity/{fidel_vcc.cpp => vcc.cpp} (100%)
 rename src/mame/fidelity/{fidel_vsc.cpp => vsc.cpp} (100%)
 rename src/mame/hegener/{mephisto_academy.cpp => academy.cpp} (100%)
 rename src/mame/hegener/{mephisto_amsterdam.cpp => amsterdam.cpp} (100%)
 rename src/mame/hegener/{mephisto_berlin.cpp => berlin.cpp} (100%)
 rename src/mame/hegener/{mephisto_brikett.cpp => brikett.cpp} (100%)
 rename src/mame/hegener/{mephisto_glasgow.cpp => glasgow.cpp} (100%)
 rename src/mame/hegener/{mephisto_milano.cpp => milano.cpp} (100%)
 rename src/mame/hegener/{mephisto_mm1.cpp => mm1.cpp} (100%)
 rename src/mame/hegener/{mephisto_mm2.cpp => mm2.cpp} (100%)
 rename src/mame/hegener/{mephisto_modena.cpp => modena.cpp} (100%)
 rename src/mame/hegener/{mephisto_modular.cpp => modular.cpp} (99%)
 rename src/mame/hegener/{mephisto_modular_tm.cpp => modular_tm.cpp} (100%)
 rename src/mame/hegener/{mephisto_mondial.cpp => mondial.cpp} (100%)
 rename src/mame/hegener/{mephisto_mondial2.cpp => mondial2.cpp} (100%)
 rename src/mame/hegener/{mephisto_mondial68k.cpp => mondial68k.cpp} (100%)
 rename src/mame/hegener/{mephisto_montec.cpp => montec.cpp} (100%)
 rename src/mame/hegener/{mephisto_polgar.cpp => polgar.cpp} (100%)
 rename src/mame/hegener/{mephisto_risc.cpp => risc.cpp} (100%)
 rename src/mame/hegener/{mephisto_smondial.cpp => smondial.cpp} (100%)
 rename src/mame/novag/{novag_cexpert.cpp => cexpert.cpp} (100%)
 rename src/mame/novag/{novag_cforte.cpp => cforte.cpp} (100%)
 rename src/mame/novag/{novag_const.cpp => const.cpp} (100%)
 rename src/mame/novag/{novag_diablo.cpp => diablo.cpp} (100%)
 rename src/mame/novag/{novag_micro.cpp => micro.cpp} (100%)
 rename src/mame/novag/{novag_micro2.cpp => micro2.cpp} (100%)
 rename src/mame/novag/{novag_savant.cpp => savant.cpp} (100%)
 rename src/mame/novag/{novag_sexpert.cpp => sexpert.cpp} (100%)
 rename src/mame/novag/{novag_snova.cpp => snova.cpp} (100%)
 rename src/mame/saitek/{saitek_ccompan.cpp => ccompan.cpp} (100%)
 rename src/mame/saitek/{saitek_chesstrv.cpp => chesstrv.cpp} (100%)
 rename src/mame/saitek/{saitek_corona.cpp => corona.cpp} (97%)
 rename src/mame/saitek/{saitek_cp2000.cpp => cp2000.cpp} (100%)
 rename src/mame/saitek/{saitek_delta1.cpp => delta1.cpp} (100%)
 rename src/mame/saitek/{saitek_exchess.cpp => exchess.cpp} (100%)
 rename src/mame/saitek/{saitek_intchess.cpp => intchess.cpp} (100%)
 rename src/mame/saitek/{saitek_leonardo.cpp => leonardo.cpp} (100%)
 rename src/mame/saitek/{saitek_mark5.cpp => mark5.cpp} (100%)
 rename src/mame/saitek/{saitek_minichess.cpp => minichess.cpp} (100%)
 rename src/mame/saitek/{saitek_prschess.cpp => prschess.cpp} (100%)
 rename src/mame/saitek/{saitek_renaissance.cpp => renaissance.cpp} (99%)
 rename src/mame/saitek/{saitek_risc2500.cpp => risc2500.cpp} (100%)
 rename src/mame/saitek/{saitek_schess.cpp => schess.cpp} (100%)
 rename src/mame/saitek/{saitek_simultano.cpp => simultano.cpp} (99%)
 rename src/mame/saitek/{saitek_ssystem3.cpp => ssystem3.cpp} (100%)
 rename src/mame/saitek/{saitek_stratos.cpp => stratos.cpp} (99%)
 rename src/mame/saitek/{saitek_stratos.h => stratos.h} (100%)
 rename src/mame/saitek/{saitek_superstar.cpp => superstar.cpp} (100%)

diff --git a/src/mame/aci/aci_boris.cpp b/src/mame/aci/boris.cpp
similarity index 100%
rename from src/mame/aci/aci_boris.cpp
rename to src/mame/aci/boris.cpp
diff --git a/src/mame/aci/aci_borisdpl.cpp b/src/mame/aci/borisdpl.cpp
similarity index 100%
rename from src/mame/aci/aci_borisdpl.cpp
rename to src/mame/aci/borisdpl.cpp
diff --git a/src/mame/aci/aci_ggm.cpp b/src/mame/aci/ggm.cpp
similarity index 100%
rename from src/mame/aci/aci_ggm.cpp
rename to src/mame/aci/ggm.cpp
diff --git a/src/mame/aci/aci_prodigy.cpp b/src/mame/aci/prodigy.cpp
similarity index 100%
rename from src/mame/aci/aci_prodigy.cpp
rename to src/mame/aci/prodigy.cpp
diff --git a/src/mame/cxg/cxg_ch2001.cpp b/src/mame/cxg/ch2001.cpp
similarity index 100%
rename from src/mame/cxg/cxg_ch2001.cpp
rename to src/mame/cxg/ch2001.cpp
diff --git a/src/mame/cxg/cxg_dominator.cpp b/src/mame/cxg/dominator.cpp
similarity index 100%
rename from src/mame/cxg/cxg_dominator.cpp
rename to src/mame/cxg/dominator.cpp
diff --git a/src/mame/cxg/cxg_scptchess.cpp b/src/mame/cxg/scptchess.cpp
similarity index 100%
rename from src/mame/cxg/cxg_scptchess.cpp
rename to src/mame/cxg/scptchess.cpp
diff --git a/src/mame/cxg/cxg_sphinx40.cpp b/src/mame/cxg/sphinx40.cpp
similarity index 100%
rename from src/mame/cxg/cxg_sphinx40.cpp
rename to src/mame/cxg/sphinx40.cpp
diff --git a/src/mame/fidelity/fidel_as12.cpp b/src/mame/fidelity/as12.cpp
similarity index 97%
rename from src/mame/fidelity/fidel_as12.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_card.cpp
rename to src/mame/fidelity/card.cpp
diff --git a/src/mame/fidelity/fidel_cc1.cpp b/src/mame/fidelity/cc1.cpp
similarity index 100%
rename from src/mame/fidelity/fidel_cc1.cpp
rename to src/mame/fidelity/cc1.cpp
diff --git a/src/mame/fidelity/fidel_cc10.cpp b/src/mame/fidelity/cc10.cpp
similarity index 99%
rename from src/mame/fidelity/fidel_cc10.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_cc7.cpp
rename to src/mame/fidelity/cc7.cpp
diff --git a/src/mame/fidelity/fidel_checkc2.cpp b/src/mame/fidelity/checkc2.cpp
similarity index 99%
rename from src/mame/fidelity/fidel_checkc2.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_chesster.cpp
rename to src/mame/fidelity/chesster.cpp
diff --git a/src/mame/fidelity/fidel_clockdiv.cpp b/src/mame/fidelity/clockdiv.cpp
similarity index 99%
rename from src/mame/fidelity/fidel_clockdiv.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_clockdiv.h
rename to src/mame/fidelity/clockdiv.h
diff --git a/src/mame/fidelity/fidel_csc.cpp b/src/mame/fidelity/csc.cpp
similarity index 99%
rename from src/mame/fidelity/fidel_csc.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_dames.cpp
rename to src/mame/fidelity/dames.cpp
diff --git a/src/mame/fidelity/fidel_desdis.cpp b/src/mame/fidelity/desdis.cpp
similarity index 99%
rename from src/mame/fidelity/fidel_desdis.cpp
rename to 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
similarity index 99%
rename from src/mame/fidelity/fidel_eag68k.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_eldorado.cpp
rename to src/mame/fidelity/eldorado.cpp
diff --git a/src/mame/fidelity/fidel_elite.cpp b/src/mame/fidelity/elite.cpp
similarity index 99%
rename from src/mame/fidelity/fidel_elite.cpp
rename to 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
similarity index 99%
rename from src/mame/fidelity/fidel_excel.cpp
rename to 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
similarity index 98%
rename from src/mame/fidelity/fidel_msc.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_phantom.cpp
rename to src/mame/fidelity/phantom.cpp
diff --git a/src/mame/fidelity/fidel_sc12.cpp b/src/mame/fidelity/sc12.cpp
similarity index 98%
rename from src/mame/fidelity/fidel_sc12.cpp
rename to 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
similarity index 98%
rename from src/mame/fidelity/fidel_sc6.cpp
rename to 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
similarity index 100%
rename from src/mame/fidelity/fidel_sc8.cpp
rename to src/mame/fidelity/sc8.cpp
diff --git a/src/mame/fidelity/fidel_sc9.cpp b/src/mame/fidelity/sc9.cpp
similarity index 100%
rename from src/mame/fidelity/fidel_sc9.cpp
rename to src/mame/fidelity/sc9.cpp
diff --git a/src/mame/fidelity/fidel_vcc.cpp b/src/mame/fidelity/vcc.cpp
similarity index 100%
rename from src/mame/fidelity/fidel_vcc.cpp
rename to src/mame/fidelity/vcc.cpp
diff --git a/src/mame/fidelity/fidel_vsc.cpp b/src/mame/fidelity/vsc.cpp
similarity index 100%
rename from src/mame/fidelity/fidel_vsc.cpp
rename to src/mame/fidelity/vsc.cpp
diff --git a/src/mame/hegener/mephisto_academy.cpp b/src/mame/hegener/academy.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_academy.cpp
rename to src/mame/hegener/academy.cpp
diff --git a/src/mame/hegener/mephisto_amsterdam.cpp b/src/mame/hegener/amsterdam.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_amsterdam.cpp
rename to src/mame/hegener/amsterdam.cpp
diff --git a/src/mame/hegener/mephisto_berlin.cpp b/src/mame/hegener/berlin.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_berlin.cpp
rename to src/mame/hegener/berlin.cpp
diff --git a/src/mame/hegener/mephisto_brikett.cpp b/src/mame/hegener/brikett.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_brikett.cpp
rename to src/mame/hegener/brikett.cpp
diff --git a/src/mame/hegener/mephisto_glasgow.cpp b/src/mame/hegener/glasgow.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_glasgow.cpp
rename to src/mame/hegener/glasgow.cpp
diff --git a/src/mame/hegener/mephisto_milano.cpp b/src/mame/hegener/milano.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_milano.cpp
rename to src/mame/hegener/milano.cpp
diff --git a/src/mame/hegener/mephisto_mm1.cpp b/src/mame/hegener/mm1.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_mm1.cpp
rename to src/mame/hegener/mm1.cpp
diff --git a/src/mame/hegener/mephisto_mm2.cpp b/src/mame/hegener/mm2.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_mm2.cpp
rename to src/mame/hegener/mm2.cpp
diff --git a/src/mame/hegener/mephisto_modena.cpp b/src/mame/hegener/modena.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_modena.cpp
rename to src/mame/hegener/modena.cpp
diff --git a/src/mame/hegener/mephisto_modular.cpp b/src/mame/hegener/modular.cpp
similarity index 99%
rename from src/mame/hegener/mephisto_modular.cpp
rename to 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
similarity index 100%
rename from src/mame/hegener/mephisto_modular_tm.cpp
rename to src/mame/hegener/modular_tm.cpp
diff --git a/src/mame/hegener/mephisto_mondial.cpp b/src/mame/hegener/mondial.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_mondial.cpp
rename to src/mame/hegener/mondial.cpp
diff --git a/src/mame/hegener/mephisto_mondial2.cpp b/src/mame/hegener/mondial2.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_mondial2.cpp
rename to src/mame/hegener/mondial2.cpp
diff --git a/src/mame/hegener/mephisto_mondial68k.cpp b/src/mame/hegener/mondial68k.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_mondial68k.cpp
rename to src/mame/hegener/mondial68k.cpp
diff --git a/src/mame/hegener/mephisto_montec.cpp b/src/mame/hegener/montec.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_montec.cpp
rename to src/mame/hegener/montec.cpp
diff --git a/src/mame/hegener/mephisto_polgar.cpp b/src/mame/hegener/polgar.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_polgar.cpp
rename to src/mame/hegener/polgar.cpp
diff --git a/src/mame/hegener/mephisto_risc.cpp b/src/mame/hegener/risc.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_risc.cpp
rename to src/mame/hegener/risc.cpp
diff --git a/src/mame/hegener/mephisto_smondial.cpp b/src/mame/hegener/smondial.cpp
similarity index 100%
rename from src/mame/hegener/mephisto_smondial.cpp
rename to 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
similarity index 100%
rename from src/mame/novag/novag_cexpert.cpp
rename to src/mame/novag/cexpert.cpp
diff --git a/src/mame/novag/novag_cforte.cpp b/src/mame/novag/cforte.cpp
similarity index 100%
rename from src/mame/novag/novag_cforte.cpp
rename to src/mame/novag/cforte.cpp
diff --git a/src/mame/novag/novag_const.cpp b/src/mame/novag/const.cpp
similarity index 100%
rename from src/mame/novag/novag_const.cpp
rename to src/mame/novag/const.cpp
diff --git a/src/mame/novag/novag_diablo.cpp b/src/mame/novag/diablo.cpp
similarity index 100%
rename from src/mame/novag/novag_diablo.cpp
rename to src/mame/novag/diablo.cpp
diff --git a/src/mame/novag/novag_micro.cpp b/src/mame/novag/micro.cpp
similarity index 100%
rename from src/mame/novag/novag_micro.cpp
rename to src/mame/novag/micro.cpp
diff --git a/src/mame/novag/novag_micro2.cpp b/src/mame/novag/micro2.cpp
similarity index 100%
rename from src/mame/novag/novag_micro2.cpp
rename to src/mame/novag/micro2.cpp
diff --git a/src/mame/novag/novag_savant.cpp b/src/mame/novag/savant.cpp
similarity index 100%
rename from src/mame/novag/novag_savant.cpp
rename to src/mame/novag/savant.cpp
diff --git a/src/mame/novag/novag_sexpert.cpp b/src/mame/novag/sexpert.cpp
similarity index 100%
rename from src/mame/novag/novag_sexpert.cpp
rename to src/mame/novag/sexpert.cpp
diff --git a/src/mame/novag/novag_snova.cpp b/src/mame/novag/snova.cpp
similarity index 100%
rename from src/mame/novag/novag_snova.cpp
rename to src/mame/novag/snova.cpp
diff --git a/src/mame/saitek/saitek_ccompan.cpp b/src/mame/saitek/ccompan.cpp
similarity index 100%
rename from src/mame/saitek/saitek_ccompan.cpp
rename to src/mame/saitek/ccompan.cpp
diff --git a/src/mame/saitek/saitek_chesstrv.cpp b/src/mame/saitek/chesstrv.cpp
similarity index 100%
rename from src/mame/saitek/saitek_chesstrv.cpp
rename to src/mame/saitek/chesstrv.cpp
diff --git a/src/mame/saitek/saitek_corona.cpp b/src/mame/saitek/corona.cpp
similarity index 97%
rename from src/mame/saitek/saitek_corona.cpp
rename to 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
similarity index 100%
rename from src/mame/saitek/saitek_cp2000.cpp
rename to src/mame/saitek/cp2000.cpp
diff --git a/src/mame/saitek/saitek_delta1.cpp b/src/mame/saitek/delta1.cpp
similarity index 100%
rename from src/mame/saitek/saitek_delta1.cpp
rename to src/mame/saitek/delta1.cpp
diff --git a/src/mame/saitek/saitek_exchess.cpp b/src/mame/saitek/exchess.cpp
similarity index 100%
rename from src/mame/saitek/saitek_exchess.cpp
rename to src/mame/saitek/exchess.cpp
diff --git a/src/mame/saitek/saitek_intchess.cpp b/src/mame/saitek/intchess.cpp
similarity index 100%
rename from src/mame/saitek/saitek_intchess.cpp
rename to src/mame/saitek/intchess.cpp
diff --git a/src/mame/saitek/saitek_leonardo.cpp b/src/mame/saitek/leonardo.cpp
similarity index 100%
rename from src/mame/saitek/saitek_leonardo.cpp
rename to src/mame/saitek/leonardo.cpp
diff --git a/src/mame/saitek/saitek_mark5.cpp b/src/mame/saitek/mark5.cpp
similarity index 100%
rename from src/mame/saitek/saitek_mark5.cpp
rename to src/mame/saitek/mark5.cpp
diff --git a/src/mame/saitek/saitek_minichess.cpp b/src/mame/saitek/minichess.cpp
similarity index 100%
rename from src/mame/saitek/saitek_minichess.cpp
rename to src/mame/saitek/minichess.cpp
diff --git a/src/mame/saitek/saitek_prschess.cpp b/src/mame/saitek/prschess.cpp
similarity index 100%
rename from src/mame/saitek/saitek_prschess.cpp
rename to src/mame/saitek/prschess.cpp
diff --git a/src/mame/saitek/saitek_renaissance.cpp b/src/mame/saitek/renaissance.cpp
similarity index 99%
rename from src/mame/saitek/saitek_renaissance.cpp
rename to 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
similarity index 100%
rename from src/mame/saitek/saitek_risc2500.cpp
rename to src/mame/saitek/risc2500.cpp
diff --git a/src/mame/saitek/saitek_schess.cpp b/src/mame/saitek/schess.cpp
similarity index 100%
rename from src/mame/saitek/saitek_schess.cpp
rename to src/mame/saitek/schess.cpp
diff --git a/src/mame/saitek/saitek_simultano.cpp b/src/mame/saitek/simultano.cpp
similarity index 99%
rename from src/mame/saitek/saitek_simultano.cpp
rename to 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
similarity index 100%
rename from src/mame/saitek/saitek_ssystem3.cpp
rename to src/mame/saitek/ssystem3.cpp
diff --git a/src/mame/saitek/saitek_stratos.cpp b/src/mame/saitek/stratos.cpp
similarity index 99%
rename from src/mame/saitek/saitek_stratos.cpp
rename to 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
similarity index 100%
rename from src/mame/saitek/saitek_stratos.h
rename to src/mame/saitek/stratos.h
diff --git a/src/mame/saitek/saitek_superstar.cpp b/src/mame/saitek/superstar.cpp
similarity index 100%
rename from src/mame/saitek/saitek_superstar.cpp
rename to src/mame/saitek/superstar.cpp