summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2011-02-24 13:51:21 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2011-02-24 13:51:21 +0000
commit50b692dd2464a3bb6dc8408ceb2405288effab8f (patch)
tree77d38036043907ff66d9b9471c4e36995fed7aaf /src/mame/includes
parentd8cb0ac416caf49efcb7497e87806e3e9ac80f6e (diff)
Modified video update system. [Miodrag Milanovic]
Screen update function is now per screen device (it was before but was attached to machine driver) MCFG_VIDEO_UPDATE -> MCFG_SCREEN_UPDATE MCFG_VIDEO_EOF -> MCFG_SCREEN_EOF EOF is now executed for all screens, so for all existing it is defined just for one screen. This part will be updated in future. Note that there are now screen_update and screen_eof virtual functions for "modern" drivers which are called same as they did before. All drivers are updated and in places where update function was separated per screen I did name separate function. This change will enable us to put screen definition fully into device.
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/1942.h2
-rw-r--r--src/mame/includes/1943.h2
-rw-r--r--src/mame/includes/40love.h2
-rw-r--r--src/mame/includes/4enraya.h2
-rw-r--r--src/mame/includes/88games.h2
-rw-r--r--src/mame/includes/actfancr.h4
-rw-r--r--src/mame/includes/aeroboto.h2
-rw-r--r--src/mame/includes/aerofgt.h20
-rw-r--r--src/mame/includes/airbustr.h4
-rw-r--r--src/mame/includes/ajax.h2
-rw-r--r--src/mame/includes/aliens.h2
-rw-r--r--src/mame/includes/alpha68k.h12
-rw-r--r--src/mame/includes/ambush.h2
-rw-r--r--src/mame/includes/amiga.h4
-rw-r--r--src/mame/includes/ampoker2.h2
-rw-r--r--src/mame/includes/amspdwy.h2
-rw-r--r--src/mame/includes/angelkds.h2
-rw-r--r--src/mame/includes/appoooh.h4
-rw-r--r--src/mame/includes/aquarium.h2
-rw-r--r--src/mame/includes/arabian.h2
-rw-r--r--src/mame/includes/arcadecl.h2
-rw-r--r--src/mame/includes/archimds.h2
-rw-r--r--src/mame/includes/argus.h6
-rw-r--r--src/mame/includes/arkanoid.h4
-rw-r--r--src/mame/includes/armedf.h4
-rw-r--r--src/mame/includes/ashnojoe.h2
-rw-r--r--src/mame/includes/asterix.h2
-rw-r--r--src/mame/includes/astrocde.h4
-rw-r--r--src/mame/includes/asuka.h4
-rw-r--r--src/mame/includes/atari.h2
-rw-r--r--src/mame/includes/atarifb.h6
-rw-r--r--src/mame/includes/atarig1.h4
-rw-r--r--src/mame/includes/atarig42.h4
-rw-r--r--src/mame/includes/atarigt.h4
-rw-r--r--src/mame/includes/atarigx2.h4
-rw-r--r--src/mame/includes/atarisy1.h2
-rw-r--r--src/mame/includes/atarisy2.h2
-rw-r--r--src/mame/includes/atetris.h2
-rw-r--r--src/mame/includes/badlands.h2
-rw-r--r--src/mame/includes/bagman.h2
-rw-r--r--src/mame/includes/balsente.h2
-rw-r--r--src/mame/includes/bankp.h2
-rw-r--r--src/mame/includes/baraduke.h4
-rw-r--r--src/mame/includes/batman.h2
-rw-r--r--src/mame/includes/battlane.h2
-rw-r--r--src/mame/includes/battlera.h2
-rw-r--r--src/mame/includes/battlex.h2
-rw-r--r--src/mame/includes/battlnts.h2
-rw-r--r--src/mame/includes/bbusters.h4
-rw-r--r--src/mame/includes/beathead.h2
-rw-r--r--src/mame/includes/beezer.h2
-rw-r--r--src/mame/includes/bigevglf.h2
-rw-r--r--src/mame/includes/bigstrkb.h2
-rw-r--r--src/mame/includes/bionicc.h4
-rw-r--r--src/mame/includes/bishi.h2
-rw-r--r--src/mame/includes/bking.h4
-rw-r--r--src/mame/includes/bladestl.h2
-rw-r--r--src/mame/includes/blktiger.h4
-rw-r--r--src/mame/includes/blmbycar.h2
-rw-r--r--src/mame/includes/blockade.h2
-rw-r--r--src/mame/includes/blockhl.h2
-rw-r--r--src/mame/includes/blockout.h2
-rw-r--r--src/mame/includes/bloodbro.h6
-rw-r--r--src/mame/includes/blstroid.h2
-rw-r--r--src/mame/includes/blueprnt.h2
-rw-r--r--src/mame/includes/bogeyman.h2
-rw-r--r--src/mame/includes/bombjack.h2
-rw-r--r--src/mame/includes/boogwing.h2
-rw-r--r--src/mame/includes/bottom9.h2
-rw-r--r--src/mame/includes/brkthru.h2
-rw-r--r--src/mame/includes/bsktball.h2
-rw-r--r--src/mame/includes/btime.h14
-rw-r--r--src/mame/includes/bublbobl.h2
-rw-r--r--src/mame/includes/buggychl.h2
-rw-r--r--src/mame/includes/bwing.h2
-rw-r--r--src/mame/includes/cabal.h2
-rw-r--r--src/mame/includes/calomega.h2
-rw-r--r--src/mame/includes/canyon.h2
-rw-r--r--src/mame/includes/capbowl.h2
-rw-r--r--src/mame/includes/carjmbre.h2
-rw-r--r--src/mame/includes/carpolo.h4
-rw-r--r--src/mame/includes/cave.h2
-rw-r--r--src/mame/includes/cbasebal.h2
-rw-r--r--src/mame/includes/cbuster.h2
-rw-r--r--src/mame/includes/ccastles.h2
-rw-r--r--src/mame/includes/cclimber.h8
-rw-r--r--src/mame/includes/centiped.h8
-rw-r--r--src/mame/includes/chaknpop.h2
-rw-r--r--src/mame/includes/champbas.h4
-rw-r--r--src/mame/includes/changela.h2
-rw-r--r--src/mame/includes/cheekyms.h2
-rw-r--r--src/mame/includes/chqflag.h2
-rw-r--r--src/mame/includes/cidelsa.h2
-rw-r--r--src/mame/includes/cinemat.h4
-rw-r--r--src/mame/includes/circus.h8
-rw-r--r--src/mame/includes/circusc.h2
-rw-r--r--src/mame/includes/cischeat.h8
-rw-r--r--src/mame/includes/citycon.h2
-rw-r--r--src/mame/includes/cloak.h2
-rw-r--r--src/mame/includes/cloud9.h2
-rw-r--r--src/mame/includes/clshroad.h2
-rw-r--r--src/mame/includes/cninja.h10
-rw-r--r--src/mame/includes/combatsc.h4
-rw-r--r--src/mame/includes/commando.h4
-rw-r--r--src/mame/includes/compgolf.h2
-rw-r--r--src/mame/includes/contra.h2
-rw-r--r--src/mame/includes/cop01.h2
-rw-r--r--src/mame/includes/copsnrob.h2
-rw-r--r--src/mame/includes/cosmic.h12
-rw-r--r--src/mame/includes/cps1.h4
-rw-r--r--src/mame/includes/crbaloon.h2
-rw-r--r--src/mame/includes/crimfght.h2
-rw-r--r--src/mame/includes/crospang.h2
-rw-r--r--src/mame/includes/crshrace.h4
-rw-r--r--src/mame/includes/cvs.h4
-rw-r--r--src/mame/includes/cyberbal.h2
-rw-r--r--src/mame/includes/darius.h2
-rw-r--r--src/mame/includes/darkmist.h2
-rw-r--r--src/mame/includes/darkseal.h2
-rw-r--r--src/mame/includes/dassault.h2
-rw-r--r--src/mame/includes/dbz.h2
-rw-r--r--src/mame/includes/dc.h2
-rw-r--r--src/mame/includes/dcheese.h2
-rw-r--r--src/mame/includes/dcon.h4
-rw-r--r--src/mame/includes/dday.h2
-rw-r--r--src/mame/includes/ddragon.h2
-rw-r--r--src/mame/includes/ddragon3.h4
-rw-r--r--src/mame/includes/ddribble.h2
-rw-r--r--src/mame/includes/deadang.h2
-rw-r--r--src/mame/includes/dec0.h14
-rw-r--r--src/mame/includes/dec8.h16
-rw-r--r--src/mame/includes/deco32.h12
-rw-r--r--src/mame/includes/deco_mlc.h4
-rw-r--r--src/mame/includes/deniam.h2
-rw-r--r--src/mame/includes/dietgo.h2
-rw-r--r--src/mame/includes/djboy.h4
-rw-r--r--src/mame/includes/djmain.h2
-rw-r--r--src/mame/includes/dkong.h6
-rw-r--r--src/mame/includes/docastle.h2
-rw-r--r--src/mame/includes/dogfgt.h2
-rw-r--r--src/mame/includes/dooyong.h20
-rw-r--r--src/mame/includes/dragrace.h2
-rw-r--r--src/mame/includes/drgnmst.h2
-rw-r--r--src/mame/includes/dribling.h2
-rw-r--r--src/mame/includes/drmicro.h2
-rw-r--r--src/mame/includes/dynax.h14
-rw-r--r--src/mame/includes/dynduke.h4
-rw-r--r--src/mame/includes/eolith.h2
-rw-r--r--src/mame/includes/epos.h2
-rw-r--r--src/mame/includes/eprom.h4
-rw-r--r--src/mame/includes/equites.h4
-rw-r--r--src/mame/includes/esd16.h6
-rw-r--r--src/mame/includes/espial.h2
-rw-r--r--src/mame/includes/esripsys.h2
-rw-r--r--src/mame/includes/exedexes.h4
-rw-r--r--src/mame/includes/exerion.h2
-rw-r--r--src/mame/includes/exidy.h2
-rw-r--r--src/mame/includes/exprraid.h2
-rw-r--r--src/mame/includes/exzisus.h2
-rw-r--r--src/mame/includes/f1gp.h6
-rw-r--r--src/mame/includes/fantland.h2
-rw-r--r--src/mame/includes/fastfred.h4
-rw-r--r--src/mame/includes/fastlane.h2
-rw-r--r--src/mame/includes/fcombat.h2
-rw-r--r--src/mame/includes/fgoal.h2
-rw-r--r--src/mame/includes/finalizr.h2
-rw-r--r--src/mame/includes/firetrap.h2
-rw-r--r--src/mame/includes/firetrk.h6
-rw-r--r--src/mame/includes/fitfight.h2
-rw-r--r--src/mame/includes/flkatck.h2
-rw-r--r--src/mame/includes/flower.h2
-rw-r--r--src/mame/includes/flstory.h6
-rw-r--r--src/mame/includes/foodf.h2
-rw-r--r--src/mame/includes/freekick.h6
-rw-r--r--src/mame/includes/fromanc2.h2
-rw-r--r--src/mame/includes/fromance.h4
-rw-r--r--src/mame/includes/funkybee.h2
-rw-r--r--src/mame/includes/funkyjet.h2
-rw-r--r--src/mame/includes/funworld.h2
-rw-r--r--src/mame/includes/funybubl.h2
-rw-r--r--src/mame/includes/fuukifg2.h2
-rw-r--r--src/mame/includes/fuukifg3.h4
-rw-r--r--src/mame/includes/gaelco.h4
-rw-r--r--src/mame/includes/gaelco2.h6
-rw-r--r--src/mame/includes/gaelco3d.h2
-rw-r--r--src/mame/includes/gaiden.h6
-rw-r--r--src/mame/includes/galaga.h12
-rw-r--r--src/mame/includes/galastrm.h2
-rw-r--r--src/mame/includes/galaxian.h2
-rw-r--r--src/mame/includes/galaxold.h4
-rw-r--r--src/mame/includes/galivan.h4
-rw-r--r--src/mame/includes/galpanic.h4
-rw-r--r--src/mame/includes/galspnbl.h2
-rw-r--r--src/mame/includes/gaplus.h4
-rw-r--r--src/mame/includes/gatron.h2
-rw-r--r--src/mame/includes/gauntlet.h2
-rw-r--r--src/mame/includes/gberet.h4
-rw-r--r--src/mame/includes/gbusters.h2
-rw-r--r--src/mame/includes/gcpinbal.h2
-rw-r--r--src/mame/includes/gijoe.h2
-rw-r--r--src/mame/includes/ginganin.h2
-rw-r--r--src/mame/includes/gladiatr.h4
-rw-r--r--src/mame/includes/glass.h2
-rw-r--r--src/mame/includes/gng.h4
-rw-r--r--src/mame/includes/goal92.h4
-rw-r--r--src/mame/includes/goindol.h2
-rw-r--r--src/mame/includes/goldstar.h10
-rw-r--r--src/mame/includes/gomoku.h2
-rw-r--r--src/mame/includes/gotcha.h2
-rw-r--r--src/mame/includes/gottlieb.h2
-rw-r--r--src/mame/includes/gotya.h2
-rw-r--r--src/mame/includes/gradius3.h2
-rw-r--r--src/mame/includes/grchamp.h2
-rw-r--r--src/mame/includes/gridlee.h2
-rw-r--r--src/mame/includes/groundfx.h2
-rw-r--r--src/mame/includes/gstriker.h2
-rw-r--r--src/mame/includes/gsword.h2
-rw-r--r--src/mame/includes/gumbo.h2
-rw-r--r--src/mame/includes/gunbustr.h2
-rw-r--r--src/mame/includes/gundealr.h2
-rw-r--r--src/mame/includes/gunsmoke.h2
-rw-r--r--src/mame/includes/gyruss.h2
-rw-r--r--src/mame/includes/hanaawas.h2
-rw-r--r--src/mame/includes/hcastle.h2
-rw-r--r--src/mame/includes/hexion.h2
-rw-r--r--src/mame/includes/higemaru.h2
-rw-r--r--src/mame/includes/himesiki.h2
-rw-r--r--src/mame/includes/hnayayoi.h2
-rw-r--r--src/mame/includes/hng64.h2
-rw-r--r--src/mame/includes/holeland.h4
-rw-r--r--src/mame/includes/homedata.h10
-rw-r--r--src/mame/includes/homerun.h2
-rw-r--r--src/mame/includes/hyhoo.h2
-rw-r--r--src/mame/includes/hyperspt.h2
-rw-r--r--src/mame/includes/hyprduel.h2
-rw-r--r--src/mame/includes/ikki.h2
-rw-r--r--src/mame/includes/inufuku.h2
-rw-r--r--src/mame/includes/iqblock.h2
-rw-r--r--src/mame/includes/irobot.h2
-rw-r--r--src/mame/includes/ironhors.h4
-rw-r--r--src/mame/includes/itech32.h2
-rw-r--r--src/mame/includes/itech8.h10
-rw-r--r--src/mame/includes/jack.h4
-rw-r--r--src/mame/includes/jackal.h2
-rw-r--r--src/mame/includes/jaguar.h2
-rw-r--r--src/mame/includes/jailbrek.h2
-rw-r--r--src/mame/includes/kaneko16.h12
-rw-r--r--src/mame/includes/kangaroo.h2
-rw-r--r--src/mame/includes/karnov.h2
-rw-r--r--src/mame/includes/kchamp.h4
-rw-r--r--src/mame/includes/kickgoal.h4
-rw-r--r--src/mame/includes/kingobox.h4
-rw-r--r--src/mame/includes/klax.h2
-rw-r--r--src/mame/includes/kncljoe.h2
-rw-r--r--src/mame/includes/konamigx.h2
-rw-r--r--src/mame/includes/kopunch.h2
-rw-r--r--src/mame/includes/ksayakyu.h2
-rw-r--r--src/mame/includes/kyugo.h2
-rw-r--r--src/mame/includes/labyrunr.h2
-rw-r--r--src/mame/includes/ladybug.h10
-rw-r--r--src/mame/includes/ladyfrog.h2
-rw-r--r--src/mame/includes/lasso.h8
-rw-r--r--src/mame/includes/lastduel.h6
-rw-r--r--src/mame/includes/lazercmd.h2
-rw-r--r--src/mame/includes/legionna.h6
-rw-r--r--src/mame/includes/lemmings.h4
-rw-r--r--src/mame/includes/lethal.h2
-rw-r--r--src/mame/includes/liberate.h8
-rw-r--r--src/mame/includes/liberatr.h2
-rw-r--r--src/mame/includes/lkage.h2
-rw-r--r--src/mame/includes/lockon.h4
-rw-r--r--src/mame/includes/lordgun.h2
-rw-r--r--src/mame/includes/lsasquad.h4
-rw-r--r--src/mame/includes/lucky74.h2
-rw-r--r--src/mame/includes/lvcards.h2
-rw-r--r--src/mame/includes/lwings.h6
-rw-r--r--src/mame/includes/m10.h4
-rw-r--r--src/mame/includes/m107.h2
-rw-r--r--src/mame/includes/m52.h2
-rw-r--r--src/mame/includes/m57.h2
-rw-r--r--src/mame/includes/m58.h2
-rw-r--r--src/mame/includes/m62.h22
-rw-r--r--src/mame/includes/m72.h4
-rw-r--r--src/mame/includes/m90.h6
-rw-r--r--src/mame/includes/m92.h2
-rw-r--r--src/mame/includes/macrossp.h4
-rw-r--r--src/mame/includes/madmotor.h2
-rw-r--r--src/mame/includes/magmax.h2
-rw-r--r--src/mame/includes/mainevt.h4
-rw-r--r--src/mame/includes/mainsnk.h2
-rw-r--r--src/mame/includes/malzak.h2
-rw-r--r--src/mame/includes/mappy.h6
-rw-r--r--src/mame/includes/marineb.h10
-rw-r--r--src/mame/includes/mario.h2
-rw-r--r--src/mame/includes/markham.h2
-rw-r--r--src/mame/includes/matmania.h4
-rw-r--r--src/mame/includes/mcatadv.h4
-rw-r--r--src/mame/includes/mcr.h6
-rw-r--r--src/mame/includes/mcr68.h4
-rw-r--r--src/mame/includes/meadows.h2
-rw-r--r--src/mame/includes/megadriv.h4
-rw-r--r--src/mame/includes/megasys1.h4
-rw-r--r--src/mame/includes/megazone.h2
-rw-r--r--src/mame/includes/mermaid.h4
-rw-r--r--src/mame/includes/metlclsh.h2
-rw-r--r--src/mame/includes/metro.h2
-rw-r--r--src/mame/includes/mexico86.h4
-rw-r--r--src/mame/includes/midvunit.h2
-rw-r--r--src/mame/includes/midzeus.h4
-rw-r--r--src/mame/includes/mikie.h2
-rw-r--r--src/mame/includes/mitchell.h2
-rw-r--r--src/mame/includes/mjkjidai.h2
-rw-r--r--src/mame/includes/model1.h4
-rw-r--r--src/mame/includes/model2.h2
-rw-r--r--src/mame/includes/model3.h2
-rw-r--r--src/mame/includes/momoko.h2
-rw-r--r--src/mame/includes/moo.h2
-rw-r--r--src/mame/includes/mosaic.h2
-rw-r--r--src/mame/includes/mouser.h2
-rw-r--r--src/mame/includes/mrdo.h2
-rw-r--r--src/mame/includes/mrflea.h2
-rw-r--r--src/mame/includes/mrjong.h2
-rw-r--r--src/mame/includes/ms32.h2
-rw-r--r--src/mame/includes/msisaac.h2
-rw-r--r--src/mame/includes/mugsmash.h2
-rw-r--r--src/mame/includes/munchmo.h2
-rw-r--r--src/mame/includes/mustache.h2
-rw-r--r--src/mame/includes/mw8080bw.h32
-rw-r--r--src/mame/includes/mystwarr.h8
-rw-r--r--src/mame/includes/n64.h2
-rw-r--r--src/mame/includes/n8080.h8
-rw-r--r--src/mame/includes/namcofl.h2
-rw-r--r--src/mame/includes/namcona1.h2
-rw-r--r--src/mame/includes/namconb1.h4
-rw-r--r--src/mame/includes/namcos1.h4
-rw-r--r--src/mame/includes/namcos2.h10
-rw-r--r--src/mame/includes/namcos21.h2
-rw-r--r--src/mame/includes/namcos22.h4
-rw-r--r--src/mame/includes/namcos86.h4
-rw-r--r--src/mame/includes/naughtyb.h2
-rw-r--r--src/mame/includes/nbmj8688.h5
-rw-r--r--src/mame/includes/nbmj8891.h2
-rw-r--r--src/mame/includes/nbmj8900.h2
-rw-r--r--src/mame/includes/nbmj8991.h4
-rw-r--r--src/mame/includes/nbmj9195.h2
-rw-r--r--src/mame/includes/nemesis.h2
-rw-r--r--src/mame/includes/neogeo.h2
-rw-r--r--src/mame/includes/news.h2
-rw-r--r--src/mame/includes/ninjakd2.h8
-rw-r--r--src/mame/includes/ninjaw.h2
-rw-r--r--src/mame/includes/nitedrvr.h2
-rw-r--r--src/mame/includes/niyanpai.h2
-rw-r--r--src/mame/includes/nmk16.h32
-rw-r--r--src/mame/includes/nova2001.h8
-rw-r--r--src/mame/includes/nycaptor.h2
-rw-r--r--src/mame/includes/offtwall.h2
-rw-r--r--src/mame/includes/ohmygod.h2
-rw-r--r--src/mame/includes/ojankohs.h4
-rw-r--r--src/mame/includes/oneshot.h4
-rw-r--r--src/mame/includes/opwolf.h2
-rw-r--r--src/mame/includes/orbit.h2
-rw-r--r--src/mame/includes/othldrby.h4
-rw-r--r--src/mame/includes/othunder.h2
-rw-r--r--src/mame/includes/overdriv.h2
-rw-r--r--src/mame/includes/pacland.h2
-rw-r--r--src/mame/includes/pacman.h4
-rw-r--r--src/mame/includes/pandoras.h2
-rw-r--r--src/mame/includes/paradise.h6
-rw-r--r--src/mame/includes/parodius.h2
-rw-r--r--src/mame/includes/pass.h2
-rw-r--r--src/mame/includes/pastelg.h2
-rw-r--r--src/mame/includes/pbaction.h2
-rw-r--r--src/mame/includes/pcktgal.h2
-rw-r--r--src/mame/includes/pgm.h4
-rw-r--r--src/mame/includes/phoenix.h2
-rw-r--r--src/mame/includes/pingpong.h2
-rw-r--r--src/mame/includes/pirates.h2
-rw-r--r--src/mame/includes/pitnrun.h2
-rw-r--r--src/mame/includes/pktgaldx.h4
-rw-r--r--src/mame/includes/playch10.h2
-rw-r--r--src/mame/includes/playmark.h8
-rw-r--r--src/mame/includes/plygonet.h2
-rw-r--r--src/mame/includes/pokechmp.h2
-rw-r--r--src/mame/includes/polepos.h2
-rw-r--r--src/mame/includes/policetr.h2
-rw-r--r--src/mame/includes/polyplay.h2
-rw-r--r--src/mame/includes/poolshrk.h2
-rw-r--r--src/mame/includes/pooyan.h2
-rw-r--r--src/mame/includes/popeye.h2
-rw-r--r--src/mame/includes/popper.h2
-rw-r--r--src/mame/includes/portrait.h2
-rw-r--r--src/mame/includes/powerins.h2
-rw-r--r--src/mame/includes/prehisle.h2
-rw-r--r--src/mame/includes/psikyo.h6
-rw-r--r--src/mame/includes/psikyo4.h2
-rw-r--r--src/mame/includes/psikyosh.h4
-rw-r--r--src/mame/includes/psx.h2
-rw-r--r--src/mame/includes/psychic5.h4
-rw-r--r--src/mame/includes/punchout.h4
-rw-r--r--src/mame/includes/pushman.h2
-rw-r--r--src/mame/includes/qdrmfgp.h2
-rw-r--r--src/mame/includes/quizdna.h2
-rw-r--r--src/mame/includes/quizpani.h2
-rw-r--r--src/mame/includes/raiden.h2
-rw-r--r--src/mame/includes/rainbow.h4
-rw-r--r--src/mame/includes/rallyx.h6
-rw-r--r--src/mame/includes/rampart.h2
-rw-r--r--src/mame/includes/rastan.h2
-rw-r--r--src/mame/includes/realbrk.h4
-rw-r--r--src/mame/includes/relief.h2
-rw-r--r--src/mame/includes/renegade.h2
-rw-r--r--src/mame/includes/retofinv.h2
-rw-r--r--src/mame/includes/rockrage.h2
-rw-r--r--src/mame/includes/rocnrope.h2
-rw-r--r--src/mame/includes/rohga.h8
-rw-r--r--src/mame/includes/rollerg.h2
-rw-r--r--src/mame/includes/rollrace.h2
-rw-r--r--src/mame/includes/route16.h6
-rw-r--r--src/mame/includes/rpunch.h2
-rw-r--r--src/mame/includes/runaway.h4
-rw-r--r--src/mame/includes/rungun.h2
-rw-r--r--src/mame/includes/sauro.h4
-rw-r--r--src/mame/includes/sbasketb.h2
-rw-r--r--src/mame/includes/sbugger.h2
-rw-r--r--src/mame/includes/scotrsht.h2
-rw-r--r--src/mame/includes/sderby.h4
-rw-r--r--src/mame/includes/segag80r.h2
-rw-r--r--src/mame/includes/segag80v.h2
-rw-r--r--src/mame/includes/segamsys.h16
-rw-r--r--src/mame/includes/segas16.h16
-rw-r--r--src/mame/includes/segas24.h2
-rw-r--r--src/mame/includes/segas32.h4
-rw-r--r--src/mame/includes/sei_crtc.h2
-rw-r--r--src/mame/includes/seibuspi.h4
-rw-r--r--src/mame/includes/seicross.h2
-rw-r--r--src/mame/includes/senjyo.h2
-rw-r--r--src/mame/includes/seta.h8
-rw-r--r--src/mame/includes/seta2.h4
-rw-r--r--src/mame/includes/sf.h2
-rw-r--r--src/mame/includes/shadfrce.h4
-rw-r--r--src/mame/includes/shangha3.h2
-rw-r--r--src/mame/includes/shangkid.h4
-rw-r--r--src/mame/includes/shaolins.h2
-rw-r--r--src/mame/includes/shisen.h2
-rw-r--r--src/mame/includes/shootout.h4
-rw-r--r--src/mame/includes/shuuz.h2
-rw-r--r--src/mame/includes/sidearms.h4
-rw-r--r--src/mame/includes/sidepckt.h2
-rw-r--r--src/mame/includes/silkroad.h2
-rw-r--r--src/mame/includes/simpl156.h2
-rw-r--r--src/mame/includes/simpsons.h2
-rw-r--r--src/mame/includes/skullxbo.h2
-rw-r--r--src/mame/includes/skydiver.h2
-rw-r--r--src/mame/includes/skyfox.h2
-rw-r--r--src/mame/includes/skykid.h2
-rw-r--r--src/mame/includes/skyraid.h2
-rw-r--r--src/mame/includes/slapfght.h4
-rw-r--r--src/mame/includes/slapshot.h4
-rw-r--r--src/mame/includes/snes.h2
-rw-r--r--src/mame/includes/snk.h10
-rw-r--r--src/mame/includes/snk6502.h2
-rw-r--r--src/mame/includes/snk68.h2
-rw-r--r--src/mame/includes/snookr10.h2
-rw-r--r--src/mame/includes/solomon.h2
-rw-r--r--src/mame/includes/sonson.h2
-rw-r--r--src/mame/includes/spacefb.h2
-rw-r--r--src/mame/includes/spbactn.h2
-rw-r--r--src/mame/includes/spcforce.h2
-rw-r--r--src/mame/includes/spdodgeb.h2
-rw-r--r--src/mame/includes/speedatk.h2
-rw-r--r--src/mame/includes/speedbal.h2
-rw-r--r--src/mame/includes/speedspn.h2
-rw-r--r--src/mame/includes/splash.h4
-rw-r--r--src/mame/includes/sprcros2.h2
-rw-r--r--src/mame/includes/sprint2.h4
-rw-r--r--src/mame/includes/sprint4.h4
-rw-r--r--src/mame/includes/sprint8.h4
-rw-r--r--src/mame/includes/spy.h2
-rw-r--r--src/mame/includes/srmp2.h6
-rw-r--r--src/mame/includes/srumbler.h4
-rw-r--r--src/mame/includes/sshangha.h2
-rw-r--r--src/mame/includes/sslam.h4
-rw-r--r--src/mame/includes/ssozumo.h2
-rw-r--r--src/mame/includes/sspeedr.h4
-rw-r--r--src/mame/includes/ssrj.h2
-rw-r--r--src/mame/includes/ssv.h6
-rw-r--r--src/mame/includes/st0016.h2
-rw-r--r--src/mame/includes/stadhero.h2
-rw-r--r--src/mame/includes/starcrus.h2
-rw-r--r--src/mame/includes/starfire.h2
-rw-r--r--src/mame/includes/starshp1.h4
-rw-r--r--src/mame/includes/stfight.h2
-rw-r--r--src/mame/includes/stlforce.h2
-rw-r--r--src/mame/includes/strnskil.h2
-rw-r--r--src/mame/includes/stv.h2
-rw-r--r--src/mame/includes/subs.h2
-rw-r--r--src/mame/includes/suna16.h4
-rw-r--r--src/mame/includes/suna8.h2
-rw-r--r--src/mame/includes/supbtime.h2
-rw-r--r--src/mame/includes/superchs.h2
-rw-r--r--src/mame/includes/superqix.h4
-rw-r--r--src/mame/includes/suprloco.h2
-rw-r--r--src/mame/includes/suprnova.h4
-rw-r--r--src/mame/includes/suprridr.h2
-rw-r--r--src/mame/includes/suprslam.h2
-rw-r--r--src/mame/includes/surpratk.h2
-rw-r--r--src/mame/includes/system1.h6
-rw-r--r--src/mame/includes/system16.h8
-rw-r--r--src/mame/includes/tagteam.h2
-rw-r--r--src/mame/includes/tail2nos.h2
-rw-r--r--src/mame/includes/taito_b.h4
-rw-r--r--src/mame/includes/taito_f2.h28
-rw-r--r--src/mame/includes/taito_f3.h4
-rw-r--r--src/mame/includes/taito_h.h6
-rw-r--r--src/mame/includes/taito_l.h4
-rw-r--r--src/mame/includes/taito_o.h2
-rw-r--r--src/mame/includes/taito_z.h14
-rw-r--r--src/mame/includes/taitoair.h2
-rw-r--r--src/mame/includes/taitojc.h2
-rw-r--r--src/mame/includes/taitosj.h4
-rw-r--r--src/mame/includes/tank8.h4
-rw-r--r--src/mame/includes/tankbatt.h2
-rw-r--r--src/mame/includes/tankbust.h2
-rw-r--r--src/mame/includes/taotaido.h4
-rw-r--r--src/mame/includes/targeth.h2
-rw-r--r--src/mame/includes/tatsumi.h8
-rw-r--r--src/mame/includes/taxidrvr.h2
-rw-r--r--src/mame/includes/tbowl.h2
-rw-r--r--src/mame/includes/tceptor.h4
-rw-r--r--src/mame/includes/tecmo.h2
-rw-r--r--src/mame/includes/tecmo16.h2
-rw-r--r--src/mame/includes/tehkanwc.h2
-rw-r--r--src/mame/includes/terracre.h2
-rw-r--r--src/mame/includes/tetrisp2.h6
-rw-r--r--src/mame/includes/thedeep.h2
-rw-r--r--src/mame/includes/thepit.h2
-rw-r--r--src/mame/includes/thief.h2
-rw-r--r--src/mame/includes/thoop2.h2
-rw-r--r--src/mame/includes/thunderj.h2
-rw-r--r--src/mame/includes/thunderx.h2
-rw-r--r--src/mame/includes/tiamc1.h2
-rw-r--r--src/mame/includes/tigeroad.h4
-rw-r--r--src/mame/includes/timelimt.h2
-rw-r--r--src/mame/includes/timeplt.h2
-rw-r--r--src/mame/includes/tmnt.h16
-rw-r--r--src/mame/includes/tnzs.h4
-rw-r--r--src/mame/includes/toaplan1.h10
-rw-r--r--src/mame/includes/toaplan2.h12
-rw-r--r--src/mame/includes/toki.h8
-rw-r--r--src/mame/includes/toobin.h2
-rw-r--r--src/mame/includes/topspeed.h2
-rw-r--r--src/mame/includes/toypop.h2
-rw-r--r--src/mame/includes/tp84.h2
-rw-r--r--src/mame/includes/trackfld.h2
-rw-r--r--src/mame/includes/travrusa.h2
-rw-r--r--src/mame/includes/triplhnt.h2
-rw-r--r--src/mame/includes/truco.h2
-rw-r--r--src/mame/includes/trucocl.h2
-rw-r--r--src/mame/includes/tryout.h2
-rw-r--r--src/mame/includes/tsamurai.h4
-rw-r--r--src/mame/includes/tubep.h4
-rw-r--r--src/mame/includes/tumbleb.h22
-rw-r--r--src/mame/includes/tumblep.h2
-rw-r--r--src/mame/includes/tunhunt.h2
-rw-r--r--src/mame/includes/turbo.h6
-rw-r--r--src/mame/includes/tutankhm.h2
-rw-r--r--src/mame/includes/twin16.h4
-rw-r--r--src/mame/includes/twincobr.h4
-rw-r--r--src/mame/includes/tx1.h10
-rw-r--r--src/mame/includes/ultraman.h2
-rw-r--r--src/mame/includes/ultratnk.h4
-rw-r--r--src/mame/includes/undrfire.h4
-rw-r--r--src/mame/includes/unico.h4
-rw-r--r--src/mame/includes/usgames.h2
-rw-r--r--src/mame/includes/vaportra.h2
-rw-r--r--src/mame/includes/vastar.h2
-rw-r--r--src/mame/includes/vball.h2
-rw-r--r--src/mame/includes/vendetta.h2
-rw-r--r--src/mame/includes/vicdual.h6
-rw-r--r--src/mame/includes/victory.h2
-rw-r--r--src/mame/includes/videopin.h2
-rw-r--r--src/mame/includes/vigilant.h4
-rw-r--r--src/mame/includes/vindictr.h2
-rw-r--r--src/mame/includes/volfied.h2
-rw-r--r--src/mame/includes/vsnes.h4
-rw-r--r--src/mame/includes/vulgus.h2
-rw-r--r--src/mame/includes/warpwarp.h2
-rw-r--r--src/mame/includes/warriorb.h2
-rw-r--r--src/mame/includes/wc90.h2
-rw-r--r--src/mame/includes/wc90b.h2
-rw-r--r--src/mame/includes/wecleman.h4
-rw-r--r--src/mame/includes/welltris.h2
-rw-r--r--src/mame/includes/wgp.h2
-rw-r--r--src/mame/includes/williams.h6
-rw-r--r--src/mame/includes/wiping.h2
-rw-r--r--src/mame/includes/wiz.h6
-rw-r--r--src/mame/includes/wolfpack.h4
-rw-r--r--src/mame/includes/wrally.h2
-rw-r--r--src/mame/includes/wwfsstar.h2
-rw-r--r--src/mame/includes/wwfwfest.h2
-rw-r--r--src/mame/includes/xain.h2
-rw-r--r--src/mame/includes/xexex.h2
-rw-r--r--src/mame/includes/xmen.h6
-rw-r--r--src/mame/includes/xorworld.h2
-rw-r--r--src/mame/includes/xxmissio.h2
-rw-r--r--src/mame/includes/xybots.h2
-rw-r--r--src/mame/includes/xyonix.h2
-rw-r--r--src/mame/includes/yiear.h2
-rw-r--r--src/mame/includes/yunsun16.h2
-rw-r--r--src/mame/includes/yunsung8.h2
-rw-r--r--src/mame/includes/zac2650.h2
-rw-r--r--src/mame/includes/zaccaria.h2
-rw-r--r--src/mame/includes/zaxxon.h8
-rw-r--r--src/mame/includes/zerozone.h2
-rw-r--r--src/mame/includes/zodiack.h2
615 files changed, 1059 insertions, 1058 deletions
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h
index 55279b4f8f3..8a7b8cc4ba4 100644
--- a/src/mame/includes/1942.h
+++ b/src/mame/includes/1942.h
@@ -37,4 +37,4 @@ extern WRITE8_HANDLER( c1942_palette_bank_w );
extern PALETTE_INIT( 1942 );
extern VIDEO_START( 1942 );
-extern VIDEO_UPDATE( 1942 );
+extern SCREEN_UPDATE( 1942 );
diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h
index babed5918b5..3d676288426 100644
--- a/src/mame/includes/1943.h
+++ b/src/mame/includes/1943.h
@@ -35,4 +35,4 @@ extern WRITE8_HANDLER( c1943_colorram_w );
extern PALETTE_INIT( 1943 );
extern VIDEO_START( 1943 );
-extern VIDEO_UPDATE( 1943 );
+extern SCREEN_UPDATE( 1943 );
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index 97d4e9229c4..52f1a48af57 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -57,5 +57,5 @@ READ8_HANDLER( fortyl_pixram_r );
WRITE8_HANDLER( fortyl_pixram_w );
VIDEO_START( fortyl );
-VIDEO_UPDATE( fortyl );
+SCREEN_UPDATE( fortyl );
PALETTE_INIT( fortyl );
diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h
index 8298f063305..88dba59ac13 100644
--- a/src/mame/includes/4enraya.h
+++ b/src/mame/includes/4enraya.h
@@ -28,4 +28,4 @@ public:
WRITE8_HANDLER( fenraya_videoram_w );
VIDEO_START( 4enraya );
-VIDEO_UPDATE( 4enraya );
+SCREEN_UPDATE( 4enraya );
diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h
index d5193904698..76c9319bc7e 100644
--- a/src/mame/includes/88games.h
+++ b/src/mame/includes/88games.h
@@ -40,4 +40,4 @@ void _88games_sprite_callback(running_machine *machine, int *code, int *color, i
void _88games_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority);
void _88games_zoom_callback(running_machine *machine, int *code, int *color, int *flags);
-VIDEO_UPDATE( 88games );
+SCREEN_UPDATE( 88games );
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index 9406e7bd3d1..386304a58ac 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -44,5 +44,5 @@ WRITE8_HANDLER( actfancr_pf2_control_w );
VIDEO_START( actfancr );
VIDEO_START( triothep );
-VIDEO_UPDATE( actfancr );
-VIDEO_UPDATE( triothep );
+SCREEN_UPDATE( actfancr );
+SCREEN_UPDATE( triothep );
diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h
index a9a02ebe522..8754aecdf69 100644
--- a/src/mame/includes/aeroboto.h
+++ b/src/mame/includes/aeroboto.h
@@ -41,7 +41,7 @@ public:
/*----------- defined in video/aeroboto.c -----------*/
VIDEO_START( aeroboto );
-VIDEO_UPDATE( aeroboto );
+SCREEN_UPDATE( aeroboto );
READ8_HANDLER( aeroboto_in0_r );
WRITE8_HANDLER( aeroboto_3000_w );
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index 4b4c5802921..39487f932fc 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -60,13 +60,13 @@ VIDEO_START( karatblz );
VIDEO_START( spinlbrk );
VIDEO_START( turbofrc );
VIDEO_START( wbbc97 );
-VIDEO_UPDATE( pspikes );
-VIDEO_UPDATE( pspikesb );
-VIDEO_UPDATE( spikes91 );
-VIDEO_UPDATE( karatblz );
-VIDEO_UPDATE( spinlbrk );
-VIDEO_UPDATE( turbofrc );
-VIDEO_UPDATE( aerofgt );
-VIDEO_UPDATE( aerfboot );
-VIDEO_UPDATE( aerfboo2 );
-VIDEO_UPDATE( wbbc97 );
+SCREEN_UPDATE( pspikes );
+SCREEN_UPDATE( pspikesb );
+SCREEN_UPDATE( spikes91 );
+SCREEN_UPDATE( karatblz );
+SCREEN_UPDATE( spinlbrk );
+SCREEN_UPDATE( turbofrc );
+SCREEN_UPDATE( aerofgt );
+SCREEN_UPDATE( aerfboot );
+SCREEN_UPDATE( aerfboo2 );
+SCREEN_UPDATE( wbbc97 );
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index 77bbc04713c..6e385fc0cf9 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -45,5 +45,5 @@ WRITE8_HANDLER( airbustr_colorram2_w );
WRITE8_HANDLER( airbustr_scrollregs_w );
VIDEO_START( airbustr );
-VIDEO_UPDATE( airbustr );
-VIDEO_EOF( airbustr );
+SCREEN_UPDATE( airbustr );
+SCREEN_EOF( airbustr );
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index 310aeefb207..030c78e1fd9 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -39,7 +39,7 @@ INTERRUPT_GEN( ajax_interrupt );
/*----------- defined in video/ajax.c -----------*/
VIDEO_START( ajax );
-VIDEO_UPDATE( ajax );
+SCREEN_UPDATE( ajax );
extern void ajax_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority);
extern void ajax_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow);
diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h
index cacd11d8095..c80f333512e 100644
--- a/src/mame/includes/aliens.h
+++ b/src/mame/includes/aliens.h
@@ -34,4 +34,4 @@ extern void aliens_tile_callback(running_machine *machine, int layer,int bank,in
extern void aliens_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow);
VIDEO_START( aliens );
-VIDEO_UPDATE( aliens );
+SCREEN_UPDATE( aliens );
diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h
index a0c2e47171c..6ec8e3f5536 100644
--- a/src/mame/includes/alpha68k.h
+++ b/src/mame/includes/alpha68k.h
@@ -51,12 +51,12 @@ PALETTE_INIT( paddlem );
VIDEO_START( alpha68k );
-VIDEO_UPDATE( kyros );
-VIDEO_UPDATE( sstingry );
-VIDEO_UPDATE( alpha68k_I );
-VIDEO_UPDATE( alpha68k_II );
-VIDEO_UPDATE( alpha68k_V );
-VIDEO_UPDATE( alpha68k_V_sb );
+SCREEN_UPDATE( kyros );
+SCREEN_UPDATE( sstingry );
+SCREEN_UPDATE( alpha68k_I );
+SCREEN_UPDATE( alpha68k_II );
+SCREEN_UPDATE( alpha68k_V );
+SCREEN_UPDATE( alpha68k_V_sb );
void alpha68k_V_video_bank_w(running_machine *machine, int bank);
void alpha68k_flipscreen_w(running_machine *machine, int flip);
diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h
index 73d06abb092..b268b8c5dd3 100644
--- a/src/mame/includes/ambush.h
+++ b/src/mame/includes/ambush.h
@@ -25,4 +25,4 @@ public:
/*----------- defined in video/ambush.c -----------*/
PALETTE_INIT( ambush );
-VIDEO_UPDATE( ambush );
+SCREEN_UPDATE( ambush );
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index e2ae8c574fc..30aeb363bb4 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -477,7 +477,7 @@ extern const UINT16 amiga_expand_byte[256];
PALETTE_INIT( amiga );
VIDEO_START( amiga );
-VIDEO_UPDATE( amiga );
+SCREEN_UPDATE( amiga );
void amiga_copper_setpc(running_machine *machine, UINT32 pc);
int amiga_copper_execute_next(running_machine *machine, int xpos);
@@ -491,7 +491,7 @@ void amiga_sprite_enable_comparitor(running_machine *machine, int which, int ena
/*----------- defined in video/amigaaga.c -----------*/
VIDEO_START( amiga_aga );
-VIDEO_UPDATE( amiga_aga );
+SCREEN_UPDATE( amiga_aga );
void amiga_aga_render_scanline(running_machine *machine, bitmap_t *bitmap, int scanline);
void amiga_aga_palette_write(running_machine *machine, int color_reg, UINT16 data);
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index e7b68e65c3d..2789c6d3b5c 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -14,4 +14,4 @@ WRITE8_HANDLER( ampoker2_videoram_w );
PALETTE_INIT( ampoker2 );
VIDEO_START( ampoker2 );
VIDEO_START( sigma2k );
-VIDEO_UPDATE( ampoker2 );
+SCREEN_UPDATE( ampoker2 );
diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h
index f296db2294b..416e24e2a01 100644
--- a/src/mame/includes/amspdwy.h
+++ b/src/mame/includes/amspdwy.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( amspdwy_paletteram_w );
WRITE8_HANDLER( amspdwy_flipscreen_w );
VIDEO_START( amspdwy );
-VIDEO_UPDATE( amspdwy );
+SCREEN_UPDATE( amspdwy );
diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h
index 50300a963db..291711325f1 100644
--- a/src/mame/includes/angelkds.h
+++ b/src/mame/includes/angelkds.h
@@ -47,4 +47,4 @@ WRITE8_HANDLER( angelkds_paletteram_w );
WRITE8_HANDLER( angelkds_layer_ctrl_write );
VIDEO_START( angelkds );
-VIDEO_UPDATE( angelkds );
+SCREEN_UPDATE( angelkds );
diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h
index 5db69c9517f..717d6a54abc 100644
--- a/src/mame/includes/appoooh.h
+++ b/src/mame/includes/appoooh.h
@@ -42,5 +42,5 @@ PALETTE_INIT( robowres );
WRITE8_HANDLER( appoooh_scroll_w );
WRITE8_HANDLER( appoooh_out_w );
VIDEO_START( appoooh );
-VIDEO_UPDATE( appoooh );
-VIDEO_UPDATE( robowres );
+SCREEN_UPDATE( appoooh );
+SCREEN_UPDATE( robowres );
diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h
index 5ef1be2d572..a8a66090dbf 100644
--- a/src/mame/includes/aquarium.h
+++ b/src/mame/includes/aquarium.h
@@ -34,4 +34,4 @@ WRITE16_HANDLER( aquarium_mid_videoram_w );
WRITE16_HANDLER( aquarium_bak_videoram_w );
VIDEO_START(aquarium);
-VIDEO_UPDATE(aquarium);
+SCREEN_UPDATE(aquarium);
diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h
index fb26633ffec..8bdb6dd7bee 100644
--- a/src/mame/includes/arabian.h
+++ b/src/mame/includes/arabian.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( arabian_videoram_w );
PALETTE_INIT( arabian );
VIDEO_START( arabian );
-VIDEO_UPDATE( arabian );
+SCREEN_UPDATE( arabian );
diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h
index ff452304e47..d025fe556d7 100644
--- a/src/mame/includes/arcadecl.h
+++ b/src/mame/includes/arcadecl.h
@@ -8,4 +8,4 @@
/*----------- defined in video/arcadecl.c -----------*/
VIDEO_START( arcadecl );
-VIDEO_UPDATE( arcadecl );
+SCREEN_UPDATE( arcadecl );
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index 1413dd2cd0c..cceac00151f 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -106,7 +106,7 @@ extern UINT8 vidc_interlace;
/*----------- defined in video/archimds.c -----------*/
extern VIDEO_START( archimds_vidc );
-extern VIDEO_UPDATE( archimds_vidc );
+extern SCREEN_UPDATE( archimds_vidc );
#define VIDC_HCR 0x80
#define VIDC_HSWR 0x84
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index af4fd3fc6dc..82920fb0754 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -44,9 +44,9 @@ VIDEO_START( butasan );
VIDEO_RESET( argus );
VIDEO_RESET( valtric );
VIDEO_RESET( butasan );
-VIDEO_UPDATE( argus );
-VIDEO_UPDATE( valtric );
-VIDEO_UPDATE( butasan );
+SCREEN_UPDATE( argus );
+SCREEN_UPDATE( valtric );
+SCREEN_UPDATE( butasan );
READ8_HANDLER( argus_txram_r );
READ8_HANDLER( argus_bg1ram_r );
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index 7c7a3fa3485..9604773d9a3 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -51,8 +51,8 @@ extern WRITE8_HANDLER( tetrsark_d008_w );
extern WRITE8_HANDLER( hexa_d008_w );
extern VIDEO_START( arkanoid );
-extern VIDEO_UPDATE( arkanoid );
-extern VIDEO_UPDATE( hexa );
+extern SCREEN_UPDATE( arkanoid );
+extern SCREEN_UPDATE( hexa );
/*----------- defined in machine/arkanoid.c -----------*/
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index c59604182ac..637c27d1771 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -30,8 +30,8 @@ public:
/*----------- defined in video/armedf.c -----------*/
-VIDEO_UPDATE( armedf );
-VIDEO_EOF( armedf );
+SCREEN_UPDATE( armedf );
+SCREEN_EOF( armedf );
VIDEO_START( armedf );
WRITE16_HANDLER( armedf_bg_videoram_w );
diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h
index f992bc5b327..56e506154df 100644
--- a/src/mame/includes/ashnojoe.h
+++ b/src/mame/includes/ashnojoe.h
@@ -48,4 +48,4 @@ WRITE16_HANDLER( joe_tilemaps_xscroll_w );
WRITE16_HANDLER( joe_tilemaps_yscroll_w );
VIDEO_START( ashnojoe );
-VIDEO_UPDATE( ashnojoe );
+SCREEN_UPDATE( ashnojoe );
diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h
index 62d1becb025..1ed7bc09f90 100644
--- a/src/mame/includes/asterix.h
+++ b/src/mame/includes/asterix.h
@@ -37,7 +37,7 @@ public:
/*----------- defined in video/asterix.c -----------*/
-VIDEO_UPDATE( asterix );
+SCREEN_UPDATE( asterix );
WRITE16_HANDLER( asterix_spritebank_w );
extern void asterix_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index 8c4c407aca5..65dc218384b 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -32,8 +32,8 @@ PALETTE_INIT( profpac );
VIDEO_START( astrocde );
VIDEO_START( profpac );
-VIDEO_UPDATE( astrocde );
-VIDEO_UPDATE( profpac );
+SCREEN_UPDATE( astrocde );
+SCREEN_UPDATE( profpac );
WRITE8_HANDLER( astrocade_pattern_board_w );
READ8_HANDLER( astrocade_data_chip_register_r );
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index 49cdb16ee6d..3bfd6ce38f5 100644
--- a/src/mame/includes/asuka.h
+++ b/src/mame/includes/asuka.h
@@ -51,5 +51,5 @@ WRITE16_HANDLER( bonzeadv_cchip_ram_w );
WRITE16_HANDLER( asuka_spritectrl_w );
-VIDEO_UPDATE( asuka );
-VIDEO_UPDATE( bonzeadv );
+SCREEN_UPDATE( asuka );
+SCREEN_UPDATE( bonzeadv );
diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h
index 7a4fd1adda0..b1a19e3311d 100644
--- a/src/mame/includes/atari.h
+++ b/src/mame/includes/atari.h
@@ -586,7 +586,7 @@ extern char atari_frame_message[64+1];
extern int atari_frame_counter;
extern VIDEO_START( atari );
-extern VIDEO_UPDATE( atari );
+extern SCREEN_UPDATE( atari );
INTERRUPT_GEN( a400_interrupt );
INTERRUPT_GEN( a800_interrupt );
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index 0d5d30c01bb..ef51f518a49 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -76,9 +76,9 @@ DISCRETE_SOUND_EXTERN( abaseb );
/*----------- defined in video/atarifb.c -----------*/
VIDEO_START( atarifb );
-VIDEO_UPDATE( atarifb );
-VIDEO_UPDATE( abaseb );
-VIDEO_UPDATE( soccer );
+SCREEN_UPDATE( atarifb );
+SCREEN_UPDATE( abaseb );
+SCREEN_UPDATE( soccer );
WRITE8_HANDLER( atarifb_alpha1_videoram_w );
WRITE8_HANDLER( atarifb_alpha2_videoram_w );
diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h
index 631e2752da4..62864db3a66 100644
--- a/src/mame/includes/atarig1.h
+++ b/src/mame/includes/atarig1.h
@@ -37,7 +37,7 @@ public:
WRITE16_HANDLER( atarig1_mo_control_w );
VIDEO_START( atarig1 );
-VIDEO_EOF( atarig1 );
-VIDEO_UPDATE( atarig1 );
+SCREEN_EOF( atarig1 );
+SCREEN_UPDATE( atarig1 );
void atarig1_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h
index e0613aeacb2..3b960528d91 100644
--- a/src/mame/includes/atarig42.h
+++ b/src/mame/includes/atarig42.h
@@ -36,8 +36,8 @@ public:
/*----------- defined in video/atarig42.c -----------*/
VIDEO_START( atarig42 );
-VIDEO_EOF( atarig42 );
-VIDEO_UPDATE( atarig42 );
+SCREEN_EOF( atarig42 );
+SCREEN_UPDATE( atarig42 );
WRITE16_HANDLER( atarig42_mo_control_w );
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index aa3351d0556..5904651bcef 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -55,7 +55,7 @@ void atarigt_colorram_w(atarigt_state *state, offs_t address, UINT16 data, UINT1
UINT16 atarigt_colorram_r(atarigt_state *state, offs_t address);
VIDEO_START( atarigt );
-VIDEO_EOF( atarigt );
-VIDEO_UPDATE( atarigt );
+SCREEN_EOF( atarigt );
+SCREEN_UPDATE( atarigt );
void atarigt_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h
index 5e6080c5581..165d72b307c 100644
--- a/src/mame/includes/atarigx2.h
+++ b/src/mame/includes/atarigx2.h
@@ -33,8 +33,8 @@ public:
/*----------- defined in video/atarigx2.c -----------*/
VIDEO_START( atarigx2 );
-VIDEO_EOF( atarigx2 );
-VIDEO_UPDATE( atarigx2 );
+SCREEN_EOF( atarigx2 );
+SCREEN_UPDATE( atarigx2 );
WRITE16_HANDLER( atarigx2_mo_control_w );
diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h
index a69b99e1874..f115ae307b5 100644
--- a/src/mame/includes/atarisy1.h
+++ b/src/mame/includes/atarisy1.h
@@ -60,4 +60,4 @@ WRITE16_HANDLER( atarisy1_yscroll_w );
WRITE16_HANDLER( atarisy1_priority_w );
VIDEO_START( atarisy1 );
-VIDEO_UPDATE( atarisy1 );
+SCREEN_UPDATE( atarisy1 );
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index 16f4f11284f..79e1f991dae 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -60,4 +60,4 @@ WRITE16_HANDLER( atarisy2_videoram_w );
WRITE16_HANDLER( atarisy2_paletteram_w );
VIDEO_START( atarisy2 );
-VIDEO_UPDATE( atarisy2 );
+SCREEN_UPDATE( atarisy2 );
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index 0b5eac7ac6b..f0c43b0c90c 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -24,6 +24,6 @@ public:
/*----------- defined in video/atetris.c -----------*/
VIDEO_START( atetris );
-VIDEO_UPDATE( atetris );
+SCREEN_UPDATE( atetris );
WRITE8_HANDLER( atetris_videoram_w );
diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h
index c311f70cc61..f05ee5ebfdd 100644
--- a/src/mame/includes/badlands.h
+++ b/src/mame/includes/badlands.h
@@ -26,4 +26,4 @@ public:
WRITE16_HANDLER( badlands_pf_bank_w );
VIDEO_START( badlands );
-VIDEO_UPDATE( badlands );
+SCREEN_UPDATE( badlands );
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index a3d6c1a1591..ccb9f07531a 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( bagman_flipscreen_w );
PALETTE_INIT( bagman );
VIDEO_START( bagman );
-VIDEO_UPDATE( bagman );
+SCREEN_UPDATE( bagman );
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index e245cdcae0b..8adbf6f41e7 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -181,7 +181,7 @@ WRITE16_HANDLER( shrike_io_68k_w );
/*----------- defined in video/balsente.c -----------*/
VIDEO_START( balsente );
-VIDEO_UPDATE( balsente );
+SCREEN_UPDATE( balsente );
WRITE8_HANDLER( balsente_videoram_w );
WRITE8_HANDLER( balsente_paletteram_w );
diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h
index 0f948917d73..6f2317fe80d 100644
--- a/src/mame/includes/bankp.h
+++ b/src/mame/includes/bankp.h
@@ -38,6 +38,6 @@ WRITE8_HANDLER( bankp_out_w );
PALETTE_INIT( bankp );
VIDEO_START( bankp );
-VIDEO_UPDATE( bankp );
+SCREEN_UPDATE( bankp );
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index f3f05d0bf1d..6380ec875f9 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -20,8 +20,8 @@ public:
/*----------- defined in video/baraduke.c -----------*/
VIDEO_START( baraduke );
-VIDEO_UPDATE( baraduke );
-VIDEO_EOF( baraduke );
+SCREEN_UPDATE( baraduke );
+SCREEN_EOF( baraduke );
READ8_HANDLER( baraduke_videoram_r );
WRITE8_HANDLER( baraduke_videoram_w );
READ8_HANDLER( baraduke_textram_r );
diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h
index 8760463dba9..46e21818d6b 100644
--- a/src/mame/includes/batman.h
+++ b/src/mame/includes/batman.h
@@ -21,6 +21,6 @@ public:
/*----------- defined in video/batman.c -----------*/
VIDEO_START( batman );
-VIDEO_UPDATE( batman );
+SCREEN_UPDATE( batman );
void batman_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h
index aa06b5393a2..58f6577c340 100644
--- a/src/mame/includes/battlane.h
+++ b/src/mame/includes/battlane.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( battlane_bitmap_w );
WRITE8_HANDLER( battlane_video_ctrl_w );
VIDEO_START( battlane );
-VIDEO_UPDATE( battlane );
+SCREEN_UPDATE( battlane );
diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h
index 4414c0e8bcf..fed506e2724 100644
--- a/src/mame/includes/battlera.h
+++ b/src/mame/includes/battlera.h
@@ -28,7 +28,7 @@ public:
/*----------- defined in video/battlera.c -----------*/
-VIDEO_UPDATE( battlera );
+SCREEN_UPDATE( battlera );
VIDEO_START( battlera );
INTERRUPT_GEN( battlera_interrupt );
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index 1b8b8d4044a..814f73c3ea6 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -30,4 +30,4 @@ extern WRITE8_HANDLER( battlex_flipscreen_w );
extern PALETTE_INIT( battlex );
extern VIDEO_START( battlex );
-extern VIDEO_UPDATE( battlex );
+extern SCREEN_UPDATE( battlex );
diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h
index 12c097f75fb..89363784421 100644
--- a/src/mame/includes/battlnts.h
+++ b/src/mame/includes/battlnts.h
@@ -28,7 +28,7 @@ public:
WRITE8_HANDLER( battlnts_spritebank_w );
-VIDEO_UPDATE( battlnts );
+SCREEN_UPDATE( battlnts );
void battlnts_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags);
void battlnts_sprite_callback(running_machine *machine, int *code, int *color);
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index 1da6442732b..9c57e09edee 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -28,8 +28,8 @@ public:
VIDEO_START( bbuster );
VIDEO_START( mechatt );
-VIDEO_UPDATE( bbuster );
-VIDEO_UPDATE( mechatt );
+SCREEN_UPDATE( bbuster );
+SCREEN_UPDATE( mechatt );
WRITE16_HANDLER( bbusters_pf1_w );
WRITE16_HANDLER( bbusters_pf2_w );
diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h
index 7219134f704..68a361ae82b 100644
--- a/src/mame/includes/beathead.h
+++ b/src/mame/includes/beathead.h
@@ -20,7 +20,7 @@ public:
virtual void machine_reset();
virtual void video_start();
- virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
+ virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
required_device<asap_device> m_maincpu;
diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h
index 6eb7669c97f..b7802157d59 100644
--- a/src/mame/includes/beezer.h
+++ b/src/mame/includes/beezer.h
@@ -34,6 +34,6 @@ READ8_DEVICE_HANDLER( beezer_noise_r );
/*----------- defined in video/beezer.c -----------*/
INTERRUPT_GEN( beezer_interrupt );
-VIDEO_UPDATE( beezer );
+SCREEN_UPDATE( beezer );
WRITE8_HANDLER( beezer_map_w );
READ8_HANDLER( beezer_line_r );
diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h
index fc6cc41b8d9..e9a357c7b0f 100644
--- a/src/mame/includes/bigevglf.h
+++ b/src/mame/includes/bigevglf.h
@@ -60,7 +60,7 @@ READ8_HANDLER( bigevglf_mcu_status_r );
/*----------- defined in video/bigevglf.c -----------*/
VIDEO_START( bigevglf );
-VIDEO_UPDATE( bigevglf );
+SCREEN_UPDATE( bigevglf );
READ8_HANDLER( bigevglf_vidram_r );
WRITE8_HANDLER( bigevglf_vidram_w );
diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h
index 3a0fe14f328..76ea70e7aa8 100644
--- a/src/mame/includes/bigstrkb.h
+++ b/src/mame/includes/bigstrkb.h
@@ -24,4 +24,4 @@ WRITE16_HANDLER( bsb_videoram_w );
WRITE16_HANDLER( bsb_videoram2_w );
WRITE16_HANDLER( bsb_videoram3_w );
VIDEO_START(bigstrkb);
-VIDEO_UPDATE(bigstrkb);
+SCREEN_UPDATE(bigstrkb);
diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h
index 88ccb28fc36..4cc5847f689 100644
--- a/src/mame/includes/bionicc.h
+++ b/src/mame/includes/bionicc.h
@@ -36,5 +36,5 @@ WRITE16_HANDLER( bionicc_scroll_w );
WRITE16_HANDLER( bionicc_gfxctrl_w );
VIDEO_START( bionicc );
-VIDEO_UPDATE( bionicc );
-VIDEO_EOF( bionicc );
+SCREEN_UPDATE( bionicc );
+SCREEN_EOF( bionicc );
diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h
index c103aaa13ca..612d1b22054 100644
--- a/src/mame/includes/bishi.h
+++ b/src/mame/includes/bishi.h
@@ -37,4 +37,4 @@ public:
extern void bishi_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
VIDEO_START(bishi);
-VIDEO_UPDATE(bishi);
+SCREEN_UPDATE(bishi);
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index 497a6c4caba..048118ed250 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -60,5 +60,5 @@ READ8_HANDLER( bking_pos_r );
PALETTE_INIT( bking );
VIDEO_START( bking );
-VIDEO_UPDATE( bking );
-VIDEO_EOF( bking );
+SCREEN_UPDATE( bking );
+SCREEN_EOF( bking );
diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h
index 8011e018531..af7936c39df 100644
--- a/src/mame/includes/bladestl.h
+++ b/src/mame/includes/bladestl.h
@@ -32,7 +32,7 @@ public:
PALETTE_INIT( bladestl );
-VIDEO_UPDATE( bladestl );
+SCREEN_UPDATE( bladestl );
void bladestl_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags);
void bladestl_sprite_callback(running_machine *machine, int *code, int *color);
diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h
index 2c938c3d9ce..1067502399d 100644
--- a/src/mame/includes/blktiger.h
+++ b/src/mame/includes/blktiger.h
@@ -48,5 +48,5 @@ WRITE8_HANDLER( blktiger_scrollx_w );
WRITE8_HANDLER( blktiger_scrolly_w );
VIDEO_START( blktiger );
-VIDEO_UPDATE( blktiger );
-VIDEO_EOF( blktiger );
+SCREEN_UPDATE( blktiger );
+SCREEN_EOF( blktiger );
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index 492c157a620..fdc255011db 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -37,4 +37,4 @@ WRITE16_HANDLER( blmbycar_vram_0_w );
WRITE16_HANDLER( blmbycar_vram_1_w );
VIDEO_START( blmbycar );
-VIDEO_UPDATE( blmbycar );
+SCREEN_UPDATE( blmbycar );
diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h
index fbfe05e7130..27efebdf803 100644
--- a/src/mame/includes/blockade.h
+++ b/src/mame/includes/blockade.h
@@ -23,7 +23,7 @@ public:
WRITE8_HANDLER( blockade_videoram_w );
VIDEO_START( blockade );
-VIDEO_UPDATE( blockade );
+SCREEN_UPDATE( blockade );
/*----------- defined in audio/blockade.c -----------*/
diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h
index 16526853ce3..187eb346b29 100644
--- a/src/mame/includes/blockhl.h
+++ b/src/mame/includes/blockhl.h
@@ -34,4 +34,4 @@ extern void blockhl_tile_callback(running_machine *machine, int layer,int bank,i
extern void blockhl_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow);
VIDEO_START( blockhl );
-VIDEO_UPDATE( blockhl );
+SCREEN_UPDATE( blockhl );
diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h
index 8fc6beda47b..f52394ed9e0 100644
--- a/src/mame/includes/blockout.h
+++ b/src/mame/includes/blockout.h
@@ -31,4 +31,4 @@ WRITE16_HANDLER( blockout_paletteram_w );
WRITE16_HANDLER( blockout_frontcolor_w );
VIDEO_START( blockout );
-VIDEO_UPDATE( blockout );
+SCREEN_UPDATE( blockout );
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index 5ce3578d71b..5cb9ced9113 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -8,7 +8,7 @@ WRITE16_HANDLER( bloodbro_bgvideoram_w );
WRITE16_HANDLER( bloodbro_fgvideoram_w );
WRITE16_HANDLER( bloodbro_txvideoram_w );
-VIDEO_UPDATE( bloodbro );
-VIDEO_UPDATE( weststry );
-VIDEO_UPDATE( skysmash );
+SCREEN_UPDATE( bloodbro );
+SCREEN_UPDATE( weststry );
+SCREEN_UPDATE( skysmash );
VIDEO_START( bloodbro );
diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h
index 4afce0645d4..170ae8f1957 100644
--- a/src/mame/includes/blstroid.h
+++ b/src/mame/includes/blstroid.h
@@ -19,6 +19,6 @@ public:
/*----------- defined in video/blstroid.c -----------*/
VIDEO_START( blstroid );
-VIDEO_UPDATE( blstroid );
+SCREEN_UPDATE( blstroid );
void blstroid_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index ff6c7cefe74..9bad50241ac 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( blueprnt_flipscreen_w );
PALETTE_INIT( blueprnt );
VIDEO_START( blueprnt );
-VIDEO_UPDATE( blueprnt );
+SCREEN_UPDATE( blueprnt );
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index cfdb22a75d1..a3d6bdf6d34 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -39,4 +39,4 @@ WRITE8_HANDLER( bogeyman_paletteram_w );
PALETTE_INIT( bogeyman );
VIDEO_START( bogeyman );
-VIDEO_UPDATE( bogeyman );
+SCREEN_UPDATE( bogeyman );
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index 1a30181daf1..e783c93ca3b 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -34,4 +34,4 @@ WRITE8_HANDLER( bombjack_background_w );
WRITE8_HANDLER( bombjack_flipscreen_w );
VIDEO_START( bombjack );
-VIDEO_UPDATE( bombjack );
+SCREEN_UPDATE( bombjack );
diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h
index db4766fec06..9fdf5ec4d70 100644
--- a/src/mame/includes/boogwing.h
+++ b/src/mame/includes/boogwing.h
@@ -35,5 +35,5 @@ public:
/*----------- defined in video/boogwing.c -----------*/
-VIDEO_UPDATE( boogwing );
+SCREEN_UPDATE( boogwing );
diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h
index 022784aa16c..e6b3220cd86 100644
--- a/src/mame/includes/bottom9.h
+++ b/src/mame/includes/bottom9.h
@@ -38,4 +38,4 @@ extern void bottom9_sprite_callback(running_machine *machine, int *code,int *col
extern void bottom9_zoom_callback(running_machine *machine, int *code,int *color,int *flags);
VIDEO_START( bottom9 );
-VIDEO_UPDATE( bottom9 );
+SCREEN_UPDATE( bottom9 );
diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h
index 5083928f0ab..811d53245ac 100644
--- a/src/mame/includes/brkthru.h
+++ b/src/mame/includes/brkthru.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( brkthru_bgram_w );
WRITE8_HANDLER( brkthru_fgram_w );
VIDEO_START( brkthru );
PALETTE_INIT( brkthru );
-VIDEO_UPDATE( brkthru );
+SCREEN_UPDATE( brkthru );
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index a2646dba2ee..7206911e6f0 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -60,6 +60,6 @@ DISCRETE_SOUND_EXTERN( bsktball );
/*----------- defined in video/bsktball.c -----------*/
VIDEO_START( bsktball );
-VIDEO_UPDATE( bsktball );
+SCREEN_UPDATE( bsktball );
WRITE8_HANDLER( bsktball_videoram_w );
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index 7f20d7e05ef..72d4692c8f1 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -59,13 +59,13 @@ PALETTE_INIT( lnc );
VIDEO_START( btime );
VIDEO_START( bnj );
-VIDEO_UPDATE( btime );
-VIDEO_UPDATE( cookrace );
-VIDEO_UPDATE( bnj );
-VIDEO_UPDATE( lnc );
-VIDEO_UPDATE( zoar );
-VIDEO_UPDATE( disco );
-VIDEO_UPDATE( eggs );
+SCREEN_UPDATE( btime );
+SCREEN_UPDATE( cookrace );
+SCREEN_UPDATE( bnj );
+SCREEN_UPDATE( lnc );
+SCREEN_UPDATE( zoar );
+SCREEN_UPDATE( disco );
+SCREEN_UPDATE( eggs );
WRITE8_HANDLER( btime_paletteram_w );
WRITE8_HANDLER( bnj_background_w );
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index e2c4287616d..a0ea7ef17f7 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -94,4 +94,4 @@ WRITE8_HANDLER( bublbobl_68705_ddr_b_w );
/*----------- defined in video/bublbobl.c -----------*/
-VIDEO_UPDATE( bublbobl );
+SCREEN_UPDATE( bublbobl );
diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h
index 324b3faa04d..adef26d4310 100644
--- a/src/mame/includes/buggychl.h
+++ b/src/mame/includes/buggychl.h
@@ -41,4 +41,4 @@ WRITE8_HANDLER( buggychl_bg_scrollx_w );
PALETTE_INIT( buggychl );
VIDEO_START( buggychl );
-VIDEO_UPDATE( buggychl );
+SCREEN_UPDATE( buggychl );
diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h
index 9955055b1cb..e80b3b3c72d 100644
--- a/src/mame/includes/bwing.h
+++ b/src/mame/includes/bwing.h
@@ -55,4 +55,4 @@ WRITE8_HANDLER( bwing_scrollram_w );
READ8_HANDLER( bwing_scrollram_r );
VIDEO_START( bwing );
-VIDEO_UPDATE( bwing );
+SCREEN_UPDATE( bwing );
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index 59b43da5040..d5b9b47e263 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -19,7 +19,7 @@ public:
/*----------- defined in video/cabal.c -----------*/
extern VIDEO_START( cabal );
-extern VIDEO_UPDATE( cabal );
+extern SCREEN_UPDATE( cabal );
WRITE16_HANDLER( cabal_flipscreen_w );
WRITE16_HANDLER( cabal_background_videoram16_w );
WRITE16_HANDLER( cabal_text_videoram16_w );
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index 7744fbcc998..cb3e6e4be42 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -6,4 +6,4 @@ WRITE8_HANDLER( calomega_videoram_w );
WRITE8_HANDLER( calomega_colorram_w );
PALETTE_INIT( calomega );
VIDEO_START( calomega );
-VIDEO_UPDATE( calomega );
+SCREEN_UPDATE( calomega );
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index 2b92e8ecef1..1c38ba15065 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -44,6 +44,6 @@ DISCRETE_SOUND_EXTERN( canyon );
/*----------- defined in video/canyon.c -----------*/
VIDEO_START( canyon );
-VIDEO_UPDATE( canyon );
+SCREEN_UPDATE( canyon );
WRITE8_HANDLER( canyon_videoram_w );
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 18c17004b70..1a91d679438 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -31,7 +31,7 @@ public:
/*----------- defined in video/capbowl.c -----------*/
VIDEO_START( capbowl );
-VIDEO_UPDATE( capbowl );
+SCREEN_UPDATE( capbowl );
WRITE8_HANDLER( bowlrama_blitter_w );
READ8_HANDLER( bowlrama_blitter_r );
diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h
index 835ad0dba56..fb088a5227c 100644
--- a/src/mame/includes/carjmbre.h
+++ b/src/mame/includes/carjmbre.h
@@ -31,6 +31,6 @@ WRITE8_HANDLER( carjmbre_videoram_w );
PALETTE_INIT( carjmbre );
VIDEO_START( carjmbre );
-VIDEO_UPDATE( carjmbre );
+SCREEN_UPDATE( carjmbre );
diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h
index 6e309025f26..6f0210a8576 100644
--- a/src/mame/includes/carpolo.h
+++ b/src/mame/includes/carpolo.h
@@ -92,5 +92,5 @@ void carpolo_generate_car_border_interrupt(running_machine *machine, int car, in
PALETTE_INIT( carpolo );
VIDEO_START( carpolo );
-VIDEO_UPDATE( carpolo );
-VIDEO_EOF( carpolo );
+SCREEN_UPDATE( carpolo );
+SCREEN_EOF( carpolo );
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index c39b75a59a0..1ba96eff55a 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -142,7 +142,7 @@ VIDEO_START( cave_4_layers );
VIDEO_START( sailormn_3_layers );
-VIDEO_UPDATE( cave );
+SCREEN_UPDATE( cave );
void cave_get_sprite_info(running_machine *machine);
void sailormn_tilebank_w(running_machine *machine, int bank);
diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h
index 3b4c430cb19..a717f2679c4 100644
--- a/src/mame/includes/cbasebal.h
+++ b/src/mame/includes/cbasebal.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( cbasebal_scrollx_w );
WRITE8_HANDLER( cbasebal_scrolly_w );
VIDEO_START( cbasebal );
-VIDEO_UPDATE( cbasebal );
+SCREEN_UPDATE( cbasebal );
diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h
index 6086a0e2974..18b8419c487 100644
--- a/src/mame/includes/cbuster.h
+++ b/src/mame/includes/cbuster.h
@@ -34,4 +34,4 @@ public:
WRITE16_HANDLER( twocrude_palette_24bit_rg_w );
WRITE16_HANDLER( twocrude_palette_24bit_b_w );
-VIDEO_UPDATE( twocrude );
+SCREEN_UPDATE( twocrude );
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index 5d8ee1284e7..7c5793ad5a9 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -49,7 +49,7 @@ public:
VIDEO_START( ccastles );
-VIDEO_UPDATE( ccastles );
+SCREEN_UPDATE( ccastles );
WRITE8_HANDLER( ccastles_hscroll_w );
WRITE8_HANDLER( ccastles_vscroll_w );
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 51bd738caaa..310ddc2229b 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -35,18 +35,18 @@ WRITE8_HANDLER( cannonb_flip_screen_w );
PALETTE_INIT( cclimber );
VIDEO_START( cclimber );
-VIDEO_UPDATE( cclimber );
+SCREEN_UPDATE( cclimber );
PALETTE_INIT( swimmer );
VIDEO_START( swimmer );
-VIDEO_UPDATE( swimmer );
+SCREEN_UPDATE( swimmer );
PALETTE_INIT( yamato );
-VIDEO_UPDATE( yamato );
+SCREEN_UPDATE( yamato );
PALETTE_INIT( toprollr );
VIDEO_START( toprollr );
-VIDEO_UPDATE( toprollr );
+SCREEN_UPDATE( toprollr );
/*----------- defined in audio/cclimber.c -----------*/
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index 4b797367b0f..3bad0b8e8c3 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -33,10 +33,10 @@ VIDEO_START( milliped );
VIDEO_START( warlords );
VIDEO_START( bullsdrt );
-VIDEO_UPDATE( centiped );
-VIDEO_UPDATE( milliped );
-VIDEO_UPDATE( warlords );
-VIDEO_UPDATE( bullsdrt );
+SCREEN_UPDATE( centiped );
+SCREEN_UPDATE( milliped );
+SCREEN_UPDATE( warlords );
+SCREEN_UPDATE( bullsdrt );
WRITE8_HANDLER( centiped_paletteram_w );
WRITE8_HANDLER( milliped_paletteram_w );
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index 7167293d4ca..cd691011a2a 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -45,7 +45,7 @@ WRITE8_HANDLER( chaknpop_mcu_port_c_w );
PALETTE_INIT( chaknpop );
VIDEO_START( chaknpop );
-VIDEO_UPDATE( chaknpop );
+SCREEN_UPDATE( chaknpop );
READ8_HANDLER( chaknpop_gfxmode_r );
WRITE8_HANDLER( chaknpop_gfxmode_w );
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index e6e62aba70f..cf94641642d 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -46,7 +46,7 @@ PALETTE_INIT( champbas );
PALETTE_INIT( exctsccr );
VIDEO_START( champbas );
VIDEO_START( exctsccr );
-VIDEO_UPDATE( champbas );
-VIDEO_UPDATE( exctsccr );
+SCREEN_UPDATE( champbas );
+SCREEN_UPDATE( exctsccr );
diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h
index afdf17d012b..d33050c7639 100644
--- a/src/mame/includes/changela.h
+++ b/src/mame/includes/changela.h
@@ -52,7 +52,7 @@ public:
/*----------- defined in video/changela.c -----------*/
VIDEO_START( changela );
-VIDEO_UPDATE( changela );
+SCREEN_UPDATE( changela );
WRITE8_HANDLER( changela_colors_w );
WRITE8_HANDLER( changela_mem_device_select_w );
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index 81d47f8f09e..bacbf946e63 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -30,6 +30,6 @@ public:
PALETTE_INIT( cheekyms );
VIDEO_START( cheekyms );
-VIDEO_UPDATE( cheekyms );
+SCREEN_UPDATE( cheekyms );
WRITE8_HANDLER( cheekyms_port_40_w );
WRITE8_HANDLER( cheekyms_port_80_w );
diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h
index 8aad90d545f..b3eb0c789ad 100644
--- a/src/mame/includes/chqflag.h
+++ b/src/mame/includes/chqflag.h
@@ -40,4 +40,4 @@ extern void chqflag_zoom_callback_0(running_machine *machine, int *code,int *col
extern void chqflag_zoom_callback_1(running_machine *machine, int *code,int *color,int *flags);
VIDEO_START( chqflag );
-VIDEO_UPDATE( chqflag );
+SCREEN_UPDATE( chqflag );
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index 616b4a05d9d..768b769ee53 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -43,7 +43,7 @@ public:
virtual void machine_reset();
virtual void video_start();
- bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { m_vis->update_screen(&bitmap, &cliprect); return false; }
+ virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect) { m_vis->update_screen(&bitmap, &cliprect); return false; }
DECLARE_READ8_MEMBER( draco_sound_in_r );
DECLARE_READ8_MEMBER( draco_sound_ay8910_r );
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index 3f5e8eda533..726c246fca6 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -76,6 +76,6 @@ VIDEO_START( cinemat_16level );
VIDEO_START( cinemat_64level );
VIDEO_START( cinemat_color );
VIDEO_START( cinemat_qb3color );
-VIDEO_UPDATE( cinemat );
+SCREEN_UPDATE( cinemat );
-VIDEO_UPDATE( spacewar );
+SCREEN_UPDATE( spacewar );
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index ba0ccebc60b..96703f38dc6 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -44,7 +44,7 @@ extern WRITE8_HANDLER( circus_clown_y_w );
extern WRITE8_HANDLER( circus_videoram_w );
extern VIDEO_START( circus );
-extern VIDEO_UPDATE( crash );
-extern VIDEO_UPDATE( circus );
-extern VIDEO_UPDATE( robotbwl );
-extern VIDEO_UPDATE( ripcord );
+extern SCREEN_UPDATE( crash );
+extern SCREEN_UPDATE( circus );
+extern SCREEN_UPDATE( robotbwl );
+extern SCREEN_UPDATE( ripcord );
diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h
index 4dbe5a5206e..d0f242b014c 100644
--- a/src/mame/includes/circusc.h
+++ b/src/mame/includes/circusc.h
@@ -42,4 +42,4 @@ WRITE8_HANDLER( circusc_colorram_w );
VIDEO_START( circusc );
WRITE8_HANDLER( circusc_flipscreen_w );
PALETTE_INIT( circusc );
-VIDEO_UPDATE( circusc );
+SCREEN_UPDATE( circusc );
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index da66ed117c0..e83cd42c2af 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -49,7 +49,7 @@ VIDEO_START( bigrun );
VIDEO_START( cischeat );
VIDEO_START( f1gpstar );
-VIDEO_UPDATE( bigrun );
-VIDEO_UPDATE( cischeat );
-VIDEO_UPDATE( f1gpstar );
-VIDEO_UPDATE( scudhamm );
+SCREEN_UPDATE( bigrun );
+SCREEN_UPDATE( cischeat );
+SCREEN_UPDATE( f1gpstar );
+SCREEN_UPDATE( scudhamm );
diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h
index 7de461ee5c2..05bf5a04591 100644
--- a/src/mame/includes/citycon.h
+++ b/src/mame/includes/citycon.h
@@ -33,5 +33,5 @@ WRITE8_HANDLER( citycon_videoram_w );
WRITE8_HANDLER( citycon_linecolor_w );
WRITE8_HANDLER( citycon_background_w );
-VIDEO_UPDATE( citycon );
+SCREEN_UPDATE( citycon );
VIDEO_START( citycon );
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index 76e35f76a17..07ee2de2e65 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -36,4 +36,4 @@ WRITE8_HANDLER( graph_processor_w );
WRITE8_HANDLER( cloak_clearbmp_w );
VIDEO_START( cloak );
-VIDEO_UPDATE( cloak );
+SCREEN_UPDATE( cloak );
diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h
index 353a727a86e..575bc15314e 100644
--- a/src/mame/includes/cloud9.h
+++ b/src/mame/includes/cloud9.h
@@ -44,7 +44,7 @@ public:
/*----------- defined in video/cloud9.c -----------*/
VIDEO_START( cloud9 );
-VIDEO_UPDATE( cloud9 );
+SCREEN_UPDATE( cloud9 );
WRITE8_HANDLER( cloud9_video_control_w );
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index 42d0d6c18e8..9b14062d209 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -11,4 +11,4 @@ PALETTE_INIT( firebatl );
PALETTE_INIT( clshroad );
VIDEO_START( firebatl );
VIDEO_START( clshroad );
-VIDEO_UPDATE( clshroad );
+SCREEN_UPDATE( clshroad );
diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h
index 7c80cb24179..13d54a68cdd 100644
--- a/src/mame/includes/cninja.h
+++ b/src/mame/includes/cninja.h
@@ -40,8 +40,8 @@ public:
VIDEO_START( stoneage );
-VIDEO_UPDATE( cninja );
-VIDEO_UPDATE( cninjabl );
-VIDEO_UPDATE( edrandy );
-VIDEO_UPDATE( robocop2 );
-VIDEO_UPDATE( mutantf );
+SCREEN_UPDATE( cninja );
+SCREEN_UPDATE( cninjabl );
+SCREEN_UPDATE( edrandy );
+SCREEN_UPDATE( robocop2 );
+SCREEN_UPDATE( mutantf );
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index e0ed1070111..e394276885a 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -55,5 +55,5 @@ PALETTE_INIT( combatsc );
PALETTE_INIT( combatscb );
VIDEO_START( combatsc );
VIDEO_START( combatscb );
-VIDEO_UPDATE( combatscb );
-VIDEO_UPDATE( combatsc );
+SCREEN_UPDATE( combatscb );
+SCREEN_UPDATE( combatsc );
diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h
index b3e19ff4b63..d838090fdd3 100644
--- a/src/mame/includes/commando.h
+++ b/src/mame/includes/commando.h
@@ -39,5 +39,5 @@ WRITE8_HANDLER( commando_scrolly_w );
WRITE8_HANDLER( commando_c804_w );
VIDEO_START( commando );
-VIDEO_UPDATE( commando );
-VIDEO_EOF( commando );
+SCREEN_UPDATE( commando );
+SCREEN_EOF( commando );
diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h
index 8341b5e0d6f..159612cd721 100644
--- a/src/mame/includes/compgolf.h
+++ b/src/mame/includes/compgolf.h
@@ -31,4 +31,4 @@ WRITE8_HANDLER( compgolf_video_w );
WRITE8_HANDLER( compgolf_back_w );
PALETTE_INIT ( compgolf );
VIDEO_START ( compgolf );
-VIDEO_UPDATE ( compgolf );
+SCREEN_UPDATE( compgolf );
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index bca9b339c3d..3b00a0127fd 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -47,5 +47,5 @@ WRITE8_HANDLER( contra_text_cram_w );
WRITE8_HANDLER( contra_K007121_ctrl_0_w );
WRITE8_HANDLER( contra_K007121_ctrl_1_w );
-VIDEO_UPDATE( contra );
+SCREEN_UPDATE( contra );
VIDEO_START( contra );
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index 489a088db00..c69b984dc2a 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -35,7 +35,7 @@ public:
PALETTE_INIT( cop01 );
VIDEO_START( cop01 );
-VIDEO_UPDATE( cop01 );
+SCREEN_UPDATE( cop01 );
WRITE8_HANDLER( cop01_background_w );
WRITE8_HANDLER( cop01_foreground_w );
diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h
index 965fb899cbe..cf7f86d8a4e 100644
--- a/src/mame/includes/copsnrob.h
+++ b/src/mame/includes/copsnrob.h
@@ -35,7 +35,7 @@ READ8_HANDLER( copsnrob_gun_position_r );
/*----------- defined in video/copsnrob.c -----------*/
-VIDEO_UPDATE( copsnrob );
+SCREEN_UPDATE( copsnrob );
/*----------- defined in audio/copsnrob.c -----------*/
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index 92cd77a80e6..07fc35f5851 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -50,9 +50,9 @@ PALETTE_INIT( cosmicg );
PALETTE_INIT( magspot );
PALETTE_INIT( nomnlnd );
-VIDEO_UPDATE( panic );
-VIDEO_UPDATE( magspot );
-VIDEO_UPDATE( devzone );
-VIDEO_UPDATE( cosmica );
-VIDEO_UPDATE( cosmicg );
-VIDEO_UPDATE( nomnlnd );
+SCREEN_UPDATE( panic );
+SCREEN_UPDATE( magspot );
+SCREEN_UPDATE( devzone );
+SCREEN_UPDATE( cosmica );
+SCREEN_UPDATE( cosmicg );
+SCREEN_UPDATE( nomnlnd );
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index a459e8659c4..834e43573cd 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -167,8 +167,8 @@ WRITE16_HANDLER( cps2_objram2_w );
VIDEO_START( cps1 );
VIDEO_START( cps2 );
-VIDEO_UPDATE( cps1 );
-VIDEO_EOF( cps1 );
+SCREEN_UPDATE( cps1 );
+SCREEN_EOF( cps1 );
void cps1_get_video_base(running_machine *machine);
void cps2_set_sprite_priorities(running_machine *machine);
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index 85e8f9b2aaa..a1c4bbebdf9 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -40,7 +40,7 @@ MACHINE_CONFIG_EXTERN( crbaloon_audio );
PALETTE_INIT( crbaloon );
VIDEO_START( crbaloon );
-VIDEO_UPDATE( crbaloon );
+SCREEN_UPDATE( crbaloon );
WRITE8_HANDLER( crbaloon_videoram_w );
WRITE8_HANDLER( crbaloon_colorram_w );
diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h
index 50be912ef51..d7e5504977c 100644
--- a/src/mame/includes/crimfght.h
+++ b/src/mame/includes/crimfght.h
@@ -30,4 +30,4 @@ extern void crimfght_tile_callback(running_machine *machine, int layer,int bank,
extern void crimfght_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow);
VIDEO_START( crimfght );
-VIDEO_UPDATE( crimfght );
+SCREEN_UPDATE( crimfght );
diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h
index 25b1b19c320..8ca23316c13 100644
--- a/src/mame/includes/crospang.h
+++ b/src/mame/includes/crospang.h
@@ -30,7 +30,7 @@ public:
/*----------- defined in video/crospang.c -----------*/
VIDEO_START( crospang );
-VIDEO_UPDATE( crospang );
+SCREEN_UPDATE( crospang );
WRITE16_HANDLER ( crospang_fg_scrolly_w );
WRITE16_HANDLER ( crospang_bg_scrolly_w );
diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h
index 1278ba64bf0..446d142ffad 100644
--- a/src/mame/includes/crshrace.h
+++ b/src/mame/includes/crshrace.h
@@ -32,5 +32,5 @@ WRITE16_HANDLER( crshrace_roz_bank_w );
WRITE16_HANDLER( crshrace_gfxctrl_w );
VIDEO_START( crshrace );
-VIDEO_EOF( crshrace );
-VIDEO_UPDATE( crshrace );
+SCREEN_EOF( crshrace );
+SCREEN_UPDATE( crshrace );
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index dbcb7008630..c8e13cd026a 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -100,11 +100,11 @@ READ8_HANDLER( cvs_collision_clear );
void cvs_scroll_stars(running_machine *machine);
PALETTE_INIT( cvs );
-VIDEO_UPDATE( cvs );
+SCREEN_UPDATE( cvs );
VIDEO_START( cvs );
/*----------- defined in video/quasar.c -----------*/
PALETTE_INIT( quasar );
-VIDEO_UPDATE( quasar );
+SCREEN_UPDATE( quasar );
VIDEO_START( quasar );
diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h
index 696dfe997db..e60e6eef039 100644
--- a/src/mame/includes/cyberbal.h
+++ b/src/mame/includes/cyberbal.h
@@ -57,6 +57,6 @@ WRITE16_HANDLER( cyberbal_paletteram_1_w );
VIDEO_START( cyberbal );
VIDEO_START( cyberbal2p );
-VIDEO_UPDATE( cyberbal );
+SCREEN_UPDATE( cyberbal );
void cyberbal_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h
index 220ff8803a6..6a3410251df 100644
--- a/src/mame/includes/darius.h
+++ b/src/mame/includes/darius.h
@@ -69,4 +69,4 @@ public:
WRITE16_HANDLER( darius_fg_layer_w );
VIDEO_START( darius );
-VIDEO_UPDATE( darius );
+SCREEN_UPDATE( darius );
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index 7626b52bd0e..ede6bd7b49f 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -18,6 +18,6 @@ public:
/*----------- defined in video/darkmist.c -----------*/
VIDEO_START( darkmist );
-VIDEO_UPDATE( darkmist );
+SCREEN_UPDATE( darkmist );
PALETTE_INIT( darkmist );
diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h
index 0114b7c7564..86b51006b8b 100644
--- a/src/mame/includes/darkseal.h
+++ b/src/mame/includes/darkseal.h
@@ -22,7 +22,7 @@ public:
/*----------- defined in video/darkseal.c -----------*/
VIDEO_START( darkseal );
-VIDEO_UPDATE( darkseal );
+SCREEN_UPDATE( darkseal );
WRITE16_HANDLER( darkseal_pf1_data_w );
WRITE16_HANDLER( darkseal_pf2_data_w );
diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h
index ca1c40b90fc..a56be36b753 100644
--- a/src/mame/includes/dassault.h
+++ b/src/mame/includes/dassault.h
@@ -37,4 +37,4 @@ public:
/*----------- defined in video/dassault.c -----------*/
-VIDEO_UPDATE( dassault );
+SCREEN_UPDATE( dassault );
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index 6fedd64f247..5f18ea0c27f 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -42,4 +42,4 @@ WRITE16_HANDLER(dbz_bg1_videoram_w);
WRITE16_HANDLER(dbz_bg2_videoram_w);
VIDEO_START(dbz);
-VIDEO_UPDATE(dbz);
+SCREEN_UPDATE(dbz);
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index f86cd2ca853..8153950771a 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -217,7 +217,7 @@ WRITE64_HANDLER( pvr_ta_w );
WRITE64_HANDLER( ta_fifo_poly_w );
WRITE64_HANDLER( ta_fifo_yuv_w );
VIDEO_START(dc);
-VIDEO_UPDATE(dc);
+SCREEN_UPDATE(dc);
/*--------------- CORE registers --------------*/
#define PVRID ((0x005f8000-0x005f8000)/4)
diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h
index 1955cdf2a0d..216739afa74 100644
--- a/src/mame/includes/dcheese.h
+++ b/src/mame/includes/dcheese.h
@@ -42,7 +42,7 @@ void dcheese_signal_irq(running_machine *machine, int which);
PALETTE_INIT( dcheese );
VIDEO_START( dcheese );
-VIDEO_UPDATE( dcheese );
+SCREEN_UPDATE( dcheese );
WRITE16_HANDLER( madmax_blitter_color_w );
WRITE16_HANDLER( madmax_blitter_xparam_w );
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index bb3111078c8..5e18150f3d2 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -11,5 +11,5 @@ WRITE16_HANDLER( dcon_control_w );
READ16_HANDLER( dcon_control_r );
VIDEO_START( dcon );
-VIDEO_UPDATE( dcon );
-VIDEO_UPDATE( sdgndmps );
+SCREEN_UPDATE( dcon );
+SCREEN_UPDATE( sdgndmps );
diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h
index eb60471b9f7..0df5498d3c8 100644
--- a/src/mame/includes/dday.h
+++ b/src/mame/includes/dday.h
@@ -34,7 +34,7 @@ public:
PALETTE_INIT( dday );
VIDEO_START( dday );
-VIDEO_UPDATE( dday );
+SCREEN_UPDATE( dday );
WRITE8_HANDLER( dday_bgvideoram_w );
WRITE8_HANDLER( dday_fgvideoram_w );
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index a5c0e5bae57..7d60b23ff48 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -63,5 +63,5 @@ WRITE8_HANDLER( ddragon_fgvideoram_w );
VIDEO_START( chinagat );
VIDEO_START( ddragon );
-VIDEO_UPDATE( ddragon );
+SCREEN_UPDATE( ddragon );
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index 258365da449..d881b501c0c 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -43,5 +43,5 @@ extern WRITE16_HANDLER( ddragon3_scroll_w );
extern READ16_HANDLER( ddragon3_scroll_r );
extern VIDEO_START( ddragon3 );
-extern VIDEO_UPDATE( ddragon3 );
-extern VIDEO_UPDATE( ctribe );
+extern SCREEN_UPDATE( ddragon3 );
+extern SCREEN_UPDATE( ctribe );
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index 18296bc84d9..0ba29ef0bda 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -42,4 +42,4 @@ WRITE8_HANDLER( K005885_1_w );
PALETTE_INIT( ddribble );
VIDEO_START( ddribble );
-VIDEO_UPDATE( ddribble );
+SCREEN_UPDATE( ddribble );
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index 1a0c71b64a2..23aa5bf3bd5 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -17,4 +17,4 @@ WRITE16_HANDLER( deadang_text_w );
WRITE16_HANDLER( deadang_bank_w );
VIDEO_START( deadang );
-VIDEO_UPDATE( deadang );
+SCREEN_UPDATE( deadang );
diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h
index 1b817e310af..676be5b2de5 100644
--- a/src/mame/includes/dec0.h
+++ b/src/mame/includes/dec0.h
@@ -51,13 +51,13 @@ public:
/* Video emulation definitions */
VIDEO_START( dec0 );
VIDEO_START( dec0_nodma );
-VIDEO_UPDATE( hbarrel );
-VIDEO_UPDATE( baddudes );
-VIDEO_UPDATE( birdtry );
-VIDEO_UPDATE( robocop );
-VIDEO_UPDATE( hippodrm );
-VIDEO_UPDATE( slyspy );
-VIDEO_UPDATE( midres );
+SCREEN_UPDATE( hbarrel );
+SCREEN_UPDATE( baddudes );
+SCREEN_UPDATE( birdtry );
+SCREEN_UPDATE( robocop );
+SCREEN_UPDATE( hippodrm );
+SCREEN_UPDATE( slyspy );
+SCREEN_UPDATE( midres );
WRITE16_HANDLER( dec0_pf1_control_0_w );
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 13e80036402..e14619bf1ca 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -41,14 +41,14 @@ public:
PALETTE_INIT( ghostb );
-VIDEO_UPDATE( cobracom );
-VIDEO_UPDATE( ghostb );
-VIDEO_UPDATE( srdarwin );
-VIDEO_UPDATE( gondo );
-VIDEO_UPDATE( garyoret );
-VIDEO_UPDATE( lastmisn );
-VIDEO_UPDATE( shackled );
-VIDEO_UPDATE( oscar );
+SCREEN_UPDATE( cobracom );
+SCREEN_UPDATE( ghostb );
+SCREEN_UPDATE( srdarwin );
+SCREEN_UPDATE( gondo );
+SCREEN_UPDATE( garyoret );
+SCREEN_UPDATE( lastmisn );
+SCREEN_UPDATE( shackled );
+SCREEN_UPDATE( oscar );
VIDEO_START( cobracom );
VIDEO_START( oscar );
VIDEO_START( ghostb );
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 470e919cd1f..74ef89b73f9 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -72,13 +72,13 @@ VIDEO_START( dragngun );
VIDEO_START( lockload );
VIDEO_START( nslasher );
-VIDEO_EOF( captaven );
-VIDEO_EOF( dragngun );
+SCREEN_EOF( captaven );
+SCREEN_EOF( dragngun );
-VIDEO_UPDATE( captaven );
-VIDEO_UPDATE( fghthist );
-VIDEO_UPDATE( dragngun );
-VIDEO_UPDATE( nslasher );
+SCREEN_UPDATE( captaven );
+SCREEN_UPDATE( fghthist );
+SCREEN_UPDATE( dragngun );
+SCREEN_UPDATE( nslasher );
WRITE32_HANDLER( deco32_pf1_data_w );
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index 7f0ebcff690..6111b9b17f7 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -21,5 +21,5 @@ public:
/*----------- defined in video/deco_mlc.c -----------*/
VIDEO_START( mlc );
-VIDEO_UPDATE( mlc );
-VIDEO_EOF( mlc );
+SCREEN_UPDATE( mlc );
+SCREEN_EOF( mlc );
diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h
index de8b73b0960..e917cc5de8e 100644
--- a/src/mame/includes/deniam.h
+++ b/src/mame/includes/deniam.h
@@ -42,7 +42,7 @@ READ16_HANDLER( deniam_coinctrl_r );
WRITE16_HANDLER( deniam_coinctrl_w );
VIDEO_START( deniam );
-VIDEO_UPDATE( deniam );
+SCREEN_UPDATE( deniam );
DRIVER_INIT( logicpro );
DRIVER_INIT( karianx );
diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h
index 0f8bc3468c0..46de4888d5c 100644
--- a/src/mame/includes/dietgo.h
+++ b/src/mame/includes/dietgo.h
@@ -27,4 +27,4 @@ public:
/*----------- defined in video/dietgo.c -----------*/
-VIDEO_UPDATE( dietgo );
+SCREEN_UPDATE( dietgo );
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index 9b6698bd78b..6dde642ad8a 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -51,5 +51,5 @@ WRITE8_HANDLER( djboy_videoram_w );
WRITE8_HANDLER( djboy_paletteram_w );
VIDEO_START( djboy );
-VIDEO_UPDATE( djboy );
-VIDEO_EOF( djboy );
+SCREEN_UPDATE( djboy );
+SCREEN_EOF( djboy );
diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h
index 444b2d1bc2c..23dc0db9b2d 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -20,7 +20,7 @@ public:
/*----------- defined in video/djmain.c -----------*/
-VIDEO_UPDATE( djmain );
+SCREEN_UPDATE( djmain );
VIDEO_START( djmain );
void djmain_tile_callback(running_machine* machine, int layer, int *code, int *color, int *flags);
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index ecddf53c37d..6459a244a99 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -202,9 +202,9 @@ PALETTE_INIT( radarscp1 );
PALETTE_INIT( dkong3 );
VIDEO_START( dkong );
-VIDEO_UPDATE( dkong );
-VIDEO_UPDATE( pestplce );
-VIDEO_UPDATE( spclforc );
+SCREEN_UPDATE( dkong );
+SCREEN_UPDATE( pestplce );
+SCREEN_UPDATE( spclforc );
/*----------- defined in audio/dkong.c -----------*/
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index 2620aa5fe0a..0d778df2b98 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -47,5 +47,5 @@ WRITE8_HANDLER( docastle_flipscreen_on_w );
PALETTE_INIT( docastle );
VIDEO_START( docastle );
VIDEO_START( dorunrun );
-VIDEO_UPDATE( docastle );
+SCREEN_UPDATE( docastle );
diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h
index c87cfd44a07..b900218508b 100644
--- a/src/mame/includes/dogfgt.h
+++ b/src/mame/includes/dogfgt.h
@@ -43,4 +43,4 @@ WRITE8_HANDLER( dogfgt_1800_w );
PALETTE_INIT( dogfgt );
VIDEO_START( dogfgt );
-VIDEO_UPDATE( dogfgt );
+SCREEN_UPDATE( dogfgt );
diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h
index 2b33d6af1d2..e09b92274f3 100644
--- a/src/mame/includes/dooyong.h
+++ b/src/mame/includes/dooyong.h
@@ -58,14 +58,14 @@ WRITE8_HANDLER( paletteram_flytiger_w );
WRITE8_HANDLER( flytiger_ctrl_w );
WRITE16_HANDLER( rshark_ctrl_w );
-VIDEO_UPDATE( lastday );
-VIDEO_UPDATE( gulfstrm );
-VIDEO_UPDATE( pollux );
-VIDEO_UPDATE( bluehawk );
-VIDEO_UPDATE( flytiger );
-VIDEO_UPDATE( primella );
-VIDEO_UPDATE( rshark );
-VIDEO_UPDATE( popbingo );
+SCREEN_UPDATE( lastday );
+SCREEN_UPDATE( gulfstrm );
+SCREEN_UPDATE( pollux );
+SCREEN_UPDATE( bluehawk );
+SCREEN_UPDATE( flytiger );
+SCREEN_UPDATE( primella );
+SCREEN_UPDATE( rshark );
+SCREEN_UPDATE( popbingo );
VIDEO_START( lastday );
VIDEO_START( gulfstrm );
@@ -76,5 +76,5 @@ VIDEO_START( primella );
VIDEO_START( rshark );
VIDEO_START( popbingo );
-VIDEO_EOF( dooyong );
-VIDEO_EOF( rshark );
+SCREEN_EOF( dooyong );
+SCREEN_EOF( rshark );
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index 3d4901c33e8..ebf71f0a143 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -51,4 +51,4 @@ DISCRETE_SOUND_EXTERN( dragrace );
/*----------- defined in video/dragrace.c -----------*/
VIDEO_START( dragrace );
-VIDEO_UPDATE( dragrace );
+SCREEN_UPDATE( dragrace );
diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h
index 25dcc20136e..b5704b43243 100644
--- a/src/mame/includes/drgnmst.h
+++ b/src/mame/includes/drgnmst.h
@@ -45,4 +45,4 @@ WRITE16_HANDLER( drgnmst_bg_videoram_w );
WRITE16_HANDLER( drgnmst_md_videoram_w );
VIDEO_START(drgnmst);
-VIDEO_UPDATE(drgnmst);
+SCREEN_UPDATE(drgnmst);
diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h
index 341cba331c2..ec9c70a41af 100644
--- a/src/mame/includes/dribling.h
+++ b/src/mame/includes/dribling.h
@@ -33,4 +33,4 @@ public:
PALETTE_INIT( dribling );
WRITE8_HANDLER( dribling_colorram_w );
-VIDEO_UPDATE( dribling );
+SCREEN_UPDATE( dribling );
diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h
index 2d3b266b97b..70d4e2e7440 100644
--- a/src/mame/includes/drmicro.h
+++ b/src/mame/includes/drmicro.h
@@ -31,6 +31,6 @@ public:
PALETTE_INIT( drmicro );
VIDEO_START( drmicro );
-VIDEO_UPDATE( drmicro );
+SCREEN_UPDATE( drmicro );
WRITE8_HANDLER( drmicro_videoram_w );
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index 76b5cc16593..2ea7ebde6c3 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -184,12 +184,12 @@ VIDEO_START( mjelctrn );
VIDEO_START( neruton );
VIDEO_START( htengoku );
-VIDEO_UPDATE( hanamai );
-VIDEO_UPDATE( hnoridur );
-VIDEO_UPDATE( sprtmtch );
-VIDEO_UPDATE( mjdialq2 );
-VIDEO_UPDATE( jantouki );
-VIDEO_UPDATE( htengoku );
+SCREEN_UPDATE( hanamai );
+SCREEN_UPDATE( hnoridur );
+SCREEN_UPDATE( sprtmtch );
+SCREEN_UPDATE( mjdialq2 );
+SCREEN_UPDATE( jantouki );
+SCREEN_UPDATE( htengoku );
PALETTE_INIT( sprtmtch );
@@ -205,4 +205,4 @@ WRITE8_HANDLER( ddenlovr_transparency_pen_w );
WRITE8_HANDLER( ddenlovr_transparency_mask_w );
VIDEO_START(ddenlovr);
-VIDEO_UPDATE(ddenlovr);
+SCREEN_UPDATE(ddenlovr);
diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h
index 3102b6a701f..aede4ce7541 100644
--- a/src/mame/includes/dynduke.h
+++ b/src/mame/includes/dynduke.h
@@ -19,5 +19,5 @@ WRITE16_HANDLER( dynduke_gfxbank_w );
WRITE16_HANDLER( dynduke_control_w );
WRITE16_HANDLER( dynduke_paletteram_w );
VIDEO_START( dynduke );
-VIDEO_UPDATE( dynduke );
-VIDEO_EOF( dynduke );
+SCREEN_UPDATE( dynduke );
+SCREEN_EOF( dynduke );
diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h
index 044b13c960e..b7c966864cb 100644
--- a/src/mame/includes/eolith.h
+++ b/src/mame/includes/eolith.h
@@ -15,4 +15,4 @@ public:
READ32_HANDLER( eolith_vram_r );
WRITE32_HANDLER( eolith_vram_w );
VIDEO_START( eolith );
-VIDEO_UPDATE( eolith );
+SCREEN_UPDATE( eolith );
diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h
index 466b5cb37ab..9c3b4b08a70 100644
--- a/src/mame/includes/epos.h
+++ b/src/mame/includes/epos.h
@@ -25,4 +25,4 @@ public:
/*----------- defined in video/epos.c -----------*/
WRITE8_HANDLER( epos_port_1_w );
-VIDEO_UPDATE( epos );
+SCREEN_UPDATE( epos );
diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h
index 1c9e42d7205..97277963a16 100644
--- a/src/mame/includes/eprom.h
+++ b/src/mame/includes/eprom.h
@@ -22,9 +22,9 @@ public:
/*----------- defined in video/eprom.c -----------*/
VIDEO_START( eprom );
-VIDEO_UPDATE( eprom );
+SCREEN_UPDATE( eprom );
VIDEO_START( guts );
-VIDEO_UPDATE( guts );
+SCREEN_UPDATE( guts );
void eprom_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index 8196364eb57..744383d232e 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -65,7 +65,7 @@ extern WRITE16_HANDLER(splndrbt_bg_scrolly_w);
extern PALETTE_INIT( equites );
extern VIDEO_START( equites );
-extern VIDEO_UPDATE( equites );
+extern SCREEN_UPDATE( equites );
extern PALETTE_INIT( splndrbt );
extern VIDEO_START( splndrbt );
-extern VIDEO_UPDATE( splndrbt );
+extern SCREEN_UPDATE( splndrbt );
diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h
index 18164fb932a..cbb04b5fb6e 100644
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@@ -40,6 +40,6 @@ WRITE16_HANDLER( esd16_vram_1_w );
WRITE16_HANDLER( esd16_tilemap0_color_w );
VIDEO_START( esd16 );
-VIDEO_UPDATE( esd16 );
-VIDEO_UPDATE( hedpanic );
-VIDEO_UPDATE( hedpanio );
+SCREEN_UPDATE( esd16 );
+SCREEN_UPDATE( hedpanic );
+SCREEN_UPDATE( hedpanio );
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index efa39a8f0e8..d90c129ac04 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -40,4 +40,4 @@ WRITE8_HANDLER( espial_colorram_w );
WRITE8_HANDLER( espial_attributeram_w );
WRITE8_HANDLER( espial_scrollram_w );
WRITE8_HANDLER( espial_flipscreen_w );
-VIDEO_UPDATE( espial );
+SCREEN_UPDATE( espial );
diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h
index c48e47b05b8..c9d8682a34b 100644
--- a/src/mame/includes/esripsys.h
+++ b/src/mame/includes/esripsys.h
@@ -25,7 +25,7 @@ extern int esripsys__12sel;
extern int esripsys_video_firq_en;
VIDEO_START( esripsys );
-VIDEO_UPDATE( esripsys );
+SCREEN_UPDATE( esripsys );
WRITE8_HANDLER( esripsys_bg_intensity_w );
INTERRUPT_GEN( esripsys_vblank_irq );
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index d31d3e167d3..dc849d98a71 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -35,5 +35,5 @@ extern WRITE8_HANDLER( exedexes_gfxctrl_w );
extern PALETTE_INIT( exedexes );
extern VIDEO_START( exedexes );
-extern VIDEO_UPDATE( exedexes );
-extern VIDEO_EOF( exedexes );
+extern SCREEN_UPDATE( exedexes );
+extern SCREEN_EOF( exedexes );
diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h
index bd2914f6846..74a9daf6c77 100644
--- a/src/mame/includes/exerion.h
+++ b/src/mame/includes/exerion.h
@@ -53,7 +53,7 @@ public:
PALETTE_INIT( exerion );
VIDEO_START( exerion );
-VIDEO_UPDATE( exerion );
+SCREEN_UPDATE( exerion );
WRITE8_HANDLER( exerion_videoreg_w );
WRITE8_HANDLER( exerion_video_latch_w );
diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h
index 1fb26f41d5c..9ac008f5952 100644
--- a/src/mame/includes/exidy.h
+++ b/src/mame/includes/exidy.h
@@ -33,7 +33,7 @@ extern UINT8 *exidy_sprite_enable;
void exidy_video_config(UINT8 _collision_mask, UINT8 _collision_invert, int _is_2bpp);
VIDEO_START( exidy );
-VIDEO_UPDATE( exidy );
+SCREEN_UPDATE( exidy );
INTERRUPT_GEN( exidy_vblank_interrupt );
INTERRUPT_GEN( teetert_vblank_interrupt );
diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h
index abd90c6250d..d60df24da9f 100644
--- a/src/mame/includes/exprraid.h
+++ b/src/mame/includes/exprraid.h
@@ -41,4 +41,4 @@ extern WRITE8_HANDLER( exprraid_scrollx_w );
extern WRITE8_HANDLER( exprraid_scrolly_w );
extern VIDEO_START( exprraid );
-extern VIDEO_UPDATE( exprraid );
+extern SCREEN_UPDATE( exprraid );
diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h
index 2ffa0ccd4db..95148c0658a 100644
--- a/src/mame/includes/exzisus.h
+++ b/src/mame/includes/exzisus.h
@@ -28,6 +28,6 @@ WRITE8_HANDLER( exzisus_videoram_1_w );
WRITE8_HANDLER( exzisus_objectram_0_w );
WRITE8_HANDLER( exzisus_objectram_1_w );
-VIDEO_UPDATE( exzisus );
+SCREEN_UPDATE( exzisus );
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h
index 81b3a709089..7893cff57f0 100644
--- a/src/mame/includes/f1gp.h
+++ b/src/mame/includes/f1gp.h
@@ -50,6 +50,6 @@ WRITE16_HANDLER( f1gp2_gfxctrl_w );
VIDEO_START( f1gp );
VIDEO_START( f1gpb );
VIDEO_START( f1gp2 );
-VIDEO_UPDATE( f1gp );
-VIDEO_UPDATE( f1gpb );
-VIDEO_UPDATE( f1gp2 );
+SCREEN_UPDATE( f1gp );
+SCREEN_UPDATE( f1gpb );
+SCREEN_UPDATE( f1gp2 );
diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h
index 4f9cf4e607c..e311ec9848b 100644
--- a/src/mame/includes/fantland.h
+++ b/src/mame/includes/fantland.h
@@ -30,4 +30,4 @@ public:
/*----------- defined in video/fantland.c -----------*/
-VIDEO_UPDATE( fantland );
+SCREEN_UPDATE( fantland );
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 82083a9b5b3..bdc4b49c0c8 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -41,9 +41,9 @@ WRITE8_HANDLER( fastfred_colorbank1_w );
WRITE8_HANDLER( fastfred_colorbank2_w );
WRITE8_HANDLER( fastfred_flip_screen_x_w );
WRITE8_HANDLER( fastfred_flip_screen_y_w );
-VIDEO_UPDATE( fastfred );
+SCREEN_UPDATE( fastfred );
VIDEO_START( imago );
-VIDEO_UPDATE( imago );
+SCREEN_UPDATE( imago );
WRITE8_HANDLER( imago_fg_videoram_w );
WRITE8_HANDLER( imago_charbank_w );
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index cd1bd72882b..871b7fe3383 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -36,4 +36,4 @@ WRITE8_HANDLER( fastlane_vram2_w );
PALETTE_INIT( fastlane );
VIDEO_START( fastlane );
-VIDEO_UPDATE( fastlane );
+SCREEN_UPDATE( fastlane );
diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h
index bca6c634d24..0df35c16aaf 100644
--- a/src/mame/includes/fcombat.h
+++ b/src/mame/includes/fcombat.h
@@ -55,6 +55,6 @@ public:
PALETTE_INIT( fcombat );
VIDEO_START( fcombat );
-VIDEO_UPDATE( fcombat );
+SCREEN_UPDATE( fcombat );
WRITE8_HANDLER( fcombat_videoreg_w );
diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h
index fb531d50361..6ca87da05e4 100644
--- a/src/mame/includes/fgoal.h
+++ b/src/mame/includes/fgoal.h
@@ -28,7 +28,7 @@ public:
/*----------- defined in video/fgoal.c -----------*/
VIDEO_START( fgoal );
-VIDEO_UPDATE( fgoal );
+SCREEN_UPDATE( fgoal );
WRITE8_HANDLER( fgoal_color_w );
WRITE8_HANDLER( fgoal_xpos_w );
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index e5d63358c1b..cb463107ca7 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -40,4 +40,4 @@ WRITE8_HANDLER( finalizr_videoctrl_w );
PALETTE_INIT( finalizr );
VIDEO_START( finalizr );
-VIDEO_UPDATE( finalizr );
+SCREEN_UPDATE( finalizr );
diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h
index 53c6c238ec5..66091ee1de8 100644
--- a/src/mame/includes/firetrap.h
+++ b/src/mame/includes/firetrap.h
@@ -50,4 +50,4 @@ WRITE8_HANDLER( firetrap_bg2_scrolly_w );
PALETTE_INIT( firetrap );
VIDEO_START( firetrap );
-VIDEO_UPDATE( firetrap );
+SCREEN_UPDATE( firetrap );
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index 8f919fb97f6..2a8d63ecaec 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -84,8 +84,8 @@ PALETTE_INIT( montecar );
VIDEO_START( firetrk );
VIDEO_START( superbug );
VIDEO_START( montecar );
-VIDEO_UPDATE( firetrk );
-VIDEO_UPDATE( superbug );
-VIDEO_UPDATE( montecar );
+SCREEN_UPDATE( firetrk );
+SCREEN_UPDATE( superbug );
+SCREEN_UPDATE( montecar );
diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h
index a072cf627df..b0bffcdcb1b 100644
--- a/src/mame/includes/fitfight.h
+++ b/src/mame/includes/fitfight.h
@@ -34,4 +34,4 @@ WRITE16_HANDLER( fof_mid_tileram_w );
WRITE16_HANDLER( fof_txt_tileram_w );
VIDEO_START(fitfight);
-VIDEO_UPDATE(fitfight);
+SCREEN_UPDATE(fitfight);
diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h
index 0d71d9acbec..f8d90fb3a2a 100644
--- a/src/mame/includes/flkatck.h
+++ b/src/mame/includes/flkatck.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( flkatck_k007121_w );
WRITE8_HANDLER( flkatck_k007121_regs_w );
VIDEO_START( flkatck );
-VIDEO_UPDATE( flkatck );
+SCREEN_UPDATE( flkatck );
diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h
index 7c386297f65..256a8a05ea3 100644
--- a/src/mame/includes/flower.h
+++ b/src/mame/includes/flower.h
@@ -17,6 +17,6 @@ WRITE8_HANDLER( flower_bg0ram_w );
WRITE8_HANDLER( flower_bg1ram_w );
WRITE8_HANDLER( flower_flipscreen_w );
-VIDEO_UPDATE( flower );
+SCREEN_UPDATE( flower );
VIDEO_START( flower );
PALETTE_INIT( flower );
diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h
index b5e710d307c..f1ce8c0f11d 100644
--- a/src/mame/includes/flstory.h
+++ b/src/mame/includes/flstory.h
@@ -80,11 +80,11 @@ READ8_HANDLER( victnine_mcu_status_r );
/*----------- defined in video/flstory.c -----------*/
VIDEO_START( flstory );
-VIDEO_UPDATE( flstory );
+SCREEN_UPDATE( flstory );
VIDEO_START( victnine );
-VIDEO_UPDATE( victnine );
+SCREEN_UPDATE( victnine );
VIDEO_START( rumba );
-VIDEO_UPDATE( rumba );
+SCREEN_UPDATE( rumba );
WRITE8_HANDLER( flstory_videoram_w );
READ8_HANDLER( flstory_palette_r );
diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h
index 012492a02a0..2f2bb9ed65d 100644
--- a/src/mame/includes/foodf.h
+++ b/src/mame/includes/foodf.h
@@ -31,4 +31,4 @@ WRITE16_HANDLER( foodf_paletteram_w );
void foodf_set_flip(foodf_state *state, int flip);
VIDEO_START( foodf );
-VIDEO_UPDATE( foodf );
+SCREEN_UPDATE( foodf );
diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h
index 114c7a065e3..c074768d68e 100644
--- a/src/mame/includes/freekick.h
+++ b/src/mame/includes/freekick.h
@@ -26,7 +26,7 @@ public:
/*----------- defined in video/freekick.c -----------*/
VIDEO_START(freekick);
-VIDEO_UPDATE(gigas);
-VIDEO_UPDATE(pbillrd);
-VIDEO_UPDATE(freekick);
+SCREEN_UPDATE(gigas);
+SCREEN_UPDATE(pbillrd);
+SCREEN_UPDATE(freekick);
WRITE8_HANDLER( freek_videoram_w );
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
index dc8e307a0a3..f0bb69dee64 100644
--- a/src/mame/includes/fromanc2.h
+++ b/src/mame/includes/fromanc2.h
@@ -33,7 +33,7 @@ public:
/*----------- defined in video/fromanc2.c -----------*/
-VIDEO_UPDATE( fromanc2 );
+SCREEN_UPDATE( fromanc2 );
VIDEO_START( fromanc2 );
VIDEO_START( fromancr );
VIDEO_START( fromanc4 );
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index 2994e7d3498..e496a53ef57 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -50,8 +50,8 @@ VIDEO_START( fromance );
VIDEO_START( nekkyoku );
VIDEO_START( pipedrm );
VIDEO_START( hatris );
-VIDEO_UPDATE( fromance );
-VIDEO_UPDATE( pipedrm );
+SCREEN_UPDATE( fromance );
+SCREEN_UPDATE( pipedrm );
WRITE8_HANDLER( fromance_crtc_data_w );
WRITE8_HANDLER( fromance_crtc_register_w );
diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h
index 44eda8161c7..51dc876ef7d 100644
--- a/src/mame/includes/funkybee.h
+++ b/src/mame/includes/funkybee.h
@@ -26,4 +26,4 @@ WRITE8_HANDLER( funkybee_flipscreen_w );
PALETTE_INIT( funkybee );
VIDEO_START( funkybee );
-VIDEO_UPDATE( funkybee );
+SCREEN_UPDATE( funkybee );
diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h
index 00ff523ef52..dbceef0bef7 100644
--- a/src/mame/includes/funkyjet.h
+++ b/src/mame/includes/funkyjet.h
@@ -27,4 +27,4 @@ public:
/*----------- defined in video/funkyjet.c -----------*/
-VIDEO_UPDATE( funkyjet );
+SCREEN_UPDATE( funkyjet );
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index c4fcc80021c..41b8aa9d329 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -8,4 +8,4 @@ WRITE8_HANDLER( funworld_colorram_w );
PALETTE_INIT( funworld );
VIDEO_START( funworld );
VIDEO_START( magicrd2 );
-VIDEO_UPDATE( funworld );
+SCREEN_UPDATE( funworld );
diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h
index 608a361e111..e81a0b56b6a 100644
--- a/src/mame/includes/funybubl.h
+++ b/src/mame/includes/funybubl.h
@@ -23,4 +23,4 @@ public:
WRITE8_HANDLER ( funybubl_paldatawrite );
VIDEO_START(funybubl);
-VIDEO_UPDATE(funybubl);
+SCREEN_UPDATE(funybubl);
diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h
index c67ddd4d5b7..babe489b440 100644
--- a/src/mame/includes/fuukifg2.h
+++ b/src/mame/includes/fuukifg2.h
@@ -38,4 +38,4 @@ WRITE16_HANDLER( fuuki16_vram_2_w );
WRITE16_HANDLER( fuuki16_vram_3_w );
VIDEO_START( fuuki16 );
-VIDEO_UPDATE( fuuki16 );
+SCREEN_UPDATE( fuuki16 );
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index 0671b679e31..88ce7a2ee1a 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -51,5 +51,5 @@ WRITE32_HANDLER( fuuki32_vram_2_w );
WRITE32_HANDLER( fuuki32_vram_3_w );
VIDEO_START( fuuki32 );
-VIDEO_UPDATE( fuuki32 );
-VIDEO_EOF( fuuki32 );
+SCREEN_UPDATE( fuuki32 );
+SCREEN_EOF( fuuki32 );
diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h
index 707778a6f19..de61ad327b5 100644
--- a/src/mame/includes/gaelco.h
+++ b/src/mame/includes/gaelco.h
@@ -33,5 +33,5 @@ WRITE16_HANDLER( gaelco_vram_w );
VIDEO_START( bigkarnk );
VIDEO_START( maniacsq );
-VIDEO_UPDATE( bigkarnk );
-VIDEO_UPDATE( maniacsq );
+SCREEN_UPDATE( bigkarnk );
+SCREEN_UPDATE( maniacsq );
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index 0362fb8befa..7934a737c99 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -39,8 +39,8 @@ WRITE16_HANDLER( snowboar_protection_w );
WRITE16_HANDLER( gaelco2_vram_w );
WRITE16_HANDLER( gaelco2_palette_w );
-VIDEO_UPDATE( gaelco2 );
-VIDEO_EOF( gaelco2 );
+SCREEN_UPDATE( gaelco2 );
+SCREEN_EOF( gaelco2 );
VIDEO_START( gaelco2 );
-VIDEO_UPDATE( gaelco2_dual );
+SCREEN_UPDATE( gaelco2_dual );
VIDEO_START( gaelco2_dual );
diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h
index afa3b10a59e..154730cd608 100644
--- a/src/mame/includes/gaelco3d.h
+++ b/src/mame/includes/gaelco3d.h
@@ -58,4 +58,4 @@ WRITE16_HANDLER( gaelco3d_paletteram_w );
WRITE32_HANDLER( gaelco3d_paletteram_020_w );
VIDEO_START( gaelco3d );
-VIDEO_UPDATE( gaelco3d );
+SCREEN_UPDATE( gaelco3d );
diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h
index 1de400f7e60..5aaccf16417 100644
--- a/src/mame/includes/gaiden.h
+++ b/src/mame/includes/gaiden.h
@@ -42,9 +42,9 @@ VIDEO_START( raiga );
VIDEO_START( drgnbowl );
VIDEO_START( mastninj );
-VIDEO_UPDATE( gaiden );
-VIDEO_UPDATE( raiga );
-VIDEO_UPDATE( drgnbowl );
+SCREEN_UPDATE( gaiden );
+SCREEN_UPDATE( raiga );
+SCREEN_UPDATE( drgnbowl );
WRITE16_HANDLER( gaiden_videoram_w );
WRITE16_HANDLER( gaiden_videoram2_w );
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index c0fdd8b0cc9..8487203efb5 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -78,9 +78,9 @@ WRITE8_HANDLER( bosco_scrollx_w );
WRITE8_HANDLER( bosco_scrolly_w );
WRITE8_HANDLER( bosco_starclr_w );
VIDEO_START( bosco );
-VIDEO_UPDATE( bosco );
+SCREEN_UPDATE( bosco );
PALETTE_INIT( bosco );
-VIDEO_EOF( bosco ); /* update starfield */
+SCREEN_EOF( bosco ); /* update starfield */
/*----------- defined in audio/galaga.c -----------*/
@@ -102,8 +102,8 @@ PALETTE_INIT( galaga );
WRITE8_HANDLER( galaga_videoram_w );
WRITE8_HANDLER( gatsbee_bank_w );
VIDEO_START( galaga );
-VIDEO_UPDATE( galaga );
-VIDEO_EOF( galaga ); /* update starfield */
+SCREEN_UPDATE( galaga );
+SCREEN_EOF( galaga ); /* update starfield */
/*----------- defined in video/xevious.c -----------*/
@@ -116,7 +116,7 @@ WRITE8_HANDLER( xevious_bs_w );
READ8_HANDLER( xevious_bb_r );
VIDEO_START( xevious );
PALETTE_INIT( xevious );
-VIDEO_UPDATE( xevious );
+SCREEN_UPDATE( xevious );
PALETTE_INIT( battles );
@@ -145,5 +145,5 @@ INTERRUPT_GEN( battles_interrupt_4 );
WRITE8_HANDLER( digdug_videoram_w );
WRITE8_HANDLER( digdug_PORT_w );
VIDEO_START( digdug );
-VIDEO_UPDATE( digdug );
+SCREEN_UPDATE( digdug );
PALETTE_INIT( digdug );
diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h
index 73e649e4fda..4582cc5bca2 100644
--- a/src/mame/includes/galastrm.h
+++ b/src/mame/includes/galastrm.h
@@ -39,4 +39,4 @@ public:
/*----------- defined in video/galastrm.c -----------*/
VIDEO_START( galastrm );
-VIDEO_UPDATE( galastrm );
+SCREEN_UPDATE( galastrm );
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index 8e878d4c0f6..32ea1b08001 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -49,7 +49,7 @@ PALETTE_INIT( galaxian );
PALETTE_INIT( moonwar );
VIDEO_START( galaxian );
-VIDEO_UPDATE( galaxian );
+SCREEN_UPDATE( galaxian );
WRITE8_HANDLER( galaxian_videoram_w );
WRITE8_HANDLER( galaxian_objram_w );
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index 85ce85d7a0c..fe3b4aa45eb 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -88,8 +88,8 @@ VIDEO_START( ad2083 );
void galaxold_init_stars(running_machine *machine, int colors_offset);
void galaxold_draw_stars(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect);
-VIDEO_UPDATE( galaxold );
-VIDEO_UPDATE( dambustr );
+SCREEN_UPDATE( galaxold );
+SCREEN_UPDATE( dambustr );
WRITE8_HANDLER( galaxold_gfxbank_w );
WRITE8_HANDLER( galaxold_flip_screen_x_w );
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index 7b6d503e40d..7913ddcdcc4 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -42,5 +42,5 @@ PALETTE_INIT( galivan );
VIDEO_START( galivan );
VIDEO_START( ninjemak );
-VIDEO_UPDATE( galivan );
-VIDEO_UPDATE( ninjemak );
+SCREEN_UPDATE( galivan );
+SCREEN_UPDATE( ninjemak );
diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h
index 013be2ba202..41caff51a3c 100644
--- a/src/mame/includes/galpanic.h
+++ b/src/mame/includes/galpanic.h
@@ -17,7 +17,7 @@ PALETTE_INIT( galpanic );
WRITE16_HANDLER( galpanic_bgvideoram_w );
WRITE16_HANDLER( galpanic_paletteram_w );
VIDEO_START( galpanic );
-VIDEO_UPDATE( galpanic );
-VIDEO_UPDATE( comad );
+SCREEN_UPDATE( galpanic );
+SCREEN_UPDATE( comad );
diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h
index c99ee3c656b..524925d325c 100644
--- a/src/mame/includes/galspnbl.h
+++ b/src/mame/includes/galspnbl.h
@@ -29,4 +29,4 @@ public:
PALETTE_INIT( galspnbl );
-VIDEO_UPDATE( galspnbl );
+SCREEN_UPDATE( galspnbl );
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index 6b53caf4b35..ceb380d07f1 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -35,5 +35,5 @@ WRITE8_HANDLER( gaplus_videoram_w );
WRITE8_HANDLER( gaplus_starfield_control_w );
VIDEO_START( gaplus );
PALETTE_INIT( gaplus );
-VIDEO_UPDATE( gaplus );
-VIDEO_EOF( gaplus ); /* update starfields */
+SCREEN_UPDATE( gaplus );
+SCREEN_EOF( gaplus ); /* update starfields */
diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h
index 89b82715f3f..4deeff09de9 100644
--- a/src/mame/includes/gatron.h
+++ b/src/mame/includes/gatron.h
@@ -13,5 +13,5 @@ public:
WRITE8_HANDLER( gat_videoram_w );
PALETTE_INIT( gat );
VIDEO_START( gat );
-VIDEO_UPDATE( gat );
+SCREEN_UPDATE( gat );
diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h
index 96c01ebef9b..6a3d81da743 100644
--- a/src/mame/includes/gauntlet.h
+++ b/src/mame/includes/gauntlet.h
@@ -25,4 +25,4 @@ WRITE16_HANDLER( gauntlet_xscroll_w );
WRITE16_HANDLER( gauntlet_yscroll_w );
VIDEO_START( gauntlet );
-VIDEO_UPDATE( gauntlet );
+SCREEN_UPDATE( gauntlet );
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index 678cca7bb80..d8a5d1f070a 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -37,5 +37,5 @@ WRITE8_HANDLER( gberet_sprite_bank_w );
PALETTE_INIT( gberet );
VIDEO_START( gberet );
-VIDEO_UPDATE( gberet );
-VIDEO_UPDATE( gberetb );
+SCREEN_UPDATE( gberet );
+SCREEN_UPDATE( gberetb );
diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h
index 9da3877da54..6e86ebe8d62 100644
--- a/src/mame/includes/gbusters.h
+++ b/src/mame/includes/gbusters.h
@@ -35,4 +35,4 @@ extern void gbusters_tile_callback(running_machine *machine, int layer,int bank,
extern void gbusters_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow);
VIDEO_START( gbusters );
-VIDEO_UPDATE( gbusters );
+SCREEN_UPDATE( gbusters );
diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h
index c18083b597e..de7c3c4c93a 100644
--- a/src/mame/includes/gcpinbal.h
+++ b/src/mame/includes/gcpinbal.h
@@ -41,7 +41,7 @@ public:
/*----------- defined in video/gcpinbal.c -----------*/
VIDEO_START( gcpinbal );
-VIDEO_UPDATE( gcpinbal );
+SCREEN_UPDATE( gcpinbal );
READ16_HANDLER ( gcpinbal_tilemaps_word_r );
WRITE16_HANDLER( gcpinbal_tilemaps_word_w );
diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h
index be4af4e86e4..60a62715653 100644
--- a/src/mame/includes/gijoe.h
+++ b/src/mame/includes/gijoe.h
@@ -39,4 +39,4 @@ extern void gijoe_sprite_callback(running_machine *machine, int *code, int *colo
extern void gijoe_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
VIDEO_START( gijoe );
-VIDEO_UPDATE( gijoe );
+SCREEN_UPDATE( gijoe );
diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h
index 3e89e108005..dea51b79fe2 100644
--- a/src/mame/includes/ginganin.h
+++ b/src/mame/includes/ginganin.h
@@ -47,4 +47,4 @@ WRITE16_HANDLER( ginganin_txtram16_w );
WRITE16_HANDLER( ginganin_vregs16_w );
VIDEO_START( ginganin );
-VIDEO_UPDATE( ginganin );
+SCREEN_UPDATE( ginganin );
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index b6cdcfddd9f..b85b4e38072 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -37,6 +37,6 @@ WRITE8_HANDLER( gladiatr_video_registers_w );
WRITE8_HANDLER( gladiatr_spritebuffer_w );
WRITE8_HANDLER( gladiatr_spritebank_w );
VIDEO_START( ppking );
-VIDEO_UPDATE( ppking );
+SCREEN_UPDATE( ppking );
VIDEO_START( gladiatr );
-VIDEO_UPDATE( gladiatr );
+SCREEN_UPDATE( gladiatr );
diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h
index c6a18b7a830..5343dd85018 100644
--- a/src/mame/includes/glass.h
+++ b/src/mame/includes/glass.h
@@ -32,4 +32,4 @@ WRITE16_HANDLER( glass_vram_w );
WRITE16_HANDLER( glass_blitter_w );
VIDEO_START( glass );
-VIDEO_UPDATE( glass );
+SCREEN_UPDATE( glass );
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index beba55ac16f..fe6588c42fb 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -33,5 +33,5 @@ WRITE8_HANDLER( gng_bgscrolly_w );
WRITE8_HANDLER( gng_flipscreen_w );
VIDEO_START( gng );
-VIDEO_UPDATE( gng );
-VIDEO_EOF( gng );
+SCREEN_UPDATE( gng );
+SCREEN_EOF( gng );
diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h
index 6878b6d45be..a0effc7d473 100644
--- a/src/mame/includes/goal92.h
+++ b/src/mame/includes/goal92.h
@@ -43,5 +43,5 @@ WRITE16_HANDLER( goal92_fg_bank_w );
READ16_HANDLER( goal92_fg_bank_r );
VIDEO_START( goal92 );
-VIDEO_UPDATE( goal92 );
-VIDEO_EOF( goal92 );
+SCREEN_UPDATE( goal92 );
+SCREEN_EOF( goal92 );
diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h
index 95e20f971a5..a5f031921c8 100644
--- a/src/mame/includes/goindol.h
+++ b/src/mame/includes/goindol.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( goindol_fg_videoram_w );
WRITE8_HANDLER( goindol_bg_videoram_w );
VIDEO_START( goindol );
-VIDEO_UPDATE( goindol );
+SCREEN_UPDATE( goindol );
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index ec39e26f49a..be5dfaa2123 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -61,8 +61,8 @@ VIDEO_START( goldstar );
VIDEO_START( cherrym );
VIDEO_START( unkch );
VIDEO_START( magical );
-VIDEO_UPDATE( goldstar );
-VIDEO_UPDATE( cmast91 );
-VIDEO_UPDATE( amcoe1a );
-VIDEO_UPDATE( unkch );
-VIDEO_UPDATE( magical );
+SCREEN_UPDATE( goldstar );
+SCREEN_UPDATE( cmast91 );
+SCREEN_UPDATE( amcoe1a );
+SCREEN_UPDATE( unkch );
+SCREEN_UPDATE( magical );
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index 7d812d410f1..6534c843a38 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -16,7 +16,7 @@ extern UINT8 *gomoku_bgram;
PALETTE_INIT( gomoku );
VIDEO_START( gomoku );
-VIDEO_UPDATE( gomoku );
+SCREEN_UPDATE( gomoku );
WRITE8_HANDLER( gomoku_videoram_w );
WRITE8_HANDLER( gomoku_colorram_w );
diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h
index 2435da08406..7d7dbed1416 100644
--- a/src/mame/includes/gotcha.h
+++ b/src/mame/includes/gotcha.h
@@ -31,7 +31,7 @@ public:
VIDEO_START( gotcha );
-VIDEO_UPDATE( gotcha );
+SCREEN_UPDATE( gotcha );
WRITE16_HANDLER( gotcha_fgvideoram_w );
WRITE16_HANDLER( gotcha_bgvideoram_w );
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index a80c2c8b8be..a8c91582880 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -81,4 +81,4 @@ extern WRITE8_HANDLER( gottlieb_paletteram_w );
VIDEO_START( gottlieb );
VIDEO_START( screwloo );
-VIDEO_UPDATE( gottlieb );
+SCREEN_UPDATE( gottlieb );
diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h
index 5ce5aa69041..e402ce1d9b3 100644
--- a/src/mame/includes/gotya.h
+++ b/src/mame/includes/gotya.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( gotya_video_control_w );
PALETTE_INIT( gotya );
VIDEO_START( gotya );
-VIDEO_UPDATE( gotya );
+SCREEN_UPDATE( gotya );
diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h
index 9f5bf403c93..3ce4dcd38c7 100644
--- a/src/mame/includes/gradius3.h
+++ b/src/mame/includes/gradius3.h
@@ -39,4 +39,4 @@ READ16_HANDLER( gradius3_gfxrom_r );
WRITE16_HANDLER( gradius3_gfxram_w );
VIDEO_START( gradius3 );
-VIDEO_UPDATE( gradius3 );
+SCREEN_UPDATE( gradius3 );
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index efa7e33a9a1..e260ced5c7d 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -60,7 +60,7 @@ DISCRETE_SOUND_EXTERN( grchamp );
PALETTE_INIT( grchamp );
VIDEO_START( grchamp );
-VIDEO_UPDATE( grchamp );
+SCREEN_UPDATE( grchamp );
WRITE8_HANDLER( grchamp_left_w );
WRITE8_HANDLER( grchamp_center_w );
WRITE8_HANDLER( grchamp_right_w );
diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h
index 1f83227ed16..87674888df5 100644
--- a/src/mame/includes/gridlee.h
+++ b/src/mame/includes/gridlee.h
@@ -44,7 +44,7 @@ DECLARE_LEGACY_SOUND_DEVICE(GRIDLEE, gridlee_sound);
PALETTE_INIT( gridlee );
VIDEO_START( gridlee );
-VIDEO_UPDATE( gridlee );
+SCREEN_UPDATE( gridlee );
WRITE8_HANDLER( gridlee_cocktail_flip_w );
WRITE8_HANDLER( gridlee_videoram_w );
diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h
index 11d909e1a61..d3622350aac 100644
--- a/src/mame/includes/groundfx.h
+++ b/src/mame/includes/groundfx.h
@@ -27,4 +27,4 @@ public:
/*----------- defined in video/groundfx.c -----------*/
VIDEO_START( groundfx );
-VIDEO_UPDATE( groundfx );
+SCREEN_UPDATE( groundfx );
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h
index 008dfdfddf0..60ccf7968f1 100644
--- a/src/mame/includes/gstriker.h
+++ b/src/mame/includes/gstriker.h
@@ -72,7 +72,7 @@ extern tCG10103 CG10103[MAX_CG10103];
#define CG10103_0_vram (CG10103[0].vram)
#define CG10103_1_vram (CG10103[1].vram)
-VIDEO_UPDATE( gstriker );
+SCREEN_UPDATE( gstriker );
VIDEO_START( gstriker );
VIDEO_START( twrldc94 );
VIDEO_START( vgoalsoc );
diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h
index 773f6b5cc3f..6371cd64a85 100644
--- a/src/mame/includes/gsword.h
+++ b/src/mame/includes/gsword.h
@@ -32,4 +32,4 @@ WRITE8_HANDLER( gsword_scroll_w );
PALETTE_INIT( josvolly );
PALETTE_INIT( gsword );
VIDEO_START( gsword );
-VIDEO_UPDATE( gsword );
+SCREEN_UPDATE( gsword );
diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h
index 4485f30d677..36a45311a80 100644
--- a/src/mame/includes/gumbo.h
+++ b/src/mame/includes/gumbo.h
@@ -27,4 +27,4 @@ WRITE16_HANDLER( gumbo_bg_videoram_w );
WRITE16_HANDLER( gumbo_fg_videoram_w );
VIDEO_START( gumbo );
-VIDEO_UPDATE( gumbo );
+SCREEN_UPDATE( gumbo );
diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h
index 6fb406023d6..e35f14121fa 100644
--- a/src/mame/includes/gunbustr.h
+++ b/src/mame/includes/gunbustr.h
@@ -24,4 +24,4 @@ public:
/*----------- defined in video/gunbustr.c -----------*/
VIDEO_START( gunbustr );
-VIDEO_UPDATE( gunbustr );
+SCREEN_UPDATE( gunbustr );
diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h
index ced67f57318..65f0e6ef424 100644
--- a/src/mame/includes/gundealr.h
+++ b/src/mame/includes/gundealr.h
@@ -37,5 +37,5 @@ WRITE8_HANDLER( gundealr_fg_scroll_w );
WRITE8_HANDLER( yamyam_fg_scroll_w );
WRITE8_HANDLER( gundealr_flipscreen_w );
-VIDEO_UPDATE( gundealr );
+SCREEN_UPDATE( gundealr );
VIDEO_START( gundealr );
diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h
index 3c04345ce62..e8e19567ce1 100644
--- a/src/mame/includes/gunsmoke.h
+++ b/src/mame/includes/gunsmoke.h
@@ -34,5 +34,5 @@ WRITE8_HANDLER( gunsmoke_colorram_w );
PALETTE_INIT( gunsmoke );
VIDEO_START( gunsmoke );
-VIDEO_UPDATE( gunsmoke );
+SCREEN_UPDATE( gunsmoke );
diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h
index 4ef31ffe5ef..dca9342d589 100644
--- a/src/mame/includes/gyruss.h
+++ b/src/mame/includes/gyruss.h
@@ -32,4 +32,4 @@ READ8_HANDLER( gyruss_scanline_r );
PALETTE_INIT( gyruss );
VIDEO_START( gyruss );
-VIDEO_UPDATE( gyruss );
+SCREEN_UPDATE( gyruss );
diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h
index 46ad143c811..6c5a4795c41 100644
--- a/src/mame/includes/hanaawas.h
+++ b/src/mame/includes/hanaawas.h
@@ -30,4 +30,4 @@ WRITE8_DEVICE_HANDLER( hanaawas_portB_w );
PALETTE_INIT( hanaawas );
VIDEO_START( hanaawas );
-VIDEO_UPDATE( hanaawas );
+SCREEN_UPDATE( hanaawas );
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 9ca4dc6b8ee..8601a61d481 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -40,5 +40,5 @@ WRITE8_HANDLER( hcastle_pf1_control_w );
WRITE8_HANDLER( hcastle_pf2_control_w );
PALETTE_INIT( hcastle );
-VIDEO_UPDATE( hcastle );
+SCREEN_UPDATE( hcastle );
VIDEO_START( hcastle );
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index 215a701225d..3a702e495e9 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -17,7 +17,7 @@ public:
/*----------- defined in video/hexion.c -----------*/
VIDEO_START( hexion );
-VIDEO_UPDATE( hexion );
+SCREEN_UPDATE( hexion );
WRITE8_HANDLER( hexion_bankswitch_w );
READ8_HANDLER( hexion_bankedram_r );
diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h
index a42bf0967f8..6aa7e94f102 100644
--- a/src/mame/includes/higemaru.h
+++ b/src/mame/includes/higemaru.h
@@ -29,4 +29,4 @@ WRITE8_HANDLER( higemaru_c800_w );
PALETTE_INIT( higemaru );
VIDEO_START( higemaru );
-VIDEO_UPDATE( higemaru );
+SCREEN_UPDATE( higemaru );
diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h
index a2cc1b5d7ff..4bbee9dbf6a 100644
--- a/src/mame/includes/himesiki.h
+++ b/src/mame/includes/himesiki.h
@@ -28,7 +28,7 @@ public:
/*----------- defined in video/himesiki.c -----------*/
VIDEO_START( himesiki );
-VIDEO_UPDATE( himesiki );
+SCREEN_UPDATE( himesiki );
WRITE8_HANDLER( himesiki_bg_ram_w );
WRITE8_HANDLER( himesiki_scrollx_w );
diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h
index 2acf760e080..0f56ed955e4 100644
--- a/src/mame/includes/hnayayoi.h
+++ b/src/mame/includes/hnayayoi.h
@@ -27,7 +27,7 @@ public:
VIDEO_START( hnayayoi );
VIDEO_START( untoucha );
-VIDEO_UPDATE( hnayayoi );
+SCREEN_UPDATE( hnayayoi );
WRITE8_HANDLER( dynax_blitter_rev1_param_w );
WRITE8_HANDLER( dynax_blitter_rev1_start_w );
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index b6bc4f7b80d..a8ef8a7bb75 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -103,4 +103,4 @@ WRITE32_HANDLER( hng64_videoram_w );
void hng64_command3d(running_machine* machine, const UINT16* packet);
VIDEO_START( hng64 );
-VIDEO_UPDATE( hng64 );
+SCREEN_UPDATE( hng64 );
diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h
index 34d6918ed29..e7fced3c66f 100644
--- a/src/mame/includes/holeland.h
+++ b/src/mame/includes/holeland.h
@@ -28,8 +28,8 @@ public:
VIDEO_START( holeland );
VIDEO_START( crzrally );
-VIDEO_UPDATE( holeland );
-VIDEO_UPDATE( crzrally );
+SCREEN_UPDATE( holeland );
+SCREEN_UPDATE( crzrally );
WRITE8_HANDLER( holeland_videoram_w );
WRITE8_HANDLER( holeland_colorram_w );
diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h
index 3641f02ed19..500324f2f93 100644
--- a/src/mame/includes/homedata.h
+++ b/src/mame/includes/homedata.h
@@ -63,8 +63,8 @@ VIDEO_START( reikaids );
VIDEO_START( pteacher );
VIDEO_START( lemnangl );
VIDEO_START( mirderby );
-VIDEO_UPDATE( mrokumei );
-VIDEO_UPDATE( reikaids );
-VIDEO_UPDATE( pteacher );
-VIDEO_UPDATE( mirderby );
-VIDEO_EOF( homedata );
+SCREEN_UPDATE( mrokumei );
+SCREEN_UPDATE( reikaids );
+SCREEN_UPDATE( pteacher );
+SCREEN_UPDATE( mirderby );
+SCREEN_EOF( homedata );
diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h
index ffde5470946..f9be211f45f 100644
--- a/src/mame/includes/homerun.h
+++ b/src/mame/includes/homerun.h
@@ -32,4 +32,4 @@ WRITE8_HANDLER( homerun_color_w );
WRITE8_DEVICE_HANDLER( homerun_banking_w );
VIDEO_START(homerun);
-VIDEO_UPDATE(homerun);
+SCREEN_UPDATE(homerun);
diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h
index cc0db0a1364..724c14fe0ac 100644
--- a/src/mame/includes/hyhoo.h
+++ b/src/mame/includes/hyhoo.h
@@ -2,7 +2,7 @@
extern UINT8 *hyhoo_clut;
-VIDEO_UPDATE( hyhoo );
+SCREEN_UPDATE( hyhoo );
VIDEO_START( hyhoo );
WRITE8_HANDLER( hyhoo_blitter_w );
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index e3912856d24..5fcb9bf6136 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -26,6 +26,6 @@ WRITE8_HANDLER( hyperspt_flipscreen_w );
PALETTE_INIT( hyperspt );
VIDEO_START( hyperspt );
-VIDEO_UPDATE( hyperspt );
+SCREEN_UPDATE( hyperspt );
VIDEO_START( roadf );
diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h
index 02c5415f086..134644341e3 100644
--- a/src/mame/includes/hyprduel.h
+++ b/src/mame/includes/hyprduel.h
@@ -62,4 +62,4 @@ WRITE16_HANDLER( hyprduel_scrollreg_init_w );
VIDEO_START( hyprduel_14220 );
VIDEO_START( magerror_14220 );
-VIDEO_UPDATE( hyprduel );
+SCREEN_UPDATE( hyprduel );
diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h
index 94c2638d875..341d4150ffe 100644
--- a/src/mame/includes/ikki.h
+++ b/src/mame/includes/ikki.h
@@ -30,4 +30,4 @@ WRITE8_HANDLER( ikki_scrn_ctrl_w );
PALETTE_INIT( ikki );
VIDEO_START( ikki );
-VIDEO_UPDATE( ikki );
+SCREEN_UPDATE( ikki );
diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h
index d20e61cbd97..932c3a610b3 100644
--- a/src/mame/includes/inufuku.h
+++ b/src/mame/includes/inufuku.h
@@ -38,5 +38,5 @@ WRITE16_HANDLER( inufuku_tx_videoram_w );
WRITE16_HANDLER( inufuku_palettereg_w );
WRITE16_HANDLER( inufuku_scrollreg_w );
-VIDEO_UPDATE( inufuku );
+SCREEN_UPDATE( inufuku );
VIDEO_START( inufuku );
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index c84400612db..1188f88df92 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -22,4 +22,4 @@ READ8_HANDLER( iqblock_bgvideoram_r );
WRITE8_HANDLER( iqblock_fgscroll_w );
VIDEO_START( iqblock );
-VIDEO_UPDATE( iqblock );
+SCREEN_UPDATE( iqblock );
diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h
index fe69de29f0d..fd8fa698237 100644
--- a/src/mame/includes/irobot.h
+++ b/src/mame/includes/irobot.h
@@ -84,7 +84,7 @@ WRITE8_HANDLER( irobot_sharedmem_w );
PALETTE_INIT( irobot );
VIDEO_START( irobot );
-VIDEO_UPDATE( irobot );
+SCREEN_UPDATE( irobot );
WRITE8_HANDLER( irobot_paletteram_w );
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index c4d152c743f..f4c30d03396 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -38,6 +38,6 @@ WRITE8_HANDLER( ironhors_flipscreen_w );
PALETTE_INIT( ironhors );
VIDEO_START( ironhors );
-VIDEO_UPDATE( ironhors );
+SCREEN_UPDATE( ironhors );
VIDEO_START( farwest );
-VIDEO_UPDATE( farwest );
+SCREEN_UPDATE( farwest );
diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h
index ae6c08c4ee7..c0942ddcf43 100644
--- a/src/mame/includes/itech32.h
+++ b/src/mame/includes/itech32.h
@@ -109,4 +109,4 @@ WRITE32_HANDLER( itech020_video_w );
READ32_HANDLER( itech020_video_r );
WRITE32_HANDLER( drivedge_zbuf_control_w );
-VIDEO_UPDATE( itech32 );
+SCREEN_UPDATE( itech32 );
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index f8a78a79acd..a10e5a23fb0 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -20,7 +20,7 @@ READ8_HANDLER( slikshot_z80_control_r );
WRITE8_HANDLER( slikshot_z80_control_w );
VIDEO_START( slikshot );
-VIDEO_UPDATE( slikshot );
+SCREEN_UPDATE( slikshot );
/*----------- defined in video/itech8.c -----------*/
@@ -43,7 +43,7 @@ WRITE8_HANDLER( grmatch_palette_w );
WRITE8_HANDLER( grmatch_xscroll_w );
TIMER_DEVICE_CALLBACK( grmatch_palette_update );
-VIDEO_UPDATE( itech8_2layer );
-VIDEO_UPDATE( itech8_grmatch );
-VIDEO_UPDATE( itech8_2page );
-VIDEO_UPDATE( itech8_2page_large );
+SCREEN_UPDATE( itech8_2layer );
+SCREEN_UPDATE( itech8_grmatch );
+SCREEN_UPDATE( itech8_2page );
+SCREEN_UPDATE( itech8_2page_large );
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index ff93f9cf1e2..c88e3c2c3e0 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -42,8 +42,8 @@ READ8_HANDLER( jack_flipscreen_r );
WRITE8_HANDLER( jack_flipscreen_w );
VIDEO_START( jack );
-VIDEO_UPDATE( jack );
+SCREEN_UPDATE( jack );
PALETTE_INIT( joinem );
VIDEO_START( joinem );
-VIDEO_UPDATE( joinem );
+SCREEN_UPDATE( joinem );
diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h
index 49c796c305d..0c21b921a91 100644
--- a/src/mame/includes/jackal.h
+++ b/src/mame/includes/jackal.h
@@ -35,4 +35,4 @@ void jackal_mark_tile_dirty(running_machine *machine, int offset);
PALETTE_INIT( jackal );
VIDEO_START( jackal );
-VIDEO_UPDATE( jackal );
+SCREEN_UPDATE( jackal );
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 07ec2da851e..31ffc462f84 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -67,4 +67,4 @@ WRITE32_HANDLER( jaguar_tom_regs32_w );
READ32_HANDLER( cojag_gun_input_r );
VIDEO_START( cojag );
-VIDEO_UPDATE( cojag );
+SCREEN_UPDATE( cojag );
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 94f2ec38435..ca477a2f281 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -36,4 +36,4 @@ WRITE8_HANDLER( jailbrek_colorram_w );
PALETTE_INIT( jailbrek );
VIDEO_START( jailbrek );
-VIDEO_UPDATE( jailbrek );
+SCREEN_UPDATE( jailbrek );
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index cdc3e3befc3..e370222998d 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -117,13 +117,13 @@ VIDEO_START( berlwall );
VIDEO_START( sandscrp_1xVIEW2 );
-VIDEO_UPDATE( kaneko16 );
-VIDEO_UPDATE( sandscrp );
-VIDEO_UPDATE( berlwall );
-VIDEO_UPDATE( jchan_view2 );
+SCREEN_UPDATE( kaneko16 );
+SCREEN_UPDATE( sandscrp );
+SCREEN_UPDATE( berlwall );
+SCREEN_UPDATE( jchan_view2 );
VIDEO_START( galsnew );
-VIDEO_UPDATE( galsnew );
+SCREEN_UPDATE( galsnew );
extern UINT16* galsnew_bg_pixram;
extern UINT16* galsnew_fg_pixram;
@@ -140,7 +140,7 @@ extern UINT16 *galpani2_bg15;
PALETTE_INIT( galpani2 );
VIDEO_START( galpani2 );
-VIDEO_UPDATE( galpani2 );
+SCREEN_UPDATE( galpani2 );
WRITE16_HANDLER( galpani2_palette_0_w );
WRITE16_HANDLER( galpani2_palette_1_w );
diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h
index f387ee32950..a620577c5d1 100644
--- a/src/mame/includes/kangaroo.h
+++ b/src/mame/includes/kangaroo.h
@@ -28,7 +28,7 @@ public:
/*----------- defined in video/kangaroo.c -----------*/
VIDEO_START( kangaroo );
-VIDEO_UPDATE( kangaroo );
+SCREEN_UPDATE( kangaroo );
WRITE8_HANDLER( kangaroo_videoram_w );
WRITE8_HANDLER( kangaroo_video_control_w );
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index ba564fff0c8..0130906afe6 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -53,4 +53,4 @@ void karnov_flipscreen_w(running_machine *machine, int data);
PALETTE_INIT( karnov );
VIDEO_START( karnov );
VIDEO_START( wndrplnt );
-VIDEO_UPDATE( karnov );
+SCREEN_UPDATE( karnov );
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index 304b2575d60..fdd93d02040 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -39,5 +39,5 @@ WRITE8_HANDLER( kchamp_flipscreen_w );
PALETTE_INIT( kchamp );
VIDEO_START( kchamp );
-VIDEO_UPDATE( kchamp );
-VIDEO_UPDATE( kchampvs );
+SCREEN_UPDATE( kchamp );
+SCREEN_UPDATE( kchampvs );
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index 298030e1714..9a821fa34bb 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -46,7 +46,7 @@ WRITE16_HANDLER( kickgoal_bgram_w );
WRITE16_HANDLER( kickgoal_bg2ram_w );
VIDEO_START( kickgoal );
-VIDEO_UPDATE( kickgoal );
+SCREEN_UPDATE( kickgoal );
VIDEO_START( actionhw );
-VIDEO_UPDATE( actionhw );
+SCREEN_UPDATE( actionhw );
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index a30bf22bccb..807567907b6 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -43,8 +43,8 @@ WRITE8_HANDLER( kingofb_f800_w );
PALETTE_INIT( kingofb );
VIDEO_START( kingofb );
-VIDEO_UPDATE( kingofb );
+SCREEN_UPDATE( kingofb );
PALETTE_INIT( ringking );
VIDEO_START( ringking );
-VIDEO_UPDATE( ringking );
+SCREEN_UPDATE( ringking );
diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h
index 2715bc9e493..168436c0094 100644
--- a/src/mame/includes/klax.h
+++ b/src/mame/includes/klax.h
@@ -19,4 +19,4 @@ public:
WRITE16_HANDLER( klax_latch_w );
VIDEO_START( klax );
-VIDEO_UPDATE( klax );
+SCREEN_UPDATE( klax );
diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h
index ac4de2f3442..1ac9ccaa102 100644
--- a/src/mame/includes/kncljoe.h
+++ b/src/mame/includes/kncljoe.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER(kncljoe_scroll_w);
PALETTE_INIT( kncljoe );
VIDEO_START( kncljoe );
-VIDEO_UPDATE( kncljoe );
+SCREEN_UPDATE( kncljoe );
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index a41bcb76d25..7c609133233 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -85,7 +85,7 @@ VIDEO_START(dragoonj);
VIDEO_START(winspike);
VIDEO_START(opengolf);
VIDEO_START(racinfrc);
-VIDEO_UPDATE(konamigx);
+SCREEN_UPDATE(konamigx);
WRITE32_HANDLER( konamigx_palette_w );
#ifdef UNUSED_FUNCTION
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index 92e3b598e2a..d30393d3e3f 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -35,4 +35,4 @@ WRITE8_HANDLER( kopunch_gfxbank_w );
PALETTE_INIT( kopunch );
VIDEO_START( kopunch );
-VIDEO_UPDATE( kopunch );
+SCREEN_UPDATE( kopunch );
diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h
index 041cdfcea97..0eafb47cc1c 100644
--- a/src/mame/includes/ksayakyu.h
+++ b/src/mame/includes/ksayakyu.h
@@ -30,4 +30,4 @@ WRITE8_HANDLER( ksayakyu_videoram_w );
WRITE8_HANDLER( ksayakyu_videoctrl_w );
PALETTE_INIT( ksayakyu );
VIDEO_START( ksayakyu );
-VIDEO_UPDATE( ksayakyu );
+SCREEN_UPDATE( ksayakyu );
diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h
index f29fc279ca6..8bfb8268e49 100644
--- a/src/mame/includes/kyugo.h
+++ b/src/mame/includes/kyugo.h
@@ -44,4 +44,4 @@ WRITE8_HANDLER( kyugo_scroll_y_w );
WRITE8_HANDLER( kyugo_flipscreen_w );
VIDEO_START( kyugo );
-VIDEO_UPDATE( kyugo );
+SCREEN_UPDATE( kyugo );
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index 1061e61642f..45a1e700e8f 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -34,4 +34,4 @@ WRITE8_HANDLER( labyrunr_vram2_w );
PALETTE_INIT( labyrunr );
VIDEO_START( labyrunr );
-VIDEO_UPDATE( labyrunr );
+SCREEN_UPDATE( labyrunr );
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index 11365909012..9746231a9a4 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -51,12 +51,12 @@ WRITE8_HANDLER( sraider_io_w );
PALETTE_INIT( ladybug );
VIDEO_START( ladybug );
-VIDEO_UPDATE( ladybug );
+SCREEN_UPDATE( ladybug );
PALETTE_INIT( sraider );
VIDEO_START( sraider );
-VIDEO_UPDATE( sraider );
-VIDEO_EOF( sraider );
+SCREEN_UPDATE( sraider );
+SCREEN_EOF( sraider );
/*----------- defined in video/redclash.c -----------*/
@@ -71,8 +71,8 @@ WRITE8_HANDLER( redclash_star_reset_w );
PALETTE_INIT( redclash );
VIDEO_START( redclash );
-VIDEO_UPDATE( redclash );
-VIDEO_EOF( redclash );
+SCREEN_UPDATE( redclash );
+SCREEN_EOF( redclash );
/* sraider uses the zerohour star generator board */
void redclash_set_stars_enable(running_machine *machine, UINT8 on);
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index 7a3fbbe72a0..52b067bfbab 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -49,4 +49,4 @@ READ8_HANDLER( ladyfrog_videoram_r );
VIDEO_START( ladyfrog );
VIDEO_START( toucheme );
-VIDEO_UPDATE( ladyfrog );
+SCREEN_UPDATE( ladyfrog );
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index c209857dbaa..41e2f5b785a 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -49,7 +49,7 @@ VIDEO_START( lasso );
VIDEO_START( wwjgtin );
VIDEO_START( pinbo );
-VIDEO_UPDATE( lasso );
-VIDEO_UPDATE( chameleo );
-VIDEO_UPDATE( wwjgtin );
-VIDEO_UPDATE( pinbo );
+SCREEN_UPDATE( lasso );
+SCREEN_UPDATE( chameleo );
+SCREEN_UPDATE( wwjgtin );
+SCREEN_UPDATE( pinbo );
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index 3034f584b3b..2a6a00b9a5b 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -39,6 +39,6 @@ WRITE16_HANDLER( lastduel_palette_word_w );
VIDEO_START( lastduel );
VIDEO_START( madgear );
-VIDEO_UPDATE( lastduel );
-VIDEO_UPDATE( madgear );
-VIDEO_EOF( lastduel );
+SCREEN_UPDATE( lastduel );
+SCREEN_UPDATE( madgear );
+SCREEN_EOF( lastduel );
diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h
index 0e90b7d175d..3f5d6e6af84 100644
--- a/src/mame/includes/lazercmd.h
+++ b/src/mame/includes/lazercmd.h
@@ -40,4 +40,4 @@ public:
/*----------- defined in video/lazercmd.c -----------*/
-VIDEO_UPDATE( lazercmd );
+SCREEN_UPDATE( lazercmd );
diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h
index e4f7b3ab80b..30addab24af 100644
--- a/src/mame/includes/legionna.h
+++ b/src/mame/includes/legionna.h
@@ -15,6 +15,6 @@ VIDEO_START( cupsoc );
VIDEO_START( denjinmk );
VIDEO_START( grainbow );
VIDEO_START( godzilla );
-VIDEO_UPDATE( legionna );
-VIDEO_UPDATE( godzilla );
-VIDEO_UPDATE( grainbow );
+SCREEN_UPDATE( legionna );
+SCREEN_UPDATE( godzilla );
+SCREEN_UPDATE( grainbow );
diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h
index 63cd2008edc..7e9d9230dd1 100644
--- a/src/mame/includes/lemmings.h
+++ b/src/mame/includes/lemmings.h
@@ -32,5 +32,5 @@ WRITE16_HANDLER( lemmings_pixel_1_w );
WRITE16_HANDLER( lemmings_vram_w );
VIDEO_START( lemmings );
-VIDEO_EOF( lemmings );
-VIDEO_UPDATE( lemmings );
+SCREEN_EOF( lemmings );
+SCREEN_UPDATE( lemmings );
diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h
index e5a593d159d..e85dbda983d 100644
--- a/src/mame/includes/lethal.h
+++ b/src/mame/includes/lethal.h
@@ -36,4 +36,4 @@ extern void lethalen_tile_callback(running_machine *machine, int layer, int *cod
WRITE8_HANDLER(lethalen_palette_control);
VIDEO_START(lethalen);
-VIDEO_UPDATE(lethalen);
+SCREEN_UPDATE(lethalen);
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index 0350b8f97f3..8cc6d62d7df 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -31,10 +31,10 @@ public:
/*----------- defined in video/liberate.c -----------*/
PALETTE_INIT( liberate );
-VIDEO_UPDATE( prosoccr );
-VIDEO_UPDATE( prosport );
-VIDEO_UPDATE( liberate );
-VIDEO_UPDATE( boomrang );
+SCREEN_UPDATE( prosoccr );
+SCREEN_UPDATE( prosport );
+SCREEN_UPDATE( liberate );
+SCREEN_UPDATE( boomrang );
VIDEO_START( prosoccr );
VIDEO_START( prosport );
VIDEO_START( boomrang );
diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h
index 2b73dc073d3..64317b3d92f 100644
--- a/src/mame/includes/liberatr.h
+++ b/src/mame/includes/liberatr.h
@@ -37,7 +37,7 @@ protected:
virtual void machine_start();
virtual void video_start();
- virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
+ virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
void init_planet(planet &liberatr_planet, UINT8 *planet_rom);
void get_pens(pen_t *pens);
diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h
index cf3291aa7e8..f3170c5ca6f 100644
--- a/src/mame/includes/lkage.h
+++ b/src/mame/includes/lkage.h
@@ -57,5 +57,5 @@ READ8_HANDLER( lkage_mcu_status_r );
WRITE8_HANDLER( lkage_videoram_w );
VIDEO_START( lkage );
-VIDEO_UPDATE( lkage );
+SCREEN_UPDATE( lkage );
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index c6dec719075..c8e7044c17a 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -80,8 +80,8 @@ public:
PALETTE_INIT( lockon );
VIDEO_START( lockon );
-VIDEO_UPDATE( lockon );
-VIDEO_EOF( lockon );
+SCREEN_UPDATE( lockon );
+SCREEN_EOF( lockon );
READ16_HANDLER( lockon_crtc_r );
WRITE16_HANDLER( lockon_crtc_w );
WRITE16_HANDLER( lockon_rotate_w );
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index c4cad837d22..d7dab5f262c 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -56,4 +56,4 @@ float lordgun_crosshair_mapper(const input_field_config *field, float linear_val
void lordgun_update_gun(running_machine *machine, int i);
VIDEO_START( lordgun );
-VIDEO_UPDATE( lordgun );
+SCREEN_UPDATE( lordgun );
diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h
index 2b5fd6134d9..ac688b88af9 100644
--- a/src/mame/includes/lsasquad.h
+++ b/src/mame/includes/lsasquad.h
@@ -55,5 +55,5 @@ READ8_HANDLER( daikaiju_mcu_status_r );
/*----------- defined in video/lsasquad.c -----------*/
-VIDEO_UPDATE( lsasquad );
-VIDEO_UPDATE( daikaiju );
+SCREEN_UPDATE( lsasquad );
+SCREEN_UPDATE( daikaiju );
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index f3fc5931e32..60d0dfd4007 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -8,4 +8,4 @@ WRITE8_HANDLER( lucky74_bg_videoram_w );
WRITE8_HANDLER( lucky74_bg_colorram_w );
PALETTE_INIT( lucky74 );
VIDEO_START( lucky74 );
-VIDEO_UPDATE( lucky74 );
+SCREEN_UPDATE( lucky74 );
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index 54c921acaf0..53838f4fd40 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -9,4 +9,4 @@ WRITE8_HANDLER( lvcards_colorram_w );
PALETTE_INIT( lvcards );
PALETTE_INIT( ponttehk );
VIDEO_START( lvcards );
-VIDEO_UPDATE( lvcards );
+SCREEN_UPDATE( lvcards );
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index b6970085b1d..3b0c5521c3f 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -39,6 +39,6 @@ WRITE8_HANDLER( trojan_bg2_image_w );
VIDEO_START( lwings );
VIDEO_START( trojan );
VIDEO_START( avengers );
-VIDEO_UPDATE( lwings );
-VIDEO_UPDATE( trojan );
-VIDEO_EOF( lwings );
+SCREEN_UPDATE( lwings );
+SCREEN_UPDATE( trojan );
+SCREEN_EOF( lwings );
diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h
index 7b227a3b3be..0c942f88934 100644
--- a/src/mame/includes/m10.h
+++ b/src/mame/includes/m10.h
@@ -70,8 +70,8 @@ WRITE8_HANDLER( m10_colorram_w );
WRITE8_HANDLER( m10_chargen_w );
WRITE8_HANDLER( m15_chargen_w );
-VIDEO_UPDATE( m10 );
-VIDEO_UPDATE( m15 );
+SCREEN_UPDATE( m10 );
+SCREEN_UPDATE( m15 );
VIDEO_START( m10 );
VIDEO_START( m15 );
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index 510a5ef57bc..e6232b1f46f 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -36,7 +36,7 @@ public:
/*----------- defined in video/m107.c -----------*/
WRITE16_HANDLER( m107_spritebuffer_w );
-VIDEO_UPDATE( m107 );
+SCREEN_UPDATE( m107 );
VIDEO_START( m107 );
WRITE16_HANDLER( m107_control_w );
WRITE16_HANDLER( m107_vram_w );
diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h
index ed4482684ee..18bea207ab2 100644
--- a/src/mame/includes/m52.h
+++ b/src/mame/includes/m52.h
@@ -34,4 +34,4 @@ WRITE8_HANDLER( m52_colorram_w );
PALETTE_INIT( m52 );
VIDEO_START( m52 );
-VIDEO_UPDATE( m52 );
+SCREEN_UPDATE( m52 );
diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h
index 9f253c046f8..9a4f69906b8 100644
--- a/src/mame/includes/m57.h
+++ b/src/mame/includes/m57.h
@@ -23,4 +23,4 @@ WRITE8_HANDLER( m57_flipscreen_w );
PALETTE_INIT( m57 );
VIDEO_START( m57 );
-VIDEO_UPDATE( m57 );
+SCREEN_UPDATE( m57 );
diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h
index caa6f88b7a7..79f3a5d2912 100644
--- a/src/mame/includes/m58.h
+++ b/src/mame/includes/m58.h
@@ -27,4 +27,4 @@ WRITE8_HANDLER( yard_flipscreen_w );
PALETTE_INIT( yard );
VIDEO_START( yard );
-VIDEO_UPDATE( yard );
+SCREEN_UPDATE( yard );
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index 966a2ac0271..b251bbebb51 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -67,14 +67,14 @@ VIDEO_START( spelunkr );
VIDEO_START( spelunk2 );
VIDEO_START( youjyudn );
-VIDEO_UPDATE( battroad );
-VIDEO_UPDATE( horizon );
-VIDEO_UPDATE( kidniki );
-VIDEO_UPDATE( kungfum );
-VIDEO_UPDATE( ldrun );
-VIDEO_UPDATE( ldrun3 );
-VIDEO_UPDATE( ldrun4 );
-VIDEO_UPDATE( lotlot );
-VIDEO_UPDATE( spelunkr );
-VIDEO_UPDATE( spelunk2 );
-VIDEO_UPDATE( youjyudn );
+SCREEN_UPDATE( battroad );
+SCREEN_UPDATE( horizon );
+SCREEN_UPDATE( kidniki );
+SCREEN_UPDATE( kungfum );
+SCREEN_UPDATE( ldrun );
+SCREEN_UPDATE( ldrun3 );
+SCREEN_UPDATE( ldrun4 );
+SCREEN_UPDATE( lotlot );
+SCREEN_UPDATE( spelunkr );
+SCREEN_UPDATE( spelunk2 );
+SCREEN_UPDATE( youjyudn );
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index 39c30f6ec96..a370b3dedda 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -63,5 +63,5 @@ WRITE16_HANDLER( m72_port02_w );
WRITE16_HANDLER( rtype2_port02_w );
WRITE16_HANDLER( majtitle_gfx_ctrl_w );
-VIDEO_UPDATE( m72 );
-VIDEO_UPDATE( majtitle );
+SCREEN_UPDATE( m72 );
+SCREEN_UPDATE( majtitle );
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index 859e0b6e4e1..660cfd48139 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -5,8 +5,8 @@ extern UINT16 *m90_video_data;
VIDEO_START( m90 );
VIDEO_START( dynablsb );
VIDEO_START( bomblord );
-VIDEO_UPDATE( m90 );
-VIDEO_UPDATE( dynablsb );
-VIDEO_UPDATE( bomblord );
+SCREEN_UPDATE( m90 );
+SCREEN_UPDATE( dynablsb );
+SCREEN_UPDATE( bomblord );
WRITE16_HANDLER( m90_video_w );
WRITE16_HANDLER( m90_video_control_w );
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index 0dedff0178f..f365fa62bf1 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -54,4 +54,4 @@ WRITE16_HANDLER( m92_pf3_control_w );
WRITE16_HANDLER( m92_master_control_w );
VIDEO_START( m92 );
-VIDEO_UPDATE( m92 );
+SCREEN_UPDATE( m92 );
diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h
index b756a6c4cfc..f785a193f3e 100644
--- a/src/mame/includes/macrossp.h
+++ b/src/mame/includes/macrossp.h
@@ -47,5 +47,5 @@ WRITE32_HANDLER( macrossp_scrc_videoram_w );
WRITE32_HANDLER( macrossp_text_videoram_w );
VIDEO_START(macrossp);
-VIDEO_UPDATE(macrossp);
-VIDEO_EOF(macrossp);
+SCREEN_UPDATE(macrossp);
+SCREEN_EOF(macrossp);
diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h
index 5ea4045bd43..72c51fcbe97 100644
--- a/src/mame/includes/madmotor.h
+++ b/src/mame/includes/madmotor.h
@@ -39,4 +39,4 @@ WRITE16_HANDLER( madmotor_pf2_data_w );
WRITE16_HANDLER( madmotor_pf3_data_w );
VIDEO_START( madmotor );
-VIDEO_UPDATE( madmotor );
+SCREEN_UPDATE( madmotor );
diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h
index 3e91c502b77..92e9811605c 100644
--- a/src/mame/includes/magmax.h
+++ b/src/mame/includes/magmax.h
@@ -15,5 +15,5 @@ extern UINT16 *magmax_scroll_x;
extern UINT16 *magmax_scroll_y;
PALETTE_INIT( magmax );
-VIDEO_UPDATE( magmax );
+SCREEN_UPDATE( magmax );
VIDEO_START( magmax );
diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h
index 817ab673f04..06fc6b26e99 100644
--- a/src/mame/includes/mainevt.h
+++ b/src/mame/includes/mainevt.h
@@ -38,5 +38,5 @@ extern void dv_sprite_callback(running_machine *machine, int *code,int *color,in
VIDEO_START( mainevt );
VIDEO_START( dv );
-VIDEO_UPDATE( mainevt );
-VIDEO_UPDATE( dv );
+SCREEN_UPDATE( mainevt );
+SCREEN_UPDATE( dv );
diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h
index d64e8d3eb40..c59f7188dd8 100644
--- a/src/mame/includes/mainsnk.h
+++ b/src/mame/includes/mainsnk.h
@@ -22,4 +22,4 @@ WRITE8_HANDLER(mainsnk_c600_w);
WRITE8_HANDLER(mainsnk_fgram_w);
WRITE8_HANDLER(mainsnk_bgram_w);
VIDEO_START(mainsnk);
-VIDEO_UPDATE(mainsnk);
+SCREEN_UPDATE(mainsnk);
diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h
index c2a372403eb..964f9dfc665 100644
--- a/src/mame/includes/malzak.h
+++ b/src/mame/includes/malzak.h
@@ -30,4 +30,4 @@ public:
WRITE8_HANDLER( malzak_playfield_w );
-VIDEO_UPDATE( malzak );
+SCREEN_UPDATE( malzak );
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 451649219f6..f176b18a0dd 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -18,14 +18,14 @@ public:
VIDEO_START( phozon );
PALETTE_INIT( phozon );
-VIDEO_UPDATE( phozon );
+SCREEN_UPDATE( phozon );
PALETTE_INIT( superpac );
PALETTE_INIT( mappy );
VIDEO_START( superpac );
VIDEO_START( mappy );
-VIDEO_UPDATE( superpac );
-VIDEO_UPDATE( mappy );
+SCREEN_UPDATE( superpac );
+SCREEN_UPDATE( mappy );
WRITE8_HANDLER( superpac_videoram_w );
WRITE8_HANDLER( mappy_videoram_w );
WRITE8_HANDLER( mappy_scroll_w );
diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h
index c4e35ecf6cb..5ae9c02533c 100644
--- a/src/mame/includes/marineb.h
+++ b/src/mame/includes/marineb.h
@@ -33,8 +33,8 @@ WRITE8_HANDLER( marineb_flipscreen_y_w );
PALETTE_INIT( marineb );
VIDEO_START( marineb );
-VIDEO_UPDATE( marineb );
-VIDEO_UPDATE( changes );
-VIDEO_UPDATE( springer );
-VIDEO_UPDATE( hoccer );
-VIDEO_UPDATE( hopprobo );
+SCREEN_UPDATE( marineb );
+SCREEN_UPDATE( changes );
+SCREEN_UPDATE( springer );
+SCREEN_UPDATE( hoccer );
+SCREEN_UPDATE( hopprobo );
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index ca5371c5417..ca66984aa43 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -70,7 +70,7 @@ WRITE8_HANDLER( mario_flip_w );
PALETTE_INIT( mario );
VIDEO_START( mario );
-VIDEO_UPDATE( mario );
+SCREEN_UPDATE( mario );
/*----------- defined in audio/mario.c -----------*/
diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h
index 3537b253f5b..a38d60dc6c6 100644
--- a/src/mame/includes/markham.h
+++ b/src/mame/includes/markham.h
@@ -28,4 +28,4 @@ WRITE8_HANDLER( markham_flipscreen_w );
PALETTE_INIT( markham );
VIDEO_START( markham );
-VIDEO_UPDATE( markham );
+SCREEN_UPDATE( markham );
diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h
index 84fedf3177d..3ed0d6a5402 100644
--- a/src/mame/includes/matmania.h
+++ b/src/mame/includes/matmania.h
@@ -59,6 +59,6 @@ READ8_HANDLER( maniach_mcu_status_r );
WRITE8_HANDLER( matmania_paletteram_w );
PALETTE_INIT( matmania );
-VIDEO_UPDATE( maniach );
+SCREEN_UPDATE( maniach );
VIDEO_START( matmania );
-VIDEO_UPDATE( matmania );
+SCREEN_UPDATE( matmania );
diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h
index 7293038703f..fa077e7a789 100644
--- a/src/mame/includes/mcatadv.h
+++ b/src/mame/includes/mcatadv.h
@@ -28,9 +28,9 @@ public:
/*----------- defined in video/mcatadv.c -----------*/
-VIDEO_UPDATE( mcatadv );
+SCREEN_UPDATE( mcatadv );
VIDEO_START( mcatadv );
-VIDEO_EOF( mcatadv );
+SCREEN_EOF( mcatadv );
WRITE16_HANDLER( mcatadv_videoram1_w );
WRITE16_HANDLER( mcatadv_videoram2_w );
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index 48bb8fe6f06..79cd6920d37 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -76,7 +76,7 @@ READ8_HANDLER( twotiger_videoram_r );
WRITE8_HANDLER( twotiger_videoram_w );
WRITE8_HANDLER( mcr_91490_videoram_w );
-VIDEO_UPDATE( mcr );
+SCREEN_UPDATE( mcr );
/*----------- defined in video/mcr3.c -----------*/
@@ -97,5 +97,5 @@ VIDEO_START( spyhunt );
PALETTE_INIT( spyhunt );
-VIDEO_UPDATE( mcr3 );
-VIDEO_UPDATE( spyhunt );
+SCREEN_UPDATE( mcr3 );
+SCREEN_UPDATE( spyhunt );
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index 94609a22ef1..350228fa942 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -71,11 +71,11 @@ WRITE16_HANDLER( mcr68_paletteram_w );
WRITE16_HANDLER( mcr68_videoram_w );
VIDEO_START( mcr68 );
-VIDEO_UPDATE( mcr68 );
+SCREEN_UPDATE( mcr68 );
WRITE16_HANDLER( zwackery_paletteram_w );
WRITE16_HANDLER( zwackery_videoram_w );
WRITE16_HANDLER( zwackery_spriteram_w );
VIDEO_START( zwackery );
-VIDEO_UPDATE( zwackery );
+SCREEN_UPDATE( zwackery );
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index bc263656e42..ed24458fc92 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -41,7 +41,7 @@ void meadows_sh_update(running_machine *machine);
/*----------- defined in video/meadows.c -----------*/
VIDEO_START( meadows );
-VIDEO_UPDATE( meadows );
+SCREEN_UPDATE( meadows );
WRITE8_HANDLER( meadows_videoram_w );
WRITE8_HANDLER( meadows_spriteram_w );
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index 1605864ac3f..7023cb8e7b2 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -66,8 +66,8 @@ extern UINT8 megadrive_io_ctrl_regs[3];
MACHINE_START( megadriv );
MACHINE_RESET( megadriv );
VIDEO_START( megadriv );
-VIDEO_UPDATE( megadriv );
-VIDEO_EOF( megadriv );
+SCREEN_UPDATE( megadriv );
+SCREEN_EOF( megadriv );
extern UINT16* megadrive_vdp_palette_lookup;
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 66661bf50e7..86b6c79a975 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -36,8 +36,8 @@ extern int megasys1_bits_per_color_code;
/* Functions */
VIDEO_START( megasys1 );
-VIDEO_UPDATE( megasys1 );
-VIDEO_EOF( megasys1 );
+SCREEN_UPDATE( megasys1 );
+SCREEN_EOF( megasys1 );
PALETTE_INIT( megasys1 );
diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h
index 03a912aebea..881ba733a0f 100644
--- a/src/mame/includes/megazone.h
+++ b/src/mame/includes/megazone.h
@@ -43,4 +43,4 @@ WRITE8_HANDLER( megazone_flipscreen_w );
PALETTE_INIT( megazone );
VIDEO_START( megazone );
-VIDEO_UPDATE( megazone );
+SCREEN_UPDATE( megazone );
diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h
index ae4817cabdf..6b787e139b2 100644
--- a/src/mame/includes/mermaid.h
+++ b/src/mame/includes/mermaid.h
@@ -60,5 +60,5 @@ READ8_HANDLER( mermaid_collision_r );
PALETTE_INIT( mermaid );
PALETTE_INIT( rougien );
VIDEO_START( mermaid );
-VIDEO_UPDATE( mermaid );
-VIDEO_EOF( mermaid );
+SCREEN_UPDATE( mermaid );
+SCREEN_EOF( mermaid );
diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h
index dbcff37c864..cda4364bd31 100644
--- a/src/mame/includes/metlclsh.h
+++ b/src/mame/includes/metlclsh.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( metlclsh_gfxbank_w );
WRITE8_HANDLER( metlclsh_rambank_w );
VIDEO_START( metlclsh );
-VIDEO_UPDATE( metlclsh );
+SCREEN_UPDATE( metlclsh );
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index eee69a17f72..38c93fa9176 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -102,6 +102,6 @@ VIDEO_START( metro_14300 );
VIDEO_START( blzntrnd );
VIDEO_START( gstrik2 );
-VIDEO_UPDATE( metro );
+SCREEN_UPDATE( metro );
void metro_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect);
diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h
index 3c327c579d2..66c484214c6 100644
--- a/src/mame/includes/mexico86.h
+++ b/src/mame/includes/mexico86.h
@@ -53,5 +53,5 @@ WRITE8_HANDLER( mexico86_68705_ddr_b_w );
WRITE8_HANDLER( mexico86_bankswitch_w );
-VIDEO_UPDATE( mexico86 );
-VIDEO_UPDATE( kikikai );
+SCREEN_UPDATE( mexico86 );
+SCREEN_UPDATE( kikikai );
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index f0ca3563f56..1be8f984121 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -65,4 +65,4 @@ WRITE32_HANDLER( midvunit_textureram_w );
READ32_HANDLER( midvunit_textureram_r );
VIDEO_START( midvunit );
-VIDEO_UPDATE( midvunit );
+SCREEN_UPDATE( midvunit );
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index bba0a282f80..ea9c34323cc 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -22,7 +22,7 @@ public:
extern UINT32 *zeusbase;
VIDEO_START( midzeus );
-VIDEO_UPDATE( midzeus );
+SCREEN_UPDATE( midzeus );
READ32_HANDLER( zeus_r );
WRITE32_HANDLER( zeus_w );
@@ -30,7 +30,7 @@ WRITE32_HANDLER( zeus_w );
/*----------- defined in video/midzeus2.c -----------*/
VIDEO_START( midzeus2 );
-VIDEO_UPDATE( midzeus2 );
+SCREEN_UPDATE( midzeus2 );
READ32_HANDLER( zeus2_r );
WRITE32_HANDLER( zeus2_w );
diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h
index 6d99fae93e4..a8e12b09ed9 100644
--- a/src/mame/includes/mikie.h
+++ b/src/mame/includes/mikie.h
@@ -38,4 +38,4 @@ WRITE8_HANDLER( mikie_flipscreen_w );
PALETTE_INIT( mikie );
VIDEO_START( mikie );
-VIDEO_UPDATE( mikie );
+SCREEN_UPDATE( mikie );
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index 476f6f4c9dc..74b68f0d4e1 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -67,4 +67,4 @@ WRITE8_HANDLER( mstworld_gfxctrl_w );
WRITE8_HANDLER( mstworld_video_bank_w );
VIDEO_START( pang );
-VIDEO_UPDATE( pang );
+SCREEN_UPDATE( pang );
diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h
index b7ecd22cf31..fa91ce9e44c 100644
--- a/src/mame/includes/mjkjidai.h
+++ b/src/mame/includes/mjkjidai.h
@@ -19,7 +19,7 @@ public:
/*----------- defined in video/mjkjidai.c -----------*/
VIDEO_START( mjkjidai );
-VIDEO_UPDATE( mjkjidai );
+SCREEN_UPDATE( mjkjidai );
WRITE8_HANDLER( mjkjidai_videoram_w );
WRITE8_HANDLER( mjkjidai_ctrl_w );
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index 17e8f0baabb..90ce638afd5 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -110,8 +110,8 @@ void model1_tgp_reset(running_machine *machine, int swa);
/*----------- defined in video/model1.c -----------*/
VIDEO_START(model1);
-VIDEO_UPDATE(model1);
-VIDEO_EOF(model1);
+SCREEN_UPDATE(model1);
+SCREEN_EOF(model1);
READ16_HANDLER( model1_listctl_r );
WRITE16_HANDLER( model1_listctl_w );
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 09f5cef4ef2..f02f56416b2 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -71,6 +71,6 @@ public:
/*----------- defined in video/model2.c -----------*/
VIDEO_START(model2);
-VIDEO_UPDATE(model2);
+SCREEN_UPDATE(model2);
void model2_3d_set_zclip( running_machine *machine, UINT8 clip );
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index e75a6b0ba82..a319efe6ca9 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -128,7 +128,7 @@ READ64_HANDLER(model3_palette_r);
WRITE64_HANDLER(model3_palette_w);
VIDEO_START(model3);
-VIDEO_UPDATE(model3);
+SCREEN_UPDATE(model3);
WRITE64_HANDLER(real3d_cmd_w);
WRITE64_HANDLER(real3d_display_list_w);
diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h
index fcbeefa9d78..ccdc598a97b 100644
--- a/src/mame/includes/momoko.h
+++ b/src/mame/includes/momoko.h
@@ -46,4 +46,4 @@ WRITE8_HANDLER( momoko_fg_select_w);
WRITE8_HANDLER( momoko_bg_select_w);
WRITE8_HANDLER( momoko_bg_priority_w);
-VIDEO_UPDATE( momoko );
+SCREEN_UPDATE( momoko );
diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h
index 234cad3cef9..fc3637286ca 100644
--- a/src/mame/includes/moo.h
+++ b/src/mame/includes/moo.h
@@ -45,4 +45,4 @@ extern void moo_tile_callback(running_machine *machine, int layer, int *code, in
extern void moo_sprite_callback(running_machine *machine, int *code, int *color, int *priority_mask);
VIDEO_START(moo);
-VIDEO_UPDATE(moo);
+SCREEN_UPDATE(moo);
diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h
index 4fccd4ccc6d..ae5effea262 100644
--- a/src/mame/includes/mosaic.h
+++ b/src/mame/includes/mosaic.h
@@ -29,4 +29,4 @@ WRITE8_HANDLER( mosaic_fgvideoram_w );
WRITE8_HANDLER( mosaic_bgvideoram_w );
VIDEO_START( mosaic );
-VIDEO_UPDATE( mosaic );
+SCREEN_UPDATE( mosaic );
diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h
index 88cb7c5a14b..cdee6709477 100644
--- a/src/mame/includes/mouser.h
+++ b/src/mame/includes/mouser.h
@@ -31,4 +31,4 @@ WRITE8_HANDLER( mouser_flip_screen_x_w );
WRITE8_HANDLER( mouser_flip_screen_y_w );
PALETTE_INIT( mouser );
-VIDEO_UPDATE( mouser );
+SCREEN_UPDATE( mouser );
diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h
index c91faee8216..bc34ef36f83 100644
--- a/src/mame/includes/mrdo.h
+++ b/src/mame/includes/mrdo.h
@@ -32,4 +32,4 @@ WRITE8_HANDLER( mrdo_flipscreen_w );
PALETTE_INIT( mrdo );
VIDEO_START( mrdo );
-VIDEO_UPDATE( mrdo );
+SCREEN_UPDATE( mrdo );
diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h
index 2ad07a6bac3..cafbd6548f0 100644
--- a/src/mame/includes/mrflea.h
+++ b/src/mame/includes/mrflea.h
@@ -36,4 +36,4 @@ WRITE8_HANDLER( mrflea_gfx_bank_w );
WRITE8_HANDLER( mrflea_videoram_w );
WRITE8_HANDLER( mrflea_spriteram_w );
-VIDEO_UPDATE( mrflea );
+SCREEN_UPDATE( mrflea );
diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h
index 0a8f1940454..95fc7a8b851 100644
--- a/src/mame/includes/mrjong.h
+++ b/src/mame/includes/mrjong.h
@@ -27,4 +27,4 @@ WRITE8_HANDLER( mrjong_flipscreen_w );
PALETTE_INIT( mrjong );
VIDEO_START( mrjong );
-VIDEO_UPDATE( mrjong );
+SCREEN_UPDATE( mrjong );
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 5d41c3af6ac..82f511398ee 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -25,4 +25,4 @@ WRITE32_HANDLER( ms32_brightness_w );
WRITE32_HANDLER( ms32_gfxctrl_w );
VIDEO_START( ms32 );
VIDEO_START( f1superb );
-VIDEO_UPDATE( ms32 );
+SCREEN_UPDATE( ms32 );
diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h
index 1889007c3f4..23c028ded1e 100644
--- a/src/mame/includes/msisaac.h
+++ b/src/mame/includes/msisaac.h
@@ -53,5 +53,5 @@ WRITE8_HANDLER( msisaac_bg_videoram_w );
WRITE8_HANDLER( msisaac_bg2_videoram_w );
WRITE8_HANDLER( msisaac_fg_videoram_w );
-VIDEO_UPDATE( msisaac );
+SCREEN_UPDATE( msisaac );
VIDEO_START( msisaac );
diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h
index 38b70712ce9..3f4fec0cb3c 100644
--- a/src/mame/includes/mugsmash.h
+++ b/src/mame/includes/mugsmash.h
@@ -22,7 +22,7 @@ public:
/*----------- defined in video/mugsmash.c -----------*/
VIDEO_START( mugsmash );
-VIDEO_UPDATE( mugsmash );
+SCREEN_UPDATE( mugsmash );
WRITE16_HANDLER( mugsmash_reg_w );
WRITE16_HANDLER( mugsmash_videoram2_w );
diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h
index cb8ef049fb9..67030e51c42 100644
--- a/src/mame/includes/munchmo.h
+++ b/src/mame/includes/munchmo.h
@@ -41,4 +41,4 @@ WRITE8_HANDLER( mnchmobl_flipscreen_w );
PALETTE_INIT( mnchmobl );
VIDEO_START( mnchmobl );
-VIDEO_UPDATE( mnchmobl );
+SCREEN_UPDATE( mnchmobl );
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index cb2b30a9c18..d4aa3b530c4 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -16,5 +16,5 @@ WRITE8_HANDLER( mustache_videoram_w );
WRITE8_HANDLER( mustache_scroll_w );
WRITE8_HANDLER( mustache_video_control_w );
VIDEO_START( mustache );
-VIDEO_UPDATE( mustache );
+SCREEN_UPDATE( mustache );
PALETTE_INIT( mustache );
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index d0634751bff..74038346547 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -294,29 +294,29 @@ WRITE8_HANDLER( shuttlei_sh_port_2_w );
/*----------- defined in video/mw8080bw.c -----------*/
-VIDEO_UPDATE( mw8080bw );
+SCREEN_UPDATE( mw8080bw );
-VIDEO_UPDATE( spcenctr );
+SCREEN_UPDATE( spcenctr );
-VIDEO_UPDATE( phantom2 );
-VIDEO_EOF( phantom2 );
+SCREEN_UPDATE( phantom2 );
+SCREEN_EOF( phantom2 );
-VIDEO_UPDATE( invaders );
+SCREEN_UPDATE( invaders );
/*----------- defined in video/8080bw.c -----------*/
MACHINE_START( extra_8080bw_vh );
-VIDEO_UPDATE( invadpt2 );
-VIDEO_UPDATE( ballbomb );
-VIDEO_UPDATE( schaser );
-VIDEO_UPDATE( schasercv );
-VIDEO_UPDATE( rollingc );
-VIDEO_UPDATE( polaris );
-VIDEO_UPDATE( lupin3 );
-VIDEO_UPDATE( cosmo );
-VIDEO_UPDATE( indianbt );
-VIDEO_UPDATE( shuttlei );
-VIDEO_UPDATE( sflush );
+SCREEN_UPDATE( invadpt2 );
+SCREEN_UPDATE( ballbomb );
+SCREEN_UPDATE( schaser );
+SCREEN_UPDATE( schasercv );
+SCREEN_UPDATE( rollingc );
+SCREEN_UPDATE( polaris );
+SCREEN_UPDATE( lupin3 );
+SCREEN_UPDATE( cosmo );
+SCREEN_UPDATE( indianbt );
+SCREEN_UPDATE( shuttlei );
+SCREEN_UPDATE( sflush );
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index 364fd131f9c..617abf11011 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -29,10 +29,10 @@ VIDEO_START( viostorm );
VIDEO_START( metamrph );
VIDEO_START( martchmp );
VIDEO_START( mystwarr );
-VIDEO_UPDATE( dadandrn );
-VIDEO_UPDATE( mystwarr );
-VIDEO_UPDATE( metamrph );
-VIDEO_UPDATE( martchmp );
+SCREEN_UPDATE( dadandrn );
+SCREEN_UPDATE( mystwarr );
+SCREEN_UPDATE( metamrph );
+SCREEN_UPDATE( martchmp );
WRITE16_HANDLER( ddd_053936_enable_w );
WRITE16_HANDLER( ddd_053936_clip_w );
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index bd072a53db1..7e059b4f459 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -19,7 +19,7 @@ public:
/*----------- defined in video/n64.c -----------*/
extern VIDEO_START( n64 );
-extern VIDEO_UPDATE( n64 );
+extern SCREEN_UPDATE( n64 );
#define DACRATE_NTSC (48681812)
#define DACRATE_PAL (49656530)
diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h
index fec440889d3..93d77ca2264 100644
--- a/src/mame/includes/n8080.h
+++ b/src/mame/includes/n8080.h
@@ -52,10 +52,10 @@ PALETTE_INIT( helifire );
VIDEO_START( spacefev );
VIDEO_START( sheriff );
VIDEO_START( helifire );
-VIDEO_UPDATE( spacefev );
-VIDEO_UPDATE( sheriff );
-VIDEO_UPDATE( helifire );
-VIDEO_EOF( helifire );
+SCREEN_UPDATE( spacefev );
+SCREEN_UPDATE( sheriff );
+SCREEN_UPDATE( helifire );
+SCREEN_EOF( helifire );
void spacefev_start_red_cannon(running_machine *machine);
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index a817d9bb3e8..3b68288b729 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -1,6 +1,6 @@
/*----------- defined in video/namcofl.c -----------*/
VIDEO_START( namcofl );
-VIDEO_UPDATE( namcofl );
+SCREEN_UPDATE( namcofl );
WRITE32_HANDLER( namcofl_spritebank_w );
diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h
index 33ee61124e8..3f45b3d3722 100644
--- a/src/mame/includes/namcona1.h
+++ b/src/mame/includes/namcona1.h
@@ -40,5 +40,5 @@ extern WRITE16_HANDLER( namcona1_gfxram_w );
extern READ16_HANDLER( namcona1_paletteram_r );
extern WRITE16_HANDLER( namcona1_paletteram_w );
-extern VIDEO_UPDATE( namcona1 );
+extern SCREEN_UPDATE( namcona1 );
extern VIDEO_START( namcona1 );
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index 8822f1433c1..c15d1120b9c 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -20,8 +20,8 @@ extern UINT32 *namconb1_tilebank32;
#define NAMCONB1_SPRITEGFX 1
#define NAMCONB1_ROTGFX 2
-VIDEO_UPDATE( namconb1 );
+SCREEN_UPDATE( namconb1 );
VIDEO_START( namconb1 );
-VIDEO_UPDATE( namconb2 );
+SCREEN_UPDATE( namconb2 );
VIDEO_START( namconb2 );
diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h
index 50432dbb18d..d3e85d3efd7 100644
--- a/src/mame/includes/namcos1.h
+++ b/src/mame/includes/namcos1.h
@@ -52,5 +52,5 @@ READ8_HANDLER( namcos1_spriteram_r );
WRITE8_HANDLER( namcos1_spriteram_w );
VIDEO_START( namcos1 );
-VIDEO_UPDATE( namcos1 );
-VIDEO_EOF( namcos1 );
+SCREEN_UPDATE( namcos1 );
+SCREEN_EOF( namcos1 );
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 15039bfcca7..cf3b86cc6eb 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -90,19 +90,19 @@ enum
#define NAMCOS21_NUM_COLORS 0x8000
VIDEO_START( namcos2 );
-VIDEO_UPDATE( namcos2_default );
+SCREEN_UPDATE( namcos2_default );
VIDEO_START( finallap );
-VIDEO_UPDATE( finallap );
+SCREEN_UPDATE( finallap );
VIDEO_START( luckywld );
-VIDEO_UPDATE( luckywld );
+SCREEN_UPDATE( luckywld );
VIDEO_START( metlhawk );
-VIDEO_UPDATE( metlhawk );
+SCREEN_UPDATE( metlhawk );
VIDEO_START( sgunner );
-VIDEO_UPDATE( sgunner );
+SCREEN_UPDATE( sgunner );
extern UINT16 *namcos2_sprite_ram;
WRITE16_HANDLER( namcos2_sprite_ram_w );
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index cd6485564db..6323b4f0b3b 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -35,4 +35,4 @@ extern READ16_HANDLER(winrun_gpu_register_r);
extern WRITE16_HANDLER(winrun_gpu_register_w);
extern VIDEO_START( namcos21 ) ;
-extern VIDEO_UPDATE( namcos21 );
+extern SCREEN_UPDATE( namcos21 );
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index 489b74c0b93..f8ef2bccb73 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -66,10 +66,10 @@ WRITE32_HANDLER( namcos22_dspram_w );
VIDEO_START( namcos22 );
-VIDEO_UPDATE( namcos22 );
+SCREEN_UPDATE( namcos22 );
VIDEO_START( namcos22s );
-VIDEO_UPDATE( namcos22s );
+SCREEN_UPDATE( namcos22s );
void namcos22_draw_direct_poly( running_machine *machine, const UINT16 *pSource );
extern UINT32 namcos22_point_rom_r( offs_t offs );
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index cd4db3868b7..b63d32d2c75 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -4,8 +4,8 @@ extern UINT8 *rthunder_videoram1, *rthunder_videoram2, *rthunder_spriteram;
PALETTE_INIT( namcos86 );
VIDEO_START( namcos86 );
-VIDEO_UPDATE( namcos86 );
-VIDEO_EOF( namcos86 );
+SCREEN_UPDATE( namcos86 );
+SCREEN_EOF( namcos86 );
READ8_HANDLER( rthunder_videoram1_r );
WRITE8_HANDLER( rthunder_videoram1_w );
diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h
index 8332c270afb..eac3acb68bf 100644
--- a/src/mame/includes/naughtyb.h
+++ b/src/mame/includes/naughtyb.h
@@ -19,4 +19,4 @@ WRITE8_HANDLER( popflame_videoreg_w );
VIDEO_START( naughtyb );
PALETTE_INIT( naughtyb );
-VIDEO_UPDATE( naughtyb );
+SCREEN_UPDATE( naughtyb );
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index 9fec5394c5d..791d2162573 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -3,8 +3,9 @@
PALETTE_INIT( mbmj8688_8bit );
PALETTE_INIT( mbmj8688_12bit );
PALETTE_INIT( mbmj8688_16bit );
-VIDEO_UPDATE( mbmj8688 );
-VIDEO_UPDATE( mbmj8688_LCD );
+SCREEN_UPDATE( mbmj8688 );
+SCREEN_UPDATE( mbmj8688_lcd0 );
+SCREEN_UPDATE( mbmj8688_lcd1 );
VIDEO_START( mbmj8688_8bit );
VIDEO_START( mbmj8688_hybrid_12bit );
VIDEO_START( mbmj8688_pure_12bit );
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index 185c87e533f..4d115629ecb 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -1,6 +1,6 @@
/*----------- defined in video/nbmj8891.c -----------*/
-VIDEO_UPDATE( nbmj8891 );
+SCREEN_UPDATE( nbmj8891 );
VIDEO_START( nbmj8891_1layer );
VIDEO_START( nbmj8891_2layer );
diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h
index a5d932de499..ba9300ce2b4 100644
--- a/src/mame/includes/nbmj8900.h
+++ b/src/mame/includes/nbmj8900.h
@@ -1,6 +1,6 @@
/*----------- defined in video/nbmj8900.c -----------*/
-VIDEO_UPDATE( nbmj8900 );
+SCREEN_UPDATE( nbmj8900 );
VIDEO_START( nbmj8900_2layer );
READ8_HANDLER( nbmj8900_palette_type1_r );
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index 5b51ff4dae2..08ae19184da 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -1,7 +1,7 @@
/*----------- defined in video/nbmj8991.c -----------*/
-VIDEO_UPDATE( nbmj8991_type1 );
-VIDEO_UPDATE( nbmj8991_type2 );
+SCREEN_UPDATE( nbmj8991_type1 );
+SCREEN_UPDATE( nbmj8991_type2 );
VIDEO_START( nbmj8991 );
WRITE8_HANDLER( nbmj8991_palette_type1_w );
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 03e022a2164..19e6db5b0cb 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -1,6 +1,6 @@
/*----------- defined in video/nbmj9195.c -----------*/
-VIDEO_UPDATE( nbmj9195 );
+SCREEN_UPDATE( nbmj9195 );
VIDEO_START( nbmj9195_1layer );
VIDEO_START( nbmj9195_2layer );
VIDEO_START( nbmj9195_nb22090 );
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index b9721418499..34b418d4351 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -60,4 +60,4 @@ WRITE16_HANDLER( nemesis_colorram2_word_w );
WRITE16_HANDLER( nemesis_charram_word_w );
VIDEO_START( nemesis );
-VIDEO_UPDATE( nemesis );
+SCREEN_UPDATE( nemesis );
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index 49902356744..18d9675ed8f 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -210,7 +210,7 @@ void matrimbl_decrypt(running_machine *machine);
VIDEO_START( neogeo );
VIDEO_RESET( neogeo );
-VIDEO_UPDATE( neogeo );
+SCREEN_UPDATE( neogeo );
READ16_HANDLER( neogeo_video_register_r );
WRITE16_HANDLER( neogeo_video_register_w );
diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h
index ec6913fba60..15523126818 100644
--- a/src/mame/includes/news.h
+++ b/src/mame/includes/news.h
@@ -23,4 +23,4 @@ WRITE8_HANDLER( news_bgram_w );
WRITE8_HANDLER( news_bgpic_w );
VIDEO_START( news );
-VIDEO_UPDATE( news );
+SCREEN_UPDATE( news );
diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h
index dd9f2feb268..18190f6bd46 100644
--- a/src/mame/includes/ninjakd2.h
+++ b/src/mame/includes/ninjakd2.h
@@ -23,10 +23,10 @@ extern VIDEO_START( mnight );
extern VIDEO_START( arkarea );
extern VIDEO_START( robokid );
extern VIDEO_START( omegaf );
-extern VIDEO_UPDATE( ninjakd2 );
-extern VIDEO_UPDATE( robokid );
-extern VIDEO_UPDATE( omegaf );
-extern VIDEO_EOF( ninjakd2 );
+extern SCREEN_UPDATE( ninjakd2 );
+extern SCREEN_UPDATE( robokid );
+extern SCREEN_UPDATE( omegaf );
+extern SCREEN_EOF( ninjakd2 );
extern UINT8* ninjakd2_bg_videoram;
extern UINT8* ninjakd2_fg_videoram;
diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h
index 1487b9a2189..976bf4b43b3 100644
--- a/src/mame/includes/ninjaw.h
+++ b/src/mame/includes/ninjaw.h
@@ -40,4 +40,4 @@ public:
/*----------- defined in video/ninjaw.c -----------*/
VIDEO_START( ninjaw );
-VIDEO_UPDATE( ninjaw );
+SCREEN_UPDATE( ninjaw );
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index 1b300cf3200..530972d8749 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -71,4 +71,4 @@ WRITE8_HANDLER( nitedrvr_hvc_w );
WRITE8_HANDLER( nitedrvr_videoram_w );
VIDEO_START( nitedrvr );
-VIDEO_UPDATE( nitedrvr );
+SCREEN_UPDATE( nitedrvr );
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 35f368ba453..b1e47828ae5 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -1,6 +1,6 @@
/*----------- defined in video/niyanpai.c -----------*/
-VIDEO_UPDATE( niyanpai );
+SCREEN_UPDATE( niyanpai );
VIDEO_START( niyanpai );
READ16_HANDLER( niyanpai_palette_r );
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 36479521801..86b458093f8 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -36,29 +36,29 @@ WRITE16_HANDLER( vandykeb_scroll_w );
WRITE16_HANDLER( manybloc_scroll_w );
VIDEO_START( macross );
-VIDEO_UPDATE( manybloc );
+SCREEN_UPDATE( manybloc );
VIDEO_START( gunnail );
VIDEO_START( macross2 );
VIDEO_START( raphero );
VIDEO_START( bjtwin );
VIDEO_START( bioship );
VIDEO_START( strahl );
-VIDEO_UPDATE( bioship );
-VIDEO_UPDATE( strahl );
-VIDEO_UPDATE( macross );
-VIDEO_UPDATE( gunnail );
-VIDEO_UPDATE( bjtwin );
-VIDEO_UPDATE( tharrier );
-VIDEO_UPDATE( hachamf );
-VIDEO_UPDATE( tdragon );
-VIDEO_EOF( nmk );
-VIDEO_EOF( strahl );
+SCREEN_UPDATE( bioship );
+SCREEN_UPDATE( strahl );
+SCREEN_UPDATE( macross );
+SCREEN_UPDATE( gunnail );
+SCREEN_UPDATE( bjtwin );
+SCREEN_UPDATE( tharrier );
+SCREEN_UPDATE( hachamf );
+SCREEN_UPDATE( tdragon );
+SCREEN_EOF( nmk );
+SCREEN_EOF( strahl );
VIDEO_START( afega );
VIDEO_START( grdnstrm );
VIDEO_START( firehawk );
-VIDEO_UPDATE( afega );
-VIDEO_UPDATE( redhawkb );
-VIDEO_UPDATE(redhawki );
-VIDEO_UPDATE( bubl2000 );
-VIDEO_UPDATE( firehawk );
+SCREEN_UPDATE( afega );
+SCREEN_UPDATE( redhawkb );
+SCREEN_UPDATE(redhawki );
+SCREEN_UPDATE( bubl2000 );
+SCREEN_UPDATE( firehawk );
diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h
index 6e6211c2611..171e5d5f9b2 100644
--- a/src/mame/includes/nova2001.h
+++ b/src/mame/includes/nova2001.h
@@ -14,10 +14,10 @@ extern WRITE8_HANDLER( ninjakun_paletteram_w );
extern PALETTE_INIT( nova2001 );
extern VIDEO_START( nova2001 );
-extern VIDEO_UPDATE( nova2001 );
+extern SCREEN_UPDATE( nova2001 );
extern VIDEO_START( ninjakun );
-extern VIDEO_UPDATE( ninjakun );
+extern SCREEN_UPDATE( ninjakun );
extern VIDEO_START( pkunwar );
-extern VIDEO_UPDATE( pkunwar );
+extern SCREEN_UPDATE( pkunwar );
extern VIDEO_START( raiders5 );
-extern VIDEO_UPDATE( raiders5 );
+extern SCREEN_UPDATE( raiders5 );
diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h
index bb8ae7290b1..c48f6bf7c9b 100644
--- a/src/mame/includes/nycaptor.h
+++ b/src/mame/includes/nycaptor.h
@@ -72,4 +72,4 @@ WRITE8_HANDLER( nycaptor_gfxctrl_w );
WRITE8_HANDLER( nycaptor_scrlram_w );
VIDEO_START( nycaptor );
-VIDEO_UPDATE( nycaptor );
+SCREEN_UPDATE( nycaptor );
diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h
index 0b71bd72bb6..5bd6991f14c 100644
--- a/src/mame/includes/offtwall.h
+++ b/src/mame/includes/offtwall.h
@@ -24,4 +24,4 @@ public:
/*----------- defined in video/offtwall.c -----------*/
VIDEO_START( offtwall );
-VIDEO_UPDATE( offtwall );
+SCREEN_UPDATE( offtwall );
diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h
index e61418e3dcd..c3929a47d36 100644
--- a/src/mame/includes/ohmygod.h
+++ b/src/mame/includes/ohmygod.h
@@ -35,4 +35,4 @@ WRITE16_HANDLER( ohmygod_scrollx_w );
WRITE16_HANDLER( ohmygod_scrolly_w );
VIDEO_START( ohmygod );
-VIDEO_UPDATE( ohmygod );
+SCREEN_UPDATE( ohmygod );
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index a8d7b505e95..ffd07a0357f 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -52,8 +52,8 @@ VIDEO_START( ojankohs );
VIDEO_START( ojankoy );
VIDEO_START( ojankoc );
-VIDEO_UPDATE( ojankohs );
-VIDEO_UPDATE( ojankoc );
+SCREEN_UPDATE( ojankohs );
+SCREEN_UPDATE( ojankoc );
void ojankoc_flipscreen(address_space *space, int data);
diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h
index 4962e0fa9c9..180ae2638bc 100644
--- a/src/mame/includes/oneshot.h
+++ b/src/mame/includes/oneshot.h
@@ -32,5 +32,5 @@ WRITE16_HANDLER( oneshot_mid_videoram_w );
WRITE16_HANDLER( oneshot_fg_videoram_w );
VIDEO_START( oneshot );
-VIDEO_UPDATE( oneshot );
-VIDEO_UPDATE( maddonna );
+SCREEN_UPDATE( oneshot );
+SCREEN_UPDATE( maddonna );
diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h
index 8c3385fc714..e013055f703 100644
--- a/src/mame/includes/opwolf.h
+++ b/src/mame/includes/opwolf.h
@@ -63,4 +63,4 @@ WRITE16_HANDLER( opwolf_cchip_bank_w );
WRITE16_HANDLER( opwolf_spritectrl_w );
-VIDEO_UPDATE( opwolf );
+SCREEN_UPDATE( opwolf );
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index 2a891698e52..4d4b017633d 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -50,6 +50,6 @@ DISCRETE_SOUND_EXTERN( orbit );
/*----------- defined in video/orbit.c -----------*/
VIDEO_START( orbit );
-VIDEO_UPDATE( orbit );
+SCREEN_UPDATE( orbit );
extern WRITE8_HANDLER( orbit_playfield_w );
diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h
index 51954ec1bb8..f890b38f192 100644
--- a/src/mame/includes/othldrby.h
+++ b/src/mame/includes/othldrby.h
@@ -36,5 +36,5 @@ WRITE16_HANDLER( othldrby_vreg_addr_w );
WRITE16_HANDLER( othldrby_vreg_w );
VIDEO_START( othldrby );
-VIDEO_EOF( othldrby );
-VIDEO_UPDATE( othldrby );
+SCREEN_EOF( othldrby );
+SCREEN_UPDATE( othldrby );
diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h
index 4e36e4326d9..0d65a770185 100644
--- a/src/mame/includes/othunder.h
+++ b/src/mame/includes/othunder.h
@@ -53,4 +53,4 @@ public:
/*----------- defined in video/othunder.c -----------*/
VIDEO_START( othunder );
-VIDEO_UPDATE( othunder );
+SCREEN_UPDATE( othunder );
diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h
index a378378cdf5..cf73da3db0a 100644
--- a/src/mame/includes/overdriv.h
+++ b/src/mame/includes/overdriv.h
@@ -37,4 +37,4 @@ extern void overdriv_sprite_callback(running_machine *machine, int *code,int *co
extern void overdriv_zoom_callback_0(running_machine *machine, int *code,int *color,int *flags);
extern void overdriv_zoom_callback_1(running_machine *machine, int *code,int *color,int *flags);
-VIDEO_UPDATE( overdriv );
+SCREEN_UPDATE( overdriv );
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index 1220fc27644..15415c2680e 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -28,4 +28,4 @@ WRITE8_HANDLER( pacland_bankswitch_w );
PALETTE_INIT( pacland );
VIDEO_START( pacland );
-VIDEO_UPDATE( pacland );
+SCREEN_UPDATE( pacland );
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index 97292c67a7a..b64db53fb68 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -11,7 +11,7 @@ extern UINT8 *pacman_colorram;
PALETTE_INIT( pacman );
VIDEO_START( pacman );
-VIDEO_UPDATE( pacman );
+SCREEN_UPDATE( pacman );
WRITE8_HANDLER( pacman_videoram_w );
WRITE8_HANDLER( pacman_colorram_w );
@@ -29,7 +29,7 @@ WRITE8_HANDLER( vanvan_bgcolor_w );
VIDEO_START( s2650games );
-VIDEO_UPDATE( s2650games );
+SCREEN_UPDATE( s2650games );
extern UINT8 *s2650games_spriteram;
extern UINT8 *s2650games_tileram;
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index 513874d8660..3ca40265dd4 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -41,5 +41,5 @@ WRITE8_HANDLER( pandoras_flipscreen_w );
WRITE8_HANDLER( pandoras_scrolly_w );
VIDEO_START( pandoras );
-VIDEO_UPDATE( pandoras );
+SCREEN_UPDATE( pandoras );
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index c9bc56375ed..f533dfc1a0e 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -37,6 +37,6 @@ WRITE8_HANDLER( paradise_palbank_w );
VIDEO_START( paradise );
-VIDEO_UPDATE( paradise );
-VIDEO_UPDATE( torus );
-VIDEO_UPDATE( madball );
+SCREEN_UPDATE( paradise );
+SCREEN_UPDATE( torus );
+SCREEN_UPDATE( madball );
diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h
index 2612a68b307..184bbed4fa1 100644
--- a/src/mame/includes/parodius.h
+++ b/src/mame/includes/parodius.h
@@ -36,4 +36,4 @@ public:
extern void parodius_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority);
extern void parodius_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask);
-VIDEO_UPDATE( parodius );
+SCREEN_UPDATE( parodius );
diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h
index e6e7f72c523..db0aa56056c 100644
--- a/src/mame/includes/pass.h
+++ b/src/mame/includes/pass.h
@@ -18,4 +18,4 @@ WRITE16_HANDLER( pass_fg_videoram_w );
WRITE16_HANDLER( pass_bg_videoram_w );
VIDEO_START( pass );
-VIDEO_UPDATE( pass );
+SCREEN_UPDATE( pass );
diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h
index 74dc6dff818..3041f054671 100644
--- a/src/mame/includes/pastelg.h
+++ b/src/mame/includes/pastelg.h
@@ -1,7 +1,7 @@
/*----------- defined in video/pastelg.c -----------*/
PALETTE_INIT( pastelg );
-VIDEO_UPDATE( pastelg );
+SCREEN_UPDATE( pastelg );
VIDEO_START( pastelg );
WRITE8_HANDLER( pastelg_clut_w );
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index c8564db7208..8836720dc6c 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -40,4 +40,4 @@ extern WRITE8_HANDLER( pbaction_flipscreen_w );
extern WRITE8_HANDLER( pbaction_scroll_w );
extern VIDEO_START( pbaction );
-extern VIDEO_UPDATE( pbaction );
+extern SCREEN_UPDATE( pbaction );
diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h
index e8c29197be4..94790915411 100644
--- a/src/mame/includes/pcktgal.h
+++ b/src/mame/includes/pcktgal.h
@@ -18,4 +18,4 @@ WRITE8_HANDLER( pcktgal_flipscreen_w );
PALETTE_INIT( pcktgal );
VIDEO_START( pcktgal );
-VIDEO_UPDATE( pcktgal );
+SCREEN_UPDATE( pcktgal );
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index f522e895032..2e68f8948b3 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -120,5 +120,5 @@ WRITE16_HANDLER( pgm_tx_videoram_w );
WRITE16_HANDLER( pgm_bg_videoram_w );
VIDEO_START( pgm );
-VIDEO_EOF( pgm );
-VIDEO_UPDATE( pgm );
+SCREEN_EOF( pgm );
+SCREEN_UPDATE( pgm );
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index 354426cda24..7c2b1bc80aa 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -32,7 +32,7 @@ PALETTE_INIT( phoenix );
PALETTE_INIT( survival );
PALETTE_INIT( pleiads );
VIDEO_START( phoenix );
-VIDEO_UPDATE( phoenix );
+SCREEN_UPDATE( phoenix );
WRITE8_HANDLER( phoenix_videoram_w );
WRITE8_HANDLER( phoenix_videoreg_w );
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index a72b97f1faf..ca0c23dec53 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -8,4 +8,4 @@ WRITE8_HANDLER( pingpong_colorram_w );
PALETTE_INIT( pingpong );
VIDEO_START( pingpong );
-VIDEO_UPDATE( pingpong );
+SCREEN_UPDATE( pingpong );
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index 181d1de4a4a..6f458c60c50 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -9,4 +9,4 @@ WRITE16_HANDLER( pirates_fg_tileram_w );
WRITE16_HANDLER( pirates_bg_tileram_w );
VIDEO_START( pirates );
-VIDEO_UPDATE( pirates );
+SCREEN_UPDATE( pirates );
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index 01396331a1c..0e74035e25f 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -55,4 +55,4 @@ WRITE8_HANDLER( pitnrun_scroll_w );
PALETTE_INIT(pitnrun);
VIDEO_START(pitnrun);
-VIDEO_UPDATE(pitnrun);
+SCREEN_UPDATE(pitnrun);
diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h
index 7389c477853..dac3e039869 100644
--- a/src/mame/includes/pktgaldx.h
+++ b/src/mame/includes/pktgaldx.h
@@ -29,5 +29,5 @@ public:
/*----------- defined in video/pktgaldx.c -----------*/
-VIDEO_UPDATE( pktgaldx );
-VIDEO_UPDATE( pktgaldb );
+SCREEN_UPDATE( pktgaldx );
+SCREEN_UPDATE( pktgaldb );
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index 1b9dfb16ce7..12732c49755 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -65,4 +65,4 @@ WRITE8_HANDLER( playch10_videoram_w );
PALETTE_INIT( playch10 );
VIDEO_START( playch10 );
VIDEO_START( playch10_hboard );
-VIDEO_UPDATE( playch10 );
+SCREEN_UPDATE( playch10 );
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index 789033f8242..1c6c039d032 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -63,7 +63,7 @@ VIDEO_START( excelsr );
VIDEO_START( hotmind );
VIDEO_START( hrdtimes );
-VIDEO_UPDATE( bigtwin );
-VIDEO_UPDATE( wbeachvl );
-VIDEO_UPDATE( excelsr );
-VIDEO_UPDATE( hrdtimes );
+SCREEN_UPDATE( bigtwin );
+SCREEN_UPDATE( wbeachvl );
+SCREEN_UPDATE( excelsr );
+SCREEN_UPDATE( hrdtimes );
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index 9c0217096b3..8c7181ae845 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -37,7 +37,7 @@ public:
/*----------- defined in video/plygonet.c -----------*/
VIDEO_START( polygonet );
-VIDEO_UPDATE( polygonet );
+SCREEN_UPDATE( polygonet );
READ32_HANDLER( polygonet_ttl_ram_r );
WRITE32_HANDLER( polygonet_ttl_ram_w );
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index 42f6bbfb3a0..ec17bb53549 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -14,4 +14,4 @@ WRITE8_HANDLER( pokechmp_videoram_w );
WRITE8_HANDLER( pokechmp_flipscreen_w );
VIDEO_START( pokechmp );
-VIDEO_UPDATE( pokechmp );
+SCREEN_UPDATE( pokechmp );
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index 7bf08c6dc54..001a8c9be3c 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -49,7 +49,7 @@ DISCRETE_SOUND_EXTERN( polepos );
VIDEO_START( polepos );
PALETTE_INIT( polepos );
-VIDEO_UPDATE( polepos );
+SCREEN_UPDATE( polepos );
WRITE16_HANDLER( polepos_view16_w );
WRITE16_HANDLER( polepos_road16_w );
diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h
index a42d501a215..63dcc5f4b4b 100644
--- a/src/mame/includes/policetr.h
+++ b/src/mame/includes/policetr.h
@@ -18,4 +18,4 @@ WRITE32_HANDLER( policetr_palette_offset_w );
WRITE32_HANDLER( policetr_palette_data_w );
VIDEO_START( policetr );
-VIDEO_UPDATE( policetr );
+SCREEN_UPDATE( policetr );
diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h
index 05fd847051b..abaff4050a9 100644
--- a/src/mame/includes/polyplay.h
+++ b/src/mame/includes/polyplay.h
@@ -25,5 +25,5 @@ extern UINT8 *polyplay_characterram;
PALETTE_INIT( polyplay );
VIDEO_START( polyplay );
-VIDEO_UPDATE( polyplay );
+SCREEN_UPDATE( polyplay );
WRITE8_HANDLER( polyplay_characterram_w );
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index 98777453c1a..254526796f0 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -35,5 +35,5 @@ DISCRETE_SOUND_EXTERN( poolshrk );
/*----------- defined in video/poolshrk.c -----------*/
VIDEO_START( poolshrk );
-VIDEO_UPDATE( poolshrk );
+SCREEN_UPDATE( poolshrk );
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index 864e4297d39..3ccb8e5d0c2 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -29,4 +29,4 @@ WRITE8_HANDLER( pooyan_flipscreen_w );
PALETTE_INIT( pooyan );
VIDEO_START( pooyan );
-VIDEO_UPDATE( pooyan );
+SCREEN_UPDATE( pooyan );
diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h
index 912e369d152..6ada626a2e6 100644
--- a/src/mame/includes/popeye.h
+++ b/src/mame/includes/popeye.h
@@ -14,4 +14,4 @@ PALETTE_INIT( popeye );
PALETTE_INIT( popeyebl );
VIDEO_START( skyskipr );
VIDEO_START( popeye );
-VIDEO_UPDATE( popeye );
+SCREEN_UPDATE( popeye );
diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h
index f2635dd3c6d..7bcd013c119 100644
--- a/src/mame/includes/popper.h
+++ b/src/mame/includes/popper.h
@@ -41,5 +41,5 @@ WRITE8_HANDLER( popper_gfx_bank_w );
PALETTE_INIT( popper );
VIDEO_START( popper );
-VIDEO_UPDATE( popper );
+SCREEN_UPDATE( popper );
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index a361cb64e71..0c213184c67 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -5,6 +5,6 @@ extern int portrait_scroll;
PALETTE_INIT( portrait );
VIDEO_START( portrait );
-VIDEO_UPDATE( portrait );
+SCREEN_UPDATE( portrait );
WRITE8_HANDLER( portrait_bgvideo_write );
WRITE8_HANDLER( portrait_fgvideo_write );
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 2e9621676b6..285cd11dbf8 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -26,4 +26,4 @@ WRITE16_HANDLER( powerins_vram_0_w );
WRITE16_HANDLER( powerins_vram_1_w );
VIDEO_START( powerins );
-VIDEO_UPDATE( powerins );
+SCREEN_UPDATE( powerins );
diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h
index c1db8a2aac2..6a184ab6409 100644
--- a/src/mame/includes/prehisle.h
+++ b/src/mame/includes/prehisle.h
@@ -24,4 +24,4 @@ WRITE16_HANDLER( prehisle_control16_w );
READ16_HANDLER( prehisle_control16_r );
VIDEO_START( prehisle );
-VIDEO_UPDATE( prehisle );
+SCREEN_UPDATE( prehisle );
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index a62b7ed165e..a0a2f6925bb 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -51,6 +51,6 @@ WRITE32_HANDLER( psikyo_vram_1_w );
VIDEO_START( sngkace );
VIDEO_START( psikyo );
-VIDEO_UPDATE( psikyo );
-VIDEO_UPDATE( psikyo_bootleg );
-VIDEO_EOF( psikyo );
+SCREEN_UPDATE( psikyo );
+SCREEN_UPDATE( psikyo_bootleg );
+SCREEN_EOF( psikyo );
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index 44098877c9c..ebc82dfcea2 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -37,4 +37,4 @@ public:
/*----------- defined in video/psikyo4.c -----------*/
VIDEO_START( psikyo4 );
-VIDEO_UPDATE( psikyo4 );
+SCREEN_UPDATE( psikyo4 );
diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h
index 12887119316..bc2c6c2c1ac 100644
--- a/src/mame/includes/psikyosh.h
+++ b/src/mame/includes/psikyosh.h
@@ -46,5 +46,5 @@ public:
/*----------- defined in video/psikyosh.c -----------*/
VIDEO_START( psikyosh );
-VIDEO_UPDATE( psikyosh );
-VIDEO_EOF( psikyosh );
+SCREEN_UPDATE( psikyosh );
+SCREEN_EOF( psikyosh );
diff --git a/src/mame/includes/psx.h b/src/mame/includes/psx.h
index dcf1592cf30..f3746602891 100644
--- a/src/mame/includes/psx.h
+++ b/src/mame/includes/psx.h
@@ -61,7 +61,7 @@ public:
PALETTE_INIT( psx );
VIDEO_START( psx_type1 );
VIDEO_START( psx_type2 );
-VIDEO_UPDATE( psx );
+SCREEN_UPDATE( psx );
INTERRUPT_GEN( psx_vblank );
extern void psx_gpu_reset( running_machine *machine );
extern void psx_gpu_read( running_machine *, UINT32 *p_ram, INT32 n_size );
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index 650c02ee4b3..f333d7e25dc 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -38,11 +38,11 @@ READ8_HANDLER( psychic5_vram_page_select_r );
VIDEO_START( psychic5 );
VIDEO_RESET( psychic5 );
-VIDEO_UPDATE( psychic5 );
+SCREEN_UPDATE( psychic5 );
WRITE8_HANDLER( bombsa_paged_ram_w );
WRITE8_HANDLER( bombsa_unknown_w );
VIDEO_START( bombsa );
VIDEO_RESET( bombsa );
-VIDEO_UPDATE( bombsa );
+SCREEN_UPDATE( bombsa );
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index 7416c882fe7..9e761344e7b 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -17,8 +17,8 @@ WRITE8_HANDLER( punchout_spr2_videoram_w );
VIDEO_START( punchout );
VIDEO_START( armwrest );
-VIDEO_UPDATE( punchout );
-VIDEO_UPDATE( armwrest );
+SCREEN_UPDATE( punchout );
+SCREEN_UPDATE( armwrest );
DRIVER_INIT( punchout );
DRIVER_INIT( spnchout );
diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h
index c6eeadb1936..38c68a91036 100644
--- a/src/mame/includes/pushman.h
+++ b/src/mame/includes/pushman.h
@@ -37,4 +37,4 @@ WRITE16_HANDLER( pushman_videoram_w );
VIDEO_START( pushman );
-VIDEO_UPDATE( pushman );
+SCREEN_UPDATE( pushman );
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index 30dc1fcee96..dbd16cd3b69 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -17,7 +17,7 @@ public:
VIDEO_START( qdrmfgp );
VIDEO_START( qdrmfgp2 );
-VIDEO_UPDATE( qdrmfgp );
+SCREEN_UPDATE( qdrmfgp );
void qdrmfgp_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
void qdrmfgp2_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index 04611c32bf1..b5f5e51bf32 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -1,7 +1,7 @@
/*----------- defined in video/quizdna.c -----------*/
VIDEO_START( quizdna );
-VIDEO_UPDATE( quizdna );
+SCREEN_UPDATE( quizdna );
WRITE8_HANDLER( quizdna_fg_ram_w );
WRITE8_HANDLER( quizdna_bg_ram_w );
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index 5c7f4481eab..0dada904b84 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -8,4 +8,4 @@ WRITE16_HANDLER( quizpani_txt_videoram_w );
WRITE16_HANDLER( quizpani_tilesbank_w );
VIDEO_START( quizpani );
-VIDEO_UPDATE( quizpani );
+SCREEN_UPDATE( quizpani );
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index e4ab873df0f..2b657f822d8 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -19,4 +19,4 @@ VIDEO_START( raiden );
VIDEO_START( raidena );
WRITE16_HANDLER( raiden_control_w );
WRITE16_HANDLER( raidena_control_w );
-VIDEO_UPDATE( raiden );
+SCREEN_UPDATE( raiden );
diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h
index e1d5529c8b3..8bb1664732e 100644
--- a/src/mame/includes/rainbow.h
+++ b/src/mame/includes/rainbow.h
@@ -47,9 +47,9 @@ WRITE16_HANDLER( rainbow_cchip_ram_w );
/*----------- defined in video/rainbow.c -----------*/
-VIDEO_UPDATE( rainbow );
+SCREEN_UPDATE( rainbow );
VIDEO_START( jumping );
-VIDEO_UPDATE( jumping );
+SCREEN_UPDATE( jumping );
WRITE16_HANDLER( jumping_spritectrl_w );
WRITE16_HANDLER( rainbow_spritectrl_w );
diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h
index 51d55bbb012..ea6810677a6 100644
--- a/src/mame/includes/rallyx.h
+++ b/src/mame/includes/rallyx.h
@@ -48,6 +48,6 @@ VIDEO_START( rallyx );
VIDEO_START( jungler );
VIDEO_START( locomotn );
VIDEO_START( commsega );
-VIDEO_UPDATE( rallyx );
-VIDEO_UPDATE( jungler );
-VIDEO_UPDATE( locomotn );
+SCREEN_UPDATE( rallyx );
+SCREEN_UPDATE( jungler );
+SCREEN_UPDATE( locomotn );
diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h
index dfd1327d60e..9a504821929 100644
--- a/src/mame/includes/rampart.h
+++ b/src/mame/includes/rampart.h
@@ -21,6 +21,6 @@ public:
/*----------- defined in video/rampart.c -----------*/
VIDEO_START( rampart );
-VIDEO_UPDATE( rampart );
+SCREEN_UPDATE( rampart );
void rampart_bitmap_render(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect);
diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h
index 4e6541ec4c9..8309e3a2bc9 100644
--- a/src/mame/includes/rastan.h
+++ b/src/mame/includes/rastan.h
@@ -33,4 +33,4 @@ public:
WRITE16_HANDLER( rastan_spritectrl_w );
-VIDEO_UPDATE( rastan );
+SCREEN_UPDATE( rastan );
diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h
index 5f9aa0cc2d4..4a565485557 100644
--- a/src/mame/includes/realbrk.h
+++ b/src/mame/includes/realbrk.h
@@ -27,8 +27,8 @@ public:
#define REALBRK_H
VIDEO_START(realbrk);
-VIDEO_UPDATE(realbrk);
-VIDEO_UPDATE(dai2kaku);
+SCREEN_UPDATE(realbrk);
+SCREEN_UPDATE(dai2kaku);
WRITE16_HANDLER( realbrk_vram_0_w );
WRITE16_HANDLER( realbrk_vram_1_w );
diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h
index df9d00682e9..93388858817 100644
--- a/src/mame/includes/relief.h
+++ b/src/mame/includes/relief.h
@@ -21,4 +21,4 @@ public:
/*----------- defined in video/relief.c -----------*/
VIDEO_START( relief );
-VIDEO_UPDATE( relief );
+SCREEN_UPDATE( relief );
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index e119402af0c..4617752fbc4 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -12,7 +12,7 @@ public:
extern UINT8 *renegade_videoram2;
-VIDEO_UPDATE( renegade );
+SCREEN_UPDATE( renegade );
VIDEO_START( renegade );
WRITE8_HANDLER( renegade_scroll0_w );
WRITE8_HANDLER( renegade_scroll1_w );
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index b776ff5f789..90a32302d7c 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -48,7 +48,7 @@ READ8_HANDLER( retofinv_mcu_status_r );
VIDEO_START( retofinv );
PALETTE_INIT( retofinv );
-VIDEO_UPDATE( retofinv );
+SCREEN_UPDATE( retofinv );
WRITE8_HANDLER( retofinv_bg_videoram_w );
WRITE8_HANDLER( retofinv_fg_videoram_w );
WRITE8_HANDLER( retofinv_gfx_ctrl_w );
diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h
index 2df882cd395..a5776c9b322 100644
--- a/src/mame/includes/rockrage.h
+++ b/src/mame/includes/rockrage.h
@@ -28,7 +28,7 @@ public:
WRITE8_HANDLER( rockrage_vreg_w );
-VIDEO_UPDATE( rockrage );
+SCREEN_UPDATE( rockrage );
PALETTE_INIT( rockrage );
void rockrage_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags);
diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h
index 0a9e1b262eb..334d2899d43 100644
--- a/src/mame/includes/rocnrope.h
+++ b/src/mame/includes/rocnrope.h
@@ -23,4 +23,4 @@ WRITE8_HANDLER( rocnrope_flipscreen_w );
PALETTE_INIT( rocnrope );
VIDEO_START( rocnrope );
-VIDEO_UPDATE( rocnrope );
+SCREEN_UPDATE( rocnrope );
diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h
index ab0fa2f92e1..7de66e398aa 100644
--- a/src/mame/includes/rohga.h
+++ b/src/mame/includes/rohga.h
@@ -41,7 +41,7 @@ WRITE16_HANDLER( rohga_buffer_spriteram16_w );
VIDEO_START( rohga );
-VIDEO_UPDATE( rohga );
-VIDEO_UPDATE( schmeisr );
-VIDEO_UPDATE( wizdfire );
-VIDEO_UPDATE( nitrobal );
+SCREEN_UPDATE( rohga );
+SCREEN_UPDATE( schmeisr );
+SCREEN_UPDATE( wizdfire );
+SCREEN_UPDATE( nitrobal );
diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h
index fc78e51dce0..95c9063b31f 100644
--- a/src/mame/includes/rollerg.h
+++ b/src/mame/includes/rollerg.h
@@ -33,4 +33,4 @@ extern void rollerg_sprite_callback(running_machine *machine, int *code,int *col
extern void rollerg_zoom_callback(running_machine *machine, int *code,int *color,int *flags);
VIDEO_START( rollerg );
-VIDEO_UPDATE( rollerg );
+SCREEN_UPDATE( rollerg );
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index 00e7fa82348..a6ee42d1104 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -21,7 +21,7 @@ public:
/*----------- defined in video/rollrace.c -----------*/
PALETTE_INIT( rollrace );
-VIDEO_UPDATE( rollrace );
+SCREEN_UPDATE( rollrace );
WRITE8_HANDLER( rollrace_charbank_w );
WRITE8_HANDLER( rollrace_backgroundpage_w );
diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h
index 6cc4418dff7..e81c4182f9b 100644
--- a/src/mame/includes/route16.h
+++ b/src/mame/includes/route16.h
@@ -6,6 +6,6 @@ extern size_t route16_videoram_size;
WRITE8_HANDLER( route16_out0_w );
WRITE8_HANDLER( route16_out1_w );
-VIDEO_UPDATE( route16 );
-VIDEO_UPDATE( stratvox );
-VIDEO_UPDATE( ttmahjng );
+SCREEN_UPDATE( route16 );
+SCREEN_UPDATE( stratvox );
+SCREEN_UPDATE( ttmahjng );
diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h
index a2886ac12e2..0f0960dcb2b 100644
--- a/src/mame/includes/rpunch.h
+++ b/src/mame/includes/rpunch.h
@@ -15,7 +15,7 @@ extern size_t rpunch_bitmapram_size;
extern int rpunch_sprite_palette;
VIDEO_START( rpunch );
-VIDEO_UPDATE( rpunch );
+SCREEN_UPDATE( rpunch );
WRITE16_HANDLER( rpunch_videoram_w );
WRITE16_HANDLER( rpunch_videoreg_w );
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 386625f0f22..8d3386e486c 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -16,8 +16,8 @@ public:
VIDEO_START( runaway );
VIDEO_START( qwak );
-VIDEO_UPDATE( runaway );
-VIDEO_UPDATE( qwak );
+SCREEN_UPDATE( runaway );
+SCREEN_UPDATE( qwak );
WRITE8_HANDLER( runaway_paletteram_w );
WRITE8_HANDLER( runaway_video_ram_w );
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 582f80118e7..44e1899b195 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -46,4 +46,4 @@ WRITE16_HANDLER( rng_ttl_ram_w );
WRITE16_HANDLER( rng_936_videoram_w );
VIDEO_START( rng );
-VIDEO_UPDATE( rng );
+SCREEN_UPDATE( rng );
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index 27a5bb2d39b..f3056bc4d34 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -29,5 +29,5 @@ WRITE8_HANDLER( sauro_palette_bank_w );
VIDEO_START( sauro );
VIDEO_START( trckydoc );
-VIDEO_UPDATE( sauro );
-VIDEO_UPDATE( trckydoc );
+SCREEN_UPDATE( sauro );
+SCREEN_UPDATE( trckydoc );
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index 935f91e582f..9511bda9e27 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -24,4 +24,4 @@ WRITE8_HANDLER( sbasketb_flipscreen_w );
PALETTE_INIT( sbasketb );
VIDEO_START( sbasketb );
-VIDEO_UPDATE( sbasketb );
+SCREEN_UPDATE( sbasketb );
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index 9c6287a59ad..d32a0cd05f6 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -14,7 +14,7 @@ public:
/*----------- defined in video/sbugger.c -----------*/
PALETTE_INIT(sbugger);
-VIDEO_UPDATE(sbugger);
+SCREEN_UPDATE(sbugger);
VIDEO_START(sbugger);
WRITE8_HANDLER( sbugger_videoram_attr_w );
WRITE8_HANDLER( sbugger_videoram_w );
diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h
index b0308591c3a..b57ef736535 100644
--- a/src/mame/includes/scotrsht.h
+++ b/src/mame/includes/scotrsht.h
@@ -26,4 +26,4 @@ WRITE8_HANDLER( scotrsht_palettebank_w );
PALETTE_INIT( scotrsht );
VIDEO_START( scotrsht );
-VIDEO_UPDATE( scotrsht );
+SCREEN_UPDATE( scotrsht );
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index de1a57bf4de..fcea4a5c257 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -25,6 +25,6 @@ WRITE16_HANDLER( sderby_videoram_w );
WRITE16_HANDLER( sderby_md_videoram_w );
WRITE16_HANDLER( sderby_fg_videoram_w );
VIDEO_START( sderby );
-VIDEO_UPDATE( sderby );
-VIDEO_UPDATE( pmroulet );
+SCREEN_UPDATE( sderby );
+SCREEN_UPDATE( pmroulet );
WRITE16_HANDLER( sderby_scroll_w );
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index f3af8882a18..d63d4218dde 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -47,7 +47,7 @@ READ8_HANDLER( segag80r_video_port_r );
WRITE8_HANDLER( segag80r_video_port_w );
VIDEO_START( segag80r );
-VIDEO_UPDATE( segag80r );
+SCREEN_UPDATE( segag80r );
READ8_HANDLER( spaceod_back_port_r );
diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h
index 1bfa1027803..2df92c9421c 100644
--- a/src/mame/includes/segag80v.h
+++ b/src/mame/includes/segag80v.h
@@ -40,4 +40,4 @@ WRITE8_HANDLER( zektor2_sh_w );
/*----------- defined in video/segag80v.c -----------*/
VIDEO_START( segag80v );
-VIDEO_UPDATE( segag80v );
+SCREEN_UPDATE( segag80v );
diff --git a/src/mame/includes/segamsys.h b/src/mame/includes/segamsys.h
index 59d1c5dd3e1..3031cc7338a 100644
--- a/src/mame/includes/segamsys.h
+++ b/src/mame/includes/segamsys.h
@@ -8,15 +8,15 @@ enum sms_mapper
ADDRESS_MAP_EXTERN( sms_io_map, 8 );
-extern VIDEO_UPDATE(megatech_bios);
-extern VIDEO_UPDATE(megaplay_bios);
-extern VIDEO_UPDATE(megatech_md_sms);
+extern SCREEN_UPDATE(megatech_bios);
+extern SCREEN_UPDATE(megaplay_bios);
+extern SCREEN_UPDATE(megatech_md_sms);
extern DRIVER_INIT( megatech_bios );
extern DRIVER_INIT( hazemd_segasyse );
extern MACHINE_RESET(megatech_bios);
extern MACHINE_RESET(megatech_md_sms);
-extern VIDEO_EOF(megatech_bios);
-extern VIDEO_EOF(megatech_md_sms);
+extern SCREEN_EOF(megatech_bios);
+extern SCREEN_EOF(megatech_md_sms);
extern READ8_HANDLER( sms_vcounter_r );
extern READ8_HANDLER( sms_vdp_data_r );
@@ -35,14 +35,14 @@ extern READ8_HANDLER( md_sms_vdp_ctrl_r );
extern WRITE8_HANDLER( md_sms_vdp_ctrl_w );
extern VIDEO_START(sms);
-extern VIDEO_EOF(sms);
+extern SCREEN_EOF(sms);
extern MACHINE_RESET(sms);
extern READ8_HANDLER( sms_vdp_2_data_r );
extern WRITE8_HANDLER( sms_vdp_2_data_w );
extern READ8_HANDLER( sms_vdp_2_ctrl_r );
extern WRITE8_HANDLER( sms_vdp_2_ctrl_w );
-extern VIDEO_EOF(systeme);
-extern VIDEO_UPDATE(systeme);
+extern SCREEN_EOF(systeme);
+extern SCREEN_UPDATE(systeme);
extern MACHINE_RESET(systeme);
extern UINT8* sms_mainram;
extern UINT8* vdp2_vram_bank0;
diff --git a/src/mame/includes/segas16.h b/src/mame/includes/segas16.h
index 5bd9a54b0ed..14876b1570a 100644
--- a/src/mame/includes/segas16.h
+++ b/src/mame/includes/segas16.h
@@ -103,23 +103,23 @@ public:
VIDEO_START( hangon );
VIDEO_START( sharrier );
-VIDEO_UPDATE( hangon );
+SCREEN_UPDATE( hangon );
/*----------- defined in video/segas16a.c -----------*/
VIDEO_START( system16a );
-VIDEO_UPDATE( system16a );
+SCREEN_UPDATE( system16a );
/*----------- defined in video/segas16b.c -----------*/
VIDEO_START( system16b );
VIDEO_START( timscanr );
-VIDEO_UPDATE( system16b );
+SCREEN_UPDATE( system16b );
/*----------- defined in video/segas18.c -----------*/
VIDEO_START( system18 );
-VIDEO_UPDATE( system18 );
+SCREEN_UPDATE( system18 );
void system18_set_grayscale(running_machine *machine, int enable);
void system18_set_vdp_enable(running_machine *machine, int eanble);
@@ -129,18 +129,18 @@ void system18_set_vdp_mixing(running_machine *machine, int mixing);
VIDEO_START( outrun );
VIDEO_START( shangon );
-VIDEO_UPDATE( outrun );
-VIDEO_UPDATE( shangon );
+SCREEN_UPDATE( outrun );
+SCREEN_UPDATE( shangon );
/*----------- defined in video/segaxbd.c -----------*/
VIDEO_START( xboard );
-VIDEO_UPDATE( xboard );
+SCREEN_UPDATE( xboard );
/*----------- defined in video/segaybd.c -----------*/
VIDEO_START( yboard );
-VIDEO_UPDATE( yboard );
+SCREEN_UPDATE( yboard );
/*----------- defined in machine/s16fd.c -----------*/
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 5e7b7893aad..d2b5e330290 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -33,4 +33,4 @@ extern void s24_fd1094_driver_init(running_machine *machine);
/*----------- defined in video/segas24.c -----------*/
VIDEO_START(system24);
-VIDEO_UPDATE(system24);
+SCREEN_UPDATE(system24);
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index 45b899cdf5f..0147b3369e8 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -91,8 +91,8 @@ WRITE16_HANDLER( arescue_dsp_w );
VIDEO_START(system32);
VIDEO_START(multi32);
-VIDEO_UPDATE(system32);
-VIDEO_UPDATE(multi32);
+SCREEN_UPDATE(system32);
+SCREEN_UPDATE(multi32);
void system32_set_vblank(running_machine *machine, int state);
READ16_HANDLER( system32_videoram_r );
diff --git a/src/mame/includes/sei_crtc.h b/src/mame/includes/sei_crtc.h
index eb2fc8c3101..a2df5d43f92 100644
--- a/src/mame/includes/sei_crtc.h
+++ b/src/mame/includes/sei_crtc.h
@@ -11,4 +11,4 @@ WRITE16_HANDLER( seibucrtc_sc3vram_w );
WRITE16_HANDLER( seibucrtc_vregs_w );
void seibucrtc_sc0bank_w(UINT16 data);
VIDEO_START( seibu_crtc );
-VIDEO_UPDATE( seibu_crtc );
+SCREEN_UPDATE( seibu_crtc );
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 4889881286e..d86ffc72171 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -28,10 +28,10 @@ void seibuspi_rise11_sprite_decrypt_feversoc(UINT8 *rom, int romsize);
extern UINT32 *spi_scrollram;
VIDEO_START( spi );
-VIDEO_UPDATE( spi );
+SCREEN_UPDATE( spi );
VIDEO_START( sys386f2 );
-VIDEO_UPDATE( sys386f2 );
+SCREEN_UPDATE( sys386f2 );
READ32_HANDLER( spi_layer_bank_r );
WRITE32_HANDLER( spi_layer_bank_w );
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index c7e184a3a2b..7784905c04e 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -27,4 +27,4 @@ WRITE8_HANDLER( seicross_colorram_w );
PALETTE_INIT( seicross );
VIDEO_START( seicross );
-VIDEO_UPDATE( seicross );
+SCREEN_UPDATE( seicross );
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index b9a9b9b533b..727d791f95a 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -62,4 +62,4 @@ WRITE8_HANDLER( senjyo_bg3videoram_w );
WRITE8_HANDLER( senjyo_bgstripes_w );
VIDEO_START( senjyo );
-VIDEO_UPDATE( senjyo );
+SCREEN_UPDATE( senjyo );
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 835d82aa1fb..46d95bf39dd 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -111,9 +111,9 @@ VIDEO_START( seta_1_layer);
VIDEO_START( seta_2_layers);
VIDEO_START( oisipuzl_2_layers );
-VIDEO_UPDATE( seta );
-VIDEO_UPDATE( seta_no_layers );
-VIDEO_UPDATE( usclssic );
-VIDEO_UPDATE( inttoote );
+SCREEN_UPDATE( seta );
+SCREEN_UPDATE( seta_no_layers );
+SCREEN_UPDATE( usclssic );
+SCREEN_UPDATE( inttoote );
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 341588b6732..6a33dad0fe3 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -33,7 +33,7 @@ WRITE16_HANDLER( seta2_vregs_w );
VIDEO_START( seta2 );
VIDEO_START( seta2_offset );
-VIDEO_UPDATE( seta2 );
-VIDEO_EOF( seta2 );
+SCREEN_UPDATE( seta2 );
+SCREEN_EOF( seta2 );
diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h
index b61fa6d3014..3bf007b198d 100644
--- a/src/mame/includes/sf.h
+++ b/src/mame/includes/sf.h
@@ -35,4 +35,4 @@ WRITE16_HANDLER( sf_videoram_w );
WRITE16_HANDLER( sf_gfxctrl_w );
VIDEO_START( sf );
-VIDEO_UPDATE( sf );
+SCREEN_UPDATE( sf );
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index 4a5c0eaf5e5..8f88739f252 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -31,8 +31,8 @@ WRITE16_HANDLER ( shadfrce_bg1scrollx_w );
WRITE16_HANDLER ( shadfrce_bg0scrolly_w );
WRITE16_HANDLER ( shadfrce_bg1scrolly_w );
VIDEO_START( shadfrce );
-VIDEO_EOF(shadfrce);
-VIDEO_UPDATE( shadfrce );
+SCREEN_EOF(shadfrce);
+SCREEN_UPDATE( shadfrce );
WRITE16_HANDLER( shadfrce_fgvideoram_w );
WRITE16_HANDLER( shadfrce_bg0videoram_w );
WRITE16_HANDLER( shadfrce_bg1videoram_w );
diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h
index 8ce78740eb4..1ba5ab78c36 100644
--- a/src/mame/includes/shangha3.h
+++ b/src/mame/includes/shangha3.h
@@ -23,4 +23,4 @@ WRITE16_HANDLER( shangha3_flipscreen_w );
WRITE16_HANDLER( shangha3_gfxlist_addr_w );
WRITE16_HANDLER( shangha3_blitter_go_w );
VIDEO_START( shangha3 );
-VIDEO_UPDATE( shangha3 );
+SCREEN_UPDATE( shangha3 );
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index f6204bc603c..9af00cc2781 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -14,9 +14,9 @@ extern UINT8 *shangkid_videoreg;
extern int shangkid_gfx_type;
VIDEO_START( shangkid );
-VIDEO_UPDATE( shangkid );
+SCREEN_UPDATE( shangkid );
WRITE8_HANDLER( shangkid_videoram_w );
PALETTE_INIT( dynamski );
-VIDEO_UPDATE( dynamski );
+SCREEN_UPDATE( dynamski );
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index efae10f1059..6fcd35084a9 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -25,4 +25,4 @@ WRITE8_HANDLER( shaolins_nmi_w );
PALETTE_INIT( shaolins );
VIDEO_START( shaolins );
-VIDEO_UPDATE( shaolins );
+SCREEN_UPDATE( shaolins );
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index 972c3f7d095..2ebe5c17b9a 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -18,4 +18,4 @@ WRITE8_HANDLER( sichuan2_bankswitch_w );
WRITE8_HANDLER( sichuan2_paletteram_w );
VIDEO_START( sichuan2 );
-VIDEO_UPDATE( sichuan2 );
+SCREEN_UPDATE( sichuan2 );
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index 91c3909f845..4bca02d8786 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -19,5 +19,5 @@ WRITE8_HANDLER( shootout_textram_w );
PALETTE_INIT( shootout );
VIDEO_START( shootout );
-VIDEO_UPDATE( shootout );
-VIDEO_UPDATE( shootouj );
+SCREEN_UPDATE( shootout );
+SCREEN_UPDATE( shootouj );
diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h
index fb4c61a878c..c0ded7077d2 100644
--- a/src/mame/includes/shuuz.h
+++ b/src/mame/includes/shuuz.h
@@ -19,4 +19,4 @@ public:
/*----------- defined in video/shuuz.c -----------*/
VIDEO_START( shuuz );
-VIDEO_UPDATE( shuuz );
+SCREEN_UPDATE( shuuz );
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index a173c6c74c7..192aa88255c 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -36,5 +36,5 @@ WRITE8_HANDLER( sidearms_c804_w );
WRITE8_HANDLER( sidearms_gfxctrl_w );
VIDEO_START( sidearms );
-VIDEO_UPDATE( sidearms );
-VIDEO_EOF( sidearms );
+SCREEN_UPDATE( sidearms );
+SCREEN_EOF( sidearms );
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index a4ef848d1c1..8cf2b586108 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -22,7 +22,7 @@ public:
PALETTE_INIT( sidepckt );
VIDEO_START( sidepckt );
-VIDEO_UPDATE( sidepckt );
+SCREEN_UPDATE( sidepckt );
WRITE8_HANDLER( sidepckt_flipscreen_w );
WRITE8_HANDLER( sidepckt_videoram_w );
diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h
index 6c1730e7e9c..63832def482 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -21,4 +21,4 @@ WRITE32_HANDLER( silkroad_fgram_w );
WRITE32_HANDLER( silkroad_fgram2_w );
WRITE32_HANDLER( silkroad_fgram3_w );
VIDEO_START(silkroad);
-VIDEO_UPDATE(silkroad);
+SCREEN_UPDATE(silkroad);
diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h
index 4735075f0b1..71230c7805e 100644
--- a/src/mame/includes/simpl156.h
+++ b/src/mame/includes/simpl156.h
@@ -36,4 +36,4 @@ public:
/*----------- defined in video/simpl156.c -----------*/
VIDEO_START( simpl156 );
-VIDEO_UPDATE( simpl156 );
+SCREEN_UPDATE( simpl156 );
diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h
index 8c364941f52..765bfc3952c 100644
--- a/src/mame/includes/simpsons.h
+++ b/src/mame/includes/simpsons.h
@@ -41,7 +41,7 @@ MACHINE_START( simpsons );
/*----------- defined in video/simpsons.c -----------*/
void simpsons_video_banking( running_machine *machine, int select );
-VIDEO_UPDATE( simpsons );
+SCREEN_UPDATE( simpsons );
extern void simpsons_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority);
extern void simpsons_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask);
diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h
index d5622b63bf8..451eb6f6866 100644
--- a/src/mame/includes/skullxbo.h
+++ b/src/mame/includes/skullxbo.h
@@ -22,6 +22,6 @@ WRITE16_HANDLER( skullxbo_yscroll_w );
WRITE16_HANDLER( skullxbo_mobmsb_w );
VIDEO_START( skullxbo );
-VIDEO_UPDATE( skullxbo );
+SCREEN_UPDATE( skullxbo );
void skullxbo_scanline_update(running_machine *machine, int param);
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 99fcafa843e..6e972354437 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -53,4 +53,4 @@ WRITE8_HANDLER( skydiver_2000_201F_w );
WRITE8_HANDLER( skydiver_width_w );
WRITE8_HANDLER( skydiver_coin_lockout_w );
VIDEO_START( skydiver );
-VIDEO_UPDATE( skydiver );
+SCREEN_UPDATE( skydiver );
diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h
index 91d34cd2314..1c3b59bba2c 100644
--- a/src/mame/includes/skyfox.h
+++ b/src/mame/includes/skyfox.h
@@ -31,5 +31,5 @@ WRITE8_HANDLER( skyfox_vregs_w );
PALETTE_INIT( skyfox );
-VIDEO_UPDATE( skyfox );
+SCREEN_UPDATE( skyfox );
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index 5624584c68b..303a2f496c5 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -19,7 +19,7 @@ public:
/*----------- defined in video/skykid.c -----------*/
VIDEO_START( skykid );
-VIDEO_UPDATE( skykid );
+SCREEN_UPDATE( skykid );
PALETTE_INIT( skykid );
READ8_HANDLER( skykid_videoram_r );
diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h
index adcb7810b7e..38213c8798b 100644
--- a/src/mame/includes/skyraid.h
+++ b/src/mame/includes/skyraid.h
@@ -29,4 +29,4 @@ extern WRITE8_DEVICE_HANDLER( skyraid_sound_w );
/*----------- defined in video/skyraid.c -----------*/
VIDEO_START(skyraid);
-VIDEO_UPDATE(skyraid);
+SCREEN_UPDATE(skyraid);
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index 4df9b56ebbb..94be499739e 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -89,8 +89,8 @@ extern UINT8 *slapfight_fixvideoram;
extern UINT8 *slapfight_fixcolorram;
extern UINT8 *slapfight_scrollx_lo,*slapfight_scrollx_hi,*slapfight_scrolly;
-VIDEO_UPDATE( slapfight );
-VIDEO_UPDATE( perfrman );
+SCREEN_UPDATE( slapfight );
+SCREEN_UPDATE( perfrman );
VIDEO_START( slapfight );
VIDEO_START( perfrman );
diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h
index f062f7c027b..68f7f94fca5 100644
--- a/src/mame/includes/slapshot.h
+++ b/src/mame/includes/slapshot.h
@@ -54,5 +54,5 @@ public:
/*----------- defined in video/slapshot.c -----------*/
VIDEO_START( slapshot );
-VIDEO_UPDATE( slapshot );
-VIDEO_EOF( taito_no_buffer );
+SCREEN_UPDATE( slapshot );
+SCREEN_EOF( taito_no_buffer );
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 1f67028a1ed..8a4df9c0f76 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -672,7 +672,7 @@ extern struct SNES_PPU_STRUCT snes_ppu;
extern void snes_latch_counters(running_machine *machine);
extern VIDEO_START( snes );
-extern VIDEO_UPDATE( snes );
+extern SCREEN_UPDATE( snes );
extern READ8_HANDLER( snes_ppu_read );
extern WRITE8_HANDLER( snes_ppu_write );
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index dd36a89279a..976aba860db 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -54,11 +54,11 @@ extern VIDEO_START( gwar );
extern VIDEO_START( psychos );
extern VIDEO_START( tdfever );
-extern VIDEO_UPDATE( marvins );
-extern VIDEO_UPDATE( tnk3 );
-extern VIDEO_UPDATE( ikari );
-extern VIDEO_UPDATE( gwar );
-extern VIDEO_UPDATE( tdfever );
+extern SCREEN_UPDATE( marvins );
+extern SCREEN_UPDATE( tnk3 );
+extern SCREEN_UPDATE( ikari );
+extern SCREEN_UPDATE( gwar );
+extern SCREEN_UPDATE( tdfever );
extern WRITE8_HANDLER( snk_fg_scrollx_w );
extern WRITE8_HANDLER( snk_fg_scrolly_w );
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 35cc704ed30..3d4537afc88 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -73,7 +73,7 @@ WRITE8_HANDLER( snk6502_scrolly_w );
PALETTE_INIT( snk6502 );
VIDEO_START( snk6502 );
-VIDEO_UPDATE( snk6502 );
+SCREEN_UPDATE( snk6502 );
VIDEO_START( pballoon );
WRITE8_HANDLER( satansat_b002_w );
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index a2254c072cc..b16d385d277 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -22,7 +22,7 @@ public:
VIDEO_START( pow );
VIDEO_START( searchar );
-VIDEO_UPDATE( pow );
+SCREEN_UPDATE( pow );
WRITE16_HANDLER( pow_paletteram16_word_w );
WRITE16_HANDLER( pow_flipscreen16_w );
WRITE16_HANDLER( searchar_flipscreen16_w );
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index c0f003dfdc3..5481551c0c4 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -9,5 +9,5 @@ PALETTE_INIT( snookr10 );
PALETTE_INIT( apple10 );
VIDEO_START( snookr10 );
VIDEO_START( apple10 );
-VIDEO_UPDATE( snookr10 );
+SCREEN_UPDATE( snookr10 );
diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h
index 4ac5f02645d..d208cb76839 100644
--- a/src/mame/includes/solomon.h
+++ b/src/mame/includes/solomon.h
@@ -25,4 +25,4 @@ WRITE8_HANDLER( solomon_colorram2_w );
WRITE8_HANDLER( solomon_flipscreen_w );
VIDEO_START( solomon );
-VIDEO_UPDATE( solomon );
+SCREEN_UPDATE( solomon );
diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h
index 9b1df1a6aeb..0406a89af71 100644
--- a/src/mame/includes/sonson.h
+++ b/src/mame/includes/sonson.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( sonson_flipscreen_w );
PALETTE_INIT( sonson );
VIDEO_START( sonson );
-VIDEO_UPDATE( sonson );
+SCREEN_UPDATE( sonson );
diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h
index 7305178d2e3..bdf66e081a8 100644
--- a/src/mame/includes/spacefb.h
+++ b/src/mame/includes/spacefb.h
@@ -40,7 +40,7 @@ extern UINT8 *spacefb_videoram;
extern size_t spacefb_videoram_size;
VIDEO_START( spacefb );
-VIDEO_UPDATE( spacefb );
+SCREEN_UPDATE( spacefb );
WRITE8_HANDLER( spacefb_port_0_w );
WRITE8_HANDLER( spacefb_port_2_w );
diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h
index 52db40e4266..a67081addaa 100644
--- a/src/mame/includes/spbactn.h
+++ b/src/mame/includes/spbactn.h
@@ -16,4 +16,4 @@ public:
/*----------- defined in video/spbactn.c -----------*/
VIDEO_START( spbactn );
-VIDEO_UPDATE( spbactn );
+SCREEN_UPDATE( spbactn );
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index 53310eba269..78a2b0d6896 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -16,4 +16,4 @@ public:
/*----------- defined in video/spcforce.c -----------*/
WRITE8_HANDLER( spcforce_flip_screen_w );
-VIDEO_UPDATE( spcforce );
+SCREEN_UPDATE( spcforce );
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 7f5764be070..2205d6a9ec3 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -4,7 +4,7 @@ extern UINT8 *spdodgeb_videoram;
PALETTE_INIT( spdodgeb );
VIDEO_START( spdodgeb );
-VIDEO_UPDATE( spdodgeb );
+SCREEN_UPDATE( spdodgeb );
INTERRUPT_GEN( spdodgeb_interrupt );
WRITE8_HANDLER( spdodgeb_scrollx_lo_w );
WRITE8_HANDLER( spdodgeb_ctrl_w );
diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h
index eb2012e582f..15ee5c05895 100644
--- a/src/mame/includes/speedatk.h
+++ b/src/mame/includes/speedatk.h
@@ -23,4 +23,4 @@ WRITE8_HANDLER( speedatk_colorram_w );
WRITE8_HANDLER( speedatk_6845_w );
PALETTE_INIT( speedatk );
VIDEO_START( speedatk );
-VIDEO_UPDATE( speedatk );
+SCREEN_UPDATE( speedatk );
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index a6afb806a69..1bcb67c373a 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -4,6 +4,6 @@ extern UINT8 *speedbal_background_videoram;
extern UINT8 *speedbal_foreground_videoram;
VIDEO_START( speedbal );
-VIDEO_UPDATE( speedbal );
+SCREEN_UPDATE( speedbal );
WRITE8_HANDLER( speedbal_foreground_videoram_w );
WRITE8_HANDLER( speedbal_background_videoram_w );
diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h
index a8624768423..fa8d13fadfb 100644
--- a/src/mame/includes/speedspn.h
+++ b/src/mame/includes/speedspn.h
@@ -3,7 +3,7 @@
extern UINT8 *speedspn_attram;
VIDEO_START( speedspn );
-VIDEO_UPDATE( speedspn );
+SCREEN_UPDATE( speedspn );
WRITE8_HANDLER( speedspn_vidram_w );
WRITE8_HANDLER( speedspn_attram_w );
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 56a2c337450..7842327c143 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -23,5 +23,5 @@ public:
WRITE16_HANDLER( splash_vram_w );
VIDEO_START( splash );
-VIDEO_UPDATE( splash );
-VIDEO_UPDATE( funystrp );
+SCREEN_UPDATE( splash );
+SCREEN_UPDATE( funystrp );
diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h
index 0e197b3c0ee..b509ade740b 100644
--- a/src/mame/includes/sprcros2.h
+++ b/src/mame/includes/sprcros2.h
@@ -24,4 +24,4 @@ WRITE8_HANDLER( sprcros2_bgscrolly_w );
PALETTE_INIT( sprcros2 );
VIDEO_START( sprcros2 );
-VIDEO_UPDATE( sprcros2 );
+SCREEN_UPDATE( sprcros2 );
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index ef03ab60ac4..a198de8ca51 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -56,7 +56,7 @@ WRITE8_HANDLER( sprint2_collision_reset2_w );
WRITE8_HANDLER( sprint2_video_ram_w );
PALETTE_INIT( sprint2 );
-VIDEO_UPDATE( sprint2 );
+SCREEN_UPDATE( sprint2 );
VIDEO_START( sprint2 );
-VIDEO_EOF( sprint2 );
+SCREEN_EOF( sprint2 );
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index a7a1940c663..b8fdfce3662 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -20,8 +20,8 @@ public:
PALETTE_INIT( sprint4 );
-VIDEO_EOF( sprint4 );
+SCREEN_EOF( sprint4 );
VIDEO_START( sprint4 );
-VIDEO_UPDATE( sprint4 );
+SCREEN_UPDATE( sprint4 );
WRITE8_HANDLER( sprint4_video_ram_w );
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index 6c62744ea74..d80ef8f94f1 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -31,9 +31,9 @@ void sprint8_set_collision(running_machine *machine, int n);
/*----------- defined in video/sprint8.c -----------*/
PALETTE_INIT( sprint8 );
-VIDEO_EOF( sprint8 );
+SCREEN_EOF( sprint8 );
VIDEO_START( sprint8 );
-VIDEO_UPDATE( sprint8 );
+SCREEN_UPDATE( sprint8 );
WRITE8_HANDLER( sprint8_video_ram_w );
diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h
index 0399e8f891e..aa79648a28f 100644
--- a/src/mame/includes/spy.h
+++ b/src/mame/includes/spy.h
@@ -39,4 +39,4 @@ extern void spy_tile_callback(running_machine *machine, int layer,int bank,int *
extern void spy_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow);
VIDEO_START( spy );
-VIDEO_UPDATE( spy );
+SCREEN_UPDATE( spy );
diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h
index cf11c9d3b37..a6106b89f5a 100644
--- a/src/mame/includes/srmp2.h
+++ b/src/mame/includes/srmp2.h
@@ -25,7 +25,7 @@ public:
/*----------- defined in video/srmp2.c -----------*/
PALETTE_INIT( srmp2 );
-VIDEO_UPDATE( srmp2 );
+SCREEN_UPDATE( srmp2 );
PALETTE_INIT( srmp3 );
-VIDEO_UPDATE( srmp3 );
-VIDEO_UPDATE( mjyuugi );
+SCREEN_UPDATE( srmp3 );
+SCREEN_UPDATE( mjyuugi );
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index 3c9da4aee6c..816868fc8dd 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -20,5 +20,5 @@ WRITE8_HANDLER( srumbler_scroll_w );
WRITE8_HANDLER( srumbler_4009_w );
VIDEO_START( srumbler );
-VIDEO_UPDATE( srumbler );
-VIDEO_EOF( srumbler );
+SCREEN_UPDATE( srumbler );
+SCREEN_EOF( srumbler );
diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h
index ff6b5b5245c..bb3cab13e0c 100644
--- a/src/mame/includes/sshangha.h
+++ b/src/mame/includes/sshangha.h
@@ -25,7 +25,7 @@ public:
/*----------- defined in video/sshangha.c -----------*/
VIDEO_START( sshangha );
-VIDEO_UPDATE( sshangha );
+SCREEN_UPDATE( sshangha );
WRITE16_HANDLER( sshangha_pf2_data_w );
WRITE16_HANDLER( sshangha_pf1_data_w );
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index 5bc59d0d058..d0037d19c0e 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -39,5 +39,5 @@ WRITE16_HANDLER( sslam_bg_tileram_w );
WRITE16_HANDLER( powerbls_bg_tileram_w );
VIDEO_START(sslam);
VIDEO_START(powerbls);
-VIDEO_UPDATE(sslam);
-VIDEO_UPDATE(powerbls);
+SCREEN_UPDATE(sslam);
+SCREEN_UPDATE(powerbls);
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index 736c290d27d..b9829f48fc8 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -29,4 +29,4 @@ WRITE8_HANDLER( ssozumo_flipscreen_w );
PALETTE_INIT( ssozumo );
VIDEO_START( ssozumo );
-VIDEO_UPDATE( ssozumo );
+SCREEN_UPDATE( ssozumo );
diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h
index 8b2335016b8..58dc45f44c5 100644
--- a/src/mame/includes/sspeedr.h
+++ b/src/mame/includes/sspeedr.h
@@ -37,5 +37,5 @@ WRITE8_HANDLER( sspeedr_track_vert_w );
WRITE8_HANDLER( sspeedr_track_ice_w );
VIDEO_START( sspeedr );
-VIDEO_UPDATE( sspeedr );
-VIDEO_EOF( sspeedr );
+SCREEN_UPDATE( sspeedr );
+SCREEN_EOF( sspeedr );
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index 454d99408c9..742a1676304 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -21,5 +21,5 @@ WRITE8_HANDLER(ssrj_vram2_w);
WRITE8_HANDLER(ssrj_vram4_w);
VIDEO_START( ssrj );
-VIDEO_UPDATE( ssrj );
+SCREEN_UPDATE( ssrj );
PALETTE_INIT( ssrj );
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 28922f5f051..776b52a2fdf 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -63,6 +63,6 @@ VIDEO_START( ssv );
VIDEO_START( eaglshot );
VIDEO_START( gdfs );
-VIDEO_UPDATE( ssv );
-VIDEO_UPDATE( eaglshot );
-VIDEO_UPDATE( gdfs );
+SCREEN_UPDATE( ssv );
+SCREEN_UPDATE( eaglshot );
+SCREEN_UPDATE( gdfs );
diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h
index 3a05a1304f4..355fc4a2391 100644
--- a/src/mame/includes/st0016.h
+++ b/src/mame/includes/st0016.h
@@ -52,7 +52,7 @@ READ8_HANDLER (st0016_vregs_r);
WRITE8_HANDLER (st0016_vregs_w);
VIDEO_START(st0016);
-VIDEO_UPDATE(st0016);
+SCREEN_UPDATE(st0016);
extern UINT32 st0016_game;
diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h
index 05a162b6452..938875e0cbf 100644
--- a/src/mame/includes/stadhero.h
+++ b/src/mame/includes/stadhero.h
@@ -17,7 +17,7 @@ public:
/*----------- defined in video/stadhero.c -----------*/
VIDEO_START( stadhero );
-VIDEO_UPDATE( stadhero );
+SCREEN_UPDATE( stadhero );
WRITE16_HANDLER( stadhero_pf1_data_w );
READ16_HANDLER( stadhero_pf2_data_r );
diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h
index 6d99b444f90..420af9247ed 100644
--- a/src/mame/includes/starcrus.h
+++ b/src/mame/includes/starcrus.h
@@ -55,4 +55,4 @@ WRITE8_HANDLER( starcrus_proj_parm_1_w );
WRITE8_HANDLER( starcrus_proj_parm_2_w );
READ8_HANDLER( starcrus_coll_det_r );
VIDEO_START( starcrus );
-VIDEO_UPDATE( starcrus );
+SCREEN_UPDATE( starcrus );
diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h
index 600c05c6988..fd6e4263868 100644
--- a/src/mame/includes/starfire.h
+++ b/src/mame/includes/starfire.h
@@ -34,7 +34,7 @@ public:
/*----------- defined in video/starfire.c -----------*/
-VIDEO_UPDATE( starfire );
+SCREEN_UPDATE( starfire );
VIDEO_START( starfire );
WRITE8_HANDLER( starfire_videoram_w );
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index d9e777d091e..cc7006c07a3 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -72,8 +72,8 @@ WRITE8_HANDLER( starshp1_ssadd_w );
WRITE8_HANDLER( starshp1_playfield_w );
PALETTE_INIT( starshp1 );
-VIDEO_UPDATE( starshp1 );
-VIDEO_EOF( starshp1 );
+SCREEN_UPDATE( starshp1 );
+SCREEN_EOF( starshp1 );
VIDEO_START( starshp1 );
diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h
index b8ff13acab6..e3eb72b08a4 100644
--- a/src/mame/includes/stfight.h
+++ b/src/mame/includes/stfight.h
@@ -27,4 +27,4 @@ WRITE8_HANDLER( stfight_text_attr_w );
WRITE8_HANDLER( stfight_vh_latch_w );
WRITE8_HANDLER( stfight_sprite_bank_w );
VIDEO_START( stfight );
-VIDEO_UPDATE( stfight );
+SCREEN_UPDATE( stfight );
diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h
index f97e6e1ee5d..f0c49d09937 100644
--- a/src/mame/includes/stlforce.h
+++ b/src/mame/includes/stlforce.h
@@ -27,7 +27,7 @@ public:
/*----------- defined in video/stlforce.c -----------*/
VIDEO_START( stlforce );
-VIDEO_UPDATE( stlforce );
+SCREEN_UPDATE( stlforce );
WRITE16_HANDLER( stlforce_tx_videoram_w );
WRITE16_HANDLER( stlforce_mhigh_videoram_w );
WRITE16_HANDLER( stlforce_mlow_videoram_w );
diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h
index b19f1ff55df..1c83f46f4f4 100644
--- a/src/mame/includes/strnskil.h
+++ b/src/mame/includes/strnskil.h
@@ -17,4 +17,4 @@ WRITE8_HANDLER( strnskil_scrl_ctrl_w );
PALETTE_INIT( strnskil );
VIDEO_START( strnskil );
-VIDEO_UPDATE( strnskil );
+SCREEN_UPDATE( strnskil );
diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h
index fd3b7f59a98..604e954a8dc 100644
--- a/src/mame/includes/stv.h
+++ b/src/mame/includes/stv.h
@@ -96,5 +96,5 @@ WRITE32_HANDLER ( stv_vdp2_regs_w );
READ32_HANDLER ( stv_vdp2_regs_r );
VIDEO_START ( stv_vdp2 );
-VIDEO_UPDATE( stv_vdp2 );
+SCREEN_UPDATE( stv_vdp2 );
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index 548f67a9f56..a54a9f8c400 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -58,7 +58,7 @@ DISCRETE_SOUND_EXTERN( subs );
/*----------- defined in video/subs.c -----------*/
-VIDEO_UPDATE( subs );
+SCREEN_UPDATE( subs );
WRITE8_HANDLER( subs_invert1_w );
WRITE8_HANDLER( subs_invert2_w );
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index d2aff353fc9..c34b3f0c562 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -21,5 +21,5 @@ READ16_HANDLER ( suna16_paletteram16_r );
WRITE16_HANDLER( suna16_paletteram16_w );
VIDEO_START( suna16 );
-VIDEO_UPDATE( suna16 );
-VIDEO_UPDATE( bestbest );
+SCREEN_UPDATE( suna16 );
+SCREEN_UPDATE( bestbest );
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 50cc015d068..cd2731ad41a 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -55,4 +55,4 @@ WRITE8_HANDLER( brickzn_banked_paletteram_w );
VIDEO_START( suna8_textdim0 );
VIDEO_START( suna8_textdim8 );
VIDEO_START( suna8_textdim12 );
-VIDEO_UPDATE( suna8 );
+SCREEN_UPDATE( suna8 );
diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h
index dbb500687f8..23aff39f8ed 100644
--- a/src/mame/includes/supbtime.h
+++ b/src/mame/includes/supbtime.h
@@ -29,4 +29,4 @@ public:
/*----------- defined in video/supbtime.c -----------*/
-VIDEO_UPDATE( supbtime );
+SCREEN_UPDATE( supbtime );
diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h
index 14181da67d6..188beacf1b6 100644
--- a/src/mame/includes/superchs.h
+++ b/src/mame/includes/superchs.h
@@ -26,4 +26,4 @@ public:
/*----------- defined in video/superchs.c -----------*/
VIDEO_START( superchs );
-VIDEO_UPDATE( superchs );
+SCREEN_UPDATE( superchs );
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 263b6682408..f7cd04f0e00 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -42,6 +42,6 @@ WRITE8_HANDLER( pbillian_0410_w );
WRITE8_HANDLER( superqix_0410_w );
VIDEO_START( pbillian );
-VIDEO_UPDATE( pbillian );
+SCREEN_UPDATE( pbillian );
VIDEO_START( superqix );
-VIDEO_UPDATE( superqix );
+SCREEN_UPDATE( superqix );
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index 474a4c91c6a..034fb5a062c 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -15,7 +15,7 @@ public:
PALETTE_INIT( suprloco );
VIDEO_START( suprloco );
-VIDEO_UPDATE( suprloco );
+SCREEN_UPDATE( suprloco );
WRITE8_HANDLER( suprloco_videoram_w );
WRITE8_HANDLER( suprloco_scrollram_w );
WRITE8_HANDLER( suprloco_control_w );
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 84149bd0ddd..7ee10bcf43f 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -22,5 +22,5 @@ WRITE32_HANDLER ( skns_pal_regs_w );
WRITE32_HANDLER ( skns_palette_ram_w );
VIDEO_START(skns);
VIDEO_RESET(skns);
-VIDEO_EOF(skns);
-VIDEO_UPDATE(skns);
+SCREEN_EOF(skns);
+SCREEN_UPDATE(skns);
diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h
index 6d6a67c6d55..239db037b05 100644
--- a/src/mame/includes/suprridr.h
+++ b/src/mame/includes/suprridr.h
@@ -22,4 +22,4 @@ int suprridr_is_screen_flipped(void);
WRITE8_HANDLER( suprridr_fgram_w );
WRITE8_HANDLER( suprridr_bgram_w );
-VIDEO_UPDATE( suprridr );
+SCREEN_UPDATE( suprridr );
diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h
index 8d039e1433d..90db6647dfd 100644
--- a/src/mame/includes/suprslam.h
+++ b/src/mame/includes/suprslam.h
@@ -39,4 +39,4 @@ WRITE16_HANDLER( suprslam_bg_videoram_w );
WRITE16_HANDLER( suprslam_bank_w );
VIDEO_START( suprslam );
-VIDEO_UPDATE( suprslam );
+SCREEN_UPDATE( suprslam );
diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h
index 5b814545494..0b8e9ded689 100644
--- a/src/mame/includes/surpratk.h
+++ b/src/mame/includes/surpratk.h
@@ -33,4 +33,4 @@ public:
extern void surpratk_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority);
extern void surpratk_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask);
-VIDEO_UPDATE( surpratk );
+SCREEN_UPDATE( surpratk );
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index e6c8b45561a..e935d38fdab 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -47,6 +47,6 @@ READ8_HANDLER( system1_sprite_collision_r );
WRITE8_HANDLER( system1_sprite_collision_w );
WRITE8_HANDLER( system1_sprite_collision_reset_w );
-VIDEO_UPDATE( system1 );
-VIDEO_UPDATE( system2 );
-VIDEO_UPDATE( system2_rowscroll );
+SCREEN_UPDATE( system1 );
+SCREEN_UPDATE( system2 );
+SCREEN_UPDATE( system2_rowscroll );
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index b59653bcfb6..21603b40202 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -97,8 +97,8 @@ extern VIDEO_START( s16a_bootleg );
extern VIDEO_START( s16a_bootleg_wb3bl );
extern VIDEO_START( s16a_bootleg_shinobi );
extern VIDEO_START( s16a_bootleg_passsht );
-extern VIDEO_UPDATE( s16a_bootleg );
-extern VIDEO_UPDATE( s16a_bootleg_passht4b );
+extern SCREEN_UPDATE( s16a_bootleg );
+extern SCREEN_UPDATE( s16a_bootleg_passht4b );
extern WRITE16_HANDLER( s16a_bootleg_tilemapselect_w );
extern WRITE16_HANDLER( s16a_bootleg_bgscrolly_w );
extern WRITE16_HANDLER( s16a_bootleg_bgscrollx_w );
@@ -111,8 +111,8 @@ extern WRITE16_HANDLER( sys16_textram_w );
/* "normal" video hardware */
extern VIDEO_START( system16 );
-extern VIDEO_UPDATE( system16 );
+extern SCREEN_UPDATE( system16 );
/* system18 video hardware */
extern VIDEO_START( system18old );
-extern VIDEO_UPDATE( system18old );
+extern SCREEN_UPDATE( system18old );
diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h
index 8fe3ceeb58b..823f7565d2e 100644
--- a/src/mame/includes/tagteam.h
+++ b/src/mame/includes/tagteam.h
@@ -14,4 +14,4 @@ WRITE8_HANDLER( tagteam_flipscreen_w );
PALETTE_INIT( tagteam );
VIDEO_START( tagteam );
-VIDEO_UPDATE( tagteam );
+SCREEN_UPDATE( tagteam );
diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h
index b3660a15ec6..28bbfe29f0d 100644
--- a/src/mame/includes/tail2nos.h
+++ b/src/mame/includes/tail2nos.h
@@ -38,4 +38,4 @@ WRITE16_HANDLER( tail2nos_zoomdata_w );
WRITE16_HANDLER( tail2nos_gfxbank_w );
VIDEO_START( tail2nos );
-VIDEO_UPDATE( tail2nos );
+SCREEN_UPDATE( tail2nos );
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 690eaa7b8c6..e3227deff77 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -49,6 +49,6 @@ VIDEO_START( hitice );
VIDEO_RESET( hitice );
-VIDEO_UPDATE( taitob );
+SCREEN_UPDATE( taitob );
-VIDEO_EOF( taitob );
+SCREEN_EOF( taitob );
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index bdfb77023d2..fe04e96e004 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -104,20 +104,20 @@ VIDEO_START( taitof2_yesnoj );
VIDEO_START( taitof2_deadconx );
VIDEO_START( taitof2_deadconxj );
VIDEO_START( taitof2_dinorex );
-VIDEO_EOF( taitof2_no_buffer );
-VIDEO_EOF( taitof2_full_buffer_delayed );
-VIDEO_EOF( taitof2_partial_buffer_delayed );
-VIDEO_EOF( taitof2_partial_buffer_delayed_thundfox );
-VIDEO_EOF( taitof2_partial_buffer_delayed_qzchikyu );
-
-VIDEO_UPDATE( taitof2 );
-VIDEO_UPDATE( taitof2_pri );
-VIDEO_UPDATE( taitof2_pri_roz );
-VIDEO_UPDATE( taitof2_ssi );
-VIDEO_UPDATE( taitof2_thundfox );
-VIDEO_UPDATE( taitof2_deadconx );
-VIDEO_UPDATE( taitof2_metalb );
-VIDEO_UPDATE( taitof2_yesnoj );
+SCREEN_EOF( taitof2_no_buffer );
+SCREEN_EOF( taitof2_full_buffer_delayed );
+SCREEN_EOF( taitof2_partial_buffer_delayed );
+SCREEN_EOF( taitof2_partial_buffer_delayed_thundfox );
+SCREEN_EOF( taitof2_partial_buffer_delayed_qzchikyu );
+
+SCREEN_UPDATE( taitof2 );
+SCREEN_UPDATE( taitof2_pri );
+SCREEN_UPDATE( taitof2_pri_roz );
+SCREEN_UPDATE( taitof2_ssi );
+SCREEN_UPDATE( taitof2_thundfox );
+SCREEN_UPDATE( taitof2_deadconx );
+SCREEN_UPDATE( taitof2_metalb );
+SCREEN_UPDATE( taitof2_yesnoj );
WRITE16_HANDLER( taitof2_spritebank_w );
WRITE16_HANDLER( koshien_spritebank_w );
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index 614302f059f..524f9368f3e 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -60,8 +60,8 @@ extern UINT32 *f3_vram,*f3_line_ram;
extern UINT32 *f3_pf_data,*f3_pivot_ram;
VIDEO_START( f3 );
-VIDEO_UPDATE( f3 );
-VIDEO_EOF( f3 );
+SCREEN_UPDATE( f3 );
+SCREEN_EOF( f3 );
WRITE32_HANDLER( f3_control_0_w );
WRITE32_HANDLER( f3_control_1_w );
diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h
index db2aef60b89..8663465ac9e 100644
--- a/src/mame/includes/taito_h.h
+++ b/src/mame/includes/taito_h.h
@@ -26,6 +26,6 @@ public:
/*----------- defined in video/taito_h.c -----------*/
-VIDEO_UPDATE( syvalion );
-VIDEO_UPDATE( recordbr );
-VIDEO_UPDATE( dleague );
+SCREEN_UPDATE( syvalion );
+SCREEN_UPDATE( recordbr );
+SCREEN_UPDATE( dleague );
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 65eeff2e1ed..4995c996dbc 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -56,9 +56,9 @@ public:
/*----------- defined in video/taito_l.c -----------*/
-VIDEO_EOF( taitol );
+SCREEN_EOF( taitol );
VIDEO_START( taitol );
-VIDEO_UPDATE( taitol );
+SCREEN_UPDATE( taitol );
void taitol_chardef14_m(running_machine *machine, int offset);
void taitol_chardef15_m(running_machine *machine, int offset);
diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h
index 023d0a3dd32..daee027bc39 100644
--- a/src/mame/includes/taito_o.h
+++ b/src/mame/includes/taito_o.h
@@ -20,4 +20,4 @@ public:
/*----------- defined in video/taito_o.c -----------*/
-VIDEO_UPDATE( parentj );
+SCREEN_UPDATE( parentj );
diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h
index 05eaca63e94..dae63d33229 100644
--- a/src/mame/includes/taito_z.h
+++ b/src/mame/includes/taito_z.h
@@ -54,10 +54,10 @@ WRITE16_HANDLER( sci_spriteframe_w );
VIDEO_START( taitoz );
-VIDEO_UPDATE( contcirc );
-VIDEO_UPDATE( chasehq );
-VIDEO_UPDATE( bshark );
-VIDEO_UPDATE( sci );
-VIDEO_UPDATE( aquajack );
-VIDEO_UPDATE( spacegun );
-VIDEO_UPDATE( dblaxle );
+SCREEN_UPDATE( contcirc );
+SCREEN_UPDATE( chasehq );
+SCREEN_UPDATE( bshark );
+SCREEN_UPDATE( sci );
+SCREEN_UPDATE( aquajack );
+SCREEN_UPDATE( spacegun );
+SCREEN_UPDATE( dblaxle );
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index 28b3d0b3290..599d09d2507 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -45,4 +45,4 @@ public:
/*----------- defined in video/taitoair.c -----------*/
-VIDEO_UPDATE( taitoair );
+SCREEN_UPDATE( taitoair );
diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h
index 5bd91b2ac7b..047167e12ba 100644
--- a/src/mame/includes/taitojc.h
+++ b/src/mame/includes/taitojc.h
@@ -66,4 +66,4 @@ void taitojc_clear_frame(running_machine *machine);
void taitojc_render_polygons(running_machine *machine, UINT16 *polygon_fifo, int length);
VIDEO_START(taitojc);
-VIDEO_UPDATE(taitojc);
+SCREEN_UPDATE(taitojc);
diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h
index 60a61cd8d74..2ca8aa37655 100644
--- a/src/mame/includes/taitosj.h
+++ b/src/mame/includes/taitosj.h
@@ -72,5 +72,5 @@ WRITE8_HANDLER( taitosj_characterram_w );
WRITE8_HANDLER( junglhbr_characterram_w );
WRITE8_HANDLER( taitosj_collision_reg_clear_w );
VIDEO_START( taitosj );
-VIDEO_UPDATE( taitosj );
-VIDEO_UPDATE( kikstart );
+SCREEN_UPDATE( taitosj );
+SCREEN_UPDATE( kikstart );
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 13584aa6084..a2a28856a93 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -55,9 +55,9 @@ void tank8_set_collision(running_machine *machine, int index);
/*----------- defined in video/tank8.c -----------*/
PALETTE_INIT( tank8 );
-VIDEO_EOF( tank8 );
+SCREEN_EOF( tank8 );
VIDEO_START( tank8 );
-VIDEO_UPDATE( tank8 );
+SCREEN_UPDATE( tank8 );
WRITE8_HANDLER( tank8_video_ram_w );
diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h
index 09e886ac387..41eedc1f326 100644
--- a/src/mame/includes/tankbatt.h
+++ b/src/mame/includes/tankbatt.h
@@ -19,4 +19,4 @@ WRITE8_HANDLER( tankbatt_videoram_w );
PALETTE_INIT( tankbatt );
VIDEO_START( tankbatt );
-VIDEO_UPDATE( tankbatt );
+SCREEN_UPDATE( tankbatt );
diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h
index af28170cd2f..b6f03b2564b 100644
--- a/src/mame/includes/tankbust.h
+++ b/src/mame/includes/tankbust.h
@@ -5,7 +5,7 @@ extern UINT8 *tankbust_videoram;
extern UINT8 *tankbust_colorram;
VIDEO_START( tankbust );
-VIDEO_UPDATE( tankbust );
+SCREEN_UPDATE( tankbust );
WRITE8_HANDLER( tankbust_background_videoram_w );
READ8_HANDLER( tankbust_background_videoram_r );
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
index a8cfc43082f..26209eaf717 100644
--- a/src/mame/includes/taotaido.h
+++ b/src/mame/includes/taotaido.h
@@ -9,5 +9,5 @@ WRITE16_HANDLER( taotaido_sprite_character_bank_select_w );
WRITE16_HANDLER( taotaido_tileregs_w );
WRITE16_HANDLER( taotaido_bgvideoram_w );
VIDEO_START( taotaido );
-VIDEO_UPDATE( taotaido );
-VIDEO_EOF( taotaido );
+SCREEN_UPDATE( taotaido );
+SCREEN_EOF( taotaido );
diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h
index 0c3bc829797..21a2409528a 100644
--- a/src/mame/includes/targeth.h
+++ b/src/mame/includes/targeth.h
@@ -15,4 +15,4 @@ public:
WRITE16_HANDLER( targeth_vram_w );
VIDEO_START( targeth );
-VIDEO_UPDATE( targeth );
+SCREEN_UPDATE( targeth );
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index db5545c0c0c..9350bf54cc0 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -78,8 +78,8 @@ VIDEO_START( roundup5 );
VIDEO_START( cyclwarr );
VIDEO_START( bigfight );
-VIDEO_UPDATE( roundup5 );
-VIDEO_UPDATE( apache3 );
-VIDEO_UPDATE( cyclwarr );
-VIDEO_UPDATE( bigfight );
+SCREEN_UPDATE( roundup5 );
+SCREEN_UPDATE( apache3 );
+SCREEN_UPDATE( cyclwarr );
+SCREEN_UPDATE( bigfight );
diff --git a/src/mame/includes/taxidrvr.h b/src/mame/includes/taxidrvr.h
index a07ddccc2f9..a1326df2f0a 100644
--- a/src/mame/includes/taxidrvr.h
+++ b/src/mame/includes/taxidrvr.h
@@ -7,4 +7,4 @@ extern int taxidrvr_bghide;
WRITE8_DEVICE_HANDLER( taxidrvr_spritectrl_w );
-VIDEO_UPDATE( taxidrvr );
+SCREEN_UPDATE( taxidrvr );
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index 0e840b684aa..1c1cd2fc78b 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -17,4 +17,4 @@ WRITE8_HANDLER( tbowl_bgyscroll_lo );
WRITE8_HANDLER( tbowl_bgyscroll_hi );
VIDEO_START( tbowl );
-VIDEO_UPDATE( tbowl );
+SCREEN_UPDATE( tbowl );
diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h
index 4dad1b8d83e..caae11fc377 100644
--- a/src/mame/includes/tceptor.h
+++ b/src/mame/includes/tceptor.h
@@ -32,8 +32,8 @@ public:
PALETTE_INIT( tceptor );
VIDEO_START( tceptor );
-VIDEO_UPDATE( tceptor );
-VIDEO_EOF( tceptor );
+SCREEN_UPDATE( tceptor );
+SCREEN_EOF( tceptor );
WRITE8_HANDLER( tceptor_tile_ram_w );
WRITE8_HANDLER( tceptor_tile_attr_w );
diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h
index f6144a4bab9..d0b0b9c7868 100644
--- a/src/mame/includes/tecmo.h
+++ b/src/mame/includes/tecmo.h
@@ -11,4 +11,4 @@ WRITE8_HANDLER( tecmo_bgscroll_w );
WRITE8_HANDLER( tecmo_flipscreen_w );
VIDEO_START( tecmo );
-VIDEO_UPDATE( tecmo );
+SCREEN_UPDATE( tecmo );
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index 0cf08c7e17f..3d89f1249a8 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -23,4 +23,4 @@ WRITE16_HANDLER( tecmo16_scroll_char_y_w );
VIDEO_START( fstarfrc );
VIDEO_START( ginkun );
VIDEO_START( riot );
-VIDEO_UPDATE( tecmo16 );
+SCREEN_UPDATE( tecmo16 );
diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h
index 8d59a9c25ca..3de2a1614ca 100644
--- a/src/mame/includes/tehkanwc.h
+++ b/src/mame/includes/tehkanwc.h
@@ -15,4 +15,4 @@ extern WRITE8_HANDLER( gridiron_led0_w );
extern WRITE8_HANDLER( gridiron_led1_w );
extern VIDEO_START( tehkanwc );
-extern VIDEO_UPDATE( tehkanwc );
+extern SCREEN_UPDATE( tehkanwc );
diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h
index c20036df438..cd97f61cea4 100644
--- a/src/mame/includes/terracre.h
+++ b/src/mame/includes/terracre.h
@@ -19,4 +19,4 @@ WRITE16_HANDLER( amazon_scrolly_w );
WRITE16_HANDLER( amazon_scrollx_w );
WRITE16_HANDLER( amazon_flipscreen_w );
VIDEO_START( amazon );
-VIDEO_UPDATE( amazon );
+SCREEN_UPDATE( amazon );
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index 3bca1761259..14b71b349d0 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -34,13 +34,13 @@ WRITE16_HANDLER( rocknms_sub_vram_fg_w );
WRITE16_HANDLER( rocknms_sub_vram_rot_w );
VIDEO_START( tetrisp2 );
-VIDEO_UPDATE( tetrisp2 );
+SCREEN_UPDATE( tetrisp2 );
VIDEO_START( rockntread );
-VIDEO_UPDATE( rockntread );
+SCREEN_UPDATE( rockntread );
VIDEO_START( rocknms );
-VIDEO_UPDATE( rocknms );
+SCREEN_UPDATE( rocknms );
VIDEO_START( nndmseal );
void tetrisp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t *bitmap_pri, const rectangle *cliprect, UINT8* priram, UINT16 *sprram_top, size_t sprram_size, int gfxnum, int reverseorder, int flip, int allowzoom);
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index 4190556fda9..dfa52d8b5a3 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -8,5 +8,5 @@ WRITE8_HANDLER( thedeep_vram_1_w );
PALETTE_INIT( thedeep );
VIDEO_START( thedeep );
-VIDEO_UPDATE( thedeep );
+SCREEN_UPDATE( thedeep );
diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h
index 05ffa8c70d2..be0cdcfcb1c 100644
--- a/src/mame/includes/thepit.h
+++ b/src/mame/includes/thepit.h
@@ -9,7 +9,7 @@ extern size_t thepit_spriteram_size;
PALETTE_INIT( thepit );
PALETTE_INIT( suprmous );
VIDEO_START( thepit );
-VIDEO_UPDATE( thepit );
+SCREEN_UPDATE( thepit );
WRITE8_HANDLER( thepit_videoram_w );
WRITE8_HANDLER( thepit_colorram_w );
WRITE8_HANDLER( thepit_flip_screen_x_w );
diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h
index 9e7b35f6102..c6373e56c43 100644
--- a/src/mame/includes/thief.h
+++ b/src/mame/includes/thief.h
@@ -23,4 +23,4 @@ READ8_HANDLER( thief_coprocessor_r );
WRITE8_HANDLER( thief_coprocessor_w );
VIDEO_START( thief );
-VIDEO_UPDATE( thief );
+SCREEN_UPDATE( thief );
diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h
index bde87dcad85..3ab54bab577 100644
--- a/src/mame/includes/thoop2.h
+++ b/src/mame/includes/thoop2.h
@@ -17,4 +17,4 @@ public:
WRITE16_HANDLER( thoop2_vram_w );
VIDEO_START( thoop2 );
-VIDEO_UPDATE( thoop2 );
+SCREEN_UPDATE( thoop2 );
diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h
index 920f678ac07..493f157f354 100644
--- a/src/mame/includes/thunderj.h
+++ b/src/mame/includes/thunderj.h
@@ -19,4 +19,4 @@ public:
/*----------- defined in video/thunderj.c -----------*/
VIDEO_START( thunderj );
-VIDEO_UPDATE( thunderj );
+SCREEN_UPDATE( thunderj );
diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h
index e7ae3645b23..02ccee4cbb0 100644
--- a/src/mame/includes/thunderx.h
+++ b/src/mame/includes/thunderx.h
@@ -39,4 +39,4 @@ extern void thunderx_tile_callback(running_machine *machine, int layer,int bank,
extern void thunderx_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow);
VIDEO_START( scontra );
-VIDEO_UPDATE( scontra );
+SCREEN_UPDATE( scontra );
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 435ffa1501d..45df09d07ec 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -13,7 +13,7 @@ WRITE8_DEVICE_HANDLER( tiamc1_timer1_gate_w );
PALETTE_INIT( tiamc1 );
VIDEO_START( tiamc1 );
-VIDEO_UPDATE( tiamc1 );
+SCREEN_UPDATE( tiamc1 );
WRITE8_HANDLER( tiamc1_palette_w );
WRITE8_HANDLER( tiamc1_videoram_w );
diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h
index 65d3c412e2e..d1a01070c93 100644
--- a/src/mame/includes/tigeroad.h
+++ b/src/mame/includes/tigeroad.h
@@ -18,5 +18,5 @@ WRITE16_HANDLER( tigeroad_videoram_w );
WRITE16_HANDLER( tigeroad_videoctrl_w );
WRITE16_HANDLER( tigeroad_scroll_w );
VIDEO_START( tigeroad );
-VIDEO_UPDATE( tigeroad );
-VIDEO_EOF( tigeroad );
+SCREEN_UPDATE( tigeroad );
+SCREEN_EOF( tigeroad );
diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h
index cc8d87b65ec..b932496b796 100644
--- a/src/mame/includes/timelimt.h
+++ b/src/mame/includes/timelimt.h
@@ -15,7 +15,7 @@ extern size_t timelimt_bg_videoram_size;
VIDEO_START( timelimt );
PALETTE_INIT( timelimt );
-VIDEO_UPDATE( timelimt );
+SCREEN_UPDATE( timelimt );
WRITE8_HANDLER( timelimt_videoram_w );
WRITE8_HANDLER( timelimt_bg_videoram_w );
diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h
index 742dbd60c8e..01a820b039f 100644
--- a/src/mame/includes/timeplt.h
+++ b/src/mame/includes/timeplt.h
@@ -37,4 +37,4 @@ WRITE8_HANDLER( timeplt_flipscreen_w );
PALETTE_INIT( timeplt );
VIDEO_START( timeplt );
VIDEO_START( chkun );
-VIDEO_UPDATE( timeplt );
+SCREEN_UPDATE( timeplt );
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index 0d4ab6aac55..6ea7d9c55a8 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -89,12 +89,12 @@ VIDEO_START( blswhstl );
VIDEO_START( glfgreat );
VIDEO_START( prmrsocr );
-VIDEO_UPDATE( mia );
-VIDEO_UPDATE( tmnt );
-VIDEO_UPDATE( punkshot );
-VIDEO_UPDATE( lgtnfght );
-VIDEO_UPDATE( glfgreat );
-VIDEO_UPDATE( tmnt2 );
-VIDEO_UPDATE( thndrx2 );
+SCREEN_UPDATE( mia );
+SCREEN_UPDATE( tmnt );
+SCREEN_UPDATE( punkshot );
+SCREEN_UPDATE( lgtnfght );
+SCREEN_UPDATE( glfgreat );
+SCREEN_UPDATE( tmnt2 );
+SCREEN_UPDATE( thndrx2 );
-VIDEO_EOF( blswhstl );
+SCREEN_EOF( blswhstl );
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index 1bf1aae5eb9..035735a5787 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -95,5 +95,5 @@ MACHINE_START( jpopnics );
/*----------- defined in video/tnzs.c -----------*/
PALETTE_INIT( arknoid2 );
-VIDEO_UPDATE( tnzs );
-VIDEO_EOF( tnzs );
+SCREEN_UPDATE( tnzs );
+SCREEN_EOF( tnzs );
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index 6434224808a..25500ee737f 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -144,10 +144,10 @@ WRITE16_HANDLER( toaplan1_tileram_offs_w );
READ16_HANDLER ( toaplan1_spriteram_offs_r );
WRITE16_HANDLER( toaplan1_spriteram_offs_w );
-VIDEO_EOF( rallybik );
-VIDEO_EOF( toaplan1 );
-VIDEO_EOF( samesame );
+SCREEN_EOF( rallybik );
+SCREEN_EOF( toaplan1 );
+SCREEN_EOF( samesame );
VIDEO_START( rallybik );
VIDEO_START( toaplan1 );
-VIDEO_UPDATE( rallybik );
-VIDEO_UPDATE( toaplan1 );
+SCREEN_UPDATE( rallybik );
+SCREEN_UPDATE( toaplan1 );
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index 607e2465baf..35055b5e6ed 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -77,18 +77,18 @@ void fixeight_okisnd_w(device_t *device, int data);
/*----------- defined in video/toaplan2.c -----------*/
-VIDEO_EOF( toaplan2 );
+SCREEN_EOF( toaplan2 );
VIDEO_START( toaplan2 );
VIDEO_START( truxton2 );
VIDEO_START( fixeighb );
VIDEO_START( bgaregga );
VIDEO_START( batrider );
-VIDEO_UPDATE( toaplan2 );
-VIDEO_UPDATE( truxton2 );
-VIDEO_UPDATE( batrider );
-VIDEO_UPDATE( dogyuun );
-VIDEO_UPDATE( batsugun );
+SCREEN_UPDATE( toaplan2 );
+SCREEN_UPDATE( truxton2 );
+SCREEN_UPDATE( batrider );
+SCREEN_UPDATE( dogyuun );
+SCREEN_UPDATE( batsugun );
/* non-vdp text layer */
READ16_HANDLER ( toaplan2_txvideoram16_r );
diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h
index ec5f907c08d..3b26f0e73ed 100644
--- a/src/mame/includes/toki.h
+++ b/src/mame/includes/toki.h
@@ -15,10 +15,10 @@ extern UINT16 *toki_background2_videoram16;
extern UINT16 *toki_scrollram16;
VIDEO_START( toki );
-VIDEO_EOF( toki );
-VIDEO_EOF( tokib );
-VIDEO_UPDATE( toki );
-VIDEO_UPDATE( tokib );
+SCREEN_EOF( toki );
+SCREEN_EOF( tokib );
+SCREEN_UPDATE( toki );
+SCREEN_UPDATE( tokib );
WRITE16_HANDLER( toki_background1_videoram16_w );
WRITE16_HANDLER( toki_background2_videoram16_w );
WRITE16_HANDLER( toki_control_w );
diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h
index 8b296d24192..6795b65a275 100644
--- a/src/mame/includes/toobin.h
+++ b/src/mame/includes/toobin.h
@@ -28,4 +28,4 @@ WRITE16_HANDLER( toobin_yscroll_w );
WRITE16_HANDLER( toobin_slip_w );
VIDEO_START( toobin );
-VIDEO_UPDATE( toobin );
+SCREEN_UPDATE( toobin );
diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h
index e3d245d89a7..8fba9818802 100644
--- a/src/mame/includes/topspeed.h
+++ b/src/mame/includes/topspeed.h
@@ -40,4 +40,4 @@ public:
/*----------- defined in video/topspeed.c -----------*/
-VIDEO_UPDATE( topspeed );
+SCREEN_UPDATE( topspeed );
diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h
index 764d0f49ffd..fe42485d9c5 100644
--- a/src/mame/includes/toypop.h
+++ b/src/mame/includes/toypop.h
@@ -24,5 +24,5 @@ WRITE16_HANDLER( toypop_merged_background_w );
WRITE8_HANDLER( toypop_palettebank_w );
WRITE16_HANDLER( toypop_flipscreen_w );
VIDEO_START( toypop );
-VIDEO_UPDATE( toypop );
+SCREEN_UPDATE( toypop );
PALETTE_INIT( toypop );
diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h
index 96c9e037f0a..0b25a7e58a6 100644
--- a/src/mame/includes/tp84.h
+++ b/src/mame/includes/tp84.h
@@ -27,4 +27,4 @@ READ8_HANDLER( tp84_scanline_r );
PALETTE_INIT( tp84 );
VIDEO_START( tp84 );
-VIDEO_UPDATE( tp84 );
+SCREEN_UPDATE( tp84 );
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index ac18b066214..373cfdf7511 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -37,6 +37,6 @@ WRITE8_HANDLER( atlantol_gfxbank_w );
PALETTE_INIT( trackfld );
VIDEO_START( trackfld );
-VIDEO_UPDATE( trackfld );
+SCREEN_UPDATE( trackfld );
VIDEO_START( atlantol );
diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h
index eac2c90e3fb..625c74be7f2 100644
--- a/src/mame/includes/travrusa.h
+++ b/src/mame/includes/travrusa.h
@@ -24,4 +24,4 @@ WRITE8_HANDLER( travrusa_flipscreen_w );
PALETTE_INIT( travrusa );
PALETTE_INIT( shtrider );
VIDEO_START( travrusa );
-VIDEO_UPDATE( travrusa );
+SCREEN_UPDATE( travrusa );
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index 6e265e34381..b3983289c7c 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -30,7 +30,7 @@ extern const samples_interface triplhnt_samples_interface;
/*----------- defined in video/triplhnt.c -----------*/
VIDEO_START( triplhnt );
-VIDEO_UPDATE( triplhnt );
+SCREEN_UPDATE( triplhnt );
extern UINT8* triplhnt_playfield_ram;
extern UINT8* triplhnt_vpos_ram;
diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h
index 3bf0f8b9ccf..35a38ccffb2 100644
--- a/src/mame/includes/truco.h
+++ b/src/mame/includes/truco.h
@@ -10,5 +10,5 @@ public:
/*----------- defined in video/truco.c -----------*/
-VIDEO_UPDATE( truco );
+SCREEN_UPDATE( truco );
PALETTE_INIT( truco );
diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h
index c57c1f93f8f..3e8f6e49f59 100644
--- a/src/mame/includes/trucocl.h
+++ b/src/mame/includes/trucocl.h
@@ -7,4 +7,4 @@ WRITE8_HANDLER( trucocl_videoram_w );
WRITE8_HANDLER( trucocl_colorram_w );
PALETTE_INIT( trucocl );
VIDEO_START( trucocl );
-VIDEO_UPDATE( trucocl );
+SCREEN_UPDATE( trucocl );
diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h
index fdb380587fe..2d75f6e05b1 100644
--- a/src/mame/includes/tryout.h
+++ b/src/mame/includes/tryout.h
@@ -24,4 +24,4 @@ WRITE8_HANDLER( tryout_flipscreen_w );
PALETTE_INIT( tryout );
VIDEO_START( tryout );
-VIDEO_UPDATE( tryout );
+SCREEN_UPDATE( tryout );
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index 8076c7f9e70..953e652e4b1 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -38,7 +38,7 @@ WRITE8_HANDLER( tsamurai_fg_videoram_w );
WRITE8_HANDLER( tsamurai_fg_colorram_w );
VIDEO_START( tsamurai );
-VIDEO_UPDATE( tsamurai );
+SCREEN_UPDATE( tsamurai );
VIDEO_START( vsgongf );
-VIDEO_UPDATE( vsgongf );
+SCREEN_UPDATE( vsgongf );
diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h
index 5f2235be7b9..34821364bb5 100644
--- a/src/mame/includes/tubep.h
+++ b/src/mame/includes/tubep.h
@@ -2,9 +2,9 @@
void tubep_vblank_end(void);
PALETTE_INIT( tubep );
-VIDEO_UPDATE( tubep );
+SCREEN_UPDATE( tubep );
PALETTE_INIT( rjammer );
-VIDEO_UPDATE( rjammer );
+SCREEN_UPDATE( rjammer );
VIDEO_START( tubep );
VIDEO_RESET( tubep );
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
index 7a0956f9783..0b7cac7fbb5 100644
--- a/src/mame/includes/tumbleb.h
+++ b/src/mame/includes/tumbleb.h
@@ -57,14 +57,14 @@ VIDEO_START( sdfight );
VIDEO_START( suprtrio );
VIDEO_START( pangpang );
-VIDEO_UPDATE( tumblepb );
-VIDEO_UPDATE( jumpkids );
-VIDEO_UPDATE( fncywld );
-VIDEO_UPDATE( jumppop );
-VIDEO_UPDATE( semicom );
-VIDEO_UPDATE( semicom_altoffsets );
-VIDEO_UPDATE( bcstory );
-VIDEO_UPDATE(semibase );
-VIDEO_UPDATE( suprtrio );
-VIDEO_UPDATE( pangpang );
-VIDEO_UPDATE( sdfight );
+SCREEN_UPDATE( tumblepb );
+SCREEN_UPDATE( jumpkids );
+SCREEN_UPDATE( fncywld );
+SCREEN_UPDATE( jumppop );
+SCREEN_UPDATE( semicom );
+SCREEN_UPDATE( semicom_altoffsets );
+SCREEN_UPDATE( bcstory );
+SCREEN_UPDATE(semibase );
+SCREEN_UPDATE( suprtrio );
+SCREEN_UPDATE( pangpang );
+SCREEN_UPDATE( sdfight );
diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h
index 753d0f76c61..dba29353ef7 100644
--- a/src/mame/includes/tumblep.h
+++ b/src/mame/includes/tumblep.h
@@ -27,4 +27,4 @@ public:
/*----------- defined in video/tumblep.c -----------*/
-VIDEO_UPDATE( tumblep );
+SCREEN_UPDATE( tumblep );
diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h
index cc87e4d58ec..f9c40ca1e6b 100644
--- a/src/mame/includes/tunhunt.h
+++ b/src/mame/includes/tunhunt.h
@@ -18,4 +18,4 @@ WRITE8_HANDLER( tunhunt_videoram_w );
PALETTE_INIT( tunhunt );
VIDEO_START( tunhunt );
-VIDEO_UPDATE( tunhunt );
+SCREEN_UPDATE( tunhunt );
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index 7348f33ac61..b37633ab928 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -89,14 +89,14 @@ WRITE8_DEVICE_HANDLER( buckrog_sound_b_w );
PALETTE_INIT( turbo );
VIDEO_START( turbo );
-VIDEO_UPDATE( turbo );
+SCREEN_UPDATE( turbo );
PALETTE_INIT( subroc3d );
-VIDEO_UPDATE( subroc3d );
+SCREEN_UPDATE( subroc3d );
PALETTE_INIT( buckrog );
VIDEO_START( buckrog );
-VIDEO_UPDATE( buckrog );
+SCREEN_UPDATE( buckrog );
WRITE8_HANDLER( turbo_videoram_w );
WRITE8_HANDLER( buckrog_bitmap_w );
diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h
index 031b82476a0..0e89268aee1 100644
--- a/src/mame/includes/tutankhm.h
+++ b/src/mame/includes/tutankhm.h
@@ -26,4 +26,4 @@ public:
WRITE8_HANDLER( tutankhm_flip_screen_x_w );
WRITE8_HANDLER( tutankhm_flip_screen_y_w );
-VIDEO_UPDATE( tutankhm );
+SCREEN_UPDATE( tutankhm );
diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h
index 3e2a8ece92f..37dbb8d3f40 100644
--- a/src/mame/includes/twin16.h
+++ b/src/mame/includes/twin16.h
@@ -41,7 +41,7 @@ WRITE16_HANDLER( twin16_video_register_w );
READ16_HANDLER( twin16_sprite_status_r );
VIDEO_START( twin16 );
-VIDEO_UPDATE( twin16 );
-VIDEO_EOF( twin16 );
+SCREEN_UPDATE( twin16 );
+SCREEN_EOF( twin16 );
void twin16_spriteram_process( running_machine *machine );
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index a8c97f22cdf..c6cb81e0422 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -83,5 +83,5 @@ extern INT32 twincobr_bg_ram_bank;
extern INT32 wardner_sprite_hack;
VIDEO_START( toaplan0 );
-VIDEO_UPDATE( toaplan0 );
-VIDEO_EOF( toaplan0 );
+SCREEN_UPDATE( toaplan0 );
+SCREEN_EOF( toaplan0 );
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index b2a64fa6ba1..e6be8c8e74c 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -77,8 +77,8 @@ extern UINT16 *tx1_rcram;
extern size_t tx1_objram_size;
PALETTE_INIT( tx1 );
VIDEO_START( tx1 );
-VIDEO_UPDATE( tx1 );
-VIDEO_EOF( tx1 );
+SCREEN_UPDATE( tx1 );
+SCREEN_EOF( tx1 );
WRITE16_HANDLER( tx1_slincs_w );
WRITE16_HANDLER( tx1_slock_w );
WRITE16_HANDLER( tx1_scolst_w );
@@ -92,11 +92,11 @@ extern size_t buggyboy_objram_size;
extern size_t buggyboy_rcram_size;
PALETTE_INIT( buggyboy );
VIDEO_START( buggyboy );
-VIDEO_UPDATE( buggyboy );
-VIDEO_EOF( buggyboy );
+SCREEN_UPDATE( buggyboy );
+SCREEN_EOF( buggyboy );
VIDEO_START( buggybjr );
-VIDEO_UPDATE( buggybjr );
+SCREEN_UPDATE( buggybjr );
WRITE16_HANDLER( buggyboy_slincs_w );
WRITE16_HANDLER( buggyboy_scolst_w );
WRITE16_HANDLER( buggyboy_gas_w );
diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h
index a7e350141a0..e3cf2b3b046 100644
--- a/src/mame/includes/ultraman.h
+++ b/src/mame/includes/ultraman.h
@@ -38,4 +38,4 @@ extern void ultraman_zoom_callback_2(running_machine *machine, int *code,int *co
WRITE16_HANDLER( ultraman_gfxctrl_w );
VIDEO_START( ultraman );
-VIDEO_UPDATE( ultraman );
+SCREEN_UPDATE( ultraman );
diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h
index f0502fb1d3c..fa294e09af5 100644
--- a/src/mame/includes/ultratnk.h
+++ b/src/mame/includes/ultratnk.h
@@ -23,7 +23,7 @@ public:
PALETTE_INIT( ultratnk );
VIDEO_START( ultratnk );
-VIDEO_UPDATE( ultratnk );
-VIDEO_EOF( ultratnk );
+SCREEN_UPDATE( ultratnk );
+SCREEN_EOF( ultratnk );
WRITE8_HANDLER( ultratnk_video_ram_w );
diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h
index c5237831b2e..a60d90c6079 100644
--- a/src/mame/includes/undrfire.h
+++ b/src/mame/includes/undrfire.h
@@ -28,5 +28,5 @@ public:
/*----------- defined in video/undrfire.c -----------*/
VIDEO_START( undrfire );
-VIDEO_UPDATE( undrfire );
-VIDEO_UPDATE( cbombers );
+SCREEN_UPDATE( undrfire );
+SCREEN_UPDATE( cbombers );
diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h
index fd68c07cd76..583e11e7305 100644
--- a/src/mame/includes/unico.h
+++ b/src/mame/includes/unico.h
@@ -16,8 +16,8 @@ WRITE32_HANDLER( unico_vram32_2_w );
WRITE32_HANDLER( unico_palette32_w );
VIDEO_START( unico );
-VIDEO_UPDATE( unico );
+SCREEN_UPDATE( unico );
VIDEO_START( zeropnt2 );
-VIDEO_UPDATE( zeropnt2 );
+SCREEN_UPDATE( zeropnt2 );
diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h
index 8a5f8ac6b8d..0edc2532055 100644
--- a/src/mame/includes/usgames.h
+++ b/src/mame/includes/usgames.h
@@ -6,4 +6,4 @@ WRITE8_HANDLER( usgames_videoram_w );
WRITE8_HANDLER( usgames_charram_w );
VIDEO_START( usgames );
PALETTE_INIT( usgames );
-VIDEO_UPDATE( usgames );
+SCREEN_UPDATE( usgames );
diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h
index 6b9ab905bca..7202813914b 100644
--- a/src/mame/includes/vaportra.h
+++ b/src/mame/includes/vaportra.h
@@ -33,4 +33,4 @@ WRITE16_HANDLER( vaportra_priority_w );
WRITE16_HANDLER( vaportra_palette_24bit_rg_w );
WRITE16_HANDLER( vaportra_palette_24bit_b_w );
-VIDEO_UPDATE( vaportra );
+SCREEN_UPDATE( vaportra );
diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h
index d6273e2e22e..fe6ff46c0cc 100644
--- a/src/mame/includes/vastar.h
+++ b/src/mame/includes/vastar.h
@@ -32,4 +32,4 @@ READ8_HANDLER( vastar_bg1videoram_r );
READ8_HANDLER( vastar_bg2videoram_r );
VIDEO_START( vastar );
-VIDEO_UPDATE( vastar );
+SCREEN_UPDATE( vastar );
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index df42ad65426..6e8d9808657 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -10,7 +10,7 @@ extern int vball_gfxset;
extern int vb_scrollx[256];
VIDEO_START( vb );
-VIDEO_UPDATE( vb );
+SCREEN_UPDATE( vb );
void vb_bgprombank_w(running_machine *machine, int bank);
void vb_spprombank_w(running_machine *machine, int bank);
WRITE8_HANDLER( vb_attrib_w );
diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h
index 29fb8a57dd9..1bd6cac4cce 100644
--- a/src/mame/includes/vendetta.h
+++ b/src/mame/includes/vendetta.h
@@ -38,4 +38,4 @@ extern void vendetta_tile_callback(running_machine *machine, int layer,int bank,
extern void esckids_tile_callback(running_machine *machine, int layer,int bank,int *code,int *color,int *flags,int *priority);
extern void vendetta_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask);
-VIDEO_UPDATE( vendetta );
+SCREEN_UPDATE( vendetta );
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index 56c3e4fa46b..706924b601e 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -34,9 +34,9 @@ int vicdual_is_cabinet_color(running_machine *machine);
WRITE8_HANDLER( vicdual_palette_bank_w );
-VIDEO_UPDATE( vicdual_bw );
-VIDEO_UPDATE( vicdual_color );
-VIDEO_UPDATE( vicdual_bw_or_color );
+SCREEN_UPDATE( vicdual_bw );
+SCREEN_UPDATE( vicdual_color );
+SCREEN_UPDATE( vicdual_bw_or_color );
/*----------- defined in audio/vicdual.c -----------*/
diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h
index 7e306ce7600..f6cad13ef9e 100644
--- a/src/mame/includes/victory.h
+++ b/src/mame/includes/victory.h
@@ -22,7 +22,7 @@ extern UINT8 *victory_videoram;
extern UINT8 *victory_charram;
VIDEO_START( victory );
-VIDEO_UPDATE( victory );
+SCREEN_UPDATE( victory );
INTERRUPT_GEN( victory_vblank_interrupt );
READ8_HANDLER( victory_video_control_r );
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index 2f3d70e2bee..2d6138d74e3 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -43,5 +43,5 @@ WRITE8_HANDLER( videopin_video_ram_w );
WRITE8_HANDLER( videopin_ball_w );
VIDEO_START( videopin );
-VIDEO_UPDATE( videopin );
+SCREEN_UPDATE( videopin );
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index b95370f9de4..21e19314117 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -16,5 +16,5 @@ WRITE8_HANDLER( vigilant_paletteram_w );
WRITE8_HANDLER( vigilant_horiz_scroll_w );
WRITE8_HANDLER( vigilant_rear_horiz_scroll_w );
WRITE8_HANDLER( vigilant_rear_color_w );
-VIDEO_UPDATE( vigilant );
-VIDEO_UPDATE( kikcubic );
+SCREEN_UPDATE( vigilant );
+SCREEN_UPDATE( kikcubic );
diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h
index 936446665b5..adad272da4f 100644
--- a/src/mame/includes/vindictr.h
+++ b/src/mame/includes/vindictr.h
@@ -23,6 +23,6 @@ public:
WRITE16_HANDLER( vindictr_paletteram_w );
VIDEO_START( vindictr );
-VIDEO_UPDATE( vindictr );
+SCREEN_UPDATE( vindictr );
void vindictr_scanline_update(screen_device &screen, int scanline);
diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h
index 5b7c993d889..f1f6f0ae369 100644
--- a/src/mame/includes/volfied.h
+++ b/src/mame/includes/volfied.h
@@ -54,5 +54,5 @@ WRITE16_HANDLER( volfied_video_mask_w );
READ16_HANDLER( volfied_video_ram_r );
READ16_HANDLER( volfied_video_ctrl_r );
-VIDEO_UPDATE( volfied );
+SCREEN_UPDATE( volfied );
VIDEO_START( volfied );
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index 36905e1f8e3..d9a53b03fcc 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -2,9 +2,9 @@
VIDEO_START( vsnes );
PALETTE_INIT( vsnes );
-VIDEO_UPDATE( vsnes );
+SCREEN_UPDATE( vsnes );
VIDEO_START( vsdual );
-VIDEO_UPDATE( vsdual );
+SCREEN_UPDATE( vsnes_bottom );
PALETTE_INIT( vsdual );
extern const ppu2c0x_interface vsnes_ppu_interface_1;
diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h
index 5e0310b110b..38181f32c5e 100644
--- a/src/mame/includes/vulgus.h
+++ b/src/mame/includes/vulgus.h
@@ -23,4 +23,4 @@ WRITE8_HANDLER( vulgus_palette_bank_w );
VIDEO_START( vulgus );
PALETTE_INIT( vulgus );
-VIDEO_UPDATE( vulgus );
+SCREEN_UPDATE( vulgus );
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index f7532049747..b167515c120 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -15,7 +15,7 @@ PALETTE_INIT( warpwarp );
VIDEO_START( geebee );
VIDEO_START( navarone );
VIDEO_START( warpwarp );
-VIDEO_UPDATE( geebee );
+SCREEN_UPDATE( geebee );
WRITE8_HANDLER( warpwarp_videoram_w );
WRITE8_HANDLER( geebee_videoram_w );
diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h
index 258d51f24df..a011786b8e6 100644
--- a/src/mame/includes/warriorb.h
+++ b/src/mame/includes/warriorb.h
@@ -36,4 +36,4 @@ public:
/*----------- defined in video/warriorb.c -----------*/
VIDEO_START( warriorb );
-VIDEO_UPDATE( warriorb );
+SCREEN_UPDATE( warriorb );
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index 8969f4053bf..675aa759018 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -15,4 +15,4 @@ VIDEO_START( wc90t );
WRITE8_HANDLER( wc90_fgvideoram_w );
WRITE8_HANDLER( wc90_bgvideoram_w );
WRITE8_HANDLER( wc90_txvideoram_w );
-VIDEO_UPDATE( wc90 );
+SCREEN_UPDATE( wc90 );
diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h
index bf285e5a8a0..5375f2e980d 100644
--- a/src/mame/includes/wc90b.h
+++ b/src/mame/includes/wc90b.h
@@ -11,7 +11,7 @@ extern UINT8 *wc90b_scroll2y;
extern UINT8 *wc90b_scroll_x_lo;
VIDEO_START( wc90b );
-VIDEO_UPDATE( wc90b );
+SCREEN_UPDATE( wc90b );
WRITE8_HANDLER( wc90b_bgvideoram_w );
WRITE8_HANDLER( wc90b_fgvideoram_w );
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index 716adfb65bd..ba580f28256 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -46,9 +46,9 @@ WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w );
WRITE16_HANDLER( wecleman_videostatus_w );
WRITE16_HANDLER( wecleman_pageram_w );
WRITE16_HANDLER( wecleman_txtram_w );
-VIDEO_UPDATE( wecleman );
+SCREEN_UPDATE( wecleman );
VIDEO_START( wecleman );
-VIDEO_UPDATE( hotchase );
+SCREEN_UPDATE( hotchase );
VIDEO_START( hotchase );
void hotchase_zoom_callback_0(running_machine *machine, int *code,int *color,int *flags);
diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h
index f80f1cc6bf7..2141a9ba6a9 100644
--- a/src/mame/includes/welltris.h
+++ b/src/mame/includes/welltris.h
@@ -30,4 +30,4 @@ WRITE16_HANDLER( welltris_charvideoram_w );
WRITE16_HANDLER( welltris_scrollreg_w );
VIDEO_START( welltris );
-VIDEO_UPDATE( welltris );
+SCREEN_UPDATE( welltris );
diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h
index caa98617c30..3b042b5372d 100644
--- a/src/mame/includes/wgp.h
+++ b/src/mame/includes/wgp.h
@@ -53,4 +53,4 @@ WRITE16_HANDLER( wgp_piv_ctrl_word_w );
VIDEO_START( wgp );
VIDEO_START( wgp2 );
-VIDEO_UPDATE( wgp );
+SCREEN_UPDATE( wgp );
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index 6fc91c01d8e..a90acc24c9b 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -130,9 +130,9 @@ VIDEO_START( williams );
VIDEO_START( blaster );
VIDEO_START( williams2 );
-VIDEO_UPDATE( williams );
-VIDEO_UPDATE( blaster );
-VIDEO_UPDATE( williams2 );
+SCREEN_UPDATE( williams );
+SCREEN_UPDATE( blaster );
+SCREEN_UPDATE( williams2 );
WRITE8_HANDLER( williams2_tileram_w );
diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h
index 450058a4c77..f3024f4899b 100644
--- a/src/mame/includes/wiping.h
+++ b/src/mame/includes/wiping.h
@@ -5,5 +5,5 @@ extern UINT8 *wiping_colorram;
WRITE8_HANDLER( wiping_flipscreen_w );
PALETTE_INIT( wiping );
-VIDEO_UPDATE( wiping );
+SCREEN_UPDATE( wiping );
diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h
index d97b0c6e6e9..c7e940022a2 100644
--- a/src/mame/includes/wiz.h
+++ b/src/mame/includes/wiz.h
@@ -24,6 +24,6 @@ WRITE8_HANDLER( wiz_flipy_w );
VIDEO_START( wiz );
PALETTE_INIT( wiz );
-VIDEO_UPDATE( wiz );
-VIDEO_UPDATE( stinger );
-VIDEO_UPDATE( kungfut );
+SCREEN_UPDATE( wiz );
+SCREEN_UPDATE( stinger );
+SCREEN_UPDATE( kungfut );
diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h
index 59d0af6acf7..8638f2d5f9f 100644
--- a/src/mame/includes/wolfpack.h
+++ b/src/mame/includes/wolfpack.h
@@ -27,9 +27,9 @@ public:
/*----------- defined in video/wolfpack.c -----------*/
PALETTE_INIT( wolfpack );
-VIDEO_UPDATE( wolfpack );
+SCREEN_UPDATE( wolfpack );
VIDEO_START( wolfpack );
-VIDEO_EOF( wolfpack );
+SCREEN_EOF( wolfpack );
WRITE8_HANDLER( wolfpack_video_invert_w );
WRITE8_HANDLER( wolfpack_ship_reflect_w );
diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h
index 267e7ae37c9..fa93fdde4f5 100644
--- a/src/mame/includes/wrally.h
+++ b/src/mame/includes/wrally.h
@@ -23,5 +23,5 @@ WRITE16_HANDLER( wrally_coin_lockout_w );
/*----------- defined in video/wrally.c -----------*/
VIDEO_START( wrally );
-VIDEO_UPDATE( wrally );
+SCREEN_UPDATE( wrally );
diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index d95588173b1..0bfd615fbfd 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -18,6 +18,6 @@ public:
/*----------- defined in video/wwfsstar.c -----------*/
VIDEO_START( wwfsstar );
-VIDEO_UPDATE( wwfsstar );
+SCREEN_UPDATE( wwfsstar );
WRITE16_HANDLER( wwfsstar_fg0_videoram_w );
WRITE16_HANDLER( wwfsstar_bg0_videoram_w );
diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h
index 60f986d8125..bbbc7b5ee93 100644
--- a/src/mame/includes/wwfwfest.h
+++ b/src/mame/includes/wwfwfest.h
@@ -6,7 +6,7 @@ extern UINT16 wwfwfest_bg0_scrollx, wwfwfest_bg0_scrolly, wwfwfest_bg1_scrollx,
VIDEO_START( wwfwfest );
VIDEO_START( wwfwfstb );
-VIDEO_UPDATE( wwfwfest );
+SCREEN_UPDATE( wwfwfest );
WRITE16_HANDLER( wwfwfest_fg0_videoram_w );
WRITE16_HANDLER( wwfwfest_bg0_videoram_w );
WRITE16_HANDLER( wwfwfest_bg1_videoram_w );
diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h
index a9eac616a61..97f2f8b2bc1 100644
--- a/src/mame/includes/xain.h
+++ b/src/mame/includes/xain.h
@@ -2,7 +2,7 @@
extern UINT8 *xain_charram, *xain_bgram0, *xain_bgram1, xain_pri;
-VIDEO_UPDATE( xain );
+SCREEN_UPDATE( xain );
VIDEO_START( xain );
WRITE8_HANDLER( xain_scrollxP0_w );
WRITE8_HANDLER( xain_scrollyP0_w );
diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h
index 64a6ea2e4ee..8249ecb52df 100644
--- a/src/mame/includes/xexex.h
+++ b/src/mame/includes/xexex.h
@@ -50,4 +50,4 @@ extern void xexex_sprite_callback(running_machine *machine, int *code, int *colo
extern void xexex_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags);
VIDEO_START( xexex );
-VIDEO_UPDATE( xexex );
+SCREEN_UPDATE( xexex );
diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h
index f8bd55313e8..e8038289521 100644
--- a/src/mame/includes/xmen.h
+++ b/src/mame/includes/xmen.h
@@ -42,6 +42,6 @@ void xmen_tile_callback(running_machine *machine, int layer,int bank,int *code,i
void xmen_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask);
VIDEO_START( xmen6p );
-VIDEO_UPDATE( xmen );
-VIDEO_UPDATE( xmen6p );
-VIDEO_EOF( xmen6p );
+SCREEN_UPDATE( xmen );
+SCREEN_UPDATE( xmen6p );
+SCREEN_EOF( xmen6p );
diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h
index b423249c72e..b6cfee74306 100644
--- a/src/mame/includes/xorworld.h
+++ b/src/mame/includes/xorworld.h
@@ -14,4 +14,4 @@ WRITE16_HANDLER( xorworld_videoram16_w );
PALETTE_INIT( xorworld );
VIDEO_START( xorworld );
-VIDEO_UPDATE( xorworld );
+SCREEN_UPDATE( xorworld );
diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h
index 53c0596de3d..bd12a027b40 100644
--- a/src/mame/includes/xxmissio.h
+++ b/src/mame/includes/xxmissio.h
@@ -5,7 +5,7 @@ extern UINT8 *xxmissio_fgram;
extern UINT8 *xxmissio_spriteram;
VIDEO_START( xxmissio );
-VIDEO_UPDATE( xxmissio );
+SCREEN_UPDATE( xxmissio );
WRITE8_DEVICE_HANDLER( xxmissio_scroll_x_w );
WRITE8_DEVICE_HANDLER( xxmissio_scroll_y_w );
diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h
index d7b4ab0e822..32711458661 100644
--- a/src/mame/includes/xybots.h
+++ b/src/mame/includes/xybots.h
@@ -19,4 +19,4 @@ public:
/*----------- defined in video/xybots.c -----------*/
VIDEO_START( xybots );
-VIDEO_UPDATE( xybots );
+SCREEN_UPDATE( xybots );
diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h
index 7379a32731a..6a1f5300621 100644
--- a/src/mame/includes/xyonix.h
+++ b/src/mame/includes/xyonix.h
@@ -19,4 +19,4 @@ public:
PALETTE_INIT( xyonix );
WRITE8_HANDLER( xyonix_vidram_w );
VIDEO_START(xyonix);
-VIDEO_UPDATE(xyonix);
+SCREEN_UPDATE(xyonix);
diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h
index 000c7bc698d..ec9d13a70cb 100644
--- a/src/mame/includes/yiear.h
+++ b/src/mame/includes/yiear.h
@@ -24,4 +24,4 @@ WRITE8_HANDLER( yiear_control_w );
PALETTE_INIT( yiear );
VIDEO_START( yiear );
-VIDEO_UPDATE( yiear );
+SCREEN_UPDATE( yiear );
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index 8a20bd19a48..fb7f7f4801d 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -35,4 +35,4 @@ WRITE16_HANDLER( yunsun16_vram_0_w );
WRITE16_HANDLER( yunsun16_vram_1_w );
VIDEO_START( yunsun16 );
-VIDEO_UPDATE( yunsun16 );
+SCREEN_UPDATE( yunsun16 );
diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h
index 18aa7016ffe..f84c45a1d16 100644
--- a/src/mame/includes/yunsung8.h
+++ b/src/mame/includes/yunsung8.h
@@ -36,4 +36,4 @@ WRITE8_HANDLER( yunsung8_videoram_w );
WRITE8_HANDLER( yunsung8_flipscreen_w );
VIDEO_START( yunsung8 );
-VIDEO_UPDATE( yunsung8 );
+SCREEN_UPDATE( yunsung8 );
diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h
index 28c66729809..fafae1a3bf1 100644
--- a/src/mame/includes/zac2650.h
+++ b/src/mame/includes/zac2650.h
@@ -18,5 +18,5 @@ WRITE8_HANDLER( zac_s2636_w );
READ8_HANDLER( tinvader_port_0_r );
VIDEO_START( tinvader );
-VIDEO_UPDATE( tinvader );
+SCREEN_UPDATE( tinvader );
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index 1154bf5199c..ef46c14e270 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -8,4 +8,4 @@ WRITE8_HANDLER( zaccaria_videoram_w );
WRITE8_HANDLER( zaccaria_attributes_w );
WRITE8_HANDLER( zaccaria_flip_screen_x_w );
WRITE8_HANDLER( zaccaria_flip_screen_y_w );
-VIDEO_UPDATE( zaccaria );
+SCREEN_UPDATE( zaccaria );
diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h
index 9aec20de189..1d8bc09c19f 100644
--- a/src/mame/includes/zaxxon.h
+++ b/src/mame/includes/zaxxon.h
@@ -71,7 +71,7 @@ VIDEO_START( zaxxon );
VIDEO_START( razmataz );
VIDEO_START( congo );
-VIDEO_UPDATE( zaxxon );
-VIDEO_UPDATE( razmataz );
-VIDEO_UPDATE( congo );
-VIDEO_UPDATE( futspy );
+SCREEN_UPDATE( zaxxon );
+SCREEN_UPDATE( razmataz );
+SCREEN_UPDATE( congo );
+SCREEN_UPDATE( futspy );
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index fe71bb91014..f11395a2e95 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -29,4 +29,4 @@ WRITE16_HANDLER( zerozone_tilemap_w );
WRITE16_HANDLER( zerozone_tilebank_w );
VIDEO_START( zerozone );
-VIDEO_UPDATE( zerozone );
+SCREEN_UPDATE( zerozone );
diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h
index 0c7cd0dc073..89f54e639ca 100644
--- a/src/mame/includes/zodiack.h
+++ b/src/mame/includes/zodiack.h
@@ -36,4 +36,4 @@ WRITE8_HANDLER( zodiack_flipscreen_w );
PALETTE_INIT( zodiack );
VIDEO_START( zodiack );
-VIDEO_UPDATE( zodiack );
+SCREEN_UPDATE( zodiack );